@hinkal/common 0.3.1 → 0.3.2

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

@@ -2,72 +2,68 @@ 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 { buildOutCommitments as i, calcAmountChanges as a, calcStealthAddressStructure as o, getUtxoCircuitH0Coords as s } from "./common.snarkjs.mjs";
+import { encodeToByte32Array as c } from "../pre-transaction/solana.mjs";
+import { computeSignedMessageHashSolana as l } from "./signedMessageHash.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 u } from "./generateMainAndCommitmentZkProof.mjs";
+import { getDataFromWorkers as d } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { getSolanaCalldataHash as f } from "../pre-transaction/getSolanaCalldataHash.mjs";
 import "../web3/index.mjs";
-import { PublicKey as h } from "@solana/web3.js";
+import { PublicKey as p } 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,
+var m = async (m, h, g, _, v, y, b, x, S, C, w, T, E, D = e.solanaLocalnet, O = [], k = [], A = 0n) => {
+	let j = new p(C), M = new p(w), N = g.getShieldedPrivateKey(), { pubSpendingBJJPoint: P } = g.getSpendingKeyPair(), F = o(b, N, g.getSpendingKeyPair().pubSpendingBJJPoint), I = n(31), L = t(I), R = t(A), z = _.map((e) => r(e)), B = z.map((e) => e.mintAccountPart1), V = z.map((e) => e.mintAccountPart2), H = f(T, j, M, E, x, S, O, k), U = `${T.tokenNumber}x${T.nullifierAmount}x${T.outputAmount}`, W = a(v, y), { inCommitmentSiblings: ee, inCommitmentSiblingSides: G, rootHashHinkal: K, inNullifiers: q } = await d(D, h, v.map((e) => e.map((e) => e.getConstructableParams()))), J = i(y), Y = F.H0x, X = F.H0y, Z = l({
+		rootHashHinkal: K,
+		mintAccountPart1: B,
+		mintAccountPart2: V,
 		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,
+		outTimeStamp: BigInt(y[0][0].timeStamp),
+		inNullifiers: q,
+		outCommitments: J,
+		calldataHash: H,
+		message: L,
+		swapperAccountAdditionalSeed: R,
+		outH1Ay: F.H1y,
+		H0Ax: Y,
+		H0Ay: X
+	}), { R8: Q, S: $ } = g.signEddsa(Z), te = {
+		rootHashHinkal: K,
+		spendingPublicKey: P,
 		eddsaSignature: [
-			$[0],
-			$[1],
-			ne
+			Q[0],
+			Q[1],
+			$
 		],
-		signedMessageHash: Q,
-		nullifyingPrivateKey: P,
-		mintAccountPart1: V,
-		mintAccountPart2: H,
+		signedMessageHash: Z,
+		nullifyingPrivateKey: N,
+		mintAccountPart1: B,
+		mintAccountPart2: V,
 		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;
+		inAmounts: v.map((e) => e.map((e) => e.amount.toString())),
+		inH0Ax: v.map((e) => e.map((e) => s(e)[0].toString())),
+		inH0Ay: v.map((e) => e.map((e) => s(e)[1].toString())),
+		inTimeStamps: v.map((e) => e.map((e) => e.timeStamp)),
+		inNullifiers: q,
+		inCommitmentSiblings: ee,
+		inCommitmentSiblingSides: G,
+		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: H,
+		messageSeed: I,
+		swapperAccountSalt: A,
+		H0Ax: Y,
+		H0Ay: X
+	}, { zkCallData: ne, publicSignals: re, commitmentValidationData: ie } = await u(D, g, _, v, `mainSolanaCircuit${U}`, te, m), [ae, oe, se] = ne;
 	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: ae.map(BigInt).map(c).flat(),
+		proofBArr: oe.flat().map(BigInt).map(c).flat(),
+		proofCArr: se.map(BigInt).map(c).flat(),
+		publicInputsArr: re.map(BigInt).map(c),
+		commitmentValidationData: ie
 	};
 };
 //#endregion
-export { g as constructSolanaZkProof };
+export { m as constructSolanaZkProof };

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

