@hinkal/common 0.2.26 → 0.2.28

package/functions/snarkjs/constructEmporiumProof.mjs

@@ -1,166 +1,156 @@
-import { Utxo as da } from "../../data-structures/utxo/Utxo.mjs";
-import { UserKeys as la } from "../../data-structures/crypto-keys/keys.mjs";
-import { zeroAddress as A, defaultSignatureData as sa } from "../../constants/protocol.constants.mjs";
-import { chainIds as ca } from "../../constants/chains.constants.mjs";
-import { ZKProofWorkerActionType as pa } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { performTaskWithWorker as fa } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as Sa } from "../../webworker/worker.registry.mjs";
-import { calcAmountChanges as D, calcEncryptedOutputs as ga, buildOutCommitments as Aa, calcPublicSignalCount as ha, getSlippageValues as Ha, createCallDataHash as wa, calcStealthAddressStructure as Ma } from "./common.snarkjs.mjs";
-import { randomBigInt as _ } from "../web3/etherFunctions.mjs";
-import { encodeEmporiumMetadata as Ca, getAuthorizationDataIfNeeded as Da } from "../private-wallet/emporium.helpers.mjs";
-import { ExternalActionId as Ta } from "../../types/external-action.types.mjs";
-import { defaultHookData as ka } from "../../types/circom-data.types.mjs";
-import { generateCircomData as za } from "./generateCircomData.mjs";
-import { generateZkProof as Wa } from "./generateZkProof.mjs";
-import { getCurrentTimeInSeconds as q } from "../utils/time.utils.mjs";
-import { defaultHinkalLogicArgs as ba } from "../../types/hinkal.types.mjs";
-import { generateFeeStructure as Ea } from "../utils/fees.utils.mjs";
-import { hinkalCheckTokenRegistry as ya, createHinkalHelperFromData as Ia } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
-import { poseidonFunction as Na } from "../../crypto/poseidon.mjs";
+import { Utxo as oa } from "../../data-structures/utxo/Utxo.mjs";
+import { zeroAddress as A, defaultSignatureData as da } from "../../constants/protocol.constants.mjs";
+import { chainIds as la } from "../../constants/chains.constants.mjs";
+import { calcAmountChanges as D, calcEncryptedOutputs as sa, buildOutCommitments as ca, calcPublicSignalCount as pa, getSlippageValues as fa, createCallDataHash as Sa, calcStealthAddressStructure as ga } from "./common.snarkjs.mjs";
+import { randomBigInt as q } from "../web3/etherFunctions.mjs";
+import { encodeEmporiumMetadata as Aa, getAuthorizationDataIfNeeded as Ha } from "../private-wallet/emporium.helpers.mjs";
+import { ExternalActionId as ha } from "../../types/external-action.types.mjs";
+import { defaultHookData as wa } from "../../types/circom-data.types.mjs";
+import { generateCircomData as Ca } from "./generateCircomData.mjs";
+import { generateZkProof as Da } from "./generateZkProof.mjs";
+import { getCurrentTimeInSeconds as Z } from "../utils/time.utils.mjs";
+import { defaultHinkalLogicArgs as Ma } from "../../types/hinkal.types.mjs";
+import { generateFeeStructure as za } from "../utils/fees.utils.mjs";
+import { hinkalCheckTokenRegistry as Ta, createHinkalHelperFromData as ba } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
+import { poseidonFunction as Ea } from "../../crypto/poseidon.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-import { getMerkleTreeSiblingsAndRootHashes as Pa } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-const mt = async (i, j, G, l, h, t, a, d, T, J, k, K, Q, z = A, o = ca.localhost, s = t.map(() => !1), H = t.map(() => 0n), c, r = void 0, X = !1, p, f = void 0, Y, W = sa, L, V = !0) => {
-  const b = D(t, a), w = ga(a), S = d.getShieldedPrivateKey(), E = da.findCorrectRandomization(_(31), S), x = await ya(
-    Y ?? Ia(o),
+import { getDataFromWorkers as Fa } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { AccountActions as Pa } from "../../data-structures/AccountActions/AccountActions.mjs";
+const Va = async (o, j, G, l, H, e, a, d, M, J, z, Q, X, T = A, r = la.localhost, s = e.map(() => !1), b = e.map(() => 0n), c, n = void 0, Y = !1, p, f = void 0, _, E = da, K) => {
+  const F = D(e, a), h = sa(a), S = d.getShieldedPrivateKey(), P = oa.findCorrectRandomization(q(31), S), V = await Ta(
+    _ ?? ba(r),
     l,
-    D(t, a, !0)
-  ), y = t.map((e) => e.map((n) => n.getConstructableParams())), {
-    inCommitmentSiblings: U,
-    inCommitmentSiblingSides: aa,
-    accessTokenSiblings: I,
-    accessTokenSiblingSides: N,
-    rootHashHinkal: P,
-    rootHashAccessToken: M
-  } = await Pa(
-    o,
-    d,
-    y,
-    X,
-    x,
+    D(e, a, !0)
+  ), L = e.map((t) => t.map((i) => i.getConstructableParams())), {
+    inCommitmentSiblings: x,
+    inCommitmentSiblingSides: U,
+    accessTokenSiblings: W,
+    accessTokenSiblingSides: k,
+    rootHashHinkal: u,
+    rootHashAccessToken: w,
+    inNullifiers: N
+  } = await Fa(
+    r,
     j,
     G,
-    V
-  ), R = await fa({
-    type: Sa.ZKProof,
-    payload: {
-      type: pa.BUILD_IN_NULLIFIERS,
-      data: { inputUtxosSerialized: y, onChainCreation: s, proverVersion: i }
-    }
-  }), F = Aa(i, a, s), C = L ?? _(31), ta = Na(C), m = {
-    rootHashHinkal: P,
+    d,
+    L,
+    Y,
+    V,
+    s,
+    o
+  ), R = ca(o, a, s), C = K ?? q(31), aa = Ea(C), m = {
+    rootHashHinkal: u,
     erc20TokenAddresses: l,
-    tokenIds: h,
-    inNullifiers: R,
-    outTimeStamp: a.length > 0 ? BigInt(a[0][0].timeStamp) : q(),
-    extraRandomization: E,
-    amountChanges: b,
-    outCommitments: F,
-    rootHashAccessToken: M,
+    tokenIds: H,
+    inNullifiers: N,
+    outTimeStamp: a.length > 0 ? BigInt(a[0][0].timeStamp) : Z(),
+    extraRandomization: P,
+    amountChanges: F,
+    outCommitments: R,
+    rootHashAccessToken: w,
     calldataHash: 0n,
     shieldedPrivateKey: S,
-    accessTokenSiblings: I,
-    accessTokenSiblingSides: N,
-    outAmounts: a.map((e) => e.map((n) => n.amount)),
-    outPublicKeys: a.map((e) => e.map((n) => n.getStealthAddress())),
-    inAmounts: t.map((e) => e.map((n) => n.amount.toString())),
-    inTimeStamps: t.map((e) => e.map((n) => n.timeStamp)),
-    inRandomizations: t.map((e) => e.map((n) => n.randomization)),
-    inCommitmentSiblings: U,
-    inCommitmentSiblingSides: aa,
+    accessTokenSiblings: W,
+    accessTokenSiblingSides: k,
+    outAmounts: a.map((t) => t.map((i) => i.amount)),
+    outPublicKeys: a.map((t) => t.map((i) => i.getStealthAddress())),
+    inAmounts: e.map((t) => t.map((i) => i.amount.toString())),
+    inTimeStamps: e.map((t) => t.map((i) => i.timeStamp)),
+    inRandomizations: e.map((t) => t.map((i) => i.randomization)),
+    inCommitmentSiblings: x,
+    inCommitmentSiblingSides: U,
     messageSeed: C
-  }, ea = c ? la.getSignerAddressFromPrivateKey(o, c) : void 0, B = k, u = Ta.Emporium, v = await Ca(
-    o,
-    k,
+  }, ta = c ? Pa.getSignerAddressFromPrivateKey(r, c) : void 0, v = z, B = ha.Emporium, I = await Aa(
+    r,
+    z,
     c,
-    K,
-    ta,
-    ea
-  ), g = a.length === 0 ? "swapperMWMin0" : `swapperMW${T}x${J}x${a[0].length}`, O = ha(
+    Q,
+    aa,
+    ta
+  ), g = a.length === 0 ? "swapperMWMin0" : `swapperMW${M}x${J}x${a[0].length}`, O = pa(
     g,
     m.erc20TokenAddresses,
     m.amountChanges,
     m.inNullifiers,
     m.outCommitments,
-    h.length
+    H.length
   );
-  if (r || (r = ba(b.length, d), r.interactionAddress = "0x032f580aFFE7a5f17025fAF83c13B4277A880532", r.inHinkalAddress = d.getInHinkalAddress(r.interactionAddress)), i === "v1x1") {
-    if (m.interactionAddress = r.interactionAddress, d.getInHinkalAddress(m.interactionAddress) !== r.inHinkalAddress)
+  if (n || (n = Ma(F.length, d), n.interactionAddress = "0x032f580aFFE7a5f17025fAF83c13B4277A880532", n.inHinkalAddress = d.getInHinkalAddress(n.interactionAddress)), o === "v1x1") {
+    if (m.interactionAddress = n.interactionAddress, d.getInHinkalAddress(m.interactionAddress) !== n.inHinkalAddress)
       throw new Error("inHinkalAddress mismatch");
-    m.externalApprovalAddresses = r?.useApprovalUtxoData?.map(({ externalApprovalAddresses: e }) => e) ?? Array(T).fill([A, A, A]);
+    m.externalApprovalAddresses = n?.useApprovalUtxoData?.map(({ externalApprovalAddresses: t }) => t) ?? Array(M).fill([A, A, A]);
   }
-  f || (f = Ea(H, l));
-  const Z = D(t, a, !0);
-  p || (p = Ha(Z, r)), m.calldataHash = wa(
-    i,
+  f || (f = za(b, l));
+  const $ = D(e, a, !0);
+  p || (p = fa($, n)), m.calldataHash = Sa(
+    o,
     O,
-    z,
-    B,
-    u,
+    T,
     v,
-    w,
-    H,
+    B,
+    I,
+    h,
+    b,
     void 0,
     p,
     s,
-    r,
+    n,
     f,
-    W
+    E
   );
-  const $ = {
-    outTimeStamp: q(),
-    rootHashAccessToken: M,
+  const y = {
+    outTimeStamp: Z(),
+    rootHashAccessToken: w,
     calldataHash: m.calldataHash,
     shieldedPrivateKey: S,
-    accessTokenSiblings: I,
-    accessTokenSiblingSides: N,
+    accessTokenSiblings: W,
+    accessTokenSiblingSides: k,
     messageSeed: C
-  }, { zkCallData: ma } = await Wa(
-    i,
-    o,
-    g,
-    g === "swapperMWMin0" ? $ : m,
-    Q
-  ), ra = Ma(E, S), na = await za(
-    i,
-    F,
+  }, [{ zkCallData: ea }, ma] = await Promise.all([
+    Da(
+      o,
+      r,
+      g,
+      g === "swapperMWMin0" ? y : m,
+      X
+    ),
+    Ha(r, c)
+  ]), na = ga(P, S), ia = Ca(
     R,
-    P,
-    M,
-    Z,
+    N,
+    u,
+    w,
+    $,
     l,
-    t,
     a,
-    w,
-    H,
+    h,
     O,
-    u,
     B,
     v,
-    z,
+    I,
+    T,
     m.calldataHash,
-    h,
-    ra,
+    H,
+    na,
     s,
-    ka,
-    g === "swapperMWMin0" ? $.outTimeStamp : m.outTimeStamp,
+    wa,
+    g === "swapperMWMin0" ? y.outTimeStamp : m.outTimeStamp,
     // although these variables seem to contain the same value, there can actually be a single second difference if the timing is unlucky
-    r,
+    n,
     p,
     f,
-    W
-  ), ia = {
-    tokenNumber: t.length,
-    nullifierAmount: t.length > 0 ? t[0].length : 0,
+    E
+  ), ra = {
+    tokenNumber: e.length,
+    nullifierAmount: e.length > 0 ? e[0].length : 0,
     outputAmount: a.length > 0 ? a[0].length : 0
-  }, oa = await Da(
-    o,
-    c
-  );
-  return { zkCallData: ma, circomData: na, dimData: ia, encryptedOutputs: w, authorizationData: oa };
+  };
+  return { zkCallData: ea, circomData: ia, dimData: ra, encryptedOutputs: h, authorizationData: ma };
 };
 export {
-  mt as constructEmporiumProof
+  Va as constructEmporiumProof
 };

package/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const te=require("../../constants/chains.constants.cjs"),i=require("../../constants/protocol.constants.cjs"),ne=require("../../data-structures/utxo/Utxo.cjs"),ae=require("../../webworker/performTaskWithWorker.cjs"),re=require("../../webworker/worker.registry.cjs"),oe=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),se=require("../web3/etherFunctions.cjs"),s=require("./common.snarkjs.cjs"),ie=require("./generateCircomData.cjs"),ce=require("./generateZkProof.cjs"),de=require("../../types/hinkal.types.cjs"),me=require("../utils/fees.utils.cjs"),E=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),q=require("../../error-handling/logger.cjs"),le=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),ke=async(c,j,F,t,o,d,b,C,m,p,M,P=i.zeroAddress,S=te.chainIds.localhost,l=t.map(()=>!1),A=t.map(()=>0n),y=void 0,K=!1,a=void 0,k,g=void 0,G,z=i.defaultSignatureData,I,J=!0)=>{const R=s.calcAmountChanges(t,o),h=t.map(e=>e[0].erc20TokenAddress),f=s.calcEncryptedOutputs(o),H=d.getShieldedPrivateKey(),_=ne.Utxo.findCorrectRandomization(se.randomBigInt(31),H),Q=await E.hinkalCheckTokenRegistry(G??E.createHinkalHelperFromData(S),h,s.calcAmountChanges(t,o,!0)),w=t.map(e=>e.map(n=>n.getConstructableParams())),{inCommitmentSiblings:X,inCommitmentSiblingSides:Y,accessTokenSiblings:$,accessTokenSiblingSides:L,rootHashHinkal:D,rootHashAccessToken:W}=await le.getMerkleTreeSiblingsAndRootHashes(S,d,w,K,Q,j,F,J),Z=await ae.performTaskWithWorker({type:re.WorkerVariant.ZKProof,payload:{type:oe.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:w,onChainCreation:l,proverVersion:c}}}),v=s.buildOutCommitments(c,o,l),r={rootHashHinkal:D,shieldedPrivateKey:H,erc20TokenAddresses:h,inAmounts:t.map(e=>e.map(n=>n.amount.toString())),inTimeStamps:t.map(e=>e.map(n=>n.timeStamp)),inRandomizations:t.map(e=>e.map(n=>n.randomization)),inNullifiers:Z,inCommitmentSiblings:X,inCommitmentSiblingSides:Y,outAmounts:o.map(e=>e.map(n=>n.amount.toString())),outTimeStamp:BigInt(o[0][0].timeStamp),outPublicKeys:o.map(e=>e.map(n=>n.getStealthAddress())),extraRandomization:_,amountChanges:R,outCommitments:v,rootHashAccessToken:W,accessTokenSiblings:$,accessTokenSiblingSides:L,calldataHash:0n},u=t.map(e=>e[0].tokenId??0),B=u.reduce((e,n)=>e+n,0)>0?u.length:0;B>0&&(r.tokenIds=u);const T=s.calcPublicSignalCount(b,r.erc20TokenAddresses,r.amountChanges,r.inNullifiers,r.outCommitments,B);if(!a){a=de.defaultHinkalLogicArgs(R.length,d),a.interactionAddress=m??i.zeroAddress;const e=d.getInHinkalAddress(a.interactionAddress);a.inHinkalAddress=e}if(c==="v1x1"){if(r.interactionAddress=a?.interactionAddress??m??i.zeroAddress,d.getInHinkalAddress(r.interactionAddress)!==a.inHinkalAddress)throw new Error("inHinkalAddress mismatch");r.externalApprovalAddresses=a.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e)??[i.zeroAddress,i.zeroAddress,i.zeroAddress]}g||(g=me.generateFeeStructure(A,t.map(e=>e[0].erc20TokenAddress)));const N=s.calcAmountChanges(t,o,!0);k||(k=s.getSlippageValues(N,a)),q.Logger.log({publicSignalCount:T}),r.calldataHash=s.createCallDataHash(c,T,P,m,C,p,f,A,y,k,l,a,g,z,I);const{zkCallData:V,publicSignals:U}=await ce.generateZkProof(c,S,b,r,M);q.Logger.log({publicSignals:U});const x=s.calcStealthAddressStructure(_,H),O=await ie.generateCircomData(c,v,Z,D,W,N,h,t,o,f,A,T,C,m,p,P,r.calldataHash,u,x,l,y,void 0,a,k,g,z,I);q.Logger.log({circomData:O});const ee={tokenNumber:t.length,nullifierAmount:t[0].length,outputAmount:o[0].length};return{zkCallData:V,circomData:O,dimData:ee,encryptedOutputs:f}};exports.constructZkProof=ke;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const H=require("../../constants/chains.constants.cjs"),c=require("../../constants/protocol.constants.cjs"),ee=require("../../data-structures/utxo/Utxo.cjs"),te=require("../web3/etherFunctions.cjs"),o=require("./common.snarkjs.cjs"),ne=require("./generateCircomData.cjs"),ae=require("./generateZkProof.cjs"),se=require("../../types/hinkal.types.cjs"),re=require("../utils/fees.utils.cjs"),T=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),oe=require("../../error-handling/logger.cjs"),ce=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),ie=async(d,N,M,t,a,m,b,q,l,z,W,P=c.zeroAddress,i=H.chainIds.localhost,k=t.map(()=>!1),y=t.map(()=>0n),D=void 0,R=!1,s=void 0,u,g=void 0,G,v=c.defaultSignatureData,w)=>{const p=o.calcAmountChanges(t,a),A=t.map(e=>e[0].erc20TokenAddress),h=o.calcEncryptedOutputs(a),f=m.getShieldedPrivateKey(),_=ee.Utxo.findCorrectRandomization(te.randomBigInt(31),f),O=H.isTronLike(i)?await T.hinkalCheckTronTokenRegistry(A,o.calcAmountChanges(t,a,!0),i):await T.hinkalCheckTokenRegistry(G??T.createHinkalHelperFromData(i),A,o.calcAmountChanges(t,a,!0)),J=H.isTronLike(i)?R||O:R,Q=t.map(e=>e.map(n=>n.getConstructableParams())),{inCommitmentSiblings:X,inCommitmentSiblingSides:Y,accessTokenSiblings:$,accessTokenSiblingSides:K,rootHashHinkal:Z,rootHashAccessToken:B,inNullifiers:F}=await ce.getDataFromWorkers(i,N,M,m,Q,J,O,k,d),I=o.buildOutCommitments(d,a,k),r={rootHashHinkal:Z,shieldedPrivateKey:f,erc20TokenAddresses:A,inAmounts:t.map(e=>e.map(n=>n.amount.toString())),inTimeStamps:t.map(e=>e.map(n=>n.timeStamp)),inRandomizations:t.map(e=>e.map(n=>n.randomization)),inNullifiers:F,inCommitmentSiblings:X,inCommitmentSiblingSides:Y,outAmounts:a.map(e=>e.map(n=>n.amount.toString())),outTimeStamp:BigInt(a[0][0].timeStamp),outPublicKeys:a.map(e=>e.map(n=>n.getStealthAddress())),extraRandomization:_,amountChanges:p,outCommitments:I,rootHashAccessToken:B,accessTokenSiblings:$,accessTokenSiblingSides:K,calldataHash:0n},S=t.map(e=>e[0].tokenId??0),j=S.reduce((e,n)=>e+n,0)>0?S.length:0;j>0&&(r.tokenIds=S);const C=o.calcPublicSignalCount(b,r.erc20TokenAddresses,r.amountChanges,r.inNullifiers,r.outCommitments,j);if(!s){s=se.defaultHinkalLogicArgs(p.length,m),s.interactionAddress=l??c.zeroAddress;const e=m.getInHinkalAddress(s.interactionAddress);s.inHinkalAddress=e}if(d==="v1x1"){if(r.interactionAddress=s?.interactionAddress??l??c.zeroAddress,m.getInHinkalAddress(r.interactionAddress)!==s.inHinkalAddress)throw new Error("inHinkalAddress mismatch");r.externalApprovalAddresses=s.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e)??[c.zeroAddress,c.zeroAddress,c.zeroAddress]}g||(g=re.generateFeeStructure(y,t.map(e=>e[0].erc20TokenAddress)));const E=o.calcAmountChanges(t,a,!0);u||(u=o.getSlippageValues(E,s)),oe.Logger.log({publicSignalCount:C}),r.calldataHash=o.createCallDataHash(d,C,P,l,q,z,h,y,D,u,k,s,g,v,w);const{zkCallData:L}=await ae.generateZkProof(d,i,b,r,W),V=o.calcStealthAddressStructure(_,f),U=ne.generateCircomData(I,F,Z,B,E,A,a,h,C,q,l,z,P,r.calldataHash,S,V,k,D,void 0,s,u,g,v,w),x={tokenNumber:t.length,nullifierAmount:t[0].length,outputAmount:a[0].length};return{zkCallData:L,circomData:U,dimData:x,encryptedOutputs:h}};exports.constructZkProof=ie;

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -1,11 +1,11 @@
 import { MerkleTree } from '../../data-structures/merkle-tree';
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../data-structures/utxo/Utxo';
-import { CircomDataV1x1, DimDataType, HookDataType } from '../../types/circom-data.types';
+import { CircomDataType, DimDataType, HookDataType } from '../../types/circom-data.types';
 import { ExternalActionId } from '../../types/external-action.types';
 import { FeeStructure, HinkalLogicArgs, ProverVersion } from '../../types/hinkal.types';
 import { ethers } from 'ethers';
