Transaction relayer fetching gas price from current eth client instea…

…d of using hardcoded value (#1589) * modified txRelayer to fetch gasprice from current eth client instead of hardcoded one * fetch gas price only if default is 0 * Don't set gas price explicitly when using tx relayer * unexported defaultGasPrice constant --------- Co-authored-by: adirola <adirola@gmail.com>
0xPolygon · Jun 7, 2023 · 5318ff4 · 5318ff4
1 parent ef33b05
commit 5318ff4
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 88 deletions.
diff --git a/command/rootchain/staking/stake.go b/command/rootchain/staking/stake.go
@@ -102,11 +102,6 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	gasPrice, err := txRelayer.Client().Eth().GasPrice()
-	if err != nil {
-		return err
-	}
-
 	approveTxn, err := rootHelper.CreateApproveERC20Txn(params.amountValue,
 		types.StringToAddress(params.stakeManagerAddr), types.StringToAddress(params.stakeTokenAddr))
 	if err != nil {
@@ -134,10 +129,9 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 
 	stakeManagerAddr := ethgo.Address(types.StringToAddress(params.stakeManagerAddr))
 	txn := &ethgo.Transaction{
-		From:     validatorAccount.Ecdsa.Address(),
-		Input:    encoded,
-		To:       &stakeManagerAddr,
-		GasPrice: gasPrice,
+		From:  validatorAccount.Ecdsa.Address(),
+		Input: encoded,
+		To:    &stakeManagerAddr,
 	}
 
 	receipt, err = txRelayer.SendTransaction(txn, validatorAccount.Ecdsa)

diff --git a/command/rootchain/supernet/supernet.go b/command/rootchain/supernet/supernet.go
@@ -117,11 +117,6 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf("enlist validator failed: %w", err)
 	}
 
-	gasPrice, err := txRelayer.Client().Eth().GasPrice()
-	if err != nil {
-		return err
-	}
-
 	supernetAddr := ethgo.Address(types.StringToAddress(params.supernetManagerAddress))
 
 	if params.finalizeGenesisSet {
@@ -131,10 +126,9 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 		}
 
 		txn := &ethgo.Transaction{
-			From:     ownerKey.Address(),
-			Input:    encoded,
-			To:       &supernetAddr,
-			GasPrice: gasPrice,
+			From:  ownerKey.Address(),
+			Input: encoded,
+			To:    &supernetAddr,
 		}
 
 		if _, err = txRelayer.Call(ownerKey.Address(), supernetAddr, encoded); err == nil {
@@ -185,10 +179,9 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 		}
 
 		txn := &ethgo.Transaction{
-			From:     ownerKey.Address(),
-			Input:    encoded,
-			To:       &supernetAddr,
-			GasPrice: gasPrice,
+			From:  ownerKey.Address(),
+			Input: encoded,
+			To:    &supernetAddr,
 		}
 
 		receipt, err := txRelayer.SendTransaction(txn, ownerKey)

diff --git a/command/rootchain/whitelist/whitelist_validators.go b/command/rootchain/whitelist/whitelist_validators.go
@@ -94,11 +94,6 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf("whitelist validator failed. Could not create tx relayer: %w", err)
 	}
 
-	gasPrice, err := txRelayer.Client().Eth().GasPrice()
-	if err != nil {
-		return err
-	}
-
 	whitelistFn := &contractsapi.WhitelistValidatorsCustomSupernetManagerFn{
 		Validators_: stringSliceToAddressSlice(params.newValidatorAddresses),
 	}
@@ -110,10 +105,9 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 
 	supernetAddr := ethgo.Address(types.StringToAddress(params.supernetManagerAddress))
 	txn := &ethgo.Transaction{
-		From:     ecdsaKey.Address(),
-		Input:    encoded,
-		To:       &supernetAddr,
-		GasPrice: gasPrice,
+		From:  ecdsaKey.Address(),
+		Input: encoded,
+		To:    &supernetAddr,
 	}
 
 	receipt, err := txRelayer.SendTransaction(txn, ecdsaKey)

diff --git a/command/rootchain/withdraw/withdraw.go b/command/rootchain/withdraw/withdraw.go
@@ -102,17 +102,11 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	gasPrice, err := txRelayer.Client().Eth().GasPrice()
-	if err != nil {
-		return err
-	}
-
 	stakeManagerAddr := ethgo.Address(types.StringToAddress(params.stakeManagerAddr))
 	txn := &ethgo.Transaction{
-		From:     validatorAccount.Ecdsa.Address(),
-		Input:    encoded,
-		To:       &stakeManagerAddr,
-		GasPrice: gasPrice,
+		From:  validatorAccount.Ecdsa.Address(),
+		Input: encoded,
+		To:    &stakeManagerAddr,
 	}
 
 	receipt, err := txRelayer.SendTransaction(txn, validatorAccount.Ecdsa)

