@gurge/sdk 0.3.142 → 0.3.151

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

@@ -1,60 +1,104 @@
 import { chainIds as e, getOnchainChainId 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 { ContractType as a } from "../../types/ethereum-network.types.mjs";
-import { Logger as o } from "../../error-handling/logger.mjs";
+import { Logger as a } from "../../error-handling/logger.mjs";
+import { ContractType as o } from "../../types/ethereum-network.types.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 u } from "ethers";
+import { getContractWithFetcherByChainId as l } from "../web3/getContractMetadata.mjs";
+import { getContractAddress as u } from "../utils/getContractAddress.mjs";
+import { ethers as d } from "ethers";
 //#region libs/shared/common/src/functions/private-wallet/emporium.helpers.ts
-var d = (e) => {
+var f = (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();
+}, p = "tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)", m = `tuple(uint8 v, bytes32 r, bytes32 s, address signerAddress, ${p}[] ops, uint256 maxFee, uint256 deadline)`, h = 1200, g = (e) => {
+	let [t] = d.AbiCoder.defaultAbiCoder().decode([p], e);
+	return {
+		endpoint: t.endpoint,
+		invokeWallet: t.invokeWallet,
+		value: BigInt(t.value),
+		callData: t.callData
+	};
+}, _ = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, value: a }) => {
+	let o, s = r ?? "0x";
 	if (typeof e == "object") {
-		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 u.hexlify(f);
-}, p = async (e, n, i, a, o, s) => {
-	let l = t(e), d = i ? await c.signTypedDataFromPrivateKey(l, i, {
-		name: "Emporium",
-		version: "1.0.0",
-		chainId: l,
-		verifyingContract: n
-	}, { EmporiumSignature: [{
-		name: "message",
-		type: "uint256"
-	}, {
-		name: "ops",
-		type: "bytes[]"
-	}] }, {
-		message: o,
-		ops: a
-	}) : void 0, { v: f, r: p, s: m } = d ? u.Signature.from(d) : {
+		if (o = f(e), r?.length && r?.length > 0) throw Error("If function and args are providedm no calldata is needed");
+		t && n && !r && (s = e.interface.encodeFunctionData(t, n));
+	} else o = e;
+	return d.AbiCoder.defaultAbiCoder().encode([p], [{
+		endpoint: o,
+		invokeWallet: !!i,
+		value: a ?? 0n,
+		callData: s
+	}]);
+}, v = async (e, n, i, a, o, s, l) => {
+	let u = t(e), f = a.map(g), p = 0n, _ = i && s ? await (async () => {
+		if (l === void 0) throw Error("maxFee required if making tx from emporium");
+		return p = BigInt(Math.floor(Date.now() / 1e3) + h), c.signTypedDataFromPrivateKey(u, i, {
+			name: "Emporium",
+			version: "1.0.0",
+			chainId: u,
+			verifyingContract: n
+		}, {
+			EmporiumSignature: [
+				{
+					name: "message",
+					type: "uint256"
+				},
+				{
+					name: "ops",
+					type: "EmporiumOperation[]"
+				},
+				{
+					name: "maxFee",
+					type: "uint256"
+				},
+				{
+					name: "deadline",
+					type: "uint256"
+				}
+			],
+			EmporiumOperation: [
+				{
+					name: "endpoint",
+					type: "address"
+				},
+				{
+					name: "invokeWallet",
+					type: "bool"
+				},
+				{
+					name: "value",
+					type: "uint128"
+				},
+				{
+					name: "callData",
+					type: "bytes"
+				}
+			]
+		}, {
+			message: o,
+			ops: f,
+			maxFee: l,
+			deadline: p
+		});
+	})() : void 0, { v, r: y, s: b } = _ ? d.Signature.from(_) : {
 		v: 0,
-		r: u.ZeroHash,
-		s: u.ZeroHash
+		r: d.ZeroHash,
+		s: d.ZeroHash
 	};
-	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,
+	return d.AbiCoder.defaultAbiCoder().encode([m], [{
+		v,
+		r: y,
+		s: b,
 		signerAddress: s ?? r,
-		ops: a
+		ops: f,
+		maxFee: l ?? 0n,
+		deadline: p
 	}]);
-}, m = (e, t, n, r) => f(e ? {
+}, y = (e, t, n, r) => _(e ? {
 	contract: e,
 	func: "transfer",
 	args: [t, n],
@@ -63,41 +107,41 @@ var d = (e) => {
 	contract: t,
 	value: n,
 	invokeWallet: r
-}), h = (e, t, n, o, s) => {
-	let c = e.getContractWithFetcher(t, a.HinkalContract);
-	return n.map((n, u) => m(i(n, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, n), s ?? l(c), o[u], !0));
-}, g = (e, t, n, r) => f({
+}), b = (e, t, n, a, s) => {
+	let c = e.getContractWithFetcherByChainId(t, o.HinkalContract);
+	return n.map((n, l) => y(i(n, r) ? void 0 : e.getContractWithFetcherByChainId(t, o.ERC20Contract, n), s ?? u(c), a[l], !0));
+}, x = (e, t, n, r) => _({
 	contract: e,
 	func: "approve",
 	args: [t, n],
 	invokeWallet: r
-}), _ = (e, t, n, o, s, c, l, u) => {
+}), S = (e, t, n, a, s, c, u) => {
 	let d = [];
-	for (let s = 0; s < n.length; s += 1) {
-		let c = n[s], u = i(c, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, c);
-		d.push(m(u, l, o[s], !1));
+	for (let a = 0; a < t.length; a += 1) {
+		let s = t[a], u = i(s, r) ? void 0 : l(e, o.ERC20Contract, s);
+		d.push(y(u, c, n[a], !1));
 	}
-	if (u) for (let n = 0; n < s.length; n += 1) {
-		let o = s[n];
-		if (!i(o, r)) {
-			let r = e.getContractWithFetcher(t, a.ERC20Contract, o);
-			d.push(g(r, u, c[n], !0));
+	if (u) for (let t = 0; t < a.length; t += 1) {
+		let n = a[t];
+		if (!i(n, r)) {
+			let r = l(e, o.ERC20Contract, n);
+			d.push(x(r, u, s[t], !0));
 		}
 	}
 	return d;
-}, v = (e, t, n, a, o, s, c, l) => {
-	let u = [], d = [o], p = [s];
-	l.nativeFee > 0n && !i(o, r) && (d.push(r), p.push(l.nativeFee));
-	let m = _(e, t, d, p, [o], [c], n, a);
-	u.push(...m);
-	let h = l.nativeFee;
-	return i(o, r) && (h += c), u.push(f({
+}, C = (e, t, n, a, o, s, c, l) => {
+	let u = [], d = [o], f = [s];
+	l.nativeFee > 0n && !i(o, r) && (d.push(r), f.push(l.nativeFee));
+	let p = S(t, d, f, [o], [c], n, a);
+	u.push(...p);
+	let m = l.nativeFee;
+	return i(o, r) && (m += c), u.push(_({
 		contract: a,
 		callDataString: l.calldata,
-		value: h > 0n ? h : void 0,
+		value: m > 0n ? m : void 0,
 		invokeWallet: !0
 	})), u;
-}, y = "0xef0100", b = async (e, t) => {
+}, w = "0xef0100", T = async (e, t) => {
 	try {
 		let n = s(e), r = await n.getCode(t);
 		if (r === "0x" || !r) return {
@@ -105,24 +149,24 @@ var d = (e) => {
 			implementation: void 0,
 			nonce: void 0
 		};
-		if (r.toLowerCase().startsWith(y) && r.length === 48) {
+		if (r.toLowerCase().startsWith(w) && r.length === 48) {
 			let e = `0x${r.slice(8)}`, i = await n.getTransactionCount(t);
 			return {
 				delegated: !0,
-				implementation: u.getAddress(e),
+				implementation: d.getAddress(e),
 				nonce: i
 			};
 		} else throw Error("checkEOAWithDelegation: It is a contract");
 	} catch (e) {
-		throw o.error("checkEOAWithDelegation error", { error: e }), e;
+		throw a.error("checkEOAWithDelegation error", { error: e }), e;
 	}
-}, x = (e) => {
+}, E = (e) => {
 	let { hinkalWalletAddress: t } = n[e].contractData;
 	if (!t || i(t, r)) throw Error("Hinkal Wallet Address is not set");
 	return t;
-}, S = async (n, r) => {
+}, D = async (n, r) => {
 	if (n === e.localhost || !r) return;
-	let a = t(n), { delegated: o, implementation: s } = await b(n, c.getSignerAddressFromPrivateKey(n, r)), l = x(n);
+	let a = t(n), { delegated: o, implementation: s } = await T(n, c.getSignerAddressFromPrivateKey(n, r)), l = E(n);
 	if (!o || !i(s, l)) {
 		let e = await c.authorizeDelegation(a, r, l);
 		return {
@@ -136,4 +180,4 @@ var d = (e) => {
 	}
 };
 //#endregion
-export { b as checkEOAWithDelegation, g as createApproveEmporiumOp, v as createLifiBridgeOps, h as createTransaferEmporiumOpsBatch, m as createTransferToEmporiumOp, f as emporiumOp, p as encodeEmporiumMetadata, _ as generateFundAndApproveOps, S as getAuthorizationDataIfNeeded };
+export { T as checkEOAWithDelegation, x as createApproveEmporiumOp, C as createLifiBridgeOps, b as createTransaferEmporiumOpsBatch, y as createTransferToEmporiumOp, _ as emporiumOp, v as encodeEmporiumMetadata, S as generateFundAndApproveOps, D as getAuthorizationDataIfNeeded };

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/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=_;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../utils/string.utils.cjs`),o=require(`../utils/erc20tokenFunctions.cjs`),s=require(`../pre-transaction/getExternalSwapAddress.cjs`),c=require(`../utils/getContractAddress.cjs`),l=require(`./emporium.helpers.cjs`),u=require(`../../constants/addresses.constants.cjs`);let d=require(`ethers`);var f=(e,t,n,r,i,o,c=!1)=>l.emporiumOp({contract:n,callDataString:a.replaceAllInstances(r,s.getExternalSwapAddress(e,t).slice(2),i.slice(2)),value:o,invokeWallet:c}),p=async(e,n)=>{let r=(await o.getErc20TokensForChainAPI(n)).find(e=>e.symbol===`USDT`);return r?t.caseInsensitiveEqual(e,r.erc20TokenAddress):!1},m=async(e,t,r,i,a,o)=>{if(await p(c.getContractAddress(r),e))try{await r.allowance(i,a)>0n&&t.push(l.createApproveEmporiumOp(r,a,0n,o))}catch(e){n.Logger.error(`Error in nullifyUsdtApprovalIfNeeded`,e)}},h=async(t,n,i,a,o,s,c,f)=>{if(i!==e.zeroAddress){let f=u.SWAP_FEE_TAKER_ADDRESSES[n],p=t.getContractWithFetcher(n,r.ContractType.ERC20Contract,i),h=await p.balanceOf(a);await m(n,s,p,a,f,c),s.push(l.createApproveEmporiumOp(p,f,2n**256n-1n,c));let g=new d.ethers.Contract(f,[`function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable`]),_=o;s.push(l.emporiumOp({contract:g,func:`takeSwapFee`,args:[i,h,e.HINKAL_SWAP_VARIABLE_RATE,_],invokeWallet:c}))}else{let t=o;s.push(l.emporiumOp({contract:t,value:f*e.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:c}))}},g=async(t,n,a,o,s,c,u,d,p,m,g,_,v=!1)=>{if(a!==i.ExternalActionId.Lifi)throw Error(`Unsupported swap external action for emporium ops: ${a}`);let y=u<0n?-1n*u:u,b=[];if(c!==e.zeroAddress){let e=t.getContractWithFetcher(n,r.ContractType.ERC20Contract,c);b.push(l.createApproveEmporiumOp(e,o,y,v))}let x=0n;c===e.zeroAddress&&(x+=y),d&&p===e.zeroAddress&&d<0n&&(x+=-1n*d);let S=x>0n?x:void 0;return b.push(f(n,a,o,s,g,S,v)),m&&p&&d!==void 0&&await h(t,n,p,g,_,b,v,d),b};exports.createSwapToEmporiumOps=g;

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

@@ -0,0 +1,3 @@
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
+import { ExternalActionId } from '../../types/external-action.types';
+export declare const createSwapToEmporiumOps: (hinkal: IHinkal, chainId: number, externalActionId: ExternalActionId, routerAddress: string, data: string, inputTokenAddress: string, inputAmount: bigint, outputAmount: bigint | undefined, outputTokenAddress: string | undefined, isTheSameChainSwap: boolean, walletAddress: string, relay: string, invokeWallet?: boolean) => Promise<string[]>;

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

@@ -1,107 +1,65 @@
 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 { 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 { Logger as r } from "../../error-handling/logger.mjs";
+import { ContractType as i } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
 import { replaceAllInstances as o } from "../utils/string.utils.mjs";
 import { getErc20TokensForChainAPI as s } from "../utils/erc20tokenFunctions.mjs";
-import { NATIVE_TOKEN_WRAPPER_ADDRESSES as c, SWAP_FEE_TAKER_ADDRESSES as l, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as u } from "../../constants/addresses.constants.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";
+import { getExternalSwapAddress as c } from "../pre-transaction/getExternalSwapAddress.mjs";
+import { getContractAddress as l } from "../utils/getContractAddress.mjs";
+import { createApproveEmporiumOp as u, emporiumOp as d } from "./emporium.helpers.mjs";
+import { SWAP_FEE_TAKER_ADDRESSES as f } from "../../constants/addresses.constants.mjs";
+import { ethers as p } from "ethers";
 //#region libs/shared/common/src/functions/private-wallet/emporium.swap.helpers.ts
-var g = (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 p({
-		contract: new h.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
-	});
-}, _ = (e, t, n, r, i, a, s = !1) => p({
+var m = (e, t, n, r, i, a, s = !1) => d({
 	contract: n,
-	callDataString: o(r, m(e, t).slice(2), i.slice(2)),
+	callDataString: o(r, c(e, t).slice(2), i.slice(2)),
 	value: a,
 	invokeWallet: s
-}), v = async (e, t) => {
+}), h = async (e, t) => {
 	let r = (await s(t)).find((e) => e.symbol === "USDT");
 	return r ? n(e, r.erc20TokenAddress) : !1;
-}, y = async (e, t, n, r, i, o) => {
-	if (await v(d(n), e)) try {
-		await n.allowance(r, i) > 0n && t.push(f(n, i, 0n, o));
+}, g = async (e, t, n, i, a, o) => {
+	if (await h(l(n), e)) try {
+		await n.allowance(i, a) > 0n && t.push(u(n, a, 0n, o));
 	} catch (e) {
-		a.error("Error in nullifyUsdtApprovalIfNeeded", e);
+		r.error("Error in nullifyUsdtApprovalIfNeeded", e);
 	}
-}, b = async (n, i, a, o, s, c, u, d) => {
+}, _ = async (n, r, a, o, s, c, l, m) => {
 	if (a !== t) {
-		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,
+		let t = f[r], m = n.getContractWithFetcher(r, i.ERC20Contract, a), h = await m.balanceOf(o);
+		await g(r, c, m, o, t, l), c.push(u(m, t, 2n ** 256n - 1n, l));
+		let _ = new p.Contract(t, ["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"]), v = s;
+		c.push(d({
+			contract: _,
 			func: "takeSwapFee",
 			args: [
 				a,
-				m,
+				h,
 				e,
-				_
+				v
 			],
-			invokeWallet: u
+			invokeWallet: l
 		}));
 	} else {
 		let t = s;
-		c.push(p({
+		c.push(d({
 			contract: t,
-			value: d * e / 10000n,
-			invokeWallet: u
+			value: m * e / 10000n,
+			invokeWallet: l
 		}));
 	}
-}, 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 === i.OneInch || a === i.Lifi) {
-		if (l !== t) {
-			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 === i.OneInch || x && a === i.Lifi) && v && m !== void 0 && await b(e, n, v, S, C, E, w, m), E;
+}, v = async (e, n, r, o, s, c, l, d, f, p, h, g, v = !1) => {
+	if (r !== a.Lifi) throw Error(`Unsupported swap external action for emporium ops: ${r}`);
+	let y = l < 0n ? -1n * l : l, b = [];
+	if (c !== t) {
+		let t = e.getContractWithFetcher(n, i.ERC20Contract, c);
+		b.push(u(t, o, y, v));
 	}
-	if (!v || !m) throw Error("There should be output token for UniSwap and Odos");
-	if (l === t) {
-		let t = e.getContractWithFetcher(n, r.ERC20Contract, D);
-		E.push(p({
-			contract: t,
-			func: "deposit",
-			value: T,
-			invokeWallet: w
-		})), l = D;
-	}
-	let A = 0n;
-	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 === 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,
-			func: "withdrawBalanceDifference",
-			args: [A],
-			invokeWallet: w
-		}));
-	}
-	return E;
+	let x = 0n;
+	c === t && (x += y), d && f === t && d < 0n && (x += -1n * d);
+	let S = x > 0n ? x : void 0;
+	return b.push(m(n, r, o, s, h, S, v)), p && f && d !== void 0 && await _(e, n, f, h, g, b, v, d), b;
 };
 //#endregion
-export { g as createSwapToEmporiumOpForUniswap, x as createSwapToEmporiumOps };
+export { v as createSwapToEmporiumOps };

package/common/src/functions/private-wallet/index.cjs

@@ -1 +1 @@
-require(`./emporium.helpers.cjs`),require(`./opProducer.cjs`),require(`./emporium.swap.helpers.cjs`);
+require(`./emporium.helpers.cjs`),require(`./emporium.swap.helpers.cjs`);

package/common/src/functions/private-wallet/index.d.ts

@@ -0,0 +1,2 @@
+export * from './emporium.helpers';
+export * from './emporium.swap.helpers';

package/common/src/functions/private-wallet/index.mjs

@@ -1,3 +1,2 @@
 import "./emporium.helpers.mjs";
-import "./opProducer.mjs";
 import "./emporium.swap.helpers.mjs";

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(`../../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 i=t.UserKeys.getH1FromH0(e,n),a=BigInt(t.UserKeys.getStealthAddressNewStyle(e,n,r));return{extraRandomization:o.addHighestBitToNumber(e[0]),H0:e[1],H1:i[1],stealthAddress:a}},x=(e,n,r)=>{let{H0:i}=t.UserKeys.getRandomizedStealthPair(e,n);return b(i,n,r)},S=(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=x,exports.calcStealthAddressStructureFromH0=b,exports.createCallDataHash=v,exports.getSlippageValues=h,exports.getUtxoCircuitH0Coords=c,exports.getUtxoCircuitInRandomization=l,exports.getZkProofVerifierName=S,exports.hasOnlyZeroAmounts=d,exports.serializeCircomData=_;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../constants/fees.constants.cjs`),r=require(`../../data-structures/crypto-keys/keys.cjs`),i=require(`../../types/circom-data.types.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=>{if(e.H0?.[0]!==void 0&&e.H0[1]!==void 0)return[e.H0[0],e.H0[1]];throw Error(`UTXO missing H0 coordinates for 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=(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},h=e=>e.map(e=>e>=0n?0n:e),g=(e,t)=>{let r=BigInt(Math.round(t*100));return e.map(e=>e<0n?e:e-e*r/n.BPS_DENOMINATOR)},_=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},v=(e,t)=>`0x${Buffer.from(a.encryptEncryptionKeyAndStealthAddress(e,t.stealthAddress)).toString(`hex`)}`,y=e=>{let t={...e};return t.amountChanges=e.amountChanges.map(e=>e.toString()),t.calldataHash=e.calldataHash.toString(),t.stealthAddressStructure.H0x=e.stealthAddressStructure.H0x.toString(),t.stealthAddressStructure.H0y=e.stealthAddressStructure.H0y.toString(),t.stealthAddressStructure.H1x=e.stealthAddressStructure.H1x.toString(),t.stealthAddressStructure.H1y=e.stealthAddressStructure.H1y.toString(),t.stealthAddressStructure.stealthAddress=e.stealthAddressStructure.stealthAddress.toString(),t.rootHashHinkal=e.rootHashHinkal?.toString(),t.rootHashHinkalIndex=e.rootHashHinkalIndex?.toString(),t.externalActionData={...e.externalActionData,externalActionId:e.externalActionData.externalActionId?.toString()},t.emporiumMessage=e.emporiumMessage?.toString(),t.slippageValues=e.slippageValues.map(e=>e.toString()),t.feeStructure.flatFee=e.feeStructure.flatFee.toString(),t.feeStructure.variableRate=e.feeStructure.variableRate.toString(),e.newRootHash!==void 0&&(t.newRootHash=e.newRootHash.toString()),e.insertedLeafIndex!==void 0&&(t.insertedLeafIndex=e.insertedLeafIndex.toString()),t},b=e=>({...e,amountChanges:e.amountChanges.map(e=>BigInt(e)),calldataHash:BigInt(e.calldataHash),rootHashHinkal:BigInt(e.rootHashHinkal),rootHashHinkalIndex:BigInt(e.rootHashHinkalIndex),externalActionData:{...e.externalActionData,externalActionId:BigInt(e.externalActionData.externalActionId)},emporiumMessage:BigInt(e.emporiumMessage),stealthAddressStructure:{H0x:BigInt(e.stealthAddressStructure.H0x),H0y:BigInt(e.stealthAddressStructure.H0y),H1x:BigInt(e.stealthAddressStructure.H1x),H1y:BigInt(e.stealthAddressStructure.H1y),stealthAddress:BigInt(e.stealthAddressStructure.stealthAddress)},feeStructure:{...e.feeStructure,flatFee:BigInt(e.feeStructure.flatFee),variableRate:BigInt(e.feeStructure.variableRate)},slippageValues:e.slippageValues.map(e=>BigInt(e)),newRootHash:e.newRootHash===void 0?void 0:BigInt(e.newRootHash),insertedLeafIndex:e.insertedLeafIndex===void 0?void 0:BigInt(e.insertedLeafIndex)}),x=(n,r,a,l,u,d,f,p,m,h,g,_,v,y=`0x`,b,x=!1)=>{let S=b!==void 0&&e.isTronLike(b),C=Object.values(m||i.defaultHookData),w=a??t.zeroAddress,T=v??s.getOriginalSender(w,r),E=typeof l==`bigint`?l:o.getExternalActionIdHash(l),D=[_.feeToken,_.flatFee,_.variableRate],O=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`address`,`uint256`,`tuple(address externalAddress, uint256 externalActionId, bytes externalActionMetadata)`,...S?[]:[`int256[]`]],[n,r,u,[w,E,d],...S?[]:[h]]),k=c.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(address, address, bytes, bytes)`,`bytes[][]`,...S?[`tuple(address, uint256, uint256)`,`int256[]`]:[`bytes`,`tuple(address, uint256, uint256)`,`bool[]`],`address`,`bytes`,...S?[`bool`]:[]],[C,f,...S?[D,h]:[p,D,g],T,y,...S?[x]:[]]),A=BigInt(c.ethers.keccak256(O)),j=BigInt(c.ethers.keccak256(k)),M=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint256`,`uint256`],[A,j]);return BigInt(c.ethers.keccak256(M))%t.CIRCOM_P},S=(e,t,n,r,i)=>{if(e.startsWith(`mainEVMCircuitMin0`))return 3;let a=e.startsWith(`mainTronCircuit`);return 2+t.length+n.length+1+r.flat().length+i.flat().length+1+1+(a?2:5)},C=(e,t,n)=>{let i=r.UserKeys.getH1FromH0(e,t),a=BigInt(r.UserKeys.getStealthAddress(e,t,n));return{H0x:e[0],H0y:e[1],H1x:i[0],H1y:i[1],stealthAddress:a}},w=(e,t,n)=>{let{H0:i}=r.UserKeys.getRandomizedStealthPair(e,t);return C(i,t,n)},T=(e,t,n=!1)=>t.length===0?`mainEVMCircuitMin0`:`${n?`mainTronCircuit`:`mainEVMCircuit`}${e.length}x${e[0].length}x${t[0].length}`;exports.buildOutCommitments=p,exports.buildSwapSlippageValues=g,exports.buildZeroInputMerkleDataFromSerialized=f,exports.calcAmountChanges=m,exports.calcEncryptedOutputs=_,exports.calcOnchainEncryptedOutput=v,exports.calcPublicSignalCount=S,exports.calcStealthAddressStructure=w,exports.calcStealthAddressStructureFromH0=C,exports.createCallDataHash=x,exports.deserializeCircomData=b,exports.getSlippageValues=h,exports.getUtxoCircuitH0Coords=l,exports.getZkProofVerifierName=T,exports.hasOnlyZeroAmounts=d,exports.serializeCircomData=y;

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

@@ -0,0 +1,32 @@
+import { IUtxoConstructor, 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 } from '../../types/hinkal.types';
+export declare const getUtxoCircuitH0Coords: (utxo: Utxo) => [bigint, bigint];
+export declare const buildInNullifiers: (inputUtxos: Utxo[][], onChainCreation: boolean[]) => string[][];
+export declare const hasOnlyZeroAmounts: <T extends {
+    amount: bigint;
+}>(inputUtxosByToken: T[][]) => boolean;
+export declare const buildZeroInputMerkleDataFromSerialized: (inputUtxosSerialized: IUtxoConstructor[][]) => {
+    inCommitmentSiblings: string[][][];
+    inCommitmentSiblingSides: string[][][];
+    inNullifiers: 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[]) => bigint[];
+export declare const buildSwapSlippageValues: (deltaAmounts: bigint[], slippagePercentage: number) => bigint[];
+export declare const calcEncryptedOutputs: (outputUtxos: Utxo[][]) => string[][];
+export declare const calcOnchainEncryptedOutput: (encryptionKey: string, stealthAddressStructure: StealthAddressStructure) => string;
+export declare const calcCommitmentsSiblingAndSides: (inputUtxos: Utxo[][], merkleTree: MerkleTree<bigint>) => {
+    inCommitmentSiblings: string[][][];
+    inCommitmentSiblingSides: 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, emporiumMessage: bigint, externalActionMetadata: string, encryptedOutputs: string[][], onChainEncryptedOutput: string, hookData: HookDataType | undefined, slippageValues: bigint[], onChainCreation: boolean[], feeStructure: FeeStructure, _originalSender?: string, extraData?: string, chainId?: number, createBlockedUtxos?: boolean) => bigint;
+export declare const calcPublicSignalCount: (verifierName: string, erc20TokenAddresses: string[], amountChanges: bigint[], inNullifiers: string[][], outCommitments: string[][]) => number;
+export declare const calcStealthAddressStructureFromH0: (H0: [bigint, bigint], nullifyingPrivateKey: string, spendingPublicKey: bigint[]) => StealthAddressStructure;
+export declare const calcStealthAddressStructure: (extraRandomization: bigint, nullifyingPrivateKey: string, spendingPublicKey: bigint[]) => StealthAddressStructure;
+export declare const getZkProofVerifierName: (inputUtxos: Utxo[][], outputUtxos: Utxo[][], isTron?: boolean) => string;