@hinkal/common 0.3.6 → 0.3.7

package/common/src/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../web3/etherFunctions.cjs`),i=require(`../../data-structures/crypto-keys/keys.cjs`),a=require(`../utils/time.utils.cjs`);require(`../../types/circom-data.types.cjs`);const ee=require(`../../types/external-action.types.cjs`),te=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateCircomData.cjs`),l=require(`../../data-structures/AccountActions/AccountActions.cjs`),ne=require(`./generateMainAndCommitmentZkProof.cjs`),u=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),d=require(`../private-wallet/emporium.helpers.cjs`),f=require(`./fetchTronInsertionSiblings.cjs`);var p=async(p,m,h,g,_,v,y,b,x=t.zeroAddress,S=e.chainIds.localhost,C=m.map(()=>!1),w=void 0,T,E,D=`0x`,O=!1)=>{let k=e.isTronLike(S),A=o.getZkProofVerifierName(m,h,k),j=o.calcAmountChanges(m,h),M=m.map(e=>e[0].erc20TokenAddress),N=o.calcEncryptedOutputs(h),P=g.getShieldedPrivateKey(),{pubSpendingBJJPoint:F}=g.getSpendingKeyPair(),I=o.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),P),P,g.getSpendingKeyPair().pubSpendingBJJPoint),L=o.calcOnchainEncryptedOutput(i.UserKeys.getEncryptionKeyPair(P).publicKey,I),{inCommitmentSiblings:re,inCommitmentSiblingSides:ie,rootHashHinkal:R,rootHashHinkalIndex:ae,inNullifiers:z}=await u.getDataFromWorkers(S,p,m.map(e=>e.map(e=>e.getConstructableParams()))),B=o.buildOutCommitments(h),V=r.randomBigInt(31),H=n.poseidonFunction(V),U=BigInt(h.length>0?h[0][0].timeStamp:a.getCurrentTimeInSeconds()),W={rootHashHinkal:R,spendingPublicKey:F,nullifyingPrivateKey:P,erc20TokenAddresses:M,amountChanges:j,inAmounts:m.map(e=>e.map(e=>e.amount.toString())),inH0Ax:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[1].toString())),inTimeStamps:m.map(e=>e.map(e=>e.timeStamp)),inNullifiers:z,inCommitmentSiblings:re,inCommitmentSiblingSides:ie,outAmounts:h.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:U,outPublicKeys:h.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:B,calldataHash:0n,messageSeed:V},G;if(k){let e=await f.fetchTronInsertionSiblings(S,B);W.insertionSiblings=e.insertionSiblings,W.insertionSiblingSides=e.insertionSiblingSides,G=BigInt(e.insertedLeafIndex),W.insertedLeafIndex=e.insertedLeafIndex}else W.H0Ax=I.H0x,W.H0Ay=I.H0y;let K=o.calcPublicSignalCount(A,W.erc20TokenAddresses,W.amountChanges,W.inNullifiers,W.outCommitments),q=o.calcAmountChanges(m,h,!0),J=o.getSlippageValues(q);te.Logger.log({publicSignalCount:K});let Y=Array.isArray(y)?y:[y],oe=e.getOnchainChainId(S),se=E?l.AccountActions.getSignerAddressFromPrivateKey(oe,E):void 0,X;X=_===ee.ExternalActionId.Emporium?await d.encodeEmporiumMetadata(S,v??t.zeroAddress,E,Y,H,se):_===0n?`0x`:Y[0]??`0x`,W.calldataHash=o.createCallDataHash(K,x,v,_,H,X,N,L,w,J,C,b,T,D,S,O);let Z=k?s.computeSignedMessageHashTron({rootHashHinkal:R,erc20TokenAddresses:M,amountChanges:j,outTimeStamp:U,inNullifiers:z,outCommitments:B,calldataHash:W.calldataHash,message:H}):s.computeSignedMessageHashEvm({rootHashHinkal:R,erc20TokenAddresses:M,amountChanges:j,outTimeStamp:U,inNullifiers:z,outCommitments:B,calldataHash:W.calldataHash,message:H,outH1Ax:I.H1x,outH1Ay:I.H1y,H0Ax:W.H0Ax,H0Ay:I.H0y}),{R8:Q,S:ce}=g.signEddsa(Z);W.eddsaSignature=[Q[0],Q[1],ce],W.signedMessageHash=Z;let $=A.startsWith(`mainEVMCircuitMin0`),le={outTimeStamp:U,calldataHash:W.calldataHash,messageSeed:V},{zkCallData:ue,publicSignals:de,commitmentValidationData:fe}=await ne.generateMainAndCommitmentZkProof(S,g,M,m,A,$?le:W);return{zkCallData:ue,circomData:c.generateCircomData(B,z,R,ae,q,M,h,N,L,K,_,v,H,X,x,W.calldataHash,I,C,w,$?Number(U):void 0,J,b,T,k,de,D,G,O),dimData:{tokenNumber:m.length,nullifierAmount:m.length>0?m[0].length:0,outputAmount:h.length>0?h[0].length:0},encryptedOutputs:N,commitmentValidationData:fe}};exports.constructZkProof=p;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../web3/etherFunctions.cjs`),i=require(`../../data-structures/crypto-keys/keys.cjs`),ee=require(`../utils/time.utils.cjs`);require(`../../types/circom-data.types.cjs`);const te=require(`../../types/external-action.types.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateCircomData.cjs`),ne=require(`../../data-structures/AccountActions/AccountActions.cjs`),re=require(`./generateMainAndCommitmentZkProof.cjs`),ie=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),l=require(`../private-wallet/emporium.helpers.cjs`),u=require(`./fetchTronInsertionSiblings.cjs`);var d=async(d,f,p,m,h,g,_,v,y=t.zeroAddress,b=e.chainIds.localhost,x=f.map(()=>!1),S=void 0,C,w,T=`0x`,E=!1,ae=!1,oe)=>{let{hinkalAddress:D}=e.networkRegistry[b].contractData,O=e.isTronLike(b),k=o.getZkProofVerifierName(f,p,O),A=o.calcAmountChanges(f,p),j=f.map(e=>e[0].erc20TokenAddress),M=o.calcEncryptedOutputs(p),N=m.getShieldedPrivateKey(),{pubSpendingBJJPoint:se}=m.getSpendingKeyPair(),P=o.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),N),N,m.getSpendingKeyPair().pubSpendingBJJPoint),F=o.calcOnchainEncryptedOutput(i.UserKeys.getEncryptionKeyPair(N).publicKey,P),{inCommitmentSiblings:ce,inCommitmentSiblingSides:le,rootHashHinkal:I,rootHashHinkalIndex:ue,inNullifiers:L}=await ie.getDataFromWorkers(b,d,f.map(e=>e.map(e=>e.getConstructableParams())),ae),R=o.buildOutCommitments(p),z=r.randomBigInt(31),B=n.poseidonFunction(z),V=BigInt(p.length>0?p[0][0].timeStamp:ee.getCurrentTimeInSeconds()),H={rootHashHinkal:I,spendingPublicKey:se,nullifyingPrivateKey:N,erc20TokenAddresses:j,amountChanges:A,inAmounts:f.map(e=>e.map(e=>e.amount.toString())),inH0Ax:f.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:f.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[1].toString())),inTimeStamps:f.map(e=>e.map(e=>e.timeStamp)),inNullifiers:L,inCommitmentSiblings:ce,inCommitmentSiblingSides:le,outAmounts:p.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:V,outPublicKeys:p.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:R,calldataHash:0n,messageSeed:z},U;if(O){let e=await u.fetchTronInsertionSiblings(b,R);H.insertionSiblings=e.insertionSiblings,H.insertionSiblingSides=e.insertionSiblingSides,U=BigInt(e.insertedLeafIndex),H.insertedLeafIndex=e.insertedLeafIndex}else H.H0Ax=P.H0x,H.H0Ay=P.H0y;let W=o.calcPublicSignalCount(k,H.erc20TokenAddresses,H.amountChanges,H.inNullifiers,H.outCommitments),G=o.calcAmountChanges(f,p,!0),K=oe??o.getSlippageValues(G);a.Logger.log({publicSignalCount:W});let q=Array.isArray(_)?_:[_],J=e.getOnchainChainId(b),de=w?ne.AccountActions.getSignerAddressFromPrivateKey(J,w):void 0,Y;Y=h===te.ExternalActionId.Emporium?await l.encodeEmporiumMetadata(b,g??t.zeroAddress,w,q,B,de,v.flatFee):h===0n?`0x`:q[0]??`0x`,H.calldataHash=o.createCallDataHash(W,y,g,h,B,Y,M,F,S,K,x,v,C,T,b,E);let X=O?s.computeSignedMessageHashTron({rootHashHinkal:I,erc20TokenAddresses:j,amountChanges:A,outTimeStamp:V,inNullifiers:L,outCommitments:R,calldataHash:H.calldataHash,message:B,chainId:BigInt(J),verifyingContract:D}):s.computeSignedMessageHashEvm({rootHashHinkal:I,erc20TokenAddresses:j,amountChanges:A,outTimeStamp:V,inNullifiers:L,outCommitments:R,calldataHash:H.calldataHash,message:B,outH1Ax:P.H1x,outH1Ay:P.H1y,H0Ax:H.H0Ax,H0Ay:P.H0y,chainId:BigInt(J),verifyingContract:D}),{R8:Z,S:Q}=m.signEddsa(X);H.eddsaSignature=[Z[0],Z[1],Q],H.signedMessageHash=X;let $=k.startsWith(`mainEVMCircuitMin0`),fe={outTimeStamp:V,calldataHash:H.calldataHash,messageSeed:z},{zkCallData:pe,publicSignals:me,commitmentValidationData:he}=await re.generateMainAndCommitmentZkProof(b,m,j,f,k,$?fe:H);return{zkCallData:pe,circomData:c.generateCircomData(R,L,I,ue,G,j,p,M,F,W,h,g,B,Y,y,H.calldataHash,P,x,S,$?Number(V):void 0,K,v,C,O,me,T,U,E),dimData:{tokenNumber:f.length,nullifierAmount:f.length>0?f[0].length:0,outputAmount:p.length>0?p[0].length:0},encryptedOutputs:M,commitmentValidationData:he}};exports.constructZkProof=d;

package/common/src/functions/snarkjs/constructGeneralZkProof.d.ts

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

package/common/src/functions/snarkjs/constructGeneralZkProof.mjs

@@ -1,94 +1,98 @@
-import { chainIds as e, getOnchainChainId as t, isTronLike as n } from "../../constants/chains.constants.mjs";
-import { zeroAddress as r } from "../../constants/protocol.constants.mjs";
-import { poseidonFunction as ee } from "../../crypto/poseidon.mjs";
-import { randomBigInt as i } from "../web3/etherFunctions.mjs";
-import { UserKeys as a } from "../../data-structures/crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as te } from "../utils/time.utils.mjs";
+import { chainIds as e, getOnchainChainId as t, isTronLike as ee, networkRegistry as te } from "../../constants/chains.constants.mjs";
+import { zeroAddress as n } from "../../constants/protocol.constants.mjs";
+import { poseidonFunction as ne } from "../../crypto/poseidon.mjs";
+import { randomBigInt as r } from "../web3/etherFunctions.mjs";
+import { UserKeys as i } from "../../data-structures/crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as re } from "../utils/time.utils.mjs";
 import "../../types/circom-data.types.mjs";
-import { ExternalActionId as ne } from "../../types/external-action.types.mjs";
-import { Logger as re } from "../../error-handling/logger.mjs";
-import { buildOutCommitments as ie, calcAmountChanges as o, calcEncryptedOutputs as ae, calcOnchainEncryptedOutput as oe, calcPublicSignalCount as se, calcStealthAddressStructure as s, createCallDataHash as c, getSlippageValues as l, getUtxoCircuitH0Coords as u, getZkProofVerifierName as ce } from "./common.snarkjs.mjs";
-import { computeSignedMessageHashEvm as le, computeSignedMessageHashTron as ue } from "./signedMessageHash.mjs";
-import { generateCircomData as de } from "./generateCircomData.mjs";
-import { AccountActions as fe } from "../../data-structures/AccountActions/AccountActions.mjs";
-import { generateMainAndCommitmentZkProof as pe } from "./generateMainAndCommitmentZkProof.mjs";
-import { getDataFromWorkers as me } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-import { encodeEmporiumMetadata as he } from "../private-wallet/emporium.helpers.mjs";
-import { fetchTronInsertionSiblings as d } from "./fetchTronInsertionSiblings.mjs";
+import { ExternalActionId as ie } from "../../types/external-action.types.mjs";
+import { Logger as ae } from "../../error-handling/logger.mjs";
+import { buildOutCommitments as oe, calcAmountChanges as a, calcEncryptedOutputs as se, calcOnchainEncryptedOutput as o, calcPublicSignalCount as s, calcStealthAddressStructure as c, createCallDataHash as l, getSlippageValues as ce, getUtxoCircuitH0Coords as u, getZkProofVerifierName as le } from "./common.snarkjs.mjs";
+import { computeSignedMessageHashEvm as ue, computeSignedMessageHashTron as de } from "./signedMessageHash.mjs";
+import { generateCircomData as fe } from "./generateCircomData.mjs";
+import { AccountActions as pe } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { generateMainAndCommitmentZkProof as me } from "./generateMainAndCommitmentZkProof.mjs";
+import { getDataFromWorkers as he } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { encodeEmporiumMetadata as ge } from "../private-wallet/emporium.helpers.mjs";
+import { fetchTronInsertionSiblings as _e } from "./fetchTronInsertionSiblings.mjs";
 //#region libs/shared/common/src/functions/snarkjs/constructGeneralZkProof.ts
-var f = async (f, p, m, h, g, _, v, y, b = r, x = e.localhost, S = p.map(() => !1), C = void 0, w, T, E = "0x", D = !1) => {
-	let O = n(x), k = ce(p, m, O), A = o(p, m), j = p.map((e) => e[0].erc20TokenAddress), M = ae(m), N = h.getShieldedPrivateKey(), { pubSpendingBJJPoint: P } = h.getSpendingKeyPair(), F = s(a.findCorrectRandomization(i(31), N), N, h.getSpendingKeyPair().pubSpendingBJJPoint), I = oe(a.getEncryptionKeyPair(N).publicKey, F), { inCommitmentSiblings: L, inCommitmentSiblingSides: ge, rootHashHinkal: R, rootHashHinkalIndex: _e, inNullifiers: z } = await me(x, f, p.map((e) => e.map((e) => e.getConstructableParams()))), B = ie(m), V = i(31), H = ee(V), U = BigInt(m.length > 0 ? m[0][0].timeStamp : te()), W = {
-		rootHashHinkal: R,
+var d = async (d, f, p, m, h, g, _, v, y = n, b = e.localhost, x = f.map(() => !1), S = void 0, C, w, T = "0x", E = !1, ve = !1, ye) => {
+	let { hinkalAddress: D } = te[b].contractData, O = ee(b), k = le(f, p, O), A = a(f, p), j = f.map((e) => e[0].erc20TokenAddress), M = se(p), N = m.getShieldedPrivateKey(), { pubSpendingBJJPoint: P } = m.getSpendingKeyPair(), F = c(i.findCorrectRandomization(r(31), N), N, m.getSpendingKeyPair().pubSpendingBJJPoint), I = o(i.getEncryptionKeyPair(N).publicKey, F), { inCommitmentSiblings: be, inCommitmentSiblingSides: xe, rootHashHinkal: L, rootHashHinkalIndex: Se, inNullifiers: R } = await he(b, d, f.map((e) => e.map((e) => e.getConstructableParams())), ve), z = oe(p), B = r(31), V = ne(B), H = BigInt(p.length > 0 ? p[0][0].timeStamp : re()), U = {
+		rootHashHinkal: L,
 		spendingPublicKey: P,
 		nullifyingPrivateKey: N,
 		erc20TokenAddresses: j,
 		amountChanges: A,
-		inAmounts: p.map((e) => e.map((e) => e.amount.toString())),
-		inH0Ax: p.map((e) => e.map((e) => u(e)[0].toString())),
-		inH0Ay: p.map((e) => e.map((e) => u(e)[1].toString())),
-		inTimeStamps: p.map((e) => e.map((e) => e.timeStamp)),
-		inNullifiers: z,
-		inCommitmentSiblings: L,
-		inCommitmentSiblingSides: ge,
-		outAmounts: m.map((e) => e.map((e) => e.amount.toString())),
-		outTimeStamp: U,
-		outPublicKeys: m.map((e) => e.map((e) => e.getStealthAddress())),
-		outCommitments: B,
+		inAmounts: f.map((e) => e.map((e) => e.amount.toString())),
+		inH0Ax: f.map((e) => e.map((e) => u(e)[0].toString())),
+		inH0Ay: f.map((e) => e.map((e) => u(e)[1].toString())),
+		inTimeStamps: f.map((e) => e.map((e) => e.timeStamp)),
+		inNullifiers: R,
+		inCommitmentSiblings: be,
+		inCommitmentSiblingSides: xe,
+		outAmounts: p.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: H,
+		outPublicKeys: p.map((e) => e.map((e) => e.getStealthAddress())),
+		outCommitments: z,
 		calldataHash: 0n,
-		messageSeed: V
-	}, G;
+		messageSeed: B
+	}, W;
 	if (O) {
-		let e = await d(x, B);
-		W.insertionSiblings = e.insertionSiblings, W.insertionSiblingSides = e.insertionSiblingSides, G = BigInt(e.insertedLeafIndex), W.insertedLeafIndex = e.insertedLeafIndex;
-	} else W.H0Ax = F.H0x, W.H0Ay = F.H0y;
-	let K = se(k, W.erc20TokenAddresses, W.amountChanges, W.inNullifiers, W.outCommitments), q = o(p, m, !0), J = l(q);
-	re.log({ publicSignalCount: K });
-	let Y = Array.isArray(v) ? v : [v], ve = t(x), ye = T ? fe.getSignerAddressFromPrivateKey(ve, T) : void 0, X;
-	X = g === ne.Emporium ? await he(x, _ ?? r, T, Y, H, ye) : g === 0n ? "0x" : Y[0] ?? "0x", W.calldataHash = c(K, b, _, g, H, X, M, I, C, J, S, y, w, E, x, D);
-	let Z = O ? ue({
-		rootHashHinkal: R,
+		let e = await _e(b, z);
+		U.insertionSiblings = e.insertionSiblings, U.insertionSiblingSides = e.insertionSiblingSides, W = BigInt(e.insertedLeafIndex), U.insertedLeafIndex = e.insertedLeafIndex;
+	} else U.H0Ax = F.H0x, U.H0Ay = F.H0y;
+	let G = s(k, U.erc20TokenAddresses, U.amountChanges, U.inNullifiers, U.outCommitments), K = a(f, p, !0), q = ye ?? ce(K);
+	ae.log({ publicSignalCount: G });
+	let J = Array.isArray(_) ? _ : [_], Y = t(b), Ce = w ? pe.getSignerAddressFromPrivateKey(Y, w) : void 0, X;
+	X = h === ie.Emporium ? await ge(b, g ?? n, w, J, V, Ce, v.flatFee) : h === 0n ? "0x" : J[0] ?? "0x", U.calldataHash = l(G, y, g, h, V, X, M, I, S, q, x, v, C, T, b, E);
+	let Z = O ? de({
+		rootHashHinkal: L,
 		erc20TokenAddresses: j,
 		amountChanges: A,
-		outTimeStamp: U,
-		inNullifiers: z,
-		outCommitments: B,
-		calldataHash: W.calldataHash,
-		message: H
-	}) : le({
-		rootHashHinkal: R,
+		outTimeStamp: H,
+		inNullifiers: R,
+		outCommitments: z,
+		calldataHash: U.calldataHash,
+		message: V,
+		chainId: BigInt(Y),
+		verifyingContract: D
+	}) : ue({
+		rootHashHinkal: L,
 		erc20TokenAddresses: j,
 		amountChanges: A,
-		outTimeStamp: U,
-		inNullifiers: z,
-		outCommitments: B,
-		calldataHash: W.calldataHash,
-		message: H,
+		outTimeStamp: H,
+		inNullifiers: R,
+		outCommitments: z,
+		calldataHash: U.calldataHash,
+		message: V,
 		outH1Ax: F.H1x,
 		outH1Ay: F.H1y,
-		H0Ax: W.H0Ax,
-		H0Ay: F.H0y
-	}), { R8: Q, S: be } = h.signEddsa(Z);
-	W.eddsaSignature = [
+		H0Ax: U.H0Ax,
+		H0Ay: F.H0y,
+		chainId: BigInt(Y),
+		verifyingContract: D
+	}), { R8: Q, S: we } = m.signEddsa(Z);
+	U.eddsaSignature = [
 		Q[0],
 		Q[1],
-		be
-	], W.signedMessageHash = Z;
-	let $ = k.startsWith("mainEVMCircuitMin0"), xe = {
-		outTimeStamp: U,
-		calldataHash: W.calldataHash,
-		messageSeed: V
-	}, { zkCallData: Se, publicSignals: Ce, commitmentValidationData: we } = await pe(x, h, j, p, k, $ ? xe : W);
+		we
+	], U.signedMessageHash = Z;
+	let $ = k.startsWith("mainEVMCircuitMin0"), Te = {
+		outTimeStamp: H,
+		calldataHash: U.calldataHash,
+		messageSeed: B
+	}, { zkCallData: Ee, publicSignals: De, commitmentValidationData: Oe } = await me(b, m, j, f, k, $ ? Te : U);
 	return {
-		zkCallData: Se,
-		circomData: de(B, z, R, _e, q, j, m, M, I, K, g, _, H, X, b, W.calldataHash, F, S, C, $ ? Number(U) : void 0, J, y, w, O, Ce, E, G, D),
+		zkCallData: Ee,
+		circomData: fe(z, R, L, Se, K, j, p, M, I, G, h, g, V, X, y, U.calldataHash, F, x, S, $ ? Number(H) : void 0, q, v, C, O, De, T, W, E),
 		dimData: {
-			tokenNumber: p.length,
-			nullifierAmount: p.length > 0 ? p[0].length : 0,
-			outputAmount: m.length > 0 ? m[0].length : 0
+			tokenNumber: f.length,
+			nullifierAmount: f.length > 0 ? f[0].length : 0,
+			outputAmount: p.length > 0 ? p[0].length : 0
 		},
 		encryptedOutputs: M,
-		commitmentValidationData: we
+		commitmentValidationData: Oe
 	};
 };
 //#endregion
-export { f as constructZkProof };
+export { d as constructZkProof };

package/common/src/functions/snarkjs/constructSolanaZkProof.cjs

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

package/common/src/functions/snarkjs/constructSolanaZkProof.d.ts

@@ -4,7 +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';
-export declare const constructSolanaZkProof: (merkleTreeHinkal: MerkleTree<bigint>, userKeys: UserKeys, mintAddresses: string[], inputUtxosArray: Utxo[][], outputUtxosArray: Utxo[][], relayerFee: bigint, variableRate: bigint, recipientAddress: string, signerAddress: string, dimensions: DimDataType, onChainCreation?: boolean[], chainId?: number, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[], swapperAccountSalt?: bigint) => Promise<{
+export declare const constructSolanaZkProof: (merkleTreeHinkal: MerkleTree<bigint>, userKeys: UserKeys, mintAddresses: string[], inputUtxosArray: Utxo[][], outputUtxosArray: Utxo[][], relayerFee: bigint, variableRate: bigint, recipientAddress: string, signerAddress: string, dimensions: DimDataType, onChainCreation?: boolean[], chainId?: number, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[], swapperAccountSalt?: bigint, isSpeculativeTree?: boolean) => Promise<{
     proofAArr: number[];
     proofBArr: number[];
     proofCArr: number[];

package/common/src/functions/snarkjs/constructSolanaZkProof.mjs

@@ -7,20 +7,20 @@ import { buildOutCommitments as a, calcAmountChanges as o, calcEncryptedOutputs
 import { encodeToByte32Array as d } from "../pre-transaction/solana.mjs";
 import { computeSignedMessageHashSolana as f } from "./signedMessageHash.mjs";
 import "../pre-transaction/index.mjs";
-import { generateMainAndCommitmentZkProof as p } from "./generateMainAndCommitmentZkProof.mjs";
-import { getDataFromWorkers as ee } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { generateMainAndCommitmentZkProof as ee } from "./generateMainAndCommitmentZkProof.mjs";
+import { getDataFromWorkers as te } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
 import "../web3/index.mjs";
-import { getSolanaCalldataHash as te } from "../pre-transaction/getSolanaCalldataHash.mjs";
-import { ethers as m } from "ethers";
-import { PublicKey as h } from "@solana/web3.js";
+import { getSolanaCalldataHash as ne } from "../pre-transaction/getSolanaCalldataHash.mjs";
+import { ethers as p } from "ethers";
+import { PublicKey as m } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/snarkjs/constructSolanaZkProof.ts
-var g = async (g, _, v, y, b, x, S, C, w, T, E = [], D = e.solanaLocalnet, ne = [], re = [], O = 0n) => {
-	let ie = new h(C), k = new h(w), A = _.getShieldedPrivateKey(), { pubSpendingBJJPoint: j } = _.getSpendingKeyPair(), M = l(r.findCorrectRandomization(n(31), A), A, _.getSpendingKeyPair().pubSpendingBJJPoint), N = E.some(Boolean) ? c(r.getEncryptionKeyPair(A).publicKey, M) : "0x", P = s(b).flatMap((e, t) => E[t] ? e.map(() => []) : e.map((e) => [...m.getBytes(e)])), F = n(31), I = t(F), L = t(O), R = v.map((e) => i(e)), z = R.map((e) => e.mintAccountPart1), B = R.map((e) => e.mintAccountPart2), V = te(T, ie, k, P, N, x, S, ne, re), H = `${T.tokenNumber}x${T.nullifierAmount}x${T.outputAmount}`, U = o(y, b), { inCommitmentSiblings: W, inCommitmentSiblingSides: ae, rootHashHinkal: G, rootHashHinkalIndex: K, inNullifiers: q } = await ee(D, g, y.map((e) => e.map((e) => e.getConstructableParams()))), J = a(b), Y = M.H0x, X = M.H0y, Z = f({
+var h = async (h, g, _, v, y, b, x, S, C, w, T = [], E = e.solanaLocalnet, re = [], ie = [], D = 0n, ae = !1) => {
+	let O = new m(S), k = new m(C), A = g.getShieldedPrivateKey(), { pubSpendingBJJPoint: j } = g.getSpendingKeyPair(), M = l(r.findCorrectRandomization(n(31), A), A, g.getSpendingKeyPair().pubSpendingBJJPoint), N = T.some(Boolean) ? c(r.getEncryptionKeyPair(A).publicKey, M) : "0x", P = s(y).flatMap((e, t) => T[t] ? e.map(() => []) : e.map((e) => [...p.getBytes(e)])), F = n(31), I = t(F), L = t(D), R = _.map((e) => i(e)), z = R.map((e) => e.mintAccountPart1), B = R.map((e) => e.mintAccountPart2), V = ne(w, O, k, P, N, b, x, re, ie), H = `${w.tokenNumber}x${w.nullifierAmount}x${w.outputAmount}`, U = o(v, y), { inCommitmentSiblings: oe, inCommitmentSiblingSides: W, rootHashHinkal: G, rootHashHinkalIndex: K, inNullifiers: q } = await te(E, h, v.map((e) => e.map((e) => e.getConstructableParams())), ae), J = a(y), Y = M.H0x, X = M.H0y, Z = f({
 		rootHashHinkal: G,
 		mintAccountPart1: z,
 		mintAccountPart2: B,
 		amountChanges: U,
-		outTimeStamp: BigInt(b[0][0].timeStamp),
+		outTimeStamp: BigInt(y[0][0].timeStamp),
 		inNullifiers: q,
 		outCommitments: J,
 		calldataHash: V,
@@ -29,46 +29,46 @@ var g = async (g, _, v, y, b, x, S, C, w, T, E = [], D = e.solanaLocalnet, ne =
 		outH1Ay: M.H1y,
 		H0Ax: Y,
 		H0Ay: X
-	}), { R8: Q, S: oe } = _.signEddsa(Z), se = {
+	}), { R8: Q, S: se } = g.signEddsa(Z), ce = {
 		rootHashHinkal: G,
 		spendingPublicKey: j,
 		eddsaSignature: [
 			Q[0],
 			Q[1],
-			oe
+			se
 		],
 		signedMessageHash: Z,
 		nullifyingPrivateKey: A,
 		mintAccountPart1: z,
 		mintAccountPart2: B,
 		amountChanges: U,
-		inAmounts: y.map((e) => e.map((e) => e.amount.toString())),
-		inH0Ax: y.map((e) => e.map((e) => u(e)[0].toString())),
-		inH0Ay: y.map((e) => e.map((e) => u(e)[1].toString())),
-		inTimeStamps: y.map((e) => e.map((e) => e.timeStamp)),
+		inAmounts: v.map((e) => e.map((e) => e.amount.toString())),
+		inH0Ax: v.map((e) => e.map((e) => u(e)[0].toString())),
+		inH0Ay: v.map((e) => e.map((e) => u(e)[1].toString())),
+		inTimeStamps: v.map((e) => e.map((e) => e.timeStamp)),
 		inNullifiers: q,
-		inCommitmentSiblings: W,
-		inCommitmentSiblingSides: ae,
-		outAmounts: b.map((e) => e.map((e) => e.amount.toString())),
-		outTimeStamp: BigInt(b[0][0].timeStamp),
-		outPublicKeys: b.map((e) => e.map((e) => e.getStealthAddress())),
+		inCommitmentSiblings: oe,
+		inCommitmentSiblingSides: W,
+		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: J,
 		calldataHash: V,
 		messageSeed: F,
-		swapperAccountSalt: O,
+		swapperAccountSalt: D,
 		H0Ax: Y,
 		H0Ay: X
-	}, { zkCallData: ce, publicSignals: le, commitmentValidationData: $ } = await p(D, _, v, y, `mainSolanaCircuit${H}`, se), [ue, de, fe] = ce;
+	}, { zkCallData: le, publicSignals: $, commitmentValidationData: ue } = await ee(E, g, _, v, `mainSolanaCircuit${H}`, ce), [de, fe, pe] = le;
 	return {
-		proofAArr: ue.map(BigInt).map(d).flat(),
-		proofBArr: de.flat().map(BigInt).map(d).flat(),
-		proofCArr: fe.map(BigInt).map(d).flat(),
-		publicInputsArr: le.map(BigInt).map(d),
-		commitmentValidationData: $,
+		proofAArr: de.map(BigInt).map(d).flat(),
+		proofBArr: fe.flat().map(BigInt).map(d).flat(),
+		proofCArr: pe.map(BigInt).map(d).flat(),
+		publicInputsArr: $.map(BigInt).map(d),
+		commitmentValidationData: ue,
 		rootHashHinkalIndex: K,
 		encryptedOutputs: P,
 		onChainEncryptedOutput: N
 	};
 };
 //#endregion
-export { g as constructSolanaZkProof };
+export { h as constructSolanaZkProof };

package/common/src/functions/snarkjs/constructTxEnclave.cjs

@@ -1 +1 @@
-const e=require(`./constant.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./verifySignedEnclaveResponse.cjs`);var i=e=>e?.flat().filter(e=>e.amount>0n).map(e=>e.getCommitment()),a=async(i,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await n.makeEnclaveHandshakeAndEncryptInput(a),c=await t.httpClient.post(`${e.ENCLAVE_URL}${i}`,{key:o,inputs:s});return r.verifySignedEnclaveResponse(c.data,c.signature)},o=e=>{if(Array.isArray(e))return`[${e.map(o).join(`,`)}]`;if(e&&typeof e==`object`){let t=e;return`{${Object.keys(t).filter(e=>t[e]!==void 0).sort().map(e=>`${JSON.stringify(e)}:${o(t[e])}`).join(`,`)}}`}return JSON.stringify(e)},s=(e,t)=>{if(o({chainId:String(e.chainId),erc20Addresses:e.erc20Addresses,amountChanges:e.amountChanges,externalAddress:e.externalAddress,...e.originalSender?{originalSender:e.originalSender}:{},relay:e.relay??``,feeStructure:e.feeStructure?{feeToken:e.feeStructure.feeToken,flatFee:e.feeStructure.flatFee.toString(),variableRate:e.feeStructure.variableRate.toString()}:null,externalActionId:e.externalActionId??``,externalActionMetadata:e.externalActionMetadata??``,onChainCreation:e.onChainCreation??null,recipientAddress:e.recipientAddress??null,recipientAmounts:e.recipientAmounts??null,selfOutputAmounts:e.selfOutputAmounts??null,inputCommitments:e.inputCommitments??null,useBlockedUtxos:e.useBlockedUtxos??!1,createBlockedUtxos:e.createBlockedUtxos??!1,...e.forceEmptyUtxos?{forceEmptyUtxos:!0}:{},messageSeed:e.messageSeed??``,skipLock:e.skipLock??!1})!==o(t))throw Error(`Enclave prepare-tx response does not match the request sent - refusing to sign`)},c=(e,t)=>{let n={chainId:String(e.chainId),mintAddresses:e.mintAddresses,amountChanges:e.amountChanges,relayAddress:e.relayAddress,recipient:e.recipient,signer:e.signer??e.relayAddress,functionName:e.functionName??`transact`,accounts:e.accounts,onChainCreation:e.onChainCreation??null,relayerFee:e.relayerFee??`0`,variableRate:e.variableRate??`0`,hinkalInstructions:e.hinkalInstructions??null,remainingAccounts:e.remainingAccounts??null,swapperAccountSalt:e.swapperAccountSalt??`0`,recipientAddress:e.recipientAddress??``,recipientAmounts:e.recipientAmounts??null,inputCommitments:e.inputCommitments??null,useBlockedUtxos:e.useBlockedUtxos??!1,messageSeed:e.messageSeed??``};if(e.recipientAmount&&(n.recipientAmount=e.recipientAmount),e.displayRecipient&&(n.displayRecipient=e.displayRecipient),o(n)!==o(t))throw Error(`Enclave prepare-solana-tx response does not match the request sent - refusing to sign`)},l=e=>({R8:e.R8.map(String),S:e.S.toString()}),u=e=>({feeToken:e.feeToken,flatFee:e.flatFee.toString(),variableRate:e.variableRate.toString()}),d=(e,t)=>{if(o({chainId:String(e.chainId),erc20Address:e.erc20Address,externalAddress:e.externalAddress,relay:e.relay,feeStructure:{feeToken:e.feeStructure.feeToken,flatFee:e.feeStructure.flatFee.toString(),variableRate:e.feeStructure.variableRate.toString()},hashedEthereumAddress:e.hashedEthereumAddress})!==o(t))throw Error(`Enclave prepare-stuck-withdraw response does not match the request sent - refusing to sign`)},f=async(e,t,n=e.userKeys)=>{let r={...t,amountChanges:t.amountChanges.map(String),recipientAmounts:t.recipientAmounts?.map(e=>e.map(String)),selfOutputAmounts:t.selfOutputAmounts?.map(String),messageSeed:t.messageSeed?.toString(),nullifyingKey:n.getShieldedPrivateKey(),spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},i=await a(`/prepare-tx`,r);return s(r,i.request),i},p=async(e,t)=>{let{nullifierCount:n}=await a(`/estimate-nullifiers`,{...t,amountChanges:t.amountChanges.map(String),nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return n},m=async(e,t,n=e.userKeys)=>{let r={...t,amountChanges:t.amountChanges.map(String),relayerFee:t.relayerFee?.toString(),variableRate:t.variableRate?.toString(),swapperAccountSalt:t.swapperAccountSalt?.toString(),recipientAmounts:t.recipientAmounts?.map(String),messageSeed:t.messageSeed?.toString(),nullifyingKey:n.getShieldedPrivateKey(),spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},i=await a(`/prepare-solana-tx`,r);return c(r,i.request),i},h=async(e,t)=>{let n={...t,nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},{jobs:r,request:i}=await a(`/prepare-stuck-withdraw`,n);return d(n,i),r},g=async(e,t)=>{let n=Object.fromEntries(Object.entries(t.feeStructures).map(([e,t])=>[e,u(t)])),{jobs:r}=await a(`/prepare-solana-stuck-withdraw`,{...t,feeStructures:n,nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return r},_=async(e,t)=>a(`/finalize-tx`,{jobId:e,eddsaSignature:l(t)}),v=async(e,t)=>a(`/finalize-solana-tx`,{jobId:e,eddsaSignature:l(t)}),y=async(e,t,n,r)=>{let{txHash:i}=await a(`/finalize-tx-relay`,{jobId:e,eddsaSignature:l(t),chainId:n,adminData:r?.adminData,authorizationData:r?.authorizationData,withUniswapWorkAround:r?.withUniswapWorkAround});return i},b=async(e,t,n,r)=>{let{txHash:i}=await a(`/finalize-solana-tx-relay`,{jobId:e,eddsaSignature:l(t),chainId:n,adminData:r?.adminData});return i};exports.collectInputCommitments=i,exports.estimateNullifiersEnclaveCall=p,exports.finalizeSolanaTxEnclaveCall=v,exports.finalizeSolanaTxEnclaveCallRelay=b,exports.finalizeTxEnclaveCall=_,exports.finalizeTxEnclaveCallRelay=y,exports.prepareSolanaStuckWithdrawEnclaveCall=g,exports.prepareSolanaTxEnclaveCall=m,exports.prepareStuckWithdrawEnclaveCall=h,exports.prepareTxEnclaveCall=f;
+const e=require(`./constant.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./verifySignedEnclaveResponse.cjs`);var i=e=>e?.flat().filter(e=>e.amount>0n).map(e=>e.getCommitment()),a=async(i,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await n.makeEnclaveHandshakeAndEncryptInput(a),c=await t.httpClient.post(`${e.ENCLAVE_URL}${i}`,{key:o,inputs:s});return r.verifySignedEnclaveResponse(c.data,c.signature)},o=e=>{if(Array.isArray(e))return`[${e.map(o).join(`,`)}]`;if(e&&typeof e==`object`){let t=e;return`{${Object.keys(t).filter(e=>t[e]!==void 0).sort().map(e=>`${JSON.stringify(e)}:${o(t[e])}`).join(`,`)}}`}return JSON.stringify(e)},s=(e,t)=>{if(o({chainId:String(e.chainId),hinkalAddress:e.hinkalAddress??``,erc20Addresses:e.erc20Addresses,amountChanges:e.amountChanges,externalAddress:e.externalAddress,...e.originalSender?{originalSender:e.originalSender}:{},relay:e.relay??``,feeStructure:e.feeStructure?{feeToken:e.feeStructure.feeToken,flatFee:e.feeStructure.flatFee.toString(),variableRate:e.feeStructure.variableRate.toString()}:null,externalActionId:e.externalActionId??``,externalActionMetadata:e.externalActionMetadata??``,onChainCreation:e.onChainCreation??null,recipientAddress:e.recipientAddress??null,recipientAmounts:e.recipientAmounts??null,selfOutputAmounts:e.selfOutputAmounts??null,inputCommitments:e.inputCommitments??null,useBlockedUtxos:e.useBlockedUtxos??!1,createBlockedUtxos:e.createBlockedUtxos??!1,...e.forceEmptyUtxos?{forceEmptyUtxos:!0}:{},messageSeed:e.messageSeed??``,skipLock:e.skipLock??!1,...e.speculative?{speculative:e.speculative}:{},slippageValues:e.slippageValues??null})!==o(t))throw Error(`Enclave prepare-tx response does not match the request sent - refusing to sign`)},c=(e,t)=>{let n={chainId:String(e.chainId),mintAddresses:e.mintAddresses,amountChanges:e.amountChanges,relayAddress:e.relayAddress,recipient:e.recipient,signer:e.signer??e.relayAddress,functionName:e.functionName??`transact`,accounts:e.accounts,onChainCreation:e.onChainCreation??null,relayerFee:e.relayerFee??`0`,variableRate:e.variableRate??`0`,hinkalInstructions:e.hinkalInstructions??null,remainingAccounts:e.remainingAccounts??null,swapperAccountSalt:e.swapperAccountSalt??`0`,recipientAddress:e.recipientAddress??``,recipientAmounts:e.recipientAmounts??null,inputCommitments:e.inputCommitments??null,useBlockedUtxos:e.useBlockedUtxos??!1,messageSeed:e.messageSeed??``};if(e.recipientAmount&&(n.recipientAmount=e.recipientAmount),e.displayRecipient&&(n.displayRecipient=e.displayRecipient),e.speculative&&(n.speculative=e.speculative),o(n)!==o(t))throw Error(`Enclave prepare-solana-tx response does not match the request sent - refusing to sign`)},l=e=>({R8:e.R8.map(String),S:e.S.toString()}),u=e=>({feeToken:e.feeToken,flatFee:e.flatFee.toString(),variableRate:e.variableRate.toString()}),d=(e,t)=>{if(o({chainId:String(e.chainId),hinkalAddress:e.hinkalAddress??``,erc20Address:e.erc20Address,externalAddress:e.externalAddress,relay:e.relay,feeStructure:{feeToken:e.feeStructure.feeToken,flatFee:e.feeStructure.flatFee.toString(),variableRate:e.feeStructure.variableRate.toString()},hashedEthereumAddress:e.hashedEthereumAddress})!==o(t))throw Error(`Enclave prepare-stuck-withdraw response does not match the request sent - refusing to sign`)},f=async(e,t,n=e.userKeys)=>{let r={...t,amountChanges:t.amountChanges.map(String),recipientAmounts:t.recipientAmounts?.map(e=>e.map(String)),selfOutputAmounts:t.selfOutputAmounts?.map(String),messageSeed:t.messageSeed?.toString(),nullifyingKey:n.getShieldedPrivateKey(),spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint.map(String),slippageValues:t.slippageValues?.map(String)},i=await a(`/prepare-tx`,r);return s(r,i.request),i},p=async(e,t)=>{let{nullifierCount:n}=await a(`/estimate-nullifiers`,{...t,amountChanges:t.amountChanges.map(String),nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return n},m=async(e,t,n=e.userKeys)=>{let r={...t,amountChanges:t.amountChanges.map(String),relayerFee:t.relayerFee?.toString(),variableRate:t.variableRate?.toString(),swapperAccountSalt:t.swapperAccountSalt?.toString(),recipientAmounts:t.recipientAmounts?.map(String),messageSeed:t.messageSeed?.toString(),nullifyingKey:n.getShieldedPrivateKey(),spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},i=await a(`/prepare-solana-tx`,r);return c(r,i.request),i},h=async(e,t)=>{let n={...t,nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},{jobs:r,request:i}=await a(`/prepare-stuck-withdraw`,n);return d(n,i),r},g=async(e,t)=>{let n=Object.fromEntries(Object.entries(t.feeStructures).map(([e,t])=>[e,u(t)])),{jobs:r}=await a(`/prepare-solana-stuck-withdraw`,{...t,feeStructures:n,nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return r},_=async(e,t)=>a(`/finalize-tx`,{jobId:e,eddsaSignature:l(t)}),v=async(e,t)=>a(`/finalize-solana-tx`,{jobId:e,eddsaSignature:l(t)}),y=async(e,t,n,r)=>{let{txHash:i}=await a(`/finalize-tx-relay`,{jobId:e,eddsaSignature:l(t),chainId:n,adminData:r?.adminData,authorizationData:r?.authorizationData,withUniswapWorkAround:r?.withUniswapWorkAround});return i},b=async(e,t,n,r)=>{let{txHash:i}=await a(`/finalize-solana-tx-relay`,{jobId:e,eddsaSignature:l(t),chainId:n,adminData:r?.adminData});return i};exports.collectInputCommitments=i,exports.estimateNullifiersEnclaveCall=p,exports.finalizeSolanaTxEnclaveCall=v,exports.finalizeSolanaTxEnclaveCallRelay=b,exports.finalizeTxEnclaveCall=_,exports.finalizeTxEnclaveCallRelay=y,exports.prepareSolanaStuckWithdrawEnclaveCall=g,exports.prepareSolanaTxEnclaveCall=m,exports.prepareStuckWithdrawEnclaveCall=h,exports.prepareTxEnclaveCall=f;

package/common/src/functions/snarkjs/constructTxEnclave.mjs

@@ -20,6 +20,7 @@ var i = (e) => e?.flat().filter((e) => e.amount > 0n).map((e) => e.getCommitment
 }, s = (e, t) => {
 	if (o({
 		chainId: String(e.chainId),
+		hinkalAddress: e.hinkalAddress ?? "",
 		erc20Addresses: e.erc20Addresses,
 		amountChanges: e.amountChanges,
 		externalAddress: e.externalAddress,
@@ -41,7 +42,9 @@ var i = (e) => e?.flat().filter((e) => e.amount > 0n).map((e) => e.getCommitment
 		createBlockedUtxos: e.createBlockedUtxos ?? !1,
 		...e.forceEmptyUtxos ? { forceEmptyUtxos: !0 } : {},
 		messageSeed: e.messageSeed ?? "",
-		skipLock: e.skipLock ?? !1
+		skipLock: e.skipLock ?? !1,
+		...e.speculative ? { speculative: e.speculative } : {},
+		slippageValues: e.slippageValues ?? null
 	}) !== o(t)) throw Error("Enclave prepare-tx response does not match the request sent - refusing to sign");
 }, c = (e, t) => {
 	let n = {
@@ -65,7 +68,7 @@ var i = (e) => e?.flat().filter((e) => e.amount > 0n).map((e) => e.getCommitment
 		useBlockedUtxos: e.useBlockedUtxos ?? !1,
 		messageSeed: e.messageSeed ?? ""
 	};
-	if (e.recipientAmount && (n.recipientAmount = e.recipientAmount), e.displayRecipient && (n.displayRecipient = e.displayRecipient), o(n) !== o(t)) throw Error("Enclave prepare-solana-tx response does not match the request sent - refusing to sign");
+	if (e.recipientAmount && (n.recipientAmount = e.recipientAmount), e.displayRecipient && (n.displayRecipient = e.displayRecipient), e.speculative && (n.speculative = e.speculative), o(n) !== o(t)) throw Error("Enclave prepare-solana-tx response does not match the request sent - refusing to sign");
 }, l = (e) => ({
 	R8: e.R8.map(String),
 	S: e.S.toString()
@@ -76,6 +79,7 @@ var i = (e) => e?.flat().filter((e) => e.amount > 0n).map((e) => e.getCommitment
 }), d = (e, t) => {
 	if (o({
 		chainId: String(e.chainId),
+		hinkalAddress: e.hinkalAddress ?? "",
 		erc20Address: e.erc20Address,
 		externalAddress: e.externalAddress,
 		relay: e.relay,
@@ -94,7 +98,8 @@ var i = (e) => e?.flat().filter((e) => e.amount > 0n).map((e) => e.getCommitment
 		selfOutputAmounts: t.selfOutputAmounts?.map(String),
 		messageSeed: t.messageSeed?.toString(),
 		nullifyingKey: n.getShieldedPrivateKey(),
-		spendingPublicKey: n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
+		spendingPublicKey: n.getSpendingKeyPair().pubSpendingBJJPoint.map(String),
+		slippageValues: t.slippageValues?.map(String)
 	}, i = await a("/prepare-tx", r);
 	return s(r, i.request), i;
 }, p = async (e, t) => {

package/common/src/functions/snarkjs/fetchOnChainRootHashes.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/ethereum-network.types.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 e=>{let n=i.getContractWithFetcherByChainId(e,t.ContractType.HinkalContract);return{hinkalRootHash:await n.getRootHash(),hinkalRootHashIndex:BigInt(await n.m_index())-1n}},u=async t=>{let{contractData:i,fetchRpcUrl:l}=e.networkRegistry[t],{hinkalIdl:u,hinkalAddress:d,originalDeployer:f}=i;if(!u||!d||!f||!l)throw Error(`Missing Solana configuration for chain ${t}`);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))),hinkalRootHashIndex:0n}},d=async t=>e.isSolanaLike(t)?u(t):l(t);exports.fetchOnChainRootHashes=d;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../pre-transaction/solana.cjs`),r=require(`../utils/create-provider.cjs`),i=require(`../web3/getContractMetadata.cjs`),a=require(`../utils/solana-program.utils.cjs`),o=require(`../web3/fetchSolanaMerkleTreeRootHash.cjs`);let s=require(`@solana/web3.js`);var c=async e=>{let n=i.getContractWithFetcherByChainId(e,t.ContractType.HinkalContract);return{hinkalRootHash:await n.getRootHash(),hinkalRootHashIndex:BigInt(await n.m_index())-1n}},l=async t=>{let{contractData:i,rpcUrl:c}=e.networkRegistry[t],{hinkalIdl:l,hinkalAddress:u,originalDeployer:d}=i;if(!l||!u||!d)throw Error(`Missing Solana configuration for chain ${t}`);return{hinkalRootHash:await o.fetchSolanaMerkleTreeRootHash(a.createReadOnlySolanaProgram(r.createCustomSolanaConnection(c),l),n.getMerkleAccountPublicKey(new s.PublicKey(u),new s.PublicKey(d))),hinkalRootHashIndex:0n}},u=async t=>e.isSolanaLike(t)?l(t):c(t);exports.fetchOnChainRootHashes=u;