diff --git a/command/sidechain/helper.go b/command/sidechain/helper.go
@@ -18,8 +18,6 @@ import (
 
 const (
 	AmountFlag = "amount"
-
-	DefaultGasPrice = 1879048192 // 0x70000000
 )
 
 func CheckIfDirectoryExist(dir string) error {

diff --git a/command/sidechain/rewards/rewards.go b/command/sidechain/rewards/rewards.go
@@ -95,10 +95,9 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	}
 
 	txn := &ethgo.Transaction{
-		From:     validatorAddr,
-		Input:    encoded,
-		To:       &rewardPoolAddr,
-		GasPrice: sidechainHelper.DefaultGasPrice,
+		From:  validatorAddr,
+		Input: encoded,
+		To:    &rewardPoolAddr,
 	}
 
 	receipt, err := txRelayer.SendTransaction(txn, validatorAccount.Ecdsa)

diff --git a/command/sidechain/unstaking/unstake.go b/command/sidechain/unstaking/unstake.go
@@ -88,10 +88,9 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	}
 
 	txn := &ethgo.Transaction{
-		From:     validatorAccount.Ecdsa.Address(),
-		Input:    encoded,
-		To:       (*ethgo.Address)(&contracts.ValidatorSetContract),
-		GasPrice: sidechainHelper.DefaultGasPrice,
+		From:  validatorAccount.Ecdsa.Address(),
+		Input: encoded,
+		To:    (*ethgo.Address)(&contracts.ValidatorSetContract),
 	}
 
 	receipt, err := txRelayer.SendTransaction(txn, validatorAccount.Ecdsa)

diff --git a/command/sidechain/withdraw/withdraw.go b/command/sidechain/withdraw/withdraw.go
@@ -77,10 +77,9 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	}
 
 	txn := &ethgo.Transaction{
-		From:     validatorAccount.Ecdsa.Address(),
-		Input:    encoded,
-		To:       (*ethgo.Address)(&contracts.ValidatorSetContract),
-		GasPrice: sidechainHelper.DefaultGasPrice,
+		From:  validatorAccount.Ecdsa.Address(),
+		Input: encoded,
+		To:    (*ethgo.Address)(&contracts.ValidatorSetContract),
 	}
 
 	receipt, err := txRelayer.SendTransaction(txn, validatorAccount.Ecdsa)

