@hinkal/common 0.2.31 → 0.2.32

package/functions/private-wallet/emporium.helpers.mjs

@@ -1,51 +1,61 @@
 import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { chainIds as t, networkRegistry as n } from "../../constants/chains.constants.mjs";
-import { zeroAddress as r } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as i } from "../utils/caseInsensitive.utils.mjs";
-import { getContractAddress as a } from "../utils/getContractAddress.mjs";
+import { chainIds as t, getOnchainChainId as n, networkRegistry as r } from "../../constants/chains.constants.mjs";
+import { zeroAddress as i } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as a } from "../utils/caseInsensitive.utils.mjs";
 import { Logger as o } from "../../error-handling/logger.mjs";
-import { createCustomRpcProvider as s } from "../utils/create-provider.mjs";
+import { createJsonRpcProvider as s } from "../utils/create-provider.mjs";
 import { AccountActions as c } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { getContractAddress as l } from "../utils/getContractAddress.mjs";
 import "../utils/index.mjs";
-import { ethers as l } from "ethers";
+import { ethers as u } from "ethers";
 //#region libs/shared/common/src/functions/private-wallet/emporium.helpers.ts
-var u = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, value: o }) => {
-	let s = new Uint8Array(), c = r ? l.getBytesCopy(r) : new Uint8Array();
+var d = (e) => {
+	if (typeof e.target == "string") return e.target;
+	if (e.address) return e.address;
+	throw Error("Contract address not found");
+}, f = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, value: a }) => {
+	let o = new Uint8Array(), s = r ? u.getBytesCopy(r) : new Uint8Array();
 	if (typeof e == "object") {
-		if (s = l.getBytesCopy(a(e)), r?.length && r?.length > 0) throw Error("If function and args are providedm no calldata is needed");
-		t && n && !r && (c = l.getBytesCopy(e.interface.encodeFunctionData(t, n)));
-	} else s = l.getBytesCopy(e);
-	let u = l.getBytesCopy(new Uint8Array([+!!i])), d = l.zeroPadValue(l.toBeHex(o ?? 0n), 16), f = l.concat([
-		s,
-		u,
-		d,
-		c
+		if (o = u.getBytesCopy(d(e)), r?.length && r?.length > 0) throw Error("If function and args are providedm no calldata is needed");
+		t && n && !r && (s = u.getBytesCopy(e.interface.encodeFunctionData(t, n)));
+	} else o = u.getBytesCopy(e);
+	let c = u.getBytesCopy(new Uint8Array([+!!i])), l = u.zeroPadValue(u.toBeHex(a ?? 0n), 16), f = u.concat([
+		o,
+		c,
+		l,
+		s
 	]);
-	return l.hexlify(f);
-}, d = async (e, t, n, i, a, o) => {
-	let s = n ? await c.signTypedDataFromPrivateKey(e, n, {
+	return u.hexlify(f);
+}, p = async (e, t, r, a, o, s) => {
+	let l = n(e), d = r ? await c.signTypedDataFromPrivateKey(l, r, {
 		name: "Emporium",
 		version: "1.0.0",
-		chainId: e,
+		chainId: l,
 		verifyingContract: t
 	}, { EmporiumSignature: [{
 		name: "message",
 		type: "uint256"
-	}] }, { message: a }) : void 0, { v: u, r: d, s: f } = s ? l.Signature.from(s) : {
+	}, {
+		name: "ops",
+		type: "bytes[]"
+	}] }, {
+		message: o,
+		ops: a
+	}) : void 0, { v: f, r: p, s: m } = d ? u.Signature.from(d) : {
 		v: 0,
-		r: l.ZeroHash,
-		s: l.ZeroHash
+		r: u.ZeroHash,
+		s: u.ZeroHash
 	};
-	return l.AbiCoder.defaultAbiCoder().encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"], [{
-		v: u,
-		r: d,
-		s: f,
-		message: a ?? 0n,
-		signerAddress: o ?? r,
-		ops: i
+	return u.AbiCoder.defaultAbiCoder().encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"], [{
+		v: f,
+		r: p,
+		s: m,
+		message: o ?? 0n,
+		signerAddress: s ?? i,
+		ops: a
 	}]);
