@hinkal/common 0.2.26 → 0.2.28

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

@@ -1,224 +1,198 @@
-import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
-import { ContractType as g } from "../../types/ethereum-network.types.mjs";
-import "idb-keyval";
-import { networkRegistry as A, chainIds as w } from "../../constants/chains.constants.mjs";
-import { getContractAddress as v } from "../utils/getContractAddress.mjs";
-import { createCustomRpcProvider as W } from "../utils/create-provider.mjs";
 import { ethers as p } from "ethers";
+import { zeroAddress as d } from "../../constants/protocol.constants.mjs";
+import { ContractType as f } from "../../types/ethereum-network.types.mjs";
+import "idb-keyval";
+import { chainIds as B, networkRegistry as w } from "../../constants/chains.constants.mjs";
+import { getContractAddress as C } from "../utils/getContractAddress.mjs";
+import { createCustomRpcProvider as F } from "../utils/create-provider.mjs";
 import "../../constants/token-data/index.mjs";
 import "../../error-handling/error-codes.constants.mjs";
+import "../../constants/tokens.constants.mjs";
 import "../utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../types/circom-data.types.mjs";
 import "../../types/activities.types.mjs";
 import "circomlibjs-hinkal-fork";
-import { UserKeys as y } from "../../data-structures/crypto-keys/keys.mjs";
+import "../../data-structures/crypto-keys/keys.mjs";
 import "../../constants/server.constants.mjs";
-import "../../constants/vite.constants.mjs";
+import "../../API/getServerURL.mjs";
 import "../../data-structures/http/HttpClient.mjs";
 import "axios";
-import { caseInsensitiveEqual as l } from "../utils/caseInsensitive.utils.mjs";
-import "../../API/getServerURL.mjs";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import { Logger as k } from "../../error-handling/logger.mjs";
+import "../../constants/vite.constants.mjs";
+import { caseInsensitiveEqual as g } from "../utils/caseInsensitive.utils.mjs";
+import { Logger as W } from "../../error-handling/logger.mjs";
 import "@solana/web3.js";
+import "tronweb";
+import "@coral-xyz/anchor";
 import "@solana/spl-token";
+import { AccountActions as y } from "../../data-structures/AccountActions/AccountActions.mjs";
+import "buffer";
+import "libsodium-wrappers";
+import "lodash";
+import "../../API/enclaveUtxoCalls.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
 import "../../constants/coingecko.constants.mjs";
+import "../../constants/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
 import "../../constants/presale.constants.mjs";
 import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
+import "../../constants/schedule.constants.mjs";
 import "../utils/userAgent.mjs";
-import { replaceAllInstances as B } from "../utils/string.utils.mjs";
 import "multiformats";
