@permissionless-technologies/upp-sdk 0.5.6 → 0.5.7

package/dist/react/index.d.cts

@@ -3,8 +3,8 @@ import * as react from 'react';
 import { ReactNode, CSSProperties } from 'react';
 import { Hex, Address, PublicClient } from 'viem';
 import { M as MasterKeys, b as StarkMasterKeys } from '../types-CJSbxv4q.cjs';
-import { H as ShieldedNote, aL as NoteCreationResult, s as ProofSystem, t as ProofWorkerManager, j as DownloadProgress, aM as PlonkProofStruct, a3 as TransferStage, P as PlonkProvingStage, _ as SwapOrderEvent, a5 as UPPCircuitType, f as CircuitCacheStatus } from '../transfer-C1XU_z-6.cjs';
-export { A as ASPProof, aN as ASP_TREE_DEPTH, C as CIRCUIT_CDN_BASE, c as CIRCUIT_VERSION, d as CircuitArtifactCache, a9 as buildASPTree, af as computeMultiOriginASPRoot, ai as computeSingleOriginASPRoot, ar as generateASPProof, at as generateMultiOriginASPProof, av as generateSingleOriginASPProof, ay as generateUPPProofAsync } from '../transfer-C1XU_z-6.cjs';
+import { H as ShieldedNote, aL as NoteCreationResult, s as ProofSystem, t as ProofWorkerManager, j as DownloadProgress, aM as PlonkProofStruct, a3 as TransferStage, P as PlonkProvingStage, _ as SwapOrderEvent, a5 as UPPCircuitType, f as CircuitCacheStatus } from '../transfer-_qaZXsv7.cjs';
+export { A as ASPProof, aN as ASP_TREE_DEPTH, C as CIRCUIT_CDN_BASE, c as CIRCUIT_VERSION, d as CircuitArtifactCache, a9 as buildASPTree, af as computeMultiOriginASPRoot, ai as computeSingleOriginASPRoot, ar as generateASPProof, at as generateMultiOriginASPProof, av as generateSingleOriginASPProof, ay as generateUPPProofAsync } from '../transfer-_qaZXsv7.cjs';
 import { P as Point } from '../merkle-mteVOlDf.cjs';
 import '../keccak-m31-B_AqBbRF.cjs';
 import '@permissionless-technologies/upc-sdk';
@@ -474,6 +474,10 @@ interface WithdrawParams {
     aspId?: bigint;
     /** ASP root for compliance (default: 0 for ragequit) */
     aspRoot?: bigint;
+    /** ASP Merkle proof path elements (required when not ragequit) */
+    aspPathElements?: bigint[];
+    /** ASP Merkle proof path indices (required when not ragequit) */
+    aspPathIndices?: number[];
     /** Enable ragequit mode (bypass ASP check, requires recipient = origin) */
     isRagequit?: boolean;
 }

package/dist/react/index.d.ts

@@ -3,8 +3,8 @@ import * as react from 'react';
 import { ReactNode, CSSProperties } from 'react';
 import { Hex, Address, PublicClient } from 'viem';
 import { M as MasterKeys, b as StarkMasterKeys } from '../types-mLybMxNR.js';
-import { H as ShieldedNote, aL as NoteCreationResult, s as ProofSystem, t as ProofWorkerManager, j as DownloadProgress, aM as PlonkProofStruct, a3 as TransferStage, P as PlonkProvingStage, _ as SwapOrderEvent, a5 as UPPCircuitType, f as CircuitCacheStatus } from '../transfer-DgjxZlR7.js';
-export { A as ASPProof, aN as ASP_TREE_DEPTH, C as CIRCUIT_CDN_BASE, c as CIRCUIT_VERSION, d as CircuitArtifactCache, a9 as buildASPTree, af as computeMultiOriginASPRoot, ai as computeSingleOriginASPRoot, ar as generateASPProof, at as generateMultiOriginASPProof, av as generateSingleOriginASPProof, ay as generateUPPProofAsync } from '../transfer-DgjxZlR7.js';
+import { H as ShieldedNote, aL as NoteCreationResult, s as ProofSystem, t as ProofWorkerManager, j as DownloadProgress, aM as PlonkProofStruct, a3 as TransferStage, P as PlonkProvingStage, _ as SwapOrderEvent, a5 as UPPCircuitType, f as CircuitCacheStatus } from '../transfer-x7UChjh7.js';
+export { A as ASPProof, aN as ASP_TREE_DEPTH, C as CIRCUIT_CDN_BASE, c as CIRCUIT_VERSION, d as CircuitArtifactCache, a9 as buildASPTree, af as computeMultiOriginASPRoot, ai as computeSingleOriginASPRoot, ar as generateASPProof, at as generateMultiOriginASPProof, av as generateSingleOriginASPProof, ay as generateUPPProofAsync } from '../transfer-x7UChjh7.js';
 import { P as Point } from '../merkle-mteVOlDf.js';
 import '../keccak-m31-B_AqBbRF.js';
 import '@permissionless-technologies/upc-sdk';