-}, f = (e) => {
-	let [t] = l.AbiCoder.defaultAbiCoder().decode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"], e), { v: n, r, s: i, message: a, signerAddress: o, ops: s } = t;
+}, m = (e) => {
+	let [t] = u.AbiCoder.defaultAbiCoder().decode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"], e), { v: n, r, s: i, message: a, signerAddress: o, ops: s } = t;
 	return {
 		v: n,
 		r,
@@ -54,7 +64,7 @@ var u = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, va
 		signerAddress: o,
 		ops: s
 	};
-}, p = (e, t, n, r) => u(e ? {
+}, h = (e, t, n, r) => f(e ? {
 	contract: e,
 	func: "transfer",
 	args: [t, n],
@@ -63,41 +73,41 @@ var u = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, va
 	contract: t,
 	value: n,
 	invokeWallet: r
-}), m = (t, n, o, s, c) => {
-	let l = t.getContractWithFetcher(n, e.HinkalContract);
-	return o.map((o, u) => p(i(o, r) ? void 0 : t.getContractWithFetcher(n, e.ERC20Contract, o), c ?? a(l), s[u], !0));
-}, h = (e, t, n, r) => u({
+}), g = (t, n, r, o, s) => {
+	let c = t.getContractWithFetcher(n, e.HinkalContract);
+	return r.map((r, u) => h(a(r, i) ? void 0 : t.getContractWithFetcher(n, e.ERC20Contract, r), s ?? l(c), o[u], !0));
+}, _ = (e, t, n, r) => f({
 	contract: e,
 	func: "approve",
 	args: [t, n],
 	invokeWallet: r
-}), g = (t, n, a, o, s, c, l, u) => {
+}), v = (t, n, r, o, s, c, l, u) => {
 	let d = [];
-	for (let s = 0; s < a.length; s += 1) {
-		let c = a[s], u = i(c, r) ? void 0 : t.getContractWithFetcher(n, e.ERC20Contract, c);
-		d.push(p(u, l, o[s], !1));
+	for (let s = 0; s < r.length; s += 1) {
+		let c = r[s], u = a(c, i) ? void 0 : t.getContractWithFetcher(n, e.ERC20Contract, c);
+		d.push(h(u, l, o[s], !1));
 	}
-	if (u) for (let a = 0; a < s.length; a += 1) {
-		let o = s[a];
-		if (!i(o, r)) {
-			let r = t.getContractWithFetcher(n, e.ERC20Contract, o);
-			d.push(h(r, u, c[a], !0));
+	if (u) for (let r = 0; r < s.length; r += 1) {
+		let o = s[r];
+		if (!a(o, i)) {
+			let i = t.getContractWithFetcher(n, e.ERC20Contract, o);
+			d.push(_(i, u, c[r], !0));
 		}
 	}
 	return d;
-}, _ = (e, t, n, a, o, s, c, l) => {
-	let d = [], f = [o], p = [s];
-	l.nativeFee > 0n && !i(o, r) && (f.push(r), p.push(l.nativeFee));
-	let m = g(e, t, f, p, [o], [c], n, a);
-	d.push(...m);
+}, y = (e, t, n, r, o, s, c, l) => {
+	let u = [], d = [o], p = [s];
+	l.nativeFee > 0n && !a(o, i) && (d.push(i), p.push(l.nativeFee));
+	let m = v(e, t, d, p, [o], [c], n, r);
+	u.push(...m);
 	let h = l.nativeFee;
-	return i(o, r) && (h += c), d.push(u({
-		contract: a,
+	return a(o, i) && (h += c), u.push(f({
+		contract: r,
 		callDataString: l.calldata,
 		value: h > 0n ? h : void 0,
 		invokeWallet: !0
-	})), d;
-}, v = "0xef0100", y = async (e, t) => {
+	})), u;
+}, b = "0xef0100", x = async (e, t) => {
 	try {
 		let n = s(e), r = await n.getCode(t);
 		if (r === "0x" || !r) return {
@@ -105,40 +115,40 @@ var u = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, va
 			implementation: void 0,
 			nonce: void 0
 		};
-		if (r.toLowerCase().startsWith(v) && r.length === 48) {
+		if (r.toLowerCase().startsWith(b) && r.length === 48) {
 			let e = `0x${r.slice(8)}`, i = await n.getTransactionCount(t);
 			return {
 				delegated: !0,
-				implementation: l.getAddress(e),
+				implementation: u.getAddress(e),
 				nonce: i
 			};
 		} else throw Error("checkEOAWithDelegation: It is a contract");
 	} catch (e) {
 		throw o.error("checkEOAWithDelegation error", { error: e }), e;
 	}
-}, b = (e) => {
-	let { hinkalWalletAddress: t } = n[e].contractData;
-	if (!t || i(t, r)) throw Error("Hinkal Wallet Address is not set");
+}, S = (e) => {
+	let { hinkalWalletAddress: t } = r[e].contractData;
+	if (!t || a(t, i)) throw Error("Hinkal Wallet Address is not set");
 	return t;
-}, x = async (e, n) => {
-	if (e === t.localhost || !n) return;
-	let { delegated: r, implementation: a } = await y(e, c.getSignerAddressFromPrivateKey(e, n)), o = b(e);
-	if (!r || !i(a, o)) {
-		let t = await c.authorizeDelegation(e, n, o);
+}, C = async (e, r) => {
+	if (e === t.localhost || !r) return;
+	let i = n(e), { delegated: o, implementation: s } = await x(e, c.getSignerAddressFromPrivateKey(e, r)), l = S(e);
+	if (!o || !a(s, l)) {
+		let e = await c.authorizeDelegation(i, r, l);
 		return {
-			v: t.signature.v.toString(),
-			r: t.signature.r,
-			s: t.signature.s,
-			nonce: t.nonce.toString(),
-			address: o,
-			chainId: String(e)
+			v: e.signature.v.toString(),
+			r: e.signature.r,
+			s: e.signature.s,
+			nonce: e.nonce.toString(),
+			address: l,
+			chainId: String(i)
 		};
 	}
-}, S = (e) => {
+}, w = (e) => {
 	if (!e) return;
 	let { v: t, r: n, s: r, nonce: i, chainId: a, address: o } = e;
 	return {
-		signature: l.Signature.from({
+		signature: u.Signature.from({
 			v: t,
 			r: n,
 			s: r
@@ -149,4 +159,4 @@ var u = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, va
 	};
 };
 //#endregion
-export { y as checkEOAWithDelegation, h as createApproveEmporiumOp, _ as createLifiBridgeOps, m as createTransaferEmporiumOpsBatch, p as createTransferToEmporiumOp, f as decodeEmporiumMetadata, u as emporiumOp, d as encodeEmporiumMetadata, g as generateFundAndApproveOps, x as getAuthorizationDataIfNeeded, S as recoverAuthorizationData };
+export { x as checkEOAWithDelegation, _ as createApproveEmporiumOp, y as createLifiBridgeOps, g as createTransaferEmporiumOpsBatch, h as createTransferToEmporiumOp, m as decodeEmporiumMetadata, f as emporiumOp, p as encodeEmporiumMetadata, v as generateFundAndApproveOps, C as getAuthorizationDataIfNeeded, w as recoverAuthorizationData };

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

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

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

@@ -5,9 +5,9 @@ import { caseInsensitiveEqual as i } from "../utils/caseInsensitive.utils.mjs";
 import { getERC20Registry as a } from "../../constants/token-data/ERC20Registry.mjs";
 import "../../constants/token-data/index.mjs";
 import { NATIVE_TOKEN_WRAPPER_ADDRESSES as o, SWAP_FEE_TAKER_ADDRESSES as s, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as c } from "../../constants/addresses.constants.mjs";
-import { getContractAddress as l } from "../utils/getContractAddress.mjs";
-import { Logger as u } from "../../error-handling/logger.mjs";
-import { replaceAllInstances as d } from "../utils/string.utils.mjs";
+import { Logger as l } from "../../error-handling/logger.mjs";
+import { replaceAllInstances as u } from "../utils/string.utils.mjs";
+import { getContractAddress as d } from "../utils/getContractAddress.mjs";
 import { createApproveEmporiumOp as f, emporiumOp as p } from "./emporium.helpers.mjs";
 import { getExternalSwapAddress as m } from "../pre-transaction/getExternalSwapAddress.mjs";
 import { ethers as h } from "ethers";
@@ -30,17 +30,17 @@ var g = (e, t, n, r, i, a, o = !1) => {
 	});
 }, _ = (e, t, n, r, i, a, o = !1) => p({
 	contract: n,
-	callDataString: d(r, m(e, t).slice(2), i.slice(2)),
+	callDataString: u(r, m(e, t).slice(2), i.slice(2)),
 	value: a,
 	invokeWallet: o
 }), v = (e, t) => {
 	let n = a(t).find((e) => e.symbol === "USDT");
 	return n ? i(e, n.erc20TokenAddress) : !1;
 }, y = async (e, t, n, r, i, a) => {
-	if (v(l(n), e)) try {
+	if (v(d(n), e)) try {
 		await n.allowance(r, i) > 0n && t.push(f(n, i, 0n, a));
 	} catch (e) {
-		u.error("Error in nullifyUsdtApprovalIfNeeded", e);
+		l.error("Error in nullifyUsdtApprovalIfNeeded", e);
 	}
 }, b = async (t, i, a, o, c, l, u, d) => {
 	if (a !== r) {

package/functions/snarkjs/common.snarkjs.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/circom-data.types.cjs`);require(`../../constants/conversion.constants.cjs`);const t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../utils/amounts.utils.cjs`),i=require(`../../data-structures/crypto-keys/keys.cjs`),a=require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`),o=require(`../utils/external-action.utils.cjs`),s=require(`./getOriginalSender.cjs`);let c=require(`ethers`);var l=(e,t)=>e.map((e,n)=>e.map(e=>t[n]?`0`:e.getNullifier())),u=e=>e.map(e=>e.map(e=>e.amount===0n?`0`:e.getCommitment())),d=(e,n,r=!1)=>{let i=[];for(let a=0;a<e.length;a+=1){let o=0n,s=0n;for(let t=0;t<e[a].length;t+=1)o+=e[a][t].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(t.CIRCOM_P+(s-o)):i.push(s-o)}return i},f=e=>e.useApprovalUtxoData.reduce((e,t)=>[...e,r.calculateBigIntSum(t.approvalChanges)],[]),p=(e,t)=>{let r=f(t),i=t.hinkalLogicAction;return e.map((e,t)=>i===n.HinkalLogicAction.NONE||i===n.HinkalLogicAction.APPROVE?e+r[t]>=0n?0n:e+r[t]:e>=0n?0n:e)},m=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,r)=>{t[n][r]=`0x${Buffer.from(a.encryptUtxo(e)).toString(`hex`)}`});return t},h=(e,t)=>{let n=[];for(let r=0;r<e.length;r+=1){n.push([]);for(let i=0;i<e[r].length;i+=1)n[r][i]=t.getSiblingHashesForVerification(BigInt(e[r][i].getCommitment())).map(e=>e.toString())}let r=[];for(let n=0;n<e.length;n+=1){r.push([]);for(let i=0;i<e[n].length;i+=1)r[n][i]=t.getSiblingSides(BigInt(e[n][i].getCommitment())).map(e=>e.toString())}return{inCommitmentSiblings:n,inCommitmentSiblingSides:r}},g=(e,t)=>({accessTokenSiblings:t.getSiblingHashesForVerification(BigInt(e)).map(e=>e.toString()),accessTokenSiblingSides:t.getSiblingSides(BigInt(e)).map(e=>e.toString())}),_=(e,t)=>g(e,t),v=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},y=e=>({...e,amountChanges:e.amountChanges.map(e=>BigInt(e)),calldataHash:BigInt(e.calldataHash),rootHashAccessToken:BigInt(e.rootHashAccessToken),rootHashHinkal:BigInt(e.rootHashHinkal),externalActionId:BigInt(e.externalActionId),stealthAddressStructure:{extraRandomization:BigInt(e.stealthAddressStructure.extraRandomization),stealthAddress:BigInt(e.stealthAddressStructure.stealthAddress),H0:BigInt(e.stealthAddressStructure.H0),H1:BigInt(e.stealthAddressStructure.H1)},feeStructure:{...e.feeStructure,flatFee:BigInt(e.feeStructure.flatFee),variableRate:BigInt(e.feeStructure.variableRate)},slippageValues:e.slippageValues.map(e=>BigInt(e)),hinkalLogicArgs:{...e.hinkalLogicArgs,executeApprovalChanges:e.hinkalLogicArgs.executeApprovalChanges.map(e=>BigInt(e)),inHinkalAddress:BigInt(e.hinkalLogicArgs.inHinkalAddress),useApprovalUtxoData:e.hinkalLogicArgs.useApprovalUtxoData.map(e=>({approvalChanges:e.approvalChanges.map(e=>BigInt(e)),externalApprovalAddresses:e.externalApprovalAddresses,conversionInHinkalAddress:e.conversionInHinkalAddress.map(e=>BigInt(e))}))}}),b=(n,r,i,a,l,u,d,f,p,m,h,g,_,v)=>{let y=Object.values(f||e.defaultHookData),b=v??s.getOriginalSender(i??t.zeroAddress,r),x=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`address`,`address`,`uint256`,`bytes`],[n,r,i,typeof a==`bigint`?a:o.getExternalActionIdHash(a),l]),S=c.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(address, address, bytes, bytes)`,`bytes[][]`,`tuple(address, uint256, uint256)`,`int256[]`,`bool[]`,`tuple(uint256, uint256,int256[],bool, tuple(int256[] approvalChanges, address[] externalApprovalAddresses, uint256[] conversionInHinkalAddress)[])`,`tuple(uint8 v, bytes32 r, bytes32 s, uint256 accessKey, uint256 nonce, address ethereumAddress)`,`address`],[y,u,[g.feeToken,g.flatFee,g.variableRate],p,m,[h.hinkalLogicAction,h.inHinkalAddress,h.executeApprovalChanges,h.doPreTxApproval,h.useApprovalUtxoData],_,b]),C=BigInt(c.ethers.keccak256(x)),w=BigInt(c.ethers.keccak256(S)),T=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint256`,`uint256`],[C,w]);return BigInt(c.ethers.keccak256(T))%t.CIRCOM_P},x=e=>e.startsWith(`swapperMO`)||e.startsWith(`swapperME`)?2:e.startsWith(`swapperMW`)?1:(e.startsWith(`swapperMHA`),0),S=(e,t,n,r,i,a)=>{if(e.startsWith(`swapperMWMin0`))return 4;let o=x(e);return 10+t.length+n.length+r.flat().length+i.flat().length+o+a+3*t.length},C=(e,t)=>{let{h0:n,h1:r}=i.UserKeys.getStealthAddressCompressedPoints(e,t);return{extraRandomization:e,H0:n,H1:r,stealthAddress:BigInt(i.UserKeys.getStealthAddress(e,t))}};exports.buildInNullifiers=l,exports.buildOutCommitments=u,exports.calcAccessTokenSiblingAndSidesFromAccessKey=g,exports.calcAccessTokenSiblingsAndSides=_,exports.calcAmountChanges=d,exports.calcCommitmentsSiblingAndSides=h,exports.calcEncryptedOutputs=m,exports.calcPublicSignalCount=S,exports.calcStealthAddressStructure=C,exports.createCallDataHash=b,exports.deserializeCircomData=y,exports.getSlippageValues=p,exports.serializeCircomData=v;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/circom-data.types.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../data-structures/crypto-keys/keys.cjs`),r=require(`../utils/bit.operations.cjs`),i=require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`),a=require(`../utils/external-action.utils.cjs`),o=require(`./getOriginalSender.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 n.UserKeys.getH0FromRandomization(e.randomization);throw Error(`UTXO missing H0 coordinates for proof input`)},l=e=>{if(e.randomization!==void 0)return e.randomization.toString();if(!e.isNewStyle)throw Error(`UTXO missing randomization for old-style proof input`);return`0`},u=(e,t)=>e.map((e,n)=>e.map(e=>t[n]?`0`:e.getNullifier())),d=e=>e.map(e=>e.map(e=>e.amount===0n?`0`:e.getCommitment())),f=(e,n,r=!1)=>{let i=[];for(let a=0;a<e.length;a+=1){let o=0n,s=0n;for(let t=0;t<e[a].length;t+=1)o+=e[a][t].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(t.CIRCOM_P+(s-o)):i.push(s-o)}return i},p=e=>e.map(e=>e>=0n?0n:e),m=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,r)=>{t[n][r]=`0x${Buffer.from(i.encryptUtxo(e)).toString(`hex`)}`});return t},h=(e,t)=>{let n=[];for(let r=0;r<e.length;r+=1){n.push([]);for(let i=0;i<e[r].length;i+=1)n[r][i]=t.getSiblingHashesForVerification(BigInt(e[r][i].getCommitment())).map(e=>e.toString())}let r=[];for(let n=0;n<e.length;n+=1){r.push([]);for(let i=0;i<e[n].length;i+=1)r[n][i]=t.getSiblingSides(BigInt(e[n][i].getCommitment())).map(e=>e.toString())}return{inCommitmentSiblings:n,inCommitmentSiblingSides:r}},g=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},_=e=>{let t={...e.hinkalLogicArgs,inHinkalAddress:BigInt(e.hinkalLogicArgs.inHinkalAddress),executeApprovalChanges:e.hinkalLogicArgs.executeApprovalChanges.map(e=>BigInt(e)),useApprovalUtxoData:e.hinkalLogicArgs.useApprovalUtxoData.map(e=>({...e,approvalChanges:e.approvalChanges.map(e=>BigInt(e)),conversionInHinkalAddress:e.conversionInHinkalAddress.map(e=>BigInt(e))}))};return{...e,amountChanges:e.amountChanges.map(e=>BigInt(e)),calldataHash:BigInt(e.calldataHash),rootHashAccessToken:BigInt(e.rootHashAccessToken),rootHashHinkal:BigInt(e.rootHashHinkal),externalActionId:BigInt(e.externalActionId),stealthAddressStructure:{extraRandomization:BigInt(e.stealthAddressStructure.extraRandomization),stealthAddress:BigInt(e.stealthAddressStructure.stealthAddress),H0:BigInt(e.stealthAddressStructure.H0),H1:BigInt(e.stealthAddressStructure.H1)},feeStructure:{...e.feeStructure,flatFee:BigInt(e.feeStructure.flatFee),variableRate:BigInt(e.feeStructure.variableRate)},slippageValues:e.slippageValues.map(e=>BigInt(e)),hinkalLogicArgs:t}},v=(n,r,i,c,l,u,d,f,p,m,h,g)=>{let _=Object.values(d||e.defaultHookData),v=g??o.getOriginalSender(i??t.zeroAddress,r),y=s.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`address`,`address`,`uint256`,`bytes`],[n,r,i,typeof c==`bigint`?c:a.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))%t.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,t,i)=>{let{H0:a}=n.UserKeys.getRandomizedStealthPair(e,t),o=n.UserKeys.getH1FromH0(a,t),s=BigInt(n.UserKeys.getStealthAddressNewStyle(a,t,i));return{extraRandomization:r.addHighestBitToNumber(a[0]),H0:a[1],H1:o[1],stealthAddress:s}},x=(e,t)=>t.length===0?`mainEVMCircuitMin0`:`mainEVMCircuit${e.length}x${e[0].length}x${t[0].length}`;exports.buildInNullifiers=u,exports.buildOutCommitments=d,exports.calcAmountChanges=f,exports.calcCommitmentsSiblingAndSides=h,exports.calcEncryptedOutputs=m,exports.calcPublicSignalCount=y,exports.calcStealthAddressStructure=b,exports.createCallDataHash=v,exports.deserializeCircomData=_,exports.getSlippageValues=p,exports.getUtxoCircuitH0Coords=c,exports.getUtxoCircuitInRandomization=l,exports.getZkProofVerifierName=x,exports.serializeCircomData=g;

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

