@hinkal/common 0.2.31 → 0.2.33

package/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-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;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../web3/etherFunctions.cjs`),ee=require(`../../crypto/poseidon.cjs`),te=require(`../../data-structures/crypto-keys/keys.cjs`),ne=require(`../utils/time.utils.cjs`),i=require(`../utils/bit.operations.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateCircomData.cjs`),l=require(`./generateZkProof.cjs`),u=require(`../../data-structures/AccountActions/AccountActions.cjs`),d=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),f=require(`../private-wallet/emporium.helpers.cjs`);var p=async(p,m,h,g,_,v,y,b,x,S=n.zeroAddress,C=t.chainIds.localhost,w=m.map(()=>!1),T=void 0,E,D)=>{let O=o.getZkProofVerifierName(m,h),k=o.calcAmountChanges(m,h),A=m.map(e=>e[0].erc20TokenAddress),j=o.calcEncryptedOutputs(h),M=n.defaultSignatureData,N=g.getShieldedPrivateKey(),{pubSpendingBJJPoint:P}=g.getSpendingKeyPair(),F=o.calcStealthAddressStructure(te.UserKeys.findCorrectRandomization(r.randomBigInt(31),N),N,g.getSpendingKeyPair().pubSpendingBJJPoint),{inCommitmentSiblings:I,inCommitmentSiblingSides:re,rootHashHinkal:L,inNullifiers:R}=await d.getDataFromWorkers(C,p,m.map(e=>e.map(e=>e.getConstructableParams()))),z=o.buildOutCommitments(h),B=r.randomBigInt(31),V=ee.poseidonFunction(B),H=BigInt(h.length>0?h[0][0].timeStamp:ne.getCurrentTimeInSeconds()),U={rootHashHinkal:L,spendingPublicKey:P,nullifyingPrivateKey:N,erc20TokenAddresses:A,amountChanges:k,inAmounts:m.map(e=>e.map(e=>e.amount.toString())),inRandomizations:m.map(e=>e.map(e=>o.getUtxoCircuitInRandomization(e))),inH0Ax:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:m.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:m.map(e=>e.map(e=>e.timeStamp)),inNullifiers:R,inCommitmentSiblings:I,inCommitmentSiblingSides:re,outAmounts:h.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:H,outPublicKeys:h.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:z,calldataHash:0n,messageSeed:B,H0Ax:i.takeOffHighestBit(F.extraRandomization),H0Ay:F.H0},W=o.calcPublicSignalCount(O,U.erc20TokenAddresses,U.amountChanges,U.inNullifiers,U.outCommitments),G=o.calcAmountChanges(m,h,!0),K=o.getSlippageValues(G);a.Logger.log({publicSignalCount:W});let q=Array.isArray(y)?y:[y],J=t.getOnchainChainId(C),Y=D?u.AccountActions.getSignerAddressFromPrivateKey(J,D):void 0,X=_===e.ExternalActionId.Emporium?await f.encodeEmporiumMetadata(C,v??n.zeroAddress,D,q,V,Y):await f.encodeEmporiumMetadata(C,n.zeroAddress,void 0,_===0n?[]:q,V,n.zeroAddress);U.calldataHash=o.createCallDataHash(W,S,v,_,X,j,T,K,w,x,M,E);let Z=s.computeSignedMessageHashEvm({rootHashHinkal:L,erc20TokenAddresses:A,amountChanges:k,outTimeStamp:H,inNullifiers:R,outCommitments:z,calldataHash:U.calldataHash,message:V,outH1Ay:F.H1,H0Ax:U.H0Ax,H0Ay:F.H0}),{R8:Q,S:ie}=g.signEddsa(Z);U.eddsaSignature=[Q[0],Q[1],ie],U.signedMessageHash=Z;let $=O.startsWith(`mainEVMCircuitMin0`),ae={outTimeStamp:H,calldataHash:U.calldataHash,messageSeed:B},{zkCallData:oe}=await l.generateZkProof(C,O,$?ae:U,b);return{zkCallData:oe,circomData:c.generateCircomData(z,R,L,G,A,h,j,W,_,v,X,S,U.calldataHash,F,w,T,$?Number(H):void 0,K,x,M,E),dimData:{tokenNumber:m.length,nullifierAmount:m.length>0?m[0].length:0,outputAmount:h.length>0?h[0].length:0},encryptedOutputs:j}};exports.constructZkProof=p;

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -3,9 +3,8 @@ 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 } from '../../types/hinkal.types';
-import { ethers } from 'ethers';
-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<{
+import { FeeStructure } from '../../types/hinkal.types';
+export declare const constructZkProof: <T = CircomDataType>(merkleTree: MerkleTree<bigint>, inputUtxos: Utxo[][], outputUtxos: Utxo[][], userKeys: UserKeys, externalActionId: ExternalActionId | 0n, externalAddress: string | undefined, externalActionMetadata: string | string[], generateProofRemotely: boolean, feeStructure: FeeStructure, relay?: string, chainId?: number, onChainCreation?: boolean[], hookData?: HookDataType | undefined, originalSender?: string, subAccountPrivateKey?: string) => Promise<{
     zkCallData: import('../..').NewZkCallDataType;
     circomData: T;
     dimData: DimDataType;

package/functions/snarkjs/constructGeneralZkProof.mjs

@@ -1,64 +1,81 @@
-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";
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { chainIds as t, getOnchainChainId as n } from "../../constants/chains.constants.mjs";
+import { defaultSignatureData as r, zeroAddress as i } from "../../constants/protocol.constants.mjs";
+import { randomBigInt as a } from "../web3/etherFunctions.mjs";
+import { poseidonFunction as ee } from "../../crypto/poseidon.mjs";
+import { UserKeys as te } from "../../data-structures/crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as ne } from "../utils/time.utils.mjs";
+import { takeOffHighestBit as re } from "../utils/bit.operations.mjs";
+import { Logger as ie } from "../../error-handling/logger.mjs";
+import { buildOutCommitments as ae, calcAmountChanges as o, calcEncryptedOutputs as s, calcPublicSignalCount as c, calcStealthAddressStructure as l, createCallDataHash as u, getSlippageValues as d, getUtxoCircuitH0Coords as f, getUtxoCircuitInRandomization as oe, getZkProofVerifierName as se } from "./common.snarkjs.mjs";
+import { computeSignedMessageHashEvm as ce } from "./signedMessageHash.mjs";
+import { generateCircomData as le } from "./generateCircomData.mjs";
+import { generateZkProof as ue } from "./generateZkProof.mjs";
+import { AccountActions as de } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { getDataFromWorkers as p } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { encodeEmporiumMetadata as m } from "../private-wallet/emporium.helpers.mjs";
 //#region libs/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);
+var h = async (h, g, _, v, y, b, x, fe, S, C = i, w = t.localhost, T = g.map(() => !1), E = void 0, D, O) => {
+	let k = se(g, _), A = o(g, _), j = g.map((e) => e[0].erc20TokenAddress), M = s(_), N = r, P = v.getShieldedPrivateKey(), { pubSpendingBJJPoint: F } = v.getSpendingKeyPair(), I = l(te.findCorrectRandomization(a(31), P), P, v.getSpendingKeyPair().pubSpendingBJJPoint), { inCommitmentSiblings: L, inCommitmentSiblingSides: R, rootHashHinkal: z, inNullifiers: B } = await p(w, h, g.map((e) => e.map((e) => e.getConstructableParams()))), V = ae(_), H = a(31), U = ee(H), W = BigInt(_.length > 0 ? _[0][0].timeStamp : ne()), G = {
+		rootHashHinkal: z,
+		spendingPublicKey: F,
+		nullifyingPrivateKey: P,
+		erc20TokenAddresses: j,
+		amountChanges: A,
+		inAmounts: g.map((e) => e.map((e) => e.amount.toString())),
+		inRandomizations: g.map((e) => e.map((e) => oe(e))),
+		inH0Ax: g.map((e) => e.map((e) => f(e)[0].toString())),
+		inH0Ay: g.map((e) => e.map((e) => f(e)[1].toString())),
+		isNewStyle: g.map((e) => e.map((e) => !!e.isNewStyle)),
+		inTimeStamps: g.map((e) => e.map((e) => e.timeStamp)),
+		inNullifiers: B,
+		inCommitmentSiblings: L,
+		inCommitmentSiblingSides: R,
+		outAmounts: _.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: W,
+		outPublicKeys: _.map((e) => e.map((e) => e.getStealthAddress())),
+		outCommitments: V,
+		calldataHash: 0n,
+		messageSeed: H,
+		H0Ax: re(I.extraRandomization),
+		H0Ay: I.H0
+	}, K = c(k, G.erc20TokenAddresses, G.amountChanges, G.inNullifiers, G.outCommitments), q = o(g, _, !0), J = d(q);
+	ie.log({ publicSignalCount: K });
+	let Y = Array.isArray(x) ? x : [x], pe = n(w), me = O ? de.getSignerAddressFromPrivateKey(pe, O) : void 0, X = y === e.Emporium ? await m(w, b ?? i, O, Y, U, me) : await m(w, i, void 0, y === 0n ? [] : Y, U, i);
+	G.calldataHash = u(K, C, b, y, X, M, E, J, T, S, N, D);
+	let Z = ce({
+		rootHashHinkal: z,
+		erc20TokenAddresses: j,
+		amountChanges: A,
+		outTimeStamp: W,
+		inNullifiers: B,
+		outCommitments: V,
+		calldataHash: G.calldataHash,
+		message: U,
+		outH1Ay: I.H1,
+		H0Ax: G.H0Ax,
+		H0Ay: I.H0
+	}), { R8: Q, S: he } = v.signEddsa(Z);
+	G.eddsaSignature = [
+		Q[0],
+		Q[1],
+		he
+	], G.signedMessageHash = Z;
+	let $ = k.startsWith("mainEVMCircuitMin0"), ge = {
+		outTimeStamp: W,
+		calldataHash: G.calldataHash,
+		messageSeed: H
+	}, { zkCallData: _e } = await ue(w, k, $ ? ge : G, fe);
 	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),
+		zkCallData: _e,
+		circomData: le(V, B, z, q, j, _, M, K, y, b, X, C, G.calldataHash, I, T, E, $ ? Number(W) : void 0, J, S, N, D),
 		dimData: {
-			tokenNumber: h.length,
-			nullifierAmount: h[0].length,
-			outputAmount: g[0].length
+			tokenNumber: g.length,
+			nullifierAmount: g.length > 0 ? g[0].length : 0,
+			outputAmount: _.length > 0 ? _[0].length : 0
 		},
-		encryptedOutputs: L
+		encryptedOutputs: M
 	};
 };
 //#endregion
-export { m as constructZkProof };
+export { h as constructZkProof };

package/functions/snarkjs/constructSolanaZkProof.cjs

@@ -1 +1 @@
-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;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../web3/etherFunctions.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../utils/bit.operations.cjs`),i=require(`../utils/solanaMint.utils.cjs`),a=require(`./common.snarkjs.cjs`),o=require(`../pre-transaction/solana.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateZkProof.cjs`);require(`../pre-transaction/index.cjs`),require(`../utils/index.cjs`);const l=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),u=require(`../pre-transaction/getSolanaCalldataHash.cjs`);require(`../web3/index.cjs`);let d=require(`@solana/web3.js`);var f=async(f,p,m,h,g,_,v,y,b,x,S,C,w,T=e.chainIds.solanaLocalnet,E=[],D=[],O=0n)=>{let k=new d.PublicKey(x),A=new d.PublicKey(S),j=m.getShieldedPrivateKey(),{pubSpendingBJJPoint:M}=m.getSpendingKeyPair(),N=a.calcStealthAddressStructure(v,j,m.getSpendingKeyPair().pubSpendingBJJPoint),P=t.randomBigInt(31),F=n.poseidonFunction(P),I=n.poseidonFunction(O),L=h.map(e=>i.formatMintAddress(e)),R=L.map(e=>e.mintAccountPart1),z=L.map(e=>e.mintAccountPart2),B=u.getSolanaCalldataHash(C,k,A,w,y,b,E,D),V=`${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`,H=a.calcAmountChanges(g,_),{inCommitmentSiblings:U,inCommitmentSiblingSides:W,rootHashHinkal:G,inNullifiers:K}=await l.getDataFromWorkers(T,p,g.map(e=>e.map(e=>e.getConstructableParams()))),q=a.buildOutCommitments(_),J=r.takeOffHighestBit(N.extraRandomization),Y=N.H0,X=s.computeSignedMessageHashSolana({rootHashHinkal:G,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,outTimeStamp:BigInt(_[0][0].timeStamp),inNullifiers:K,outCommitments:q,calldataHash:B,message:F,swapperAccountAdditionalSeed:I,outH1Ay:N.H1,H0Ax:J,H0Ay:Y}),{R8:Z,S:Q}=m.signEddsa(X),$={rootHashHinkal:G,spendingPublicKey:M,eddsaSignature:[Z[0],Z[1],Q],signedMessageHash:X,nullifyingPrivateKey:j,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,inAmounts:g.map(e=>e.map(e=>e.amount.toString())),inRandomizations:g.map(e=>e.map(e=>a.getUtxoCircuitInRandomization(e))),inH0Ax:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:g.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inNullifiers:K,inCommitmentSiblings:U,inCommitmentSiblingSides:W,outAmounts:_.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(_[0][0].timeStamp),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:q,calldataHash:B,messageSeed:P,swapperAccountSalt:O,H0Ax:J,H0Ay:Y},{publicSignals:ee,zkCallData:te}=await c.generateZkProof(T,`mainSolanaCircuit${V}`,$,f),[ne,re,ie]=te;return{proofAArr:ne.map(BigInt).map(o.encodeToByte32Array).flat(),proofBArr:re.flat().map(BigInt).map(o.encodeToByte32Array).flat(),proofCArr:ie.map(BigInt).map(o.encodeToByte32Array).flat(),publicInputsArr:ee.map(BigInt).map(o.encodeToByte32Array)}};exports.constructSolanaZkProof=f;

