Merge branch 'main' into tt_1619_more_robust_builder

seth/client.go

@@ -500,6 +500,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 {

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
 			},
 		},
 	}

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")
 	}