feat: introduce min gas limit

ethersphere · Dec 2, 2022 · 9915106 · 9915106
1 parent aba4328
commit 9915106
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/pkg/storageincentives/redistribution/redistribution.go b/pkg/storageincentives/redistribution/redistribution.go
@@ -143,12 +143,13 @@ func (c *contract) Reveal(ctx context.Context, storageDepth uint8, reserveCommit
 		return err
 	}
 	request := &transaction.TxRequest{
-		To:          &c.incentivesContractAddress,
-		Data:        callData,
-		GasPrice:    sctx.GetGasPrice(ctx),
-		GasLimit:    sctx.GetGasLimit(ctx),
-		Value:       big.NewInt(0),
-		Description: "reveal transaction",
+		To:                   &c.incentivesContractAddress,
+		Data:                 callData,
+		GasPrice:             sctx.GetGasPrice(ctx),
+		GasLimit:             sctx.GetGasLimit(ctx),
+		MinEstimatedGasLimit: 500_000,
+		Value:                big.NewInt(0),
+		Description:          "reveal transaction",
 	}
 	err = c.sendAndWait(ctx, request, 50)
 	if err != nil {

diff --git a/pkg/transaction/transaction.go b/pkg/transaction/transaction.go
@@ -44,13 +44,14 @@ const DefaultTipBoostPercent = 20
 
 // TxRequest describes a request for a transaction that can be executed.
 type TxRequest struct {
-	To          *common.Address // recipient of the transaction
-	Data        []byte          // transaction data
-	GasPrice    *big.Int        // gas price or nil if suggested gas price should be used
-	GasLimit    uint64          // gas limit or 0 if it should be estimated
-	GasFeeCap   *big.Int        // adds a cap to maximum fee user is willing to pay
-	Value       *big.Int        // amount of wei to send
-	Description string          // optional description
+	To                   *common.Address // recipient of the transaction
+	Data                 []byte          // transaction data
+	GasPrice             *big.Int        // gas price or nil if suggested gas price should be used
+	GasLimit             uint64          // gas limit or 0 if it should be estimated
+	MinEstimatedGasLimit uint64          // minimum gas limit to use if the gas limit was estimated; it will not apply when this value is 0 or when GasLimit is not 0
+	GasFeeCap            *big.Int        // adds a cap to maximum fee user is willing to pay
+	Value                *big.Int        // amount of wei to send
+	Description          string          // optional description
 }
 
 type StoredTransaction struct {
@@ -271,7 +272,9 @@ func (t *transactionService) prepareTransaction(ctx context.Context, request *Tx
 		}
 
 		gasLimit += gasLimit / 4 // add 25% on top
-
+		if gasLimit < request.MinEstimatedGasLimit {
+			gasLimit = request.MinEstimatedGasLimit
+		}
 	} else {
 		gasLimit = request.GasLimit
 	}