package/common/src/functions/snarkjs/fetchOnChainRootHashes.mjs

@@ -3,34 +3,23 @@ import { ContractType as n } from "../../types/ethereum-network.types.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";
+import { createReadOnlySolanaProgram as o } from "../utils/solana-program.utils.mjs";
+import { fetchSolanaMerkleTreeRootHash as s } from "../web3/fetchSolanaMerkleTreeRootHash.mjs";
+import { PublicKey as c } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/snarkjs/fetchOnChainRootHashes.ts
-var d = () => {
-	let e = s.generate();
-	return {
-		publicKey: e.publicKey,
-		payer: e,
-		signTransaction: async (e) => e,
-		signAllTransactions: async (e) => e
-	};
-}, f = async (e) => {
+var l = async (e) => {
 	let t = a(e, n.HinkalContract);
 	return {
 		hinkalRootHash: await t.getRootHash(),
 		hinkalRootHashIndex: BigInt(await t.m_index()) - 1n
 	};
-}, p = async (e) => {
-	let { contractData: n, fetchRpcUrl: a } = t[e], { hinkalIdl: s, hinkalAddress: f, originalDeployer: p } = n;
-	if (!s || !f || !p || !a) throw Error(`Missing Solana configuration for chain ${e}`);
+}, u = async (e) => {
+	let { contractData: n, rpcUrl: a } = t[e], { hinkalIdl: l, hinkalAddress: u, originalDeployer: d } = n;
+	if (!l || !u || !d) 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))),
+		hinkalRootHash: await s(o(i(a), l), r(new c(u), new c(d))),
 		hinkalRootHashIndex: 0n
 	};