@@ -474,6 +474,10 @@ interface WithdrawParams {
     aspId?: bigint;
     /** ASP root for compliance (default: 0 for ragequit) */
     aspRoot?: bigint;
+    /** ASP Merkle proof path elements (required when not ragequit) */
+    aspPathElements?: bigint[];
+    /** ASP Merkle proof path indices (required when not ragequit) */
+    aspPathIndices?: number[];
     /** Enable ragequit mode (bypass ASP check, requires recipient = origin) */
     isRagequit?: boolean;
 }

package/dist/react/index.js

@@ -1,16 +1,19 @@
 import { StorableAccountAdapter, init_stealth, stealth_exports, generateUPPProofAsync, SWAP_ORDER_PLACED_EVENT, filterOrdersByTokenPair, filterOrdersByASP, generateCancelSecret, computeCancelKeyHash, computeGiveAmount, ProofWorkerManager, getCancelSecret, SWAP_ORDER_FILLED_EVENT, SWAP_ORDER_CLAIMED_EVENT, SWAP_ORDER_CANCELLED_EVENT, NoteStore } from '../chunk-2NKFTLPD.js';
 export { ProofWorkerManager, generateUPPProofAsync } from '../chunk-2NKFTLPD.js';
+import { packNoteData, buildWithdrawCircuitInputs, padToDepth } from '../chunk-N2VHE47N.js';
+import '../chunk-KR4GB6VC.js';
 import { computeSingleOriginASPRoot } from '../chunk-6IEYWJVS.js';
 export { ASP_TREE_DEPTH, buildASPTree, computeMultiOriginASPRoot, computeSingleOriginASPRoot, generateASPProof, generateMultiOriginASPProof, generateSingleOriginASPProof } from '../chunk-6IEYWJVS.js';
 import { CircuitArtifactCache, CIRCUIT_VERSION } from '../chunk-2BSIUEPO.js';
 export { CIRCUIT_CDN_BASE, CIRCUIT_VERSION, CircuitArtifactCache } from '../chunk-2BSIUEPO.js';
+import '../chunk-GPF72JFR.js';
 import { createSyncEngine } from '../chunk-FW2U6TKQ.js';
 import { createIndexedDBAdapter } from '../chunk-ABVALIIG.js';
 import { init_crypto, hexToBytes, bigintToBytes } from '../chunk-4E23V3AT.js';
 import { init_poseidon, computeOwnerHash } from '../chunk-5QSSX3KR.js';
 import { __toCommonJS } from '../chunk-Z6ZWNWWR.js';
 import { createContext, useState, useRef, useEffect, useCallback, useMemo, useContext } from 'react';
-import { keccak256, toBytes, toHex, encodePacked } from 'viem';
+import { keccak256, toBytes, toHex } from 'viem';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { createPortal } from 'react-dom';
 import { ASP_REGISTRY_HUB_ABI } from '@permissionless-technologies/upc-sdk';
