@hinkal/common 0.2.18 → 0.2.20

package/functions/snarkjs/constructEmporiumProof.mjs

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

package/functions/snarkjs/constructGeneralZkProof.cjs

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

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -3,10 +3,9 @@ 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 { ExternalActionId } from '../../types/external-action.types';
-import { StakeArgs } from '../../types/hinkal.stake.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, stakeArgs?: StakeArgs, 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 = 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<{
     zkCallData: import('../../index.ts').NewZkCallDataType;
     circomData: T;
     dimData: DimDataType;

package/functions/snarkjs/constructGeneralZkProof.mjs

@@ -1,158 +1,154 @@
-import { chainIds as oe } from "../../constants/chains.constants.mjs";
-import { zeroAddress as r, defaultSignatureData as ae } from "../../constants/protocol.constants.mjs";
-import { Utxo as me } from "../../data-structures/utxo/Utxo.mjs";
-import { HinkalStakeMode as S } from "../../types/hinkal.stake.types.mjs";
-import { performTaskWithWorker as ne } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as ie } from "../../webworker/worker.registry.mjs";
-import { ZKProofWorkerActionType as de } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
-import { randomBigInt as re } from "../web3/etherFunctions.mjs";
-import { calcAmountChanges as A, calcEncryptedOutputs as ce, buildOutCommitments as se, calcPublicSignalCount as le, getSlippageValues as fe, createCallDataHash as pe, calcStealthAddressStructure as ke } from "./common.snarkjs.mjs";
-import { generateCircomData as Se } from "./generateCircomData.mjs";
-import { generateZkProof as He } from "./generateZkProof.mjs";
-import { defaultHinkalLogicArgs as Te } from "../../types/hinkal.types.mjs";
-import { generateFeeStructure as be } from "../utils/fees.utils.mjs";
-import { hinkalCheckTokenRegistry as he, createHinkalHelperFromData as Ce } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
-import { Logger as I } from "../../error-handling/logger.mjs";
-import { getMerkleTreeSiblingsAndRootHashes as ge } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-const _e = async (d, K, M, o, n, c, P, D, s, R, j, u = r, H = oe.localhost, l = o.map(() => !1), T = o.map(() => 0n), w = void 0, i, G = !1, m = void 0, f, p = void 0, J, y = ae, z, Q = !0) => {
-  const B = A(o, n), b = o.map((e) => e[0].erc20TokenAddress), h = ce(
-    n,
-    (i && i.mode !== S.Deposit) ?? !1
-  ), C = c.getShieldedPrivateKey(), v = me.findCorrectRandomization(re(31), C), X = await he(
-    J ?? Ce(H),
-    b,
-    A(o, n, !0)
-  ), N = o.map((e) => e.map((a) => a.getConstructableParams())), {
-    inCommitmentSiblings: Y,
-    inCommitmentSiblingSides: $,
-    accessTokenSiblings: L,
-    accessTokenSiblingSides: V,
-    rootHashHinkal: W,
-    rootHashAccessToken: Z
-  } = await ge(
+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,
-    c,
-    N,
-    G,
-    X,
-    K,
+    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,
+    j,
     M,
-    Q
-  ), E = await ne({
-    type: ie.ZKProof,
+    q,
+    F,
+    J
+  ), W = await mt({
+    type: ot.ZKProof,
     payload: {
-      type: de.BUILD_IN_NULLIFIERS,
-      data: { inputUtxosSerialized: N, onChainCreation: l, proverVersion: d }
+      type: nt.BUILD_IN_NULLIFIERS,
+      data: { inputUtxosSerialized: v, onChainCreation: c, proverVersion: r }
     }
-  }), O = se(d, n, l), t = {
-    rootHashHinkal: W,
-    shieldedPrivateKey: C,
-    erc20TokenAddresses: b,
-    inAmounts: o.map((e) => e.map((a) => a.amount.toString())),
-    inTimeStamps: o.map((e) => e.map((a) => a.timeStamp)),
-    inRandomizations: o.map((e) => e.map((a) => a.randomization)),
-    inNullifiers: E,
-    inCommitmentSiblings: Y,
-    inCommitmentSiblingSides: $,
-    outAmounts: n.map((e) => e.map((a) => a.amount.toString())),
+  }), 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((e) => e.map((a) => a.getStealthAddress())),
-    extraRandomization: v,
-    amountChanges: B,
-    outCommitments: O,
-    rootHashAccessToken: Z,
-    accessTokenSiblings: L,
-    accessTokenSiblingSides: V,
+    outPublicKeys: n.map((t) => t.map((e) => e.getStealthAddress())),
+    extraRandomization: R,
+    amountChanges: D,
+    outCommitments: Z,
+    rootHashAccessToken: N,
+    accessTokenSiblings: Y,
+    accessTokenSiblingSides: $,
     calldataHash: 0n
-  }, k = o.map((e) => e[0].tokenId ?? 0), _ = k.reduce((e, a) => e + a, 0) > 0 ? k.length : 0;
-  _ > 0 && (t.tokenIds = k);
-  const g = le(
-    P,
-    t.erc20TokenAddresses,
-    t.amountChanges,
-    t.inNullifiers,
-    t.outCommitments,
-    _
+  }, 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(
+    C,
+    o.erc20TokenAddresses,
+    o.amountChanges,
+    o.inNullifiers,
+    o.outCommitments,
+    E
   );
   if (!m) {
-    m = Te(B.length, c), m.interactionAddress = s ?? r;
-    const e = c.getInHinkalAddress(m.interactionAddress);
-    m.inHinkalAddress = e;
+    m = St(D.length, d), m.interactionAddress = s ?? i;
+    const t = d.getInHinkalAddress(m.interactionAddress);
+    m.inHinkalAddress = t;
   }
