feat: support transaction speed up

evm/evm_client.go

@@ -3,11 +3,10 @@ package evm
 import (
 	"context"
 	"errors"
-	"math/big"
-	"time"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"math/big"
+	"time"
 
 	gethcommon "github.com/ethereum/go-ethereum/common"
 	coregethtypes "github.com/ethereum/go-ethereum/core/types"
@@ -241,7 +240,6 @@ func (ec *Client) WaitForTransaction(
 		ec.logger.Info("transaction confirmed", "hash", tx.Hash().String(), "block", receipt.BlockNumber.Uint64())
 		return receipt, nil
 	}
-	ec.logger.Error("transaction failed", "hash", tx.Hash().String())
 
 	return receipt, err
 }

relayer/errors.go

@@ -9,4 +9,5 @@ var (
 	ErrAttestationNotDataCommitmentRequest = errors.New("attestation is not a data commitment request")
 	ErrAttestationNotFound                 = errors.New("attestation not found")
 	ErrValidatorSetMismatch                = errors.New("p2p validator set is different from the trusted contract one")
+	ErrTransactionStillPending             = errors.New("evm transaction still pending")
 )

relayer/relayer.go

@@ -4,7 +4,9 @@ import (
 	"bytes"
 	"context"
 	"encoding/hex"
+	stderrors "errors"
 	"fmt"
+	"github.com/ethereum/go-ethereum/ethclient"
 	"math/big"
 	"strconv"
 	"time"
@@ -113,8 +115,7 @@ func (r *Relayer) Start(ctx context.Context) error {
 					return err
 				}
 
-				// wait for transaction to be mined
-				_, err = r.EVMClient.WaitForTransaction(ctx, ethClient, tx, r.RetryTimeout)
+				err = r.waitForTransactionAndRetryIfNeeded(ctx, ethClient, tx)
 				if err != nil {
 					return err
 				}
@@ -373,6 +374,53 @@ func (r *Relayer) SaveDataCommitmentSignaturesToStore(ctx context.Context, att c
 	return batch.Commit(ctx)
 }
 
+// waitForTransactionAndRetryIfNeeded waits for transaction to be mined. If it's not mined in the provided timeout, it will
+// attempt to speed it up via updating the gas price.
+func (r *Relayer) waitForTransactionAndRetryIfNeeded(ctx context.Context, ethClient *ethclient.Client, tx *coregethtypes.Transaction) error {
+	for i := 0; i < 10; i++ {
+		_, err := r.EVMClient.WaitForTransaction(ctx, ethClient, tx, r.RetryTimeout)
+		if err != nil {
+			if stderrors.Is(err, context.DeadlineExceeded) {
+				r.logger.Debug("transaction still not included. updating the gas price", "retry_number", i, "err", err.Error())
+				newGasPrice, err := ethClient.SuggestGasPrice(ctx)
+				if err != nil {
+					return err
+				}
+				newTx := toLegacyTransaction(tx)
+				newTx.GasPrice = newGasPrice.Mul(newGasPrice, big.NewInt(2))
+				newTx2 := coregethtypes.NewTx(newTx)
+				err = ethClient.SendTransaction(ctx, newTx2)
+				if err != nil {
+					_, err := ethClient.TransactionReceipt(ctx, tx.Hash())
+					if err == nil {
+						return nil
+					}
+				}
+			} else {
+				return err
+			}
+		} else {
+			return nil
+		}
+	}
+	return ErrTransactionStillPending
+}
+
+func toLegacyTransaction(tx *coregethtypes.Transaction) *coregethtypes.LegacyTx {
+	v, r, s := tx.RawSignatureValues()
+	return &coregethtypes.LegacyTx{
+		Nonce:    tx.Nonce(),
+		GasPrice: tx.GasPrice(),
+		Gas:      tx.Gas(),
+		To:       tx.To(),
+		Value:    tx.Value(),
+		Data:     tx.Data(),
+		V:        v,
+		R:        r,
+		S:        s,
+	}
+}
+
 // matchAttestationConfirmSigs matches and sorts the confirm signatures with the valset
 // members as expected by the Blobstream contract.
 // Also, it leaves the non provided signatures as nil in the `sigs` slice: