fix loading tx receipts per block

pk910 · pk910 · commit 39ccb4eae4e3 · 2024-11-21T15:56:27.000+01:00
diff --git a/pkg/coordinator/wallet/manager.go b/pkg/coordinator/wallet/manager.go
@@ -94,11 +94,9 @@ func (manager *Manager) processBlockTransactions(block *execution.Block) {
 	manager.walletsMutex.Lock()
 
 	wallets := map[common.Address]*Wallet{}
-	pendingTxCount := uint64(0)
 
 	for addr := range manager.walletsMap {
 		wallets[addr] = manager.walletsMap[addr]
-		pendingTxCount += wallets[addr].pendingNonce - wallets[addr].confirmedNonce
 	}
 
 	manager.walletsMutex.Unlock()
@@ -107,20 +105,11 @@ func (manager *Manager) processBlockTransactions(block *execution.Block) {
 
 	var blockReceipts []*ethtypes.Receipt
 
-	if pendingTxCount > 10 {
-		// load all receipts for block to avoid receipt polling for each pending transaction
-		blockReceipts = manager.loadBlockReceipts(block)
-	}
+	receiptsLoaded := false
 
 	signer := ethtypes.LatestSignerForChainID(manager.clientPool.GetBlockCache().GetChainID())
 
 	for idx, tx := range blockData.Transactions() {
-		var txReceipt *ethtypes.Receipt
-
-		if blockReceipts != nil && idx < len(blockReceipts) {
-			txReceipt = blockReceipts[idx]
-		}
-
 		txFrom, err := ethtypes.Sender(signer, tx)
 		if err != nil {
 			manager.logger.Warnf("error decoding tx sender (block %v, tx %v): %v", block.Number, idx, err)
@@ -129,6 +118,17 @@ func (manager *Manager) processBlockTransactions(block *execution.Block) {
 
 		fromWallet := wallets[txFrom]
 		if fromWallet != nil {
+			if !receiptsLoaded {
+				blockReceipts = manager.loadBlockReceipts(block)
+				receiptsLoaded = true
+			}
+
+			var txReceipt *ethtypes.Receipt
+
+			if blockReceipts != nil && idx < len(blockReceipts) {
+				txReceipt = blockReceipts[idx]
+			}
+
 			fromWallet.processTransactionInclusion(block, tx, txReceipt)
 		}
 
diff --git a/pkg/coordinator/wallet/wallet.go b/pkg/coordinator/wallet/wallet.go
@@ -454,10 +454,6 @@ func (wallet *Wallet) processTransactionInclusion(block *execution.Block, tx *ty
 		return
 	}
 
-	if receipt == nil {
-		receipt = wallet.loadTransactionReceipt(context.Background(), block, tx)
-	}
-
 	nonce := tx.Nonce()
 
 	wallet.txNonceMutex.Lock()

Original file line number	Diff line number	Diff line change
`@@ -454,10 +454,6 @@ func (wallet Wallet) processTransactionInclusion(block execution.Block, tx *ty`
`454`	`454`	`return`
`455`	`455`	`}`
`456`	`456`
`457`		`- if receipt == nil {`
`458`		`- receipt = wallet.loadTransactionReceipt(context.Background(), block, tx)`
`459`		`- }`
`460`		`-`
`461`	`457`	`nonce := tx.Nonce()`
`462`	`458`
`463`	`459`	`wallet.txNonceMutex.Lock()`