-}, m = async (t) => e(t) ? p(t) : f(t);
+}, d = async (t) => e(t) ? u(t) : l(t);
 //#endregion
-export { m as fetchOnChainRootHashes };
+export { d as fetchOnChainRootHashes };

package/common/src/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.cjs

@@ -1 +1 @@
-const e=require(`../../constants/vite.constants.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../utils/amounts.utils.cjs`),r=require(`./common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`),s=require(`./fetchMerkleTreeSiblings.cjs`),c=require(`./fetchOnChainRootHashes.cjs`);var l=async(t,n)=>{let r=t.getRootHash();if(r===void 0)throw Error(`Root hash not available from hinkal merkle tree`);let s=t.getIndex()-1n,c;return c=(e.isNode,await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:n,merkleTreeSerialized:t.toJSON()}}})),{inCommitmentSiblings:c.inCommitmentSiblings,inCommitmentSiblingSides:c.inCommitmentSiblingSides,rootHashHinkal:r,rootHashHinkalIndex:s}},u=async(e,t)=>{let r=await s.fetchMerkleTreeSiblings(e,t);return{inCommitmentSiblings:r.inCommitmentSiblings,inCommitmentSiblingSides:r.inCommitmentSiblingSides,rootHashHinkal:n.toBigInt(r.rootHashHinkal),rootHashHinkalIndex:n.toBigInt(r.rootHashHinkalIndex)}},d=async(e,t)=>{if(!t)return!1;try{let n=t.getRootHash();if(n===void 0)return!1;let{hinkalRootHash:r}=await c.fetchOnChainRootHashes(e);return n===r}catch{return!1}},f=async(e,n,r)=>await d(e,r)||t.isLocalNetwork(e)?l(r,n):u(e,n),p=async(n,s,l)=>{if(r.hasOnlyZeroAmounts(l)){let e=r.buildZeroInputMerkleDataFromSerialized(l);if(t.isLocalNetwork(n)){let t=s.getRootHash();if(t===void 0)throw Error(`Root hash not available from hinkal merkle tree`);return{...e,rootHashHinkal:t,rootHashHinkalIndex:s.getIndex()-1n}}let{hinkalRootHash:i,hinkalRootHashIndex:a}=await c.fetchOnChainRootHashes(n);return{...e,rootHashHinkal:i,rootHashHinkalIndex:a}}if(e.isNode){let{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c}=await f(n,l,s);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c,inNullifiers:await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:l}}})}}else{let[{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c},u]=await Promise.all([f(n,l,s),a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:l}}})]);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c,inNullifiers:u}}};exports.getDataFromWorkers=p;
+const e=require(`../../constants/vite.constants.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../utils/amounts.utils.cjs`),r=require(`./common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`),s=require(`./fetchMerkleTreeSiblings.cjs`),c=require(`./fetchOnChainRootHashes.cjs`);var l=async(t,n)=>{let r=t.getRootHash();if(r===void 0)throw Error(`Root hash not available from hinkal merkle tree`);let s=t.getIndex()-1n,c;return c=(e.isNode,await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:n,merkleTreeSerialized:t.toJSON()}}})),{inCommitmentSiblings:c.inCommitmentSiblings,inCommitmentSiblingSides:c.inCommitmentSiblingSides,rootHashHinkal:r,rootHashHinkalIndex:s}},u=async(e,t)=>{let r=await s.fetchMerkleTreeSiblings(e,t);return{inCommitmentSiblings:r.inCommitmentSiblings,inCommitmentSiblingSides:r.inCommitmentSiblingSides,rootHashHinkal:n.toBigInt(r.rootHashHinkal),rootHashHinkalIndex:n.toBigInt(r.rootHashHinkalIndex)}},d=async(e,t)=>{if(!t)return!1;try{let n=t.getRootHash();if(n===void 0)return!1;let{hinkalRootHash:r}=await c.fetchOnChainRootHashes(e);return n===r}catch{return!1}},f=async(e,n,r,i=!1)=>i||await d(e,r)||t.isLocalNetwork(e)?l(r,n):u(e,n),p=async(n,s,l,u=!1)=>{if(r.hasOnlyZeroAmounts(l)){let e=r.buildZeroInputMerkleDataFromSerialized(l);if(t.isLocalNetwork(n)){let t=s.getRootHash();if(t===void 0)throw Error(`Root hash not available from hinkal merkle tree`);return{...e,rootHashHinkal:t,rootHashHinkalIndex:s.getIndex()-1n}}let{hinkalRootHash:i,hinkalRootHashIndex:a}=await c.fetchOnChainRootHashes(n);return{...e,rootHashHinkal:i,rootHashHinkalIndex:a}}if(e.isNode){let{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c}=await f(n,l,s,u);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c,inNullifiers:await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:l}}})}}else{let[{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c},d]=await Promise.all([f(n,l,s,u),a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:l}}})]);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c,inNullifiers:d}}};exports.getDataFromWorkers=p;

