disable gas bumps in default client (#1125)

smartcontractkit · Sep 6, 2024 · d6bb3c8 · d6bb3c8
1 parent adb32bf
commit d6bb3c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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")
  }