update

Author: pkieltyka

ethreceipts/ethreceipts.go

@@ -426,6 +426,11 @@ func (l *ReceiptsListener) FetchTransactionReceiptWithFilter(ctx context.Context
 					default:
 					}
 				}
+
+				if !filterer.Options().Finalize {
+					// If not finalizing, we can exit after first mined receipt
+					return
+				}
 			}
 		}
 	}()

ethreceipts/ethreceipts_test.go

@@ -199,22 +199,26 @@ func TestFetchTransactionReceiptBasic(t *testing.T) {
 		go func(i int, txnHash common.Hash) {
 			defer wg.Done()
 
-			receipt, waitFinality, err := receiptsListener.FetchTransactionReceiptWithFinality(ctx, txnHash, 7)
+			receipt, err := receiptsListener.FetchTransactionReceipt(ctx, txnHash, 7)
 			require.NoError(t, err)
 			require.NotNil(t, receipt)
 			require.True(t, receipt.Status() == types.ReceiptStatusSuccessful)
 			require.False(t, receipt.Final)
-
 			t.Logf("=> MINED %d :: %s", i, receipt.TransactionHash().String())
 
-			_ = waitFinality
-			finalReceipt, err := waitFinality(context.Background())
-			require.NoError(t, err)
-			require.NotNil(t, finalReceipt)
-			require.True(t, finalReceipt.Status() == types.ReceiptStatusSuccessful)
-			require.True(t, finalReceipt.Final)
-
-			t.Logf("=> FINAL %d :: %s", i, receipt.TransactionHash().String())
+			// receipt, waitFinality, err := receiptsListener.FetchTransactionReceiptWithFinality(ctx, txnHash, 7)
+			// require.NoError(t, err)
+			// require.NotNil(t, receipt)
+			// require.True(t, receipt.Status() == types.ReceiptStatusSuccessful)
+			// require.False(t, receipt.Final)
+			// t.Logf("=> MINED %d :: %s", i, receipt.TransactionHash().String())
+			//
+			// finalReceipt, err := waitFinality(context.Background())
+			// require.NoError(t, err)
+			// require.NotNil(t, finalReceipt)
+			// require.True(t, finalReceipt.Status() == types.ReceiptStatusSuccessful)
+			// require.True(t, finalReceipt.Final)
+			// t.Logf("=> FINAL %d :: %s", i, receipt.TransactionHash().String())
 		}(i, txnHash)
 	}
 	wg.Wait()
@@ -574,7 +578,7 @@ func TestReceiptsListenerERC20(t *testing.T) {
 		ethreceipts.FilterLogTopic(erc20TransferTopic).Finalize(true).ID(9999).MaxWait(3),
 
 		// won't be found..
-		ethreceipts.FilterFrom(ethkit.Address{}).MaxWait(0).ID(8888),
+		ethreceipts.FilterFrom(ethkit.Address{1, 2, 3, 4}).MaxWait(0).ID(8888),
 
 		// ethreceipts.FilterLogs(func(logs []*types.Log) bool {
 		// 	for _, log := range logs {
@@ -674,6 +678,8 @@ loop:
 		assert.True(t, found, "looking for matched receipt %s", mr.TransactionHash().String())
 	}
 
+	t.Logf("matchedCount: %d", matchedCount)
+	t.Logf("erc20Receipts: %d", len(erc20Receipts))
 	require.Equal(t, matchedCount, len(erc20Receipts)*2)
 }
 

ethreceipts/finalizer.go

@@ -50,7 +50,7 @@ func (f *finalizer) enqueue(filterID uint64, receipt Receipt, blockNum *big.Int)
 	txnID := txnHash
 	if filterID > 0 {
 		for i := 0; i < 8; i++ {
-			txnID[i] = txnID[i] + byte(filterID>>i)
+			txnID[i] = txnID[i] + byte(filterID>>uint(i))
 		}
 	}