-export declare const constructZkProof: <T = CircomDataV1x1>(proverVersion: ProverVersion, merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, inputUtxos: Utxo[][], outputUtxos: Utxo[][], userKeys: UserKeys, verifierName: string, externalActionId: ExternalActionId | 0n, externalAddress: string | undefined, externalActionMetadata: string, generateProofRemotely: boolean, relay?: string, chainId?: number, onChainCreation?: boolean[], flatFees?: bigint[], hookData?: HookDataType | undefined, patchAccessTokenMerkleTree?: boolean, hinkalLogicArgs?: HinkalLogicArgs | undefined, slippageValues?: bigint[], feeStructure?: FeeStructure | undefined, hinkalHelper?: ethers.Contract, signatureData?: import('../../index.ts').SignatureData, originalSender?: string, hasLocalTrees?: boolean) => Promise<{
+export declare const constructZkProof: <T = CircomDataType>(proverVersion: ProverVersion, merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, inputUtxos: Utxo[][], outputUtxos: Utxo[][], userKeys: UserKeys, verifierName: string, externalActionId: ExternalActionId | 0n, externalAddress: string | undefined, externalActionMetadata: string, generateProofRemotely: boolean, relay?: string, chainId?: number, onChainCreation?: boolean[], flatFees?: bigint[], hookData?: HookDataType | undefined, patchAccessTokenMerkleTree?: boolean, hinkalLogicArgs?: HinkalLogicArgs | undefined, slippageValues?: bigint[], feeStructure?: FeeStructure | undefined, hinkalHelper?: ethers.Contract, signatureData?: import('../../index.ts').SignatureData, originalSender?: string) => Promise<{
     zkCallData: import('../../index.ts').NewZkCallDataType;
     circomData: T;
     dimData: DimDataType;

package/functions/snarkjs/constructGeneralZkProof.mjs

@@ -1,154 +1,134 @@
-import { chainIds as tt } from "../../constants/chains.constants.mjs";
-import { zeroAddress as i, defaultSignatureData as at } from "../../constants/protocol.constants.mjs";
-import { Utxo as et } from "../../data-structures/utxo/Utxo.mjs";
-import { performTaskWithWorker as mt } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as ot } from "../../webworker/worker.registry.mjs";
-import { ZKProofWorkerActionType as nt } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { randomBigInt as rt } from "../web3/etherFunctions.mjs";
-import { calcAmountChanges as b, calcEncryptedOutputs as it, buildOutCommitments as dt, calcPublicSignalCount as st, getSlippageValues as ct, createCallDataHash as lt, calcStealthAddressStructure as ft } from "./common.snarkjs.mjs";
-import { generateCircomData as pt } from "./generateCircomData.mjs";
-import { generateZkProof as kt } from "./generateZkProof.mjs";
-import { defaultHinkalLogicArgs as St } from "../../types/hinkal.types.mjs";
-import { generateFeeStructure as Ht } from "../utils/fees.utils.mjs";
-import { hinkalCheckTokenRegistry as gt, createHinkalHelperFromData as At } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
-import { Logger as h } from "../../error-handling/logger.mjs";
-import { getMerkleTreeSiblingsAndRootHashes as Tt } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-const Zt = async (r, q, F, a, n, d, C, I, s, P, K, u = i, k = tt.localhost, c = a.map(() => !1), S = a.map(() => 0n), w = void 0, j = !1, m = void 0, l, f = void 0, G, y = at, z, J = !0) => {
-  const D = b(a, n), H = a.map((t) => t[0].erc20TokenAddress), g = it(n), A = d.getShieldedPrivateKey(), R = et.findCorrectRandomization(rt(31), A), M = await gt(
-    G ?? At(k),
-    H,
-    b(a, n, !0)
-  ), v = a.map((t) => t.map((e) => e.getConstructableParams())), {
-    inCommitmentSiblings: Q,
-    inCommitmentSiblingSides: X,
-    accessTokenSiblings: Y,
-    accessTokenSiblingSides: $,
-    rootHashHinkal: B,
-    rootHashAccessToken: N
-  } = await Tt(
-    k,
-    d,
-    v,
+import { isTronLike as q, chainIds as x } from "../../constants/chains.constants.mjs";
+import { zeroAddress as i, defaultSignatureData as ee } from "../../constants/protocol.constants.mjs";
+import { Utxo as te } from "../../data-structures/utxo/Utxo.mjs";
+import { randomBigInt as ae } from "../web3/etherFunctions.mjs";
+import { calcAmountChanges as p, calcEncryptedOutputs as me, buildOutCommitments as ne, calcPublicSignalCount as oe, getSlippageValues as re, createCallDataHash as ie, calcStealthAddressStructure as de } from "./common.snarkjs.mjs";
+import { generateCircomData as se } from "./generateCircomData.mjs";
+import { generateZkProof as ce } from "./generateZkProof.mjs";
+import { defaultHinkalLogicArgs as le } from "../../types/hinkal.types.mjs";
+import { generateFeeStructure as fe } from "../utils/fees.utils.mjs";
+import { hinkalCheckTronTokenRegistry as ke, hinkalCheckTokenRegistry as Se, createHinkalHelperFromData as He } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
+import { Logger as pe } from "../../error-handling/logger.mjs";
+import { getDataFromWorkers as Ae } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+const ye = async (d, W, j, t, m, s, C, b, c, h, G, P = i, r = x.localhost, l = t.map(() => !1), z = t.map(() => 0n), D = void 0, v = !1, n = void 0, f, k = void 0, J, w = ee, R) => {
+  const u = p(t, m), S = t.map((e) => e[0].erc20TokenAddress), A = me(m), g = s.getShieldedPrivateKey(), y = te.findCorrectRandomization(ae(31), g), B = q(r) ? await ke(S, p(t, m, !0), r) : await Se(
+    J ?? He(r),
+    S,
+    p(t, m, !0)
+  ), Q = q(r) ? v || B : v, X = t.map((e) => e.map((a) => a.getConstructableParams())), {
+    inCommitmentSiblings: Y,
+    inCommitmentSiblingSides: _,
+    accessTokenSiblings: $,
+    accessTokenSiblingSides: K,
+    rootHashHinkal: I,
+    rootHashAccessToken: O,
+    inNullifiers: E
+  } = await Ae(
+    r,
+    W,
     j,
-    M,
-    q,
-    F,
-    J
-  ), W = await mt({
-    type: ot.ZKProof,
-    payload: {
-      type: nt.BUILD_IN_NULLIFIERS,
-      data: { inputUtxosSerialized: v, onChainCreation: c, proverVersion: r }
-    }
-  }), Z = dt(r, n, c), o = {
-    rootHashHinkal: B,
-    shieldedPrivateKey: A,
-    erc20TokenAddresses: H,
-    inAmounts: a.map((t) => t.map((e) => e.amount.toString())),
-    inTimeStamps: a.map((t) => t.map((e) => e.timeStamp)),
-    inRandomizations: a.map((t) => t.map((e) => e.randomization)),
-    inNullifiers: W,
-    inCommitmentSiblings: Q,
-    inCommitmentSiblingSides: X,
-    outAmounts: n.map((t) => t.map((e) => e.amount.toString())),
-    outTimeStamp: BigInt(n[0][0].timeStamp),
-    outPublicKeys: n.map((t) => t.map((e) => e.getStealthAddress())),
-    extraRandomization: R,
-    amountChanges: D,
-    outCommitments: Z,
-    rootHashAccessToken: N,
-    accessTokenSiblings: Y,
-    accessTokenSiblingSides: $,
+    s,
+    X,
+    Q,
+    B,
+    l,
+    d
+  ), F = ne(d, m, l), o = {
+    rootHashHinkal: I,
+    shieldedPrivateKey: g,
+    erc20TokenAddresses: S,
+    inAmounts: t.map((e) => e.map((a) => a.amount.toString())),
+    inTimeStamps: t.map((e) => e.map((a) => a.timeStamp)),
+    inRandomizations: t.map((e) => e.map((a) => a.randomization)),
+    inNullifiers: E,
+    inCommitmentSiblings: Y,
+    inCommitmentSiblingSides: _,
+    outAmounts: m.map((e) => e.map((a) => a.amount.toString())),
+    outTimeStamp: BigInt(m[0][0].timeStamp),
+    outPublicKeys: m.map((e) => e.map((a) => a.getStealthAddress())),
+    extraRandomization: y,
+    amountChanges: u,
+    outCommitments: F,
+    rootHashAccessToken: O,
+    accessTokenSiblings: $,
+    accessTokenSiblingSides: K,
     calldataHash: 0n
-  }, p = a.map((t) => t[0].tokenId ?? 0), E = p.reduce((t, e) => t + e, 0) > 0 ? p.length : 0;
-  E > 0 && (o.tokenIds = p);
-  const T = st(
+  }, H = t.map((e) => e[0].tokenId ?? 0), N = H.reduce((e, a) => e + a, 0) > 0 ? H.length : 0;
+  N > 0 && (o.tokenIds = H);
+  const T = oe(
     C,
     o.erc20TokenAddresses,
     o.amountChanges,
     o.inNullifiers,
     o.outCommitments,
-    E
+    N
   );
-  if (!m) {
-    m = St(D.length, d), m.interactionAddress = s ?? i;
-    const t = d.getInHinkalAddress(m.interactionAddress);
-    m.inHinkalAddress = t;
+  if (!n) {
+    n = le(u.length, s), n.interactionAddress = c ?? i;
+    const e = s.getInHinkalAddress(n.interactionAddress);
+    n.inHinkalAddress = e;
   }
-  if (r === "v1x1") {
-    if (o.interactionAddress = m?.interactionAddress ?? s ?? i, d.getInHinkalAddress(o.interactionAddress) !== m.inHinkalAddress)
+  if (d === "v1x1") {
+    if (o.interactionAddress = n?.interactionAddress ?? c ?? i, s.getInHinkalAddress(o.interactionAddress) !== n.inHinkalAddress)
       throw new Error("inHinkalAddress mismatch");
-    o.externalApprovalAddresses = m.useApprovalUtxoData?.map(
-      ({ externalApprovalAddresses: t }) => t
+    o.externalApprovalAddresses = n.useApprovalUtxoData?.map(
+      ({ externalApprovalAddresses: e }) => e
     ) ?? [i, i, i];
   }
-  f || (f = Ht(
-    S,
-    a.map((t) => t[0].erc20TokenAddress)
+  k || (k = fe(
+    z,
+    t.map((e) => e[0].erc20TokenAddress)
   ));
-  const O = b(a, n, !0);
-  l || (l = ct(O, m)), h.log({ publicSignalCount: T }), o.calldataHash = lt(
-    r,
+  const Z = p(t, m, !0);
+  f || (f = re(Z, n)), pe.log({ publicSignalCount: T }), o.calldataHash = ie(
+    d,
     T,
-    u,
-    s,
-    I,
     P,
-    g,
-    S,
-    w,
-    l,
     c,
-    m,
+    b,
+    h,
+    A,
+    z,
+    D,
     f,
-    y,
-    z
-  );
-  const { zkCallData: L, publicSignals: V } = await kt(
-    r,
+    l,
+    n,
     k,
-    C,
-    o,
-    K
+    w,
+    R
   );
-  h.log({ publicSignals: V });
-  const U = ft(R, A), _ = await pt(
-    r,
-    Z,
-    W,
-    B,
-    N,
+  const { zkCallData: M } = await ce(d, r, C, o, G), V = de(y, g), L = se(
+    F,
+    E,
+    I,
     O,
-    H,
-    a,
-    n,
-    g,
+    Z,
     S,
+    m,
+    A,
     T,
-    I,
-    s,
+    b,
+    c,
+    h,
     P,
-    u,
     o.calldataHash,
-    p,
-    U,
-    c,
-    w,
-    void 0,
-    m,
+    H,
+    V,
     l,
+    D,
+    void 0,
+    n,
     f,
-    y,
-    z
-  );
-  h.log({ circomData: _ });
-  const x = {
-    tokenNumber: a.length,
-    nullifierAmount: a[0].length,
-    outputAmount: n[0].length
+    k,
+    w,
+    R
+  ), U = {
+    tokenNumber: t.length,
+    nullifierAmount: t[0].length,
+    outputAmount: m[0].length
   };
-  return { zkCallData: L, circomData: _, dimData: x, encryptedOutputs: g };
+  return { zkCallData: M, circomData: L, dimData: U, encryptedOutputs: A };
 };
 export {
-  Zt as constructZkProof
+  ye as constructZkProof
 };

package/functions/snarkjs/constructSolanaZkProof.cjs

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

package/functions/snarkjs/constructSolanaZkProof.d.ts

@@ -5,7 +5,7 @@ import { DimDataType } from '../../types/circom-data.types';
 import { MerkleTree } from '../../data-structures/merkle-tree';
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Program } from '@coral-xyz/anchor';
-export declare const constructSolanaZkProof: (generateProofRemotely: boolean, originalDeployer: string, merkleTreeHinkal: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, userKeys: UserKeys, hinkalProgram: Program, mintAddresses: string[], inputUtxosArray: Utxo[][], outputUtxosArray: Utxo[][], extraRandomization: bigint, relayerFee: bigint, variableRate: bigint, recipientAddress: string, signerAddress: string, dimensions: DimDataType, encryptedOutputs: number[][], chainId?: number, patchAccessTokenMerkleTree?: boolean, onChainCreation?: boolean[], swapperAccountSalt?: bigint, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[], hasLocalTrees?: boolean) => Promise<{
+export declare const constructSolanaZkProof: (generateProofRemotely: boolean, originalDeployer: string, merkleTreeHinkal: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, userKeys: UserKeys, hinkalProgram: Program, mintAddresses: string[], inputUtxosArray: Utxo[][], outputUtxosArray: Utxo[][], extraRandomization: bigint, relayerFee: bigint, variableRate: bigint, recipientAddress: string, signerAddress: string, dimensions: DimDataType, encryptedOutputs: number[][], chainId?: number, patchAccessTokenMerkleTree?: boolean, onChainCreation?: boolean[], swapperAccountSalt?: bigint, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[]) => Promise<{
     proofAArr: number[];
     proofBArr: number[];
     proofCArr: number[];