Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions packages/btcindexer/src/btcindexer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,24 @@ describe("Indexer.findNbtcDeposits", () => {
expect(deposits[1]![0]!.suiRecipient).toEqual(REGTEST_DATA[327]!.txs[2]!.suiAddr);
expect(deposits[1]![0]!.amount).toEqual(REGTEST_DATA[327]!.txs[2]!.amount);
});

it("should skip inactive deposit addresses", () => {
const block = Block.fromHex(REGTEST_DATA[329]!.rawBlockHex);
const targetTx = block.transactions?.find(
(tx) => tx.getId() === REGTEST_DATA[329]!.txs[1]!.id,
);
expect(targetTx).toBeDefined();

const originalMap = indexer.nbtcDepositAddrMap;
indexer.nbtcDepositAddrMap = new Map([
[REGTEST_DATA[329]!.depositAddr, { setup_id: 1, is_active: false }],
]);

const deposits = indexer.findNbtcDeposits(targetTx!, networks.regtest);
expect(deposits.length).toEqual(0);

indexer.nbtcDepositAddrMap = originalMap;
});
});

describe("Indexer.processBlock", () => {
Expand Down
14 changes: 11 additions & 3 deletions packages/btcindexer/src/btcindexer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,17 @@ export class Indexer {
}
try {
const btcAddress = address.fromOutputScript(vout.script, network);
const pkgId = this.nbtcDepositAddrMap.get(btcAddress)?.setup_id;
if (pkgId === undefined) continue;
const config = this.getPackageConfig(pkgId);
const depositInfo = this.nbtcDepositAddrMap.get(btcAddress);
if (!depositInfo) continue;
if (!depositInfo.is_active) {
logger.debug({
msg: "Skipping inactive deposit address",
txId: tx.getId(),
btcAddress,
});
continue;
}
const config = this.getPackageConfig(depositInfo.setup_id);

logger.debug({
msg: "Found matching nBTC deposit output",
Expand Down
3 changes: 0 additions & 3 deletions packages/btcindexer/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ export default {
count: batch.messages.length,
queue: batch.queue,
});
// TODO: Add support for active/inactive nBTC addresses.
// The current implementation fetches all addresses, but we need to distinguish it,
// probably a active (boolean) column in the table.
const indexer = await indexerFromEnv(env);
return processBlockBatch(batch, indexer);
},
Expand Down