-import "../../API/tenderly.api.mjs";
-import { replaceAddressesInCalldata as D } from "../utils/replaceAddressInCalldata.mjs";
+import "async-mutex";
+import "process";
+import "../../providers/EthersProviderAdapter.mjs";
+import "node-forge";
 const h = ({
   contract: t,
   func: e,
   args: o,
   callDataString: r,
   invokeWallet: i,
-  value: a
+  value: s
 }) => {
-  let n = new Uint8Array(), c = r ? p.getBytesCopy(r) : new Uint8Array();
+  let n = new Uint8Array(), a = r ? p.getBytesCopy(r) : new Uint8Array();
   if (typeof t == "object") {
-    if (n = p.getBytesCopy(v(t)), r?.length && r?.length > 0)
+    if (n = p.getBytesCopy(C(t)), r?.length && r?.length > 0)
       throw Error("If function and args are providedm no calldata is needed");
-    e && o && !r && (c = p.getBytesCopy(t.interface.encodeFunctionData(e, o)));
+    e && o && !r && (a = p.getBytesCopy(t.interface.encodeFunctionData(e, o)));
   } else
     n = p.getBytesCopy(t);
-  const s = p.getBytesCopy(new Uint8Array([i ? 1 : 0])), m = p.zeroPadValue(p.toBeHex(a ?? 0n), 16), d = p.concat([n, s, m, c]);
-  return p.hexlify(d);
-}, wt = async (t, e, o, r, i, a) => {
+  const m = p.getBytesCopy(new Uint8Array([i ? 1 : 0])), c = p.zeroPadValue(p.toBeHex(s ?? 0n), 16), u = p.concat([n, m, c, a]);
+  return p.hexlify(u);
+}, Wt = async (t, e, o, r, i, s) => {
   const n = o ? await y.signTypedDataFromPrivateKey(
     t,
     o,
     { name: "Emporium", version: "1.0.0", chainId: t, verifyingContract: e },
     { EmporiumSignature: [{ name: "message", type: "uint256" }] },
     { message: i }
-  ) : void 0, { v: c, r: s, s: m } = n ? p.Signature.from(n) : { v: 0, r: p.ZeroHash, s: p.ZeroHash };
+  ) : void 0, { v: a, r: m, s: c } = n ? p.Signature.from(n) : { v: 0, r: p.ZeroHash, s: p.ZeroHash };
   return p.AbiCoder.defaultAbiCoder().encode(
     ["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],
     [
       {
-        v: c,
-        r: s,
-        s: m,
+        v: a,
+        r: m,
+        s: c,
         message: i ?? 0n,
-        signerAddress: a ?? u,
+        signerAddress: s ?? d,
         ops: r
       }
     ]
   );
-}, E = (t, e, o, r) => h(t ? {
+}, Ot = (t) => {
+  const [e] = p.AbiCoder.defaultAbiCoder().decode(
+    ["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],
+    t
+  ), { v: o, r, s: i, message: s, signerAddress: n, ops: a } = e;
+  return { v: o, r, s: i, message: s, signerAddress: n, ops: a };
+}, A = (t, e, o, r) => h(t ? {
   contract: t,
   func: "transfer",
   args: [e, o],
   invokeWallet: r
-} : { contract: e, value: o, invokeWallet: r }), Wt = (t, e, o, r) => {
-  const i = t.getContractWithFetcher(g.HinkalContract), a = v(i);
-  return e.map((n, c) => {
-    const s = l(n, u) ? void 0 : t.getContractWithFetcher(g.ERC20Contract, n);
-    return E(s, r ?? a, o[c], !0);
+} : { contract: e, value: o, invokeWallet: r }), bt = (t, e, o, r, i) => {
+  const s = t.getContractWithFetcher(e, f.HinkalContract);
+  return o.map((n, a) => {
+    const m = g(n, d) ? void 0 : t.getContractWithFetcher(e, f.ERC20Contract, n);
+    return A(m, i ?? C(s), r[a], !0);
   });
 }, O = (t, e, o, r) => h({
   contract: t,
   func: "approve",
   args: [e, o],
   invokeWallet: r
-}), P = (t, e, o) => {
-  const r = t.getSelectedNetwork()?.contractData.hinkalAddress;
-  if (!r)
-    throw Error("No Hinkal Address Provided to modifyDataForProxy");
-  return B(o, r.slice(2), e.slice(2));
-}, kt = (t, e, o) => {
-  if (!e)
-    throw Error("No private key provided to modifyDataForProxy");
-  const r = y.getSignerAddressFromPrivateKey(t.getCurrentChainId(), e);
-  return P(t, r, o);
-}, F = (t, e, o, r, i, a, n) => {
-  const c = [];
-  for (let s = 0; s < e.length; s += 1) {
-    const m = e[s], d = l(m, u) ? void 0 : t.getContractWithFetcher(g.ERC20Contract, m);
-    c.push(E(d, a, o[s], !1));
+}), b = (t, e, o, r, i, s, n, a) => {
+  const m = [];
+  for (let c = 0; c < o.length; c += 1) {
+    const u = o[c], l = g(u, d) ? void 0 : t.getContractWithFetcher(e, f.ERC20Contract, u);
+    m.push(A(l, n, r[c], !1));
   }
-  if (n)
-    for (let s = 0; s < r.length; s += 1) {
-      const m = r[s];
-      if (!l(m, u)) {
-        const d = t.getContractWithFetcher(g.ERC20Contract, m);
-        c.push(O(d, n, i[s], !0));
+  if (a)
+    for (let c = 0; c < i.length; c += 1) {
+      const u = i[c];
+      if (!g(u, d)) {
+        const l = t.getContractWithFetcher(e, f.ERC20Contract, u);
+        m.push(O(l, a, s[c], !0));
       }
     }
-  return c;
-}, Bt = (t, e, o, r, i, a, n, c, s, m) => {
-  const d = F(
+  return m;
+}, kt = (t, e, o, r, i, s, n, a) => {
+  const m = [], c = [i], u = [s];
+  a.nativeFee > 0n && !g(i, d) && (c.push(d), u.push(a.nativeFee));
+  const E = b(
     t,
     e,
+    c,
+    u,
+    [i],
+    [n],
     o,
-    r,
-    i,
-    a,
-    n
-  );
-  if (!!c && !!s) {
-    const f = t.getContractWithFetcher(g.HinkalContract);
-    d.push(
-      h({
-        contract: c,
-        callDataString: D(s, v(f), a),
-        value: m,
-        invokeWallet: !0
-      })
-    );
-  }
-  return d;
-}, Dt = (t, e, o, r, i, a, n) => {
-  const c = [], s = [r], m = [i];
-  n.nativeFee > 0n && !l(r, u) && (s.push(u), m.push(n.nativeFee));
-  const C = F(
-    t,
-    s,
-    m,
-    [r],
-    [a],
-    e,
-    o
+    r
   );
-  c.push(...C);
-  let f = n.nativeFee;
-  return l(r, u) && (f += a), c.push(
+  m.push(...E);
+  let v = a.nativeFee;
+  return g(i, d) && (v += n), m.push(
     h({
-      contract: o,
-      callDataString: n.calldata,
-      value: f > 0n ? f : void 0,
+      contract: r,
+      callDataString: a.calldata,
+      value: v > 0n ? v : void 0,
       invokeWallet: !0
     })
-  ), c;
-}, I = "0xef0100", x = async (t, e) => {
+  ), m;
+}, k = "0xef0100", D = async (t, e) => {
   try {
-    const { fetchRpcUrl: o } = A[t];
-    if (!o)
-      throw new Error("RPC URL not found for the specified chain ID");
-    const r = W(o), i = await r.getCode(e);
-    if (i === "0x" || !i)
+    const o = F(t), r = await o.getCode(e);
+    if (r === "0x" || !r)
       return { delegated: !1, implementation: void 0, nonce: void 0 };
-    if (i.toLowerCase().startsWith(I) && i.length === 48) {
-      const a = `0x${i.slice(8)}`, n = await r.getTransactionCount(e);
-      return { delegated: !0, implementation: p.getAddress(a), nonce: n };
+    if (r.toLowerCase().startsWith(k) && r.length === 48) {
+      const i = `0x${r.slice(8)}`, s = await o.getTransactionCount(e);
+      return { delegated: !0, implementation: p.getAddress(i), nonce: s };
     } else
       throw Error("checkEOAWithDelegation: It is a contract");
   } catch (o) {
-    throw k.error("checkEOAWithDelegation error", { error: o }), o;
+    throw W.error("checkEOAWithDelegation error", { error: o }), o;
   }
-}, H = (t) => {
-  const { hinkalWalletAddress: e } = A[t].contractData;
-  if (!e || l(e, u))
+}, x = (t) => {
+  const { hinkalWalletAddress: e } = w[t].contractData;
+  if (!e || g(e, d))
     throw Error("Hinkal Wallet Address is not set");
   return e;
-}, Ot = async (t, e) => {
-  if (t === w.localhost || !e)
+}, Dt = async (t, e) => {
+  if (t === B.localhost || !e)
     return;
-  const o = y.getSignerAddressFromPrivateKey(t, e), { delegated: r, implementation: i } = await x(t, o), a = H(t);
-  if (!r || !l(i, a)) {
-    const n = await y.authorizeDelegation(t, e, a);
+  const o = y.getSignerAddressFromPrivateKey(t, e), { delegated: r, implementation: i } = await D(t, o), s = x(t);
+  if (!r || !g(i, s)) {
+    const n = await y.authorizeDelegation(t, e, s);
     return {
       v: n.signature.v.toString(),
       r: n.signature.r,
       s: n.signature.s,
       nonce: n.nonce.toString(),
-      address: a,
+      address: s,
       chainId: String(t)
     };
   }
-}, Pt = (t) => {
+}, xt = (t) => {
   if (!t)
     return;
-  const { v: e, r: o, s: r, nonce: i, chainId: a, address: n } = t;
-  return { signature: p.Signature.from({ v: e, r: o, s: r }), nonce: BigInt(i), chainId: BigInt(a), address: n };
+  const { v: e, r: o, s: r, nonce: i, chainId: s, address: n } = t;
+  return { signature: p.Signature.from({ v: e, r: o, s: r }), nonce: BigInt(i), chainId: BigInt(s), address: n };
 };
 export {
-  x as checkEOAWithDelegation,
+  D as checkEOAWithDelegation,
   O as createApproveEmporiumOp,
-  Dt as createLifiBridgeOps,
-  Wt as createTransaferEmporiumOpsBatch,
-  E as createTransferToEmporiumOp,
+  kt as createLifiBridgeOps,
+  bt as createTransaferEmporiumOpsBatch,
+  A as createTransferToEmporiumOp,
+  Ot as decodeEmporiumMetadata,
   h as emporiumOp,
-  wt as encodeEmporiumMetadata,
-  F as generateFundAndApproveOps,
-  Bt as generateFundApproveAndTransactOps,
-  Ot as getAuthorizationDataIfNeeded,
-  P as modifyDataForProxy,
-  kt as modifyDataForProxyWithPrivateKey,
-  Pt as recoverAuthorizationData
+  Wt as encodeEmporiumMetadata,
+  b as generateFundAndApproveOps,
+  Dt as getAuthorizationDataIfNeeded,
+  xt as recoverAuthorizationData
 };

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

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

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

@@ -1,7 +1,4 @@
-import { ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { ExternalActionId } from '../../types/external-action.types';
 export declare const createSwapToEmporiumOpForUniswap: (routerAddress: string, inputTokenAddress: string, positiveAmountInput: bigint, outputTokenAddress: string, recipient: string, data: string, invokeWallet?: boolean) => string;
-export declare const createSwapToEmporiumOpFromData: (hinkal: IHinkal, externalActionId: ExternalActionId, routerAddress: string, data: string, walletAddress: string, value?: bigint, invokeWallet?: boolean) => string;
-export declare const nullifyUsdtApprovalIfNeeded: (hinkal: IHinkal, ops: string[], tokenContract: ethers.Contract, walletAddress: string, spenderAddress: string, invokeWallet: boolean) => Promise<void>;
-export declare const createSwapToEmporiumOps: (hinkal: IHinkal, 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[]>;
+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/functions/private-wallet/emporium.swap.helpers.mjs

@@ -1,158 +1,156 @@
-import { ethers as D } from "ethers";
-import { emporiumOp as u, createApproveEmporiumOp as I } from "./emporium.helpers.mjs";
+import { ethers as _ } from "ethers";
+import { emporiumOp as u, createApproveEmporiumOp as F } from "./emporium.helpers.mjs";
 import { NATIVE_TOKEN_WRAPPER_ADDRESSES as K, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as T, SWAP_FEE_TAKER_ADDRESSES as q } from "../../constants/addresses.constants.mjs";
-import { ExternalActionId as O } from "../../types/external-action.types.mjs";
+import { ExternalActionId as h } from "../../types/external-action.types.mjs";
 import { ContractType as g } from "../../types/ethereum-network.types.mjs";
 import { getExternalSwapAddress as V } from "../pre-transaction/getExternalSwapAddress.mjs";
 import { replaceAllInstances as X } from "../utils/string.utils.mjs";
-import { zeroAddress as w, HINKAL_SWAP_VARIABLE_RATE as P } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as S, HINKAL_SWAP_VARIABLE_RATE as U } from "../../constants/protocol.constants.mjs";
 import "../../constants/token-data/index.mjs";
 import { caseInsensitiveEqual as H } from "../utils/caseInsensitive.utils.mjs";
 import { Logger as M } from "../../error-handling/logger.mjs";
-import { getContractAddress as l } from "../utils/getContractAddress.mjs";
-import { getERC20Registry as v } from "../../constants/token-data/ERC20Registry.mjs";
-const z = (t, c, a, e, n, i, o = !1) => {
-  const r = BigInt(i), C = {
-    tokenIn: c,
-    tokenOut: e,
-    fee: r,
-    recipient: n,
-    amountIn: a,
+import { getContractAddress as v } from "../utils/getContractAddress.mjs";
+import { getERC20Registry as z } from "../../constants/token-data/ERC20Registry.mjs";
+const G = (c, t, r, a, i, n, f = !1) => {
+  const o = BigInt(n), e = {
+    tokenIn: t,
+    tokenOut: a,
+    fee: o,
+    recipient: i,
+    amountIn: r,
     amountOutMinimum: 0,
     sqrtPriceLimitX96: 0
-  }, m = [
+  }, w = [
     "function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"
-  ], h = new D.Contract(t, m);
+  ], E = new _.Contract(c, w);
   return u({
-    contract: h,
+    contract: E,
     func: "exactInputSingle",
-    args: [C],
-    invokeWallet: o
+    args: [e],
+    invokeWallet: f
   });
-}, U = (t, c, a, e, n, i, o = !1) => {
-  const r = V(t, c), C = X(e, r.slice(2), n.slice(2));
+}, l = (c, t, r, a, i, n, f = !1) => {
+  const o = V(c, t), e = X(a, o.slice(2), i.slice(2));
   return u({
-    contract: a,
-    callDataString: C,
-    value: i,
-    invokeWallet: o
+    contract: r,
+    callDataString: e,
+    value: n,
+    invokeWallet: f
   });
-}, G = (t, c) => {
-  const e = v(c).find((n) => n.symbol === "USDT");
-  return e ? H(t, e.erc20TokenAddress) : !1;
-}, N = async (t, c, a, e, n, i) => {
-  const o = l(a);
-  if (G(o, t.getCurrentChainId()))
+}, j = (c, t) => {
+  const a = z(t).find((i) => i.symbol === "USDT");
+  return a ? H(c, a.erc20TokenAddress) : !1;
+}, N = async (c, t, r, a, i, n) => {
+  const f = v(r);
+  if (j(f, c))
     try {
-      await a.allowance(e, n) > 0n && c.push(I(a, n, 0n, i));
-    } catch (r) {
-      M.error("Error in nullifyUsdtApprovalIfNeeded", r);
+      await r.allowance(a, i) > 0n && t.push(F(r, i, 0n, n));
+    } catch (o) {
+      M.error("Error in nullifyUsdtApprovalIfNeeded", o);
     }
-}, L = async (t, c, a, e, n, i, o) => {
-  if (c !== w) {
-    const r = q[t.getCurrentChainId()], C = t.getContractWithFetcher(g.ERC20Contract, c), m = await C.balanceOf(a);
+}, L = async (c, t, r, a, i, n, f, o) => {
+  if (r !== S) {
+    const e = q[t], w = c.getContractWithFetcher(t, g.ERC20Contract, r), E = await w.balanceOf(a);
     await N(
       t,
       n,
-      C,
+      w,
       a,
-      r,
-      i
-    ), n.push(I(C, r, 2n ** 256n - 1n, i));
-    const h = [
+      e,
+      f
+    ), n.push(F(w, e, 2n ** 256n - 1n, f));
+    const b = [
       "function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"
-    ], f = new D.Contract(r, h), E = e;
+    ], s = new _.Contract(e, b), C = i;
     n.push(
       u({
-        contract: f,
+        contract: s,
         func: "takeSwapFee",
-        args: [c, m, P, E],
-        invokeWallet: i
+        args: [r, E, U, C],
+        invokeWallet: f
       })
     );
   } else {
-    const r = e;
+    const e = i;
     n.push(
       u({
-        contract: r,
-        value: o * P / 10000n,
-        invokeWallet: i
+        contract: e,
+        value: o * U / 10000n,
+        invokeWallet: f
       })
     );
   }
-}, ct = async (t, c, a, e, n, i, o, r, C, m, h, f = !1) => {
-  const E = i < 0n ? -1n * i : i, y = t.getCurrentChainId(), p = [], S = K[y];
-  let _ = !1, R;
-  if (c === O.OneInch || c === O.Lifi) {
-    if (n !== w) {
-      const b = t.getContractWithFetcher(g.ERC20Contract, n);
-      p.push(I(b, a, E, f));
+}, at = async (c, t, r, a, i, n, f, o, e, w, E, b, s = !1) => {
+  const C = f < 0n ? -1n * f : f, m = [], R = K[t];
+  let B = !1, O;
+  if (r === h.OneInch || r === h.Lifi) {
+    if (n !== S) {
+      const y = c.getContractWithFetcher(t, g.ERC20Contract, n);
+      m.push(F(y, a, C, s));
     }
-    let s = 0n;
-    n === w && (s += E), o && r === w && o < 0n && (s += -1n * o);
-    const F = s > 0n ? s : void 0;
-    return R = U(
+    let p = 0n;
+    n === S && (p += C), o && e === S && o < 0n && (p += -1n * o);
+    const D = p > 0n ? p : void 0;
+    return O = l(
       t,
-      c,
+      r,
       a,
-      e,
-      m,
-      F,
-      f
-    ), p.push(R), (c === O.OneInch || C && c === O.Lifi) && r && o !== void 0 && await L(t, r, m, h, p, f, o), p;
+      i,
+      E,
+      D,
+      s
+    ), m.push(O), (r === h.OneInch || w && r === h.Lifi) && e && o !== void 0 && await L(c, t, e, E, b, m, s, o), m;
   }
-  if (!r || !o)
+  if (!e || !o)
     throw Error("There should be output token for UniSwap and Odos");
-  if (n === w) {
-    const s = t.getContractWithFetcher(g.ERC20Contract, S);
-    p.push(
+  if (n === S) {
+    const p = c.getContractWithFetcher(t, g.ERC20Contract, R);
+    m.push(
       u({
-        contract: s,
+        contract: p,
         func: "deposit",
-        value: E,
-        invokeWallet: f
+        value: C,
+        invokeWallet: s
       })
-    ), n = S;
+    ), n = R;
   }
-  let B = 0n;
-  if (r === w && (r = S, _ = !0, B = await t.getContractWithFetcher(g.ERC20Contract, S).balanceOf(m)), n !== w) {
-    const s = t.getContractWithFetcher(g.ERC20Contract, n);
-    await N(t, p, s, m, a, f), p.push(I(s, a, E, f));
+  let P = 0n;
+  if (e === S && (e = R, B = !0, P = await c.getContractWithFetcher(t, g.ERC20Contract, R).balanceOf(E)), n !== S) {
+    const p = c.getContractWithFetcher(t, g.ERC20Contract, n);
+    await N(t, m, p, E, a, s), m.push(F(p, a, C, s));
   }
-  if (c === O.Uniswap ? R = z(
+  if (r === h.Uniswap ? O = G(
     a,
     n,
-    E,
-    r,
-    m,
+    C,
     e,
-    f
-  ) : R = U(
+    E,
+    i,
+    s
+  ) : O = l(
     t,
-    c,
+    r,
     a,
-    e,
-    m,
+    i,
+    E,
     void 0,
-    f
-  ), p.push(R), await L(t, r, m, h, p, f, o), _) {
-    const s = T[y], F = t.getContractWithFetcher(g.ERC20Contract, S);
-    p.push(I(F, s, 2n ** 256n - 1n, f));
-    const b = ["function withdrawBalanceDifference(uint256 beforeBalance) external"], x = new D.Contract(s, b);
-    p.push(
+    s
+  ), m.push(O), await L(c, t, e, E, b, m, s, o), B) {
+    const p = T[t], D = c.getContractWithFetcher(t, g.ERC20Contract, R);
+    m.push(F(D, p, 2n ** 256n - 1n, s));
+    const y = ["function withdrawBalanceDifference(uint256 beforeBalance) external"], x = new _.Contract(p, y);
+    m.push(
       u({
         contract: x,
         func: "withdrawBalanceDifference",
-        args: [B],
-        invokeWallet: f
+        args: [P],
+        invokeWallet: s
       })
     );
   }
-  return p;
+  return m;
 };
 export {
-  z as createSwapToEmporiumOpForUniswap,
-  U as createSwapToEmporiumOpFromData,
-  ct as createSwapToEmporiumOps,
-  N as nullifyUsdtApprovalIfNeeded
+  G as createSwapToEmporiumOpForUniswap,
+  at as createSwapToEmporiumOps
 };