fix: address review comments

Author: MarcosNicolau

core/chainio/avs_writer.go

@@ -81,7 +81,10 @@ func NewAvsWriterFromConfig(baseConfig *config.BaseConfig, ecdsaConfig *config.E
 // Sends AggregatedResponse and waits for the receipt for three blocks, if not received
 // it will try again bumping the last tx gas price based on `CalculateGasPriceBump`
 // This process happens indefinitely until the transaction is included.
-// Note: If the rpc endpoints fail, the retry will stop, as it will infinitely try
+//
+// Note: If the rpc endpoints fail, the retry will stop it returning a permanent error.
+// This is because the retries are infinite and we want to prevent increasing the time between them too much as it is exponential.
+// And we might also if the rpc is down for a good period of time, we might fall into an infinite waiting.
 func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMerkleRoot [32]byte, senderAddress [20]byte, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature, onRetry func()) (*types.Receipt, error) {
 	txOpts := *w.Signer.GetTxOpts()
 	txOpts.NoSend = true // simulate the transaction
@@ -125,7 +128,6 @@ func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMe
 
 		w.logger.Infof("Sending ResponseToTask transaction with a gas price of %v", txOpts.GasPrice)
 		err = w.checkRespondToTaskFeeLimit(tx, txOpts, batchIdentifierHash, senderAddress)
-
 		if err != nil {
 			return nil, connection.PermanentError{Inner: err}
 		}

core/utils/eth_client_utils.go

@@ -25,9 +25,8 @@ func WaitForTransactionReceipt(client eth.InstrumentedClient, ctx context.Contex
 		// if context has timed out, return
 		if ctx.Err() != nil {
 			return nil, ctx.Err()
-		} else {
-			time.Sleep(sleepTime)
 		}
+		time.Sleep(sleepTime)
 	}
 	return nil, fmt.Errorf("transaction receipt not found for txHash: %s", txHash.String())
 }
@@ -48,13 +47,21 @@ func BytesToQuorumThresholdPercentages(quorumThresholdPercentagesBytes []byte) e
 	return quorumThresholdPercentages
 }
 
-// Very basic algorithm to calculate the gasPrice bump based on the currentGasPrice a constant percentage and the retry number.
-// It adds a the percentage to the current gas price and a 5% * i, where i is the iteration number. That is:
-func CalculateGasPriceBumpBasedOnRetry(currentGasPrice *big.Int, percentage int, i int) *big.Int {
-	retryPercentage := new(big.Int).Mul(big.NewInt(5), big.NewInt(int64(i)))
-	percentageBump := new(big.Int).Add(big.NewInt(int64(percentage)), retryPercentage)
-	bumpAmount := new(big.Int).Mul(currentGasPrice, percentageBump)
+// Simple algorithm to calculate the gasPrice bump based on:
+// the currentGasPrice, a base bump percentage, and the retry count.
+// Formula: currentGasPrice + (currentGasPrice * (baseBumpPercentage + retryCount * incrementalRetryPercentage) / 100)
+func CalculateGasPriceBumpBasedOnRetry(currentGasPrice *big.Int, baseBumpPercentage int, retryCount int) *big.Int {
+	// Incremental percentage increase for each retry attempt (5%)
+	incrementalRetryPercentage := new(big.Int).Mul(big.NewInt(5), big.NewInt(int64(retryCount)))
+
+	// Total bump percentage: base bump + incremental percentage based on retry count
+	totalBumpPercentage := new(big.Int).Add(big.NewInt(int64(baseBumpPercentage)), incrementalRetryPercentage)
+
+	// Calculate the bump amount: currentGasPrice * totalBumpPercentage / 100
+	bumpAmount := new(big.Int).Mul(currentGasPrice, totalBumpPercentage)
 	bumpAmount = new(big.Int).Div(bumpAmount, big.NewInt(100))
+
+	// Final bumped gas price: currentGasPrice + bumpAmount
 	bumpedGasPrice := new(big.Int).Add(currentGasPrice, bumpAmount)
 
 	return bumpedGasPrice