@arcium-hq/client 0.8.4 → 0.8.5

package/build/index.cjs

@@ -1809,7 +1809,7 @@ function createPacker(fields, typeName = 'Packer') {
 var address = "Arcj82pX7HxYKLR92qvgZUAd7vGS1k4hQvAFcPATFdEQ";
 var metadata = {
 	name: "arcium",
-	version: "0.8.4",
+	version: "0.8.5",
 	spec: "0.1.0",
 	description: "The Arcium program"
 };
@@ -14039,38 +14039,78 @@ function getArciumEnv() {
     }
 }
 
+const POLL_INTERVAL_MS = 500;
 /**
- * Waits for the finalization of a computation by listening for the finalizeComputationEvent.
- * Resolves with the transaction signature once the computation is finalized.
- * @param provider - The Anchor provider to use for event listening.
- * @param computationOffset - The offset of the computation to wait for.
- * @param mxeProgramId - The public key of the MXE program.
- * @param commitment - (Optional) The desired finality/commitment level (default: 'confirmed').
- * @returns The transaction signature of the finalization event.
+ * Waits for a computation to finalize by polling the computation account
+ * status via HTTP RPC. Does not use WebSocket subscriptions.
+ *
+ * Polls every 500ms (same as Agave's send_and_confirm_transaction_with_config).
+ * Returns the most recent transaction signature on the computation account
+ * once finalization is detected.
+ *
+ * @param provider - The Anchor provider.
+ * @param computationOffset - The computation offset to wait for.
+ * @param mxeProgramId - The MXE program public key.
+ * @param commitment - Commitment level for RPC calls (default: 'confirmed').
+ * @param timeoutMs - Maximum wait time in milliseconds (default: 120000).
+ * @returns The transaction signature from the finalization.
+ * @throws Error if the MXE account has no cluster assigned.
+ * @throws Error if the computation does not finalize within timeoutMs.
  */
