signet.js 0.2.0 → 0.3.0

package/dist/index.cjs

@@ -2695,24 +2695,33 @@ const EMIT_CPI_INSTRUCTION_DISCRIMINATOR = Buffer.from([
 ]);
 var CpiEventParser = class {
 	/**
-	* Parse CPI events from a transaction (emit_cpi! pattern)
+	* Parse CPI events from an already-fetched transaction (emit_cpi! pattern).
 	*/
-	static async parseCpiEvents(connection, signature, targetProgramId, program) {
+	static parseCpiEventsFromTransaction(tx, targetProgramId, program) {
 		const events$1 = [];
+		if (!tx?.meta?.innerInstructions) return events$1;
+		for (const innerIxSet of tx.meta.innerInstructions) for (const instruction of innerIxSet.instructions) {
+			if (!("programId" in instruction) || !("data" in instruction)) continue;
+			if (instruction.programId.toString() !== targetProgramId) continue;
+			const parsedEvent = this.parseInstruction(instruction.data, program);
+			if (parsedEvent) events$1.push(parsedEvent);
+		}
+		return events$1;
+	}
+	/**
+	* Fetch a transaction by signature and parse its CPI events.
+	* Used by the subscription path where only the signature is available.
+	*/
+	static async fetchAndParseCpiEvents(connection, signature, targetProgramId, program) {
 		try {
 			const tx = await connection.getParsedTransaction(signature, {
 				commitment: "confirmed",
 				maxSupportedTransactionVersion: 0
 			});
-			if (!tx?.meta?.innerInstructions) return events$1;
-			for (const innerIxSet of tx.meta.innerInstructions) for (const instruction of innerIxSet.instructions) {
-				if (!("programId" in instruction) || !("data" in instruction)) continue;
-				if (instruction.programId.toString() !== targetProgramId) continue;
-				const parsedEvent = this.parseInstruction(instruction.data, program);
-				if (parsedEvent) events$1.push(parsedEvent);
-			}
-		} catch {}
-		return events$1;
+			return this.parseCpiEventsFromTransaction(tx, targetProgramId, program);
+		} catch {
+			return [];
+		}
 	}
 	/**
 	* Parse CPI event from instruction data
@@ -2742,7 +2751,7 @@ var CpiEventParser = class {
 		return connection.onLogs(program.programId, (logs, context) => {
 			if (logs.err) return;
 			(async () => {
-				const events$1 = await this.parseCpiEvents(connection, logs.signature, program.programId.toString(), program);
+				const events$1 = await this.fetchAndParseCpiEvents(connection, logs.signature, program.programId.toString(), program);
 				for (const event of events$1) {
 					const handler = eventHandlers.get(event.name);
 					if (handler) try {
@@ -2842,15 +2851,15 @@ var ChainSignatureContract$1 = class extends ChainSignatureContract {
 	}
 	/**
 	* Sends a transaction to the program to request a signature, then
-	* polls for the signature result. If the signature is not found within the retry
-	* parameters, it will throw an error.
+	* races a WebSocket listener against polling backfill to find the result.
+	* If the signature is not found within the timeout, it will throw an error.
 	*/
 	async sign(args, options) {
 		const algo = options?.sign?.algo ?? "";
 		const dest = options?.sign?.dest ?? "";
 		const params = options?.sign?.params ?? "";
 		const delay = options?.retry?.delay ?? 5e3;
-		const retryCount = options?.retry?.retryCount ?? 12;
+		const timeoutMs = delay * (options?.retry?.retryCount ?? 12);
 		if (options?.remainingAccounts?.filter((acc) => acc.isSigner)?.some((acc) => !options?.remainingSigners?.some((signer) => signer.publicKey.equals(acc.pubkey)))) throw new Error("All accounts marked as signers must have a corresponding signer");
 		const requestId = this.getRequestId(args, {
 			algo,
@@ -2868,24 +2877,38 @@ var ChainSignatureContract$1 = class extends ChainSignatureContract {
 		const transaction = new __solana_web3_js.Transaction().add(instruction);
 		transaction.feePayer = this.provider.wallet.publicKey;
 		const hash = await this.sendAndConfirmWithoutWebSocket(transaction, options?.remainingSigners);
+		const controller = new AbortController();
+		const successPromise = this.waitForEvent({
+			eventName: "signatureRespondedEvent",
+			requestId,
+			signer: this.programId,
+			afterSignature: hash,
+			timeoutMs,
+			backfillIntervalMs: delay,
+			signal: controller.signal
+		});
+		const errorPromise = this.waitForEvent({
+			eventName: "signatureErrorEvent",
+			requestId,
+			signer: this.programId,
+			afterSignature: hash,
+			timeoutMs,
+			backfillIntervalMs: delay,
+			signal: controller.signal
+		}).then((err) => {
+			throw new SignatureContractError(err.error, requestId, { hash });
+		});
+		successPromise.catch(() => {});
+		errorPromise.catch(() => {});
 		try {
-			const pollResult = await this.pollForRequestId({
-				requestId,
-				payload: args.payload,
-				path: args.path,
-				afterSignature: hash,
-				options: {
-					delay,
-					retryCount
-				}
-			});
-			if (!pollResult) throw new SignatureNotFoundError(requestId, { hash });
-			if ("error" in pollResult) throw new SignatureContractError(pollResult.error, requestId, { hash });
-			if (!await verifyRecoveredAddress(pollResult, args.payload, this.requesterAddress, args.path, this, args.key_version)) throw new SigningError(requestId, { hash }, /* @__PURE__ */ new Error("Signature verification failed: recovered address does not match expected address"));
-			return pollResult;
+			const result = await Promise.race([successPromise, errorPromise]);
+			if (!await verifyRecoveredAddress(result, args.payload, this.requesterAddress, args.path, this, args.key_version)) throw new SigningError(requestId, { hash }, /* @__PURE__ */ new Error("Signature verification failed: recovered address does not match expected address"));
+			return result;
 		} catch (error) {
 			if (error instanceof SignatureNotFoundError || error instanceof SignatureContractError) throw error;
 			else throw new SigningError(requestId, { hash }, error instanceof Error ? error : void 0);
+		} finally {
+			controller.abort();
 		}
 	}
 	async sendAndConfirmWithoutWebSocket(transaction, signers) {
@@ -2909,70 +2932,147 @@ var ChainSignatureContract$1 = class extends ChainSignatureContract {
 		throw new __solana_web3_js.TransactionExpiredTimeoutError(signature, timeout / 1e3);
 	}
 	/**
-	* Polls for signature or error events matching the given requestId starting from the solana transaction with signature afterSignature.
-	* Returns a signature, error data, or undefined if nothing is found.
+	* Waits for a specific event matching the given requestId by combining
+	* a WebSocket listener (real-time) with polling backfill (resilience).
 	*/
-	async pollForRequestId({ requestId, payload: _payload, path: _path, afterSignature, options }) {
-		const delay = options?.delay ?? 5e3;
-		const retryCount = options?.retryCount ?? 12;
-		let lastCheckedSignature = afterSignature;
-		for (let i = 0; i < retryCount; i++) {
-			try {
-				const signatures = await this.connection.getSignaturesForAddress(this.programId, {
-					until: lastCheckedSignature,
-					limit: 50
-				}, "confirmed");
-				if (signatures.length > 0) lastCheckedSignature = signatures[signatures.length - 1].signature;
-				for (const sig of signatures) {
-					const tx = await this.connection.getParsedTransaction(sig.signature, {
-						commitment: "confirmed",
-						maxSupportedTransactionVersion: 0
+	async waitForEvent(options) {
+		const { eventName, requestId, signer, afterSignature, timeoutMs = 6e4, backfillIntervalMs = 5e3, backfillLimit = 50, signal } = options;
+		return await new Promise((resolve, reject) => {
+			let settled = false;
+			const seenSignatures = /* @__PURE__ */ new Set();
+			let lastCheckedSignature = afterSignature;
+			const cleanupFns = [];
+			const cleanup = () => {
+				for (const fn of cleanupFns) try {
+					fn();
+				} catch {}
+			};
+			const settle = (action) => {
+				if (settled) return;
+				settled = true;
+				cleanup();
+				action();
+			};
+			const processEvent = (name, data, txSignature) => {
+				if (settled) return false;
+				if (txSignature && seenSignatures.has(txSignature)) return false;
+				if (txSignature) seenSignatures.add(txSignature);
+				if (name !== eventName) return false;
+				const result = this.mapEventForName(eventName, data, requestId);
+				if (result !== void 0) {
+					settle(() => {
+						resolve(result);
 					});
-					if (tx?.meta?.logMessages) {
-						const result = await this.parseLogsForEvents(tx.meta.logMessages, requestId, sig.signature);
-						if (result) return result;
-					}
+					return true;
 				}
-			} catch (error) {
-				console.error("Error checking for events:", error);
-			}
-			if (i < retryCount - 1) {
-				console.log(`Retrying get signature: ${i + 1}/${retryCount}`);
-				await new Promise((resolve) => setTimeout(resolve, delay));
+				return false;
+			};
+			if (signal) {
+				if (signal.aborted) {
+					settle(() => {
+						reject(signal.reason ?? /* @__PURE__ */ new Error("Aborted"));
+					});
+					return;
+				}
+				const onAbort = () => {
+					settle(() => {
+						reject(signal.reason ?? /* @__PURE__ */ new Error("Aborted"));
+					});
+				};
+				signal.addEventListener("abort", onAbort, { once: true });
+				cleanupFns.push(() => {
+					signal.removeEventListener("abort", onAbort);
+				});
 			}
-		}
+			const timeoutId = setTimeout(() => {
+				settle(() => {
+					reject(new SignatureNotFoundError(requestId));
+				});
+			}, timeoutMs);
+			cleanupFns.push(() => {
+				clearTimeout(timeoutId);
+			});
+			const parser = new __coral_xyz_anchor.EventParser(this.program.programId, this.program.coder);
+			const subId = this.connection.onLogs(signer, (logs, _context) => {
+				if (settled) return;
+				if (logs.err) return;
+				for (const evt of parser.parseLogs(logs.logs)) {
+					if (!evt) continue;
+					if (processEvent(evt.name, evt.data, logs.signature)) return;
+				}
+				CpiEventParser.fetchAndParseCpiEvents(this.connection, logs.signature, this.programId.toString(), this.program).then((cpiEvents) => {
+					for (const event of cpiEvents) if (processEvent(event.name, event.data, logs.signature)) return;
+				});
+			}, "confirmed");
+			cleanupFns.push(() => {
+				this.connection.removeOnLogsListener(subId);
+			});
+			const runBackfill = async () => {
+				if (settled) return;
+				try {
+					const signatures = await this.connection.getSignaturesForAddress(signer, {
+						until: lastCheckedSignature,
+						limit: backfillLimit
+					}, "confirmed");
+					if (signatures.length > 0) lastCheckedSignature = signatures[0].signature;
+					for (const sig of signatures) {
+						if (settled) return;
+						if (seenSignatures.has(sig.signature)) continue;
+						const tx = await this.connection.getParsedTransaction(sig.signature, {
+							commitment: "confirmed",
+							maxSupportedTransactionVersion: 0
+						});
+						if (!tx) continue;
+						const cpiEvents = CpiEventParser.parseCpiEventsFromTransaction(tx, this.programId.toString(), this.program);
+						for (const event of cpiEvents) if (processEvent(event.name, event.data, sig.signature)) return;
+						const logs = tx.meta?.logMessages;
+						if (logs) for (const evt of parser.parseLogs(logs)) {
+							if (!evt) continue;
+							if (processEvent(evt.name, evt.data, sig.signature)) return;
+						}
+					}
+				} catch {}
+			};
+			runBackfill();
+			const intervalId = setInterval(() => {
+				runBackfill();
+			}, backfillIntervalMs);
+			cleanupFns.push(() => {
+				clearInterval(intervalId);
+			});
+		});
 	}
-	/**
-	* Parses transaction logs for signature or error events.
-	*/
-	async parseLogsForEvents(logs, requestId, signature) {
-		const cpiEvents = await CpiEventParser.parseCpiEvents(this.connection, signature, this.programId.toString(), this.program);
-		for (const event of cpiEvents) {
-			const mapped = this.mapEventToResult(event.name, event.name === "signatureRespondedEvent" ? event.data : event.data, requestId);
-			if (mapped) return mapped;
-		}
-		const parser = new __coral_xyz_anchor.EventParser(this.program.programId, this.program.coder);
-		for (const evt of parser.parseLogs(logs)) {
-			if (!evt) continue;
-			const mapped = this.mapEventToResult(evt.name, evt.name === "signatureRespondedEvent" ? evt.data : evt.data, requestId);
-			if (mapped) return mapped;
-		}
+	mapRespondToResult(data, requestId) {
+		if ("0x" + Buffer.from(data.requestId).toString("hex") !== requestId) return void 0;
+		return {
+			r: Buffer.from(data.signature.bigR.x).toString("hex"),
+			s: Buffer.from(data.signature.s).toString("hex"),
+			v: data.signature.recoveryId + 27
+		};
 	}
-	mapEventToResult(name, data, requestId) {
+	mapRespondErrorToResult(data, requestId) {
 		const eventRequestIdHex = "0x" + Buffer.from(data.requestId).toString("hex");
-		if (name === "signatureRespondedEvent" && eventRequestIdHex === requestId) {
-			const d = data;
-			return {
-				r: Buffer.from(d.signature.bigR.x).toString("hex"),
-				s: Buffer.from(d.signature.s).toString("hex"),
-				v: d.signature.recoveryId + 27
-			};
-		}
-		if (name === "signatureErrorEvent" && eventRequestIdHex === requestId) return {
+		if (eventRequestIdHex !== requestId) return void 0;
+		return {
 			requestId: eventRequestIdHex,
 			error: data.error
 		};
 	}
+	mapRespondBidirectionalToResult(data, requestId) {
+		if ("0x" + Buffer.from(data.requestId).toString("hex") !== requestId) return void 0;
+		return {
+			serializedOutput: data.serializedOutput,
+			signature: data.signature
+		};
+	}
+	mapEventForName(eventName, data, requestId) {
+		switch (eventName) {
+			case "signatureRespondedEvent": return this.mapRespondToResult(data, requestId);
+			case "signatureErrorEvent": return this.mapRespondErrorToResult(data, requestId);
+			case "respondBidirectionalEvent": return this.mapRespondBidirectionalToResult(data, requestId);
+			default: return;
+		}
+	}
 	/**
 	* Generates the request ID for a signature request allowing to track the response.
 	*/
@@ -2992,46 +3092,6 @@ var ChainSignatureContract$1 = class extends ChainSignatureContract {
 			chainId: KDF_CHAIN_IDS.SOLANA
 		});
 	}
-	/**
-	* Subscribes to program events using Anchor's EventParser for regular events,
-	* and CPI parsing for emit_cpi!-emitted events. Returns an unsubscribe fn.
-	*/
-	async subscribeToEvents(handlers) {
-		const commitment = "confirmed";
-		const cpiHandlers = /* @__PURE__ */ new Map();
-		if (handlers.onSignatureResponded) {
-			const onSignatureResponded = handlers.onSignatureResponded;
-			cpiHandlers.set("signatureRespondedEvent", async (e, s) => {
-				await onSignatureResponded(e, s);
-			});
-		}
-		if (handlers.onSignatureError) {
-			const onSignatureError = handlers.onSignatureError;
-			cpiHandlers.set("signatureErrorEvent", async (e, s) => {
-				await onSignatureError(e, s);
-			});
-		}
-		const cpiSubId = CpiEventParser.subscribeToCpiEvents(this.connection, this.program, cpiHandlers);
-		const parser = new __coral_xyz_anchor.EventParser(this.program.programId, this.program.coder);
-		const subId = this.connection.onLogs(this.program.programId, (logs, context) => {
-			if (logs.err) return;
-			for (const evt of parser.parseLogs(logs.logs)) {
-				if (!evt) continue;
-				if (evt.name === "signatureRespondedEvent") {
-					const onSignatureResponded = handlers.onSignatureResponded;
-					if (onSignatureResponded) onSignatureResponded(evt.data, context.slot);
-				}
-				if (evt.name === "signatureErrorEvent") {
-					const onSignatureError = handlers.onSignatureError;
-					if (onSignatureError) onSignatureError(evt.data, context.slot);
-				}
-			}
-		}, commitment);
-		return async () => {
-			await this.connection.removeOnLogsListener(subId);
-			await this.connection.removeOnLogsListener(cpiSubId);
-		};
-	}
 };
 
 //#endregion

package/dist/index.d.cts

@@ -1550,16 +1550,17 @@ interface Signature {
   s: number[];
   recoveryId: number;
 }
-interface SignatureRespondedEvent {
-  requestId: number[];
-  responder: PublicKey;
+interface RespondBidirectionalData {
+  serializedOutput: Buffer;
   signature: Signature;
 }
-interface SignatureErrorEvent {
-  requestId: number[];
-  responder: PublicKey;
-  error: string;
+type ChainSignaturesEventName = 'signatureRespondedEvent' | 'signatureErrorEvent' | 'respondBidirectionalEvent';
+interface EventResultMap {
+  signatureRespondedEvent: RSVSignature;
+  signatureErrorEvent: SignatureErrorData;
+  respondBidirectionalEvent: RespondBidirectionalData;
 }
+type EventResult<E extends ChainSignaturesEventName> = EventResultMap[E];
 //#endregion
 //#region src/contracts/solana/ChainSignaturesContract.d.ts
 declare class ChainSignatureContract$1 extends ChainSignatureContract {
@@ -1608,8 +1609,8 @@ declare class ChainSignatureContract$1 extends ChainSignatureContract {
   }): Promise<TransactionInstruction>;
   /**
    * Sends a transaction to the program to request a signature, then
-   * polls for the signature result. If the signature is not found within the retry
-   * parameters, it will throw an error.
+   * races a WebSocket listener against polling backfill to find the result.
+   * If the signature is not found within the timeout, it will throw an error.
    */
   sign(args: SignArgs, options?: Partial<SignOptions> & {
     remainingAccounts?: AccountMeta[];
@@ -1617,39 +1618,27 @@ declare class ChainSignatureContract$1 extends ChainSignatureContract {
   }): Promise<RSVSignature>;
   private sendAndConfirmWithoutWebSocket;
   /**
-   * Polls for signature or error events matching the given requestId starting from the solana transaction with signature afterSignature.
-   * Returns a signature, error data, or undefined if nothing is found.
+   * Waits for a specific event matching the given requestId by combining
+   * a WebSocket listener (real-time) with polling backfill (resilience).
    */
-  pollForRequestId({
-    requestId,
-    payload: _payload,
-    path: _path,
-    afterSignature,
-    options
-  }: {
+  waitForEvent<E extends ChainSignaturesEventName>(options: {
+    eventName: E;
     requestId: string;
-    payload: number[];
-    path: string;
-    afterSignature: string;
-    options?: RetryOptions;
-  }): Promise<RSVSignature | SignatureErrorData | undefined>;
-  /**
-   * Parses transaction logs for signature or error events.
-   */
-  private parseLogsForEvents;
-  private mapEventToResult;
+    signer: PublicKey;
+    afterSignature?: string;
+    timeoutMs?: number;
+    backfillIntervalMs?: number;
+    backfillLimit?: number;
+    signal?: AbortSignal;
+  }): Promise<EventResult<E>>;
+  private mapRespondToResult;
+  private mapRespondErrorToResult;
+  private mapRespondBidirectionalToResult;
+  private mapEventForName;
   /**
    * Generates the request ID for a signature request allowing to track the response.
    */
   getRequestId(args: SignArgs, options?: SignOptions['sign']): string;
-  /**
-   * Subscribes to program events using Anchor's EventParser for regular events,
-   * and CPI parsing for emit_cpi!-emitted events. Returns an unsubscribe fn.
-   */
-  subscribeToEvents(handlers: {
-    onSignatureResponded?: (event: SignatureRespondedEvent, slot: number) => Promise<void> | void;
-    onSignatureError?: (event: SignatureErrorEvent, slot: number) => Promise<void> | void;
-  }): Promise<() => Promise<void>>;
 }
 declare namespace index_d_exports$4 {
   export { ChainSignatureContract$1 as ChainSignatureContract, ChainSignaturesProject, utils };

package/dist/index.d.ts

@@ -1548,16 +1548,17 @@ interface Signature {
   s: number[];
   recoveryId: number;
 }
-interface SignatureRespondedEvent {
-  requestId: number[];
-  responder: PublicKey;
+interface RespondBidirectionalData {
+  serializedOutput: Buffer;
   signature: Signature;
 }
-interface SignatureErrorEvent {
-  requestId: number[];
-  responder: PublicKey;
-  error: string;
+type ChainSignaturesEventName = 'signatureRespondedEvent' | 'signatureErrorEvent' | 'respondBidirectionalEvent';
+interface EventResultMap {
+  signatureRespondedEvent: RSVSignature;
+  signatureErrorEvent: SignatureErrorData;
+  respondBidirectionalEvent: RespondBidirectionalData;
 }
+type EventResult<E extends ChainSignaturesEventName> = EventResultMap[E];
 //#endregion
 //#region src/contracts/solana/ChainSignaturesContract.d.ts
 declare class ChainSignatureContract$1 extends ChainSignatureContract {
@@ -1606,8 +1607,8 @@ declare class ChainSignatureContract$1 extends ChainSignatureContract {
   }): Promise<TransactionInstruction>;
   /**
    * Sends a transaction to the program to request a signature, then
-   * polls for the signature result. If the signature is not found within the retry
-   * parameters, it will throw an error.
+   * races a WebSocket listener against polling backfill to find the result.
+   * If the signature is not found within the timeout, it will throw an error.
    */
   sign(args: SignArgs, options?: Partial<SignOptions> & {
     remainingAccounts?: AccountMeta[];
@@ -1615,39 +1616,27 @@ declare class ChainSignatureContract$1 extends ChainSignatureContract {
   }): Promise<RSVSignature>;
   private sendAndConfirmWithoutWebSocket;
   /**
-   * Polls for signature or error events matching the given requestId starting from the solana transaction with signature afterSignature.
-   * Returns a signature, error data, or undefined if nothing is found.
+   * Waits for a specific event matching the given requestId by combining
+   * a WebSocket listener (real-time) with polling backfill (resilience).
    */
-  pollForRequestId({
-    requestId,
-    payload: _payload,
-    path: _path,
-    afterSignature,
-    options
-  }: {
+  waitForEvent<E extends ChainSignaturesEventName>(options: {
+    eventName: E;
     requestId: string;
-    payload: number[];
-    path: string;
-    afterSignature: string;
-    options?: RetryOptions;
-  }): Promise<RSVSignature | SignatureErrorData | undefined>;
-  /**
-   * Parses transaction logs for signature or error events.
-   */
-  private parseLogsForEvents;
-  private mapEventToResult;
+    signer: PublicKey;
+    afterSignature?: string;
+    timeoutMs?: number;
+    backfillIntervalMs?: number;
+    backfillLimit?: number;
+    signal?: AbortSignal;
+  }): Promise<EventResult<E>>;
+  private mapRespondToResult;
+  private mapRespondErrorToResult;
+  private mapRespondBidirectionalToResult;
+  private mapEventForName;
   /**
    * Generates the request ID for a signature request allowing to track the response.
    */
   getRequestId(args: SignArgs, options?: SignOptions['sign']): string;
-  /**
-   * Subscribes to program events using Anchor's EventParser for regular events,
-   * and CPI parsing for emit_cpi!-emitted events. Returns an unsubscribe fn.
-   */
-  subscribeToEvents(handlers: {
-    onSignatureResponded?: (event: SignatureRespondedEvent, slot: number) => Promise<void> | void;
-    onSignatureError?: (event: SignatureErrorEvent, slot: number) => Promise<void> | void;
-  }): Promise<() => Promise<void>>;
 }
 declare namespace index_d_exports$4 {
   export { ChainSignatureContract$1 as ChainSignatureContract, ChainSignaturesProject, utils };

package/dist/index.js

@@ -2652,24 +2652,33 @@ const EMIT_CPI_INSTRUCTION_DISCRIMINATOR = Buffer.from([
 ]);
 var CpiEventParser = class {
 	/**
-	* Parse CPI events from a transaction (emit_cpi! pattern)
+	* Parse CPI events from an already-fetched transaction (emit_cpi! pattern).
 	*/
-	static async parseCpiEvents(connection, signature, targetProgramId, program) {
+	static parseCpiEventsFromTransaction(tx, targetProgramId, program) {
 		const events$1 = [];
+		if (!tx?.meta?.innerInstructions) return events$1;
+		for (const innerIxSet of tx.meta.innerInstructions) for (const instruction of innerIxSet.instructions) {
+			if (!("programId" in instruction) || !("data" in instruction)) continue;
+			if (instruction.programId.toString() !== targetProgramId) continue;
+			const parsedEvent = this.parseInstruction(instruction.data, program);
+			if (parsedEvent) events$1.push(parsedEvent);
+		}
+		return events$1;
+	}
+	/**
+	* Fetch a transaction by signature and parse its CPI events.
+	* Used by the subscription path where only the signature is available.
+	*/
+	static async fetchAndParseCpiEvents(connection, signature, targetProgramId, program) {
 		try {
 			const tx = await connection.getParsedTransaction(signature, {
 				commitment: "confirmed",
 				maxSupportedTransactionVersion: 0
 			});
-			if (!tx?.meta?.innerInstructions) return events$1;
-			for (const innerIxSet of tx.meta.innerInstructions) for (const instruction of innerIxSet.instructions) {
-				if (!("programId" in instruction) || !("data" in instruction)) continue;
-				if (instruction.programId.toString() !== targetProgramId) continue;
-				const parsedEvent = this.parseInstruction(instruction.data, program);
-				if (parsedEvent) events$1.push(parsedEvent);
-			}
-		} catch {}
-		return events$1;
+			return this.parseCpiEventsFromTransaction(tx, targetProgramId, program);
+		} catch {
+			return [];
+		}
 	}
 	/**
 	* Parse CPI event from instruction data
@@ -2699,7 +2708,7 @@ var CpiEventParser = class {
 		return connection.onLogs(program.programId, (logs, context) => {
 			if (logs.err) return;
 			(async () => {
-				const events$1 = await this.parseCpiEvents(connection, logs.signature, program.programId.toString(), program);
+				const events$1 = await this.fetchAndParseCpiEvents(connection, logs.signature, program.programId.toString(), program);
 				for (const event of events$1) {
 					const handler = eventHandlers.get(event.name);
 					if (handler) try {
@@ -2799,15 +2808,15 @@ var ChainSignatureContract$1 = class extends ChainSignatureContract {
 	}
 	/**
 	* Sends a transaction to the program to request a signature, then
-	* polls for the signature result. If the signature is not found within the retry
-	* parameters, it will throw an error.
+	* races a WebSocket listener against polling backfill to find the result.
+	* If the signature is not found within the timeout, it will throw an error.
 	*/
 	async sign(args, options) {
 		const algo = options?.sign?.algo ?? "";
 		const dest = options?.sign?.dest ?? "";
 		const params = options?.sign?.params ?? "";
 		const delay = options?.retry?.delay ?? 5e3;
-		const retryCount = options?.retry?.retryCount ?? 12;
+		const timeoutMs = delay * (options?.retry?.retryCount ?? 12);
 		if (options?.remainingAccounts?.filter((acc) => acc.isSigner)?.some((acc) => !options?.remainingSigners?.some((signer) => signer.publicKey.equals(acc.pubkey)))) throw new Error("All accounts marked as signers must have a corresponding signer");
 		const requestId = this.getRequestId(args, {
 			algo,
@@ -2825,24 +2834,38 @@ var ChainSignatureContract$1 = class extends ChainSignatureContract {
 		const transaction = new Transaction().add(instruction);
 		transaction.feePayer = this.provider.wallet.publicKey;
 		const hash = await this.sendAndConfirmWithoutWebSocket(transaction, options?.remainingSigners);
+		const controller = new AbortController();
+		const successPromise = this.waitForEvent({
+			eventName: "signatureRespondedEvent",
+			requestId,
+			signer: this.programId,
+			afterSignature: hash,
+			timeoutMs,
+			backfillIntervalMs: delay,
+			signal: controller.signal
+		});
+		const errorPromise = this.waitForEvent({
+			eventName: "signatureErrorEvent",
+			requestId,
+			signer: this.programId,
+			afterSignature: hash,
+			timeoutMs,
+			backfillIntervalMs: delay,
+			signal: controller.signal
+		}).then((err) => {
+			throw new SignatureContractError(err.error, requestId, { hash });
+		});
+		successPromise.catch(() => {});
+		errorPromise.catch(() => {});
 		try {
-			const pollResult = await this.pollForRequestId({
-				requestId,
-				payload: args.payload,
-				path: args.path,
-				afterSignature: hash,
-				options: {
-					delay,
-					retryCount
-				}
-			});
-			if (!pollResult) throw new SignatureNotFoundError(requestId, { hash });
-			if ("error" in pollResult) throw new SignatureContractError(pollResult.error, requestId, { hash });
-			if (!await verifyRecoveredAddress(pollResult, args.payload, this.requesterAddress, args.path, this, args.key_version)) throw new SigningError(requestId, { hash }, /* @__PURE__ */ new Error("Signature verification failed: recovered address does not match expected address"));
-			return pollResult;
+			const result = await Promise.race([successPromise, errorPromise]);
+			if (!await verifyRecoveredAddress(result, args.payload, this.requesterAddress, args.path, this, args.key_version)) throw new SigningError(requestId, { hash }, /* @__PURE__ */ new Error("Signature verification failed: recovered address does not match expected address"));
+			return result;
 		} catch (error) {
 			if (error instanceof SignatureNotFoundError || error instanceof SignatureContractError) throw error;
 			else throw new SigningError(requestId, { hash }, error instanceof Error ? error : void 0);
+		} finally {
+			controller.abort();
 		}
 	}
 	async sendAndConfirmWithoutWebSocket(transaction, signers) {
@@ -2866,70 +2889,147 @@ var ChainSignatureContract$1 = class extends ChainSignatureContract {
 		throw new TransactionExpiredTimeoutError(signature, timeout / 1e3);
 	}
 	/**
-	* Polls for signature or error events matching the given requestId starting from the solana transaction with signature afterSignature.
-	* Returns a signature, error data, or undefined if nothing is found.
+	* Waits for a specific event matching the given requestId by combining
+	* a WebSocket listener (real-time) with polling backfill (resilience).
 	*/
-	async pollForRequestId({ requestId, payload: _payload, path: _path, afterSignature, options }) {
-		const delay = options?.delay ?? 5e3;
-		const retryCount = options?.retryCount ?? 12;
-		let lastCheckedSignature = afterSignature;
-		for (let i = 0; i < retryCount; i++) {
-			try {
-				const signatures = await this.connection.getSignaturesForAddress(this.programId, {
-					until: lastCheckedSignature,
-					limit: 50
-				}, "confirmed");
-				if (signatures.length > 0) lastCheckedSignature = signatures[signatures.length - 1].signature;
-				for (const sig of signatures) {
-					const tx = await this.connection.getParsedTransaction(sig.signature, {
-						commitment: "confirmed",
-						maxSupportedTransactionVersion: 0
+	async waitForEvent(options) {
+		const { eventName, requestId, signer, afterSignature, timeoutMs = 6e4, backfillIntervalMs = 5e3, backfillLimit = 50, signal } = options;
+		return await new Promise((resolve, reject) => {
+			let settled = false;
+			const seenSignatures = /* @__PURE__ */ new Set();
+			let lastCheckedSignature = afterSignature;
+			const cleanupFns = [];
+			const cleanup = () => {
+				for (const fn of cleanupFns) try {
+					fn();
+				} catch {}
+			};
+			const settle = (action) => {
+				if (settled) return;
+				settled = true;
+				cleanup();
+				action();
+			};
+			const processEvent = (name, data, txSignature) => {
+				if (settled) return false;
+				if (txSignature && seenSignatures.has(txSignature)) return false;
+				if (txSignature) seenSignatures.add(txSignature);
+				if (name !== eventName) return false;
+				const result = this.mapEventForName(eventName, data, requestId);
+				if (result !== void 0) {
+					settle(() => {
+						resolve(result);
 					});
-					if (tx?.meta?.logMessages) {
-						const result = await this.parseLogsForEvents(tx.meta.logMessages, requestId, sig.signature);
-						if (result) return result;
-					}
+					return true;
 				}
-			} catch (error) {
-				console.error("Error checking for events:", error);
-			}
-			if (i < retryCount - 1) {
-				console.log(`Retrying get signature: ${i + 1}/${retryCount}`);
-				await new Promise((resolve) => setTimeout(resolve, delay));
+				return false;
+			};
+			if (signal) {
+				if (signal.aborted) {
+					settle(() => {
+						reject(signal.reason ?? /* @__PURE__ */ new Error("Aborted"));
+					});
+					return;
+				}
+				const onAbort = () => {
+					settle(() => {
+						reject(signal.reason ?? /* @__PURE__ */ new Error("Aborted"));
+					});
+				};
+				signal.addEventListener("abort", onAbort, { once: true });
+				cleanupFns.push(() => {
+					signal.removeEventListener("abort", onAbort);
+				});
 			}
-		}
+			const timeoutId = setTimeout(() => {
+				settle(() => {
+					reject(new SignatureNotFoundError(requestId));
+				});
+			}, timeoutMs);
+			cleanupFns.push(() => {
+				clearTimeout(timeoutId);
+			});
+			const parser = new EventParser(this.program.programId, this.program.coder);
+			const subId = this.connection.onLogs(signer, (logs, _context) => {
+				if (settled) return;
+				if (logs.err) return;
+				for (const evt of parser.parseLogs(logs.logs)) {
+					if (!evt) continue;
+					if (processEvent(evt.name, evt.data, logs.signature)) return;
+				}
+				CpiEventParser.fetchAndParseCpiEvents(this.connection, logs.signature, this.programId.toString(), this.program).then((cpiEvents) => {
+					for (const event of cpiEvents) if (processEvent(event.name, event.data, logs.signature)) return;
+				});
+			}, "confirmed");
+			cleanupFns.push(() => {
+				this.connection.removeOnLogsListener(subId);
+			});
+			const runBackfill = async () => {
+				if (settled) return;
+				try {
+					const signatures = await this.connection.getSignaturesForAddress(signer, {
+						until: lastCheckedSignature,
+						limit: backfillLimit
+					}, "confirmed");
+					if (signatures.length > 0) lastCheckedSignature = signatures[0].signature;
+					for (const sig of signatures) {
+						if (settled) return;
+						if (seenSignatures.has(sig.signature)) continue;
+						const tx = await this.connection.getParsedTransaction(sig.signature, {
+							commitment: "confirmed",
+							maxSupportedTransactionVersion: 0
+						});
+						if (!tx) continue;
+						const cpiEvents = CpiEventParser.parseCpiEventsFromTransaction(tx, this.programId.toString(), this.program);
+						for (const event of cpiEvents) if (processEvent(event.name, event.data, sig.signature)) return;
+						const logs = tx.meta?.logMessages;
+						if (logs) for (const evt of parser.parseLogs(logs)) {
+							if (!evt) continue;
+							if (processEvent(evt.name, evt.data, sig.signature)) return;
+						}
+					}
+				} catch {}
+			};
+			runBackfill();
+			const intervalId = setInterval(() => {
+				runBackfill();
+			}, backfillIntervalMs);
+			cleanupFns.push(() => {
+				clearInterval(intervalId);
+			});
+		});
 	}
-	/**
-	* Parses transaction logs for signature or error events.
-	*/
-	async parseLogsForEvents(logs, requestId, signature) {
-		const cpiEvents = await CpiEventParser.parseCpiEvents(this.connection, signature, this.programId.toString(), this.program);
-		for (const event of cpiEvents) {
-			const mapped = this.mapEventToResult(event.name, event.name === "signatureRespondedEvent" ? event.data : event.data, requestId);
-			if (mapped) return mapped;
-		}
-		const parser = new EventParser(this.program.programId, this.program.coder);
-		for (const evt of parser.parseLogs(logs)) {
-			if (!evt) continue;
-			const mapped = this.mapEventToResult(evt.name, evt.name === "signatureRespondedEvent" ? evt.data : evt.data, requestId);
-			if (mapped) return mapped;
-		}
+	mapRespondToResult(data, requestId) {
+		if ("0x" + Buffer.from(data.requestId).toString("hex") !== requestId) return void 0;
+		return {
+			r: Buffer.from(data.signature.bigR.x).toString("hex"),
+			s: Buffer.from(data.signature.s).toString("hex"),
+			v: data.signature.recoveryId + 27
+		};
 	}
-	mapEventToResult(name, data, requestId) {
+	mapRespondErrorToResult(data, requestId) {
 		const eventRequestIdHex = "0x" + Buffer.from(data.requestId).toString("hex");
-		if (name === "signatureRespondedEvent" && eventRequestIdHex === requestId) {
-			const d = data;
-			return {
-				r: Buffer.from(d.signature.bigR.x).toString("hex"),
-				s: Buffer.from(d.signature.s).toString("hex"),
-				v: d.signature.recoveryId + 27
-			};
-		}
-		if (name === "signatureErrorEvent" && eventRequestIdHex === requestId) return {
+		if (eventRequestIdHex !== requestId) return void 0;
+		return {
 			requestId: eventRequestIdHex,
 			error: data.error
 		};
 	}
+	mapRespondBidirectionalToResult(data, requestId) {
+		if ("0x" + Buffer.from(data.requestId).toString("hex") !== requestId) return void 0;
+		return {
+			serializedOutput: data.serializedOutput,
+			signature: data.signature
+		};
+	}
+	mapEventForName(eventName, data, requestId) {
+		switch (eventName) {
+			case "signatureRespondedEvent": return this.mapRespondToResult(data, requestId);
+			case "signatureErrorEvent": return this.mapRespondErrorToResult(data, requestId);
+			case "respondBidirectionalEvent": return this.mapRespondBidirectionalToResult(data, requestId);
+			default: return;
+		}
+	}
 	/**
 	* Generates the request ID for a signature request allowing to track the response.
 	*/
@@ -2949,46 +3049,6 @@ var ChainSignatureContract$1 = class extends ChainSignatureContract {
 			chainId: KDF_CHAIN_IDS.SOLANA
 		});
 	}
-	/**
-	* Subscribes to program events using Anchor's EventParser for regular events,
-	* and CPI parsing for emit_cpi!-emitted events. Returns an unsubscribe fn.
-	*/
-	async subscribeToEvents(handlers) {
-		const commitment = "confirmed";
-		const cpiHandlers = /* @__PURE__ */ new Map();
-		if (handlers.onSignatureResponded) {
-			const onSignatureResponded = handlers.onSignatureResponded;
-			cpiHandlers.set("signatureRespondedEvent", async (e, s) => {
-				await onSignatureResponded(e, s);
-			});
-		}
-		if (handlers.onSignatureError) {
-			const onSignatureError = handlers.onSignatureError;
-			cpiHandlers.set("signatureErrorEvent", async (e, s) => {
-				await onSignatureError(e, s);
-			});
-		}
-		const cpiSubId = CpiEventParser.subscribeToCpiEvents(this.connection, this.program, cpiHandlers);
-		const parser = new EventParser(this.program.programId, this.program.coder);
-		const subId = this.connection.onLogs(this.program.programId, (logs, context) => {
-			if (logs.err) return;
-			for (const evt of parser.parseLogs(logs.logs)) {
-				if (!evt) continue;
-				if (evt.name === "signatureRespondedEvent") {
-					const onSignatureResponded = handlers.onSignatureResponded;
-					if (onSignatureResponded) onSignatureResponded(evt.data, context.slot);
-				}
-				if (evt.name === "signatureErrorEvent") {
-					const onSignatureError = handlers.onSignatureError;
-					if (onSignatureError) onSignatureError(evt.data, context.slot);
-				}
-			}
-		}, commitment);
-		return async () => {
-			await this.connection.removeOnLogsListener(subId);
-			await this.connection.removeOnLogsListener(cpiSubId);
-		};
-	}
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signet.js",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "A TypeScript library for handling multi-chain transactions and signatures using Signet MPC",
   "type": "module",
   "exports": {
@@ -37,7 +37,9 @@
     "docs:dev": "vocs dev",
     "docs:build": "vocs build",
     "docs:preview": "vocs preview",
-    "format": "prettier --write ."
+    "format": "prettier --write .",
+    "lint": "eslint 'src/**/*.ts'",
+    "typecheck": "tsc --noEmit"
   },
   "author": "Sig Network",
   "license": "MIT",