@@ -2,27 +2,22 @@ import { Utxo } from '../../data-structures/utxo/Utxo';
 import { MerkleTree } from '../../data-structures/merkle-tree';
 import { CircomDataJsonType, CircomDataType, HookDataType, StealthAddressStructure } from '../../types/circom-data.types';
 import { ExternalActionId } from '../../types/external-action.types';
-import { FeeStructure, HinkalLogicArgs } from '../../types/hinkal.types';
+import { FeeStructure } from '../../types/hinkal.types';
 import { SignatureData } from '../../types/crypto.types';
+export declare const getUtxoCircuitH0Coords: (utxo: Utxo) => [bigint, bigint];
+export declare const getUtxoCircuitInRandomization: (utxo: Utxo) => string;
 export declare const buildInNullifiers: (inputUtxos: Utxo[][], onChainCreation: boolean[]) => string[][];
 export declare const buildOutCommitments: (outputUtxos: Utxo[][]) => string[][];
 export declare const calcAmountChanges: (inputUtxos: Utxo[][], outputUtxos: Utxo[][], forCircomData?: boolean) => bigint[];
-export declare const getSlippageValues: (amountChanges: bigint[], hinkalLogicArgs: HinkalLogicArgs) => bigint[];
+export declare const getSlippageValues: (amountChanges: bigint[]) => bigint[];
 export declare const calcEncryptedOutputs: (outputUtxos: Utxo[][]) => string[][];
 export declare const calcCommitmentsSiblingAndSides: (inputUtxos: Utxo[][], merkleTree: MerkleTree<bigint>) => {
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];
 };