@@ -2,10 +2,8 @@ import { IUtxoConstructor } from '../../data-structures/utxo/Utxo';
 interface MerkleTreeSiblingsResponse {
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];
-    accessTokenSiblings: string[];
-    accessTokenSiblingSides: string[];
     rootHashHinkal: string;
-    rootHashAccessToken: string;
+    rootHashHinkalIndex: string;
 }
 export declare const fetchMerkleTreeSiblings: (chainId: number, inputUtxosSerialized: IUtxoConstructor[][]) => Promise<MerkleTreeSiblingsResponse>;
 export {};

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=>({hinkalRootHash:await i.getContractWithFetcherByChainId(e,t.ContractType.HinkalContract).getRootHash()}),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)))}},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(`../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;

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

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

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

@@ -15,13 +15,22 @@ var d = () => {
 		signTransaction: async (e) => e,
 		signAllTransactions: async (e) => e
 	};
-}, f = async (e) => ({ hinkalRootHash: await a(e, n.HinkalContract).getRootHash() }), p = async (e) => {
+}, f = 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}`);
-	return { hinkalRootHash: await o(new u(s, new l(i(a), d(), {
-		preflightCommitment: "confirmed",
-		commitment: "confirmed"
-	})), r(new c(f), new c(p))) };
+	return {
+		hinkalRootHash: await o(new u(s, new l(i(a), d(), {
+			preflightCommitment: "confirmed",
+			commitment: "confirmed"
+		})), r(new c(f), new c(p))),
+		hinkalRootHashIndex: 0n
+	};
 }, m = async (t) => e(t) ? p(t) : f(t);
 //#endregion
 export { m as fetchOnChainRootHashes };

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+require(`../../constants/chains.constants.cjs`),require(`./generateZkProofSelf.cjs`),require(`./constructSignatureFromMnemonicProofInput.cjs`);

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

@@ -0,0 +1,2 @@
+import { Proof } from '../../API/enclaveUtxoCalls';
+export declare const generateSignatureFromMnemonicProof: (mnemonic: string[], withdrawalAddress: string) => Promise<Proof>;

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

@@ -0,0 +1,3 @@
+import "../../constants/chains.constants.mjs";
+import "./generateZkProofSelf.mjs";
+import "./constructSignatureFromMnemonicProofInput.mjs";

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;return s=(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:s.inCommitmentSiblings,inCommitmentSiblingSides:s.inCommitmentSiblingSides,rootHashHinkal:r}},u=async(e,t)=>{let r=await s.fetchMerkleTreeSiblings(e,t);return{inCommitmentSiblings:r.inCommitmentSiblings,inCommitmentSiblingSides:r.inCommitmentSiblingSides,rootHashHinkal:n.toBigInt(r.rootHashHinkal)}},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}}let{hinkalRootHash:i}=await c.fetchOnChainRootHashes(n);return{...e,rootHashHinkal:i}}if(e.isNode){let{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r}=await f(n,l,s);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,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},c]=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,inNullifiers:c}}};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)=>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;

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

@@ -4,10 +4,12 @@ interface MerkleTreeSiblingsAndRootHashes {
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];
     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<{
     rootHashHinkal: bigint;
+    rootHashHinkalIndex: bigint;
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];
     inNullifiers: string[][];

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

