Timeout for waitForTransaction (#1545)

Author: yrong

relayer/chain/ethereum/connection.go

@@ -162,10 +162,10 @@ func (co *Connection) waitForTransaction(ctx context.Context, tx *types.Transact
 		case <-ctx.Done():
 			return nil, ctx.Err()
 		case <-time.After(6 * time.Second):
-			if co.config.CallTimeoutSecs > 0 {
+			if co.config.PendingTxTimeoutSecs > 0 {
 				cnt++
 				log.Info(fmt.Sprintf("waiting for receipt: %d seconds elapsed", cnt*6))
-				if cnt*6 > co.config.CallTimeoutSecs {
+				if cnt*6 > co.config.PendingTxTimeoutSecs {
 					return nil, fmt.Errorf("wait receipt timeout")
 				}
 			}

relayer/config/config.go

@@ -13,12 +13,12 @@ type ParachainConfig struct {
 }
 
 type EthereumConfig struct {
-	Endpoint        string `mapstructure:"endpoint"`
-	GasFeeCap       uint64 `mapstructure:"gas-fee-cap"`
-	GasTipCap       uint64 `mapstructure:"gas-tip-cap"`
-	GasLimit        uint64 `mapstructure:"gas-limit"`
-	HeartbeatSecs   uint64 `mapstructure:"heartbeat-secs"`
-	CallTimeoutSecs uint64 `mapstructure:"call-timeout-secs"`
+	Endpoint             string `mapstructure:"endpoint"`
+	GasFeeCap            uint64 `mapstructure:"gas-fee-cap"`
+	GasTipCap            uint64 `mapstructure:"gas-tip-cap"`
+	GasLimit             uint64 `mapstructure:"gas-limit"`
+	HeartbeatSecs        uint64 `mapstructure:"heartbeat-secs"`
+	PendingTxTimeoutSecs uint64 `mapstructure:"pending-tx-timeout-secs"`
 }
 
 type OFACConfig struct {

relayer/relays/parachain/ethereum-writer.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"math/big"
 	"strings"
-	"time"
 
 	"golang.org/x/sync/errgroup"
 
@@ -151,13 +150,6 @@ func (wr *EthereumWriter) WriteChannel(
 	}
 	options.Nonce = big.NewInt(0).SetUint64(nonce)
 
-	// Add a timeout when calling submit
-	if wr.config.Ethereum.CallTimeoutSecs > 0 {
-		ctx, cancel := context.WithTimeout(ctx, time.Second*time.Duration(wr.config.Ethereum.CallTimeoutSecs))
-		options.Context = ctx
-		defer cancel()
-	}
-
 	tx, err := wr.gateway.SubmitV1(
 		options, message, commitmentProof.Proof.InnerHashes, verificationProof,
 	)