@gurge/sdk 0.3.27 → 0.3.29

package/common/src/functions/pre-transaction/buildCommitmentValidationData.mjs

@@ -1,96 +1,55 @@
-import { isReactNative as e } from "../../constants/vite.constants.mjs";
-import { isSolanaLike as t } from "../../constants/chains.constants.mjs";
-import { getRnCryptoBridge as n } from "../../crypto/rnCryptoBridge.mjs";
-import { UserKeys as r } from "../../data-structures/crypto-keys/keys.mjs";
-import { CryptoWorkerOp as i } from "../../webworker/cryptoWorker/cryptoWorker.types.mjs";
-import { getUtxoCircuitH0Coords as a, getUtxoCircuitInRandomization as o, hasOnlyZeroAmounts as s } from "../snarkjs/common.snarkjs.mjs";
-import { getSpendingPublicKeyForRn as c } from "../../crypto/rnUtxoCrypto.mjs";
-import { formatMintAddress as l } from "../utils/solanaMint.utils.mjs";
-import { createRnDeltaTiming as u } from "../utils/hinkalTiming.utils.mjs";
-import { WorkerVariant as d } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as f } from "../../webworker/performTaskWithWorker.mjs";
-import { ZKProofWorkerActionType as p } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
+import { UserKeys as t } from "../../data-structures/crypto-keys/keys.mjs";
+import { formatMintAddress as n } from "../utils/solanaMint.utils.mjs";
+import { createRnDeltaTiming as r } from "../utils/hinkalTiming.utils.mjs";
+import { getUtxoCircuitH0Coords as i, getUtxoCircuitInRandomization as a, hasOnlyZeroAmounts as o } from "../snarkjs/common.snarkjs.mjs";
+import { WorkerVariant as s } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as c } from "../../webworker/performTaskWithWorker.mjs";
+import { ZKProofWorkerActionType as l } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/buildCommitmentValidationData.ts
-var m = async (m, h, g, _) => {
-	let v = u("mainThread.commitmentValidation");
-	if (s(_)) return;
-	let y = t(m), b = _.map((e) => e.map((e) => e.amount.toString())), x = _.map((e) => e.map((e) => e.timeStamp)), S = _.map((e) => e.map((e) => o(e))), C = _.map((e) => e.map((e) => e.getConstructableParams()));
-	v.log("serializeInputs");
-	let w = u("mainThread.getCommitment"), T = _.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString()));
-	w.log("all-utxos", { count: _.reduce((e, t) => e + t.length, 0) });
-	let E = await f({
-		type: d.ZKProof,
+var u = async (u, d, f, p) => {
+	if (o(p)) return;
+	let m = e(u), h = p.map((e) => e.map((e) => e.amount.toString())), g = p.map((e) => e.map((e) => e.timeStamp)), _ = p.map((e) => e.map((e) => a(e))), v = p.map((e) => e.map((e) => e.getConstructableParams())), y = p.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString())), b = await c({
+		type: s.ZKProof,
 		payload: {
-			type: p.BUILD_IN_NULLIFIERS,
-			data: { inputUtxosSerialized: C }
+			type: l.BUILD_IN_NULLIFIERS,
+			data: { inputUtxosSerialized: v }
 		}
-	});
-	v.log("buildInNullifiers-worker-done");
-	let D = h.getShieldedPrivateKey(), O = await c(h), k = y ? g.map((e) => {
-		let { compressedAddress: t } = l(e);
+	}), x = d.getShieldedPrivateKey(), S = d.getSpendingKeyPair().pubSpendingBJJPoint, C = m ? f.map((e) => {
+		let { compressedAddress: t } = n(e);
 		return BigInt(t).toString();
-	}) : g.map((e) => BigInt(e).toString()), A = u("mainThread.stealthValidation"), j = 0;
-	if (e) {
-		let e = [];
-		_.forEach((t, n) => {
-			t.forEach((t, r) => {
-				j += 1;
-				let i = t.spendingPublicKey ?? O;
-				e.push({
-					tokenIdx: n,
-					utxoIdx: r,
-					utxoStealthAddress: t.getStealthAddress(),
-					isNewStyle: !!t.isNewStyle,
-					randomization: t.randomization?.toString(),
-					H0: t.H0 ? [t.H0[0].toString(), t.H0[1].toString()] : void 0,
-					spendingPublicKey: [i[0].toString(), i[1].toString()]
-				});
-			});
+	}) : f.map((e) => BigInt(e).toString()), w = r("withdraw.stealthValidation"), T = 0;
+	p.forEach((e, n) => {
+		e.forEach((e, r) => {
+			T += 1;
+			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? S, o = e.isNewStyle && e.H0 ? t.getStealthAddressNewStyle(e.H0, x, a) : t.getStealthAddress(BigInt(e.randomization), x);
+			if (BigInt(i).toString() !== BigInt(o).toString()) throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`);
 		});
-		let t = n();
-		await t.init(), (await t.call(i.BATCH_STEALTH_VALIDATION, {
-			nullifyingPrivateKey: D,
-			defaultSpendingPublicKey: [O[0].toString(), O[1].toString()],
-			checks: e
-		})).forEach((t, n) => {
-			if (t.matches) return;
-			let { tokenIdx: r, utxoIdx: i } = e[n];
-			throw Error(`Commitment validation stealth mismatch at tokenIdx=${r}, utxoIdx=${i}`);
-		});
-	} else _.forEach((e, t) => {
-		e.forEach((e, n) => {
-			j += 1;
-			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? O, o = e.isNewStyle && e.H0 ? r.getStealthAddressNewStyle(e.H0, D, a) : r.getStealthAddress(BigInt(e.randomization), D);
-			if (BigInt(i).toString() !== BigInt(o).toString()) throw Error(`Commitment validation stealth mismatch at tokenIdx=${t}, utxoIdx=${n}`);
-		});
-	});
-	A.log("all-utxos", { stealthChecks: j });
-	let M = {
-		nullifyingPrivateKey: D,
-		spendingPublicKey: O,
-		erc20TokenAddresses: k,
-		inAmounts: b,
-		inRandomizations: S,
-		inH0Ax: _.map((e) => e.map((e) => a(e)[0].toString())),
-		inH0Ay: _.map((e) => e.map((e) => a(e)[1].toString())),
-		isNewStyle: _.map((e) => e.map((e) => !!e.isNewStyle)),
-		inTimeStamps: x,
-		inCommitments: T,
-		inNullifiers: E
+	}), w.log("done", { stealthChecks: T });
+	let E = {
+		nullifyingPrivateKey: x,
+		spendingPublicKey: S,
+		erc20TokenAddresses: C,
+		inAmounts: h,
+		inRandomizations: _,
+		inH0Ax: p.map((e) => e.map((e) => i(e)[0].toString())),
+		inH0Ay: p.map((e) => e.map((e) => i(e)[1].toString())),
+		isNewStyle: p.map((e) => e.map((e) => !!e.isNewStyle)),
+		inTimeStamps: g,
+		inCommitments: y,
+		inNullifiers: b
 	};
-	if (!g.length || !_[0]?.length) return;
-	let N = `commitmentCalculator${g.length}x${_[0].length}`;
-	return v.log("done", { verifierName: N }), {
-		tokenAddresses: k,
-		inAmounts: b,
-		inTimeStamps: x,
-		inRandomizations: S,
-		inCommitments: T,
-		inNullifiers: E,
-		verifierName: N,
-		commitmentInput: M
+	if (!(!f.length || !p[0]?.length)) return {
+		tokenAddresses: C,
+		inAmounts: h,
+		inTimeStamps: g,
+		inRandomizations: _,
+		inCommitments: y,
+		inNullifiers: b,
+		verifierName: `commitmentCalculator${f.length}x${p[0].length}`,
+		commitmentInput: E
 	};
-}, h = (e, t) => {
+}, d = (e, t) => {
 	if (!(!e || !t)) return {
 		tokenAddresses: e.tokenAddresses,
 		inAmounts: e.inAmounts,
@@ -106,4 +65,4 @@ var m = async (m, h, g, _) => {
 	};
 };
 //#endregion
-export { m as buildCommitmentValidationData, h as buildCommitmentValidationDataFromProof };
+export { u as buildCommitmentValidationData, d as buildCommitmentValidationDataFromProof };

package/common/src/functions/pre-transaction/outputUtxoProcessing.cjs

@@ -1 +1 @@
-const e=require(`../utils/amounts.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../crypto/rnUtxoCrypto.cjs`),r=require(`../../data-structures/utxo/Utxo.cjs`),i=require(`../utils/hinkalTiming.utils.cjs`);var a=async(a,o,s,c,l=!0,u,d)=>{let f=i.createRnDeltaTiming(`mainThread.outputUtxo`),p=e.countTotalAmountInUtxos(o),{erc20TokenAddress:m,mintAddress:h}=o[0];if(l&&s<0n&&p+s<0n)throw Error(t.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);f.log(`sumInputs`);let g=await n.getSpendingPublicKeyForRn(a),_=[await r.Utxo.createAsync({amount:e.bigintMax(p+s,0n),erc20TokenAddress:m,mintAddress:h,nullifyingKey:a.getShieldedPrivateKey(),timeStamp:c,spendingPublicKey:g,isNewStyle:!0})];if(f.log(`newUtxo-change`,{randomization:!!_[0].randomization,h0:!!_[0].H0}),u!==void 0&&d!==void 0){let[e,t,n,,i]=u.split(`,`);_.push(new r.Utxo({amount:d,erc20TokenAddress:m,mintAddress:h,H0:[BigInt(t),BigInt(n)],stealthAddress:e,encryptionKey:i,timeStamp:c,isNewStyle:!0})),f.log(`newUtxo-recipient`)}return f.log(`done`,{outputCount:_.length}),{outputUtxos:_}};exports.outputUtxoProcessing=a;
+const e=require(`../utils/amounts.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`),r=require(`../utils/hinkalTiming.utils.cjs`);var i=(i,a,o,s,c=!0,l,u)=>{let d=e.countTotalAmountInUtxos(a),{erc20TokenAddress:f,mintAddress:p}=a[0];if(c&&o<0n&&d+o<0n)throw Error(t.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let m=r.createRnDeltaTiming(`withdraw.outputUtxo`),h=[new n.Utxo({amount:e.bigintMax(d+o,0n),erc20TokenAddress:f,mintAddress:p,nullifyingKey:i.getShieldedPrivateKey(),timeStamp:s,spendingPublicKey:i.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0})];if(m.log(`newUtxo-change`),l!==void 0&&u!==void 0){let[e,t,r,,i]=l.split(`,`);h.push(new n.Utxo({amount:u,erc20TokenAddress:f,mintAddress:p,H0:[BigInt(t),BigInt(r)],stealthAddress:e,encryptionKey:i,timeStamp:s,isNewStyle:!0}))}return{outputUtxos:h}};exports.outputUtxoProcessing=i;

package/common/src/functions/pre-transaction/outputUtxoProcessing.d.ts

@@ -1,5 +1,5 @@
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../data-structures/utxo/Utxo';
-export declare const outputUtxoProcessing: (userKeys: UserKeys, inputUtxos: Utxo[], amountChange: bigint, timeStamp?: string, revertIfNegative?: boolean, recipientAddress?: string, recipientAmountChange?: bigint) => Promise<{
+export declare const outputUtxoProcessing: (userKeys: UserKeys, inputUtxos: Utxo[], amountChange: bigint, timeStamp?: string, revertIfNegative?: boolean, recipientAddress?: string, recipientAmountChange?: bigint) => {
     outputUtxos: Utxo[];
-}>;
+};

package/common/src/functions/pre-transaction/outputUtxoProcessing.mjs

@@ -1,39 +1,34 @@
 import { bigintMax as e, countTotalAmountInUtxos as t } from "../utils/amounts.utils.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { getSpendingPublicKeyForRn as r } from "../../crypto/rnUtxoCrypto.mjs";
-import { Utxo as i } from "../../data-structures/utxo/Utxo.mjs";
-import { createRnDeltaTiming as a } from "../utils/hinkalTiming.utils.mjs";
+import { Utxo as r } from "../../data-structures/utxo/Utxo.mjs";
+import { createRnDeltaTiming as i } from "../utils/hinkalTiming.utils.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/outputUtxoProcessing.ts
-var o = async (o, s, c, l, u = !0, d, f) => {
-	let p = a("mainThread.outputUtxo"), m = t(s), { erc20TokenAddress: h, mintAddress: g } = s[0];
-	if (u && c < 0n && m + c < 0n) throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	p.log("sumInputs");
-	let _ = await r(o), v = [await i.createAsync({
-		amount: e(m + c, 0n),
-		erc20TokenAddress: h,
-		mintAddress: g,
-		nullifyingKey: o.getShieldedPrivateKey(),
-		timeStamp: l,
-		spendingPublicKey: _,
+var a = (a, o, s, c, l = !0, u, d) => {
+	let f = t(o), { erc20TokenAddress: p, mintAddress: m } = o[0];
+	if (l && s < 0n && f + s < 0n) throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let h = i("withdraw.outputUtxo"), g = [new r({
+		amount: e(f + s, 0n),
+		erc20TokenAddress: p,
+		mintAddress: m,
+		nullifyingKey: a.getShieldedPrivateKey(),
+		timeStamp: c,
+		spendingPublicKey: a.getSpendingKeyPair().pubSpendingBJJPoint,
 		isNewStyle: !0
 	})];
-	if (p.log("newUtxo-change", {
-		randomization: !!v[0].randomization,
-		h0: !!v[0].H0
-	}), d !== void 0 && f !== void 0) {
-		let [e, t, n, , r] = d.split(",");
-		v.push(new i({
-			amount: f,
-			erc20TokenAddress: h,
-			mintAddress: g,
+	if (h.log("newUtxo-change"), u !== void 0 && d !== void 0) {
+		let [e, t, n, , i] = u.split(",");
+		g.push(new r({
+			amount: d,
+			erc20TokenAddress: p,
+			mintAddress: m,
 			H0: [BigInt(t), BigInt(n)],
 			stealthAddress: e,
-			encryptionKey: r,
-			timeStamp: l,
+			encryptionKey: i,
+			timeStamp: c,
 			isNewStyle: !0
-		})), p.log("newUtxo-recipient");
+		}));
 	}
-	return p.log("done", { outputCount: v.length }), { outputUtxos: v };
+	return { outputUtxos: g };
 };
 //#endregion
-export { o as outputUtxoProcessing };
+export { a as outputUtxoProcessing };

package/common/src/functions/private-wallet/emporium.swap.helpers.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/string.utils.cjs`),o=require(`../utils/erc20tokenFunctions.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../utils/getContractAddress.cjs`),l=require(`./emporium.helpers.cjs`),u=require(`../pre-transaction/getExternalSwapAddress.cjs`);let d=require(`ethers`);var f=(e,t,n,r,i,a,o=!1)=>{let s={tokenIn:t,tokenOut:r,fee:BigInt(a),recipient:i,amountIn:n,amountOutMinimum:0,sqrtPriceLimitX96:0};return l.emporiumOp({contract:new d.ethers.Contract(e,[`function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)`]),func:`exactInputSingle`,args:[s],invokeWallet:o})},p=(e,t,n,r,i,o,s=!1)=>l.emporiumOp({contract:n,callDataString:a.replaceAllInstances(r,u.getExternalSwapAddress(e,t).slice(2),i.slice(2)),value:o,invokeWallet:s}),m=async(e,n)=>{let r=(await o.getErc20TokensForChainAPI(n)).find(e=>e.symbol===`USDT`);return r?t.caseInsensitiveEqual(e,r.erc20TokenAddress):!1},h=async(e,t,n,r,a,o)=>{if(await m(c.getContractAddress(n),e))try{await n.allowance(r,a)>0n&&t.push(l.createApproveEmporiumOp(n,a,0n,o))}catch(e){i.Logger.error(`Error in nullifyUsdtApprovalIfNeeded`,e)}},g=async(t,n,i,a,o,c,u,f)=>{if(i!==e.zeroAddress){let f=s.SWAP_FEE_TAKER_ADDRESSES[n],p=t.getContractWithFetcher(n,r.ContractType.ERC20Contract,i),m=await p.balanceOf(a);await h(n,c,p,a,f,u),c.push(l.createApproveEmporiumOp(p,f,2n**256n-1n,u));let g=new d.ethers.Contract(f,[`function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable`]),_=o;c.push(l.emporiumOp({contract:g,func:`takeSwapFee`,args:[i,m,e.HINKAL_SWAP_VARIABLE_RATE,_],invokeWallet:u}))}else{let t=o;c.push(l.emporiumOp({contract:t,value:f*e.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:u}))}},_=async(t,i,a,o,c,u,m,_,v,y,b,x,S=!1)=>{let C=m<0n?-1n*m:m,w=[],T=s.NATIVE_TOKEN_WRAPPER_ADDRESSES[i],E=!1,D;if(a===n.ExternalActionId.OneInch||a===n.ExternalActionId.Lifi){if(u!==e.zeroAddress){let e=t.getContractWithFetcher(i,r.ContractType.ERC20Contract,u);w.push(l.createApproveEmporiumOp(e,o,C,S))}let s=0n;return u===e.zeroAddress&&(s+=C),_&&v===e.zeroAddress&&_<0n&&(s+=-1n*_),D=p(i,a,o,c,b,s>0n?s:void 0,S),w.push(D),(a===n.ExternalActionId.OneInch||y&&a===n.ExternalActionId.Lifi)&&v&&_!==void 0&&await g(t,i,v,b,x,w,S,_),w}if(!v||!_)throw Error(`There should be output token for UniSwap and Odos`);if(u===e.zeroAddress){let e=t.getContractWithFetcher(i,r.ContractType.ERC20Contract,T);w.push(l.emporiumOp({contract:e,func:`deposit`,value:C,invokeWallet:S})),u=T}let O=0n;if(v===e.zeroAddress&&(v=T,E=!0,O=await t.getContractWithFetcher(i,r.ContractType.ERC20Contract,T).balanceOf(b)),u!==e.zeroAddress){let e=t.getContractWithFetcher(i,r.ContractType.ERC20Contract,u);await h(i,w,e,b,o,S),w.push(l.createApproveEmporiumOp(e,o,C,S))}if(D=a===n.ExternalActionId.Uniswap?f(o,u,C,v,b,c,S):p(i,a,o,c,b,void 0,S),w.push(D),await g(t,i,v,b,x,w,S,_),E){let e=s.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[i],n=t.getContractWithFetcher(i,r.ContractType.ERC20Contract,T);w.push(l.createApproveEmporiumOp(n,e,2n**256n-1n,S));let a=new d.ethers.Contract(e,[`function withdrawBalanceDifference(uint256 beforeBalance) external`]);w.push(l.emporiumOp({contract:a,func:`withdrawBalanceDifference`,args:[O],invokeWallet:S}))}return w};exports.createSwapToEmporiumOpForUniswap=f,exports.createSwapToEmporiumOps=_;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/string.utils.cjs`),o=require(`../utils/erc20tokenFunctions.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../utils/getContractAddress.cjs`),l=require(`./emporium.helpers.cjs`),u=require(`../pre-transaction/getExternalSwapAddress.cjs`);let d=require(`ethers`);var f=(e,t,n,r,i,a,o=!1)=>{let s={tokenIn:t,tokenOut:r,fee:BigInt(a),recipient:i,amountIn:n,amountOutMinimum:0,sqrtPriceLimitX96:0};return l.emporiumOp({contract:new d.ethers.Contract(e,[`function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)`]),func:`exactInputSingle`,args:[s],invokeWallet:o})},p=(e,t,n,r,i,o,s=!1)=>l.emporiumOp({contract:n,callDataString:a.replaceAllInstances(r,u.getExternalSwapAddress(e,t).slice(2),i.slice(2)),value:o,invokeWallet:s}),m=async(e,n)=>{let r=(await o.getErc20TokensForChainAPI(n)).find(e=>e.symbol===`USDT`);return r?t.caseInsensitiveEqual(e,r.erc20TokenAddress):!1},h=async(e,t,n,r,a,o)=>{if(await m(c.getContractAddress(n),e))try{await n.allowance(r,a)>0n&&t.push(l.createApproveEmporiumOp(n,a,0n,o))}catch(e){i.Logger.error(`Error in nullifyUsdtApprovalIfNeeded`,e)}},g=async(t,r,i,a,o,c,u,f)=>{if(i!==e.zeroAddress){let f=s.SWAP_FEE_TAKER_ADDRESSES[r],p=t.getContractWithFetcher(r,n.ContractType.ERC20Contract,i),m=await p.balanceOf(a);await h(r,c,p,a,f,u),c.push(l.createApproveEmporiumOp(p,f,2n**256n-1n,u));let g=new d.ethers.Contract(f,[`function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable`]),_=o;c.push(l.emporiumOp({contract:g,func:`takeSwapFee`,args:[i,m,e.HINKAL_SWAP_VARIABLE_RATE,_],invokeWallet:u}))}else{let t=o;c.push(l.emporiumOp({contract:t,value:f*e.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:u}))}},_=async(t,i,a,o,c,u,m,_,v,y,b,x,S=!1)=>{let C=m<0n?-1n*m:m,w=[],T=s.NATIVE_TOKEN_WRAPPER_ADDRESSES[i],E=!1,D;if(a===r.ExternalActionId.OneInch||a===r.ExternalActionId.Lifi){if(u!==e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,u);w.push(l.createApproveEmporiumOp(e,o,C,S))}let s=0n;return u===e.zeroAddress&&(s+=C),_&&v===e.zeroAddress&&_<0n&&(s+=-1n*_),D=p(i,a,o,c,b,s>0n?s:void 0,S),w.push(D),(a===r.ExternalActionId.OneInch||y&&a===r.ExternalActionId.Lifi)&&v&&_!==void 0&&await g(t,i,v,b,x,w,S,_),w}if(!v||!_)throw Error(`There should be output token for UniSwap and Odos`);if(u===e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T);w.push(l.emporiumOp({contract:e,func:`deposit`,value:C,invokeWallet:S})),u=T}let O=0n;if(v===e.zeroAddress&&(v=T,E=!0,O=await t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T).balanceOf(b)),u!==e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,u);await h(i,w,e,b,o,S),w.push(l.createApproveEmporiumOp(e,o,C,S))}if(D=a===r.ExternalActionId.Uniswap?f(o,u,C,v,b,c,S):p(i,a,o,c,b,void 0,S),w.push(D),await g(t,i,v,b,x,w,S,_),E){let e=s.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[i],r=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T);w.push(l.createApproveEmporiumOp(r,e,2n**256n-1n,S));let a=new d.ethers.Contract(e,[`function withdrawBalanceDifference(uint256 beforeBalance) external`]);w.push(l.emporiumOp({contract:a,func:`withdrawBalanceDifference`,args:[O],invokeWallet:S}))}return w};exports.createSwapToEmporiumOpForUniswap=f,exports.createSwapToEmporiumOps=_;

package/common/src/functions/private-wallet/emporium.swap.helpers.mjs

@@ -1,7 +1,7 @@
 import { HINKAL_SWAP_VARIABLE_RATE as e, zeroAddress as t } from "../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as n } from "../utils/caseInsensitive.utils.mjs";
-import { ExternalActionId as r } from "../../types/external-action.types.mjs";
-import { ContractType as i } from "../../types/ethereum-network.types.mjs";
+import { ContractType as r } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as i } from "../../types/external-action.types.mjs";
 import { Logger as a } from "../../error-handling/logger.mjs";
 import { replaceAllInstances as o } from "../utils/string.utils.mjs";
 import { getErc20TokensForChainAPI as s } from "../utils/erc20tokenFunctions.mjs";
@@ -41,10 +41,10 @@ var g = (e, t, n, r, i, a, o = !1) => {
 	} catch (e) {
 		a.error("Error in nullifyUsdtApprovalIfNeeded", e);
 	}
-}, b = async (n, r, a, o, s, c, u, d) => {
+}, b = async (n, i, a, o, s, c, u, d) => {
 	if (a !== t) {
-		let t = l[r], d = n.getContractWithFetcher(r, i.ERC20Contract, a), m = await d.balanceOf(o);
-		await y(r, c, d, o, t, u), c.push(f(d, t, 2n ** 256n - 1n, u));
+		let t = l[i], d = n.getContractWithFetcher(i, r.ERC20Contract, a), m = await d.balanceOf(o);
+		await y(i, c, d, o, t, u), c.push(f(d, t, 2n ** 256n - 1n, u));
 		let g = new h.Contract(t, ["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"]), _ = s;
 		c.push(p({
 			contract: g,
@@ -67,17 +67,17 @@ var g = (e, t, n, r, i, a, o = !1) => {
 	}
 }, x = async (e, n, a, o, s, l, d, m, v, x, S, C, w = !1) => {
 	let T = d < 0n ? -1n * d : d, E = [], D = c[n], O = !1, k;
-	if (a === r.OneInch || a === r.Lifi) {
+	if (a === i.OneInch || a === i.Lifi) {
 		if (l !== t) {
-			let t = e.getContractWithFetcher(n, i.ERC20Contract, l);
+			let t = e.getContractWithFetcher(n, r.ERC20Contract, l);
 			E.push(f(t, o, T, w));
 		}
 		let c = 0n;
-		return l === t && (c += T), m && v === t && m < 0n && (c += -1n * m), k = _(n, a, o, s, S, c > 0n ? c : void 0, w), E.push(k), (a === r.OneInch || x && a === r.Lifi) && v && m !== void 0 && await b(e, n, v, S, C, E, w, m), E;
+		return l === t && (c += T), m && v === t && m < 0n && (c += -1n * m), k = _(n, a, o, s, S, c > 0n ? c : void 0, w), E.push(k), (a === i.OneInch || x && a === i.Lifi) && v && m !== void 0 && await b(e, n, v, S, C, E, w, m), E;
 	}
 	if (!v || !m) throw Error("There should be output token for UniSwap and Odos");
 	if (l === t) {
-		let t = e.getContractWithFetcher(n, i.ERC20Contract, D);
+		let t = e.getContractWithFetcher(n, r.ERC20Contract, D);
 		E.push(p({
 			contract: t,
 			func: "deposit",
@@ -86,13 +86,13 @@ var g = (e, t, n, r, i, a, o = !1) => {
 		})), l = D;
 	}
 	let A = 0n;
-	if (v === t && (v = D, O = !0, A = await e.getContractWithFetcher(n, i.ERC20Contract, D).balanceOf(S)), l !== t) {
-		let t = e.getContractWithFetcher(n, i.ERC20Contract, l);
+	if (v === t && (v = D, O = !0, A = await e.getContractWithFetcher(n, r.ERC20Contract, D).balanceOf(S)), l !== t) {
+		let t = e.getContractWithFetcher(n, r.ERC20Contract, l);
 		await y(n, E, t, S, o, w), E.push(f(t, o, T, w));
 	}
-	if (k = a === r.Uniswap ? g(o, l, T, v, S, s, w) : _(n, a, o, s, S, void 0, w), E.push(k), await b(e, n, v, S, C, E, w, m), O) {
-		let t = u[n], r = e.getContractWithFetcher(n, i.ERC20Contract, D);
-		E.push(f(r, t, 2n ** 256n - 1n, w));
+	if (k = a === i.Uniswap ? g(o, l, T, v, S, s, w) : _(n, a, o, s, S, void 0, w), E.push(k), await b(e, n, v, S, C, E, w, m), O) {
+		let t = u[n], i = e.getContractWithFetcher(n, r.ERC20Contract, D);
+		E.push(f(i, t, 2n ** 256n - 1n, w));
 		let a = new h.Contract(t, ["function withdrawBalanceDifference(uint256 beforeBalance) external"]);
 		E.push(p({
 			contract: a,

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`),r=require(`../../types/circom-data.types.cjs`),i=require(`../utils/external-action.utils.cjs`),a=require(`./getOriginalSender.cjs`),o=require(`../utils/bit.operations.cjs`);let s=require(`ethers`);var c=e=>{if(e.H0?.[0]!==void 0&&e.H0[1]!==void 0)return[e.H0[0],e.H0[1]];if(e.randomization!==void 0)return t.UserKeys.getH0FromRandomization(e.randomization);throw Error(`UTXO missing H0 coordinates for proof input`)},l=e=>{if(e.isNewStyle)return`0`;if(e.randomization!==void 0)return e.randomization.toString();throw Error(`UTXO missing randomization for old-style proof input`)},u=Array.from({length:25},()=>`0`),d=e=>e.length>0&&e.every(e=>e.every(e=>BigInt(e.amount)===0n)),f=e=>({inCommitmentSiblings:e.map(e=>e.map(()=>[...u])),inCommitmentSiblingSides:e.map(e=>e.map(()=>[...u])),inNullifiers:e.map(e=>e.map(()=>`0`))}),p=e=>e.map(e=>e.map(e=>e.amount===0n?`0`:e.getCommitment())),m=(t,n,r=!1)=>{let i=[];for(let a=0;a<t.length;a+=1){let o=0n,s=0n;for(let e=0;e<t[a].length;e+=1)o+=t[a][e].amount;for(let e=0;e<n[a].length;e+=1)s+=n[a][e].amount;s-o<0?r?i.push(s-o):i.push(e.CIRCOM_P+(s-o)):i.push(s-o)}return i},h=e=>e.map(e=>e>=0n?0n:e),g=e=>{if(e.length===0)return[];let t=[[``]];for(let r=0;r<e.length;r+=1)r>0&&t.push([``]),e[r].forEach((e,i)=>{t[r][i]=`0x${Buffer.from(n.encryptUtxo(e)).toString(`hex`)}`});return t},_=e=>{let t={...e};return t.amountChanges=e.amountChanges.map(e=>e.toString()),t.calldataHash=e.calldataHash.toString(),t.rootHashAccessToken=e.rootHashAccessToken?.toString(),t.stealthAddressStructure.extraRandomization=e.stealthAddressStructure.extraRandomization.toString(),t.stealthAddressStructure.stealthAddress=e.stealthAddressStructure.stealthAddress.toString(),t.stealthAddressStructure.H0=e.stealthAddressStructure.H0.toString(),t.stealthAddressStructure.H1=e.stealthAddressStructure.H1.toString(),t.rootHashHinkal=e.rootHashHinkal?.toString(),t.externalActionId=e.externalActionId?.toString(),t.slippageValues=e.slippageValues.map(e=>e.toString()),t.hinkalLogicArgs.inHinkalAddress=e.hinkalLogicArgs.inHinkalAddress.toString(),t.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(e=>e.toString()),t.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(e=>({approvalChanges:e.approvalChanges.map(e=>e.toString()),externalApprovalAddresses:e.externalApprovalAddresses,conversionInHinkalAddress:e.conversionInHinkalAddress.map(e=>e.toString())})),t.feeStructure.flatFee=e.feeStructure.flatFee.toString(),t.feeStructure.variableRate=e.feeStructure.variableRate.toString(),t},v=(t,n,o,c,l,u,d,f,p,m,h,g)=>{let _=Object.values(d||r.defaultHookData),v=g??a.getOriginalSender(o??e.zeroAddress,n),y=s.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`address`,`address`,`uint256`,`bytes`],[t,n,o,typeof c==`bigint`?c:i.getExternalActionIdHash(c),l]),b=s.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(address, address, bytes, bytes)`,`bytes[][]`,`tuple(address, uint256, uint256)`,`int256[]`,`bool[]`,`tuple(uint8 v, bytes32 r, bytes32 s, uint256 accessKey, uint256 nonce, address ethereumAddress)`,`address`],[_,u,[m.feeToken,m.flatFee,m.variableRate],f,p,h,v]),x=BigInt(s.ethers.keccak256(y)),S=BigInt(s.ethers.keccak256(b)),C=s.ethers.AbiCoder.defaultAbiCoder().encode([`uint256`,`uint256`],[x,S]);return BigInt(s.ethers.keccak256(C))%e.CIRCOM_P},y=(e,t,n,r,i)=>e.startsWith(`mainEVMCircuitMin0`)?3:2+t.length+n.length+1+r.flat().length+i.flat().length+1+1+1+1+1+1,b=(e,n,r)=>{let{H0:i}=t.UserKeys.getRandomizedStealthPair(e,n),a=t.UserKeys.getH1FromH0(i,n),s=BigInt(t.UserKeys.getStealthAddressNewStyle(i,n,r));return{extraRandomization:o.addHighestBitToNumber(i[0]),H0:i[1],H1:a[1],stealthAddress:s}},x=(e,t)=>t.length===0?`mainEVMCircuitMin0`:`mainEVMCircuit${e.length}x${e[0].length}x${t[0].length}`;exports.buildOutCommitments=p,exports.buildZeroInputMerkleDataFromSerialized=f,exports.calcAmountChanges=m,exports.calcEncryptedOutputs=g,exports.calcPublicSignalCount=y,exports.calcStealthAddressStructure=b,exports.createCallDataHash=v,exports.getSlippageValues=h,exports.getUtxoCircuitH0Coords=c,exports.getUtxoCircuitInRandomization=l,exports.getZkProofVerifierName=x,exports.hasOnlyZeroAmounts=d,exports.serializeCircomData=_;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../../types/circom-data.types.cjs`),r=require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`),i=require(`../utils/external-action.utils.cjs`),a=require(`./getOriginalSender.cjs`),o=require(`../utils/bit.operations.cjs`);let s=require(`ethers`);var c=e=>{if(e.H0?.[0]!==void 0&&e.H0[1]!==void 0)return[e.H0[0],e.H0[1]];if(e.randomization!==void 0)return t.UserKeys.getH0FromRandomization(e.randomization);throw Error(`UTXO missing H0 coordinates for proof input`)},l=e=>{if(e.isNewStyle)return`0`;if(e.randomization!==void 0)return e.randomization.toString();throw Error(`UTXO missing randomization for old-style proof input`)},u=Array.from({length:25},()=>`0`),d=e=>e.length>0&&e.every(e=>e.every(e=>BigInt(e.amount)===0n)),f=e=>({inCommitmentSiblings:e.map(e=>e.map(()=>[...u])),inCommitmentSiblingSides:e.map(e=>e.map(()=>[...u])),inNullifiers:e.map(e=>e.map(()=>`0`))}),p=e=>e.map(e=>e.map(e=>e.amount===0n?`0`:e.getCommitment())),m=(t,n,r=!1)=>{let i=[];for(let a=0;a<t.length;a+=1){let o=0n,s=0n;for(let e=0;e<t[a].length;e+=1)o+=t[a][e].amount;for(let e=0;e<n[a].length;e+=1)s+=n[a][e].amount;s-o<0?r?i.push(s-o):i.push(e.CIRCOM_P+(s-o)):i.push(s-o)}return i},h=e=>e.map(e=>e>=0n?0n:e),g=e=>{if(e.length===0)return[];let t=[[``]];for(let n=0;n<e.length;n+=1)n>0&&t.push([``]),e[n].forEach((e,i)=>{t[n][i]=`0x${Buffer.from(r.encryptUtxo(e)).toString(`hex`)}`});return t},_=e=>{let t={...e};return t.amountChanges=e.amountChanges.map(e=>e.toString()),t.calldataHash=e.calldataHash.toString(),t.rootHashAccessToken=e.rootHashAccessToken?.toString(),t.stealthAddressStructure.extraRandomization=e.stealthAddressStructure.extraRandomization.toString(),t.stealthAddressStructure.stealthAddress=e.stealthAddressStructure.stealthAddress.toString(),t.stealthAddressStructure.H0=e.stealthAddressStructure.H0.toString(),t.stealthAddressStructure.H1=e.stealthAddressStructure.H1.toString(),t.rootHashHinkal=e.rootHashHinkal?.toString(),t.externalActionId=e.externalActionId?.toString(),t.slippageValues=e.slippageValues.map(e=>e.toString()),t.hinkalLogicArgs.inHinkalAddress=e.hinkalLogicArgs.inHinkalAddress.toString(),t.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(e=>e.toString()),t.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(e=>({approvalChanges:e.approvalChanges.map(e=>e.toString()),externalApprovalAddresses:e.externalApprovalAddresses,conversionInHinkalAddress:e.conversionInHinkalAddress.map(e=>e.toString())})),t.feeStructure.flatFee=e.feeStructure.flatFee.toString(),t.feeStructure.variableRate=e.feeStructure.variableRate.toString(),t},v=(t,r,o,c,l,u,d,f,p,m,h,g)=>{let _=Object.values(d||n.defaultHookData),v=g??a.getOriginalSender(o??e.zeroAddress,r),y=s.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`address`,`address`,`uint256`,`bytes`],[t,r,o,typeof c==`bigint`?c:i.getExternalActionIdHash(c),l]),b=s.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(address, address, bytes, bytes)`,`bytes[][]`,`tuple(address, uint256, uint256)`,`int256[]`,`bool[]`,`tuple(uint8 v, bytes32 r, bytes32 s, uint256 accessKey, uint256 nonce, address ethereumAddress)`,`address`],[_,u,[m.feeToken,m.flatFee,m.variableRate],f,p,h,v]),x=BigInt(s.ethers.keccak256(y)),S=BigInt(s.ethers.keccak256(b)),C=s.ethers.AbiCoder.defaultAbiCoder().encode([`uint256`,`uint256`],[x,S]);return BigInt(s.ethers.keccak256(C))%e.CIRCOM_P},y=(e,t,n,r,i)=>e.startsWith(`mainEVMCircuitMin0`)?3:2+t.length+n.length+1+r.flat().length+i.flat().length+1+1+1+1+1+1,b=(e,n,r)=>{let{H0:i}=t.UserKeys.getRandomizedStealthPair(e,n),a=t.UserKeys.getH1FromH0(i,n),s=BigInt(t.UserKeys.getStealthAddressNewStyle(i,n,r));return{extraRandomization:o.addHighestBitToNumber(i[0]),H0:i[1],H1:a[1],stealthAddress:s}},x=(e,t)=>t.length===0?`mainEVMCircuitMin0`:`mainEVMCircuit${e.length}x${e[0].length}x${t[0].length}`;exports.buildOutCommitments=p,exports.buildZeroInputMerkleDataFromSerialized=f,exports.calcAmountChanges=m,exports.calcEncryptedOutputs=g,exports.calcPublicSignalCount=y,exports.calcStealthAddressStructure=b,exports.createCallDataHash=v,exports.getSlippageValues=h,exports.getUtxoCircuitH0Coords=c,exports.getUtxoCircuitInRandomization=l,exports.getZkProofVerifierName=x,exports.hasOnlyZeroAmounts=d,exports.serializeCircomData=_;

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