@@ -11,8 +11,8 @@ import { fetchOnChainRootHashes as l } from "./fetchOnChainRootHashes.mjs";
 var u = async (e, t) => {
 	let n = e.getRootHash();
 	if (n === void 0) throw Error("Root hash not available from hinkal merkle tree");
-	let r;
-	return r = await o({
+	let r = e.getIndex() - 1n, i;
+	return i = await o({
 		type: a.ZKProof,
 		payload: {
 			type: s.CALC_COMMITMENTS_SIBLING_AND_SIDES,
@@ -22,16 +22,18 @@ var u = async (e, t) => {
 			}
 		}
 	}), {
-		inCommitmentSiblings: r.inCommitmentSiblings,
-		inCommitmentSiblingSides: r.inCommitmentSiblingSides,
-		rootHashHinkal: n
+		inCommitmentSiblings: i.inCommitmentSiblings,
+		inCommitmentSiblingSides: i.inCommitmentSiblingSides,
+		rootHashHinkal: n,
+		rootHashHinkalIndex: r
 	};
 }, d = async (e, t) => {
 	let r = await c(e, t);
 	return {
 		inCommitmentSiblings: r.inCommitmentSiblings,
 		inCommitmentSiblingSides: r.inCommitmentSiblingSides,
-		rootHashHinkal: n(r.rootHashHinkal)
+		rootHashHinkal: n(r.rootHashHinkal),
+		rootHashHinkalIndex: n(r.rootHashHinkalIndex)
 	};
 }, f = async (e, t) => {
 	if (!t) return !1;
@@ -51,21 +53,24 @@ var u = async (e, t) => {
 			if (t === void 0) throw Error("Root hash not available from hinkal merkle tree");
 			return {
 				...e,
-				rootHashHinkal: t
+				rootHashHinkal: t,
+				rootHashHinkalIndex: c.getIndex() - 1n
 			};
 		}
-		let { hinkalRootHash: i } = await l(n);
+		let { hinkalRootHash: i, hinkalRootHashIndex: a } = await l(n);
 		return {
 			...e,
-			rootHashHinkal: i
+			rootHashHinkal: i,
+			rootHashHinkalIndex: a
 		};
 	}
 	if (e) {
-		let { inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r } = await p(n, u, c);
+		let { inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r, rootHashHinkalIndex: i } = await p(n, u, c);
 		return {
 			inCommitmentSiblings: e,
 			inCommitmentSiblingSides: t,
 			rootHashHinkal: r,
+			rootHashHinkalIndex: i,
 			inNullifiers: await o({
 				type: a.ZKProof,
 				payload: {
@@ -75,7 +80,7 @@ var u = async (e, t) => {
 			})
 		};
 	} else {
-		let [{ inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r }, i] = 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), o({
 			type: a.ZKProof,
 			payload: {
 				type: s.BUILD_IN_NULLIFIERS,
@@ -86,7 +91,8 @@ var u = async (e, t) => {
 			inCommitmentSiblings: e,
 			inCommitmentSiblingSides: t,
 			rootHashHinkal: r,
-			inNullifiers: i
+			rootHashHinkalIndex: i,
+			inNullifiers: l
 		};
 	}
 };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./constant.cjs`);var r=(r,i)=>i===e.chainIds.localhost||i===e.chainIds.solanaLocalnet||i===e.chainIds.tronLocalnet?n.localVerifiers[`${r}${t.PROVER_VERSION}Wasm`]:n.prodVerifiers[`${r}${t.PROVER_VERSION}Wasm`],i=(r,i)=>i===e.chainIds.localhost||i===e.chainIds.solanaLocalnet||i===e.chainIds.tronLocalnet?n.localVerifiers[`${r}${t.PROVER_VERSION}Zkey`]:n.prodVerifiers[`${r}${t.PROVER_VERSION}Zkey`];exports.getWASMFile=r,exports.getZKeyFile=i;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./constant.cjs`);var r=e=>e===`SignatureFromMnemonic`?t.SIGNATURE_FROM_MNEMONIC_VERSION:`v4`,i=(t,i)=>{let a=r(t);return i===e.chainIds.localhost||i===e.chainIds.solanaLocalnet||i===e.chainIds.tronLocalnet?n.localVerifiers[`${t}${a}Wasm`]:n.prodVerifiers[`${t}${a}Wasm`]},a=(t,i)=>{let a=r(t);return i===e.chainIds.localhost||i===e.chainIds.solanaLocalnet||i===e.chainIds.tronLocalnet?n.localVerifiers[`${t}${a}Zkey`]:n.prodVerifiers[`${t}${a}Zkey`]};exports.getWASMFile=i,exports.getZKeyFile=a;

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

@@ -1,7 +1,13 @@
 import { chainIds as e } from "../../constants/chains.constants.mjs";
-import { PROVER_VERSION as t } from "../../constants/protocol.constants.mjs";
+import { SIGNATURE_FROM_MNEMONIC_VERSION as t } from "../../constants/protocol.constants.mjs";
 import { localVerifiers as n, prodVerifiers as r } from "./constant.mjs";
 //#region libs/shared/common/src/functions/snarkjs/getZKFiles.ts
-var i = (i, a) => a === e.localhost || a === e.solanaLocalnet || a === e.tronLocalnet ? n[`${i}${t}Wasm`] : r[`${i}${t}Wasm`], a = (i, a) => a === e.localhost || a === e.solanaLocalnet || a === e.tronLocalnet ? n[`${i}${t}Zkey`] : r[`${i}${t}Zkey`];
+var i = (e) => e === "SignatureFromMnemonic" ? t : "v4", a = (t, a) => {
+	let o = i(t);
+	return a === e.localhost || a === e.solanaLocalnet || a === e.tronLocalnet ? n[`${t}${o}Wasm`] : r[`${t}${o}Wasm`];
+}, o = (t, a) => {
+	let o = i(t);
+	return a === e.localhost || a === e.solanaLocalnet || a === e.tronLocalnet ? n[`${t}${o}Zkey`] : r[`${t}${o}Zkey`];
+};
 //#endregion
-export { i as getWASMFile, a as getZKeyFile };
+export { a as getWASMFile, o as getZKeyFile };

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

@@ -1 +1 @@
-require(`./common.snarkjs.cjs`),require(`./signedMessageHash.cjs`),require(`./generateZkProof.cjs`),require(`./generateMainAndCommitmentZkProof.cjs`),require(`./fetchOnChainRootHashes.cjs`),require(`./constructGeneralZkProof.cjs`),require(`./constructSolanaZkProof.cjs`),require(`./verifyCommitmentValidationData.cjs`);
+require(`./common.snarkjs.cjs`),require(`./signedMessageHash.cjs`),require(`./generateZkProof.cjs`),require(`./generateMainAndCommitmentZkProof.cjs`),require(`./fetchOnChainRootHashes.cjs`),require(`./constructGeneralZkProof.cjs`),require(`./constructSolanaZkProof.cjs`),require(`./verifyCommitmentValidationData.cjs`),require(`./constructSignatureFromMnemonicProofInput.cjs`),require(`./generateSignatureFromMnemonicProof.cjs`);

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

@@ -6,3 +6,5 @@ export * from './generateMainAndCommitmentZkProof';
 export * from './constructSolanaZkProof';
 export * from './fetchOnChainRootHashes';
 export * from './verifyCommitmentValidationData';
+export * from './constructSignatureFromMnemonicProofInput';
+export * from './generateSignatureFromMnemonicProof';

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

@@ -6,3 +6,5 @@ import "./fetchOnChainRootHashes.mjs";
 import "./constructGeneralZkProof.mjs";
 import "./constructSolanaZkProof.mjs";
 import "./verifyCommitmentValidationData.mjs";
+import "./constructSignatureFromMnemonicProofInput.mjs";
+import "./generateSignatureFromMnemonicProof.mjs";

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`],s=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.outH1Ay,e.H0Ax,e.H0Ay])),c=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=s,exports.computeSignedMessageHashSolana=c;
+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=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])),c=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=s,exports.computeSignedMessageHashSolana=c;

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

@@ -7,6 +7,7 @@ type EvmSignedMessageHashParams = {
     outCommitments: string[][];
     calldataHash: bigint;
     message: bigint;
+    outH1Ax: bigint;
     outH1Ay: bigint;
     H0Ax: bigint;
     H0Ay: bigint;

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

@@ -14,6 +14,7 @@ var i = (e) => [...new r(e.length).toArray("be", 8), ...e.flatMap((e) => t(e))],
 	"uint256",
 	"uint256",
 	"uint256",
+	"uint256",
 	"uint256"
 ], s = (e) => a(n.AbiCoder.defaultAbiCoder().encode(o, [
 	e.rootHashHinkal,
@@ -24,6 +25,7 @@ var i = (e) => [...new r(e.length).toArray("be", 8), ...e.flatMap((e) => t(e))],
 	e.outCommitments.flat().map((e) => BigInt(e)),
 	e.calldataHash,
 	e.message,
+	e.outH1Ax,
 	e.outH1Ay,
 	e.H0Ax,
 	e.H0Ay

package/common/src/functions/utils/addresses.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`),require(`../../constants/protocol.constants.cjs`);let e=require(`ethers`);require(`@solana/web3.js`),require(`tronweb`);var t=[`http://`,`https://`,`/payment/`,`.app/`,`.com/`,`.netlify.`],n=e=>{if(t.some(t=>e.includes(t)))return!1;let[n,r,i,a,o]=e.split(`,`),s=!n||!o||!r||!i||!a,c=n?.substring(0,2)!==`0x`||o?.substring(0,2)!==`0x`,l=o?.length!==66||n?.length>66||n?.length<64,u=e?.includes(`"`);return!(s||c||l||u)},r=e=>{if(t.some(t=>e.includes(t)))return!1;let[n,r,i,a,o]=e.split(`,`),s=!n||!r||!i||!a||!o,c=r?.substring(0,2)!==`0x`||i?.substring(0,2)!==`0x`,l=i?.length!==66||r?.length>66||r?.length<64,u=e?.includes(`"`);return!(s||c||l||u)},i=e=>{let[t,n,r,i]=e.split(`,`);return{extraRandomization:BigInt(n)|1n<<255n,stealthAddress:BigInt(t),H0:BigInt(r),H1:BigInt(i)}},a=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t.toLowerCase())),o=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t));exports.constructStealthAddressStructure=i,exports.hashEthereumAddress=a,exports.hashString=o,exports.isValidOldStylePrivateAddress=r,exports.isValidPrivateAddress=n;
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`),require(`../../constants/protocol.constants.cjs`);let e=require(`ethers`);require(`@solana/web3.js`),require(`tronweb`);var t=[`http://`,`https://`,`/payment/`,`.app/`,`.com/`,`.netlify.`],n=e=>{if(t.some(t=>e.includes(t)))return!1;let[n,r,i,a,o,s]=e.split(`,`),c=!n||!s||!r||!i||!a||!o,l=n?.substring(0,2)!==`0x`||s?.substring(0,2)!==`0x`,u=s?.length!==66||n?.length>66||n?.length<64,d=e?.includes(`"`);return!(c||l||u||d)},r=e=>{let[t,n,r,i,a]=e.split(`,`);return{H0x:BigInt(n),H0y:BigInt(r),H1x:BigInt(i),H1y:BigInt(a),stealthAddress:BigInt(t)}},i=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t.toLowerCase())),a=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t));exports.constructStealthAddressStructure=r,exports.hashEthereumAddress=i,exports.hashString=a,exports.isValidPrivateAddress=n;

