@hinkal/common 0.2.26 → 0.2.28

package/functions/snarkjs/constructSolanaZkProof.mjs

@@ -1,104 +1,98 @@
 import "../../types/circom-data.types.mjs";
+import { chainIds as ot } from "../../constants/chains.constants.mjs";
 import "../../types/activities.types.mjs";
 import "ethers";
 import "circomlibjs-hinkal-fork";
 import "../../error-handling/error-codes.constants.mjs";
 import "../../data-structures/crypto-keys/keys.mjs";
-import { chainIds as mt } from "../../constants/chains.constants.mjs";
 import "../../constants/server.constants.mjs";
-import "../../constants/vite.constants.mjs";
+import "../../API/getServerURL.mjs";
 import "../../data-structures/http/HttpClient.mjs";
 import "axios";
+import "../../constants/vite.constants.mjs";
 import "../../constants/token-data/index.mjs";
-import "../../API/getServerURL.mjs";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
+import "../../constants/tokens.constants.mjs";
 import { PublicKey as r } from "@solana/web3.js";
+import "tronweb";
 import { encodeToByte32Array as n } from "../pre-transaction/solana.mjs";
 import "@solana/spl-token";
+import "tweetnacl";
+import "bs58";
+import "@coral-xyz/anchor";
+import "buffer";
+import { calcAmountChanges as mt } from "./common.snarkjs.mjs";
+import "lodash";
+import "../../API/enclaveUtxoCalls.mjs";
 import { formatMintAddress as at } from "../utils/solanaMint.utils.mjs";
-import { calcAmountChanges as it } from "./common.snarkjs.mjs";
-import { hinkalCheckSolanaTokenRegistry as nt } from "../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.mjs";
-import { generateZkProof as rt } from "./generateZkProof.mjs";
-import { WorkerVariant as et } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as pt } from "../../webworker/performTaskWithWorker.mjs";
-import { ZKProofWorkerActionType as ct } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { getSolanaCalldataHash as st } from "../pre-transaction/getSolanaCalldataHash.mjs";
-import { getMerkleTreeSiblingsAndRootHashes as lt } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-const Ft = async (u, S, k, d, e, P, p, m, a, b, h, A, C, I, i, T, c = mt.solanaLocalnet, B = !1, w = m.map(() => !1), K = 0n, H = [], y = [], R = !0) => {
-  const s = "v1x1", v = new r(C), z = new r(I), L = e.getShieldedPrivateKey(), l = p.map((t) => at(t)), N = l.map((t) => t.mintAccountPart1), W = l.map((t) => t.mintAccountPart2), Z = st(
+import { hinkalCheckSolanaTokenRegistry as it } from "../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.mjs";
+import { generateZkProof as nt } from "./generateZkProof.mjs";
+import { getSolanaCalldataHash as rt } from "../pre-transaction/getSolanaCalldataHash.mjs";
+import { getDataFromWorkers as et } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+const Ft = async (g, u, S, b, e, P, p, m, a, d, k, h, C, A, i, B, c = ot.solanaLocalnet, I = !1, T = m.map(() => !1), w = 0n, H = [], K = []) => {
+  const s = "v1x1", v = new r(C), z = new r(A), $ = e.getShieldedPrivateKey(), l = p.map((t) => at(t)), R = l.map((t) => t.mintAccountPart1), D = l.map((t) => t.mintAccountPart2), N = rt(
     i,
     v,
     z,
-    T,
+    B,
+    k,
     h,
-    A,
     H,
-    y
-  ), $ = `${i.tokenNumber}x${i.nullifierAmount}x${i.outputAmount}`, f = it(m, a), D = await nt(
+    K
+  ), Z = `${i.tokenNumber}x${i.nullifierAmount}x${i.outputAmount}`, f = mt(m, a), q = await it(
     P,
-    new r(S),
+    new r(u),
     p,
     f
-  ), g = m.map((t) => t.map((o) => o.getConstructableParams())), {
-    inCommitmentSiblings: M,
-    inCommitmentSiblingSides: V,
-    accessTokenSiblings: _,
-    accessTokenSiblingSides: q,
-    rootHashHinkal: E,
-    rootHashAccessToken: F
-  } = await lt(
+  ), y = m.map((t) => t.map((o) => o.getConstructableParams())), {
+    inCommitmentSiblings: F,
+    inCommitmentSiblingSides: L,
+    accessTokenSiblings: M,
+    accessTokenSiblingSides: V,
+    rootHashHinkal: W,
+    rootHashAccessToken: j,
+    inNullifiers: E
+  } = await et(
     c,
+    S,
+    b,
     e,
-    g,
-    B,
-    D,
-    k,
-    d,
-    R
-  ), j = await pt({
-    type: et.ZKProof,
-    payload: {
-      type: ct.BUILD_IN_NULLIFIERS,
-      data: { inputUtxosSerialized: g, onChainCreation: w, proverVersion: s }
-    }
-  }), G = {
-    rootHashHinkal: E,
-    shieldedPrivateKey: L,
-    rootHashAccessToken: F,
-    accessTokenSiblings: _,
-    accessTokenSiblingSides: q,
-    mintAccountPart1: N,
-    mintAccountPart2: W,
+    y,
+    I,
+    q,
+    T,
+    s
+  ), G = {
+    rootHashHinkal: W,
+    shieldedPrivateKey: $,
+    rootHashAccessToken: j,
+    accessTokenSiblings: M,
+    accessTokenSiblingSides: V,
+    mintAccountPart1: R,
+    mintAccountPart2: D,
     inAmounts: m.map((t) => t.map((o) => o.amount)),
     inTimeStamps: m.map((t) => t.map((o) => o.timeStamp)),
     inRandomizations: m.map((t) => t.map((o) => o.randomization)),
-    inNullifiers: j,
-    inCommitmentSiblings: M,
-    inCommitmentSiblingSides: V,
+    inNullifiers: E,
+    inCommitmentSiblings: F,
+    inCommitmentSiblingSides: L,
     outAmounts: a.map((t) => t.map((o) => o.amount.toString())),
     outTimeStamp: BigInt(a[0][0].timeStamp),
     outPublicKeys: a.map((t) => t.map((o) => o.getStealthAddress())),
-    extraRandomization: b,
+    extraRandomization: d,
     amountChanges: f,
     outCommitments: a.map(
       (t) => t.map((o) => o.amount === 0n ? 0n : o.getCommitment())
     ),
-    calldataHash: Z,
-    swapperAccountSalt: K
-  }, { publicSignals: J, zkCallData: O } = await rt(
+    calldataHash: N,
+    swapperAccountSalt: w
+  }, { publicSignals: J, zkCallData: O } = await nt(
     s,
     c,
-    `basicSolana${$}`,
+    `basicSolana${Z}`,
     G,
-    u
-  ), [Q, X, Y] = O, x = Q.map(BigInt).map(n).flat(), U = X.flat().map(BigInt).map(n).flat(), tt = Y.map(BigInt).map(n).flat(), ot = J.map(BigInt).map(n);
-  return { proofAArr: x, proofBArr: U, proofCArr: tt, publicInputsArr: ot };
+    g
+  ), [Q, X, Y] = O, _ = Q.map(BigInt).map(n).flat(), x = X.flat().map(BigInt).map(n).flat(), U = Y.map(BigInt).map(n).flat(), tt = J.map(BigInt).map(n);
+  return { proofAArr: _, proofBArr: x, proofCArr: U, publicInputsArr: tt };
 };
 export {
   Ft as constructSolanaZkProof

package/functions/snarkjs/fetchMerkleTreeSiblings.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../API/getServerURL.cjs"),a=require("../../constants/server.constants.cjs"),l=require("../../data-structures/http/HttpClient.cjs"),c=async(t,r,n)=>{const i=r.map(s=>s.map(e=>({...e,amount:e.amount.toString(),randomization:e.randomization?.toString()})));return await l.httpClient.post(`${o.getSnapshotServerURL(t)}${a.API_CONFIG.ROUTES.getMerkleTreeSiblings}`,{inputUtxosSerialized:i,accessKey:n})};exports.fetchMerkleTreeSiblings=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../API/getServerURL.cjs"),a=require("../../constants/server.constants.cjs"),l=require("../../data-structures/http/HttpClient.cjs"),S=async(t,r,n)=>{const i=r.map(s=>s.map(e=>({...e,amount:e.amount.toString(),randomization:e.randomization?.toString()})));return await l.httpClient.post(`${o.SNAPSHOT_SERVER_URL}${a.API_CONFIG.ROUTES.getMerkleTreeSiblings}`,{inputUtxosSerialized:i,accessKey:n,chainId:t})};exports.fetchMerkleTreeSiblings=S;

package/functions/snarkjs/fetchMerkleTreeSiblings.mjs

@@ -1,22 +1,23 @@
-import { getSnapshotServerURL as s } from "../../API/getServerURL.mjs";
+import { SNAPSHOT_SERVER_URL as s } from "../../API/getServerURL.mjs";
 import { API_CONFIG as a } from "../../constants/server.constants.mjs";
-import { httpClient as p } from "../../data-structures/http/HttpClient.mjs";
-const c = async (e, r, o) => {
-  const n = r.map(
-    (i) => i.map((t) => ({
+import { httpClient as m } from "../../data-structures/http/HttpClient.mjs";
+const g = async (e, o, r) => {
+  const i = o.map(
+    (n) => n.map((t) => ({
       ...t,
       amount: t.amount.toString(),
       randomization: t.randomization?.toString()
     }))
   );
-  return await p.post(
-    `${s(e)}${a.ROUTES.getMerkleTreeSiblings}`,
+  return await m.post(
+    `${s}${a.ROUTES.getMerkleTreeSiblings}`,
     {
-      inputUtxosSerialized: n,
-      accessKey: o
+      inputUtxosSerialized: i,
+      accessKey: r,
+      chainId: e
     }
   );
 };
 export {
-  c as fetchMerkleTreeSiblings
+  g as fetchMerkleTreeSiblings
 };

package/functions/snarkjs/fetchOnChainRootHashes.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("../../types/ethereum-network.types.cjs"),o=require("../web3/getContractMetadata.cjs"),r=async t=>{const a=o.getContractWithFetcherByChainId(t,e.ContractType.HinkalContract),n=o.getContractWithFetcherByChainId(t,e.ContractType.AccessTokenContract),[c,s]=await Promise.all([a.getRootHash(),n.getRootHash()]);return{hinkalRootHash:c,accessTokenRootHash:s}};exports.fetchOnChainRootHashes=r;

package/functions/snarkjs/fetchOnChainRootHashes.d.ts

@@ -0,0 +1,4 @@
+export declare const fetchOnChainRootHashes: (chainId: number) => Promise<{
+    hinkalRootHash: bigint;
+    accessTokenRootHash: bigint;
+}>;

package/functions/snarkjs/fetchOnChainRootHashes.mjs

@@ -0,0 +1,15 @@
+import { ContractType as o } from "../../types/ethereum-network.types.mjs";
+import { getContractWithFetcherByChainId as a } from "../web3/getContractMetadata.mjs";
+const i = async (t) => {
+  const n = a(t, o.HinkalContract), c = a(t, o.AccessTokenContract), [s, e] = await Promise.all([
+    n.getRootHash(),
+    c.getRootHash()
+  ]);
+  return {
+    hinkalRootHash: s,
+    accessTokenRootHash: e
+  };
+};
+export {
+  i as fetchOnChainRootHashes
+};

package/functions/snarkjs/generateCircomData.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../constants/protocol.constants.cjs"),_=require("../../types/circom-data.types.cjs"),z=require("../utils/external-action.utils.cjs"),I=require("./getOriginalSender.cjs"),L=async(s,g,l,d,u,m,S,j,a,D,p,f,i,t,A,o,h,k,C,q,y,b,v,x,H,O=n.defaultSignatureData,V)=>{const c={rootHashHinkal:d,erc20TokenAddresses:S,tokenIds:k.map(e=>String(e)),amountChanges:m,inputNullifiers:l,outCommitments:g,encryptedOutputs:D,timeStamp:a.length>0?a[0][0].timeStamp:String(b??""),stealthAddressStructure:C,rootHashAccessToken:u,relay:o,externalAddress:t===void 0?n.zeroAddress:t,externalActionMetadata:A,externalActionId:typeof i=="bigint"?0n:z.getExternalActionIdHash(i),hookData:y||_.defaultHookData,publicSignalCount:f,calldataHash:h};if(s==="v1x0"){const e=c;return e.flatFees=p,e}else{const e=c;e.onChainCreation=q,e.slippageValues=x;const r=structuredClone(v);return"interactionAddress"in r&&delete r.interactionAddress,e.hinkalLogicArgs=r,e.feeStructure={...H},e.signatureData=O,e.originalSender=V??I.getOriginalSender(t??n.zeroAddress,o),e}};exports.generateCircomData=L;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../../constants/protocol.constants.cjs"),_=require("../../types/circom-data.types.cjs"),v=require("../utils/external-action.utils.cjs"),z=require("./getOriginalSender.cjs"),I=(o,c,s,g,d,l,i,u,m,n,e,S,a,D,A,f,p,k,h,q,b,y,C=r.defaultSignatureData,H)=>{const t=structuredClone(q);return"interactionAddress"in t&&delete t.interactionAddress,{rootHashHinkal:s,erc20TokenAddresses:l,tokenIds:A.map(O=>String(O)),amountChanges:d,inputNullifiers:c,outCommitments:o,encryptedOutputs:u,timeStamp:i.length>0?i[0][0].timeStamp:String(h??""),stealthAddressStructure:f,rootHashAccessToken:g,relay:a,externalAddress:e===void 0?r.zeroAddress:e,externalActionMetadata:S,externalActionId:typeof n=="bigint"?0n:v.getExternalActionIdHash(n),hookData:k||_.defaultHookData,publicSignalCount:m,calldataHash:D,onChainCreation:p,slippageValues:b,hinkalLogicArgs:t,feeStructure:{...y},signatureData:C,originalSender:H??z.getOriginalSender(e??r.zeroAddress,a)}};exports.generateCircomData=I;

package/functions/snarkjs/generateCircomData.d.ts

@@ -1,5 +1,5 @@
-import { FeeStructure, HinkalLogicArgs, ProverVersion } from '../../types/hinkal.types';
+import { FeeStructure, HinkalLogicArgs } from '../../types/hinkal.types';
 import { Utxo } from '../../data-structures/utxo/Utxo';
-import { CircomDataBaseType, HookDataType, StealthAddressStructure } from '../../types/circom-data.types';
+import { CircomDataType, HookDataType, StealthAddressStructure } from '../../types/circom-data.types';
 import { ExternalActionId } from '../../types/external-action.types';
-export declare const generateCircomData: (proverVersion: ProverVersion, outCommitments: string[][], inputNullifiers: string[][], rootHashHinkal: bigint | undefined, rootHashAccessToken: bigint | undefined, amountChanges: bigint[], erc20TokenAddresses: string[], inputUtxos: Utxo[][], outputUtxos: Utxo[][], encryptedOutputs: string[][], flatFees: bigint[], publicSignalCount: number, externalActionId: ExternalActionId | bigint, externalAddress: string | undefined, externalActionMetadata: string, relay: string, calldataHash: bigint, tokenIds: number[], stealthAddressStructure: StealthAddressStructure, onChainCreation: boolean[], hookData: HookDataType | undefined, timeStampFallback: number | undefined, hinkalLogicArgs: HinkalLogicArgs, slippageValues: bigint[], feeStructure: FeeStructure, signatureData?: import('../../index.ts').SignatureData, originalSender?: string) => Promise<CircomDataBaseType>;
+export declare const generateCircomData: (outCommitments: string[][], inputNullifiers: string[][], rootHashHinkal: bigint | undefined, rootHashAccessToken: bigint | undefined, amountChanges: bigint[], erc20TokenAddresses: string[], outputUtxos: Utxo[][], encryptedOutputs: string[][], publicSignalCount: number, externalActionId: ExternalActionId | bigint, externalAddress: string | undefined, externalActionMetadata: string, relay: string, calldataHash: bigint, tokenIds: number[], stealthAddressStructure: StealthAddressStructure, onChainCreation: boolean[], hookData: HookDataType | undefined, timeStampFallback: number | undefined, hinkalLogicArgs: HinkalLogicArgs, slippageValues: bigint[], feeStructure: FeeStructure, signatureData?: import('../../index.ts').SignatureData, originalSender?: string) => CircomDataType;

package/functions/snarkjs/generateCircomData.mjs

@@ -1,37 +1,35 @@
-import { zeroAddress as c, defaultSignatureData as y } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as n, defaultSignatureData as w } from "../../constants/protocol.constants.mjs";
 import { defaultHookData as z } from "../../types/circom-data.types.mjs";
 import { getExternalActionIdHash as E } from "../utils/external-action.utils.mjs";
-import { getOriginalSender as F } from "./getOriginalSender.mjs";
-const J = async (s, m, g, d, l, f, p, O, r, u, D, S, a, e, h, n, k, A, C, x, H, V, v, I, L, b = y, w) => {
-  const o = {
-    rootHashHinkal: d,
-    erc20TokenAddresses: p,
-    tokenIds: A.map((t) => String(t)),
-    amountChanges: f,
-    inputNullifiers: g,
-    outCommitments: m,
-    encryptedOutputs: u,
-    timeStamp: r.length > 0 ? r[0][0].timeStamp : String(V ?? ""),
-    stealthAddressStructure: C,
-    rootHashAccessToken: l,
-    relay: n,
-    externalAddress: e === void 0 ? c : e,
-    externalActionMetadata: h,
-    externalActionId: typeof a == "bigint" ? 0n : E(a),
-    hookData: H || z,
-    publicSignalCount: S,
-    calldataHash: k
+import { getOriginalSender as O } from "./getOriginalSender.mjs";
+const F = (a, m, c, g, d, s, e, f, l, i, t, p, o, S, u, D, k, A, h, H, C, I, L = w, b) => {
+  const r = structuredClone(H);
+  return "interactionAddress" in r && delete r.interactionAddress, {
+    rootHashHinkal: c,
+    erc20TokenAddresses: s,
+    tokenIds: u.map((v) => String(v)),
+    amountChanges: d,
+    inputNullifiers: m,
+    outCommitments: a,
+    encryptedOutputs: f,
+    timeStamp: e.length > 0 ? e[0][0].timeStamp : String(h ?? ""),
+    stealthAddressStructure: D,
+    rootHashAccessToken: g,
+    relay: o,
+    externalAddress: t === void 0 ? n : t,
+    externalActionMetadata: p,
+    externalActionId: typeof i == "bigint" ? 0n : E(i),
+    hookData: A || z,
+    publicSignalCount: l,
+    calldataHash: S,
+    onChainCreation: k,
+    slippageValues: C,
+    hinkalLogicArgs: r,
+    feeStructure: { ...I },
+    signatureData: L,
+    originalSender: b ?? O(t ?? n, o)
   };
-  if (s === "v1x0") {
-    const t = o;
-    return t.flatFees = D, t;
-  } else {
-    const t = o;
-    t.onChainCreation = x, t.slippageValues = I;
-    const i = structuredClone(v);
-    return "interactionAddress" in i && delete i.interactionAddress, t.hinkalLogicArgs = i, t.feeStructure = { ...L }, t.signatureData = b, t.originalSender = w ?? F(e ?? c, n), t;
-  }
 };
 export {
-  J as generateCircomData
+  F as generateCircomData
 };

package/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("../../data-structures/merkle-tree/MerkleTree.cjs"),b=require("../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.cjs"),h=require("../../webworker/performTaskWithWorker.cjs"),d=require("../../webworker/worker.registry.cjs"),u=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),T=require("./fetchMerkleTreeSiblings.cjs"),m=require("../utils/amounts.utils.cjs"),C=require("../../crypto/poseidon.cjs"),H=async(s,n)=>{const e=s.getRootHash();if(e===void 0)throw new Error("Root hash not available from patched merkle tree");const o=await h.performTaskWithWorker({type:d.WorkerVariant.ZKProof,payload:{type:u.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{userSignature:n,merkleTreeAccessTokenSerialized:s.toJSON()}}});return{accessTokenSiblings:o.accessTokenSiblings,accessTokenSiblingSides:o.accessTokenSiblingSides,rootHashAccessToken:e}},f=async(s,n,e,o,t,c)=>{const r=e.getSignature(),l=b.getPatchedAccessTokenMerkleTree(n,e,t,c),i=s.getRootHash();if(i===void 0)throw new Error("Root hash not available from hinkal merkle tree");const a=await H(l,r),S=await h.performTaskWithWorker({type:d.WorkerVariant.ZKProof,payload:{type:u.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:o,userSignature:r,merkleTreeSerialized:s.toJSON()}}});return{inCommitmentSiblings:S.inCommitmentSiblings,inCommitmentSiblingSides:S.inCommitmentSiblingSides,accessTokenSiblings:a.accessTokenSiblings,accessTokenSiblingSides:a.accessTokenSiblingSides,rootHashHinkal:i,rootHashAccessToken:a.rootHashAccessToken}},p=async(s,n,e,o,t)=>{const c=n.getSignature(),r=n.getAccessKey();if(!t||o){const a=A.MerkleTree.create(C.poseidonFunction,0n),S=b.getPatchedAccessTokenMerkleTree(a,n,o,t),[k,g]=await Promise.all([H(S,c),T.fetchMerkleTreeSiblings(s,e,r)]);return{inCommitmentSiblings:g.inCommitmentSiblings,inCommitmentSiblingSides:g.inCommitmentSiblingSides,accessTokenSiblings:k.accessTokenSiblings,accessTokenSiblingSides:k.accessTokenSiblingSides,rootHashHinkal:m.toBigInt(g.rootHashHinkal),rootHashAccessToken:k.rootHashAccessToken}}const i=await T.fetchMerkleTreeSiblings(s,e,r);return{inCommitmentSiblings:i.inCommitmentSiblings,inCommitmentSiblingSides:i.inCommitmentSiblingSides,accessTokenSiblings:i.accessTokenSiblings,accessTokenSiblingSides:i.accessTokenSiblingSides,rootHashHinkal:m.toBigInt(i.rootHashHinkal),rootHashAccessToken:m.toBigInt(i.rootHashAccessToken)}},M=async(s,n,e,o,t,c,r,l)=>l?f(c,r,n,e,o,t):p(s,n,e,o,t);exports.getMerkleTreeSiblingsAndRootHashes=M;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("../../data-structures/merkle-tree/MerkleTree.cjs"),C=require("../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.cjs"),m=require("../../webworker/performTaskWithWorker.cjs"),g=require("../../webworker/worker.registry.cjs"),T=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),A=require("./fetchMerkleTreeSiblings.cjs"),H=require("../utils/amounts.utils.cjs"),P=require("../../crypto/poseidon.cjs"),W=require("../../constants/vite.constants.cjs"),_=require("./fetchOnChainRootHashes.cjs"),y=async(e,i)=>{const s=e.getRootHash();if(s===void 0)throw new Error("Root hash not available from patched merkle tree");const o=await m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,data:{accessKey:i,merkleTreeAccessTokenSerialized:e.toJSON()}}});return{accessTokenSiblings:o.accessTokenSiblings,accessTokenSiblingSides:o.accessTokenSiblingSides,rootHashAccessToken:s}},N=async(e,i,s,o,t,n)=>{const a=s.getAccessKey(),r=C.getPatchedAccessTokenMerkleTree(i,a,t,n),S=e.getRootHash();if(S===void 0)throw new Error("Root hash not available from hinkal merkle tree");let l,c;return W.isNode?(l=await y(r,a),c=await m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:o,merkleTreeSerialized:e.toJSON()}}})):[l,c]=await Promise.all([y(r,a),m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:o,merkleTreeSerialized:e.toJSON()}}})]),{inCommitmentSiblings:c.inCommitmentSiblings,inCommitmentSiblingSides:c.inCommitmentSiblingSides,accessTokenSiblings:l.accessTokenSiblings,accessTokenSiblingSides:l.accessTokenSiblingSides,rootHashHinkal:S,rootHashAccessToken:l.rootHashAccessToken}},R=async(e,i,s,o,t)=>{const n=i.getAccessKey();if(!t||o){const S=u.MerkleTree.create(P.poseidonFunction,0n),l=C.getPatchedAccessTokenMerkleTree(S,n,o,t),[c,k]=await Promise.all([y(l,n),A.fetchMerkleTreeSiblings(e,s,n)]);return{inCommitmentSiblings:k.inCommitmentSiblings,inCommitmentSiblingSides:k.inCommitmentSiblingSides,accessTokenSiblings:c.accessTokenSiblings,accessTokenSiblingSides:c.accessTokenSiblingSides,rootHashHinkal:H.toBigInt(k.rootHashHinkal),rootHashAccessToken:c.rootHashAccessToken}}const r=await A.fetchMerkleTreeSiblings(e,s,n);return{inCommitmentSiblings:r.inCommitmentSiblings,inCommitmentSiblingSides:r.inCommitmentSiblingSides,accessTokenSiblings:r.accessTokenSiblings,accessTokenSiblingSides:r.accessTokenSiblingSides,rootHashHinkal:H.toBigInt(r.rootHashHinkal),rootHashAccessToken:H.toBigInt(r.rootHashAccessToken)}},I=async(e,i,s)=>{if(!i||!s)return!1;try{const o=i.getRootHash(),t=s.getRootHash();if(!o||!t)return!1;const{hinkalRootHash:n,accessTokenRootHash:a}=await _.fetchOnChainRootHashes(e);return o===n&&t===a}catch{return!1}},p=async(e,i,s,o,t,n,a)=>await I(e,n,a)?N(n,a,i,s,o,t):R(e,i,s,o,t),M=async(e,i,s,o,t,n,a,r,S)=>{if(W.isNode){const{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:k,accessTokenSiblingSides:h,rootHashHinkal:b,rootHashAccessToken:d}=await p(e,o,t,n,a,i,s),f=await m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:t,onChainCreation:r,proverVersion:S}}});return{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:k,accessTokenSiblingSides:h,rootHashHinkal:b,rootHashAccessToken:d,inNullifiers:f}}else{const[{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:k,accessTokenSiblingSides:h,rootHashHinkal:b,rootHashAccessToken:d},f]=await Promise.all([p(e,o,t,n,a,i,s),m.performTaskWithWorker({type:g.WorkerVariant.ZKProof,payload:{type:T.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:t,onChainCreation:r,proverVersion:S}}})]);return{inCommitmentSiblings:l,inCommitmentSiblingSides:c,accessTokenSiblings:k,accessTokenSiblingSides:h,rootHashHinkal:b,rootHashAccessToken:d,inNullifiers:f}}};exports.getDataFromWorkers=M;exports.getMerkleTreeSiblingsAndRootHashes=p;

