From d6bb3c8ab0ef93c3fc1ffa883ec03d57c5048a94 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Fri, 6 Sep 2024 13:38:29 +0200 Subject: [PATCH] disable gas bumps in default client (#1125) --- seth/client.go | 1 + seth/client_builder.go | 2 +- seth/retry.go | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/seth/client.go b/seth/client.go index f5f86107d..69f95d8b1 100644 --- a/seth/client.go +++ b/seth/client.go @@ -497,6 +497,7 @@ func (m *Client) WaitMined(ctx context.Context, l zerolog.Logger, b bind.DeployB return receipt, nil } else if errors.Is(err, ethereum.NotFound) { l.Debug(). + Str("Timeout", m.Cfg.Network.TxnTimeout.String()). Str("TX", tx.Hash().String()). Msg("Awaiting transaction") } else { diff --git a/seth/client_builder.go b/seth/client_builder.go index 5967a30dd..20449bbf2 100644 --- a/seth/client_builder.go +++ b/seth/client_builder.go @@ -38,7 +38,7 @@ func NewClientBuilder() *ClientBuilder { BlockStatsConfig: &BlockStatsConfig{RPCRateLimit: 10}, NonceManager: &NonceManagerCfg{KeySyncRateLimitSec: 10, KeySyncRetries: 3, KeySyncTimeout: MustMakeDuration(60 * time.Second), KeySyncRetryDelay: MustMakeDuration(5 * time.Second)}, GasBump: &GasBumpConfig{ - Retries: 10, + Retries: 0, // bumping disabled by default }, }, } diff --git a/seth/retry.go b/seth/retry.go index 8830c18aa..4cd57115f 100644 --- a/seth/retry.go +++ b/seth/retry.go @@ -109,11 +109,11 @@ var prepareReplacementTransaction = func(client *Client, tx *types.Transaction) ctxPending, cancelPending := context.WithTimeout(context.Background(), client.Cfg.Network.TxnTimeout.Duration()) _, isPending, err := client.Client.TransactionByHash(ctxPending, tx.Hash()) defer cancelPending() - if err != nil { + if err != nil && !strings.Contains(err.Error(), "not found") { return nil, err } - if !isPending { + if err != nil && !isPending { L.Debug().Str("Tx hash", tx.Hash().Hex()).Msg("Transaction was confirmed before bumping gas") return nil, errors.New("transaction was confirmed before bumping gas") }