@hinkal/common 0.3.8 → 0.3.10

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

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

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

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

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./caseInsensitive.utils.cjs`);let r=require(`ethers`),i=require(`@solana/web3.js`);require(`tronweb`);var a=[`http://`,`https://`,`/payment/`,`.app/`,`.com/`,`.netlify.`],o=e=>{if(a.some(t=>e.includes(t)))return!1;let[t,n,r,i,o,s]=e.split(`,`),c=!t||!s||!n||!r||!i||!o,l=t?.substring(0,2)!==`0x`||s?.substring(0,2)!==`0x`,u=s?.length!==66||t?.length>66||t?.length<64,d=e?.includes(`"`);return!(c||l||u||d)},s=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)}},c=e=>{let[,,,,,t]=e.split(`,`);if(!t)throw Error(`recipientInfo is missing an encryption key`);return t},l=e=>r.ethers.keccak256(r.ethers.toUtf8Bytes(e.toLowerCase())),u=e=>r.ethers.keccak256(r.ethers.toUtf8Bytes(e)),d=e=>{try{return new i.PublicKey(e).toBase58()===e}catch{return!1}},f=(r,i)=>(r=r.trim(),r?i===void 0?n.caseInsensitiveEqual(r,t.zeroAddress)||n.caseInsensitiveEqual(r,`11111111111111111111111111111111`):e.isSolanaLike(i)?n.caseInsensitiveEqual(r,t.solanaNativeAddress):n.caseInsensitiveEqual(r,t.zeroAddress):!1);exports.constructStealthAddressStructure=s,exports.getEncryptionKeyFromRecipientInfo=c,exports.hashEthereumAddress=l,exports.hashString=u,exports.isNativePlaceholderAddress=f,exports.isValidPrivateAddress=o,exports.isValidSolanaPublicKey=d;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./caseInsensitive.utils.cjs`),r=require(`./tron.utils.cjs`);let i=require(`ethers`),a=require(`@solana/web3.js`);require(`tronweb`);var o=[`http://`,`https://`,`/payment/`,`.app/`,`.com/`,`.netlify.`],s=e=>{if(o.some(t=>e.includes(t)))return!1;let[t,n,r,i,a,s]=e.split(`,`),c=!t||!s||!n||!r||!i||!a,l=t?.substring(0,2)!==`0x`||s?.substring(0,2)!==`0x`,u=s?.length!==66||t?.length>66||t?.length<64,d=e?.includes(`"`);return!(c||l||u||d)},c=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)}},l=e=>{let[,,,,,t]=e.split(`,`);if(!t)throw Error(`recipientInfo is missing an encryption key`);return t},u=e=>i.ethers.keccak256(i.ethers.toUtf8Bytes(e.toLowerCase())),d=(t,n)=>u(e.isSolanaLike(t)?n:r.addressToHexFormat(n)),f=e=>i.ethers.keccak256(i.ethers.toUtf8Bytes(e)),p=e=>{try{return new a.PublicKey(e).toBase58()===e}catch{return!1}},m=(r,i)=>(r=r.trim(),r?i===void 0?n.caseInsensitiveEqual(r,t.zeroAddress)||n.caseInsensitiveEqual(r,`11111111111111111111111111111111`):e.isSolanaLike(i)?n.caseInsensitiveEqual(r,t.solanaNativeAddress):n.caseInsensitiveEqual(r,t.zeroAddress):!1);exports.constructStealthAddressStructure=c,exports.getEncryptionKeyFromRecipientInfo=l,exports.hashEthereumAddress=u,exports.hashOwnerAddressForChain=d,exports.hashString=f,exports.isNativePlaceholderAddress=m,exports.isValidPrivateAddress=s,exports.isValidSolanaPublicKey=p;

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

@@ -3,6 +3,7 @@ export declare const isValidPrivateAddress: (address: string) => boolean;
 export declare const constructStealthAddressStructure: (recipientInfo: string) => StealthAddressStructure;
 export declare const getEncryptionKeyFromRecipientInfo: (recipientInfo: string) => string;
 export declare const hashEthereumAddress: (ethereumAddress: string) => string;
+export declare const hashOwnerAddressForChain: (chainId: number, ethereumAddress: string) => string;
 export declare const hashString: (string: string) => string;
 export declare const isValidSolanaPublicKey: (str: string) => boolean;
 export declare const isNativePlaceholderAddress: (address: string, chainId?: number) => boolean;

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

@@ -1,22 +1,23 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
 import { solanaNativeAddress as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as r } from "./caseInsensitive.utils.mjs";
-import { ethers as i } from "ethers";
-import { PublicKey as a } from "@solana/web3.js";
+import { addressToHexFormat as i } from "./tron.utils.mjs";
+import { ethers as a } from "ethers";
+import { PublicKey as o } from "@solana/web3.js";
 import "tronweb";
 //#region libs/shared/common/src/functions/utils/addresses.ts