@@ -1,7 +1,7 @@
 import { CIRCOM_P as e, zeroAddress as t } from "../../constants/protocol.constants.mjs";
 import { UserKeys as n } from "../../data-structures/crypto-keys/keys.mjs";
-import { encryptUtxo as r } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
-import { defaultHookData as i } from "../../types/circom-data.types.mjs";
+import { defaultHookData as r } from "../../types/circom-data.types.mjs";
+import { encryptUtxo as i } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
 import { getExternalActionIdHash as a } from "../utils/external-action.utils.mjs";
 import { getOriginalSender as o } from "./getOriginalSender.mjs";
 import { addHighestBitToNumber as s } from "../utils/bit.operations.mjs";
@@ -31,8 +31,8 @@ var l = (e) => {
 }, g = (e) => e.map((e) => e >= 0n ? 0n : e), _ = (e) => {
 	if (e.length === 0) return [];
 	let t = [[""]];
-	for (let n = 0; n < e.length; n += 1) n > 0 && t.push([""]), e[n].forEach((e, i) => {
-		t[n][i] = `0x${Buffer.from(r(e)).toString("hex")}`;
+	for (let n = 0; n < e.length; n += 1) n > 0 && t.push([""]), e[n].forEach((e, r) => {
+		t[n][r] = `0x${Buffer.from(i(e)).toString("hex")}`;
 	});
 	return t;
 }, v = (e) => {
@@ -42,8 +42,8 @@ var l = (e) => {
 		externalApprovalAddresses: e.externalApprovalAddresses,
 		conversionInHinkalAddress: e.conversionInHinkalAddress.map((e) => e.toString())
 	})), t.feeStructure.flatFee = e.feeStructure.flatFee.toString(), t.feeStructure.variableRate = e.feeStructure.variableRate.toString(), t;
-}, y = (n, r, s, l, u, d, f, p, m, h, g, _) => {
-	let v = Object.values(f || i), y = _ ?? o(s ?? t, r), b = c.AbiCoder.defaultAbiCoder().encode([
+}, y = (n, i, s, l, u, d, f, p, m, h, g, _) => {
+	let v = Object.values(f || r), y = _ ?? o(s ?? t, i), b = c.AbiCoder.defaultAbiCoder().encode([
 		"uint16",
 		"address",
 		"address",
@@ -51,7 +51,7 @@ var l = (e) => {
 		"bytes"
 	], [
 		n,
-		r,
+		i,
 		s,
 		typeof l == "bigint" ? l : a(l),
 		u

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

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

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

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

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

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