@permissionless-technologies/upp-sdk 0.4.0 → 0.4.2

package/dist/react/index.d.cts

@@ -253,8 +253,11 @@ interface PoolTransferParams {
 interface PoolTransferBuildData {
     /** Circuit used: 'transfer' for UPP 1-in-2-out */
     circuit: 'transfer';
-    /** Formatted proof as uint256[8] */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Nullifier */
     nullifier: Hex;
     /** Merkle state root */
@@ -333,8 +336,11 @@ interface WithdrawParams {
  * Withdraw build data - everything needed to call the contract
  */
 interface WithdrawBuildData {
-    /** Formatted proof as uint256[8] */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Nullifier of the note being spent */
     nullifier: Hex;
     /** Merkle state root */
@@ -539,8 +545,11 @@ interface SwapConfig {
  * Build data returned by buildPlaceOrder — everything needed for the contract call
  */
 interface PlaceOrderBuildData {
-    /** Formatted proof as uint256[8] */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Nullifier (= orderId) */
     nullifier: Hex;
     /** Merkle state root */
@@ -572,8 +581,11 @@ interface PlaceOrderBuildData {
  * Build data returned by buildFillOrder
  */
 interface FillOrderBuildData {
-    /** Formatted proof as uint256[8] */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Filler's nullifier */
     nullifier: Hex;
     /** Merkle state root */
@@ -642,8 +654,11 @@ interface SplitNoteParams {
     aspProof?: ASPProofParam;
 }
 interface SplitNoteBuildData {
-    /** Transfer proof for contract call */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Nullifier */
     nullifier: Hex;
     /** Merkle state root */

package/dist/react/index.d.ts

@@ -253,8 +253,11 @@ interface PoolTransferParams {
 interface PoolTransferBuildData {
     /** Circuit used: 'transfer' for UPP 1-in-2-out */
     circuit: 'transfer';
-    /** Formatted proof as uint256[8] */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Nullifier */
     nullifier: Hex;
     /** Merkle state root */
@@ -333,8 +336,11 @@ interface WithdrawParams {
  * Withdraw build data - everything needed to call the contract
  */
 interface WithdrawBuildData {
-    /** Formatted proof as uint256[8] */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Nullifier of the note being spent */
     nullifier: Hex;
     /** Merkle state root */
@@ -539,8 +545,11 @@ interface SwapConfig {
  * Build data returned by buildPlaceOrder — everything needed for the contract call
  */
 interface PlaceOrderBuildData {
-    /** Formatted proof as uint256[8] */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Nullifier (= orderId) */
     nullifier: Hex;
     /** Merkle state root */
@@ -572,8 +581,11 @@ interface PlaceOrderBuildData {
  * Build data returned by buildFillOrder
  */
 interface FillOrderBuildData {
-    /** Formatted proof as uint256[8] */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Filler's nullifier */
     nullifier: Hex;
     /** Merkle state root */
@@ -642,8 +654,11 @@ interface SplitNoteParams {
     aspProof?: ASPProofParam;
 }
 interface SplitNoteBuildData {
-    /** Transfer proof for contract call */
-    proof: bigint[];
+    /** PLONK proof bytes for contract call */
+    proof: {
+        proofBytes: `0x${string}`;
+        publicSignals: bigint[];
+    };
     /** Nullifier */
     nullifier: Hex;
     /** Merkle state root */

package/dist/react/index.js

@@ -511,11 +511,10 @@ function UPPAccountProvider({
               const tokenRaw = "0x" + Array.from(ptBytes.slice(84, 104)).map((b) => b.toString(16).padStart(2, "0")).join("");
               const origin = getAddress(originRaw);
               const token = getAddress(tokenRaw);
-              const pubkey = await sdk.privateToPublic(spendingSecret);
+              const ownerHash = await sdk.poseidon([spendingSecret]);
               const expectedCommitment = await sdk.poseidon([
                 amount,
-                pubkey.x,
-                pubkey.y,
+                ownerHash,
                 blinding,
                 BigInt(origin),
                 BigInt(token)
@@ -1606,7 +1605,7 @@ function usePoolTransfer(config) {
           getMerkleProofsForNotes,
           buildUPPTransferCircuitInputs
         } = transferModule;
-        const { generateUPPProof, formatProofForContract } = proofModule;
+        const { generateUPPProof, formatPlonkProofForContract } = proofModule;
         const { generateASPProof: generateASPProof2, DEMO_ASP_ID } = aspModule;
         setStage("syncing_merkle");
         const { tree, leaves } = await syncMerkleTree(cfg.publicClient, cfg.poolAddress);
@@ -1640,20 +1639,10 @@ function usePoolTransfer(config) {
           circuitInputs,
           cfg.circuitBaseUrl ?? "/circuits/"
         );
-        const formattedProof = formatProofForContract(proof);
-        const proofArray = [
-          formattedProof.a[0],
-          formattedProof.a[1],
-          formattedProof.b[0][0],
-          formattedProof.b[0][1],
-          formattedProof.b[1][0],
-          formattedProof.b[1][1],
-          formattedProof.c[0],
-          formattedProof.c[1]
-        ];
+        const formattedProof = await formatPlonkProofForContract(proof);
         return {
           circuit: "transfer",
-          proof: proofArray,
+          proof: formattedProof,
           nullifier: toHex(BigInt(circuitInputs.nullifier), { size: 32 }),
           stateRoot: BigInt(circuitInputs.stateRoot),
           aspRoot: BigInt(circuitInputs.aspRoot),
@@ -1761,7 +1750,7 @@ function useWithdraw(config) {
           import('../index.js')
         ]);
         const { syncMerkleTree, getMerkleProofsForNotes } = transferModule;
-        const { generateUPPProof, formatProofForContract } = proofModule;
+        const { generateUPPProof, formatPlonkProofForContract } = proofModule;
         setStage("syncing_merkle");
         const { tree, leaves } = await syncMerkleTree(cfg.publicClient, cfg.poolAddress);
         const spendableNote = {
@@ -1826,20 +1815,10 @@ function useWithdraw(config) {
           circuitInputs,
           cfg.circuitBaseUrl ?? "/circuits/"
         );
-        const formattedProof = formatProofForContract(proof);
+        const formattedProof = await formatPlonkProofForContract(proof);
         const stateRoot = stateRootBI;
-        const proofArray = [
-          formattedProof.a[0],
-          formattedProof.a[1],
-          formattedProof.b[0][0],
-          formattedProof.b[0][1],
-          formattedProof.b[1][0],
-          formattedProof.b[1][1],
-          formattedProof.c[0],
-          formattedProof.c[1]
-        ];
         return {
-          proof: proofArray,
+          proof: formattedProof,
           nullifier: toHex(nullifier, { size: 32 }),
           stateRoot,
           aspRoot,
@@ -2142,7 +2121,7 @@ function useSwap(config) {
           import('../asp-72WUGTQE.js')
         ]);
         const { syncMerkleTree, getMerkleProofsForNotes } = transferModule;
-        const { generateUPPProof, formatProofForContract } = proofModule;
+        const { generateUPPProof, formatPlonkProofForContract } = proofModule;
         const { generateASPProof: generateASPProof2 } = aspModule;
         setStage("syncing_merkle");
         const { tree, leaves } = await syncMerkleTree(cfg.publicClient, cfg.poolAddress);
@@ -2207,23 +2186,13 @@ function useSwap(config) {
           circuitInputs,
           cfg.circuitBaseUrl ?? "/circuits/"
         );
-        const formattedProof = formatProofForContract(proof);
-        const proofArray = [
-          formattedProof.a[0],
-          formattedProof.a[1],
-          formattedProof.b[0][0],
-          formattedProof.b[0][1],
-          formattedProof.b[1][0],
-          formattedProof.b[1][1],
-          formattedProof.c[0],
-          formattedProof.c[1]
-        ];
+        const formattedProof = await formatPlonkProofForContract(proof);
         const cancelSecret = generateCancelSecret();
         const cancelKeyHash = computeCancelKeyHash(cancelSecret);
         const currentBlock = await cfg.publicClient.getBlockNumber();
         const expiry = currentBlock + expiryBlocks;
         return {
-          proof: proofArray,
+          proof: formattedProof,
           nullifier: toHex(nullifier, { size: 32 }),
           stateRoot: stateRootBI,
           aspRoot: aspProofData.aspRoot,
@@ -2294,7 +2263,7 @@ function useSwap(config) {
           import('../asp-72WUGTQE.js')
         ]);
         const { syncMerkleTree, getMerkleProofsForNotes } = transferModule;
-        const { generateUPPProof, formatProofForContract } = proofModule;
+        const { generateUPPProof, formatPlonkProofForContract } = proofModule;
         const { generateASPProof: generateASPProof2 } = aspModule;
         const fillerOrigin = ethAddress ? BigInt(ethAddress) : BigInt(masterKeys.ownerHash);
         const fillerNoteData = await createNoteForSelf(
@@ -2365,24 +2334,14 @@ function useSwap(config) {
           circuitInputs,
           cfg.circuitBaseUrl ?? "/circuits/"
         );
-        const formattedProof = formatProofForContract(proof);
-        const proofArray = [
-          formattedProof.a[0],
-          formattedProof.a[1],
-          formattedProof.b[0][0],
-          formattedProof.b[0][1],
-          formattedProof.b[1][0],
-          formattedProof.b[1][1],
-          formattedProof.c[0],
-          formattedProof.c[1]
-        ];
+        const formattedProof = await formatPlonkProofForContract(proof);
         const { encodePacked: encodePacked3 } = await import('viem');
         const packedFillerNote = encodePacked3(
           ["uint64", "uint256", "bytes"],
           [fillerNoteData.searchTag, fillerNoteData.ownerHash, fillerNoteData.encryptedNote]
         );
         return {
-          proof: proofArray,
+          proof: formattedProof,
           nullifier: toHex(nullifier, { size: 32 }),
           stateRoot: stateRootBI,
           aspRoot: aspProofData.aspRoot,
@@ -2523,7 +2482,7 @@ function useSwap(config) {
           import('../asp-72WUGTQE.js')
         ]);
         const { syncMerkleTree, getMerkleProofsForNotes, buildUPPTransferCircuitInputs } = transferModule;
-        const { generateUPPProof, formatProofForContract } = proofModule;
+        const { generateUPPProof, formatPlonkProofForContract } = proofModule;
         const { generateASPProof: generateASPProof2, DEMO_ASP_ID } = aspModule;
         setStage("syncing_merkle");
         const { tree, leaves } = await syncMerkleTree(cfg.publicClient, cfg.poolAddress);
@@ -2553,17 +2512,7 @@ function useSwap(config) {
           circuitInputs,
           cfg.circuitBaseUrl ?? "/circuits/"
         );
-        const formattedProof = formatProofForContract(proof);
-        const proofArray = [
-          formattedProof.a[0],
-          formattedProof.a[1],
-          formattedProof.b[0][0],
-          formattedProof.b[0][1],
-          formattedProof.b[1][0],
-          formattedProof.b[1][1],
-          formattedProof.c[0],
-          formattedProof.c[1]
-        ];
+        const formattedProof = await formatPlonkProofForContract(proof);
         const { encodePacked: encodePacked3 } = await import('viem');
         const packNote = (n) => encodePacked3(
           ["uint64", "uint256", "bytes"],
@@ -2597,7 +2546,7 @@ function useSwap(config) {
           timestamp: Date.now()
         };
         return {
-          proof: proofArray,
+          proof: formattedProof,
           nullifier: toHex(BigInt(circuitInputs.nullifier), { size: 32 }),
           stateRoot: BigInt(circuitInputs.stateRoot),
           aspRoot: BigInt(circuitInputs.aspRoot),