-export declare const calcAccessTokenSiblingAndSidesFromAccessKey: (accessKey: string, merkleTreeAccessToken: MerkleTree<bigint>) => {
-    accessTokenSiblings: string[];
-    accessTokenSiblingSides: string[];
-};
-export declare const calcAccessTokenSiblingsAndSides: (accessKey: string, merkleTreeAccessToken: MerkleTree<bigint>) => {
-    accessTokenSiblings: string[];
-    accessTokenSiblingSides: string[];
-};
 export declare const serializeCircomData: (circomData: CircomDataType) => CircomDataJsonType;
 export declare const deserializeCircomData: (circomData: CircomDataJsonType) => CircomDataType;
-export declare const createCallDataHash: (publicSignalCount: number, relay: string, externalAddress: string | undefined, externalActionId: bigint | ExternalActionId, externalActionMetadata: string, encryptedOutputs: string[][], flatFees: bigint[], hookData: HookDataType | undefined, slippageValues: bigint[], onChainCreation: boolean[], hinkalLogicArgs: HinkalLogicArgs, feeStructure: FeeStructure, signatureData: SignatureData, _originalSender?: string) => bigint;
-export declare const calcPublicSignalCount: (verifierName: string, erc20TokenAddresses: string[], amountChanges: bigint[], inNullifiers: string[][], outCommitments: string[][], tokenIdsPositive: number) => number;
-export declare const calcStealthAddressStructure: (extraRandomization: bigint, privateKey: string) => StealthAddressStructure;
+export declare const createCallDataHash: (publicSignalCount: number, relay: string, externalAddress: string | undefined, externalActionId: bigint | ExternalActionId, externalActionMetadata: string, encryptedOutputs: string[][], hookData: HookDataType | undefined, slippageValues: bigint[], onChainCreation: boolean[], feeStructure: FeeStructure, signatureData: SignatureData, _originalSender?: string) => bigint;
+export declare const calcPublicSignalCount: (verifierName: string, erc20TokenAddresses: string[], amountChanges: bigint[], inNullifiers: string[][], outCommitments: string[][]) => number;
+export declare const calcStealthAddressStructure: (extraRandomization: bigint, nullifyingPrivateKey: string, spendingPublicKey: bigint[]) => StealthAddressStructure;
+export declare const getZkProofVerifierName: (inputUtxos: Utxo[][], outputUtxos: Utxo[][]) => string;

