@hinkal/common 0.2.27 → 0.2.29

package/functions/snarkjs/constructEmporiumProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const de=require("../../data-structures/utxo/Utxo.cjs"),le=require("../../data-structures/crypto-keys/keys.cjs"),d=require("../../constants/protocol.constants.cjs"),ue=require("../../constants/chains.constants.cjs"),ge=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),pe=require("../../webworker/performTaskWithWorker.cjs"),Se=require("../../webworker/worker.registry.cjs"),o=require("./common.snarkjs.cjs"),Z=require("../web3/etherFunctions.cjs"),$=require("../private-wallet/emporium.helpers.cjs"),he=require("../../types/external-action.types.cjs"),Ae=require("../../types/circom-data.types.cjs"),fe=require("./generateCircomData.cjs"),qe=require("./generateZkProof.cjs"),j=require("../utils/time.utils.cjs"),ke=require("../../types/hinkal.types.cjs"),He=require("../utils/fees.utils.cjs"),G=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),ye=require("../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const Ce=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),Te=async(s,J,K,l,f,t,e,m,C,Q,T,X,Y,w=d.zeroAddress,c=ue.chainIds.localhost,u=t.map(()=>!1),q=t.map(()=>0n),g,r=void 0,L=!1,p,S=void 0,V,M=d.defaultSignatureData,x,U=!0)=>{const z=o.calcAmountChanges(t,e),k=o.calcEncryptedOutputs(e),h=m.getShieldedPrivateKey(),D=de.Utxo.findCorrectRandomization(Z.randomBigInt(31),h),ee=await G.hinkalCheckTokenRegistry(V??G.createHinkalHelperFromData(c),l,o.calcAmountChanges(t,e,!0)),_=t.map(a=>a.map(i=>i.getConstructableParams())),{inCommitmentSiblings:te,inCommitmentSiblingSides:ae,accessTokenSiblings:W,accessTokenSiblingSides:b,rootHashHinkal:P,rootHashAccessToken:H}=await Ce.getMerkleTreeSiblingsAndRootHashes(c,m,_,L,ee,J,K,U),E=await pe.performTaskWithWorker({type:Se.WorkerVariant.ZKProof,payload:{type:ge.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:_,onChainCreation:u,proverVersion:s}}}),I=o.buildOutCommitments(s,e,u),y=x??Z.randomBigInt(31),ne=ye.poseidonFunction(y),n={rootHashHinkal:P,erc20TokenAddresses:l,tokenIds:f,inNullifiers:E,outTimeStamp:e.length>0?BigInt(e[0][0].timeStamp):j.getCurrentTimeInSeconds(),extraRandomization:D,amountChanges:z,outCommitments:I,rootHashAccessToken:H,calldataHash:0n,shieldedPrivateKey:h,accessTokenSiblings:W,accessTokenSiblingSides:b,outAmounts:e.map(a=>a.map(i=>i.amount)),outPublicKeys:e.map(a=>a.map(i=>i.getStealthAddress())),inAmounts:t.map(a=>a.map(i=>i.amount.toString())),inTimeStamps:t.map(a=>a.map(i=>i.timeStamp)),inRandomizations:t.map(a=>a.map(i=>i.randomization)),inCommitmentSiblings:te,inCommitmentSiblingSides:ae,messageSeed:y},re=g?le.UserKeys.getSignerAddressFromPrivateKey(c,g):void 0,R=T,F=he.ExternalActionId.Emporium,N=await $.encodeEmporiumMetadata(c,T,g,X,ne,re),A=e.length===0?"swapperMWMin0":`swapperMW${C}x${Q}x${e[0].length}`,B=o.calcPublicSignalCount(A,n.erc20TokenAddresses,n.amountChanges,n.inNullifiers,n.outCommitments,f.length);if(r||(r=ke.defaultHinkalLogicArgs(z.length,m),r.interactionAddress="0x032f580aFFE7a5f17025fAF83c13B4277A880532",r.inHinkalAddress=m.getInHinkalAddress(r.interactionAddress)),s==="v1x1"){if(n.interactionAddress=r.interactionAddress,m.getInHinkalAddress(n.interactionAddress)!==r.inHinkalAddress)throw new Error("inHinkalAddress mismatch");n.externalApprovalAddresses=r?.useApprovalUtxoData?.map(({externalApprovalAddresses:a})=>a)??Array(C).fill([d.zeroAddress,d.zeroAddress,d.zeroAddress])}S||(S=He.generateFeeStructure(q,l));const v=o.calcAmountChanges(t,e,!0);p||(p=o.getSlippageValues(v,r)),n.calldataHash=o.createCallDataHash(s,B,w,R,F,N,k,q,void 0,p,u,r,S,M);const O={outTimeStamp:j.getCurrentTimeInSeconds(),rootHashAccessToken:H,calldataHash:n.calldataHash,shieldedPrivateKey:h,accessTokenSiblings:W,accessTokenSiblingSides:b,messageSeed:y},{zkCallData:ie}=await qe.generateZkProof(s,c,A,A==="swapperMWMin0"?O:n,Y),oe=o.calcStealthAddressStructure(D,h),se=await fe.generateCircomData(s,I,E,P,H,v,l,t,e,k,q,B,F,R,N,w,n.calldataHash,f,oe,u,Ae.defaultHookData,A==="swapperMWMin0"?O.outTimeStamp:n.outTimeStamp,r,p,S,M),ce={tokenNumber:t.length,nullifierAmount:t.length>0?t[0].length:0,outputAmount:e.length>0?e[0].length:0},me=await $.getAuthorizationDataIfNeeded(c,g);return{zkCallData:ie,circomData:se,dimData:ce,encryptedOutputs:k,authorizationData:me}};exports.constructEmporiumProof=Te;
+const e=require(`../../types/circom-data.types.cjs`),t=require(`../../types/external-action.types.cjs`),ee=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),te=require(`../../types/hinkal.types.cjs`),r=require(`../web3/etherFunctions.cjs`),i=require(`../../crypto/poseidon.cjs`);require(`../../crypto/index.cjs`);const a=require(`../utils/time.utils.cjs`),o=require(`../../data-structures/utxo/Utxo.cjs`),s=require(`./common.snarkjs.cjs`),c=require(`./generateCircomData.cjs`),l=require(`./generateZkProof.cjs`),u=require(`../utils/fees.utils.cjs`),ne=require(`../../data-structures/AccountActions/AccountActions.cjs`),d=require(`../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs`),re=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),f=require(`../private-wallet/emporium.helpers.cjs`);var p=async(p,ie,m,h,g,_,v,y,ae,b,x,oe,S=n.zeroAddress,C=ee.chainIds.localhost,w=g.map(()=>!1),T=g.map(()=>0n),E,D=void 0,O=!1,k,A=void 0,se,j=n.defaultSignatureData,ce)=>{let M=s.calcAmountChanges(g,_),N=s.calcEncryptedOutputs(_),P=v.getShieldedPrivateKey(),F=o.Utxo.findCorrectRandomization(r.randomBigInt(31),P),I=await d.hinkalCheckTokenRegistry(se??d.createHinkalHelperFromData(C),m,s.calcAmountChanges(g,_,!0)),{inCommitmentSiblings:L,inCommitmentSiblingSides:R,accessTokenSiblings:z,accessTokenSiblingSides:B,rootHashHinkal:V,rootHashAccessToken:H,inNullifiers:U}=await re.getDataFromWorkers(C,p,ie,v,g.map(e=>e.map(e=>e.getConstructableParams())),O,I),W=s.buildOutCommitments(_),G=ce??r.randomBigInt(31),le=i.poseidonFunction(G),K={rootHashHinkal:V,erc20TokenAddresses:m,tokenIds:h,inNullifiers:U,outTimeStamp:_.length>0?BigInt(_[0][0].timeStamp):a.getCurrentTimeInSeconds(),extraRandomization:F,amountChanges:M,outCommitments:W,rootHashAccessToken:H,calldataHash:0n,shieldedPrivateKey:P,accessTokenSiblings:z,accessTokenSiblingSides:B,outAmounts:_.map(e=>e.map(e=>e.amount)),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),inAmounts:g.map(e=>e.map(e=>e.amount.toString())),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inRandomizations:g.map(e=>e.map(e=>e.randomization)),inCommitmentSiblings:L,inCommitmentSiblingSides:R,messageSeed:G},ue=E?ne.AccountActions.getSignerAddressFromPrivateKey(C,E):void 0,q=b,J=t.ExternalActionId.Emporium,Y=await f.encodeEmporiumMetadata(C,b,E,x,le,ue),X=_.length===0?`swapperMWMin0`:`swapperMW${y}x${ae}x${_[0].length}`,Z=s.calcPublicSignalCount(X,K.erc20TokenAddresses,K.amountChanges,K.inNullifiers,K.outCommitments,h.length);if(D||(D=te.defaultHinkalLogicArgs(M.length,v),D.interactionAddress=`0x032f580aFFE7a5f17025fAF83c13B4277A880532`,D.inHinkalAddress=v.getInHinkalAddress(D.interactionAddress)),K.interactionAddress=D.interactionAddress,v.getInHinkalAddress(K.interactionAddress)!==D.inHinkalAddress)throw Error(`inHinkalAddress mismatch`);K.externalApprovalAddresses=D?.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e)??Array(y).fill([n.zeroAddress,n.zeroAddress,n.zeroAddress]),A||=u.generateFeeStructure(T,m);let Q=s.calcAmountChanges(g,_,!0);k||=s.getSlippageValues(Q,D),K.calldataHash=s.createCallDataHash(Z,S,q,J,Y,N,T,void 0,k,w,D,A,j);let $={outTimeStamp:a.getCurrentTimeInSeconds(),rootHashAccessToken:H,calldataHash:K.calldataHash,shieldedPrivateKey:P,accessTokenSiblings:z,accessTokenSiblingSides:B,messageSeed:G},[{zkCallData:de},fe]=await Promise.all([l.generateZkProof(C,X,X===`swapperMWMin0`?$:K,oe),f.getAuthorizationDataIfNeeded(C,E)]),pe=s.calcStealthAddressStructure(F,P);return{zkCallData:de,circomData:c.generateCircomData(W,U,V,H,Q,m,_,N,Z,J,q,Y,S,K.calldataHash,h,pe,w,e.defaultHookData,X===`swapperMWMin0`?$.outTimeStamp:K.outTimeStamp,D,k,A,j),dimData:{tokenNumber:g.length,nullifierAmount:g.length>0?g[0].length:0,outputAmount:_.length>0?_[0].length:0},encryptedOutputs:N,authorizationData:fe}};exports.constructEmporiumProof=p;