-async function awaitComputationFinalization(provider, computationOffset, mxeProgramId, commitment = 'confirmed') {
+async function awaitComputationFinalization(provider, computationOffset, mxeProgramId, commitment = 'confirmed', timeoutMs = 120_000) {
+    const conn = provider.connection;
     const arciumProgram = getArciumProgram(provider);
-    const eventListener = new anchor.EventManager(arciumProgram.programId, provider, arciumProgram.coder);
-    const finalizeComp = await awaitEvent(eventListener, 'finalizeComputationEvent', (e) => mxeProgramId.equals(e.mxeProgramId) && e.computationOffset.eq(computationOffset), commitment);
-    return finalizeComp.sig;
-}
-/**
- * Waits for a specific event to occur, matching a custom check, and returns the event and its signature.
- * @param eventListener - The EventManager instance to use for listening.
- * @param eventName - The name of the event to listen for.
- * @param eventCheck - A predicate function to check if the event matches the desired criteria.
- * @param commitment - (Optional) The desired finality/commitment level (default: 'confirmed').
- * @returns An object containing the event and its transaction signature.
- */
-async function awaitEvent(eventListener, eventName, eventCheck, commitment = 'confirmed') {
-    const foundEvent = await new Promise((res) => {
-        const listenerId = eventListener.addEventListener(eventName, (event, _slot, signature) => {
-            if (eventCheck(event))
-                res([event, signature, listenerId]);
-        }, commitment);
-    });
-    await eventListener.removeEventListener(foundEvent[2]);
-    return { event: foundEvent[0], sig: foundEvent[1] };
+    // Derive computation account PDA (requires clusterOffset from MXE account)
+    const mxeAccAddress = getMXEAccAddress(mxeProgramId);
+    const mxeAcc = await arciumProgram.account.mxeAccount.fetch(mxeAccAddress, commitment);
+    if (mxeAcc.cluster === null) {
+        throw new Error('MXE account has no cluster assigned');
+    }
+    const compAccAddress = getComputationAccAddress(mxeAcc.cluster, computationOffset);
+    const startTime = Date.now();
+    let lastStatus = 'unknown';
+    let rpcErrorCount = 0;
+    let lastError;
+    while (Date.now() - startTime < timeoutMs) {
+        let compAcc;
+        try {
+            // eslint-disable-next-line no-await-in-loop
+            compAcc = await arciumProgram.account.computationAccount.fetchNullable(compAccAddress, commitment);
+        }
+        catch (e) {
+            rpcErrorCount++;
+            lastError = e instanceof Error ? e.message : String(e);
+            // eslint-disable-next-line no-await-in-loop
+            await new Promise((r) => {
+                setTimeout(r, POLL_INTERVAL_MS);
+            });
+            continue;
+        }
+        if (compAcc !== null && 'finalized' in compAcc.status) {
+            lastStatus = 'finalized';
+            for (let sigRetry = 0; sigRetry < 10; sigRetry++) {
+                // eslint-disable-next-line no-await-in-loop
+                const sigs = await conn.getSignaturesForAddress(compAccAddress, { limit: 1 }, commitment);
+                if (sigs.length > 0)
+                    return sigs[0].signature;
+                // eslint-disable-next-line no-await-in-loop
+                await new Promise((r) => {
+                    setTimeout(r, POLL_INTERVAL_MS);
+                });
+            }
+            throw new Error('Computation finalized but transaction signature not indexed after retries.');
+        }
+        if (compAcc !== null)
+            lastStatus = 'queued';
+        // eslint-disable-next-line no-await-in-loop
+        await new Promise((r) => {
+            setTimeout(r, POLL_INTERVAL_MS);
+        });
+    }
+    const timeoutMsg = `Computation did not finalize within ${timeoutMs}ms (status: ${lastStatus})`;
+    throw rpcErrorCount > 0
+        ? new Error(timeoutMsg, { cause: new Error(`${rpcErrorCount} RPC errors, last: ${lastError}`) })
+        : new Error(timeoutMsg);
 }
 
 Object.defineProperty(exports, "x25519", {

package/build/index.d.ts

@@ -456,7 +456,7 @@ type Arcium = {
     "address": "Arcj82pX7HxYKLR92qvgZUAd7vGS1k4hQvAFcPATFdEQ";
     "metadata": {
         "name": "arcium";
-        "version": "0.8.4";
+        "version": "0.8.5";
         "spec": "0.1.0";
         "description": "The Arcium program";
     };
@@ -11975,19 +11975,23 @@ type ArciumLocalEnv = {
 declare function getArciumEnv(): ArciumLocalEnv;
 
 /**
- * Represents possible error messages that can occur during computation processing or transaction handling.
- */
-type ComputationErrorType = `Transaction ${string} not found` | 'Transaction inner instructions not found' | `Transaction failed with error: ${string}` | 'No log messages found' | 'No queue computation instruction found' | `Invalid computation offset: ${string}` | 'Computation not found in executing pool, might have already executed' | `Error fetching transactions: ${string}` | `Instruction at index ${number} not found` | 'Account keys or program ID index not found' | `No Program ID found for instruction at index ${number}` | 'Max retries reached while searching for transaction';
-/**
- * Waits for the finalization of a computation by listening for the finalizeComputationEvent.
- * Resolves with the transaction signature once the computation is finalized.
- * @param provider - The Anchor provider to use for event listening.
- * @param computationOffset - The offset of the computation to wait for.
- * @param mxeProgramId - The public key of the MXE program.
- * @param commitment - (Optional) The desired finality/commitment level (default: 'confirmed').
- * @returns The transaction signature of the finalization event.
+ * Waits for a computation to finalize by polling the computation account
+ * status via HTTP RPC. Does not use WebSocket subscriptions.
+ *
+ * Polls every 500ms (same as Agave's send_and_confirm_transaction_with_config).
+ * Returns the most recent transaction signature on the computation account
+ * once finalization is detected.
+ *
+ * @param provider - The Anchor provider.
+ * @param computationOffset - The computation offset to wait for.
+ * @param mxeProgramId - The MXE program public key.
+ * @param commitment - Commitment level for RPC calls (default: 'confirmed').
+ * @param timeoutMs - Maximum wait time in milliseconds (default: 120000).
+ * @returns The transaction signature from the finalization.
+ * @throws Error if the MXE account has no cluster assigned.
+ * @throws Error if the computation does not finalize within timeoutMs.
  */
-declare function awaitComputationFinalization(provider: AnchorProvider, computationOffset: BN, mxeProgramId: PublicKey, commitment?: Finality): Promise<string>;
+declare function awaitComputationFinalization(provider: AnchorProvider, computationOffset: BN, mxeProgramId: PublicKey, commitment?: Finality, timeoutMs?: number): Promise<string>;
 
 /**
  * Returns the public key of the deployed Arcium program on Solana.
@@ -12077,4 +12081,4 @@ declare function getRawCircuitAccAddress(compDefPubkey: PublicKey, rawCircuitInd
 declare function getLookupTableAddress(mxeProgramId: PublicKey, lutOffset: anchor.BN): PublicKey;
 
 export { ARCIUM_ADDR, ARCIUM_IDL, Aes128Cipher, Aes192Cipher, Aes256Cipher, ArcisModule, ArcisType, ArcisValueField, CSplRescueCipher, CURVE25519_BASE_FIELD, CURVE25519_SCALAR_FIELD, CURVE25519_SCALAR_FIELD_MODULUS, IntegerInfo, Matrix, RescueCipher, RescueDesc, RescuePrimeHash, arcisEd25519, awaitComputationFinalization, buildFinalizeCompDefTx, createPacker, deserializeLE, finalizeKeyRecoveryExecution, generateRandomFieldElem, getArciumAccountBaseSeed, getArciumEnv, getArciumProgram, getArciumProgramId, getArxNodeAccAddress, getCircuitState, getClockAccAddress, getClusterAccAddress, getCompDefAccAddress, getCompDefAccOffset, getComputationAccAddress, getComputationsInMempool, getExecutingPoolAccAddress, getExecutingPoolAccInfo, getFeePoolAccAddress, getLookupTableAddress, getMXEAccAddress, getMXEArcisEd25519VerifyingKey, getMXEPublicKey, getMempoolAccAddress, getMempoolAccInfo, getMempoolPriorityFeeStats, getMxeRecoveryAccAddress, getRawCircuitAccAddress, getRecoveryClusterAccAddress, initKeyRecoveryExecution, initMxePart1, initMxePart2, isNullRef, positiveModulo, queueKeyRecoveryInit, randMatrix, recoverMxe, serializeLE, sha256, submitKeyRecoveryShare, toVec, uploadCircuit };
-export type { Arcium as ArciumIdlType, ArciumLocalEnv, CircuitSource, CircuitState, ComputationErrorType, ComputationReference, ExecutingPoolAccount, FieldInfo, FpField, MempoolAccount, MempoolPriorityFeeStats, Packer };
+export type { Arcium as ArciumIdlType, ArciumLocalEnv, CircuitSource, CircuitState, ComputationReference, ExecutingPoolAccount, FieldInfo, FpField, MempoolAccount, MempoolPriorityFeeStats, Packer };

package/build/index.mjs

@@ -4,7 +4,7 @@ export { x25519 } from '@noble/curves/ed25519';
 import { shake256, sha3_512 } from '@noble/hashes/sha3';
 import { invert, mod, isNegativeLE, pow2 } from '@noble/curves/abstract/modular';
 import * as anchor from '@coral-xyz/anchor';
-import { Program, EventManager } from '@coral-xyz/anchor';
+import { Program } from '@coral-xyz/anchor';
 import { randomBytes as randomBytes$1 } from '@noble/hashes/utils';
 import { twistedEdwards } from '@noble/curves/abstract/edwards';
 import fs from 'fs';
@@ -1790,7 +1790,7 @@ function createPacker(fields, typeName = 'Packer') {
 var address = "Arcj82pX7HxYKLR92qvgZUAd7vGS1k4hQvAFcPATFdEQ";
 var metadata = {
 	name: "arcium",
-	version: "0.8.4",
+	version: "0.8.5",
 	spec: "0.1.0",
 	description: "The Arcium program"
 };
@@ -14020,38 +14020,78 @@ function getArciumEnv() {
     }
 }
 
+const POLL_INTERVAL_MS = 500;
 /**
- * Waits for the finalization of a computation by listening for the finalizeComputationEvent.
- * Resolves with the transaction signature once the computation is finalized.
- * @param provider - The Anchor provider to use for event listening.
- * @param computationOffset - The offset of the computation to wait for.
- * @param mxeProgramId - The public key of the MXE program.
- * @param commitment - (Optional) The desired finality/commitment level (default: 'confirmed').
- * @returns The transaction signature of the finalization event.
+ * Waits for a computation to finalize by polling the computation account
+ * status via HTTP RPC. Does not use WebSocket subscriptions.
+ *
+ * Polls every 500ms (same as Agave's send_and_confirm_transaction_with_config).
+ * Returns the most recent transaction signature on the computation account
+ * once finalization is detected.
+ *
+ * @param provider - The Anchor provider.
+ * @param computationOffset - The computation offset to wait for.
+ * @param mxeProgramId - The MXE program public key.
+ * @param commitment - Commitment level for RPC calls (default: 'confirmed').
+ * @param timeoutMs - Maximum wait time in milliseconds (default: 120000).
+ * @returns The transaction signature from the finalization.
+ * @throws Error if the MXE account has no cluster assigned.
+ * @throws Error if the computation does not finalize within timeoutMs.
  */
-async function awaitComputationFinalization(provider, computationOffset, mxeProgramId, commitment = 'confirmed') {
+async function awaitComputationFinalization(provider, computationOffset, mxeProgramId, commitment = 'confirmed', timeoutMs = 120_000) {
+    const conn = provider.connection;
     const arciumProgram = getArciumProgram(provider);
-    const eventListener = new EventManager(arciumProgram.programId, provider, arciumProgram.coder);
-    const finalizeComp = await awaitEvent(eventListener, 'finalizeComputationEvent', (e) => mxeProgramId.equals(e.mxeProgramId) && e.computationOffset.eq(computationOffset), commitment);
-    return finalizeComp.sig;
-}
-/**
- * Waits for a specific event to occur, matching a custom check, and returns the event and its signature.
- * @param eventListener - The EventManager instance to use for listening.
- * @param eventName - The name of the event to listen for.
- * @param eventCheck - A predicate function to check if the event matches the desired criteria.
- * @param commitment - (Optional) The desired finality/commitment level (default: 'confirmed').
- * @returns An object containing the event and its transaction signature.
- */
-async function awaitEvent(eventListener, eventName, eventCheck, commitment = 'confirmed') {
-    const foundEvent = await new Promise((res) => {
-        const listenerId = eventListener.addEventListener(eventName, (event, _slot, signature) => {
-            if (eventCheck(event))
-                res([event, signature, listenerId]);
-        }, commitment);
-    });
-    await eventListener.removeEventListener(foundEvent[2]);
-    return { event: foundEvent[0], sig: foundEvent[1] };
+    // Derive computation account PDA (requires clusterOffset from MXE account)
+    const mxeAccAddress = getMXEAccAddress(mxeProgramId);
+    const mxeAcc = await arciumProgram.account.mxeAccount.fetch(mxeAccAddress, commitment);
+    if (mxeAcc.cluster === null) {
+        throw new Error('MXE account has no cluster assigned');
+    }
+    const compAccAddress = getComputationAccAddress(mxeAcc.cluster, computationOffset);
+    const startTime = Date.now();
+    let lastStatus = 'unknown';
+    let rpcErrorCount = 0;
+    let lastError;
+    while (Date.now() - startTime < timeoutMs) {
+        let compAcc;
+        try {
+            // eslint-disable-next-line no-await-in-loop
+            compAcc = await arciumProgram.account.computationAccount.fetchNullable(compAccAddress, commitment);
+        }
+        catch (e) {
+            rpcErrorCount++;
+            lastError = e instanceof Error ? e.message : String(e);
+            // eslint-disable-next-line no-await-in-loop
+            await new Promise((r) => {
+                setTimeout(r, POLL_INTERVAL_MS);
+            });
+            continue;
+        }
+        if (compAcc !== null && 'finalized' in compAcc.status) {
+            lastStatus = 'finalized';
+            for (let sigRetry = 0; sigRetry < 10; sigRetry++) {
+                // eslint-disable-next-line no-await-in-loop
+                const sigs = await conn.getSignaturesForAddress(compAccAddress, { limit: 1 }, commitment);
+                if (sigs.length > 0)
+                    return sigs[0].signature;
+                // eslint-disable-next-line no-await-in-loop
+                await new Promise((r) => {
+                    setTimeout(r, POLL_INTERVAL_MS);
+                });
+            }
+            throw new Error('Computation finalized but transaction signature not indexed after retries.');
+        }
+        if (compAcc !== null)
+            lastStatus = 'queued';
+        // eslint-disable-next-line no-await-in-loop
+        await new Promise((r) => {
+            setTimeout(r, POLL_INTERVAL_MS);
+        });
+    }
+    const timeoutMsg = `Computation did not finalize within ${timeoutMs}ms (status: ${lastStatus})`;
+    throw rpcErrorCount > 0
+        ? new Error(timeoutMsg, { cause: new Error(`${rpcErrorCount} RPC errors, last: ${lastError}`) })
+        : new Error(timeoutMsg);
 }
 
 export { ARCIUM_ADDR, ARCIUM_IDL, Aes128Cipher, Aes192Cipher, Aes256Cipher, ArcisModule, ArcisType, ArcisValueField, CSplRescueCipher, CURVE25519_BASE_FIELD, CURVE25519_SCALAR_FIELD, CURVE25519_SCALAR_FIELD_MODULUS, IntegerInfo, Matrix, RescueCipher, RescueDesc, RescuePrimeHash, arcisEd25519, awaitComputationFinalization, buildFinalizeCompDefTx, createPacker, deserializeLE, finalizeKeyRecoveryExecution, generateRandomFieldElem, getArciumAccountBaseSeed, getArciumEnv, getArciumProgram, getArciumProgramId, getArxNodeAccAddress, getCircuitState, getClockAccAddress, getClusterAccAddress, getCompDefAccAddress, getCompDefAccOffset, getComputationAccAddress, getComputationsInMempool, getExecutingPoolAccAddress, getExecutingPoolAccInfo, getFeePoolAccAddress, getLookupTableAddress, getMXEAccAddress, getMXEArcisEd25519VerifyingKey, getMXEPublicKey, getMempoolAccAddress, getMempoolAccInfo, getMempoolPriorityFeeStats, getMxeRecoveryAccAddress, getRawCircuitAccAddress, getRecoveryClusterAccAddress, initKeyRecoveryExecution, initMxePart1, initMxePart2, isNullRef, positiveModulo, queueKeyRecoveryInit, randMatrix, recoverMxe, serializeLE, sha256, submitKeyRecoveryShare, toVec, uploadCircuit };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcium-hq/client",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "Client SDK for interacting with encrypted Solana programs",
   "author": "Arcium",
   "license": "GPL-3.0-only",