fix(eth-sender): fix query returning inflight txs (matter-labs#2404)

This fixes issue that we may return not-yet-sent transactions as in-flight (it's been broken since we added support for blobs :/ ) because max(eth_txs_id) counts transactions from all operators not just one Signed-off-by: tomg10 <[email protected]>
vianetwork · Jul 8, 2024 · 6a89ca0 · 6a89ca0
1 parent 312defe
commit 6a89ca0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...b36b935046a9132f045ab105eaeac30c4a4d.json → ...25208b0ecfe8065c8f893ff38c49072a21fc.json b/...b36b935046a9132f045ab105eaeac30c4a4d.json → ...25208b0ecfe8065c8f893ff38c49072a21fc.json
diff --git a/core/lib/dal/src/eth_sender_dal.rs b/core/lib/dal/src/eth_sender_dal.rs
@@ -41,8 +41,10 @@ impl EthSenderDal<'_, '_> {
                         COALESCE(MAX(eth_tx_id), 0)
                     FROM
                         eth_txs_history
+                        JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id
                     WHERE
-                        sent_at_block IS NOT NULL
+                        eth_txs_history.sent_at_block IS NOT NULL
+                        AND eth_txs.from_addr IS NOT DISTINCT FROM $1
                 )
             ORDER BY
                 id