package/common/src/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.d.ts

@@ -6,8 +6,8 @@ interface MerkleTreeSiblingsAndRootHashes {
     rootHashHinkal: bigint;
     rootHashHinkalIndex: bigint;
 }
-export declare const getMerkleTreeSiblingsAndRootHashes: (chainId: number, inputUtxosSerialized: IUtxoConstructor[][], merkleTree: MerkleTree<bigint>) => Promise<MerkleTreeSiblingsAndRootHashes>;
-export declare const getDataFromWorkers: (chainId: number, merkleTree: MerkleTree<bigint>, inputUtxosSerialized: IUtxoConstructor[][]) => Promise<{
+export declare const getMerkleTreeSiblingsAndRootHashes: (chainId: number, inputUtxosSerialized: IUtxoConstructor[][], merkleTree: MerkleTree<bigint>, isSpeculativeTree?: boolean) => Promise<MerkleTreeSiblingsAndRootHashes>;
+export declare const getDataFromWorkers: (chainId: number, merkleTree: MerkleTree<bigint>, inputUtxosSerialized: IUtxoConstructor[][], isSpeculativeTree?: boolean) => Promise<{
     rootHashHinkal: bigint;
     rootHashHinkalIndex: bigint;
     inCommitmentSiblings: string[][][];

package/common/src/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.mjs

@@ -45,7 +45,7 @@ var u = async (e, t) => {
 	} catch {
 		return !1;
 	}
-}, p = async (e, n, r) => await f(e, r) || t(e) ? u(r, n) : d(e, n), m = async (n, c, u) => {
+}, p = async (e, n, r, i = !1) => i || await f(e, r) || t(e) ? u(r, n) : d(e, n), m = async (n, c, u, d = !1) => {
 	if (i(u)) {
 		let e = r(u);
 		if (t(n)) {
@@ -65,7 +65,7 @@ var u = async (e, t) => {
 		};
 	}
 	if (e) {
-		let { inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r, rootHashHinkalIndex: i } = await p(n, u, c);
+		let { inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r, rootHashHinkalIndex: i } = await p(n, u, c, d);
 		return {
 			inCommitmentSiblings: e,
 			inCommitmentSiblingSides: t,
@@ -80,7 +80,7 @@ var u = async (e, t) => {
 			})
 		};
 	} else {
-		let [{ inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r, rootHashHinkalIndex: i }, l] = await Promise.all([p(n, u, c), o({
+		let [{ inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r, rootHashHinkalIndex: i }, l] = await Promise.all([p(n, u, c, d), o({
 			type: a.ZKProof,
 			payload: {
 				type: s.BUILD_IN_NULLIFIERS,

package/common/src/functions/snarkjs/signedMessageHash.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../pre-transaction/solana.cjs`);let n=require(`ethers`),r=require(`@coral-xyz/anchor`);var i=e=>[...new r.BN(e.length).toArray(`be`,8),...e.flatMap(e=>t.encodeToByte32Array(e))],a=t=>BigInt(n.ethers.keccak256(t))%e.CIRCOM_P,o=[`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256`,`uint256`,`uint256`,`uint256`,`uint256`],s=[`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256`],c=e=>a(n.ethers.AbiCoder.defaultAbiCoder().encode(o,[e.rootHashHinkal,e.erc20TokenAddresses.map(e=>n.ethers.getBigInt(e)),e.amountChanges,e.outTimeStamp,e.inNullifiers.flat().map(e=>BigInt(e)),e.outCommitments.flat().map(e=>BigInt(e)),e.calldataHash,e.message,e.outH1Ax,e.outH1Ay,e.H0Ax,e.H0Ay])),l=e=>a(n.ethers.AbiCoder.defaultAbiCoder().encode(s,[e.rootHashHinkal,e.erc20TokenAddresses.map(e=>n.ethers.getBigInt(e)),e.amountChanges,e.outTimeStamp,e.inNullifiers.flat().map(e=>BigInt(e)),e.outCommitments.flat().map(e=>BigInt(e)),e.calldataHash,e.message])),u=r=>{let a=r.inNullifiers.flat().map(e=>BigInt(e)),o=r.outCommitments.flat().map(e=>BigInt(e)),s=[...t.encodeToByte32Array(r.rootHashHinkal),...i(r.mintAccountPart1),...i(r.mintAccountPart2),...i(r.amountChanges),...t.encodeToByte32Array(r.outTimeStamp),...i(a),...i(o),...t.encodeToByte32Array(r.calldataHash),...t.encodeToByte32Array(r.message),...t.encodeToByte32Array(r.swapperAccountAdditionalSeed),...t.encodeToByte32Array(r.outH1Ay),...t.encodeToByte32Array(r.H0Ax),...t.encodeToByte32Array(r.H0Ay)];return BigInt(n.ethers.sha256(new Uint8Array(s)))%e.CIRCOM_P};exports.computeSignedMessageHashEvm=c,exports.computeSignedMessageHashSolana=u,exports.computeSignedMessageHashTron=l;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../pre-transaction/solana.cjs`);let n=require(`ethers`),r=require(`@coral-xyz/anchor`);var i=e=>[...new r.BN(e.length).toArray(`be`,8),...e.flatMap(e=>t.encodeToByte32Array(e))],a=t=>BigInt(n.ethers.keccak256(t))%e.CIRCOM_P,o=[`uint256`,`address`,`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256`],s=[`uint256`,`uint256`,`uint256`,`uint256`],c=[`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256`],l=e=>{let t=n.ethers.keccak256(n.ethers.AbiCoder.defaultAbiCoder().encode(o,[e.chainId,e.verifyingContract,e.rootHashHinkal,e.erc20TokenAddresses.map(e=>n.ethers.getBigInt(e)),e.amountChanges,e.outTimeStamp,e.inNullifiers.flat().map(e=>BigInt(e)),e.outCommitments.flat().map(e=>BigInt(e)),e.calldataHash,e.message])),r=n.ethers.keccak256(n.ethers.AbiCoder.defaultAbiCoder().encode(s,[e.outH1Ax,e.outH1Ay,e.H0Ax,e.H0Ay]));return a(n.ethers.AbiCoder.defaultAbiCoder().encode([`uint256`,`uint256`],[BigInt(t),BigInt(r)]))},u=e=>a(n.ethers.AbiCoder.defaultAbiCoder().encode(c,[e.rootHashHinkal,e.erc20TokenAddresses.map(e=>n.ethers.getBigInt(e)),e.amountChanges,e.outTimeStamp,e.inNullifiers.flat().map(e=>BigInt(e)),e.outCommitments.flat().map(e=>BigInt(e)),e.calldataHash,e.message])),d=r=>{let a=r.inNullifiers.flat().map(e=>BigInt(e)),o=r.outCommitments.flat().map(e=>BigInt(e)),s=[...t.encodeToByte32Array(r.rootHashHinkal),...i(r.mintAccountPart1),...i(r.mintAccountPart2),...i(r.amountChanges),...t.encodeToByte32Array(r.outTimeStamp),...i(a),...i(o),...t.encodeToByte32Array(r.calldataHash),...t.encodeToByte32Array(r.message),...t.encodeToByte32Array(r.swapperAccountAdditionalSeed),...t.encodeToByte32Array(r.outH1Ay),...t.encodeToByte32Array(r.H0Ax),...t.encodeToByte32Array(r.H0Ay)];return BigInt(n.ethers.sha256(new Uint8Array(s)))%e.CIRCOM_P};exports.computeSignedMessageHashEvm=l,exports.computeSignedMessageHashSolana=d,exports.computeSignedMessageHashTron=u;

package/common/src/functions/snarkjs/signedMessageHash.d.ts

@@ -11,6 +11,8 @@ type EvmSignedMessageHashParams = {
     outH1Ay: bigint;
     H0Ax: bigint;
     H0Ay: bigint;
+    chainId: bigint;
+    verifyingContract: string;
 };
 type TronSignedMessageHashParams = {
     rootHashHinkal: bigint;
@@ -21,6 +23,8 @@ type TronSignedMessageHashParams = {
     outCommitments: string[][];
     calldataHash: bigint;
     message: bigint;
+    chainId: bigint;
+    verifyingContract: string;
 };
 type SolanaSignedMessageHashParams = {
     rootHashHinkal: bigint;