fix getting new nonce in delegated and direct funcs

Bisonai · Aug 28, 2024 · d1873d0 · d1873d0
1 parent b2c8740
commit d1873d0
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/node/pkg/chain/helper/helper.go b/node/pkg/chain/helper/helper.go
@@ -243,26 +243,26 @@ func (t *ChainHelper) PublicAddressString() (string, error) {
 }
 
 func (t *ChainHelper) SubmitDelegatedFallbackDirect(ctx context.Context, contractAddress string, functionString string, maxRetrial int, args ...interface{}) error {
-	nonce, err := noncemanager.GetAndIncrementNonce(t.wallet)
-	if err != nil {
-		return err
-	}
-
 	if t.delegatorUrl != "" {
-		err, tryDirect := t.submitDelegated(ctx, contractAddress, functionString, maxRetrial, nonce, args...)
+		err, tryDirect := t.submitDelegated(ctx, contractAddress, functionString, maxRetrial, args...)
 		if !tryDirect {
 			return err
 		}
 	}
 
-	return t.submitDirect(ctx, contractAddress, functionString, maxRetrial, nonce, args...)
+	return t.submitDirect(ctx, contractAddress, functionString, maxRetrial, args...)
 }
 
-func (t *ChainHelper) submitDelegated(ctx context.Context, contractAddress string, functionString string, maxRetrial int, nonce uint64, args ...interface{}) (error, bool) {
+func (t *ChainHelper) submitDelegated(ctx context.Context, contractAddress string, functionString string, maxRetrial int, args ...interface{}) (error, bool) {
 	var err error
 	var tx *types.Transaction
 	clientIndex := 0
 
+	nonce, err := noncemanager.GetAndIncrementNonce(t.wallet)
+	if err != nil {
+		return err, false
+	}
+
 	for i := 0; i < maxRetrial; i++ {
 		tx, err = utils.MakeFeeDelegatedTx(ctx, t.clients[clientIndex], contractAddress, t.wallet, functionString, t.chainID, nonce, args...)
 		if err != nil {
@@ -296,11 +296,16 @@ func (t *ChainHelper) submitDelegated(ctx context.Context, contractAddress strin
 	return err, true
 }
 
-func (t *ChainHelper) submitDirect(ctx context.Context, contractAddress string, functionString string, maxRetrial int, nonce uint64, args ...interface{}) error {
+func (t *ChainHelper) submitDirect(ctx context.Context, contractAddress string, functionString string, maxRetrial int, args ...interface{}) error {
 	var err error
 	var tx *types.Transaction
 	clientIndex := 0
 
+	nonce, err := noncemanager.GetAndIncrementNonce(t.wallet)
+	if err != nil {
+		return err
+	}
+
 	for i := 0; i < maxRetrial; i++ {
 		tx, err = utils.MakeDirectTx(ctx, t.clients[clientIndex], contractAddress, t.wallet, functionString, t.chainID, nonce, args...)
 		if err != nil {