Resolved comments

Signed-off-by: Rayane Charif <rayane.charif@gonative.cc>

Author: Rcc999

bun.lock

@@ -16,7 +16,7 @@ import {
 	type FinalizeRedeemTx,
 } from "@gonative-cc/sui-indexer/rpc-interface";
 import { logError, logger } from "@gonative-cc/lib/logger";
-import { getMnemonic } from "@gonative-cc/lib/secrets";
+import { getSecret } from "@gonative-cc/lib/secrets";
 import { isValidSuiAddress } from "@mysten/sui/utils";
 import { OP_RETURN } from "./opcodes";
 import { BitcoinMerkleTree } from "./bitcoin-merkle-tree";
@@ -74,10 +74,7 @@ export async function indexerFromEnv(env: Env): Promise<Indexer> {
 		throw new Error("Invalid MAX_NBTC_MINT_TX_RETRIES in config. Must be a number >= 0.");
 	}
 
-	const mnemonic = await getMnemonic(env.NBTC_MINTING_SIGNER_MNEMONIC);
-	if (!mnemonic) {
-		throw new Error("Failed to retrieve mnemonic");
-	}
+	const mnemonic = await getSecret(env.NBTC_MINTING_SIGNER_MNEMONIC);
 	const suiClients = new Map<SuiNet, SuiClient>();
 	for (const p of packageConfigs) {
 		if (!suiClients.has(p.sui_network))

packages/btcindexer/src/btcindexer.ts

@@ -1,23 +1,15 @@
-import { logger } from "./logger";
-
 interface SecretStore {
 	get(): Promise<string>;
 }
 
 /**
- * Retrieves the mnemonic from the secrets store with proper error handling.
- * Returns the mnemonic string or null if not found/failed.
+ * Retrieves a secret from the secrets store.
+ * Throws if the secret is not found or retrieval fails.
  */
-export async function getMnemonic(secret: SecretStore): Promise<string | null> {
-	try {
-		const mnemonic = await secret.get();
-		if (!mnemonic) {
-			logger.error({ msg: "Missing NBTC_MINTING_SIGNER_MNEMONIC" });
-			return null;
-		}
-		return mnemonic;
-	} catch (error) {
-		logger.error({ msg: "Failed to retrieve NBTC_MINTING_SIGNER_MNEMONIC", error });
-		return null;
+export async function getSecret(secret: SecretStore): Promise<string> {
+	const value = await secret.get();
+	if (!value) {
+		throw new Error("Secret not found in store");
 	}
+	return value;
 }

packages/lib/src/secrets.ts

@@ -124,10 +124,17 @@ export class IkaEventHandler {
 
 	private async handleCompletedSign(e: SuiEventNode) {
 		const data = e.json as CompletedSignEventRaw;
-		const signId = data.sign_id as string;
+		if (typeof data.sign_id !== "string") {
+			logger.error({
+				msg: "Unexpected sign_id type in CompletedSignEvent",
+				type: typeof data.sign_id,
+			});
+			return;
+		}
+		const signId = data.sign_id;
 
 		// IKA coordinator is shared across protocols, so we only process sign IDs that match our redeems.
-		// The final signature is recorded via SignatureRecordedEvent from nbtc.move (handled above).
+		// The final signature is recorded via SignatureRecordedEvent from nbtc.move (handled in NbtcEventHandler).
 		const redeemInfo = await this.storage.getRedeemInfoBySignId(signId);
 		if (!redeemInfo) {
 			return;
@@ -137,7 +144,6 @@ export class IkaEventHandler {
 			msg: "Ika signature completed",
 			sign_id: signId,
 			is_future_sign: data.is_future_sign,
-			signature_length: data.signature.length,
 			txDigest: e.txDigest,
 		});
 
@@ -169,7 +175,14 @@ export class IkaEventHandler {
 
 	private async handleRejectedSign(e: SuiEventNode) {
 		const data = e.json as RejectedSignEventRaw;
-		const signId = data.sign_id as string;
+		if (typeof data.sign_id !== "string") {
+			logger.error({
+				msg: "Unexpected sign_id type in RejectedSignEvent",
+				type: typeof data.sign_id,
+			});
+			return;
+		}
+		const signId = data.sign_id;
 		const redeemInfo = await this.storage.getRedeemInfoBySignId(signId);
 		if (!redeemInfo) {
 			return;

packages/sui-indexer/src/handler.ts

@@ -4,7 +4,7 @@ import type { NetworkConfig } from "./models";
 import { Processor } from "./processor";
 import { D1Storage } from "./storage";
 import { logError, logger } from "@gonative-cc/lib/logger";
-import { getMnemonic } from "@gonative-cc/lib/secrets";
+import { getSecret } from "@gonative-cc/lib/secrets";
 import { RedeemService } from "./redeem-service";
 import { createSuiClients, type SuiClient } from "./redeem-sui-client";
 import type { Service } from "@cloudflare/workers-types";
@@ -27,8 +27,7 @@ export default {
 		const storage = new D1Storage(env.DB);
 		const activeNetworks = await storage.getActiveNetworks();
 
-		const mnemonic = await getMnemonic(env.NBTC_MINTING_SIGNER_MNEMONIC);
-		if (!mnemonic) return;
+		const mnemonic = await getSecret(env.NBTC_MINTING_SIGNER_MNEMONIC);
 		const suiClients = await createSuiClients(activeNetworks, mnemonic);
 
 		// Run both indexer and redeem solver tasks in parallel
@@ -88,8 +87,12 @@ async function poolAndProcessEvents(
 	storage: D1Storage,
 	suiClients: Map<SuiNet, SuiClient>,
 ) {
-	const client = new SuiGraphQLClient(netCfg.url);
 	const suiClient = suiClients.get(netCfg.name);
+	if (!suiClient) {
+		logger.warn({ msg: "No SuiClient for network, skipping", network: netCfg.name });
+		return;
+	}
+	const client = new SuiGraphQLClient(netCfg.url);
 	const p = new Processor(netCfg, storage, client, suiClient);
 
 	const nbtcPkgs = await storage.getActiveNbtcPkgs(netCfg.name);

packages/sui-indexer/src/index.ts

@@ -9,13 +9,13 @@ export class Processor {
 	netCfg: NetworkConfig;
 	storage: D1Storage;
 	eventFetcher: EventFetcher;
-	suiClient?: SuiClient;
+	suiClient: SuiClient;
 
 	constructor(
 		netCfg: NetworkConfig,
 		storage: D1Storage,
 		eventFetcher: EventFetcher,
-		suiClient?: SuiClient,
+		suiClient: SuiClient,
 	) {
 		this.netCfg = netCfg;
 		this.storage = storage;
@@ -120,16 +120,9 @@ export class Processor {
 						endCursor: result.endCursor,
 					});
 
-					if (result.events.length > 0 && this.suiClient) {
+					if (result.events.length > 0) {
 						const handler = new IkaEventHandler(this.storage, this.suiClient);
 						await handler.handleEvents(result.events);
-					} else if (result.events.length > 0 && !this.suiClient) {
-						logger.warn({
-							msg: "Skipping IKA events: suiClient not initialized",
-							network: this.netCfg.name,
-							coordinatorPkgId: pkgId,
-							eventsLength: result.events.length,
-						});
 					}
 
 					if (result.endCursor && result.endCursor !== cursors[pkgId]) {

packages/sui-indexer/src/processor.ts

@@ -1,5 +1,6 @@
 import { WorkerEntrypoint } from "cloudflare:workers";
 import { logError, logger } from "@gonative-cc/lib/logger";
+import { getSecret } from "@gonative-cc/lib/secrets";
 import { fromBase64 } from "@mysten/sui/utils";
 
 import { D1Storage } from "./storage";
@@ -29,10 +30,7 @@ export class RPC extends WorkerEntrypoint<Env> implements SuiIndexerRpc {
 		if (requests.length === 0) return;
 
 		const storage = new D1Storage(this.env.DB);
-		const mnemonic = await this.env.NBTC_MINTING_SIGNER_MNEMONIC.get();
-		if (!mnemonic) {
-			throw new Error("NBTC_MINTING_SIGNER_MNEMONIC not set");
-		}
+		const mnemonic = await getSecret(this.env.NBTC_MINTING_SIGNER_MNEMONIC);
 
 		const { redeemsById, networks } = await this.fetchRedeemDetails(storage, requests);
 		if (networks.size === 0) return;