@interest-protocol/vortex-sdk 11.3.1 → 12.0.4

package/src/utils/decrypt.ts

@@ -1,12 +1,12 @@
-import { PaginatedEvents } from '@mysten/sui/client';
+import type { PaginatedEvents } from '@mysten/sui/client';
+import type { Commitment } from '../vortex-api.types';
+import type { UtxoPayload, VortexKeypair } from '../entities/keypair';
+import type { Vortex } from '../vortex';
+import type { VortexPool } from '../vortex.types';
+
 import { parseNewCommitmentEvent } from './events';
-import { Commitment } from '../vortex-api.types';
-import { UtxoPayload } from '../entities/keypair';
-import { VortexKeypair } from '../entities/keypair';
 import { Utxo } from '../entities/utxo';
 import { normalizeStructTag, toHex } from '@mysten/sui/utils';
-import { Vortex } from '../vortex';
-import { VortexPool } from '../vortex.types';
 import invariant from 'tiny-invariant';
 
 interface GetUnspentUtxosArgs {
@@ -24,23 +24,30 @@ export const getUnspentUtxos = async ({
 }: GetUnspentUtxosArgs) => {
   const commitments = parseNewCommitmentEvent(commitmentEvents);
 
-  const allUtxos = [] as UtxoPayload[];
+  const vortexObjectId =
+    typeof vortexPool === 'string' ? vortexPool : vortexPool.objectId;
+
+  const decryptedWithIndex: { utxo: UtxoPayload; chainIndex: bigint }[] = [];
 
   commitments.forEach((commitment) => {
     try {
       const utxo = vortexKeypair.decryptUtxo(commitment.encryptedOutput);
-      allUtxos.push(utxo);
+      // Use index from chain (commitment.index) instead of decrypted index
+      // to avoid concurrency/latency issues where encrypted index can be stale
+      decryptedWithIndex.push({ utxo, chainIndex: commitment.index });
     } catch {
-      // Do nothing
+      // HMAC verification failed - wrong keypair
     }
   });
 
-  const vortexObjectId =
-    typeof vortexPool === 'string' ? vortexPool : vortexPool.objectId;
-
-  const utxos = allUtxos.map(
-    (utxo) =>
-      new Utxo({ ...utxo, keypair: vortexKeypair, vortexPool: vortexObjectId })
+  const utxos = decryptedWithIndex.map(
+    ({ utxo, chainIndex }) =>
+      new Utxo({
+        ...utxo,
+        index: chainIndex, // Override with on-chain index
+        keypair: vortexKeypair,
+        vortexPool: vortexObjectId,
+      })
   );
 
   const nullifiers = utxos.map((utxo) => utxo.nullifier());
@@ -65,7 +72,7 @@ interface GetUnspentUtxosWithApiArgs {
 }
 
 interface GetUnspentUtxosWithApiAndCommitmentsArgs {
-  commitments: Pick<Commitment, 'coinType' | 'encryptedOutput'>[];
+  commitments: Pick<Commitment, 'coinType' | 'encryptedOutput' | 'index'>[];
   vortexKeypair: VortexKeypair;
   vortexSdk: Vortex;
   vortexPool: string | VortexPool;
@@ -77,7 +84,7 @@ export const getUnspentUtxosWithApi = async ({
   vortexSdk,
   vortexPool,
 }: GetUnspentUtxosWithApiArgs) => {
-  const allUtxos = [] as UtxoPayload[];
+  const decryptedWithIndex: { utxo: UtxoPayload; chainIndex: bigint }[] = [];
 
   const vortexObject = await vortexSdk.resolveVortexPool(vortexPool);
 
@@ -92,16 +99,19 @@ export const getUnspentUtxosWithApi = async ({
         Uint8Array.from(commitment.encryptedOutput)
       );
       const utxo = vortexKeypair.decryptUtxo(encryptedOutputHex);
-      allUtxos.push(utxo);
+      // Use index from chain (commitment.index) instead of decrypted index
+      // to avoid concurrency/latency issues where encrypted index can be stale
+      decryptedWithIndex.push({ utxo, chainIndex: BigInt(commitment.index) });
     } catch {
-      // Do nothing
+      // HMAC verification failed - wrong keypair
     }
   });
 
-  const utxos = allUtxos.map(
-    (utxo) =>
+  const utxos = decryptedWithIndex.map(
+    ({ utxo, chainIndex }) =>
       new Utxo({
         ...utxo,
+        index: chainIndex, // Override with on-chain index
         keypair: vortexKeypair,
         vortexPool: vortexObject.objectId,
       })
@@ -127,11 +137,8 @@ export const getUnspentUtxosWithApiAndCommitments = async ({
   vortexSdk,
   vortexPool,
 }: GetUnspentUtxosWithApiAndCommitmentsArgs) => {
-  const allUtxos = [] as UtxoPayload[];
-  const userCommitments = [] as Pick<
-    Commitment,
-    'coinType' | 'encryptedOutput'
-  >[];
+  const decryptedWithIndex: { utxo: UtxoPayload; chainIndex: bigint }[] = [];
+  const userCommitments = [] as Pick<Commitment, 'coinType' | 'encryptedOutput' | 'index'>[];
 
   const vortexObject = await vortexSdk.resolveVortexPool(vortexPool);
 
@@ -149,17 +156,21 @@ export const getUnspentUtxosWithApiAndCommitments = async ({
       userCommitments.push({
         coinType: commitment.coinType,
         encryptedOutput: commitment.encryptedOutput,
+        index: commitment.index,
       });
-      allUtxos.push(utxo);
+      // Use index from chain (commitment.index) instead of decrypted index
+      // to avoid concurrency/latency issues where encrypted index can be stale
+      decryptedWithIndex.push({ utxo, chainIndex: BigInt(commitment.index) });
     } catch {
-      // Do nothing
+      // HMAC verification failed - wrong keypair
     }
   });
 
-  const utxos = allUtxos.map(
-    (utxo) =>
+  const utxos = decryptedWithIndex.map(
+    ({ utxo, chainIndex }) =>
       new Utxo({
         ...utxo,
+        index: chainIndex, // Override with on-chain index
         keypair: vortexKeypair,
         vortexPool: vortexObject.objectId,
       })

package/dist/crypto/ff/random.d.ts

@@ -1,2 +0,0 @@
-export declare function getRandomBytes(length: number): Uint8Array;
-//# sourceMappingURL=random.d.ts.map

package/dist/crypto/ff/random.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"random.d.ts","sourceRoot":"","sources":["../../../src/crypto/ff/random.ts"],"names":[],"mappings":"AAUA,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAqBzD"}

package/src/crypto/ff/random.ts

@@ -1,32 +0,0 @@
-/**
- * Type definition for the browser crypto object.
- */
-type BrowserCrypto = {
-  crypto?: { getRandomValues?: (arg0: Uint8Array) => void };
-};
-
-// Type declaration for Node.js require (used in Node.js environment fallback)
-declare const require: (module: string) => any;
-
-export function getRandomBytes(length: number): Uint8Array {
-  if (length <= 0) {
-    throw new Error('Length must be greater than 0');
-  }
-  const global = globalThis as BrowserCrypto;
-  if (global.crypto?.getRandomValues) {
-    const randomValues = new Uint8Array(length);
-    global.crypto.getRandomValues(randomValues);
-    return randomValues;
-  }
-  // eslint-disable-next-line no-unused-labels
-  NODE: {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const crypto = require('crypto');
-    return crypto.randomBytes(length);
-  }
-
-  throw new Error(
-    'Random byte generation is not supported in this environment'
-  );
-}