package/common/src/functions/utils/addresses.d.ts

@@ -1,6 +1,5 @@
 import { StealthAddressStructure } from '../../types/circom-data.types';
 export declare const isValidPrivateAddress: (address: string) => boolean;
-export declare const isValidOldStylePrivateAddress: (address: string) => boolean;
 export declare const constructStealthAddressStructure: (recipientInfo: string) => StealthAddressStructure;
 export declare const hashEthereumAddress: (ethereumAddress: string) => string;
 export declare const hashString: (string: string) => string;

package/common/src/functions/utils/addresses.mjs

@@ -13,20 +13,17 @@ var t = [
 	".netlify."
 ], n = (e) => {
 	if (t.some((t) => e.includes(t))) return !1;
-	let [n, r, i, a, o] = e.split(","), s = !n || !o || !r || !i || !a, c = n?.substring(0, 2) !== "0x" || o?.substring(0, 2) !== "0x", l = o?.length !== 66 || n?.length > 66 || n?.length < 64, u = e?.includes("\"");
-	return !(s || c || l || u);
+	let [n, r, i, a, o, s] = e.split(","), c = !n || !s || !r || !i || !a || !o, l = n?.substring(0, 2) !== "0x" || s?.substring(0, 2) !== "0x", u = s?.length !== 66 || n?.length > 66 || n?.length < 64, d = e?.includes("\"");
+	return !(c || l || u || d);
 }, r = (e) => {
-	if (t.some((t) => e.includes(t))) return !1;
-	let [n, r, i, a, o] = e.split(","), s = !n || !r || !i || !a || !o, c = r?.substring(0, 2) !== "0x" || i?.substring(0, 2) !== "0x", l = i?.length !== 66 || r?.length > 66 || r?.length < 64, u = e?.includes("\"");
-	return !(s || c || l || u);
-}, i = (e) => {
-	let [t, n, r, i] = e.split(",");
+	let [t, n, r, i, a] = e.split(",");
 	return {
-		extraRandomization: BigInt(n) | 1n << 255n,
-		stealthAddress: BigInt(t),
-		H0: BigInt(r),
-		H1: BigInt(i)
+		H0x: BigInt(n),
+		H0y: BigInt(r),
+		H1x: BigInt(i),
+		H1y: BigInt(a),
+		stealthAddress: BigInt(t)
 	};
-}, a = (t) => e.keccak256(e.toUtf8Bytes(t.toLowerCase())), o = (t) => e.keccak256(e.toUtf8Bytes(t));
+}, i = (t) => e.keccak256(e.toUtf8Bytes(t.toLowerCase())), a = (t) => e.keccak256(e.toUtf8Bytes(t));
 //#endregion