package/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.d.ts

@@ -1,6 +1,8 @@
 import { MerkleTree } from '../../data-structures/merkle-tree';
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { IUtxoConstructor } from '../../data-structures/utxo/Utxo';
+import { ZKProofWorkerBuildInNullifiersReturn } from '../../webworker/zkProofWorker/zkProofWorker.types';
+import { ProverVersion } from '../../types/hinkal.types';
 interface MerkleTreeSiblingsAndRootHashes {
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];
@@ -9,5 +11,14 @@ interface MerkleTreeSiblingsAndRootHashes {
     rootHashHinkal: bigint;
     rootHashAccessToken: bigint;
 }
-export declare const getMerkleTreeSiblingsAndRootHashes: (chainId: number, userKeys: UserKeys, inputUtxosSerialized: IUtxoConstructor[][], patchAccessTokenMerkleTree: boolean, kycRequired: boolean, merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, hasLocalTrees: boolean) => Promise<MerkleTreeSiblingsAndRootHashes>;
+export declare const getMerkleTreeSiblingsAndRootHashes: (chainId: number, userKeys: UserKeys, inputUtxosSerialized: IUtxoConstructor[][], patchAccessTokenMerkleTree: boolean, kycRequired: boolean, merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>) => Promise<MerkleTreeSiblingsAndRootHashes>;
+export declare const getDataFromWorkers: (chainId: number, merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, userKeys: UserKeys, inputUtxosSerialized: IUtxoConstructor[][], patchAccessTokenMerkleTree: boolean, kycRequired: boolean, onChainCreation: boolean[], proverVersion: ProverVersion) => Promise<{
+    inCommitmentSiblings: string[][][];
+    inCommitmentSiblingSides: string[][][];
+    accessTokenSiblings: string[];
+    accessTokenSiblingSides: string[];
+    rootHashHinkal: bigint;
+    rootHashAccessToken: bigint;
+    inNullifiers: ZKProofWorkerBuildInNullifiersReturn;
+}>;
 export {};

