feat: Add gas limit adjustment flag (#105)

* added gaslimit adjustment flag

* fix tests and added changelog

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

CHANGELOG.md

@@ -48,8 +48,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 - [#104] Changed timeout for broadcasting TXs to Umee to 60s to match that of the official Gravity Bridge.
+- [#105] Added a gas limit adjustment flag for Ethereum transactions.
 
 ## [v0.1.0](https://github.com/umee-network/peggo/releases/tag/v0.1.0) - 2021-12-18
+
 ### Features
 
 - Initial release!!!

cmd/peggo/flags.go

@@ -32,6 +32,7 @@ const (
  flagEthUseLedger = "eth-use-ledger"
  flagEthRPC = "eth-rpc"
  flagEthGasAdjustment = "eth-gas-price-adjustment"
+ flagEthGasLimitAdjustment = "eth-gas-limit-adjustment"
  flagEthAlchemyWS = "eth-alchemy-ws"
  flagRelayValsets = "relay-valsets"
  flagRelayBatches = "relay-batches"
@@ -89,6 +90,7 @@ func ethereumOptsFlagSet() *pflag.FlagSet {
 
  fs.String(flagEthRPC, "https://localhost:8545", "Specify the RPC address of an Ethereum node")
  fs.Float64(flagEthGasAdjustment, float64(1.3), "Specify a gas price adjustment for Ethereum transactions")
+ fs.Float64(flagEthGasLimitAdjustment, float64(1.2), "Specify a gas limit adjustment for Ethereum transactions")
 
  return fs
 }

cmd/peggo/orchestrator.go

@@ -124,10 +124,12 @@ func getOrchestratorCmd() *cobra.Command {
  ethProvider := provider.NewEVMProvider(ethRPC)
 
  ethGasPriceAdjustment := konfig.Float64(flagEthGasAdjustment)
+ ethGasLimitAdjustment := konfig.Float64(flagEthGasLimitAdjustment)
  ethCommitter, err := committer.NewEthCommitter(
  logger,
  ethKeyFromAddress,
  ethGasPriceAdjustment,
+ ethGasLimitAdjustment,
  signerFn,
  ethProvider,
  )

orchestrator/eth_event_watcher_test.go

@@ -120,6 +120,7 @@ func TestCheckForEvents(t *testing.T) {
  logger,
  fromAddress,
  ethGasPriceAdjustment,
+ 1.0,
  nil,
  ethProvider,
  )
@@ -208,6 +209,7 @@ func TestCheckForEvents(t *testing.T) {
  logger,
  fromAddress,
  1.0,
+ 1.0,
  nil,
  ethProvider,
  )
@@ -313,6 +315,7 @@ func TestCheckForEvents(t *testing.T) {
  logger,
  fromAddress,
  ethGasPriceAdjustment,
+ 1.0,
  nil,
  ethProvider,
  )
@@ -431,6 +434,7 @@ func TestCheckForEvents(t *testing.T) {
  logger,
  fromAddress,
  ethGasPriceAdjustment,
+ 1.0,
  nil,
  ethProvider,
  )
@@ -563,6 +567,7 @@ func TestCheckForEvents(t *testing.T) {
  logger,
  fromAddress,
  ethGasPriceAdjustment,
+ 1.0,
  nil,
  ethProvider,
  )

orchestrator/ethereum/committer/eth_committer.go

@@ -21,6 +21,7 @@ func NewEthCommitter(
  logger zerolog.Logger,
  fromAddress common.Address,
  ethGasPriceAdjustment float64,
+ ethGasLimitAdjustment float64,
  fromSigner bind.SignerFn,
  evmProvider provider.EVMProviderWithRet,
  committerOpts ...EVMCommitterOption,
@@ -29,6 +30,7 @@ func NewEthCommitter(
  logger: logger.With().Str("module", "ethCommiter").Logger(),
  committerOpts: defaultOptions(),
  ethGasPriceAdjustment: ethGasPriceAdjustment,
+ ethGasLimitAdjustment: ethGasLimitAdjustment,
  fromAddress: fromAddress,
  fromSigner: fromSigner,
  evmProvider: evmProvider,
@@ -55,6 +57,7 @@ type ethCommitter struct {
  fromSigner bind.SignerFn
 
  ethGasPriceAdjustment float64
+ ethGasLimitAdjustment float64
  evmProvider provider.EVMProviderWithRet
  nonceCache util.NonceCache
 }
@@ -100,6 +103,9 @@ func (e *ethCommitter) EstimateGas(
 
  gasCost, err = e.evmProvider.EstimateGas(ctx, msg)
 
+ // Estimated gas cost may not be accurate, so we multiply the result by the gas limit adjustment factor.
+ gasCost = uint64(float64(gasCost) * e.ethGasLimitAdjustment)
+
  return gasCost, gasPrice, err
 }
 

orchestrator/ethereum/peggy/peggy_contract_test.go

@@ -48,6 +48,7 @@ func TestGetTxBatchNonce(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )
@@ -86,6 +87,7 @@ func TestGetValsetNonce(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )
@@ -123,6 +125,7 @@ func TestGetGetPeggyID(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )
@@ -167,6 +170,7 @@ func TestGetERC20Symbol(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )
@@ -210,6 +214,7 @@ func TestGetERC20Decimals(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )
@@ -235,6 +240,7 @@ func TestAddress(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )

orchestrator/ethereum/peggy/pending_transactions_test.go

@@ -57,6 +57,7 @@ func TestIsPendingTxInput(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )

orchestrator/ethereum/peggy/submit_batch_test.go

@@ -31,6 +31,7 @@ func TestEncodeTransactionBatch(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )

orchestrator/ethereum/peggy/valset_update_test.go

@@ -31,6 +31,7 @@ func TestEncodeValsetUpdate(t *testing.T) {
  logger,
  common.Address{},
  1.0,
+ 1.0,
  nil,
  mockEvmProvider,
  )

orchestrator/oracle_resync_test.go

@@ -46,6 +46,7 @@ func TestGetLastCheckedBlock(t *testing.T) {
  logger,
  fromAddress,
  ethGasPriceAdjustment,
+ 1.0,
  nil,
  ethProvider,
  )

orchestrator/relayer/batch_relaying_test.go

@@ -53,6 +53,7 @@ func TestIsBatchProfitable(t *testing.T) {
  logger,
  fromAddress,
  1.0,
+ 1.0,
  nil,
  ethProvider,
  )