-export { i as constructStealthAddressStructure, a as hashEthereumAddress, o as hashString, r as isValidOldStylePrivateAddress, n as isValidPrivateAddress };
+export { r as constructStealthAddressStructure, i as hashEthereumAddress, a as hashString, n as isValidPrivateAddress };

package/common/src/functions/utils/bridge-flow.utils.d.ts

@@ -1,4 +1,4 @@
 import { ERC20Token } from '../../types/token.types';
 export declare const getBridgingSlippagePercent: (amount: string, tokenPriceDollar?: number) => number;
 export declare const getIsBridgeOrSwapFlow: (usePrivateBalance: boolean, sourceToken: ERC20Token | undefined, destinationToken: ERC20Token | undefined) => boolean;
-export declare const getIsConfidentialBridgeFlow: (usePrivateBalance: boolean, sourceToken: ERC20Token | undefined, destinationToken: ERC20Token | undefined, publicTransfer?: boolean) => boolean;
+export declare const getIsConfidentialBridgeOrSwapFlow: (usePrivateBalance: boolean, sourceToken: ERC20Token | undefined, destinationToken: ERC20Token | undefined, publicTransfer?: boolean) => boolean;

package/common/src/functions/utils/buildClaimableDepositPlan.d.ts

@@ -10,6 +10,7 @@ interface BuildClaimableDepositPlanParams {
 }
 export interface ClaimableDepositPlan {
     stealthAddressStructures: StealthAddressStructure[];
+    recipientEncryptionKeys: string[];
     fallbackRecipients: FallbackRecipientUtxoPlan[];
 }
 export declare const buildClaimableDepositPlan: ({ userKeys, recipientAmounts, recipientAddresses, recipientInfos, nonce, tokenAddress, }: BuildClaimableDepositPlanParams) => ClaimableDepositPlan;