-  if (d === "v1x1") {
-    if (t.interactionAddress = m?.interactionAddress ?? s ?? r, c.getInHinkalAddress(t.interactionAddress) !== m.inHinkalAddress)
+  if (r === "v1x1") {
+    if (o.interactionAddress = m?.interactionAddress ?? s ?? i, d.getInHinkalAddress(o.interactionAddress) !== m.inHinkalAddress)
       throw new Error("inHinkalAddress mismatch");
-    t.externalApprovalAddresses = m.useApprovalUtxoData?.map(
-      ({ externalApprovalAddresses: e }) => e
-    ) ?? [r, r, r];
+    o.externalApprovalAddresses = m.useApprovalUtxoData?.map(
+      ({ externalApprovalAddresses: t }) => t
+    ) ?? [i, i, i];
   }
-  p || (p = be(
-    T,
-    o.map((e) => e[0].erc20TokenAddress)
+  f || (f = Ht(
+    S,
+    a.map((t) => t[0].erc20TokenAddress)
   ));
-  const q = A(o, n, !0);
-  f || (f = fe(q, m)), I.log({ publicSignalCount: g }), t.calldataHash = pe(
-    d,
-    g,
+  const O = b(a, n, !0);
+  l || (l = ct(O, m)), h.log({ publicSignalCount: T }), o.calldataHash = lt(
+    r,
+    T,
     u,
     s,
-    D,
-    R,
-    h,
-    T,
+    I,
+    P,
+    g,
+    S,
     w,
-    f,
     l,
+    c,
     m,
-    p,
+    f,
     y,
     z
-  ), i && (i.mode === S.Deposit && (t.mode = 0), i.mode === S.Stake && (t.mode = 1), i.mode === S.Unstake && (t.mode = 2), t.stakedTokenRecipient = i.stakedTokenRecipient, t.stakeBlinding = i.stakeBlinding, t.depositorAddress = i.depositorAddress);
-  const { zkCallData: U, publicSignals: x } = await He(
-    d,
-    H,
-    P,
-    t,
-    j
   );
-  I.log({ publicSignals: x });
-  const ee = ke(v, C), F = await Se(
-    d,
-    O,
-    E,
-    W,
-    Z,
-    q,
-    b,
+  const { zkCallData: L, publicSignals: V } = await kt(
+    r,
+    k,
+    C,
     o,
+    K
+  );
+  h.log({ publicSignals: V });
+  const U = ft(R, A), _ = await pt(
+    r,
+    Z,
+    W,
+    B,
+    N,
+    O,
+    H,
+    a,
     n,
-    h,
-    T,
     g,
-    D,
+    S,
+    T,
+    I,
     s,
-    R,
+    P,
     u,
-    t.calldataHash,
-    k,
-    ee,
-    l,
+    o.calldataHash,
+    p,
+    U,
+    c,
     w,
     void 0,
     m,
+    l,
     f,
-    p,
     y,
     z
   );
-  I.log({ circomData: F });
-  const te = {
-    tokenNumber: o.length,
-    nullifierAmount: o[0].length,
+  h.log({ circomData: _ });
+  const x = {
+    tokenNumber: a.length,
+    nullifierAmount: a[0].length,
     outputAmount: n[0].length
   };
-  return { zkCallData: U, circomData: F, dimData: te, encryptedOutputs: h };
+  return { zkCallData: L, circomData: _, dimData: x, encryptedOutputs: g };
 };
 export {
-  _e as constructZkProof
+  Zt 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/transactions.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 te=require("../utils/solanaMint.utils.cjs"),ne=require("./common.snarkjs.cjs"),ae=require("../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.cjs"),oe=require("./generateZkProof.cjs"),ie=require("../../webworker/worker.registry.cjs"),ce=require("../../webworker/performTaskWithWorker.cjs"),se=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),me=require("../pre-transaction/getSolanaCalldataHash.cjs"),ue=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),le=async(g,k,S,d,c,f,s,t,n,P,b,h,y,T,a,A,m=re.chainIds.solanaLocalnet,C=!1,B=t.map(()=>!1),I=[],w=[],K=!0)=>{const u="v1x1",H=new i.PublicKey(y),_=new i.PublicKey(T),R=c.getShieldedPrivateKey(),l=s.map(e=>te.formatMintAddress(e)),W=l.map(e=>e.mintAccountPart1),Z=l.map(e=>e.mintAccountPart2),v=me.getSolanaCalldataHash(a,H,_,A,b,h,I,w),z=`${a.tokenNumber}x${a.nullifierAmount}x${a.outputAmount}`,p=ne.calcAmountChanges(t,n),M=await ae.hinkalCheckSolanaTokenRegistry(f,new i.PublicKey(k),s,p),q=t.map(e=>e.map(r=>r.getConstructableParams())),{inCommitmentSiblings:L,inCommitmentSiblingSides:N,accessTokenSiblings:$,accessTokenSiblingSides:j,rootHashHinkal:D,rootHashAccessToken:V}=await ue.getMerkleTreeSiblingsAndRootHashes(m,c,q,C,M,S,d,K),E=await ce.performTaskWithWorker({type:ie.WorkerVariant.ZKProof,payload:{type:se.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:q,onChainCreation:B,proverVersion:u}}}),F={rootHashHinkal:D,shieldedPrivateKey:R,rootHashAccessToken:V,accessTokenSiblings:$,accessTokenSiblingSides:j,mintAccountPart1:W,mintAccountPart2:Z,inAmounts:t.map(e=>e.map(r=>r.amount)),inTimeStamps:t.map(e=>e.map(r=>r.timeStamp)),inRandomizations:t.map(e=>e.map(r=>r.randomization)),inNullifiers:E,inCommitmentSiblings:L,inCommitmentSiblingSides:N,outAmounts:n.map(e=>e.map(r=>r.amount.toString())),outTimeStamp:BigInt(n[0][0].timeStamp),outPublicKeys:n.map(e=>e.map(r=>r.getStealthAddress())),extraRandomization:P,amountChanges:p,outCommitments:n.map(e=>e.map(r=>r.amount===0n?0n:r.getCommitment())),calldataHash:v},{publicSignals:O,zkCallData:G}=await oe.generateZkProof(u,m,`basicSolana${z}`,F,g),[J,Q,X]=G,Y=J.map(BigInt).map(o.encodeToByte32Array).flat(),x=Q.flat().map(BigInt).map(o.encodeToByte32Array).flat(),U=X.map(BigInt).map(o.encodeToByte32Array).flat(),ee=O.map(BigInt).map(o.encodeToByte32Array);return{proofAArr:Y,proofBArr:x,proofCArr:U,publicInputsArr:ee}};exports.constructSolanaZkProof=le;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");require("../../types/transactions.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("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");require("../../constants/token-data/index.cjs");const i=require("@solana/web3.js"),o=require("../pre-transaction/solana.cjs");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");require("@coral-xyz/anchor");require("buffer");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(q,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),g=r.map(e=>e.map(t=>t.getConstructableParams())),{inCommitmentSiblings:N,inCommitmentSiblingSides:$,accessTokenSiblings:j,accessTokenSiblingSides:D,rootHashHinkal:V,rootHashAccessToken:E}=await le.getMerkleTreeSiblingsAndRootHashes(m,c,g,C,L,S,d,H),F=await se.performTaskWithWorker({type:ce.WorkerVariant.ZKProof,payload:{type:me.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:g,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,q),[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;

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[], 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[], hasLocalTrees?: boolean) => Promise<{
     proofAArr: number[];
     proofBArr: number[];
     proofCArr: number[];