Extracted TX resubmission constants for commands to cmd.go

Author: pdyraga

pkg/cmd/cmd.go

@@ -4,6 +4,8 @@ package cmd
 
 import (
 	"fmt"
+	"math/big"
+	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/keep-network/keep-common/pkg/cmd/flag"
@@ -41,6 +43,19 @@ var (
 	// interaction. The value, if that flag is passed on the command line, is
 	// stored in this variable.
 	ValueFlagValue *flag.Uint256 = &flag.Uint256{}
+
+	// DefaultMiningCheckInterval is the default interval in which transaction
+	// mining status is checked. If the transaction is not mined within this
+	// time, the gas price is increased and transaction is resubmitted.
+	// This value can be overwritten in the configuration file.
+	DefaultMiningCheckInterval = 60 * time.Second
+
+	// DefaultMaxGasPrice specifies the default maximum gas price the client is
+	// willing to pay for the transaction to be mined. The offered transaction
+	// gas price can not be higher than the max gas price value. If the maximum
+	// allowed gas price is reached, no further resubmission attempts are
+	// performed. This value can be overwritten in the configuration file.
+	DefaultMaxGasPrice = big.NewInt(50000000000) // 50 Gwei
 )
 
 // AvailableCommands is the exported list of generated commands that can be

tools/generators/ethereum/command.go.tmpl

@@ -215,8 +215,8 @@ func initialize{{.Class}}(c *cli.Context) (*contract.{{.Class}}, error) {
         )
     }
 
-	checkInterval := 30 * time.Second
-	maxGasPrice := big.NewInt(50000000000) // 50 Gwei
+	checkInterval := cmd.DefaultMiningCheckInterval
+	maxGasPrice := cmd.DefaultMaxGasPrice
 	if config.MiningCheckInterval != 0 {
 		checkInterval = time.Duration(config.MiningCheckInterval) * time.Second
 	}

tools/generators/ethereum/command_template_content.go

@@ -218,8 +218,8 @@ func initialize{{.Class}}(c *cli.Context) (*contract.{{.Class}}, error) {
         )
     }
 
-	checkInterval := 30 * time.Second
-	maxGasPrice := big.NewInt(50000000000) // 50 Gwei
+	checkInterval := cmd.DefaultMiningCheckInterval
+	maxGasPrice := cmd.DefaultMaxGasPrice
 	if config.MiningCheckInterval != 0 {
 		checkInterval = time.Duration(config.MiningCheckInterval) * time.Second
 	}

tools/generators/ethereum/contract.go.tmpl

@@ -45,7 +45,7 @@ func New{{.Class}}(
     accountKey *keystore.Key,
     backend bind.ContractBackend,
     nonceManager *ethutil.NonceManager,
-	miningWaiter *ethutil.MiningWaiter,
+    miningWaiter *ethutil.MiningWaiter,
     transactionMutex *sync.Mutex,
 ) (*{{.Class}}, error) {
 	callerOptions := &bind.CallOpts{

tools/generators/ethereum/contract_template_content.go

@@ -48,7 +48,7 @@ func New{{.Class}}(
     accountKey *keystore.Key,
     backend bind.ContractBackend,
     nonceManager *ethutil.NonceManager,
-	miningWaiter *ethutil.MiningWaiter,
+    miningWaiter *ethutil.MiningWaiter,
     transactionMutex *sync.Mutex,
 ) (*{{.Class}}, error) {
 	callerOptions := &bind.CallOpts{