package/functions/snarkjs/common.snarkjs.mjs

@@ -1,15 +1,21 @@
 import { defaultHookData as e } from "../../types/circom-data.types.mjs";
-import "../../constants/conversion.constants.mjs";
 import { CIRCOM_P as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
-import { HinkalLogicAction as r } from "../../types/hinkal.types.mjs";
-import { calculateBigIntSum as i } from "../utils/amounts.utils.mjs";
-import { UserKeys as a } from "../../data-structures/crypto-keys/keys.mjs";
-import { encryptUtxo as o } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
-import { getExternalActionIdHash as s } from "../utils/external-action.utils.mjs";
-import { getOriginalSender as c } from "./getOriginalSender.mjs";
-import { ethers as l } from "ethers";
+import { UserKeys as r } from "../../data-structures/crypto-keys/keys.mjs";
+import { addHighestBitToNumber as i } from "../utils/bit.operations.mjs";
+import { encryptUtxo as a } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
+import { getExternalActionIdHash as o } from "../utils/external-action.utils.mjs";
+import { getOriginalSender as s } from "./getOriginalSender.mjs";
+import { ethers as c } from "ethers";
 //#region libs/shared/common/src/functions/snarkjs/common.snarkjs.ts
-var u = (e, t) => e.map((e, n) => e.map((e) => t[n] ? "0" : e.getNullifier())), d = (e) => e.map((e) => e.map((e) => e.amount === 0n ? "0" : e.getCommitment())), f = (e, n, r = !1) => {
+var l = (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 r.getH0FromRandomization(e.randomization);
+	throw Error("UTXO missing H0 coordinates for proof input");
+}, u = (e) => {
+	if (e.randomization !== void 0) return e.randomization.toString();
+	if (!e.isNewStyle) throw Error("UTXO missing randomization for old-style proof input");
+	return "0";
+}, d = (e, t) => e.map((e, n) => e.map((e) => t[n] ? "0" : e.getNullifier())), f = (e) => e.map((e) => e.map((e) => e.amount === 0n ? "0" : e.getCommitment())), p = (e, n, r = !1) => {
 	let i = [];
 	for (let a = 0; a < e.length; a += 1) {
 		let o = 0n, s = 0n;
@@ -18,14 +24,11 @@ var u = (e, t) => e.map((e, n) => e.map((e) => t[n] ? "0" : e.getNullifier())),
 		s - o < 0 ? r ? i.push(s - o) : i.push(t + (s - o)) : i.push(s - o);
 	}
 	return i;
-}, p = (e) => e.useApprovalUtxoData.reduce((e, t) => [...e, i(t.approvalChanges)], []), m = (e, t) => {
-	let n = p(t), i = t.hinkalLogicAction;
-	return e.map((e, t) => i === r.NONE || i === r.APPROVE ? e + n[t] >= 0n ? 0n : e + n[t] : e >= 0n ? 0n : e);
-}, h = (e) => {
+}, m = (e) => e.map((e) => e >= 0n ? 0n : e), h = (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, r) => {
-		t[n][r] = `0x${Buffer.from(o(e)).toString("hex")}`;
+		t[n][r] = `0x${Buffer.from(a(e)).toString("hex")}`;
 	});
 	return t;
 }, g = (e, t) => {
@@ -43,47 +46,47 @@ var u = (e, t) => e.map((e, n) => e.map((e) => t[n] ? "0" : e.getNullifier())),
 		inCommitmentSiblings: n,
 		inCommitmentSiblingSides: r
 	};