-var o = [
+var s = [
 	"http://",
 	"https://",
 	"/payment/",
 	".app/",
 	".com/",
 	".netlify."
-], s = (e) => {
-	if (o.some((t) => e.includes(t))) return !1;
-	let [t, n, r, i, a, s] = e.split(","), c = !t || !s || !n || !r || !i || !a, l = t?.substring(0, 2) !== "0x" || s?.substring(0, 2) !== "0x", u = s?.length !== 66 || t?.length > 66 || t?.length < 64, d = e?.includes("\"");
+], c = (e) => {
+	if (s.some((t) => e.includes(t))) return !1;
+	let [t, n, r, i, a, o] = e.split(","), c = !t || !o || !n || !r || !i || !a, l = t?.substring(0, 2) !== "0x" || o?.substring(0, 2) !== "0x", u = o?.length !== 66 || t?.length > 66 || t?.length < 64, d = e?.includes("\"");
 	return !(c || l || u || d);
-}, c = (e) => {
+}, l = (e) => {
 	let [t, n, r, i, a] = e.split(",");
 	return {
 		H0x: BigInt(n),
@@ -25,16 +26,16 @@ var o = [
 		H1y: BigInt(a),
 		stealthAddress: BigInt(t)
 	};
-}, l = (e) => {
+}, u = (e) => {
 	let [, , , , , t] = e.split(",");
 	if (!t) throw Error("recipientInfo is missing an encryption key");
 	return t;
-}, u = (e) => i.keccak256(i.toUtf8Bytes(e.toLowerCase())), d = (e) => i.keccak256(i.toUtf8Bytes(e)), f = (e) => {
+}, d = (e) => a.keccak256(a.toUtf8Bytes(e.toLowerCase())), f = (t, n) => d(e(t) ? n : i(n)), p = (e) => a.keccak256(a.toUtf8Bytes(e)), m = (e) => {
 	try {
-		return new a(e).toBase58() === e;
+		return new o(e).toBase58() === e;
 	} catch {
 		return !1;
 	}
-}, p = (i, a) => (i = i.trim(), i ? a === void 0 ? r(i, n) || r(i, "11111111111111111111111111111111") : e(a) ? r(i, t) : r(i, n) : !1);
+}, h = (i, a) => (i = i.trim(), i ? a === void 0 ? r(i, n) || r(i, "11111111111111111111111111111111") : e(a) ? r(i, t) : r(i, n) : !1);
 //#endregion
-export { c as constructStealthAddressStructure, l as getEncryptionKeyFromRecipientInfo, u as hashEthereumAddress, d as hashString, p as isNativePlaceholderAddress, s as isValidPrivateAddress, f as isValidSolanaPublicKey };
+export { l as constructStealthAddressStructure, u as getEncryptionKeyFromRecipientInfo, d as hashEthereumAddress, f as hashOwnerAddressForChain, p as hashString, h as isNativePlaceholderAddress, c as isValidPrivateAddress, m as isValidSolanaPublicKey };

package/common/src/functions/utils/bridge-arrival.utils.cjs

@@ -1 +1 @@
-const e=require(`./time.utils.cjs`),t=require(`../../constants/bridging.constants.cjs`),n=require(`./publicBalance.utils.cjs`);var r=async(r,i,a,o,s)=>{let c=o-o*BigInt(Math.round(s*t.SLIPPAGE_SCALING_FACTOR))/BigInt(t.SLIPPAGE_SCALING_FACTOR),l=c>0n?c:1n,u=Date.now()+t.BRIDGE_ARRIVAL_TIMEOUT_MS;for(;Date.now()<u;){let o=await n.getPublicBalanceByTokenAddress(r,i,a);if(o!==null&&o>=l)return o;await e.waitLittle(t.BRIDGE_ARRIVAL_POLL_INTERVAL_MS)}throw Error(`Bridge did not land on destination temp wallet ${i} on chain ${r} within timeout.`)};exports.waitForBridgeArrival=r;
+const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`./time.utils.cjs`),n=require(`../../constants/bridging.constants.cjs`),r=require(`./publicBalance.utils.cjs`);var i=async(i,a,o,s,c)=>{let l=s-s*BigInt(Math.round(c*n.SLIPPAGE_SCALING_FACTOR))/BigInt(n.SLIPPAGE_SCALING_FACTOR),u=l>0n?l:1n,d=Date.now()+n.BRIDGE_ARRIVAL_TIMEOUT_MS;for(;Date.now()<d;){let e=await r.getPublicBalanceByTokenAddress(i,a,o);if(e!==null&&e>=u)return e;await t.waitLittle(n.BRIDGE_ARRIVAL_POLL_INTERVAL_MS)}throw Error(`${e.transactionErrorCodes.BRIDGE_ARRIVAL_TIMEOUT} ${a} on chain ${i} within timeout.`)};exports.waitForBridgeArrival=i;