Skip to content

Commit 91cf73e

Browse files
committed
fix: remove OR from mempool queries
1 parent 94ffb09 commit 91cf73e

1 file changed

Lines changed: 20 additions & 10 deletions

File tree

src/datastore/pg-write-store.ts

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ import {
5555
DbTxRaw,
5656
DbMempoolTxRaw,
5757
DbChainTip,
58-
RawEventRequestInsertValues,
59-
IndexesState,
6058
NftCustodyInsertValues,
6159
DataStoreBnsBlockTxData,
6260
DbPoxSyntheticEvent,
@@ -3004,14 +3002,20 @@ export class PgWriteStore extends PgStore {
30043002
affected_sponsored AS (
30053003
SELECT m.tx_id
30063004
FROM mempool_txs m
3007-
INNER JOIN sponsored_inputs i ON m.nonce = i.nonce::int
3008-
AND (m.sponsor_address = i.sponsor_address OR m.sender_address = i.sponsor_address)
3005+
INNER JOIN sponsored_inputs i ON m.sponsor_address = i.sponsor_address AND m.nonce = i.nonce::int
3006+
UNION
3007+
SELECT m.tx_id
3008+
FROM mempool_txs m
3009+
INNER JOIN sponsored_inputs i ON m.sender_address = i.sponsor_address AND m.nonce = i.nonce::int
30093010
),
30103011
affected_non_sponsored AS (
30113012
SELECT m.tx_id
30123013
FROM mempool_txs m
3013-
INNER JOIN non_sponsored_inputs i ON m.nonce = i.nonce::int
3014-
AND (m.sponsor_address = i.sender_address OR m.sender_address = i.sender_address)
3014+
INNER JOIN non_sponsored_inputs i ON m.sponsor_address = i.sender_address AND m.nonce = i.nonce::int
3015+
UNION
3016+
SELECT m.tx_id
3017+
FROM mempool_txs m
3018+
INNER JOIN non_sponsored_inputs i ON m.sender_address = i.sender_address AND m.nonce = i.nonce::int
30153019
),
30163020
affected_mempool_tx_ids AS (
30173021
SELECT tx_id FROM affected_sponsored
@@ -3099,14 +3103,20 @@ export class PgWriteStore extends PgStore {
30993103
affected_sponsored AS (
31003104
SELECT m.tx_id
31013105
FROM mempool_txs m
3102-
INNER JOIN sponsored_inputs i ON m.nonce = i.nonce::int
3103-
AND (m.sponsor_address = i.sponsor_address OR m.sender_address = i.sponsor_address)
3106+
INNER JOIN sponsored_inputs i ON m.sponsor_address = i.sponsor_address AND m.nonce = i.nonce::int
3107+
UNION
3108+
SELECT m.tx_id
3109+
FROM mempool_txs m
3110+
INNER JOIN sponsored_inputs i ON m.sender_address = i.sponsor_address AND m.nonce = i.nonce::int
31043111
),
31053112
affected_non_sponsored AS (
31063113
SELECT m.tx_id
31073114
FROM mempool_txs m
3108-
INNER JOIN non_sponsored_inputs i ON m.nonce = i.nonce::int
3109-
AND (m.sponsor_address = i.sender_address OR m.sender_address = i.sender_address)
3115+
INNER JOIN non_sponsored_inputs i ON m.sponsor_address = i.sender_address AND m.nonce = i.nonce::int
3116+
UNION
3117+
SELECT m.tx_id
3118+
FROM mempool_txs m
3119+
INNER JOIN non_sponsored_inputs i ON m.sender_address = i.sender_address AND m.nonce = i.nonce::int
31103120
),
31113121
affected_mempool_tx_ids AS (
31123122
SELECT tx_id FROM affected_sponsored

0 commit comments

Comments
 (0)