Merge branch 'master' into rayane/coin-race-condition-docs

Author: Rcc999

bun.lock

@@ -28,7 +28,7 @@
 		"typescript": "^5.9.3",
 		"typescript-eslint": "^8.49.0",
 		"wrangler": "^4.54.0",
-		"@gonative-cc/nbtc": "^0.1.0"
+		"@gonative-cc/nbtc": "^0.1.1"
 	},
 	"lint-staged": {
 		"*.{js,cjs,mjs,jsx,ts,tsx}": [

package.json

@@ -15,6 +15,7 @@
 	"dependencies": {
 		"@gonative-cc/btcindexer": "workspace:*",
 		"@gonative-cc/lib": "workspace:*",
+		"@gonative-cc/nbtc": "0.1.1",
 		"@ika.xyz/sdk": "^0.2.7",
 		"@mysten/bcs": "^1.9.2",
 		"@mysten/sui": "^1.45.2",

packages/sui-indexer/package.json

@@ -111,14 +111,14 @@ export class RedeemService {
 
 	private async processSolvedRedeem(req: RedeemRequestWithInputs) {
 		const client = this.getSuiClient(req.sui_network);
+		const inputsToVerify: RedeemInput[] = [];
 
 		for (const input of req.inputs) {
 			try {
 				if (!input.sign_id) {
 					await this.requestIkaSig(client, req, input);
 				} else if (input.sign_id && !input.verified) {
-					// TODO: this should be triggered when getting the event from ika
-					await this.recordIkaSig(client, req, input);
+					inputsToVerify.push(input);
 				}
 			} catch (e) {
 				logError(
@@ -133,6 +133,22 @@ export class RedeemService {
 				);
 			}
 		}
+
+		if (inputsToVerify.length > 0) {
+			try {
+				await this.recordIkaSignatures(client, req, inputsToVerify);
+			} catch (e) {
+				logError(
+					{
+						msg: "Failed to batch verify signatures",
+						method: "processSolvedRedeem",
+						redeemId: req.redeem_id,
+						count: inputsToVerify.length,
+					},
+					e,
+				);
+			}
+		}
 	}
 	// TODO: handle front runs
 	private async requestIkaSig(
@@ -260,36 +276,40 @@ export class RedeemService {
 		}
 	}
 
-	private async recordIkaSig(
+	private async recordIkaSignatures(
 		client: SuiClient,
 		req: RedeemRequestWithInputs,
-		input: RedeemInput,
+		inputs: RedeemInput[],
 	) {
+		const inputsWithSignId = inputs.filter(
+			(input): input is RedeemInput & { sign_id: string } => input.sign_id !== null,
+		);
+
+		if (inputsWithSignId.length === 0) {
+			return;
+		}
+
 		logger.info({
-			msg: "Verifying signature for input",
+			msg: "Batch verifying signatures",
 			redeemId: req.redeem_id,
-			utxoId: input.utxo_id,
-			inputIdx: input.input_index,
-			signId: input.sign_id,
+			count: inputsWithSignId.length,
 		});
 
-		if (!input.sign_id) {
-			throw new Error("Input signature ID is missing");
-		}
-
-		await client.validateSignature(
+		await client.validateSignatures(
 			req.redeem_id,
-			input.input_index,
-			input.sign_id,
+			inputsWithSignId,
 			req.nbtc_pkg,
 			req.nbtc_contract,
 		);
 
-		await this.storage.markRedeemInputVerified(req.redeem_id, input.utxo_id);
+		for (const input of inputsWithSignId) {
+			await this.storage.markRedeemInputVerified(req.redeem_id, input.utxo_id);
+		}
+
 		logger.info({
-			msg: "Signature verified",
+			msg: "Signatures verified",
 			redeemId: req.redeem_id,
-			utxoId: input.utxo_id,
+			count: inputsWithSignId.length,
 		});
 	}
 

packages/sui-indexer/src/redeem-service.ts

@@ -31,10 +31,9 @@ export interface SuiClient {
 		nbtcPkg: string,
 		nbtcContract: string,
 	): Promise<string>;
-	validateSignature(
+	validateSignatures(
 		redeemId: number,
-		inputIdx: number,
-		signId: string,
+		inputs: { input_index: number; sign_id: string }[],
 		nbtcPkg: string,
 		nbtcContract: string,
 	): Promise<void>;
@@ -262,13 +261,13 @@ class SuiClientImp implements SuiClient {
 		return decoded.sign_id;
 	}
 
-	async validateSignature(
+	async validateSignatures(
 		redeemId: number,
-		inputIdx: number,
-		signId: string,
+		inputs: { input_index: number; sign_id: string }[],
 		nbtcPkg: string,
 		nbtcContract: string,
 	): Promise<void> {
+		if (inputs.length === 0) return;
 		const tx = new Transaction();
 		const coordinatorId = this.#ika.getCoordinatorId();
 
@@ -279,8 +278,8 @@ class SuiClientImp implements SuiClient {
 					contract: nbtcContract,
 					dwalletCoordinator: coordinatorId,
 					redeemId: redeemId,
-					inputIds: inputIdx,
-					signIds: [signId],
+					inputIds: inputs.map((i) => BigInt(i.input_index)),
+					signIds: inputs.map((i) => i.sign_id),
 				},
 			}),
 		);