@hinkal/common 0.2.28 → 0.2.29

package/functions/snarkjs/constructEmporiumProof.cjs

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

@@ -3,11 +3,11 @@ import { Utxo } from '../../data-structures/utxo/Utxo';
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { CircomDataType, DimDataType } from '../../types/circom-data.types';
 import { ethers } from 'ethers';
-import { FeeStructure, HinkalLogicArgs, type ProverVersion } from '../../types/hinkal.types';
-export declare const constructEmporiumProof: <T = CircomDataType>(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) => 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: import("../../types/hinkal.types").AuthorizationData | undefined;
+    authorizationData: import('../..').AuthorizationData | undefined;
 }>;

package/functions/snarkjs/constructEmporiumProof.mjs

@@ -1,156 +1,74 @@
-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 { 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(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,
-    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: N,
-    outTimeStamp: a.length > 0 ? BigInt(a[0][0].timeStamp) : Z(),
-    extraRandomization: P,
-    amountChanges: F,
-    outCommitments: R,
-    rootHashAccessToken: w,
-    calldataHash: 0n,
-    shieldedPrivateKey: S,
-    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
-  }, ta = c ? Pa.getSignerAddressFromPrivateKey(r, c) : void 0, v = z, B = ha.Emporium, I = await Aa(
-    r,
-    z,
-    c,
-    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
-  );
-  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 = n?.useApprovalUtxoData?.map(({ externalApprovalAddresses: t }) => t) ?? Array(M).fill([A, A, A]);
-  }
-  f || (f = za(b, l));
-  const $ = D(e, a, !0);
-  p || (p = fa($, n)), m.calldataHash = Sa(
-    o,
-    O,
-    T,
-    v,
-    B,
-    I,
-    h,
-    b,
-    void 0,
-    p,
-    s,
-    n,
-    f,
-    E
-  );
-  const y = {
-    outTimeStamp: Z(),
-    rootHashAccessToken: w,
-    calldataHash: m.calldataHash,
-    shieldedPrivateKey: S,
-    accessTokenSiblings: W,
-    accessTokenSiblingSides: k,
-    messageSeed: C
-  }, [{ 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,
-    N,
-    u,
-    w,
-    $,
-    l,
-    a,
-    h,
-    O,
-    B,
-    v,
-    I,
-    T,
-    m.calldataHash,
-    H,
-    na,
-    s,
-    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
-    n,
-    p,
-    f,
-    E
-  ), ra = {
-    tokenNumber: e.length,
-    nullifierAmount: e.length > 0 ? e[0].length : 0,
-    outputAmount: a.length > 0 ? a[0].length : 0
-  };
-  return { zkCallData: ea, circomData: ia, dimData: ra, encryptedOutputs: h, authorizationData: ma };
-};
-export {
-  Va 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 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;
+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

@@ -3,10 +3,10 @@ import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../data-structures/utxo/Utxo';
 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 = 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;
+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,134 +1,64 @@
-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 { 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 { 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,
-    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
-  }, 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,
-    N
-  );
-  if (!n) {
-    n = le(u.length, s), n.interactionAddress = c ?? i;
-    const e = s.getInHinkalAddress(n.interactionAddress);
-    n.inHinkalAddress = e;
-  }
-  if (d === "v1x1") {
-    if (o.interactionAddress = n?.interactionAddress ?? c ?? i, s.getInHinkalAddress(o.interactionAddress) !== n.inHinkalAddress)
-      throw new Error("inHinkalAddress mismatch");
-    o.externalApprovalAddresses = n.useApprovalUtxoData?.map(
-      ({ externalApprovalAddresses: e }) => e
-    ) ?? [i, i, i];
-  }
-  k || (k = fe(
-    z,
-    t.map((e) => e[0].erc20TokenAddress)
-  ));
-  const Z = p(t, m, !0);
-  f || (f = re(Z, n)), pe.log({ publicSignalCount: T }), o.calldataHash = ie(
-    d,
-    T,
-    P,
-    c,
-    b,
-    h,
-    A,
-    z,
-    D,
-    f,
-    l,
-    n,
-    k,
-    w,
-    R
-  );
-  const { zkCallData: M } = await ce(d, r, C, o, G), V = de(y, g), L = se(
-    F,
-    E,
-    I,
-    O,
-    Z,
-    S,
-    m,
-    A,
-    T,
-    b,
-    c,
-    h,
-    P,
-    o.calldataHash,
-    H,
-    V,
-    l,
-    D,
-    void 0,
-    n,
-    f,
-    k,
-    w,
-    R
-  ), U = {
-    tokenNumber: t.length,
-    nullifierAmount: t[0].length,
-    outputAmount: m[0].length
-  };
-  return { zkCallData: M, circomData: L, dimData: U, encryptedOutputs: A };
-};
-export {
-  ye as constructZkProof
+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");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;
+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[]) => 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[];