Update nonce behavior to be managed by tx creator

Author: udpatil

README.md

@@ -21,7 +21,7 @@ Edit `my-config.json`:
 ```json
 {
   "endpoints": ["http://localhost:8545"],
-  "chainId": 1329,
+  "chainId": 713714,
   "scenarios": [
     {"name": "EVMTransfer", "weight": 100}
   ],
@@ -94,7 +94,7 @@ Edit `my-config.json`:
 ```json
 {
   "endpoints": ["http://localhost:8545"],
-  "chainId": 1329,
+  "chainId": 713714,
   "scenarios": [...],
   "accounts": {...},
   "settings": {...}

generator/prewarm.go

@@ -79,7 +79,6 @@ func (pg *PrewarmGenerator) Generate() (*types.LoadTx, bool) {
 		Name:     "EVMTransfer",
 		Sender:   account,
 		Receiver: account.Address, // Send to self
-		Nonce:    account.GetAndIncrementNonce(),
 	}
 
 	// Generate the transaction using EVMTransfer scenario

generator/scenario.go

@@ -40,7 +40,6 @@ func (g *scenarioGenerator) Generate() (*types.LoadTx, bool) {
 		Name:     g.scenario.Name(),
 		Sender:   sender,
 		Receiver: receiver.Address,
-		Nonce:    sender.GetAndIncrementNonce(),
 	}), true
 }
 

generator/scenarios/EVMTransfer.go

