Add non critical ext options to client

dydxprotocol · Dec 19, 2024 · 0f21853 · 0f21853
1 parent 4ee5843
commit 0f21853
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 21 deletions.
diff --git a/client/tx/factory.go b/client/tx/factory.go
@@ -25,27 +25,28 @@ import (
 // Factory defines a client transaction factory that facilitates generating and
 // signing an application-specific transaction.
 type Factory struct {
-	keybase            keyring.Keyring
-	txConfig           client.TxConfig
-	accountRetriever   client.AccountRetriever
-	accountNumber      uint64
-	sequence           uint64
-	gas                uint64
-	timeoutHeight      uint64
-	gasAdjustment      float64
-	chainID            string
-	fromName           string
-	offline            bool
-	generateOnly       bool
-	memo               string
-	fees               sdk.Coins
-	feeGranter         sdk.AccAddress
-	feePayer           sdk.AccAddress
-	gasPrices          sdk.DecCoins
-	extOptions         []*codectypes.Any
-	signMode           signing.SignMode
-	simulateAndExecute bool
-	preprocessTxHook   client.PreprocessTxFn
+	keybase               keyring.Keyring
+	txConfig              client.TxConfig
+	accountRetriever      client.AccountRetriever
+	accountNumber         uint64
+	sequence              uint64
+	gas                   uint64
+	timeoutHeight         uint64
+	gasAdjustment         float64
+	chainID               string
+	fromName              string
+	offline               bool
+	generateOnly          bool
+	memo                  string
+	fees                  sdk.Coins
+	feeGranter            sdk.AccAddress
+	feePayer              sdk.AccAddress
+	gasPrices             sdk.DecCoins
+	extOptions            []*codectypes.Any
+	nonCriticalExtOptions []*codectypes.Any
+	signMode              signing.SignMode
+	simulateAndExecute    bool
+	preprocessTxHook      client.PreprocessTxFn
 }
 
 // NewFactoryCLI creates a new Factory.
@@ -293,6 +294,11 @@ func (f Factory) WithExtensionOptions(extOpts ...*codectypes.Any) Factory {
 	return f
 }
 
+func (f Factory) WithNonCriticalExtensionOptions(extOpts ...*codectypes.Any) Factory {
+	f.nonCriticalExtOptions = extOpts
+	return f
+}
+
 // BuildUnsignedTx builds a transaction to be signed given a set of messages.
 // Once created, the fee, memo, and messages are set.
 func (f Factory) BuildUnsignedTx(msgs ...sdk.Msg) (client.TxBuilder, error) {
@@ -345,6 +351,10 @@ func (f Factory) BuildUnsignedTx(msgs ...sdk.Msg) (client.TxBuilder, error) {
 		etx.SetExtensionOptions(f.extOptions...)
 	}
 
+	if etx, ok := tx.(client.NonCriticalExtOptionsTxBuilder); ok {
+		etx.SetNonCriticalExtensionOptions(f.nonCriticalExtOptions...)
+	}
+
 	return tx, nil
 }
 

diff --git a/client/tx_config.go b/client/tx_config.go
@@ -57,4 +57,10 @@ type (
 	ExtendedTxBuilder interface {
 		SetExtensionOptions(extOpts ...*codectypes.Any)
 	}
+
+	// NonCriticalExtOptionsTxBuilder extends the TxBuilder interface,
+	// which is used to set non-critical extension options to be included in a transaction.
+	NonCriticalExtOptionsTxBuilder interface {
+		SetNonCriticalExtensionOptions(extOpts ...*codectypes.Any)
+	}
 )