diff --git a/consensus/polybft/statesyncrelayer/state_sync_relayer.go b/consensus/polybft/statesyncrelayer/state_sync_relayer.go
@@ -196,11 +196,10 @@ func (r *StateSyncRelayer) executeStateSync(proof *types.Proof) error {
 
 	// execute the state sync
 	txn := &ethgo.Transaction{
-		From:     r.key.Address(),
-		To:       (*ethgo.Address)(&contracts.StateReceiverContract),
-		GasPrice: 0,
-		Gas:      types.StateTransactionGasLimit,
-		Input:    input,
+		From:  r.key.Address(),
+		To:    (*ethgo.Address)(&contracts.StateReceiverContract),
+		Gas:   types.StateTransactionGasLimit,
+		Input: input,
 	}
 
 	receipt, err := r.txRelayer.SendTransaction(txn, r.key)

diff --git a/e2e-polybft/e2e/jsonrpc_test.go b/e2e-polybft/e2e/jsonrpc_test.go
@@ -85,10 +85,9 @@ func TestE2E_JsonRPC(t *testing.T) {
 
 		toAddr := key1.Address()
 		msg := &ethgo.CallMsg{
-			From:     acct.Address(),
-			To:       &toAddr,
-			Value:    newBalance,
-			GasPrice: gasPrice,
+			From:  acct.Address(),
+			To:    &toAddr,
+			Value: newBalance,
 		}
 
 		estimatedGas, err := client.EstimateGas(msg)
@@ -99,10 +98,9 @@ func TestE2E_JsonRPC(t *testing.T) {
 		amountToSend := new(big.Int).Sub(newBalance, big.NewInt(int64(txPrice)))
 		targetAddr := acct.Address()
 		txn = cluster.SendTxn(t, key1, &ethgo.Transaction{
-			To:       &targetAddr,
-			Value:    amountToSend,
-			GasPrice: gasPrice,
-			Gas:      estimatedGas,
+			To:    &targetAddr,
+			Value: amountToSend,
+			Gas:   estimatedGas,
 		})
 		require.NoError(t, txn.Wait())
 		require.True(t, txn.Succeed())

diff --git a/e2e-polybft/e2e/migration_test.go b/e2e-polybft/e2e/migration_test.go
@@ -60,20 +60,18 @@ func TestE2E_Migration(t *testing.T) {
 	//send transaction to user2
 	sendAmount := ethgo.Gwei(10000)
 	receipt, err := relayer.SendTransaction(&ethgo.Transaction{
-		From:     userAddr,
-		To:       &userAddr2,
-		GasPrice: 1048576,
-		Gas:      1000000,
-		Value:    sendAmount,
+		From:  userAddr,
+		To:    &userAddr2,
+		Gas:   1000000,
+		Value: sendAmount,
 	}, userKey)
 	assert.NoError(t, err)
 	assert.NotNil(t, receipt)
 
 	receipt, err = relayer.SendTransaction(&ethgo.Transaction{
-		From:     userAddr,
-		GasPrice: 1048576,
-		Gas:      1000000,
-		Input:    contractsapi.TestWriteBlockMetadata.Bytecode,
+		From:  userAddr,
+		Gas:   1000000,
+		Input: contractsapi.TestWriteBlockMetadata.Bytecode,
 	}, userKey)
 	require.NoError(t, err)
 	require.NotNil(t, receipt)

diff --git a/e2e-polybft/framework/test-cluster.go b/e2e-polybft/framework/test-cluster.go
@@ -910,7 +910,10 @@ func (c *TestCluster) SendTxn(t *testing.T, sender ethgo.Key, txn *ethgo.Transac
 	}
 
 	if txn.GasPrice == 0 {
-		txn.GasPrice = txrelayer.DefaultGasPrice
+		gasPrice, err := client.Eth().GasPrice()
+		require.NoError(t, err)
+
+		txn.GasPrice = gasPrice
 	}
 
 	if txn.Gas == 0 {

diff --git a/e2e/framework/testserver.go b/e2e/framework/testserver.go
@@ -626,12 +626,6 @@ func (t *Txn) GasLimit(gas uint64) *Txn {
 	return t
 }
 
-func (t *Txn) GasPrice(price uint64) *Txn {
-	t.raw.GasPrice = price
-
-	return t
-}
-
 func (t *Txn) Nonce(nonce uint64) *Txn {
 	t.raw.Nonce = nonce
 
@@ -645,7 +639,12 @@ func (t *Txn) sendImpl() error {
 	}
 
 	if t.raw.GasPrice == 0 {
-		t.raw.GasPrice = 1048576
+		gasPrice, err := t.client.GasPrice()
+		if err != nil {
+			return fmt.Errorf("failed to get gas price: %w", err)
+		}
+
+		t.raw.GasPrice = gasPrice
 	}
 
 	if t.raw.Nonce == 0 {

diff --git a/e2e/jsonrpc_test.go b/e2e/jsonrpc_test.go
@@ -81,7 +81,6 @@ func TestJsonRPC(t *testing.T) {
 		amountToSend := new(big.Int).Sub(newBalance, big.NewInt(int64(txPrice)))
 		txn, err = srv.Txn(key1).Transfer(fund.Address(), amountToSend).
 			GasLimit(estimatedGas).
-			GasPrice(gasPrice).
 			Send()
 		require.NoError(t, err)
 		txn.NoFail(t)

diff --git a/txrelayer/txrelayer.go b/txrelayer/txrelayer.go
@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	DefaultGasPrice   = 1879048192 // 0x70000000
+	defaultGasPrice   = 1879048192 // 0x70000000
 	DefaultGasLimit   = 5242880    // 0x500000
 	DefaultRPCAddress = "http://127.0.0.1:8545"
 	numRetries        = 1000
@@ -103,7 +103,12 @@ func (t *TxRelayerImpl) sendTransactionLocked(txn *ethgo.Transaction, key ethgo.
 	txn.Nonce = nonce
 
 	if txn.GasPrice == 0 {
-		txn.GasPrice = DefaultGasPrice
+		gasPrice, err := t.Client().Eth().GasPrice()
+		if err != nil {
+			return ethgo.ZeroHash, err
+		}
+
+		txn.GasPrice = gasPrice
 	}
 
 	if txn.Gas == 0 {
@@ -142,7 +147,7 @@ func (t *TxRelayerImpl) SendTransactionLocal(txn *ethgo.Transaction) (*ethgo.Rec
 
 	txn.From = accounts[0]
 	txn.Gas = DefaultGasLimit
-	txn.GasPrice = DefaultGasPrice
+	txn.GasPrice = defaultGasPrice
 
 	txnHash, err := t.client.Eth().SendTransaction(txn)
 	if err != nil {