Merge pull request #131 from sgz13140/feat/gas-price

support increase the gas price when submit checkpoint to eth

Author: mengcody

bridge/setu/broadcaster/broadcaster.go

@@ -120,7 +120,7 @@ func (tb *TxBroadcaster) BroadcastToMatic(msg bor.CallMsg) error {
 	maticClient := helper.GetMaticClient()
 
 	// get auth
-	auth, err := helper.GenerateAuthObj(maticClient, *msg.To, msg.Data)
+	auth, err := helper.GenerateAuthObj(maticClient, *msg.To, msg.Data, false)
 
 	if err != nil {
 		tb.logger.Error("Error generating auth object", "error", err)

helper/config.go

@@ -103,6 +103,9 @@ const (
 
 	DefaultBttcChainID string = "15001"
 
+	DefaultEnableIncreaseGasPrice  = false
+	DefaultGasPriceIncreasePercent = 0
+
 	DefaultLogsType = "json"
 	DefaultChain    = "mainnet"
 
@@ -168,6 +171,9 @@ type Configuration struct {
 	BscMaxQueryBlocks      int64 `mapstructure:"bsc_max_query_blocks"`      // bsc max number of blocks in one query logs
 	TronMaxQueryBlocks     int64 `mapstructure:"tron_max_query_blocks"`     // tron max number of blocks in one query logs
 	HeimdallMaxQueryBlocks int64 `mapstructure:"heimdall_max_query_blocks"` // heimdall max number of blocks in one query logs
+
+	EnableIncreaseGasPrice  bool  `mapstructure:"enable_increase_gas_price"`  // whether enable increase gas price when submit checkpoint to eth
+	GasPriceIncreasePercent int64 `mapstructure:"gas_price_increase_percent"` // the increase percent of gas price when submit tx. newGasPrice = oldGasPrice * (100 + GasPriceIncreasePercent) / 100
 }
 
 var conf Configuration
@@ -330,6 +336,9 @@ func GetDefaultHeimdallConfig() Configuration {
 		BscMaxQueryBlocks:      DefaultBscMaxQueryBlocks,
 		TronMaxQueryBlocks:     DefaultTronMaxQueryBlocks,
 		HeimdallMaxQueryBlocks: DefaultHeimdallMaxQueryBlocks,
+
+		EnableIncreaseGasPrice:  DefaultEnableIncreaseGasPrice,
+		GasPriceIncreasePercent: DefaultGasPriceIncreasePercent,
 	}
 }
 

helper/tx.go

@@ -22,7 +22,7 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func GenerateAuthObj(client *ethclient.Client, address common.Address, data []byte) (auth *bind.TransactOpts, err error) {
+func GenerateAuthObj(client *ethclient.Client, address common.Address, data []byte, enableIncreaseGasPrice bool) (auth *bind.TransactOpts, err error) {
 	// generate call msg
 	callMsg := ethereum.CallMsg{
 		To:   &address,
@@ -46,6 +46,18 @@ func GenerateAuthObj(client *ethclient.Client, address common.Address, data []by
 		return
 	}
 
+	if enableIncreaseGasPrice {
+		gasPriceIncreasePercent := GetConfig().GasPriceIncreasePercent
+		if gasPriceIncreasePercent > 0 {
+			multiplier := big.NewInt(100 + gasPriceIncreasePercent)
+			divisor := big.NewInt(100)
+			originGasPrice := gasprice
+			gasprice = new(big.Int).Mul(gasprice, multiplier)
+			gasprice.Div(gasprice, divisor)
+			Logger.Debug("Adjust gas price", "originGasPrice", originGasPrice, "adjustedGasPrice", gasprice)
+		}
+	}
+
 	mainChainMaxGasPrice := GetConfig().MainchainMaxGasPrice
 	// Check if configured or not, Use default in case of invalid value
 	if mainChainMaxGasPrice <= 0 {
@@ -106,7 +118,15 @@ func (c *ContractCaller) SendCheckpoint(signedData []byte, sigs [][3]*big.Int,
 	case hmtypes.RootChainTypeBsc:
 		client = GetBscClient()
 	}
-	auth, err := GenerateAuthObj(client, rootChainAddress, data)
+	var auth *bind.TransactOpts
+
+	if rootChain == hmtypes.RootChainTypeEth {
+		enableIncreaseGasPrice := GetConfig().EnableIncreaseGasPrice
+		auth, err = GenerateAuthObj(client, rootChainAddress, data, enableIncreaseGasPrice)
+	} else {
+		auth, err = GenerateAuthObj(client, rootChainAddress, data, false)
+	}
+
 	if err != nil {
 		Logger.Error("Unable to create auth object", "error", err)
 		return err
@@ -141,7 +161,7 @@ func (c *ContractCaller) SendTick(signedData []byte, sigs []byte, slashManagerAd
 		return err
 	}
 
-	auth, err := GenerateAuthObj(GetMainClient(), slashManagerAddress, data)
+	auth, err := GenerateAuthObj(GetMainClient(), slashManagerAddress, data, false)
 	if err != nil {
 		Logger.Error("Unable to create auth object", "error", err)
 		return err
@@ -173,7 +193,7 @@ func (c *ContractCaller) StakeFor(val common.Address, stakeAmount *big.Int, feeA
 		return err
 	}
 
-	auth, err := GenerateAuthObj(GetMainClient(), stakeManagerAddress, data)
+	auth, err := GenerateAuthObj(GetMainClient(), stakeManagerAddress, data, false)
 	if err != nil {
 		Logger.Error("Unable to create auth object", "error", err)
 		return err
@@ -206,7 +226,7 @@ func (c *ContractCaller) ApproveTokens(amount *big.Int, stakeManager common.Addr
 		return err
 	}
 
-	auth, err := GenerateAuthObj(GetMainClient(), tokenAddress, data)
+	auth, err := GenerateAuthObj(GetMainClient(), tokenAddress, data, false)
 	if err != nil {
 		Logger.Error("Unable to create auth object", "error", err)
 		return err
@@ -302,7 +322,7 @@ func (c *ContractCaller) SendMainStakingSync(syncMethod string, signedData []byt
 	case hmtypes.RootChainTypeBsc:
 		client = GetBscClient()
 	}
-	auth, err := GenerateAuthObj(client, stakingManager, data)
+	auth, err := GenerateAuthObj(client, stakingManager, data, false)
 	if err != nil {
 		Logger.Error("Unable to create auth object", "error", err)
 		return err