package/common/src/functions/utils/convertEmporiumOpToCallInfo.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);let t=require(`ethers`);var n=(n,r,i)=>{let{hinkalAddress:a}=e.networkRegistry[i].contractData,o=t.ethers.getBytes(n),s=o.slice(0,20),c=o.slice(20,21),[l,u,d,f]=[s,o.slice(21,37),c,o.slice(37)].map(e=>t.ethers.hexlify(e));return{from:BigInt(d)>0?r:a,to:l,value:BigInt(u),calldata:f}};exports.convertEmporiumOpToCallInfo=n;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);let t=require(`ethers`);var n=(n,r,i)=>{let{hinkalAddress:a}=e.networkRegistry[i].contractData,[{endpoint:o,invokeWallet:s,value:c,callData:l}]=t.ethers.AbiCoder.defaultAbiCoder().decode([`tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)`],n);return{from:s?r:a,to:o,value:BigInt(c),calldata:l}};exports.convertEmporiumOpToCallInfo=n;

package/common/src/functions/utils/convertEmporiumOpToCallInfo.mjs

@@ -2,17 +2,12 @@ import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { ethers as t } from "ethers";
 //#region libs/shared/common/src/functions/utils/convertEmporiumOpToCallInfo.ts
 var n = (n, r, i) => {
-	let { hinkalAddress: a } = e[i].contractData, o = t.getBytes(n), s = o.slice(0, 20), c = o.slice(20, 21), [l, u, d, f] = [
-		s,
-		o.slice(21, 37),
-		c,
-		o.slice(37)
-	].map((e) => t.hexlify(e));
+	let { hinkalAddress: a } = e[i].contractData, [{ endpoint: o, invokeWallet: s, value: c, callData: l }] = t.AbiCoder.defaultAbiCoder().decode(["tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)"], n);
 	return {
-		from: BigInt(d) > 0 ? r : a,
-		to: l,
-		value: BigInt(u),
-		calldata: f
+		from: s ? r : a,
+		to: o,
+		value: BigInt(c),
+		calldata: l
 	};
 };
 //#endregion