package/functions/snarkjs/constructSolanaZkProof.d.ts

@@ -4,8 +4,7 @@ import { AccountMeta } from '@solana/web3.js';
 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, swapperAccountSalt?: bigint, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[]) => Promise<{
+export declare const constructSolanaZkProof: (generateProofRemotely: boolean, merkleTreeHinkal: MerkleTree<bigint>, userKeys: UserKeys, mintAddresses: string[], inputUtxosArray: Utxo[][], outputUtxosArray: Utxo[][], extraRandomization: bigint, relayerFee: bigint, variableRate: bigint, recipientAddress: string, signerAddress: string, dimensions: DimDataType, encryptedOutputs: number[][], chainId?: number, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[], swapperAccountSalt?: bigint) => Promise<{
     proofAArr: number[];
     proofBArr: number[];
     proofCArr: number[];

package/functions/snarkjs/constructSolanaZkProof.mjs

@@ -1,44 +1,72 @@
 import { chainIds as e } from "../../constants/chains.constants.mjs";
-import { encodeToByte32Array as t } from "../pre-transaction/solana.mjs";
-import { hinkalCheckSolanaTokenRegistry as n } from "../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.mjs";
-import { formatMintAddress as r } from "../utils/solanaMint.utils.mjs";
-import { calcAmountChanges as i } from "./common.snarkjs.mjs";
-import { generateZkProof as a } from "./generateZkProof.mjs";
+import { randomBigInt as t } from "../web3/etherFunctions.mjs";
+import { poseidonFunction as n } from "../../crypto/poseidon.mjs";
+import { takeOffHighestBit as r } from "../utils/bit.operations.mjs";
+import { formatMintAddress as i } from "../utils/solanaMint.utils.mjs";
+import { buildOutCommitments as a, calcAmountChanges as ee, calcStealthAddressStructure as o, getUtxoCircuitH0Coords as s, getUtxoCircuitInRandomization as c } from "./common.snarkjs.mjs";
+import { encodeToByte32Array as l } from "../pre-transaction/solana.mjs";
+import { computeSignedMessageHashSolana as u } from "./signedMessageHash.mjs";
+import { generateZkProof as d } from "./generateZkProof.mjs";
 import "../pre-transaction/index.mjs";
-import { getDataFromWorkers as o } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-import { getSolanaCalldataHash as s } from "../pre-transaction/getSolanaCalldataHash.mjs";
-import { PublicKey as c } from "@solana/web3.js";
+import "../utils/index.mjs";
+import { getDataFromWorkers as f } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { getSolanaCalldataHash as p } from "../pre-transaction/getSolanaCalldataHash.mjs";
+import "../web3/index.mjs";
+import { PublicKey as m } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/snarkjs/constructSolanaZkProof.ts
-var l = async (l, u, d, f, p, m, h, g, _, v, y, b, x, S, C, w, T = e.solanaLocalnet, E = !1, D = 0n, O = [], k = []) => {
-	let A = new c(x), j = new c(S), M = p.getShieldedPrivateKey(), N = h.map((e) => r(e)), P = N.map((e) => e.mintAccountPart1), F = N.map((e) => e.mintAccountPart2), I = s(C, A, j, w, y, b, O, k), L = `${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`, R = i(g, _), z = await n(m, new c(u), h, R), { inCommitmentSiblings: B, inCommitmentSiblingSides: V, accessTokenSiblings: H, accessTokenSiblingSides: U, rootHashHinkal: W, rootHashAccessToken: G, inNullifiers: K } = await o(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(T, `basicSolana${L}`, q, l), [X, Z, Q] = Y;
+var h = async (h, g, _, te, v, y, b, x, S, C, w, T, E, D = e.solanaLocalnet, O = [], k = [], A = 0n) => {
+	let j = new m(C), M = new m(w), N = _.getShieldedPrivateKey(), { pubSpendingBJJPoint: P } = _.getSpendingKeyPair(), F = o(b, N, _.getSpendingKeyPair().pubSpendingBJJPoint), I = t(31), L = n(I), R = n(A), z = te.map((e) => i(e)), B = z.map((e) => e.mintAccountPart1), V = z.map((e) => e.mintAccountPart2), H = p(T, j, M, E, x, S, O, k), U = `${T.tokenNumber}x${T.nullifierAmount}x${T.outputAmount}`, W = ee(v, y), { inCommitmentSiblings: G, inCommitmentSiblingSides: K, rootHashHinkal: q, inNullifiers: J } = await f(D, g, v.map((e) => e.map((e) => e.getConstructableParams()))), Y = a(y), X = r(F.extraRandomization), Z = F.H0, Q = u({
+		rootHashHinkal: q,
+		mintAccountPart1: B,
+		mintAccountPart2: V,
+		amountChanges: W,
+		outTimeStamp: BigInt(y[0][0].timeStamp),
+		inNullifiers: J,
+		outCommitments: Y,
+		calldataHash: H,
+		message: L,
+		swapperAccountAdditionalSeed: R,
+		outH1Ay: F.H1,
+		H0Ax: X,
+		H0Ay: Z
+	}), { R8: $, S: ne } = _.signEddsa(Q), re = {
+		rootHashHinkal: q,
+		spendingPublicKey: P,
+		eddsaSignature: [
+			$[0],
+			$[1],
+			ne
+		],
+		signedMessageHash: Q,
+		nullifyingPrivateKey: N,
+		mintAccountPart1: B,
+		mintAccountPart2: V,
+		amountChanges: W,
+		inAmounts: v.map((e) => e.map((e) => e.amount.toString())),
+		inRandomizations: v.map((e) => e.map((e) => c(e))),
+		inH0Ax: v.map((e) => e.map((e) => s(e)[0].toString())),
+		inH0Ay: v.map((e) => e.map((e) => s(e)[1].toString())),
+		isNewStyle: v.map((e) => e.map((e) => !!e.isNewStyle)),
+		inTimeStamps: v.map((e) => e.map((e) => e.timeStamp)),
+		inNullifiers: J,
+		inCommitmentSiblings: G,
+		inCommitmentSiblingSides: K,
+		outAmounts: y.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: BigInt(y[0][0].timeStamp),
+		outPublicKeys: y.map((e) => e.map((e) => e.getStealthAddress())),
+		outCommitments: Y,
+		calldataHash: H,
+		messageSeed: I,
+		swapperAccountSalt: A,
+		H0Ax: X,
+		H0Ay: Z
+	}, { publicSignals: ie, zkCallData: ae } = await d(D, `mainSolanaCircuit${U}`, re, h), [oe, se, ce] = ae;
 	return {
-		proofAArr: X.map(BigInt).map(t).flat(),
-		proofBArr: Z.flat().map(BigInt).map(t).flat(),
-		proofCArr: Q.map(BigInt).map(t).flat(),
-		publicInputsArr: J.map(BigInt).map(t)
+		proofAArr: oe.map(BigInt).map(l).flat(),
+		proofBArr: se.flat().map(BigInt).map(l).flat(),
+		proofCArr: ce.map(BigInt).map(l).flat(),
+		publicInputsArr: ie.map(BigInt).map(l)
 	};
 };
 //#endregion
-export { l as constructSolanaZkProof };
+export { h as constructSolanaZkProof };

package/functions/snarkjs/fetchMerkleTreeSiblings.cjs

@@ -1 +1 @@
-const e=require(`../../constants/server.constants.cjs`),t=require(`../../API/getServerURL.cjs`),n=require(`../../data-structures/http/HttpClient.cjs`);var r=async(r,i,a)=>{let o=i.map(e=>e.map(e=>({...e,amount:e.amount.toString(),randomization:e.randomization?.toString()})));return await n.httpClient.post(`${t.SNAPSHOT_SERVER_URL}${e.API_CONFIG.ROUTES.getMerkleTreeSiblings}`,{inputUtxosSerialized:o,accessKey:a,chainId:r})};exports.fetchMerkleTreeSiblings=r;
+const e=require(`../../constants/server.constants.cjs`),t=require(`../../API/getServerURL.cjs`),n=require(`../../data-structures/http/HttpClient.cjs`),r=require(`../utils/serialize-utxos.utils.cjs`);var i=async(i,a)=>{let o=a.map(e=>e.map(e=>r.serializeUtxoConstructorParams(e))),s=`${t.SNAPSHOT_SERVER_URL}${e.API_CONFIG.ROUTES.getMerkleTreeSiblings}`;return await n.httpClient.post(s,{inputUtxosSerialized:o,chainId:i})};exports.fetchMerkleTreeSiblings=i;

package/functions/snarkjs/fetchMerkleTreeSiblings.d.ts

@@ -7,5 +7,5 @@ interface MerkleTreeSiblingsResponse {
     rootHashHinkal: string;
     rootHashAccessToken: string;
 }
-export declare const fetchMerkleTreeSiblings: (chainId: number, inputUtxosSerialized: IUtxoConstructor[][], accessKey: string) => Promise<MerkleTreeSiblingsResponse>;
+export declare const fetchMerkleTreeSiblings: (chainId: number, inputUtxosSerialized: IUtxoConstructor[][]) => Promise<MerkleTreeSiblingsResponse>;
 export {};

package/functions/snarkjs/fetchMerkleTreeSiblings.mjs

@@ -1,18 +1,14 @@
 import { API_CONFIG as e } from "../../constants/server.constants.mjs";
 import { SNAPSHOT_SERVER_URL as t } from "../../API/getServerURL.mjs";
 import { httpClient as n } from "../../data-structures/http/HttpClient.mjs";
+import { serializeUtxoConstructorParams as r } from "../utils/serialize-utxos.utils.mjs";
 //#region libs/shared/common/src/functions/snarkjs/fetchMerkleTreeSiblings.ts
-var r = async (r, i, a) => {
-	let o = i.map((e) => e.map((e) => ({
-		...e,
-		amount: e.amount.toString(),
-		randomization: e.randomization?.toString()
-	})));
-	return await n.post(`${t}${e.ROUTES.getMerkleTreeSiblings}`, {
+var i = async (i, a) => {
+	let o = a.map((e) => e.map((e) => r(e))), s = `${t}${e.ROUTES.getMerkleTreeSiblings}`;
+	return await n.post(s, {
 		inputUtxosSerialized: o,
-		accessKey: a,
-		chainId: r
+		chainId: i
 	});
 };
 //#endregion
-export { r as fetchMerkleTreeSiblings };
+export { i as fetchMerkleTreeSiblings };

package/functions/snarkjs/fetchOnChainRootHashes.cjs

@@ -1 +1 @@
-const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../web3/getContractMetadata.cjs`);var n=async n=>{let r=t.getContractWithFetcherByChainId(n,e.ContractType.HinkalContract),i=t.getContractWithFetcherByChainId(n,e.ContractType.AccessTokenContract),[a,o]=await Promise.all([r.getRootHash(),i.getRootHash()]);return{hinkalRootHash:a,accessTokenRootHash:o}};exports.fetchOnChainRootHashes=n;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../pre-transaction/solana.cjs`),r=require(`../utils/create-provider.cjs`),i=require(`../web3/getContractMetadata.cjs`),a=require(`../web3/fetchSolanaMerkleTreeRootHash.cjs`);let o=require(`@solana/web3.js`),s=require(`@coral-xyz/anchor`);var c=()=>{let e=o.Keypair.generate();return{publicKey:e.publicKey,payer:e,signTransaction:async e=>e,signAllTransactions:async e=>e}},l=async t=>({hinkalRootHash:await i.getContractWithFetcherByChainId(t,e.ContractType.HinkalContract).getRootHash()}),u=async e=>{let{contractData:i,fetchRpcUrl:l}=t.networkRegistry[e],{hinkalIdl:u,hinkalAddress:d,originalDeployer:f}=i;if(!u||!d||!f||!l)throw Error(`Missing Solana configuration for chain ${e}`);return{hinkalRootHash:await a.fetchSolanaMerkleTreeRootHash(new s.Program(u,new s.AnchorProvider(r.createCustomSolanaConnection(l),c(),{preflightCommitment:`confirmed`,commitment:`confirmed`})),n.getMerkleAccountPublicKey(new o.PublicKey(d),new o.PublicKey(f)))}},d=async e=>t.isSolanaLike(e)?u(e):l(e);exports.fetchOnChainRootHashes=d;

package/functions/snarkjs/fetchOnChainRootHashes.d.ts

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

package/functions/snarkjs/fetchOnChainRootHashes.mjs

@@ -1,12 +1,27 @@
 import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { getContractWithFetcherByChainId as t } from "../web3/getContractMetadata.mjs";
+import { isSolanaLike as t, networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { getMerkleAccountPublicKey as r } from "../pre-transaction/solana.mjs";
+import { createCustomSolanaConnection as i } from "../utils/create-provider.mjs";
+import { getContractWithFetcherByChainId as a } from "../web3/getContractMetadata.mjs";
+import { fetchSolanaMerkleTreeRootHash as o } from "../web3/fetchSolanaMerkleTreeRootHash.mjs";
+import { Keypair as s, PublicKey as c } from "@solana/web3.js";
+import { AnchorProvider as l, Program as u } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/functions/snarkjs/fetchOnChainRootHashes.ts
-var n = async (n) => {
-	let r = t(n, e.HinkalContract), i = t(n, e.AccessTokenContract), [a, o] = await Promise.all([r.getRootHash(), i.getRootHash()]);
+var d = () => {
+	let e = s.generate();
 	return {
-		hinkalRootHash: a,
-		accessTokenRootHash: o
+		publicKey: e.publicKey,
+		payer: e,
+		signTransaction: async (e) => e,
+		signAllTransactions: async (e) => e
 	};
-};
+}, f = async (t) => ({ hinkalRootHash: await a(t, e.HinkalContract).getRootHash() }), p = async (e) => {
+	let { contractData: t, fetchRpcUrl: a } = n[e], { hinkalIdl: s, hinkalAddress: f, originalDeployer: p } = t;
+	if (!s || !f || !p || !a) throw Error(`Missing Solana configuration for chain ${e}`);
+	return { hinkalRootHash: await o(new u(s, new l(i(a), d(), {
+		preflightCommitment: "confirmed",
+		commitment: "confirmed"
+	})), r(new c(f), new c(p))) };
+}, m = async (e) => t(e) ? p(e) : f(e);
 //#endregion
-export { n as fetchOnChainRootHashes };
+export { m as fetchOnChainRootHashes };

package/functions/snarkjs/generateCircomData.cjs

@@ -1 +1 @@
-const e=require(`../../types/circom-data.types.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../utils/external-action.utils.cjs`),r=require(`./getOriginalSender.cjs`);var i=(i,a,o,s,c,l,u,d,f,p,m,h,g,_,v,y,b,x,S,C,w,T,E=t.defaultSignatureData,D)=>{let O=structuredClone(C);return`interactionAddress`in O&&delete O.interactionAddress,{rootHashHinkal:o,erc20TokenAddresses:l,tokenIds:v.map(e=>String(e)),amountChanges:c,inputNullifiers:a,outCommitments:i,encryptedOutputs:d,timeStamp:u.length>0?u[0][0].timeStamp:String(S??``),stealthAddressStructure:y,rootHashAccessToken:s,relay:g,externalAddress:m===void 0?t.zeroAddress:m,externalActionMetadata:h,externalActionId:typeof p==`bigint`?0n:n.getExternalActionIdHash(p),hookData:x||e.defaultHookData,publicSignalCount:f,calldataHash:_,onChainCreation:b,slippageValues:w,hinkalLogicArgs:O,feeStructure:{...T},signatureData:E,originalSender:D??r.getOriginalSender(m??t.zeroAddress,g)}};exports.generateCircomData=i;
+const e=require(`../../types/circom-data.types.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../utils/external-action.utils.cjs`),i=require(`./getOriginalSender.cjs`);var a=(a,o,s,c,l,u,d,f,p,m,h,g,_,v,y,b,x,S,C,w=t.defaultSignatureData,T)=>({rootHashHinkal:s,erc20TokenAddresses:l,tokenIds:l.map(()=>`0`),amountChanges:c,inputNullifiers:o,outCommitments:a,encryptedOutputs:d,timeStamp:u.length>0?u[0][0].timeStamp:String(x??``),stealthAddressStructure:v,rootHashAccessToken:0n,relay:g,externalAddress:m===void 0?t.zeroAddress:m,externalActionMetadata:h,externalActionId:typeof p==`bigint`?0n:r.getExternalActionIdHash(p),hookData:b||e.defaultHookData,publicSignalCount:f,calldataHash:_,onChainCreation:y,slippageValues:S,hinkalLogicArgs:n.defaultHinkalLogicArgs(l.length),feeStructure:{...C},signatureData:w,originalSender:T??i.getOriginalSender(m??t.zeroAddress,g)});exports.generateCircomData=a;

package/functions/snarkjs/generateCircomData.d.ts

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

package/functions/snarkjs/generateCircomData.mjs

@@ -1,35 +1,33 @@
 import { defaultHookData as e } from "../../types/circom-data.types.mjs";
 import { defaultSignatureData as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
-import { getExternalActionIdHash as r } from "../utils/external-action.utils.mjs";
-import { getOriginalSender as i } from "./getOriginalSender.mjs";
+import { defaultHinkalLogicArgs as r } from "../../types/hinkal.types.mjs";
+import { getExternalActionIdHash as i } from "../utils/external-action.utils.mjs";
+import { getOriginalSender as a } from "./getOriginalSender.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateCircomData.ts
-var a = (a, o, s, c, l, u, d, f, p, m, h, g, _, v, y, b, x, S, C, w, T, E, D = t, O) => {
-	let k = structuredClone(w);
-	return "interactionAddress" in k && delete k.interactionAddress, {
-		rootHashHinkal: s,
-		erc20TokenAddresses: u,
-		tokenIds: y.map((e) => String(e)),
-		amountChanges: l,
-		inputNullifiers: o,
-		outCommitments: a,
-		encryptedOutputs: f,
-		timeStamp: d.length > 0 ? d[0][0].timeStamp : String(C ?? ""),
-		stealthAddressStructure: b,
-		rootHashAccessToken: c,
-		relay: _,
-		externalAddress: h === void 0 ? n : h,
-		externalActionMetadata: g,
-		externalActionId: typeof m == "bigint" ? 0n : r(m),
-		hookData: S || e,
-		publicSignalCount: p,
-		calldataHash: v,
-		onChainCreation: x,
-		slippageValues: T,
-		hinkalLogicArgs: k,
-		feeStructure: { ...E },
-		signatureData: D,
-		originalSender: O ?? i(h ?? n, _)
-	};
-};
+var o = (o, s, c, l, u, d, f, p, m, h, g, _, v, y, b, x, S, C, w, T = t, E) => ({
+	rootHashHinkal: c,
+	erc20TokenAddresses: u,
+	tokenIds: u.map(() => "0"),
+	amountChanges: l,
+	inputNullifiers: s,
+	outCommitments: o,
+	encryptedOutputs: f,
+	timeStamp: d.length > 0 ? d[0][0].timeStamp : String(S ?? ""),
+	stealthAddressStructure: y,
+	rootHashAccessToken: 0n,
+	relay: _,
+	externalAddress: h === void 0 ? n : h,
+	externalActionMetadata: g,
+	externalActionId: typeof m == "bigint" ? 0n : i(m),
+	hookData: x || e,
+	publicSignalCount: p,
+	calldataHash: v,
+	onChainCreation: b,
+	slippageValues: C,
+	hinkalLogicArgs: r(u.length),
+	feeStructure: { ...w },
+	signatureData: T,
+	originalSender: E ?? a(h ?? n, _)
+});
 //#endregion
-export { a as generateCircomData };
+export { o as generateCircomData };

package/functions/snarkjs/generateZkProof.cjs

@@ -1 +1 @@
-const e=require(`../../error-handling/logger.cjs`),t=require(`./generateZkProofEnclave.cjs`),n=require(`./generateZkProofSelf.cjs`);var r=async(r,i,a,o)=>{if(o)try{return await t.generateZkProofEnclave(r,i,a)}catch(t){e.Logger.error(`enclave proof error`,t)}return n.generateZkProofSelf(r,i,a)};exports.generateZkProof=r;
+const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`./getZKFiles.cjs`),r=require(`./generateZkProofEnclave.cjs`),i=require(`./generateZkProofSelf.cjs`);var a=async(a,o,s,c)=>{if(c)try{let t=e.getCustomProofGenerator();if(t){let{zkCallData:e,publicSignals:r}=await t(s,n.getWASMFile(o,a),n.getZKeyFile(o,a));return{zkCallData:e,publicSignals:r}}return await r.generateZkProofEnclave(a,o,s)}catch(e){t.Logger.error(`enclave proof error`,e)}return i.generateZkProofSelf(a,o,s)};exports.generateZkProof=a;

package/functions/snarkjs/generateZkProof.mjs

@@ -1,14 +1,24 @@
-import { Logger as e } from "../../error-handling/logger.mjs";
-import { generateZkProofEnclave as t } from "./generateZkProofEnclave.mjs";
-import { generateZkProofSelf as n } from "./generateZkProofSelf.mjs";
+import { getCustomProofGenerator as e } from "../utils/customEnclaveFunctionsRegister.mjs";
+import { Logger as t } from "../../error-handling/logger.mjs";
+import { getWASMFile as n, getZKeyFile as r } from "./getZKFiles.mjs";
+import { generateZkProofEnclave as i } from "./generateZkProofEnclave.mjs";
+import { generateZkProofSelf as a } from "./generateZkProofSelf.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProof.ts
-var r = async (r, i, a, o) => {
-	if (o) try {
-		return await t(r, i, a);
-	} catch (t) {
-		e.error("enclave proof error", t);
+var o = async (o, s, c, l) => {
+	if (l) try {
+		let t = e();
+		if (t) {
+			let { zkCallData: e, publicSignals: i } = await t(c, n(s, o), r(s, o));
+			return {
+				zkCallData: e,
+				publicSignals: i
+			};
+		}
+		return await i(o, s, c);
+	} catch (e) {
+		t.error("enclave proof error", e);
 	}
-	return n(r, i, a);
+	return a(o, s, c);
 };
 //#endregion
-export { r as generateZkProof };
+export { o as generateZkProof };

package/functions/snarkjs/generateZkProofEnclave.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`./constant.cjs`),r=require(`../utils/encryptInputForEnclave.cjs`),i=require(`./getZKFiles.cjs`);var a=e=>{if(e.startsWith(`http`)){let t=e.split(`/`).at(-1);if(!t)throw Error(`invalid verifierName`);return t}return e},o=async(o,s,c)=>{let l=a(i.getWASMFile(s,o)),u=a(i.getZKeyFile(s,o)),{keyCiphertext:d,inputCiphertext:f}=await r.makeEnclaveHandshakeAndEncryptInput(c),p={chainId:o,circuit_wasm:l,circuit_zkey:u,input:f,key:d,version:e.PROVER_VERSION},{public_signals:m,zk_calldata:h}=await t.httpClient.post(`${n.ENCLAVE_EC2_URL}/generate`,p);return{zkCallData:h,publicSignals:m}};exports.generateZkProofEnclave=o;
+const e=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const t=require(`./constant.cjs`),n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./getZKFiles.cjs`);var i=e=>{if(e.startsWith(`http`)){let t=e.split(`/`).at(-1);if(!t)throw Error(`invalid verifierName`);return t}return e},a=async(a,o,s)=>{let c=i(r.getWASMFile(o,a)),l=i(r.getZKeyFile(o,a)),{keyCiphertext:u,inputCiphertext:d}=await n.makeEnclaveHandshakeAndEncryptInput(s),f={circuit_wasm:c,circuit_zkey:l,input:d,key:u},{public_signals:p,zk_calldata:m}=await e.httpClient.post(`${t.ENCLAVE_URL}/generate`,f);return{zkCallData:m,publicSignals:p}};exports.generateZkProofEnclave=a;