@gurge/sdk 0.3.150 → 0.3.151

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

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

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

@@ -0,0 +1 @@
+require(`../../constants/protocol.constants.cjs`),require(`ethers`);

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

@@ -0,0 +1,7 @@
+export interface SignatureFromMnemonicProofInput {
+    mnemonicBytes: string[];
+    actualLen: string;
+    withdrawalAddress: string;
+    signature: string;
+}
+export declare const constructSignatureFromMnemonicProofInput: (mnemonic: string[], withdrawalAddress: string) => SignatureFromMnemonicProofInput;

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

@@ -0,0 +1,2 @@
+import "../../constants/protocol.constants.mjs";
+import "ethers";

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(`../utils/solanaMint.utils.cjs`),i=require(`../utils/bit.operations.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`);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=n.randomBigInt(31),F=t.poseidonFunction(P),I=t.poseidonFunction(O),L=h.map(e=>r.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=i.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},{zkCallData:ee,publicSignals:te,commitmentValidationData:ne}=await c.generateMainAndCommitmentZkProof(T,m,h,g,`mainSolanaCircuit${V}`,$,f),[re,ie,ae]=ee;return{proofAArr:re.map(BigInt).map(o.encodeToByte32Array).flat(),proofBArr:ie.flat().map(BigInt).map(o.encodeToByte32Array).flat(),proofCArr:ae.map(BigInt).map(o.encodeToByte32Array).flat(),publicInputsArr:te.map(BigInt).map(o.encodeToByte32Array),commitmentValidationData:ne}};exports.constructSolanaZkProof=f;
+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`),c=require(`../pre-transaction/getSolanaCalldataHash.cjs`);require(`../pre-transaction/index.cjs`);const l=require(`./generateMainAndCommitmentZkProof.cjs`),u=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`);require(`../web3/index.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=c.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 u.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 l.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,10 +4,13 @@ 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: (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<{
+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[];
     publicInputsArr: number[][];
     commitmentValidationData: import('../..').CommitmentValidationDataType | undefined;
+    rootHashHinkalIndex: bigint;
+    encryptedOutputs: number[][];
+    onChainEncryptedOutput: string;
 }>;

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

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

@@ -0,0 +1 @@
+const e=require(`./constant.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`./verifySignedEnclaveResponse.cjs`),r=require(`../utils/encryptInputForEnclave.cjs`),i=require(`./constructTxEnclaveVerify.cjs`);var a=e=>e?.flat().filter(e=>e.amount>0n).map(e=>e.getCommitment()),o=async(i,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await r.makeEnclaveHandshakeAndEncryptInput(a),c=await t.httpClient.post(`${e.ENCLAVE_URL}${i}`,{key:o,inputs:s});return n.verifySignedEnclaveResponse(c.data,c.signature)},s=e=>({R8:e.R8.map(String),S:e.S.toString()}),c=e=>({feeToken:e.feeToken,flatFee:e.flatFee.toString(),variableRate:e.variableRate.toString()}),l=async(t,n,a=t.userKeys)=>{let o={...n,amountChanges:n.amountChanges.map(String),recipientAmounts:n.recipientAmounts?.map(e=>e.map(String)),selfOutputAmounts:n.selfOutputAmounts?.map(String),messageSeed:n.messageSeed?.toString(),nullifyingKey:a.getShieldedPrivateKey(),spendingPublicKey:a.getSpendingKeyPair().pubSpendingBJJPoint.map(String),slippageValues:n.slippageValues?.map(String)},s=await r.enclavePostSealedSigned(`${e.ENCLAVE_URL}/prepare-tx`,o);return i.verifyPrepareTxResponse(o,s),s},u=async(e,t)=>{let{nullifierCount:n}=await o(`/estimate-nullifiers`,{...t,amountChanges:t.amountChanges.map(String),nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return n},d=async(t,n,a=t.userKeys)=>{let o={...n,amountChanges:n.amountChanges.map(String),relayerFee:n.relayerFee?.toString(),variableRate:n.variableRate?.toString(),swapperAccountSalt:n.swapperAccountSalt?.toString(),recipientAmounts:n.recipientAmounts?.map(String),messageSeed:n.messageSeed?.toString(),nullifyingKey:a.getShieldedPrivateKey(),spendingPublicKey:a.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},s=await r.enclavePostSealedSigned(`${e.ENCLAVE_URL}/prepare-solana-tx`,o);return i.verifyPrepareSolanaTxResponse(o,s),s},f=async(t,n)=>{let a={...n,nullifyingKey:t.userKeys.getShieldedPrivateKey(),spendingPublicKey:t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},o=await r.enclavePostSealedSigned(`${e.ENCLAVE_URL}/prepare-stuck-withdraw`,a);return i.verifyPrepareStuckWithdrawResponse(a,o),o.jobs},p=async(t,n)=>{let a=Object.fromEntries(Object.entries(n.feeStructures).map(([e,t])=>[e,c(t)])),o={...n,feeStructures:a,nullifyingKey:t.userKeys.getShieldedPrivateKey(),spendingPublicKey:t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},s=await r.enclavePostSealedSigned(`${e.ENCLAVE_URL}/prepare-solana-stuck-withdraw`,o);return i.verifyPrepareSolanaStuckWithdrawResponse(o,s),s.jobs},m=async(e,t)=>o(`/finalize-tx`,{jobId:e,eddsaSignature:s(t)}),h=async(e,t)=>o(`/finalize-solana-tx`,{jobId:e,eddsaSignature:s(t)}),g=async(e,t,n,r)=>{let{txHash:i}=await o(`/finalize-tx-relay`,{jobId:e,eddsaSignature:s(t),chainId:n,adminData:r?.adminData,authorizationData:r?.authorizationData,withUniswapWorkAround:r?.withUniswapWorkAround});return i},_=async(e,t,n,r)=>{let{txHash:i}=await o(`/finalize-solana-tx-relay`,{jobId:e,eddsaSignature:s(t),chainId:n,adminData:r?.adminData});return i};exports.collectInputCommitments=a,exports.estimateNullifiersEnclaveCall=u,exports.finalizeSolanaTxEnclaveCall=h,exports.finalizeSolanaTxEnclaveCallRelay=_,exports.finalizeTxEnclaveCall=m,exports.finalizeTxEnclaveCallRelay=g,exports.prepareSolanaStuckWithdrawEnclaveCall=p,exports.prepareSolanaTxEnclaveCall=d,exports.prepareStuckWithdrawEnclaveCall=f,exports.prepareTxEnclaveCall=l;

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

@@ -0,0 +1,34 @@
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
+import { UserKeys } from '../../data-structures/crypto-keys/keys';
+import { Utxo } from '../../data-structures/utxo/Utxo';
+import { AuthorizationData } from '../../types/hinkal.types';
+import { EstimateNullifiersParams, FinalizeSolanaTxResponseType, FinalizeTxResponseType, PreparedJobType, PrepareSolanaStuckWithdrawParams, PrepareSolanaTxParams, PrepareSolanaTxResponseType, PrepareStuckWithdrawRequestType, PrepareTxParams, PrepareTxResponseType } from '../../types/remote-tx-build.types';
+import { AdminDataType } from '../../types/admin.types';
+export declare const collectInputCommitments: (inputUtxos?: Utxo[][]) => string[] | undefined;
+export declare const prepareTxEnclaveCall: (hinkal: IHinkal, params: PrepareTxParams, userKeys?: UserKeys) => Promise<PrepareTxResponseType>;
+export declare const estimateNullifiersEnclaveCall: (hinkal: IHinkal, params: EstimateNullifiersParams) => Promise<number>;
+export declare const prepareSolanaTxEnclaveCall: (hinkal: IHinkal, params: PrepareSolanaTxParams, userKeys?: UserKeys) => Promise<PrepareSolanaTxResponseType>;
+export declare const prepareStuckWithdrawEnclaveCall: (hinkal: IHinkal, params: Omit<PrepareStuckWithdrawRequestType, "nullifyingKey" | "spendingPublicKey">) => Promise<PreparedJobType[]>;
+export declare const prepareSolanaStuckWithdrawEnclaveCall: (hinkal: IHinkal, params: PrepareSolanaStuckWithdrawParams) => Promise<PreparedJobType[]>;
+export declare const finalizeTxEnclaveCall: (jobId: string, eddsaSignature: {
+    R8: [bigint, bigint];
+    S: bigint;
+}) => Promise<FinalizeTxResponseType>;
+export declare const finalizeSolanaTxEnclaveCall: (jobId: string, eddsaSignature: {
+    R8: [bigint, bigint];
+    S: bigint;
+}) => Promise<FinalizeSolanaTxResponseType>;
+export declare const finalizeTxEnclaveCallRelay: (jobId: string, eddsaSignature: {
+    R8: [bigint, bigint];
+    S: bigint;
+}, chainId: number, extra?: {
+    adminData?: AdminDataType;
+    authorizationData?: AuthorizationData;
+    withUniswapWorkAround?: boolean;
+}) => Promise<string>;
+export declare const finalizeSolanaTxEnclaveCallRelay: (jobId: string, eddsaSignature: {
+    R8: [bigint, bigint];
+    S: bigint;
+}, chainId: number, extra?: {
+    adminData?: AdminDataType;
+}) => Promise<string>;

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

@@ -0,0 +1,95 @@
+import { ENCLAVE_URL as e } from "./constant.mjs";
+import { httpClient as t } from "../../data-structures/http/HttpClient.mjs";
+import "../../data-structures/http/index.mjs";
+import { verifySignedEnclaveResponse as n } from "./verifySignedEnclaveResponse.mjs";
+import { enclavePostSealedSigned as r, makeEnclaveHandshakeAndEncryptInput as i } from "../utils/encryptInputForEnclave.mjs";
+import { verifyPrepareSolanaStuckWithdrawResponse as a, verifyPrepareSolanaTxResponse as o, verifyPrepareStuckWithdrawResponse as s, verifyPrepareTxResponse as c } from "./constructTxEnclaveVerify.mjs";
+//#region libs/shared/common/src/functions/snarkjs/constructTxEnclave.ts
+var l = (e) => e?.flat().filter((e) => e.amount > 0n).map((e) => e.getCommitment()), u = async (r, a) => {
+	let { keyCiphertext: o, inputCiphertext: s } = await i(a), c = await t.post(`${e}${r}`, {
+		key: o,
+		inputs: s
+	});
+	return n(c.data, c.signature);
+}, d = (e) => ({
+	R8: e.R8.map(String),
+	S: e.S.toString()
+}), f = (e) => ({
+	feeToken: e.feeToken,
+	flatFee: e.flatFee.toString(),
+	variableRate: e.variableRate.toString()
+}), p = async (t, n, i = t.userKeys) => {
+	let a = {
+		...n,
+		amountChanges: n.amountChanges.map(String),
+		recipientAmounts: n.recipientAmounts?.map((e) => e.map(String)),
+		selfOutputAmounts: n.selfOutputAmounts?.map(String),
+		messageSeed: n.messageSeed?.toString(),
+		nullifyingKey: i.getShieldedPrivateKey(),
+		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint.map(String),
+		slippageValues: n.slippageValues?.map(String)
+	}, o = await r(`${e}/prepare-tx`, a);
+	return c(a, o), o;
+}, m = async (e, t) => {
+	let { nullifierCount: n } = await u("/estimate-nullifiers", {
+		...t,
+		amountChanges: t.amountChanges.map(String),
+		nullifyingKey: e.userKeys.getShieldedPrivateKey(),
+		spendingPublicKey: e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
+	});
+	return n;
+}, h = async (t, n, i = t.userKeys) => {
+	let a = {
+		...n,
+		amountChanges: n.amountChanges.map(String),
+		relayerFee: n.relayerFee?.toString(),
+		variableRate: n.variableRate?.toString(),
+		swapperAccountSalt: n.swapperAccountSalt?.toString(),
+		recipientAmounts: n.recipientAmounts?.map(String),
+		messageSeed: n.messageSeed?.toString(),
+		nullifyingKey: i.getShieldedPrivateKey(),
+		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
+	}, s = await r(`${e}/prepare-solana-tx`, a);
+	return o(a, s), s;
+}, g = async (t, n) => {
+	let i = {
+		...n,
+		nullifyingKey: t.userKeys.getShieldedPrivateKey(),
+		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
+	}, a = await r(`${e}/prepare-stuck-withdraw`, i);
+	return s(i, a), a.jobs;
+}, _ = async (t, n) => {
+	let i = Object.fromEntries(Object.entries(n.feeStructures).map(([e, t]) => [e, f(t)])), o = {
+		...n,
+		feeStructures: i,
+		nullifyingKey: t.userKeys.getShieldedPrivateKey(),
+		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
+	}, s = await r(`${e}/prepare-solana-stuck-withdraw`, o);
+	return a(o, s), s.jobs;
+}, v = async (e, t) => u("/finalize-tx", {
+	jobId: e,
+	eddsaSignature: d(t)
+}), y = async (e, t) => u("/finalize-solana-tx", {
+	jobId: e,
+	eddsaSignature: d(t)
+}), b = async (e, t, n, r) => {
+	let { txHash: i } = await u("/finalize-tx-relay", {
+		jobId: e,
+		eddsaSignature: d(t),
+		chainId: n,
+		adminData: r?.adminData,
+		authorizationData: r?.authorizationData,
+		withUniswapWorkAround: r?.withUniswapWorkAround
+	});
+	return i;
+}, x = async (e, t, n, r) => {
+	let { txHash: i } = await u("/finalize-solana-tx-relay", {
+		jobId: e,
+		eddsaSignature: d(t),
+		chainId: n,
+		adminData: r?.adminData
+	});
+	return i;
+};
+//#endregion
+export { l as collectInputCommitments, m as estimateNullifiersEnclaveCall, y as finalizeSolanaTxEnclaveCall, x as finalizeSolanaTxEnclaveCallRelay, v as finalizeTxEnclaveCall, b as finalizeTxEnclaveCallRelay, _ as prepareSolanaStuckWithdrawEnclaveCall, h as prepareSolanaTxEnclaveCall, g as prepareStuckWithdrawEnclaveCall, p as prepareTxEnclaveCall };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../crypto/poseidon.cjs`),i=require(`../../data-structures/crypto-keys/keys.cjs`),a=require(`../../data-structures/utxo/Utxo.cjs`),o=require(`../utils/solanaMint.utils.cjs`),s=require(`./common.snarkjs.cjs`),c=require(`./signedMessageHash.cjs`),l=require(`../pre-transaction/getSolanaCalldataHash.cjs`);let u=require(`ethers`),d=require(`@solana/web3.js`);var f=e=>e?.inputUtxos.flat().filter(e=>BigInt(e.amount)>0n).map(e=>new a.Utxo({amount:BigInt(e.amount),erc20TokenAddress:e.erc20TokenAddress,stealthAddress:e.stealthAddress,H0:[BigInt(e.H0[0]),BigInt(e.H0[1])],timeStamp:e.timeStamp}).getCommitment()),p=e=>{if(Array.isArray(e))return`[${e.map(p).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)}:${p(t[e])}`).join(`,`)}}`}return JSON.stringify(e)},m=(e,t)=>{if(p({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})!==p(t))throw Error(`Enclave prepare-tx response does not match the request sent - refusing to sign`)},h=(e,t,n,r,i,o,s,c)=>{let l=s.map(BigInt),u=new Set,d=e.map((e,s)=>t[s].map((t,c)=>{let d=BigInt(t);if(d===0n)return`0`;let f=new a.Utxo({amount:d,erc20TokenAddress:e,nullifyingKey:o,spendingPublicKey:l,H0:[BigInt(n[s][c]),BigInt(r[s][c])],timeStamp:i[s][c]});return u.add(f.getCommitment()),f.getNullifier()}));if(c&&(u.size!==c.length||!c.every(e=>u.has(e))))throw Error(`Enclave prepare-tx spent a different set of notes than the caller authorized - refusing to sign`);return d},g=(e,t)=>e===0n?`0`:new a.Utxo({amount:e,...t}).getCommitment(),_=(e,t,n,r,i,a,o,s,c,l)=>{if((c?.length??0)!==(l?.length??0))throw Error(`Enclave prepare-tx request has mismatched recipientAddress/recipientAmounts - refusing to sign`);let u=t?.length??1,d=s.map(BigInt);return e.map((e,t)=>{let s=Array.from({length:u},(s,c)=>g(BigInt(n[t][c]),{erc20TokenAddress:e,nullifyingKey:o,spendingPublicKey:d,H0:[BigInt(r[t][c]),BigInt(i[t][c])],timeStamp:a})),f=(c??[]).map((n,r)=>{let[i,o,s]=n.split(`,`);return g(BigInt(l[r][t]),{erc20TokenAddress:e,stealthAddress:i,H0:[BigInt(o),BigInt(s)],timeStamp:a})});return[...s,...f]})},v=(e,t,n,r,i)=>{r&&r.forEach((e,t)=>{if(n[0][t]!==e)throw Error(`Enclave prepare-tx self-output amounts do not match the requested selfOutputAmounts - refusing to sign`)});let a=r?.length??1;e.forEach((e,r)=>{let o=t[r].reduce((e,t)=>e+BigInt(t),0n),s=n[r].slice(0,a).reduce((e,t)=>e+BigInt(t),0n);if(o+BigInt(i[r])!==s)throw Error(`Enclave prepare-tx self-output amount does not match input total + requested amountChanges - refusing to sign`)})},y=e=>e.erc20Addresses.map((t,n)=>BigInt(e.amountChanges[n])+(e.recipientAmounts??[]).reduce((e,t)=>e+BigInt(t[n]),0n)),b=e=>e<0n?t.CIRCOM_P+e:e,x=(t,n,r)=>r.length===0?`mainEVMCircuitMin0`:`${e.isTronLike(t)?`mainTronCircuit`:`mainEVMCircuit`}${n.length}x${n[0].length}x${r[0].length}`,S=(t,n,r)=>e.isTronLike(t)?c.computeSignedMessageHashTron(n):c.computeSignedMessageHashEvm({...n,...r}),C=(e,i,a,o)=>{let c=r.poseidonFunction(BigInt(i.messageSeed)),l=e.relay||t.zeroAddress,u=l!==t.zeroAddress&&e.feeStructure?e.feeStructure:n.zeroFeeStructure,d=e.externalActionMetadata||`0x00`,f=e.erc20Addresses.map((t,n)=>e.onChainCreation?.[n]??!1),p=y(e),m=e.slippageValues?e.slippageValues.map(BigInt):s.getSlippageValues(p);return{calldataHash:s.createCallDataHash(s.calcPublicSignalCount(x(e.chainId,a,o),e.erc20Addresses,p,a,o),l,e.externalAddress,e.externalActionId??0n,c,d,i.encryptedOutputs,i.onChainEncryptedOutput,void 0,m,f,u,e.originalSender,void 0,e.chainId,e.createBlockedUtxos??!1),message:c,amountChangesModWrapped:p.map(b)}},w=(e,t,n,r,a,o)=>{if(!e?.some(Boolean))return;let[s,c]=i.UserKeys.getH1FromH0([BigInt(t),BigInt(n)],o);if(s!==BigInt(r)||c!==BigInt(a))throw Error(`Enclave prepare-tx tx-level stealth pair is not derived from the caller's own key - refusing to sign`)},T=(e,t,n,r,i,a,o,s)=>{if(S(e,{rootHashHinkal:BigInt(n.rootHashHinkal),erc20TokenAddresses:n.request.erc20Addresses,amountChanges:s,outTimeStamp:BigInt(n.outTimeStamp),inNullifiers:r,outCommitments:i,calldataHash:a,message:o,chainId:BigInt(e),verifyingContract:t},{outH1Ax:BigInt(n.outH1Ax),outH1Ay:BigInt(n.outH1Ay),H0Ax:BigInt(n.h0Ax),H0Ay:BigInt(n.h0Ay)})!==BigInt(n.signedMessageHash))throw Error(`Enclave prepare-tx signedMessageHash does not match one built from the caller's own data - refusing to sign`)},E=e=>e.map(e=>o.formatMintAddress(e).compressedAddress),D=e=>e.mintAddresses.map((t,n)=>BigInt(e.amountChanges[n])+(e.recipientAmounts?BigInt(e.recipientAmounts[n]):0n)),O=(e,t,n)=>{if(e.tokenNumber!==t.tokenNumber||e.nullifierAmount!==t.nullifierAmount||e.outputAmount!==t.outputAmount)throw Error(`Enclave ${n} dimensions do not match the caller's own data - refusing to sign`)},k=(e,t,n,i)=>{let a=r.poseidonFunction(BigInt(t.messageSeed));O(t.dimensions,{tokenNumber:e.mintAddresses.length,nullifierAmount:n[0]?.length??0,outputAmount:i[0]?.length??0},`prepare-solana-tx`);let o=e.mintAddresses.map((t,n)=>e.onChainCreation?.[n]??!1),s=o.some(Boolean),c=t.encryptedOutputs.flatMap((e,t)=>o[t]?e.map(()=>[]):e.map(e=>Array.from(u.ethers.getBytes(e)))),f=s?t.onChainEncryptedOutput:`0x`,p=(e.hinkalInstructions??[]).map(e=>({accountIndexes:Buffer.from(e.accountIndexes),data:Buffer.from(e.data),programIndex:e.programIndex})),m=(e.remainingAccounts??[]).map(e=>({pubkey:new d.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable}));return{calldataHash:l.getSolanaCalldataHash(t.dimensions,new d.PublicKey(e.recipient),new d.PublicKey(e.signer??e.relayAddress),c,f,BigInt(e.relayerFee??`0`),BigInt(e.variableRate??`0`),p,m),message:a}},A=(e,t,n,r,i,a,o,s,l)=>{if(c.computeSignedMessageHashSolana({rootHashHinkal:BigInt(e.rootHashHinkal),mintAccountPart1:t,mintAccountPart2:n,amountChanges:s,outTimeStamp:BigInt(e.outTimeStamp),inNullifiers:r,outCommitments:i,calldataHash:a,message:o,swapperAccountAdditionalSeed:l,outH1Ay:BigInt(e.outH1Ay),H0Ax:BigInt(e.h0Ax),H0Ay:BigInt(e.h0Ay)})!==BigInt(e.signedMessageHash))throw Error(`Enclave prepare-solana-tx signedMessageHash does not match one built from the caller's own data - refusing to sign`)},j=(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),p(n)!==p(t))throw Error(`Enclave prepare-solana-tx response does not match the request sent - refusing to sign`)},M=(e,t,n,i,a,o,c,l,u)=>{let d=h([n],u.inAmounts,u.inH0Ax,u.inH0Ay,u.inTimeStamps,c,l,void 0),f=_([n],void 0,u.outAmounts,u.outNoteH0Ax,u.outNoteH0Ay,u.outTimeStamp,c,l,void 0,void 0),p=[-u.inAmounts[0].reduce((e,t)=>e+BigInt(t),0n)];v([n],u.inAmounts,u.outAmounts,void 0,p.map(String));let m=p.map(b),g=r.poseidonFunction(BigInt(u.messageSeed)),y=s.getSlippageValues(p),C=s.createCallDataHash(s.calcPublicSignalCount(x(e,d,f),[n],m,d,f),i,a,0n,g,`0x00`,u.encryptedOutputs,u.onChainEncryptedOutput,void 0,y,[!1],o,void 0,void 0,e,!1);if(S(e,{rootHashHinkal:BigInt(u.rootHashHinkal),erc20TokenAddresses:[n],amountChanges:m,outTimeStamp:BigInt(u.outTimeStamp),inNullifiers:d,outCommitments:f,calldataHash:C,message:g,chainId:BigInt(e),verifyingContract:t},{outH1Ax:BigInt(u.outH1Ax),outH1Ay:BigInt(u.outH1Ay),H0Ax:BigInt(u.h0Ax),H0Ay:BigInt(u.h0Ay)})!==BigInt(u.signedMessageHash))throw Error(`Enclave prepare-stuck-withdraw job signedMessageHash does not match one built from the caller's own data - refusing to sign`)},N=(e,t,n,i,a,s,f)=>{let{compressedAddress:p,mintAccountPart1:m,mintAccountPart2:g}=o.formatMintAddress(e),y=h([p],f.inAmounts,f.inH0Ax,f.inH0Ay,f.inTimeStamps,a,s,void 0),x=_([p],void 0,f.outAmounts,f.outNoteH0Ax,f.outNoteH0Ay,f.outTimeStamp,a,s,void 0,void 0),S=[-f.inAmounts[0].reduce((e,t)=>e+BigInt(t),0n)];v([p],f.inAmounts,f.outAmounts,void 0,S.map(String));let C=S.map(b),w=r.poseidonFunction(BigInt(f.messageSeed)),T=f.encryptedOutputs.flatMap(e=>e.map(e=>Array.from(u.ethers.getBytes(e))));O(f.dimensions,{tokenNumber:1,nullifierAmount:y[0].length,outputAmount:x[0].length},`prepare-solana-stuck-withdraw`);let E=l.getSolanaCalldataHash(f.dimensions,new d.PublicKey(n),new d.PublicKey(t),T,`0x`,i.flatFee,i.variableRate,[],[]);if(c.computeSignedMessageHashSolana({rootHashHinkal:BigInt(f.rootHashHinkal),mintAccountPart1:[m],mintAccountPart2:[g],amountChanges:C,outTimeStamp:BigInt(f.outTimeStamp),inNullifiers:y,outCommitments:x,calldataHash:E,message:w,swapperAccountAdditionalSeed:r.poseidonFunction(0n),outH1Ay:BigInt(f.outH1Ay),H0Ax:BigInt(f.h0Ax),H0Ay:BigInt(f.h0Ay)})!==BigInt(f.signedMessageHash))throw Error(`Enclave prepare-solana-stuck-withdraw job signedMessageHash does not match one built from the caller's own data - refusing to sign`)},P=(e,t)=>{if(p({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})!==p(t))throw Error(`Enclave prepare-stuck-withdraw response does not match the request sent - refusing to sign`)},F=(e,t)=>{if(p({chainId:String(e.chainId),mintAddress:e.mintAddress,recipient:e.recipient,relayAddress:e.relayAddress,signer:e.relayAddress,accounts:e.accounts,feeStructures:e.feeStructures,hashedEthereumAddress:e.hashedEthereumAddress})!==p(t))throw Error(`Enclave prepare-solana-stuck-withdraw response does not match the request sent - refusing to sign`)},I=(e,t)=>{m(e,t.request);let n=e.inputCommitments??f(e.speculative)??(e.forceEmptyUtxos?[]:void 0),r=h(e.erc20Addresses,t.inAmounts,t.inH0Ax,t.inH0Ay,t.inTimeStamps,e.nullifyingKey,e.spendingPublicKey,n),i=_(e.erc20Addresses,e.selfOutputAmounts,t.outAmounts,t.outNoteH0Ax,t.outNoteH0Ay,t.outTimeStamp,e.nullifyingKey,e.spendingPublicKey,e.recipientAddress,e.recipientAmounts);v(e.erc20Addresses,t.inAmounts,t.outAmounts,e.selfOutputAmounts,e.amountChanges),w(e.onChainCreation,t.h0Ax,t.h0Ay,t.outH1Ax,t.outH1Ay,e.nullifyingKey);let{calldataHash:a,message:o,amountChangesModWrapped:s}=C(e,t,r,i);T(e.chainId,e.hinkalAddress??``,t,r,i,a,o,s)},L=(e,t)=>{j(e,t.request);let n=E(e.mintAddresses),i=e.recipientAddress?[e.recipientAddress]:void 0,a=e.recipientAmounts?[e.recipientAmounts]:void 0,s=h(n,t.inAmounts,t.inH0Ax,t.inH0Ay,t.inTimeStamps,e.nullifyingKey,e.spendingPublicKey,e.inputCommitments??f(e.speculative)),c=_(n,void 0,t.outAmounts,t.outNoteH0Ax,t.outNoteH0Ay,t.outTimeStamp,e.nullifyingKey,e.spendingPublicKey,i,a);v(n,t.inAmounts,t.outAmounts,void 0,e.amountChanges);let{calldataHash:l,message:u}=k(e,t,s,c),d=D(e).map(b),p=e.mintAddresses.map(e=>o.formatMintAddress(e)),m=r.poseidonFunction(BigInt(e.swapperAccountSalt??`0`));A(t,p.map(e=>e.mintAccountPart1),p.map(e=>e.mintAccountPart2),s,c,l,u,d,m)},R=(e,t)=>{P(e,t.request),t.jobs.forEach(t=>M(e.chainId,e.hinkalAddress??``,e.erc20Address,e.relay,e.externalAddress,e.feeStructure,e.nullifyingKey,e.spendingPublicKey,t))},z=(e,t)=>{F(e,t.request),t.jobs.forEach(t=>{let n=t.inAmounts[0].filter(e=>BigInt(e)>0n).length,r=e.feeStructures[String(n)];if(!r)throw Error(`Enclave prepare-solana-stuck-withdraw response uses nullifierCount ${n} with no matching feeStructure - refusing to sign`);N(e.mintAddress,e.relayAddress,e.recipient,{feeToken:r.feeToken,flatFee:BigInt(r.flatFee),variableRate:BigInt(r.variableRate)},e.nullifyingKey,e.spendingPublicKey,t)})};exports.verifyPrepareSolanaStuckWithdrawResponse=z,exports.verifyPrepareSolanaTxResponse=L,exports.verifyPrepareStuckWithdrawResponse=R,exports.verifyPrepareTxResponse=I;

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

@@ -0,0 +1,5 @@
+import { PrepareSolanaStuckWithdrawRequestType, PrepareSolanaStuckWithdrawResponseType, PrepareSolanaTxRequestType, PrepareSolanaTxResponseType, PrepareStuckWithdrawRequestType, PrepareStuckWithdrawResponseType, PrepareTxRequestType, PrepareTxResponseType } from '../../types/remote-tx-build.types';
+export declare const verifyPrepareTxResponse: (payload: PrepareTxRequestType, response: PrepareTxResponseType) => void;
+export declare const verifyPrepareSolanaTxResponse: (payload: PrepareSolanaTxRequestType, response: PrepareSolanaTxResponseType) => void;
+export declare const verifyPrepareStuckWithdrawResponse: (payload: PrepareStuckWithdrawRequestType, response: PrepareStuckWithdrawResponseType) => void;
+export declare const verifyPrepareSolanaStuckWithdrawResponse: (payload: PrepareSolanaStuckWithdrawRequestType, response: PrepareSolanaStuckWithdrawResponseType) => void;