@hinkal/common 0.2.21 → 0.2.22

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

@@ -1,9 +1,9 @@
 import { utils as p, BigNumber as w, ethers as C } from "ethers";
-import { zeroAddress as d } from "../../constants/protocol.constants.mjs";
-import { ContractType as g } from "../../types/ethereum-network.types.mjs";
+import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
+import { ContractType as h } from "../../types/ethereum-network.types.mjs";
 import "idb-keyval";
-import { chainIds as F, networkRegistry as W } from "../../constants/chains.constants.mjs";
-import { createCustomRpcProvider as O } from "../utils/create-provider.mjs";
+import { networkRegistry as A, chainIds as W } from "../../constants/chains.constants.mjs";
+import { createCustomRpcProvider as k } from "../utils/create-provider.mjs";
 import "../../constants/token-data/index.mjs";
 import "../../error-handling/error-codes.constants.mjs";
 import "../utils/convertIntegrationProviderToExternalActionId.mjs";
@@ -11,23 +11,26 @@ import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import "circomlibjs-hinkal-fork";
-import "../../data-structures/crypto-keys/keys.mjs";
+import { UserKeys as y } from "../../data-structures/crypto-keys/keys.mjs";
 import "../../constants/server.constants.mjs";
-import "../../API/getServerURL.mjs";
+import "../../constants/vite.constants.mjs";
 import "../../data-structures/http/HttpClient.mjs";
 import "axios";
-import "../../constants/vite.constants.mjs";
-import { caseInsensitiveEqual as l } from "../utils/caseInsensitive.utils.mjs";
-import { Logger as B } from "../../error-handling/logger.mjs";
-import "@solana/web3.js";
+import { caseInsensitiveEqual as f } 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 D } from "../../error-handling/logger.mjs";
+import "@solana/web3.js";
 import "@solana/spl-token";
-import { AccountActions as y } from "../../data-structures/AccountActions/AccountActions.mjs";
-import "buffer";
 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";
@@ -35,14 +38,12 @@ import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
 import "../utils/userAgent.mjs";
-import "libsodium-wrappers";
+import { replaceAllInstances as O } from "../utils/string.utils.mjs";
 import "multiformats";