package/functions/snarkjs/constructEmporiumProof.d.ts

@@ -1,13 +1,13 @@
 import { MerkleTree } from '../../data-structures/merkle-tree';
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
-import { CircomDataV1x1, DimDataType } from '../../types/circom-data.types';
+import { CircomDataType, DimDataType } from '../../types/circom-data.types';
 import { ethers } from 'ethers';
-import { AuthorizationData, FeeStructure, HinkalLogicArgs, type ProverVersion } from '../../types/hinkal.types';
-export declare const constructEmporiumProof: <T = CircomDataV1x1>(proverVersion: ProverVersion, merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, erc20TokenAddresses: string[], tokenIds: number[], inputUtxos: Utxo[][], outputUtxos: Utxo[][], userKeys: UserKeys, tokenCount: number, inputCount: number, emporiumAddress: string, operations: string[], generateProofRemotely: boolean, relay?: string, chainId?: number, onChainCreation?: boolean[], flatFees?: bigint[], subAccountPrivateKey?: string, hinkalLogicArgs?: HinkalLogicArgs | undefined, patchAccessTokenMerkleTree?: boolean, slippageValues?: bigint[], feeStructure?: FeeStructure | undefined, hinkalHelper?: ethers.Contract, signatureData?: import('../../index.ts').SignatureData, messageSeedOverride?: bigint, hasLocalTrees?: boolean) => Promise<{
-    zkCallData: import('../../index.ts').NewZkCallDataType;
+import { FeeStructure, HinkalLogicArgs } from '../../types/hinkal.types';
+export declare const constructEmporiumProof: <T = CircomDataType>(merkleTree: MerkleTree<bigint>, merkleTreeAccessToken: MerkleTree<bigint>, erc20TokenAddresses: string[], tokenIds: number[], inputUtxos: Utxo[][], outputUtxos: Utxo[][], userKeys: UserKeys, tokenCount: number, inputCount: number, emporiumAddress: string, operations: string[], generateProofRemotely: boolean, relay?: string, chainId?: number, onChainCreation?: boolean[], flatFees?: bigint[], subAccountPrivateKey?: string, hinkalLogicArgs?: HinkalLogicArgs | undefined, patchAccessTokenMerkleTree?: boolean, slippageValues?: bigint[], feeStructure?: FeeStructure | undefined, hinkalHelper?: ethers.Contract, signatureData?: import('../..').SignatureData, messageSeedOverride?: bigint) => Promise<{
+    zkCallData: import('../..').NewZkCallDataType;
     circomData: T;
     dimData: DimDataType;
     encryptedOutputs: string[][];
-    authorizationData: AuthorizationData | undefined;
+    authorizationData: import('../..').AuthorizationData | undefined;
 }>;

package/functions/snarkjs/constructEmporiumProof.mjs

@@ -1,166 +1,74 @@
-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 "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),
-    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,
-    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,
-    erc20TokenAddresses: l,
-    tokenIds: h,
-    inNullifiers: R,
-    outTimeStamp: a.length > 0 ? BigInt(a[0][0].timeStamp) : q(),
-    extraRandomization: E,
-    amountChanges: b,
-    outCommitments: F,
-    rootHashAccessToken: M,
-    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,
-    messageSeed: C
-  }, ea = c ? la.getSignerAddressFromPrivateKey(o, c) : void 0, B = k, u = Ta.Emporium, v = await Ca(
-    o,
-    k,
-    c,
-    K,
-    ta,
-    ea
-  ), g = a.length === 0 ? "swapperMWMin0" : `swapperMW${T}x${J}x${a[0].length}`, O = ha(
-    g,
-    m.erc20TokenAddresses,
-    m.amountChanges,
-    m.inNullifiers,
-    m.outCommitments,
-    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)
-      throw new Error("inHinkalAddress mismatch");
-    m.externalApprovalAddresses = r?.useApprovalUtxoData?.map(({ externalApprovalAddresses: e }) => e) ?? Array(T).fill([A, A, A]);
-  }
-  f || (f = Ea(H, l));
-  const Z = D(t, a, !0);
-  p || (p = Ha(Z, r)), m.calldataHash = wa(
-    i,
-    O,
-    z,
-    B,
-    u,
-    v,
-    w,
-    H,
-    void 0,
-    p,
-    s,
-    r,
-    f,
-    W
-  );
-  const $ = {
-    outTimeStamp: q(),
-    rootHashAccessToken: M,
-    calldataHash: m.calldataHash,
-    shieldedPrivateKey: S,
-    accessTokenSiblings: I,
-    accessTokenSiblingSides: N,
-    messageSeed: C
-  }, { zkCallData: ma } = await Wa(
-    i,
-    o,
-    g,
-    g === "swapperMWMin0" ? $ : m,
-    Q
-  ), ra = Ma(E, S), na = await za(
-    i,
-    F,
-    R,
-    P,
-    M,
-    Z,
-    l,
-    t,
-    a,
-    w,
-    H,
-    O,
-    u,
-    B,
-    v,
-    z,
-    m.calldataHash,
-    h,
-    ra,
-    s,
-    ka,
-    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,
-    W
-  ), ia = {
-    tokenNumber: t.length,
-    nullifierAmount: t.length > 0 ? t[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 };
-};
-export {
-  mt as constructEmporiumProof
+import { defaultHookData as e } from "../../types/circom-data.types.mjs";
+import { ExternalActionId as t } from "../../types/external-action.types.mjs";
+import { chainIds as ee } from "../../constants/chains.constants.mjs";
+import { defaultSignatureData as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as te } from "../../types/hinkal.types.mjs";
+import { randomBigInt as i } from "../web3/etherFunctions.mjs";
+import { poseidonFunction as ne } from "../../crypto/poseidon.mjs";
+import "../../crypto/index.mjs";
+import { getCurrentTimeInSeconds as a } from "../utils/time.utils.mjs";
+import { Utxo as o } from "../../data-structures/utxo/Utxo.mjs";
+import { buildOutCommitments as s, calcAmountChanges as c, calcEncryptedOutputs as re, calcPublicSignalCount as ie, calcStealthAddressStructure as ae, createCallDataHash as l, getSlippageValues as u } from "./common.snarkjs.mjs";
+import { generateCircomData as oe } from "./generateCircomData.mjs";
+import { generateZkProof as se } from "./generateZkProof.mjs";
+import { generateFeeStructure as ce } from "../utils/fees.utils.mjs";
+import { AccountActions as le } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { createHinkalHelperFromData as ue, hinkalCheckTokenRegistry as de } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
+import { getDataFromWorkers as fe } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { encodeEmporiumMetadata as d, getAuthorizationDataIfNeeded as f } from "../private-wallet/emporium.helpers.mjs";
+//#region ../shared/common/src/functions/snarkjs/constructEmporiumProof.ts
+var p = async (p, m, h, g, _, v, y, b, pe, x, me, he, S = r, C = ee.localhost, w = _.map(() => !1), T = _.map(() => 0n), E, D = void 0, O = !1, k, A = void 0, j, M = n, N) => {
+	let P = c(_, v), F = re(v), I = y.getShieldedPrivateKey(), L = o.findCorrectRandomization(i(31), I), R = await de(j ?? ue(C), h, c(_, v, !0)), { inCommitmentSiblings: ge, inCommitmentSiblingSides: _e, accessTokenSiblings: z, accessTokenSiblingSides: B, rootHashHinkal: V, rootHashAccessToken: H, inNullifiers: U } = await fe(C, p, m, y, _.map((e) => e.map((e) => e.getConstructableParams())), O, R), W = s(v), G = N ?? i(31), ve = ne(G), K = {
+		rootHashHinkal: V,
+		erc20TokenAddresses: h,
+		tokenIds: g,
+		inNullifiers: U,
+		outTimeStamp: v.length > 0 ? BigInt(v[0][0].timeStamp) : a(),
+		extraRandomization: L,
+		amountChanges: P,
+		outCommitments: W,
+		rootHashAccessToken: H,
+		calldataHash: 0n,
+		shieldedPrivateKey: I,
+		accessTokenSiblings: z,
+		accessTokenSiblingSides: B,
+		outAmounts: v.map((e) => e.map((e) => e.amount)),
+		outPublicKeys: v.map((e) => e.map((e) => e.getStealthAddress())),
+		inAmounts: _.map((e) => e.map((e) => e.amount.toString())),
+		inTimeStamps: _.map((e) => e.map((e) => e.timeStamp)),
+		inRandomizations: _.map((e) => e.map((e) => e.randomization)),
+		inCommitmentSiblings: ge,
+		inCommitmentSiblingSides: _e,
+		messageSeed: G
+	}, ye = E ? le.getSignerAddressFromPrivateKey(C, E) : void 0, q = x, J = t.Emporium, Y = await d(C, x, E, me, ve, ye), X = v.length === 0 ? "swapperMWMin0" : `swapperMW${b}x${pe}x${v[0].length}`, Z = ie(X, K.erc20TokenAddresses, K.amountChanges, K.inNullifiers, K.outCommitments, g.length);
+	if (D || (D = te(P.length, y), D.interactionAddress = "0x032f580aFFE7a5f17025fAF83c13B4277A880532", D.inHinkalAddress = y.getInHinkalAddress(D.interactionAddress)), K.interactionAddress = D.interactionAddress, y.getInHinkalAddress(K.interactionAddress) !== D.inHinkalAddress) throw Error("inHinkalAddress mismatch");
+	K.externalApprovalAddresses = D?.useApprovalUtxoData?.map(({ externalApprovalAddresses: e }) => e) ?? Array(b).fill([
+		r,
+		r,
+		r
+	]), A ||= ce(T, h);
+	let Q = c(_, v, !0);
+	k ||= u(Q, D), K.calldataHash = l(Z, S, q, J, Y, F, T, void 0, k, w, D, A, M);
+	let $ = {
+		outTimeStamp: a(),
+		rootHashAccessToken: H,
+		calldataHash: K.calldataHash,
+		shieldedPrivateKey: I,
+		accessTokenSiblings: z,
+		accessTokenSiblingSides: B,
+		messageSeed: G
+	}, [{ zkCallData: be }, xe] = await Promise.all([se(C, X, X === "swapperMWMin0" ? $ : K, he), f(C, E)]), Se = ae(L, I);
+	return {
+		zkCallData: be,
+		circomData: oe(W, U, V, H, Q, h, v, F, Z, J, q, Y, S, K.calldataHash, g, Se, w, e, X === "swapperMWMin0" ? $.outTimeStamp : K.outTimeStamp, D, k, A, M),
+		dimData: {
+			tokenNumber: _.length,
+			nullifierAmount: _.length > 0 ? _[0].length : 0,
+			outputAmount: v.length > 0 ? v[0].length : 0
+		},
+		encryptedOutputs: F,
+		authorizationData: xe
+	};
 };
+//#endregion
+export { p 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;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../web3/etherFunctions.cjs`),i=require(`../../data-structures/utxo/Utxo.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./generateCircomData.cjs`),c=require(`./generateZkProof.cjs`),l=require(`../utils/fees.utils.cjs`),u=require(`../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs`),d=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`);var f=async(f,p,m,h,g,_,v,y,b,x,S=t.zeroAddress,C=e.chainIds.localhost,w=m.map(()=>!1),T=m.map(()=>0n),E=void 0,D=!1,O=void 0,k,A=void 0,j,M=t.defaultSignatureData,N)=>{let P=o.calcAmountChanges(m,h),F=m.map(e=>e[0].erc20TokenAddress),I=o.calcEncryptedOutputs(h),L=g.getShieldedPrivateKey(),R=i.Utxo.findCorrectRandomization(r.randomBigInt(31),L),z=e.isTronLike(C)?await u.hinkalCheckTronTokenRegistry(F,o.calcAmountChanges(m,h,!0),C):await u.hinkalCheckTokenRegistry(j??u.createHinkalHelperFromData(C),F,o.calcAmountChanges(m,h,!0)),B=e.isTronLike(C)?D||z:D,{inCommitmentSiblings:V,inCommitmentSiblingSides:H,accessTokenSiblings:U,accessTokenSiblingSides:W,rootHashHinkal:G,rootHashAccessToken:K,inNullifiers:q}=await d.getDataFromWorkers(C,f,p,g,m.map(e=>e.map(e=>e.getConstructableParams())),B,z),J=o.buildOutCommitments(h),Y={rootHashHinkal:G,shieldedPrivateKey:L,erc20TokenAddresses:F,inAmounts:m.map(e=>e.map(e=>e.amount.toString())),inTimeStamps:m.map(e=>e.map(e=>e.timeStamp)),inRandomizations:m.map(e=>e.map(e=>e.randomization)),inNullifiers:q,inCommitmentSiblings:V,inCommitmentSiblingSides:H,outAmounts:h.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(h[0][0].timeStamp),outPublicKeys:h.map(e=>e.map(e=>e.getStealthAddress())),extraRandomization:R,amountChanges:P,outCommitments:J,rootHashAccessToken:K,accessTokenSiblings:U,accessTokenSiblingSides:W,calldataHash:0n},X=m.map(e=>e[0].tokenId??0),Z=X.reduce((e,t)=>e+t,0)>0?X.length:0;Z>0&&(Y.tokenIds=X);let Q=o.calcPublicSignalCount(_,Y.erc20TokenAddresses,Y.amountChanges,Y.inNullifiers,Y.outCommitments,Z);if(!O){O=n.defaultHinkalLogicArgs(P.length,g),O.interactionAddress=y??t.zeroAddress;let e=g.getInHinkalAddress(O.interactionAddress);O.inHinkalAddress=e}if(Y.interactionAddress=O?.interactionAddress??y??t.zeroAddress,g.getInHinkalAddress(Y.interactionAddress)!==O.inHinkalAddress)throw Error(`inHinkalAddress mismatch`);Y.externalApprovalAddresses=O.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e)??[t.zeroAddress,t.zeroAddress,t.zeroAddress],A||=l.generateFeeStructure(T,m.map(e=>e[0].erc20TokenAddress));let $=o.calcAmountChanges(m,h,!0);k||=o.getSlippageValues($,O),a.Logger.log({publicSignalCount:Q}),Y.calldataHash=o.createCallDataHash(Q,S,y,v,b,I,T,E,k,w,O,A,M,N);let{zkCallData:ee}=await c.generateZkProof(C,_,Y,x),te=o.calcStealthAddressStructure(R,L);return{zkCallData:ee,circomData:s.generateCircomData(J,q,G,K,$,F,h,I,Q,v,y,b,S,Y.calldataHash,X,te,w,E,void 0,O,k,A,M,N),dimData:{tokenNumber:m.length,nullifierAmount:m[0].length,outputAmount:h[0].length},encryptedOutputs:I}};exports.constructZkProof=f;

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -1,12 +1,12 @@
 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 { FeeStructure, HinkalLogicArgs } 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<{
-    zkCallData: import('../../index.ts').NewZkCallDataType;
+export declare const constructZkProof: <T = CircomDataType>(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('../..').SignatureData, originalSender?: string) => Promise<{
+    zkCallData: import('../..').NewZkCallDataType;
     circomData: T;
     dimData: DimDataType;
     encryptedOutputs: string[][];

package/functions/snarkjs/constructGeneralZkProof.mjs

@@ -1,154 +1,64 @@
-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,
-    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: $,
-    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(
-    C,
-    o.erc20TokenAddresses,
-    o.amountChanges,
-    o.inNullifiers,
-    o.outCommitments,
-    E
-  );
-  if (!m) {
-    m = St(D.length, d), m.interactionAddress = s ?? i;
-    const t = d.getInHinkalAddress(m.interactionAddress);
-    m.inHinkalAddress = t;
-  }
-  if (r === "v1x1") {
-    if (o.interactionAddress = m?.interactionAddress ?? s ?? i, d.getInHinkalAddress(o.interactionAddress) !== m.inHinkalAddress)
-      throw new Error("inHinkalAddress mismatch");
-    o.externalApprovalAddresses = m.useApprovalUtxoData?.map(
-      ({ externalApprovalAddresses: t }) => t
-    ) ?? [i, i, i];
-  }
-  f || (f = Ht(
-    S,
-    a.map((t) => t[0].erc20TokenAddress)
-  ));
-  const O = b(a, n, !0);
-  l || (l = ct(O, m)), h.log({ publicSignalCount: T }), o.calldataHash = lt(
-    r,
-    T,
-    u,
-    s,
-    I,
-    P,
-    g,
-    S,
-    w,
-    l,
-    c,
-    m,
-    f,
-    y,
-    z
-  );
-  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,
-    g,
-    S,
-    T,
-    I,
-    s,
-    P,
-    u,
-    o.calldataHash,
-    p,
-    U,
-    c,
-    w,
-    void 0,
-    m,
-    l,
-    f,
-    y,
-    z
-  );
-  h.log({ circomData: _ });
-  const x = {
-    tokenNumber: a.length,
-    nullifierAmount: a[0].length,
-    outputAmount: n[0].length
-  };
-  return { zkCallData: L, circomData: _, dimData: x, encryptedOutputs: g };
-};
-export {
-  Zt as constructZkProof
+import { chainIds as e, isTronLike as t } from "../../constants/chains.constants.mjs";
+import { defaultSignatureData as ee, zeroAddress as n } from "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as r } from "../../types/hinkal.types.mjs";
+import { randomBigInt as i } from "../web3/etherFunctions.mjs";
+import { Utxo as te } from "../../data-structures/utxo/Utxo.mjs";
+import { Logger as a } from "../../error-handling/logger.mjs";
+import { buildOutCommitments as o, calcAmountChanges as s, calcEncryptedOutputs as ne, calcPublicSignalCount as c, calcStealthAddressStructure as l, createCallDataHash as u, getSlippageValues as d } from "./common.snarkjs.mjs";
+import { generateCircomData as f } from "./generateCircomData.mjs";
+import { generateZkProof as re } from "./generateZkProof.mjs";
+import { generateFeeStructure as ie } from "../utils/fees.utils.mjs";
+import { createHinkalHelperFromData as ae, hinkalCheckTokenRegistry as oe, hinkalCheckTronTokenRegistry as p } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
+import { getDataFromWorkers as se } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+//#region ../shared/common/src/functions/snarkjs/constructGeneralZkProof.ts
+var m = async (m, ce, h, g, _, v, y, b, x, S, C = n, w = e.localhost, T = h.map(() => !1), E = h.map(() => 0n), D = void 0, O = !1, k = void 0, A, j = void 0, M, N = ee, P) => {
+	let F = s(h, g), I = h.map((e) => e[0].erc20TokenAddress), L = ne(g), R = _.getShieldedPrivateKey(), z = te.findCorrectRandomization(i(31), R), B = t(w) ? await p(I, s(h, g, !0), w) : await oe(M ?? ae(w), I, s(h, g, !0)), V = t(w) ? O || B : O, { inCommitmentSiblings: H, inCommitmentSiblingSides: U, accessTokenSiblings: W, accessTokenSiblingSides: le, rootHashHinkal: G, rootHashAccessToken: K, inNullifiers: q } = await se(w, m, ce, _, h.map((e) => e.map((e) => e.getConstructableParams())), V, B), J = o(g), Y = {
+		rootHashHinkal: G,
+		shieldedPrivateKey: R,
+		erc20TokenAddresses: I,
+		inAmounts: h.map((e) => e.map((e) => e.amount.toString())),
+		inTimeStamps: h.map((e) => e.map((e) => e.timeStamp)),
+		inRandomizations: h.map((e) => e.map((e) => e.randomization)),
+		inNullifiers: q,
+		inCommitmentSiblings: H,
+		inCommitmentSiblingSides: U,
+		outAmounts: g.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: BigInt(g[0][0].timeStamp),
+		outPublicKeys: g.map((e) => e.map((e) => e.getStealthAddress())),
+		extraRandomization: z,
+		amountChanges: F,
+		outCommitments: J,
+		rootHashAccessToken: K,
+		accessTokenSiblings: W,
+		accessTokenSiblingSides: le,
+		calldataHash: 0n
+	}, X = h.map((e) => e[0].tokenId ?? 0), Z = X.reduce((e, t) => e + t, 0) > 0 ? X.length : 0;
+	Z > 0 && (Y.tokenIds = X);
+	let Q = c(v, Y.erc20TokenAddresses, Y.amountChanges, Y.inNullifiers, Y.outCommitments, Z);
+	if (!k) {
+		k = r(F.length, _), k.interactionAddress = b ?? n;
+		let e = _.getInHinkalAddress(k.interactionAddress);
+		k.inHinkalAddress = e;
+	}
+	if (Y.interactionAddress = k?.interactionAddress ?? b ?? n, _.getInHinkalAddress(Y.interactionAddress) !== k.inHinkalAddress) throw Error("inHinkalAddress mismatch");
+	Y.externalApprovalAddresses = k.useApprovalUtxoData?.map(({ externalApprovalAddresses: e }) => e) ?? [
+		n,
+		n,
+		n
+	], j ||= ie(E, h.map((e) => e[0].erc20TokenAddress));
+	let $ = s(h, g, !0);
+	A ||= d($, k), a.log({ publicSignalCount: Q }), Y.calldataHash = u(Q, C, b, y, x, L, E, D, A, T, k, j, N, P);
+	let { zkCallData: ue } = await re(w, v, Y, S), de = l(z, R);
+	return {
+		zkCallData: ue,
+		circomData: f(J, q, G, K, $, I, g, L, Q, y, b, x, C, Y.calldataHash, X, de, T, D, void 0, k, A, j, N, P),
+		dimData: {
+			tokenNumber: h.length,
+			nullifierAmount: h[0].length,
+			outputAmount: g[0].length
+		},
+		encryptedOutputs: L
+	};
 };
+//#endregion
+export { m 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;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../pre-transaction/solana.cjs`),n=require(`../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.cjs`),r=require(`../utils/solanaMint.utils.cjs`),i=require(`./common.snarkjs.cjs`),a=require(`./generateZkProof.cjs`);require(`../pre-transaction/index.cjs`);const o=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),s=require(`../pre-transaction/getSolanaCalldataHash.cjs`);let c=require(`@solana/web3.js`);var l=async(l,u,d,f,p,m,h,g,_,v,y,b,x,S,C,w,T=e.chainIds.solanaLocalnet,E=!1,D=0n,O=[],k=[])=>{let A=new c.PublicKey(x),j=new c.PublicKey(S),M=p.getShieldedPrivateKey(),N=h.map(e=>r.formatMintAddress(e)),P=N.map(e=>e.mintAccountPart1),F=N.map(e=>e.mintAccountPart2),I=s.getSolanaCalldataHash(C,A,j,w,y,b,O,k),L=`${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`,R=i.calcAmountChanges(g,_),z=await n.hinkalCheckSolanaTokenRegistry(m,new c.PublicKey(u),h,R),{inCommitmentSiblings:B,inCommitmentSiblingSides:V,accessTokenSiblings:H,accessTokenSiblingSides:U,rootHashHinkal:W,rootHashAccessToken:G,inNullifiers:K}=await o.getDataFromWorkers(T,d,f,p,g.map(e=>e.map(e=>e.getConstructableParams())),E,z),q={rootHashHinkal:W,shieldedPrivateKey:M,rootHashAccessToken:G,accessTokenSiblings:H,accessTokenSiblingSides:U,mintAccountPart1:P,mintAccountPart2:F,inAmounts:g.map(e=>e.map(e=>e.amount)),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inRandomizations:g.map(e=>e.map(e=>e.randomization)),inNullifiers:K,inCommitmentSiblings:B,inCommitmentSiblingSides:V,outAmounts:_.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(_[0][0].timeStamp),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),extraRandomization:v,amountChanges:R,outCommitments:_.map(e=>e.map(e=>e.amount===0n?0n:e.getCommitment())),calldataHash:I,swapperAccountSalt:D},{publicSignals:J,zkCallData:Y}=await a.generateZkProof(T,`basicSolana${L}`,q,l),[X,Z,Q]=Y;return{proofAArr:X.map(BigInt).map(t.encodeToByte32Array).flat(),proofBArr:Z.flat().map(BigInt).map(t.encodeToByte32Array).flat(),proofCArr:Q.map(BigInt).map(t.encodeToByte32Array).flat(),publicInputsArr:J.map(BigInt).map(t.encodeToByte32Array)}};exports.constructSolanaZkProof=l;

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, swapperAccountSalt?: bigint, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[]) => Promise<{
     proofAArr: number[];
     proofBArr: number[];
     proofCArr: number[];