-}, _ = (e, t) => ({
-	accessTokenSiblings: t.getSiblingHashesForVerification(BigInt(e)).map((e) => e.toString()),
-	accessTokenSiblingSides: t.getSiblingSides(BigInt(e)).map((e) => e.toString())
-}), v = (e, t) => _(e, t), y = (e) => {
+}, _ = (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;
-}, b = (e) => ({
-	...e,
-	amountChanges: e.amountChanges.map((e) => BigInt(e)),
-	calldataHash: BigInt(e.calldataHash),
-	rootHashAccessToken: BigInt(e.rootHashAccessToken),
-	rootHashHinkal: BigInt(e.rootHashHinkal),
-	externalActionId: BigInt(e.externalActionId),
-	stealthAddressStructure: {
-		extraRandomization: BigInt(e.stealthAddressStructure.extraRandomization),
-		stealthAddress: BigInt(e.stealthAddressStructure.stealthAddress),
-		H0: BigInt(e.stealthAddressStructure.H0),
-		H1: BigInt(e.stealthAddressStructure.H1)
-	},
-	feeStructure: {
-		...e.feeStructure,
-		flatFee: BigInt(e.feeStructure.flatFee),
-		variableRate: BigInt(e.feeStructure.variableRate)
-	},
-	slippageValues: e.slippageValues.map((e) => BigInt(e)),
-	hinkalLogicArgs: {
+}, v = (e) => {
+	let t = {
 		...e.hinkalLogicArgs,
-		executeApprovalChanges: e.hinkalLogicArgs.executeApprovalChanges.map((e) => BigInt(e)),
 		inHinkalAddress: BigInt(e.hinkalLogicArgs.inHinkalAddress),
+		executeApprovalChanges: e.hinkalLogicArgs.executeApprovalChanges.map((e) => BigInt(e)),
 		useApprovalUtxoData: e.hinkalLogicArgs.useApprovalUtxoData.map((e) => ({
+			...e,
 			approvalChanges: e.approvalChanges.map((e) => BigInt(e)),
-			externalApprovalAddresses: e.externalApprovalAddresses,
 			conversionInHinkalAddress: e.conversionInHinkalAddress.map((e) => BigInt(e))
 		}))
-	}
-}), x = (r, i, a, o, u, d, f, p, m, h, g, _, v, y) => {
-	let b = Object.values(p || e), x = y ?? c(a ?? n, i), S = l.AbiCoder.defaultAbiCoder().encode([
+	};
+	return {
+		...e,
+		amountChanges: e.amountChanges.map((e) => BigInt(e)),
+		calldataHash: BigInt(e.calldataHash),
+		rootHashAccessToken: BigInt(e.rootHashAccessToken),
+		rootHashHinkal: BigInt(e.rootHashHinkal),
+		externalActionId: BigInt(e.externalActionId),
+		stealthAddressStructure: {
+			extraRandomization: BigInt(e.stealthAddressStructure.extraRandomization),
+			stealthAddress: BigInt(e.stealthAddressStructure.stealthAddress),
+			H0: BigInt(e.stealthAddressStructure.H0),
+			H1: BigInt(e.stealthAddressStructure.H1)
+		},
+		feeStructure: {
+			...e.feeStructure,
+			flatFee: BigInt(e.feeStructure.flatFee),
+			variableRate: BigInt(e.feeStructure.variableRate)
+		},
+		slippageValues: e.slippageValues.map((e) => BigInt(e)),
+		hinkalLogicArgs: t
+	};
+}, y = (r, i, a, l, u, d, f, p, m, h, g, _) => {
+	let v = Object.values(f || e), y = _ ?? s(a ?? n, i), b = c.AbiCoder.defaultAbiCoder().encode([
 		"uint16",
 		"address",
 		"address",
@@ -93,50 +96,38 @@ var u = (e, t) => e.map((e, n) => e.map((e) => t[n] ? "0" : e.getNullifier())),
 		r,
 		i,
 		a,
-		typeof o == "bigint" ? o : s(o),
+		typeof l == "bigint" ? l : o(l),
 		u
-	]), C = l.AbiCoder.defaultAbiCoder().encode([
+	]), x = c.AbiCoder.defaultAbiCoder().encode([
 		"tuple(address, address, bytes, bytes)",
 		"bytes[][]",
 		"tuple(address, uint256, uint256)",
 		"int256[]",
 		"bool[]",
-		"tuple(uint256, uint256,int256[],bool, tuple(int256[] approvalChanges, address[] externalApprovalAddresses, uint256[] conversionInHinkalAddress)[])",
 		"tuple(uint8 v, bytes32 r, bytes32 s, uint256 accessKey, uint256 nonce, address ethereumAddress)",
 		"address"
 	], [
-		b,
+		v,
 		d,
 		[
-			_.feeToken,
-			_.flatFee,
-			_.variableRate
+			h.feeToken,
+			h.flatFee,
+			h.variableRate
 		],
+		p,
 		m,
-		h,
-		[
-			g.hinkalLogicAction,
-			g.inHinkalAddress,
-			g.executeApprovalChanges,
-			g.doPreTxApproval,
-			g.useApprovalUtxoData
-		],
-		v,
-		x
-	]), w = BigInt(l.keccak256(S)), T = BigInt(l.keccak256(C)), E = l.AbiCoder.defaultAbiCoder().encode(["uint256", "uint256"], [w, T]);
-	return BigInt(l.keccak256(E)) % t;
-}, S = (e) => e.startsWith("swapperMO") || e.startsWith("swapperME") ? 2 : e.startsWith("swapperMW") ? 1 : (e.startsWith("swapperMHA"), 0), C = (e, t, n, r, i, a) => {
-	if (e.startsWith("swapperMWMin0")) return 4;
-	let o = S(e);
-	return 10 + t.length + n.length + r.flat().length + i.flat().length + o + a + 3 * t.length;
-}, w = (e, t) => {
-	let { h0: n, h1: r } = a.getStealthAddressCompressedPoints(e, t);
+		g,
+		y
+	]), S = BigInt(c.keccak256(b)), C = BigInt(c.keccak256(x)), w = c.AbiCoder.defaultAbiCoder().encode(["uint256", "uint256"], [S, C]);
+	return BigInt(c.keccak256(w)) % t;
+}, b = (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, x = (e, t, n) => {
+	let { H0: a } = r.getRandomizedStealthPair(e, t), o = r.getH1FromH0(a, t), s = BigInt(r.getStealthAddressNewStyle(a, t, n));
 	return {
-		extraRandomization: e,
-		H0: n,
-		H1: r,
-		stealthAddress: BigInt(a.getStealthAddress(e, t))
+		extraRandomization: i(a[0]),
+		H0: a[1],
+		H1: o[1],
+		stealthAddress: s
 	};
-};
+}, S = (e, t) => t.length === 0 ? "mainEVMCircuitMin0" : `mainEVMCircuit${e.length}x${e[0].length}x${t[0].length}`;
 //#endregion
-export { u as buildInNullifiers, d as buildOutCommitments, _ as calcAccessTokenSiblingAndSidesFromAccessKey, v as calcAccessTokenSiblingsAndSides, f as calcAmountChanges, g as calcCommitmentsSiblingAndSides, h as calcEncryptedOutputs, C as calcPublicSignalCount, w as calcStealthAddressStructure, x as createCallDataHash, b as deserializeCircomData, m as getSlippageValues, y as serializeCircomData };
+export { d as buildInNullifiers, f as buildOutCommitments, p as calcAmountChanges, g as calcCommitmentsSiblingAndSides, h as calcEncryptedOutputs, b as calcPublicSignalCount, x as calcStealthAddressStructure, y as createCallDataHash, v as deserializeCircomData, m as getSlippageValues, l as getUtxoCircuitH0Coords, u as getUtxoCircuitInRandomization, S as getZkProofVerifierName, _ as serializeCircomData };