PR comments

Signed-off-by: Ravindra Meena <rmeena840@gmail.com>

Author: rmeena840

packages/btcindexer/src/btc-address-utils.ts

@@ -1,13 +1,9 @@
 import { Transaction, payments, script } from "bitcoinjs-lib";
 import { logError } from "@gonative-cc/lib/logger";
-import type { D1Database } from "@cloudflare/workers-types";
 import { BtcNet } from "@gonative-cc/lib/nbtc";
-import { btcNetworkCfg } from "./models";
+import { btcNetworkCfg, type MintBatchArg } from "./models";
 
-export async function extractSenderAddress(
-	tx: Transaction,
-	btcNetwork: BtcNet,
-): Promise<string | null> {
+async function extractSenderAddress(tx: Transaction, btcNetwork: BtcNet): Promise<string | null> {
 	try {
 		if (tx.ins.length === 0) return null;
 
@@ -49,3 +45,19 @@ export async function extractSenderAddress(
 		return null;
 	}
 }
+
+export async function extractAllSenderAddress(
+	mintArgs: MintBatchArg[],
+	btcNet: BtcNet,
+): Promise<Map<number, string | null>> {
+	const senderAddressMap = new Map<number, string | null>();
+	await Promise.all(
+		mintArgs.map(async (args, i) => {
+			if (args) {
+				const senderAddress = await extractSenderAddress(args.tx, btcNet);
+				senderAddressMap.set(i, senderAddress);
+			}
+		}),
+	);
+	return senderAddressMap;
+}

packages/btcindexer/src/btcindexer.ts

@@ -41,7 +41,7 @@ import { ElectrsService, ELECTRS_URLS_BY_NETWORK } from "./electrs";
 import { fetchNbtcAddresses, fetchPackageConfigs, type Storage } from "./storage";
 import { CFStorage } from "./cf-storage";
 import type { PutNbtcTxResponse } from "./rpc-interface";
-import { extractSenderAddress } from "./btc-address-utils";
+import { extractAllSenderAddress } from "./btc-address-utils";
 import type { ComplianceRpc } from "@gonative-cc/lib/rpc-types";
 
 interface ConfirmingTxCandidate<T> {
@@ -709,16 +709,37 @@ export class Indexer {
 			const client = this.getSuiClient(config.sui_network);
 			const pkgKey = config.nbtc_pkg;
 
-			// Filter out sanctioned addresses before minting
+			// Extract all sender addresses at once
+			const senderAddressMap: Map<number, string | null> = await extractAllSenderAddress(
+				mintArgs,
+				config.btc_network,
+			);
+
+			// Check all addresses for blocking at once
+			const uniqueAddresses = [
+				...new Set(
+					Array.from(senderAddressMap.values()).filter((a): a is string => a !== null),
+				),
+			];
+			const blockedAddressSet = new Set<string>();
+			await Promise.all(
+				uniqueAddresses.map(async (addr) => {
+					if (await this.compliance.isBtcBlocked(addr)) {
+						blockedAddressSet.add(addr);
+					}
+				}),
+			);
+
+			// Filter out sanctioned addresses
 			const filteredMintArgs: MintBatchArg[] = [];
 			const filteredProcessedKeys: ProcessedKey[] = [];
 
 			for (let i = 0; i < mintArgs.length; i++) {
 				const args = mintArgs[i];
 				if (!args) continue;
 
-				const senderAddress = await extractSenderAddress(args.tx, config.btc_network);
-				if (senderAddress && (await this.compliance.isBtcBlocked(senderAddress))) {
+				const senderAddress = senderAddressMap.get(i);
+				if (senderAddress && blockedAddressSet.has(senderAddress)) {
 					logger.error({
 						msg: "Sanctioned address detected, skipping mint",
 						txId: args.tx.getId(),