package/common/src/functions/utils/enclave-utxo-storage.d.ts

@@ -1,7 +1,10 @@
 import { IUtxoConstructor, Utxo } from '../../data-structures/utxo/Utxo';
+import { Proof, RecoverUtxosResponse } from '../../API/enclaveUtxoCalls';
 export type UtxoConstructorParamsWithSenderAddress = IUtxoConstructor<string> & {
     senderAddress: string;
     claimableSignature?: string;
 };
 export declare const storeUtxoInEnclave: (senderAddress: string, recipientEthAddress: string, utxo: Utxo, chainId: number, claimableSignature?: string) => Promise<void>;
+export declare const getFundRecoveryMessage: (withdrawalAddress: string) => string;
+export declare const recoverUtxosViaEnclave: (signature: string, requestSignature?: string, addressForLoginSignatureVerify?: string, addressForAuthorizationSignatureVerify?: string, ethereumWithdrawalAddress?: string, solanaWithdrawalAddress?: string, mnemonicProof?: Proof) => Promise<RecoverUtxosResponse>;
 export declare const getUtxosFromEnclave: (ethAddress: string, signature: string, chainId: number, isSolanaLedger: boolean, txMessageForSolanaLedger?: string) => Promise<UtxoConstructorParamsWithSenderAddress[]>;

package/common/src/functions/utils/enclaveSessionSigning.cjs

@@ -0,0 +1 @@
+require(`crypto`),require(`@noble/curves/secp256k1`);

package/common/src/functions/utils/enclaveSessionSigning.d.ts

@@ -0,0 +1,16 @@
+import { EnclaveSessionAuthFields } from '../../types/enclaveApi.types';
+import { EnclaveSessionAuthMode } from '../../constants/enclaveAuth.constants';
+export declare const toHex: (bytes: Uint8Array) => string;
+export declare const signPayload: (privateKey: Uint8Array, payload: string) => string;
+export declare const buildActionBinding: (method: string, routePath: string) => string;
+export declare const buildRequestSignaturePayload: (binding: string, payload: string) => string;
+export declare const getCompressedPublicKey: (privateKey: Uint8Array) => string;
+export declare const sessionQueryParams: (session: EnclaveSessionAuthFields, chainId: number) => Record<string, string>;
+export declare const sessionBodyParams: (session: EnclaveSessionAuthFields, chainId: number) => {
+    sessionId: string;
+    nonce: string;
+    chainId: number;
+    timestamp: number;
+};
+export declare const resolveSessionAuthMode: (useEIP712: boolean) => EnclaveSessionAuthMode;
+export declare const buildEnclaveSignMessage: (sessionId: string, clientPublicKey: string, authMode?: EnclaveSessionAuthMode) => string;