diff --git a/core/lib/dal/.sqlx/query-7e6e8cd0b5217616d847c0b7a62723b395d9b28ca025e6b0b1b7dc9ef93c6b81.json b/core/lib/dal/.sqlx/query-4570e9ffd0b2973d0bc2986c391d0a59076dda4aa572ade2492f37e537fdf6ed.json similarity index 82% rename from core/lib/dal/.sqlx/query-7e6e8cd0b5217616d847c0b7a62723b395d9b28ca025e6b0b1b7dc9ef93c6b81.json rename to core/lib/dal/.sqlx/query-4570e9ffd0b2973d0bc2986c391d0a59076dda4aa572ade2492f37e537fdf6ed.json index 6e284803521a..7297bcdcad23 100644 --- a/core/lib/dal/.sqlx/query-7e6e8cd0b5217616d847c0b7a62723b395d9b28ca025e6b0b1b7dc9ef93c6b81.json +++ b/core/lib/dal/.sqlx/query-4570e9ffd0b2973d0bc2986c391d0a59076dda4aa572ade2492f37e537fdf6ed.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n *\n FROM\n eth_txs\n WHERE\n from_addr IS NOT DISTINCT FROM $2 -- can't just use equality as NULL != NULL\n AND id > (\n SELECT\n COALESCE(MAX(eth_tx_id), 0)\n FROM\n eth_txs_history\n )\n ORDER BY\n id\n LIMIT\n $1\n ", + "query": "\n SELECT\n *\n FROM\n eth_txs\n WHERE\n from_addr IS NOT DISTINCT FROM $2 -- can't just use equality as NULL != NULL\n AND id > (\n SELECT\n COALESCE(MAX(eth_tx_id), 0)\n FROM\n eth_txs_history\n JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id\n WHERE\n eth_txs_history.sent_at_block IS NOT NULL\n AND eth_txs.from_addr IS NOT DISTINCT FROM $2\n )\n ORDER BY\n id\n LIMIT\n $1\n ", "describe": { "columns": [ { @@ -97,5 +97,5 @@ true ] }, - "hash": "7e6e8cd0b5217616d847c0b7a62723b395d9b28ca025e6b0b1b7dc9ef93c6b81" + "hash": "4570e9ffd0b2973d0bc2986c391d0a59076dda4aa572ade2492f37e537fdf6ed" } diff --git a/core/lib/dal/src/eth_sender_dal.rs b/core/lib/dal/src/eth_sender_dal.rs index e05839281e09..d45d8470b379 100644 --- a/core/lib/dal/src/eth_sender_dal.rs +++ b/core/lib/dal/src/eth_sender_dal.rs @@ -147,6 +147,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 + eth_txs_history.sent_at_block IS NOT NULL + AND eth_txs.from_addr IS NOT DISTINCT FROM $2 ) ORDER BY id