@@ -48,7 +48,7 @@ func (s *EVMTransferScenario) AttachScenario(config *config.LoadConfig, address
 func (s *EVMTransferScenario) CreateTransaction(config *config.LoadConfig, scenario *types2.TxScenario) (*ethtypes.Transaction, error) {
 	// Create transaction with value transfer
 	tx := &ethtypes.DynamicFeeTx{
-		Nonce:     scenario.Nonce,
+		Nonce:     scenario.Sender.GetAndIncrementNonce(),
 		To:        &scenario.Receiver,
 		Value:     big.NewInt(time.Now().Unix()),
 		Gas:       21000,                   // Standard gas limit for ETH transfer

generator/scenarios/EVMTransferNoop.go

@@ -47,7 +47,7 @@ func (s *EVMTransferNoopScenario) AttachScenario(config *config.LoadConfig, addr
 func (s *EVMTransferNoopScenario) CreateTransaction(config *config.LoadConfig, scenario *types2.TxScenario) (*ethtypes.Transaction, error) {
 	// Create transaction with value transfer
 	tx := &ethtypes.DynamicFeeTx{
-		Nonce:     scenario.Nonce,
+		Nonce:     scenario.Sender.GetAndIncrementNonce(),
 		To:        &scenario.Sender.Address,
 		Value:     big.NewInt(0),
 		Gas:       21000,                   // Standard gas limit for ETH transfer

generator/scenarios/base.go

@@ -200,7 +200,6 @@ func (c *ContractScenarioBase[T]) DeployScenario(config *config.LoadConfig, depl
 	}
 
 	log.Printf("✅ Deployment successful at block %d (gas used: %d)", receipt.BlockNumber.Uint64(), receipt.GasUsed)
-	deployer.GetAndIncrementNonce()
 
 	// Bind contract instance using the provided bind function
 	bindFunc := c.deployer.GetBindFunc()

generator/utils/utils.go

@@ -45,7 +45,7 @@ func createTransactOpts(chainID *big.Int, account *loadtypes.Account, gasLimit u
 	}
 
 	// Set transaction parameters
-	auth.Nonce = big.NewInt(int64(account.Nonce))
+	auth.Nonce.SetUint64(account.GetAndIncrementNonce())
 	auth.NoSend = noSend
 
 	auth.GasLimit = gasLimit
@@ -68,6 +68,5 @@ func CreateTransactionOpts(chainID *big.Int, scenario *loadtypes.TxScenario) *bi
 	if err != nil {
 		panic("Failed to create transaction options: " + err.Error())
 	}
-	opts.Nonce.SetUint64(scenario.Nonce)
 	return opts
 }

types/scenario.go

@@ -49,7 +49,6 @@ func (tx *LoadTx) ShardID(n int) int {
 // TxScenario captures the scenario of this test transaction.
 type TxScenario struct {
 	Name     string
-	Nonce    uint64
 	Sender   *Account
 	Receiver common.Address
 }

types/types_test.go

@@ -250,18 +250,18 @@ func TestCreateTxFromEthTx(t *testing.T) {
 	account, err := NewAccount()
 	require.NoError(t, err)
 
+	account.Nonce = 42
 	receiver := common.HexToAddress("0x1234567890123456789012345678901234567890")
 	scenario := &TxScenario{
 		Name:     "TestScenario",
-		Nonce:    42,
 		Sender:   account,
 		Receiver: receiver,
 	}
 
 	// Create a test transaction using DynamicFeeTx (EIP-1559)
 	tx := types.NewTx(&types.DynamicFeeTx{
-		ChainID:   big.NewInt(1329), // Sei testnet chain ID
-		Nonce:     scenario.Nonce,
+		ChainID:   big.NewInt(713714), // Sei testnet chain ID
+		Nonce:     scenario.Sender.Nonce,
 		GasTipCap: big.NewInt(2000000000),  // 2 Gwei tip
 		GasFeeCap: big.NewInt(20000000000), // 20 Gwei max fee
 		Gas:       21000,                   // Gas limit
@@ -314,15 +314,15 @@ func TestLoadTxShardID(t *testing.T) {
 				account := accounts[i%len(accounts)]
 				scenario := &TxScenario{
 					Name:     "TestScenario",
-					Nonce:    uint64(i),
 					Sender:   account,
 					Receiver: common.Address{},
 				}
 
+				scenario.Sender.Nonce = uint64(i)
 				// Create a simple transaction
 				tx := types.NewTx(&types.DynamicFeeTx{
-					ChainID:   big.NewInt(1329), // Sei testnet chain ID
-					Nonce:     scenario.Nonce,
+					ChainID:   big.NewInt(713714), // Sei testnet chain ID
+					Nonce:     scenario.Sender.Nonce,
 					GasTipCap: big.NewInt(2000000000),  // 2 Gwei tip
 					GasFeeCap: big.NewInt(20000000000), // 20 Gwei max fee
 					Gas:       21000,                   // Gas limit
@@ -374,14 +374,13 @@ func TestLoadTxShardIDConsistency(t *testing.T) {
 
 	scenario := &TxScenario{
 		Name:     "TestScenario",
-		Nonce:    0,
 		Sender:   account,
 		Receiver: common.Address{},
 	}
 
 	tx := types.NewTx(&types.DynamicFeeTx{
-		ChainID:   big.NewInt(1329), // Sei testnet chain ID
-		Nonce:     scenario.Nonce,
+		ChainID:   big.NewInt(713714), // Sei testnet chain ID
+		Nonce:     scenario.Sender.Nonce,
 		GasTipCap: big.NewInt(2000000000),  // 2 Gwei tip
 		GasFeeCap: big.NewInt(20000000000), // 20 Gwei max fee
 		Gas:       21000,                   // Gas limit
@@ -408,16 +407,17 @@ func TestTxScenario(t *testing.T) {
 
 	receiver := common.HexToAddress("0xabcdefabcdefabcdefabcdefabcdefabcdefabcd")
 
+	account.Nonce = 123
+
 	scenario := &TxScenario{
 		Name:     "TestScenario",
-		Nonce:    123,
 		Sender:   account,
 		Receiver: receiver,
 	}
 
 	// Verify all fields are set correctly
 	assert.Equal(t, "TestScenario", scenario.Name)
-	assert.Equal(t, uint64(123), scenario.Nonce)
+	assert.Equal(t, uint64(123), scenario.Sender.Nonce)
 	assert.Equal(t, account, scenario.Sender)
 	assert.Equal(t, receiver, scenario.Receiver)
 }
@@ -477,14 +477,13 @@ func BenchmarkCreateTxFromEthTx(b *testing.B) {
 
 	scenario := &TxScenario{
 		Name:     "BenchmarkScenario",
-		Nonce:    0,
 		Sender:   account,
 		Receiver: common.Address{},
 	}
 
 	tx := types.NewTx(&types.DynamicFeeTx{
-		ChainID:   big.NewInt(1329), // Sei testnet chain ID
-		Nonce:     scenario.Nonce,
+		ChainID:   big.NewInt(713714), // Sei testnet chain ID
+		Nonce:     scenario.Sender.Nonce,
 		GasTipCap: big.NewInt(2000000000),  // 2 Gwei tip
 		GasFeeCap: big.NewInt(20000000000), // 20 Gwei max fee
 		Gas:       21000,                   // Gas limit