package/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.mjs

@@ -1,92 +1,188 @@
-import { MerkleTree as p } from "../../data-structures/merkle-tree/MerkleTree.mjs";
-import { getPatchedAccessTokenMerkleTree as b } from "../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs";
-import { performTaskWithWorker as h } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as d } from "../../webworker/worker.registry.mjs";
-import { ZKProofWorkerActionType as H } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { fetchMerkleTreeSiblings as T } from "./fetchMerkleTreeSiblings.mjs";
-import { toBigInt as k } from "../utils/amounts.utils.mjs";
-import { poseidonFunction as C } from "../../crypto/poseidon.mjs";
-const f = async (o, s) => {
+import { MerkleTree as R } from "../../data-structures/merkle-tree/MerkleTree.mjs";
+import { getPatchedAccessTokenMerkleTree as A } from "../../data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs";
+import { performTaskWithWorker as g } from "../../webworker/performTaskWithWorker.mjs";
+import { WorkerVariant as k } from "../../webworker/worker.registry.mjs";
+import { ZKProofWorkerActionType as b } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { fetchMerkleTreeSiblings as C } from "./fetchMerkleTreeSiblings.mjs";
+import { toBigInt as d } from "../utils/amounts.utils.mjs";
+import { poseidonFunction as I } from "../../crypto/poseidon.mjs";
+import { isNode as N } from "../../constants/vite.constants.mjs";
+import { fetchOnChainRootHashes as _ } from "./fetchOnChainRootHashes.mjs";
+const p = async (o, n) => {
   const e = o.getRootHash();
   if (e === void 0)
     throw new Error("Root hash not available from patched merkle tree");
-  const i = await h({
-    type: d.ZKProof,
+  const s = await g({
+    type: k.ZKProof,
     payload: {
-      type: H.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
+      type: b.CALC_ACCESS_TOKEN_SIBLING_AND_SIDES,
       data: {
-        userSignature: s,
+        accessKey: n,
         merkleTreeAccessTokenSerialized: o.toJSON()
       }
     }
   });
   return {
-    accessTokenSiblings: i.accessTokenSiblings,
-    accessTokenSiblingSides: i.accessTokenSiblingSides,
+    accessTokenSiblings: s.accessTokenSiblings,
+    accessTokenSiblingSides: s.accessTokenSiblingSides,
     rootHashAccessToken: e
   };
-}, A = async (o, s, e, i, t, c) => {
-  const a = e.getSignature(), l = b(
-    s,
-    e,
-    t,
-    c
-  ), n = o.getRootHash();
-  if (n === void 0)
+}, L = async (o, n, e, s, i, t) => {
+  const c = e.getAccessKey(), a = A(
+    n,
+    c,
+    i,
+    t
+  ), m = o.getRootHash();
+  if (m === void 0)
     throw new Error("Root hash not available from hinkal merkle tree");
-  const r = await f(l, a), m = await h({
-    type: d.ZKProof,
+  let l, r;
+  return N ? (l = await p(a, c), r = await g({
+    type: k.ZKProof,
     payload: {
-      type: H.CALC_COMMITMENTS_SIBLING_AND_SIDES,
-      data: { inputUtxosSerialized: i, userSignature: a, merkleTreeSerialized: o.toJSON() }
+      type: b.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+      data: { inputUtxosSerialized: s, merkleTreeSerialized: o.toJSON() }
     }
-  });
-  return {
-    inCommitmentSiblings: m.inCommitmentSiblings,
-    inCommitmentSiblingSides: m.inCommitmentSiblingSides,
-    accessTokenSiblings: r.accessTokenSiblings,
-    accessTokenSiblingSides: r.accessTokenSiblingSides,
-    rootHashHinkal: n,
-    rootHashAccessToken: r.rootHashAccessToken
+  })) : [l, r] = await Promise.all([
+    p(a, c),
+    g({
+      type: k.ZKProof,
+      payload: {
+        type: b.CALC_COMMITMENTS_SIBLING_AND_SIDES,
+        data: { inputUtxosSerialized: s, merkleTreeSerialized: o.toJSON() }
+      }
+    })
+  ]), {
+    inCommitmentSiblings: r.inCommitmentSiblings,
+    inCommitmentSiblingSides: r.inCommitmentSiblingSides,
+    accessTokenSiblings: l.accessTokenSiblings,
+    accessTokenSiblingSides: l.accessTokenSiblingSides,
+    rootHashHinkal: m,
+    rootHashAccessToken: l.rootHashAccessToken
   };
-}, u = async (o, s, e, i, t) => {
-  const c = s.getSignature(), a = s.getAccessKey();
-  if (!t || i) {
-    const r = p.create(C, 0n), m = b(
-      r,
+}, w = async (o, n, e, s, i) => {
+  const t = n.getAccessKey();
+  if (!i || s) {
+    const m = R.create(I, 0n), l = A(
+      m,
+      t,
       s,
-      i,
-      t
-    ), [S, g] = await Promise.all([
-      f(m, c),
-      T(o, e, a)
+      i
+    ), [r, S] = await Promise.all([
+      p(l, t),
+      C(o, e, t)
     ]);
     return {
-      inCommitmentSiblings: g.inCommitmentSiblings,
-      inCommitmentSiblingSides: g.inCommitmentSiblingSides,
-      accessTokenSiblings: S.accessTokenSiblings,
-      accessTokenSiblingSides: S.accessTokenSiblingSides,
-      rootHashHinkal: k(g.rootHashHinkal),
-      rootHashAccessToken: S.rootHashAccessToken
+      inCommitmentSiblings: S.inCommitmentSiblings,
+      inCommitmentSiblingSides: S.inCommitmentSiblingSides,
+      accessTokenSiblings: r.accessTokenSiblings,
+      accessTokenSiblingSides: r.accessTokenSiblingSides,
+      rootHashHinkal: d(S.rootHashHinkal),
+      rootHashAccessToken: r.rootHashAccessToken
     };
   }
-  const n = await T(o, e, a);
+  const a = await C(o, e, t);
   return {
-    inCommitmentSiblings: n.inCommitmentSiblings,
-    inCommitmentSiblingSides: n.inCommitmentSiblingSides,
-    accessTokenSiblings: n.accessTokenSiblings,
-    accessTokenSiblingSides: n.accessTokenSiblingSides,
-    rootHashHinkal: k(n.rootHashHinkal),
-    rootHashAccessToken: k(n.rootHashAccessToken)
+    inCommitmentSiblings: a.inCommitmentSiblings,
+    inCommitmentSiblingSides: a.inCommitmentSiblingSides,
+    accessTokenSiblings: a.accessTokenSiblings,
+    accessTokenSiblingSides: a.accessTokenSiblingSides,
+    rootHashHinkal: d(a.rootHashHinkal),
+    rootHashAccessToken: d(a.rootHashAccessToken)
   };
-}, I = async (o, s, e, i, t, c, a, l) => l ? A(
+}, P = async (o, n, e) => {
+  if (!n || !e)
+    return !1;
+  try {
+    const s = n.getRootHash(), i = e.getRootHash();
+    if (!s || !i)
+      return !1;
+    const { hinkalRootHash: t, accessTokenRootHash: c } = await _(o);
+    return s === t && i === c;
+  } catch {
+    return !1;
+  }
+}, y = async (o, n, e, s, i, t, c) => await P(o, t, c) ? L(
+  t,
   c,
-  a,
-  s,
+  n,
   e,
-  i,
-  t
-) : u(o, s, e, i, t);
+  s,
+  i
+) : w(o, n, e, s, i), v = async (o, n, e, s, i, t, c, a, m) => {
+  if (N) {
+    const {
+      inCommitmentSiblings: l,
+      inCommitmentSiblingSides: r,
+      accessTokenSiblings: S,
+      accessTokenSiblingSides: h,
+      rootHashHinkal: T,
+      rootHashAccessToken: f
+    } = await y(
+      o,
+      s,
+      i,
+      t,
+      c,
+      n,
+      e
+    ), H = await g({
+      type: k.ZKProof,
+      payload: {
+        type: b.BUILD_IN_NULLIFIERS,
+        data: { inputUtxosSerialized: i, onChainCreation: a, proverVersion: m }
+      }
+    });
+    return {
+      inCommitmentSiblings: l,
+      inCommitmentSiblingSides: r,
+      accessTokenSiblings: S,
+      accessTokenSiblingSides: h,
+      rootHashHinkal: T,
+      rootHashAccessToken: f,
+      inNullifiers: H
+    };
+  } else {
+    const [
+      {
+        inCommitmentSiblings: l,
+        inCommitmentSiblingSides: r,
+        accessTokenSiblings: S,
+        accessTokenSiblingSides: h,
+        rootHashHinkal: T,
+        rootHashAccessToken: f
+      },
+      H
+    ] = await Promise.all([
+      y(
+        o,
+        s,
+        i,
+        t,
+        c,
+        n,
+        e
+      ),
+      g({
+        type: k.ZKProof,
+        payload: {
+          type: b.BUILD_IN_NULLIFIERS,
+          data: { inputUtxosSerialized: i, onChainCreation: a, proverVersion: m }
+        }
+      })
+    ]);
+    return {
+      inCommitmentSiblings: l,
+      inCommitmentSiblingSides: r,
+      accessTokenSiblings: S,
+      accessTokenSiblingSides: h,
+      rootHashHinkal: T,
+      rootHashAccessToken: f,
+      inNullifiers: H
+    };
+  }
+};
 export {
-  I as getMerkleTreeSiblingsAndRootHashes
+  v as getDataFromWorkers,
+  y as getMerkleTreeSiblingsAndRootHashes
 };

package/functions/snarkjs/getZKFiles.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../constants/chains.constants.cjs"),o=require("./constant.cjs"),l=(e,i,t)=>{const r=e==="v1x0"?"":e;if(t===s.chainIds.localhost||t===s.chainIds.solanaLocalnet)return o.localVerifiers[`${i}${r}Wasm`];const c=o.prodVerifiers(t,e)[`${i}${r}Wasm`];return console.log({verifier:c}),c},a=(e,i,t)=>{const r=e==="v1x0"?"":e;return t===s.chainIds.localhost||t===s.chainIds.solanaLocalnet?o.localVerifiers[`${i}${r}Zkey`]:o.prodVerifiers(t,e)[`${i}${r}Zkey`]};exports.getWASMFile=l;exports.getZKeyFile=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../../constants/chains.constants.cjs"),o=require("./constant.cjs"),a=(t,i,e)=>{const s=t==="v1x0"?"":t;return e===r.chainIds.localhost||e===r.chainIds.solanaLocalnet||e===r.chainIds.tronLocalnet?o.localVerifiers[`${i}${s}Wasm`]:o.prodVerifiers(e,t)[`${i}${s}Wasm`]},l=(t,i,e)=>{const s=t==="v1x0"?"":t;return e===r.chainIds.localhost||e===r.chainIds.solanaLocalnet||e===r.chainIds.tronLocalnet?o.localVerifiers[`${i}${s}Zkey`]:o.prodVerifiers(e,t)[`${i}${s}Zkey`]};exports.getWASMFile=a;exports.getZKeyFile=l;