Merge branch 'main' into retry-flags

taikoxyz · Jun 13, 2023 · 74bd338 · 74bd338
2 parents c11c79a + feaa2b6
commit 74bd338
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/rpc/utils.go b/pkg/rpc/utils.go
@@ -53,9 +53,9 @@ func WaitReceipt(ctx context.Context, client *ethclient.Client, tx *types.Transa
 	for {
 		select {
 		case <-ctxWithTimeout.Done():
-			return nil, ctx.Err()
+			return nil, ctxWithTimeout.Err()
 		case <-ticker.C:
-			receipt, err := client.TransactionReceipt(ctx, tx.Hash())
+			receipt, err := client.TransactionReceipt(ctxWithTimeout, tx.Hash())
 			if err != nil {
 				continue
 			}