@@ -181,7 +184,9 @@ function UPPAccountProvider({
   const [lastSyncedBlock, _setLastSyncedBlock] = useState(0);
   const [liveSyncInterval, setLiveSyncInterval] = useState(null);
   const noteStoreRef = useRef(null);
+  const [noteStoreReady, setNoteStoreReady] = useState(false);
   const accountAdapterRef = useRef(null);
+  const [initNonce, setInitNonce] = useState(0);
   useEffect(() => {
     loadSDK().then(() => setCryptoReady(true));
   }, []);
@@ -194,6 +199,7 @@ function UPPAccountProvider({
       setStarkMasterKeys(null);
       setNotes([]);
       noteStoreRef.current = null;
+      setNoteStoreReady(false);
       accountAdapterRef.current = null;
       return;
     }
@@ -241,6 +247,7 @@ function UPPAccountProvider({
       const noteStorage = createIndexedDBAdapter(storagePrefix);
       const store = new NoteStore(noteStorage, "notes");
       noteStoreRef.current = store;
+      setNoteStoreReady(true);
       noteStoreUnsub = store.onChange(() => {
         if (!cancelled) setNotes([...store.getNotes()]);
       });
@@ -280,7 +287,7 @@ function UPPAccountProvider({
       cancelled = true;
       if (noteStoreUnsub) noteStoreUnsub();
     };
-  }, [ethAddress, cryptoReady, chainId, publicClientProp]);
+  }, [ethAddress, cryptoReady, chainId, publicClientProp, initNonce]);
   const setupAccount = useCallback(
     async (signature) => {
       if (!ethAddress || !cryptoReady) {
@@ -298,6 +305,7 @@ function UPPAccountProvider({
         if (adapter) {
           await adapter.save(keys, starkKeys);
         }
+        setInitNonce((n) => n + 1);
       } finally {
         setIsLoading(false);
       }
@@ -335,8 +343,8 @@ function UPPAccountProvider({
   const logout = useCallback(() => {
     noteStoreRef.current?.clear().catch(console.error);
     noteStoreRef.current = null;
+    setNoteStoreReady(false);
     accountAdapterRef.current?.clear().catch(console.error);
-    accountAdapterRef.current = null;
     if (masterKeys) {
       const ownerHashHex2 = toHex(masterKeys.ownerHash, { size: 32 });
       const notesKey = getNotesStorageKey(chainId, ownerHashHex2.slice(0, 12));
@@ -409,7 +417,7 @@ function UPPAccountProvider({
   );
   const syncEngineRef = useRef(null);
   useEffect(() => {
-    if (!masterKeys || !cryptoReady || !publicClientProp || !indexerConfig?.contractAddress) {
+    if (!masterKeys || !cryptoReady || !publicClientProp || !indexerConfig?.contractAddress || !noteStoreReady) {
       syncEngineRef.current = null;
       return;
     }
@@ -433,7 +441,7 @@ function UPPAccountProvider({
     return () => {
       cancelled = true;
     };
-  }, [masterKeys, cryptoReady, publicClientProp, indexerConfig?.contractAddress, indexerConfig?.swapModuleAddress, indexerConfig?.fromBlock]);
+  }, [masterKeys, cryptoReady, publicClientProp, noteStoreReady, indexerConfig?.contractAddress, indexerConfig?.swapModuleAddress, indexerConfig?.fromBlock]);
   const syncNotes = useCallback(
     async (_contractAddress, _client) => {
       const engine = syncEngineRef.current;
@@ -1146,18 +1154,6 @@ function useUPPCrypto() {
     getSubOrder
   };
 }
-function packNoteData(note) {
-  return encodePacked(
-    ["uint64", "uint256", "bytes"],
-    [note.searchTag, note.ownerHash, note.encryptedNote]
-  );
-}
-function padToDepth(arr, padValue, depth) {
-  if (arr.length >= depth) return arr.slice(0, depth);
-  return [...arr, ...Array(depth - arr.length).fill(padValue)];
-}
-
-// src/react/use-shield.ts
 function useShield(config) {
   const { createNoteForSelf, isSetup, masterKeys } = useUPPAccount();
   const [isPending, setIsPending] = useState(false);
@@ -1266,7 +1262,7 @@ function usePoolTransfer(config) {
         const recipientNote = await createNoteForSelf(amount, origin, token);
         const changeNote = await createNoteForSelf(changeAmount, origin, token);
         const [transferModule, proofModule, aspModule] = await Promise.all([
-          import('../transfer-2UYFZMIK.js'),
+          import('../transfer-27GZNGCI.js'),
           import('../proof-YMXBL4D5.js'),
           import('../asp-72WUGTQE.js')
         ]);
@@ -1352,9 +1348,6 @@ function usePoolTransfer(config) {
     reset
   };
 }
-init_poseidon();
-var STATE_TREE_DEPTH = 32;
-var ASP_TREE_DEPTH2 = 20;
 function useWithdraw(config) {
   const {
     isSetup,
@@ -1384,6 +1377,8 @@ function useWithdraw(config) {
           recipient,
           aspId = 0n,
           aspRoot = 0n,
+          aspPathElements,
+          aspPathIndices,
           isRagequit = false
         } = params;
         const cfg = configRef.current;
@@ -1417,10 +1412,9 @@ function useWithdraw(config) {
         const origin = BigInt(selectedNote.origin);
         const token = BigInt(selectedNote.token);
         setStage("creating_outputs");
-        const [transferModule, proofModule, sdk] = await Promise.all([
-          import('../transfer-2UYFZMIK.js'),
-          import('../proof-YMXBL4D5.js'),
-          import('../index.js')
+        const [transferModule, proofModule] = await Promise.all([
+          import('../transfer-27GZNGCI.js'),
+          import('../proof-YMXBL4D5.js')
         ]);
         const { syncMerkleTree, getMerkleProofsForNotes } = transferModule;
         const { formatPlonkProofForContract } = proofModule;
@@ -1438,50 +1432,18 @@ function useWithdraw(config) {
         };
         const [noteProof] = await getMerkleProofsForNotes([spendableNote], leaves, tree);
         setStage("generating_proof");
-        const merkleProof = noteProof.proof;
-        const stateRootBI = merkleProof.root;
-        const actualLeafIndex = merkleProof.leafIndex;
-        const inputOwnerHash = computeOwnerHash(BigInt(selectedNote.ownerSecret));
-        const localCommitment = await sdk.poseidon([
-          selectedNote.amount,
-          inputOwnerHash,
-          selectedNote.blinding,
-          BigInt(selectedNote.origin),
-          BigInt(selectedNote.token)
-        ]);
-        const storedCommitment = BigInt(selectedNote.commitment);
-        if (localCommitment !== storedCommitment) {
-          throw new Error(
-            `Note commitment mismatch \u2014 this note was created with an outdated commitment formula. Clear your shielded account (localStorage) and re-shield tokens.`
-          );
-        }
-        const nullifier = await sdk.poseidon([
-          BigInt(selectedNote.ownerSecret),
-          BigInt(actualLeafIndex),
-          storedCommitment
-        ]);
-        const circuitInputs = {
-          // Public inputs
-          stateRoot: stateRootBI.toString(),
-          aspRoot: aspRoot.toString(),
-          nullifier: nullifier.toString(),
-          amount: selectedNote.amount.toString(),
-          recipient: BigInt(recipient).toString(),
-          token: BigInt(cfg.tokenAddress).toString(),
-          isRagequit: isRagequit ? "1" : "0",
-          // Private inputs - Input Note
-          // IMPORTANT: Use actualLeafIndex from Merkle proof, not stored leafIndex
-          inputAmount: selectedNote.amount.toString(),
-          inputOneTimeSecret: BigInt(selectedNote.ownerSecret).toString(),
-          inputBlinding: selectedNote.blinding.toString(),
-          inputOrigin: origin.toString(),
-          inputLeafIndex: actualLeafIndex.toString(),
-          inputPathElements: padToDepth(merkleProof.pathElements.map(String), "0", STATE_TREE_DEPTH),
-          inputPathIndices: padToDepth(merkleProof.pathIndices.map(String), "0", STATE_TREE_DEPTH),
-          // ASP membership proof (zeros for ragequit)
-          aspPathElements: Array(ASP_TREE_DEPTH2).fill("0"),
-          aspPathIndices: Array(ASP_TREE_DEPTH2).fill("0")
-        };
+        const circuitInputs = await buildWithdrawCircuitInputs({
+          selectedNote: spendableNote,
+          merkleProof: noteProof.proof,
+          recipient: BigInt(recipient),
+          tokenAddress: BigInt(cfg.tokenAddress),
+          aspRoot,
+          aspPathElements,
+          aspPathIndices,
+          isRagequit
+        });
+        const stateRootBI = noteProof.proof.root;
+        const nullifier = BigInt(circuitInputs.nullifier);
         setProvingProgress(null);
         const { proof } = await generateUPPProofAsync(
           "withdraw",
@@ -1642,8 +1604,8 @@ function storePersonalASPId(chainId, address, aspId) {
   storeASPId(chainId, address, aspId);
 }
 init_poseidon();
-var STATE_TREE_DEPTH2 = 32;
-var ASP_TREE_DEPTH3 = 20;
+var STATE_TREE_DEPTH = 32;
+var ASP_TREE_DEPTH2 = 20;
 var SWAP_ORDERS_ABI = [{
   type: "function",
   name: "swapOrders",
@@ -1792,7 +1754,7 @@ function useSwap(config) {
         }
         setStage("creating_outputs");
         const [transferModule, proofModule, sdk, aspModule] = await Promise.all([
-          import('../transfer-2UYFZMIK.js'),
+          import('../transfer-27GZNGCI.js'),
           import('../proof-YMXBL4D5.js'),
           import('../index.js'),
           import('../asp-72WUGTQE.js')
@@ -1852,10 +1814,10 @@ function useSwap(config) {
           inputBlinding: selectedNote.blinding.toString(),
           inputOrigin: origin.toString(),
           inputLeafIndex: actualLeafIndex.toString(),
-          inputPathElements: padToDepth(merkleProof.pathElements.map(String), "0", STATE_TREE_DEPTH2),
-          inputPathIndices: padToDepth(merkleProof.pathIndices.map(String), "0", STATE_TREE_DEPTH2),
-          aspPathElements: padToDepth(aspProofData.aspPathElements.map(String), "0", ASP_TREE_DEPTH3),
-          aspPathIndices: padToDepth(aspProofData.aspPathIndices.map(String), "0", ASP_TREE_DEPTH3)
+          inputPathElements: padToDepth(merkleProof.pathElements.map(String), "0", STATE_TREE_DEPTH),
+          inputPathIndices: padToDepth(merkleProof.pathIndices.map(String), "0", STATE_TREE_DEPTH),
+          aspPathElements: padToDepth(aspProofData.aspPathElements.map(String), "0", ASP_TREE_DEPTH2),
+          aspPathIndices: padToDepth(aspProofData.aspPathIndices.map(String), "0", ASP_TREE_DEPTH2)
         };
         setProvingProgress(null);
         const { proof } = await generateUPPProofAsync(
@@ -1940,7 +1902,7 @@ function useSwap(config) {
         }
         setStage("creating_outputs");
         const [transferModule, proofModule, sdk, aspModule] = await Promise.all([
-          import('../transfer-2UYFZMIK.js'),
+          import('../transfer-27GZNGCI.js'),
           import('../proof-YMXBL4D5.js'),
           import('../index.js'),
           import('../asp-72WUGTQE.js')
@@ -2006,10 +1968,10 @@ function useSwap(config) {
           inputBlinding: selectedNote.blinding.toString(),
           inputOrigin: origin.toString(),
           inputLeafIndex: actualLeafIndex.toString(),
-          inputPathElements: padToDepth(merkleProof.pathElements.map(String), "0", STATE_TREE_DEPTH2),
-          inputPathIndices: padToDepth(merkleProof.pathIndices.map(String), "0", STATE_TREE_DEPTH2),
-          aspPathElements: padToDepth(aspProofData.aspPathElements.map(String), "0", ASP_TREE_DEPTH3),
-          aspPathIndices: padToDepth(aspProofData.aspPathIndices.map(String), "0", ASP_TREE_DEPTH3)
+          inputPathElements: padToDepth(merkleProof.pathElements.map(String), "0", STATE_TREE_DEPTH),
+          inputPathIndices: padToDepth(merkleProof.pathIndices.map(String), "0", STATE_TREE_DEPTH),
+          aspPathElements: padToDepth(aspProofData.aspPathElements.map(String), "0", ASP_TREE_DEPTH2),
+          aspPathIndices: padToDepth(aspProofData.aspPathIndices.map(String), "0", ASP_TREE_DEPTH2)
         };
         setProvingProgress(null);
         const { proof } = await generateUPPProofAsync(
@@ -2165,7 +2127,7 @@ function useSwap(config) {
           createNoteForSelf(changeAmount, origin, token)
         ]);
         const [transferModule, proofModule, aspModule] = await Promise.all([
-          import('../transfer-2UYFZMIK.js'),
+          import('../transfer-27GZNGCI.js'),
           import('../proof-YMXBL4D5.js'),
           import('../asp-72WUGTQE.js')
         ]);