-import "../../API/enclaveCalls.mjs";
-import "async-mutex";
-import "process";
-import "../../providers/EthersProviderAdapter.mjs";
-import { ethers as k } from "ethers-v6h";
-const h = ({
+import "../../API/tenderly.api.mjs";
+import { replaceAddressesInCalldata as P } from "../utils/replaceAddressInCalldata.mjs";
+import { ethers as I } from "ethers-v6h";
+const g = ({
   contract: t,
   func: r,
   args: o,
@@ -57,106 +58,140 @@ const h = ({
     r && o && !e && (s = p.arrayify(t.interface.encodeFunctionData(r, o)));
   } else
     n = p.arrayify(t);
-  const m = p.arrayify([i ? 1 : 0]), c = p.zeroPad(p.arrayify(w.from(a ?? 0n)), 16), u = p.concat([n, m, c, s]);
-  return p.hexlify(u);
-}, Ft = async (t, r, o, e, i, a) => {
+  const c = p.arrayify([i ? 1 : 0]), m = p.zeroPad(p.arrayify(w.from(a ?? 0n)), 16), d = p.concat([n, c, m, s]);
+  return p.hexlify(d);
+}, Dt = async (t, r, o, e, i, a) => {
   const n = o ? await y.signTypedDataFromPrivateKey(
     t,
     o,
     { name: "Emporium", version: "1.0.0", chainId: t, verifyingContract: r },
     { EmporiumSignature: [{ name: "message", type: "uint256" }] },
     { message: i }
-  ) : void 0, { v: s, r: m, s: c } = n ? p.splitSignature(n) : { v: 0, r: C.constants.HashZero, s: C.constants.HashZero };
+  ) : void 0, { v: s, r: c, s: m } = n ? p.splitSignature(n) : { v: 0, r: C.constants.HashZero, s: C.constants.HashZero };
   return p.defaultAbiCoder.encode(
     ["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],
     [
       {
         v: s,
-        r: m,
-        s: c,
+        r: c,
+        s: m,
         message: i ?? 0n,
-        signerAddress: a ?? d,
+        signerAddress: a ?? u,
         ops: e
       }
     ]
   );
-}, A = (t, r, o, e) => h(t ? {
+}, E = (t, r, o, e) => g(t ? {
   contract: t,
   func: "transfer",
   args: [r, o],
   invokeWallet: e
-} : { contract: r, value: o, invokeWallet: e }), Wt = (t, r, o, e, i) => {
-  const a = t.getContractWithFetcher(r, g.HinkalContract);
-  return o.map((n, s) => {
-    const m = l(n, d) ? void 0 : t.getContractWithFetcher(r, g.ERC20Contract, n);
-    return A(m, i ?? a.address, e[s], !0);
+} : { contract: r, value: o, invokeWallet: e }), Ot = (t, r, o, e) => {
+  const i = t.getContractWithFetcher(h.HinkalContract);
+  return r.map((a, n) => {
+    const s = f(a, u) ? void 0 : t.getContractWithFetcher(h.ERC20Contract, a);
+    return E(s, e ?? i.address, o[n], !0);
   });
-}, D = (t, r, o, e) => h({
+}, B = (t, r, o, e) => g({
   contract: t,
   func: "approve",
   args: [r, o],
   invokeWallet: e
-}), I = (t, r, o, e, i, a, n, s) => {
-  const m = [];
-  for (let c = 0; c < o.length; c += 1) {
-    const u = o[c], f = l(u, d) ? void 0 : t.getContractWithFetcher(r, g.ERC20Contract, u);
-    m.push(A(f, n, e[c], !1));
+}), x = (t, r, o) => {
+  const e = t.getSelectedNetwork()?.contractData.hinkalAddress;
+  if (!e)
+    throw Error("No Hinkal Address Provided to modifyDataForProxy");
+  return O(o, e.slice(2), r.slice(2));
+}, Pt = (t, r, o) => {
+  if (!r)
+    throw Error("No private key provided to modifyDataForProxy");
+  const e = y.getSignerAddressFromPrivateKey(t.getCurrentChainId(), r);
+  return x(t, e, o);
+}, F = (t, r, o, e, i, a, n) => {
+  const s = [];
+  for (let c = 0; c < r.length; c += 1) {
+    const m = r[c], d = f(m, u) ? void 0 : t.getContractWithFetcher(h.ERC20Contract, m);
+    s.push(E(d, a, o[c], !1));
   }
-  if (s)
-    for (let c = 0; c < i.length; c += 1) {
-      const u = i[c];
-      if (!l(u, d)) {
-        const f = t.getContractWithFetcher(r, g.ERC20Contract, u);
-        m.push(D(f, s, a[c], !0));
+  if (n)
+    for (let c = 0; c < e.length; c += 1) {
+      const m = e[c];
+      if (!f(m, u)) {
+        const d = t.getContractWithFetcher(h.ERC20Contract, m);
+        s.push(B(d, n, i[c], !0));
       }
     }
-  return m;
-}, Ot = (t, r, o, e, i, a, n, s) => {
-  const m = [], c = [i], u = [a];
-  s.nativeFee > 0n && !l(i, d) && (c.push(d), u.push(s.nativeFee));
-  const E = I(
+  return s;
+}, It = (t, r, o, e, i, a, n, s, c, m) => {
+  const d = F(
     t,
     r,
-    c,
-    u,
-    [i],
-    [n],
     o,
-    e
+    e,
+    i,
+    a,
+    n
+  );
+  if (!!s && !!c) {
+    const l = t.getContractWithFetcher(h.HinkalContract);
+    d.push(
+      g({
+        contract: s,
+        callDataString: P(c, l.address, a),
+        value: m,
+        invokeWallet: !0
+      })
+    );
+  }
+  return d;
+}, Bt = (t, r, o, e, i, a, n) => {
+  const s = [], c = [e], m = [i];
+  n.nativeFee > 0n && !f(e, u) && (c.push(u), m.push(n.nativeFee));
+  const v = F(
+    t,
+    c,
+    m,
+    [e],
+    [a],
+    r,
+    o
   );
-  m.push(...E);
-  let v = s.nativeFee;
-  return l(i, d) && (v += n), m.push(
-    h({
-      contract: e,
-      callDataString: s.calldata,
-      value: v > 0n ? v : void 0,
+  s.push(...v);
+  let l = n.nativeFee;
+  return f(e, u) && (l += a), s.push(
+    g({
+      contract: o,
+      callDataString: n.calldata,
+      value: l > 0n ? l : void 0,
       invokeWallet: !0
     })
-  ), m;
-}, b = "0xef0100", x = async (t, r) => {
+  ), s;
+}, T = "0xef0100", H = async (t, r) => {
   try {
-    const o = O(t), e = await o.getCode(r);
-    if (e === "0x" || !e)
+    const { fetchRpcUrl: o } = A[t];
+    if (!o)
+      throw new Error("RPC URL not found for the specified chain ID");
+    const e = k(o), i = await e.getCode(r);
+    if (i === "0x" || !i)
       return { delegated: !1, implementation: void 0, nonce: void 0 };
-    if (e.toLowerCase().startsWith(b) && e.length === 48) {
-      const i = `0x${e.slice(8)}`, a = await o.getTransactionCount(r);
-      return { delegated: !0, implementation: p.getAddress(i), nonce: a };
+    if (i.toLowerCase().startsWith(T) && i.length === 48) {
+      const a = `0x${i.slice(8)}`, n = await e.getTransactionCount(r);
+      return { delegated: !0, implementation: p.getAddress(a), nonce: n };
     } else
       throw Error("checkEOAWithDelegation: It is a contract");
   } catch (o) {
-    throw B.error("checkEOAWithDelegation error", { error: o }), o;
+    throw D.error("checkEOAWithDelegation error", { error: o }), o;
   }
-}, H = (t) => {
-  const { hinkalWalletAddress: r } = W[t].contractData;
-  if (!r || l(r, d))
+}, N = (t) => {
+  const { hinkalWalletAddress: r } = A[t].contractData;
+  if (!r || f(r, u))
     throw Error("Hinkal Wallet Address is not set");
   return r;
-}, Bt = async (t, r) => {
-  if (t === F.localhost || !r)
+}, xt = async (t, r) => {
+  if (t === W.localhost || !r)
     return;
-  const o = y.getSignerAddressFromPrivateKey(t, r), { delegated: e, implementation: i } = await x(t, o), a = H(t);
-  if (!e || !l(i, a)) {
+  const o = y.getSignerAddressFromPrivateKey(t, r), { delegated: e, implementation: i } = await H(t, o), a = N(t);
+  if (!e || !f(i, a)) {
     const n = await y.authorizeDelegation(t, r, a);
     return {
       v: n.signature.v.toString(),
@@ -167,21 +202,24 @@ const h = ({
       chainId: String(t)
     };
   }
-}, kt = (t) => {
+}, Tt = (t) => {
   if (!t)
     return;
   const { v: r, r: o, s: e, nonce: i, chainId: a, address: n } = t;
-  return { signature: k.Signature.from({ v: r, r: o, s: e }), nonce: BigInt(i), chainId: BigInt(a), address: n };
+  return { signature: I.Signature.from({ v: r, r: o, s: e }), nonce: BigInt(i), chainId: BigInt(a), address: n };
 };
 export {
-  x as checkEOAWithDelegation,
-  D as createApproveEmporiumOp,
-  Ot as createLifiBridgeOps,
-  Wt as createTransaferEmporiumOpsBatch,
-  A as createTransferToEmporiumOp,
-  h as emporiumOp,
-  Ft as encodeEmporiumMetadata,
-  I as generateFundAndApproveOps,
-  Bt as getAuthorizationDataIfNeeded,
-  kt as recoverAuthorizationData
+  H as checkEOAWithDelegation,
+  B as createApproveEmporiumOp,
+  Bt as createLifiBridgeOps,
+  Ot as createTransaferEmporiumOpsBatch,
+  E as createTransferToEmporiumOp,
+  g as emporiumOp,
+  Dt as encodeEmporiumMetadata,
+  F as generateFundAndApproveOps,
+  It as generateFundApproveAndTransactOps,
+  xt as getAuthorizationDataIfNeeded,
+  x as modifyDataForProxy,
+  Pt as modifyDataForProxyWithPrivateKey,
+  Tt as recoverAuthorizationData
 };

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

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

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

@@ -1,4 +1,7 @@
+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 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[]>;
+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[]>;

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

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

package/functions/snarkjs/constructEmporiumProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const de=require("../../data-structures/utxo/Utxo.cjs"),d=require("../../constants/protocol.constants.cjs"),le=require("../../constants/chains.constants.cjs"),ue=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),ge=require("../../webworker/performTaskWithWorker.cjs"),pe=require("../../webworker/worker.registry.cjs"),o=require("./common.snarkjs.cjs"),Z=require("../web3/etherFunctions.cjs"),$=require("../private-wallet/emporium.helpers.cjs"),Ae=require("../../types/external-action.types.cjs"),Se=require("../../types/circom-data.types.cjs"),he=require("./generateCircomData.cjs"),fe=require("./generateZkProof.cjs"),j=require("../utils/time.utils.cjs"),qe=require("../../types/hinkal.types.cjs"),ke=require("../utils/fees.utils.cjs"),G=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),He=require("../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const Ce=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),Te=require("../../data-structures/AccountActions/AccountActions.cjs"),we=async(s,J,Q,l,f,t,e,m,T,X,w,Y,K,y=d.zeroAddress,c=le.chainIds.localhost,u=t.map(()=>!1),q=t.map(()=>0n),g,r=void 0,L=!1,p,A=void 0,V,M=d.defaultSignatureData,x,U=!0)=>{const z=o.calcAmountChanges(t,e),k=o.calcEncryptedOutputs(e),S=m.getShieldedPrivateKey(),D=de.Utxo.findCorrectRandomization(Z.randomBigInt(31),S),ee=await G.hinkalCheckTokenRegistry(V??G.createHinkalHelperFromData(c),l,o.calcAmountChanges(t,e,!0)),_=t.map(a=>a.map(i=>i.getConstructableParams())),{inCommitmentSiblings:te,inCommitmentSiblingSides:ae,accessTokenSiblings:W,accessTokenSiblingSides:b,rootHashHinkal:P,rootHashAccessToken:H}=await Ce.getMerkleTreeSiblingsAndRootHashes(c,m,_,L,ee,J,Q,U),E=await ge.performTaskWithWorker({type:pe.WorkerVariant.ZKProof,payload:{type:ue.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:_,onChainCreation:u,proverVersion:s}}}),I=o.buildOutCommitments(s,e,u),C=x??Z.randomBigInt(31),ne=He.poseidonFunction(C),n={rootHashHinkal:P,erc20TokenAddresses:l,tokenIds:f,inNullifiers:E,outTimeStamp:e.length>0?BigInt(e[0][0].timeStamp):j.getCurrentTimeInSeconds(),extraRandomization:D,amountChanges:z,outCommitments:I,rootHashAccessToken:H,calldataHash:0n,shieldedPrivateKey:S,accessTokenSiblings:W,accessTokenSiblingSides:b,outAmounts:e.map(a=>a.map(i=>i.amount)),outPublicKeys:e.map(a=>a.map(i=>i.getStealthAddress())),inAmounts:t.map(a=>a.map(i=>i.amount.toString())),inTimeStamps:t.map(a=>a.map(i=>i.timeStamp)),inRandomizations:t.map(a=>a.map(i=>i.randomization)),inCommitmentSiblings:te,inCommitmentSiblingSides:ae,messageSeed:C},re=g?Te.AccountActions.getSignerAddressFromPrivateKey(c,g):void 0,R=w,F=Ae.ExternalActionId.Emporium,N=await $.encodeEmporiumMetadata(c,w,g,Y,ne,re),h=e.length===0?"swapperMWMin0":`swapperMW${T}x${X}x${e[0].length}`,B=o.calcPublicSignalCount(h,n.erc20TokenAddresses,n.amountChanges,n.inNullifiers,n.outCommitments,f.length);if(r||(r=qe.defaultHinkalLogicArgs(z.length,m),r.interactionAddress="0x032f580aFFE7a5f17025fAF83c13B4277A880532",r.inHinkalAddress=m.getInHinkalAddress(r.interactionAddress)),s==="v1x1"){if(n.interactionAddress=r.interactionAddress,m.getInHinkalAddress(n.interactionAddress)!==r.inHinkalAddress)throw new Error("inHinkalAddress mismatch");n.externalApprovalAddresses=r?.useApprovalUtxoData?.map(({externalApprovalAddresses:a})=>a)??Array(T).fill([d.zeroAddress,d.zeroAddress,d.zeroAddress])}A||(A=ke.generateFeeStructure(q,l));const v=o.calcAmountChanges(t,e,!0);p||(p=o.getSlippageValues(v,r)),n.calldataHash=o.createCallDataHash(s,B,y,R,F,N,k,q,void 0,p,u,r,A,M);const O={outTimeStamp:j.getCurrentTimeInSeconds(),rootHashAccessToken:H,calldataHash:n.calldataHash,shieldedPrivateKey:S,accessTokenSiblings:W,accessTokenSiblingSides:b,messageSeed:C},{zkCallData:ie}=await fe.generateZkProof(s,c,h,h==="swapperMWMin0"?O:n,K),oe=o.calcStealthAddressStructure(D,S),se=await he.generateCircomData(s,I,E,P,H,v,l,t,e,k,q,B,F,R,N,y,n.calldataHash,f,oe,u,Se.defaultHookData,h==="swapperMWMin0"?O.outTimeStamp:n.outTimeStamp,r,p,A,M),ce={tokenNumber:t.length,nullifierAmount:t.length>0?t[0].length:0,outputAmount:e.length>0?e[0].length:0},me=await $.getAuthorizationDataIfNeeded(c,g);return{zkCallData:ie,circomData:se,dimData:ce,encryptedOutputs:k,authorizationData:me}};exports.constructEmporiumProof=we;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const de=require("../../data-structures/utxo/Utxo.cjs"),le=require("../../data-structures/crypto-keys/keys.cjs"),d=require("../../constants/protocol.constants.cjs"),ue=require("../../constants/chains.constants.cjs"),ge=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),pe=require("../../webworker/performTaskWithWorker.cjs"),Se=require("../../webworker/worker.registry.cjs"),o=require("./common.snarkjs.cjs"),Z=require("../web3/etherFunctions.cjs"),$=require("../private-wallet/emporium.helpers.cjs"),he=require("../../types/external-action.types.cjs"),Ae=require("../../types/circom-data.types.cjs"),fe=require("./generateCircomData.cjs"),qe=require("./generateZkProof.cjs"),j=require("../utils/time.utils.cjs"),ke=require("../../types/hinkal.types.cjs"),He=require("../utils/fees.utils.cjs"),G=require("../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs"),ye=require("../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const Ce=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),Te=async(s,J,K,l,f,t,e,m,C,Q,T,X,Y,w=d.zeroAddress,c=ue.chainIds.localhost,u=t.map(()=>!1),q=t.map(()=>0n),g,r=void 0,L=!1,p,S=void 0,V,M=d.defaultSignatureData,x,U=!0)=>{const z=o.calcAmountChanges(t,e),k=o.calcEncryptedOutputs(e),h=m.getShieldedPrivateKey(),D=de.Utxo.findCorrectRandomization(Z.randomBigInt(31),h),ee=await G.hinkalCheckTokenRegistry(V??G.createHinkalHelperFromData(c),l,o.calcAmountChanges(t,e,!0)),_=t.map(a=>a.map(i=>i.getConstructableParams())),{inCommitmentSiblings:te,inCommitmentSiblingSides:ae,accessTokenSiblings:W,accessTokenSiblingSides:b,rootHashHinkal:P,rootHashAccessToken:H}=await Ce.getMerkleTreeSiblingsAndRootHashes(c,m,_,L,ee,J,K,U),E=await pe.performTaskWithWorker({type:Se.WorkerVariant.ZKProof,payload:{type:ge.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:_,onChainCreation:u,proverVersion:s}}}),I=o.buildOutCommitments(s,e,u),y=x??Z.randomBigInt(31),ne=ye.poseidonFunction(y),n={rootHashHinkal:P,erc20TokenAddresses:l,tokenIds:f,inNullifiers:E,outTimeStamp:e.length>0?BigInt(e[0][0].timeStamp):j.getCurrentTimeInSeconds(),extraRandomization:D,amountChanges:z,outCommitments:I,rootHashAccessToken:H,calldataHash:0n,shieldedPrivateKey:h,accessTokenSiblings:W,accessTokenSiblingSides:b,outAmounts:e.map(a=>a.map(i=>i.amount)),outPublicKeys:e.map(a=>a.map(i=>i.getStealthAddress())),inAmounts:t.map(a=>a.map(i=>i.amount.toString())),inTimeStamps:t.map(a=>a.map(i=>i.timeStamp)),inRandomizations:t.map(a=>a.map(i=>i.randomization)),inCommitmentSiblings:te,inCommitmentSiblingSides:ae,messageSeed:y},re=g?le.UserKeys.getSignerAddressFromPrivateKey(c,g):void 0,R=T,F=he.ExternalActionId.Emporium,N=await $.encodeEmporiumMetadata(c,T,g,X,ne,re),A=e.length===0?"swapperMWMin0":`swapperMW${C}x${Q}x${e[0].length}`,B=o.calcPublicSignalCount(A,n.erc20TokenAddresses,n.amountChanges,n.inNullifiers,n.outCommitments,f.length);if(r||(r=ke.defaultHinkalLogicArgs(z.length,m),r.interactionAddress="0x032f580aFFE7a5f17025fAF83c13B4277A880532",r.inHinkalAddress=m.getInHinkalAddress(r.interactionAddress)),s==="v1x1"){if(n.interactionAddress=r.interactionAddress,m.getInHinkalAddress(n.interactionAddress)!==r.inHinkalAddress)throw new Error("inHinkalAddress mismatch");n.externalApprovalAddresses=r?.useApprovalUtxoData?.map(({externalApprovalAddresses:a})=>a)??Array(C).fill([d.zeroAddress,d.zeroAddress,d.zeroAddress])}S||(S=He.generateFeeStructure(q,l));const v=o.calcAmountChanges(t,e,!0);p||(p=o.getSlippageValues(v,r)),n.calldataHash=o.createCallDataHash(s,B,w,R,F,N,k,q,void 0,p,u,r,S,M);const O={outTimeStamp:j.getCurrentTimeInSeconds(),rootHashAccessToken:H,calldataHash:n.calldataHash,shieldedPrivateKey:h,accessTokenSiblings:W,accessTokenSiblingSides:b,messageSeed:y},{zkCallData:ie}=await qe.generateZkProof(s,c,A,A==="swapperMWMin0"?O:n,Y),oe=o.calcStealthAddressStructure(D,h),se=await fe.generateCircomData(s,I,E,P,H,v,l,t,e,k,q,B,F,R,N,w,n.calldataHash,f,oe,u,Ae.defaultHookData,A==="swapperMWMin0"?O.outTimeStamp:n.outTimeStamp,r,p,S,M),ce={tokenNumber:t.length,nullifierAmount:t.length>0?t[0].length:0,outputAmount:e.length>0?e[0].length:0},me=await $.getAuthorizationDataIfNeeded(c,g);return{zkCallData:ie,circomData:se,dimData:ce,encryptedOutputs:k,authorizationData:me}};exports.constructEmporiumProof=Te;