@hinkal/common 0.2.4 → 0.2.13

package/functions/utils/string.utils.mjs

@@ -1,14 +1,24 @@
-function e(t) {
+function s(t) {
   return t?.toLowerCase().split(" ").map((r) => r.charAt(0).toUpperCase() + r.substring(1)).join(" ");
 }
-function n(t) {
+function u(t) {
   return t.charAt(0).toUpperCase() + t.slice(1);
 }
-function i(t) {
+function c(t) {
   return !t || t === null || Array.isArray(t) && t.length === 0 ? !0 : Object.keys(t).length === 0 && t.constructor === Object;
 }
+const o = (t) => {
+  t.startsWith("0x") && (t = t.slice(2));
+  const r = [];
+  for (let e = 0; e < t.length; e += 2) {
+    const n = parseInt(t.slice(e, e + 2), 16);
+    r.push(n);
+  }
+  return new TextDecoder("utf-8").decode(new Uint8Array(r));
+};
 export {
-  n as capitalizeFirstLetter,
-  i as isNullOrEmpty,
-  e as toTitleCase
+  u as capitalizeFirstLetter,
+  o as hexToUtf8,
+  c as isNullOrEmpty,
+  s as toTitleCase
 };

package/functions/utils/userAgent.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("ua-parser-js"),a=new s.UAParser,o=17,n=()=>{const{name:e,version:r}=a.getBrowser(),t=parseInt(r?.split(".")[0]??"0",10);return!(e==="Safari"&&t&&o>t)},l={mpcVault:"MPCVault - Multisig Wallet",utila:"UtilaWallet"},u=e=>{const r=e?.session?.peer?.metadata?.name;return!Object.values(l).includes(r)};exports.browserSupported=n;exports.walletSupported=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("ua-parser-js"),a=new s.UAParser,o=["17"],n=()=>{const{name:e,version:r}=a.getBrowser(),t=r?.substring(0,2);return!(e==="Safari"&&t&&!o.includes(t))},u={mpcVault:"MPCVault - Multisig Wallet",utila:"UtilaWallet"},l=e=>{const r=e?.session?.peer?.metadata?.name;return!Object.values(u).includes(r)};exports.browserSupported=n;exports.walletSupported=l;

package/functions/utils/userAgent.mjs

@@ -1,15 +1,15 @@
 import { UAParser as s } from "ua-parser-js";
-const a = new s(), n = 17, i = () => {
-  const { name: e, version: t } = a.getBrowser(), r = parseInt(t?.split(".")[0] ?? "0", 10);
-  return !(e === "Safari" && r && n > r);
+const a = new s(), n = ["17"], u = () => {
+  const { name: e, version: r } = a.getBrowser(), t = r?.substring(0, 2);
+  return !(e === "Safari" && t && !n.includes(t));
 }, o = {
   mpcVault: "MPCVault - Multisig Wallet",
   utila: "UtilaWallet"
-}, u = (e) => {
-  const t = e?.session?.peer?.metadata?.name;
-  return !Object.values(o).includes(t);
+}, i = (e) => {
+  const r = e?.session?.peer?.metadata?.name;
+  return !Object.values(o).includes(r);
 };
 export {
-  i as browserSupported,
-  u as walletSupported
+  u as browserSupported,
+  i as walletSupported
 };

package/functions/web3/functionCalls/accessTokenCalls.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../../constants/chains.constants.cjs");require("../../../types/circom-data.types.cjs");const r=require("../../../types/ethereum-network.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/curve.types.cjs");const T=require("../etherFunctions.cjs"),g=async e=>(await e.getContractWithFetcher(r.ContractType.CrossChainAccessTokenManagerContract).functions.hasToken(e.userKeys.getAccessKey()))[0],y=async(e,n)=>{const t=e.getContractWithSigner(r.ContractType.CrossChainAccessTokenManagerContract),s=i.networkRegistry[e.getCurrentChainId()].accessTokenMintingFee??"0",c={value:T.ethToWei(s)};return await t.addToken(n,c)},d=async(e,n,t)=>{const s=e.getContractWithSigner(r.ContractType.CrossChainAccessTokenContract),a=i.networkRegistry[e.getCurrentChainId()].accessTokenMintingFee??"0",c=T.ethToWei(a),o=t.reduce((k,h)=>k+h.messageFee,0n),u={chains:t,totalMessageFees:o},C={value:c+o};return await s.addTokenCrossChain(n,u,C)};exports.checkHinkalAccessToken=g;exports.mintAccessToken=y;exports.mintTokenCrossChain=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../../constants/chains.constants.cjs");require("../../../types/circom-data.types.cjs");const r=require("../../../types/ethereum-network.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/curve.types.cjs");const T=require("../etherFunctions.cjs"),g=async e=>(await e.getContractWithFetcher(r.ContractType.CrossChainAccessTokenContract).functions.hasToken(e.userKeys.getAccessKey()))[0],y=async(e,n)=>{const t=e.getContractWithSigner(r.ContractType.CrossChainAccessTokenContract),s=i.networkRegistry[e.getCurrentChainId()].accessTokenMintingFee??"0",c={value:T.ethToWei(s)};return await t.addToken(n,c)},d=async(e,n,t)=>{const s=e.getContractWithSigner(r.ContractType.CrossChainAccessTokenContract),a=i.networkRegistry[e.getCurrentChainId()].accessTokenMintingFee??"0",c=T.ethToWei(a),o=t.reduce((k,h)=>k+h.messageFee,0n),u={chains:t,totalMessageFees:o},C={value:c+o};return await s.addTokenCrossChain(n,u,C)};exports.checkHinkalAccessToken=g;exports.mintAccessToken=y;exports.mintTokenCrossChain=d;

package/functions/web3/functionCalls/accessTokenCalls.mjs

@@ -1,16 +1,16 @@
 import { networkRegistry as i } from "../../../constants/chains.constants.mjs";
 import "../../../types/circom-data.types.mjs";
-import { ContractType as a } from "../../../types/ethereum-network.types.mjs";
+import { ContractType as r } from "../../../types/ethereum-network.types.mjs";
 import "../../../types/transactions.types.mjs";
 import "../../../types/curve.types.mjs";
 import { ethToWei as C } from "../etherFunctions.mjs";
-const y = async (e) => (await e.getContractWithFetcher(a.CrossChainAccessTokenManagerContract).functions.hasToken(e.userKeys.getAccessKey()))[0], W = async (e, n) => {
-  const t = e.getContractWithSigner(a.CrossChainAccessTokenManagerContract), s = i[e.getCurrentChainId()].accessTokenMintingFee ?? "0", o = {
-    value: C(s)
+const y = async (e) => (await e.getContractWithFetcher(r.CrossChainAccessTokenContract).functions.hasToken(e.userKeys.getAccessKey()))[0], W = async (e, s) => {
+  const t = e.getContractWithSigner(r.CrossChainAccessTokenContract), n = i[e.getCurrentChainId()].accessTokenMintingFee ?? "0", o = {
+    value: C(n)
   };
-  return await t.addToken(n, o);
-}, A = async (e, n, t) => {
-  const s = e.getContractWithSigner(a.CrossChainAccessTokenContract), r = i[e.getCurrentChainId()].accessTokenMintingFee ?? "0", o = C(r), c = t.reduce(
+  return await t.addToken(s, o);
+}, A = async (e, s, t) => {
+  const n = e.getContractWithSigner(r.CrossChainAccessTokenContract), a = i[e.getCurrentChainId()].accessTokenMintingFee ?? "0", o = C(a), c = t.reduce(
     (k, g) => k + g.messageFee,
     0n
   ), T = {
@@ -19,7 +19,7 @@ const y = async (e) => (await e.getContractWithFetcher(a.CrossChainAccessTokenMa
   }, u = {
     value: o + c
   };
-  return await s.addTokenCrossChain(n, T, u);
+  return await n.addTokenCrossChain(s, T, u);
 };
 export {
   y as checkHinkalAccessToken,

package/functions/web3/functionCalls/transactCallDirect.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("../../../constants/protocol.constants.cjs"),I=require("../../../types/ethereum-network.types.cjs"),S=require("./approveToken.cjs"),f=require("../../utils/time.utils.cjs");require("../../../constants/chains.constants.cjs");require("../../../constants/vite.constants.cjs");require("axios");require("../../../constants/coingecko.constants.cjs");const b=require("../../../API/API.cjs");require("ethers");require("../../../types/curve.types.cjs");require("../../../constants/token-data/index.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/axelar.constants.cjs");require("../../../constants/rewards.constants.cjs");require("../../../constants/reorg-depths.constants.cjs");const x=async(e,t,o,i,A,y,C,T,n=!0)=>{const p=e.getCurrentChainId(),a=e.getContractWithSigner(I.ContractType.HinkalContract),u=await e.getEthereumAddress(),v=C??a,d=T??a,h=e.userKeys.getAccessKey(),g=n?"transact":"addTokenAndTransact";t>0n&&o.erc20TokenAddress!==m.zeroAddress&&await S.approveTokenToHinkal(e,v,t,o);const q={value:t>0n&&o.erc20TokenAddress===m.zeroAddress?BigInt(t).toString():void 0};let r;const l=[i[0],i[1],i[2],y,A,{...q,from:u}];let s=[];if(n)s=l;else{const{signatureData:c}=await b.API.getAccessTokenSignature(p,u,h);s=[c,...l]}try{r=(await d.estimateGas[g](...s)).toNumber()}catch(c){console.log("hinkalDeposit: gas estimation error",{err:c})}const w=r&&r>=0?Math.ceil(r*12/10):void 0;return q.gasLimit=w,await f.waitLittle(),await d[g](...s)};exports.transactCallDirect=x;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("../../../constants/protocol.constants.cjs"),T=require("../../../types/ethereum-network.types.cjs"),A=require("./approveToken.cjs"),q=require("../../utils/time.utils.cjs"),S=async(s,e,o,t,i,n,l,h)=>{const a=s.getContractWithSigner(T.ContractType.HinkalContract),p=await s.getEthereumAddress(),v=l??a,d=h??a,g="transact";e>0n&&o.erc20TokenAddress!==u.zeroAddress&&await A.approveTokenToHinkal(s,v,e,o);const c={value:e>0n&&o.erc20TokenAddress===u.zeroAddress?BigInt(e).toString():void 0};let r;try{r=(await d.estimateGas[g](t[0],t[1],t[2],n,i,{...c,from:p})).toNumber()}catch(y){console.log("hinkalDeposit: gas estimation error: ",{err:y})}const m=r&&r>=0?Math.ceil(r*12/10):void 0;return c.gasLimit=m,await q.waitLittle(),await d[g](t[0],t[1],t[2],n,i,c)};exports.transactCallDirect=S;

package/functions/web3/functionCalls/transactCallDirect.d.ts

@@ -3,4 +3,4 @@ import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
 import { ERC20Token } from '../../../types/token.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
-export declare const transactCallDirect: (hinkal: IHinkal, amount: bigint, tokenToApprove: ERC20Token, newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApproval?: ethers.Contract, contractTransaction?: ethers.Contract, hasAccessToken?: boolean) => Promise<any>;
+export declare const transactCallDirect: (hinkal: IHinkal, amount: bigint, tokenToApprove: ERC20Token, newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApporval?: ethers.Contract, contractTransaction?: ethers.Contract) => Promise<ethers.ContractTransaction>;

package/functions/web3/functionCalls/transactCallDirect.mjs

@@ -1,50 +1,36 @@
-import { zeroAddress as f } from "../../../constants/protocol.constants.mjs";
-import { ContractType as x } from "../../../types/ethereum-network.types.mjs";
-import { approveTokenToHinkal as I } from "./approveToken.mjs";
-import { waitLittle as K } from "../../utils/time.utils.mjs";
-import "../../../constants/chains.constants.mjs";
-import "../../../constants/vite.constants.mjs";
-import "axios";
-import "../../../constants/coingecko.constants.mjs";
-import { API as S } from "../../../API/API.mjs";
-import "ethers";
-import "../../../types/curve.types.mjs";
-import "../../../constants/token-data/index.mjs";
-import "../../../constants/contracts.constants.mjs";
-import "../../../constants/kyc.constants.mjs";
-import "../../../constants/axelar.constants.mjs";
-import "../../../constants/rewards.constants.mjs";
-import "../../../constants/reorg-depths.constants.mjs";
-const Q = async (t, r, s, i, u, A, C, y, c = !0) => {
-  const T = t.getCurrentChainId(), n = t.getContractWithSigner(x.HinkalContract), m = await t.getEthereumAddress(), h = C ?? n, d = y ?? n, v = t.userKeys.getAccessKey(), p = c ? "transact" : "addTokenAndTransact";
-  r > 0n && s.erc20TokenAddress !== f && await I(t, h, r, s);
-  const g = {
-    value: r > 0n && s.erc20TokenAddress === f ? BigInt(r).toString() : void 0
+import { zeroAddress as g } from "../../../constants/protocol.constants.mjs";
+import { ContractType as T } from "../../../types/ethereum-network.types.mjs";
+import { approveTokenToHinkal as y } from "./approveToken.mjs";
+import { waitLittle as u } from "../../utils/time.utils.mjs";
+const S = async (s, r, e, t, c, n, p, f) => {
+  const a = s.getContractWithSigner(T.HinkalContract), h = await s.getEthereumAddress(), v = p ?? a, d = f ?? a, m = "transact";
+  r > 0n && e.erc20TokenAddress !== g && await y(s, v, r, e);
+  const i = {
+    value: r > 0n && e.erc20TokenAddress === g ? BigInt(r).toString() : void 0
   };
   let o;
-  const l = [
-    i[0],
-    i[1],
-    i[2],
-    A,
-    u,
-    { ...g, from: m }
-  ];
-  let e = [];
-  if (c)
-    e = l;
-  else {
-    const { signatureData: a } = await S.getAccessTokenSignature(T, m, v);
-    e = [a, ...l];
-  }
   try {
-    o = (await d.estimateGas[p](...e)).toNumber();
-  } catch (a) {
-    console.log("hinkalDeposit: gas estimation error", { err: a });
+    o = (await d.estimateGas[m](
+      t[0],
+      t[1],
+      t[2],
+      n,
+      c,
+      { ...i, from: h }
+    )).toNumber();
+  } catch (A) {
+    console.log("hinkalDeposit: gas estimation error: ", { err: A });
   }
-  const w = o && o >= 0 ? Math.ceil(o * 12 / 10) : void 0;
-  return g.gasLimit = w, await K(), await d[p](...e);
+  const x = o && o >= 0 ? Math.ceil(o * 12 / 10) : void 0;
+  return i.gasLimit = x, await u(), await d[m](
+    t[0],
+    t[1],
+    t[2],
+    n,
+    c,
+    i
+  );
 };
 export {
-  Q as transactCallDirect
+  S as transactCallDirect
 };

package/functions/web3/functionCalls/transactCallRelayer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../../API/callRelayer.cjs");require("../../../constants/chains.constants.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("../../../constants/vite.constants.cjs");const u=require("../../snarkjs/common.snarkjs.cjs");require("../../../types/circom-data.types.cjs");require("../../utils/external-action.utils.cjs");require("node-forge");require("axios");const n=async(a,r,s,c,t)=>{const i=u.serializeCircomData(c),e=await o.callRelayerTransactAPI(a,{a:r[0],b:r[1],c:r[2],dimData:s,circomData:i,withPrivateMempool:t});if(e.status==="success")return e.message;throw new Error(e.error)};exports.transactCallRelayer=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../../API/callRelayer.cjs");require("../../../constants/chains.constants.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("../../../constants/vite.constants.cjs");const n=require("../../snarkjs/common.snarkjs.cjs");require("../../../types/circom-data.types.cjs");require("../../utils/external-action.utils.cjs");const u=async(a,r,s,c,t)=>{const i=n.serializeCircomData(c),e=await o.callRelayerTransactAPI(a,{a:r[0],b:r[1],c:r[2],dimData:s,circomData:i,withPrivateMempool:t});if(e.status==="success")return e.message;throw new Error(e.error)};exports.transactCallRelayer=u;

package/functions/web3/functionCalls/transactCallRelayer.mjs

@@ -1,27 +1,25 @@
-import { callRelayerTransactAPI as c } from "../../../API/callRelayer.mjs";
+import { callRelayerTransactAPI as e } from "../../../API/callRelayer.mjs";
 import "../../../constants/chains.constants.mjs";
 import "ethers";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "../../../constants/vite.constants.mjs";
-import { serializeCircomData as e } from "../../snarkjs/common.snarkjs.mjs";
+import { serializeCircomData as m } from "../../snarkjs/common.snarkjs.mjs";
 import "../../../types/circom-data.types.mjs";
 import "../../utils/external-action.utils.mjs";
-import "node-forge";
-import "axios";
-const x = async (t, r, i, m, s) => {
-  const a = e(m), o = await c(t, {
+const h = async (t, r, s, a, i) => {
+  const c = m(a), o = await e(t, {
     a: r[0],
     b: r[1],
     c: r[2],
-    dimData: i,
-    circomData: a,
-    withPrivateMempool: s
+    dimData: s,
+    circomData: c,
+    withPrivateMempool: i
   });
   if (o.status === "success")
     return o.message;
   throw new Error(o.error);
 };
 export {
-  x as transactCallRelayer
+  h as transactCallRelayer
 };

package/functions/web3/odosAPI.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../API/callOdosAPI.cjs");require("../../constants/token-data/index.cjs");const n=require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");const a=require("../../constants/protocol.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const d=require("../../error-handling/error-codes.constants.cjs"),q=require("./etherFunctions.cjs");require("axios");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const l=async(r,e,t,u)=>{try{const o={chainId:r!==31337?r:n.localhostNetwork,inputTokens:[{tokenAddress:e?.wrappedErc20TokenAddress??e.erc20TokenAddress,amount:q.getAmountInWei(e,u).toString()}],outputTokens:[{tokenAddress:t?.wrappedErc20TokenAddress??t.erc20TokenAddress,proportion:1}],userAddr:n.networkRegistry[r].contractData.odosExternalActionInstanceAddress||a.zeroAddress,slippageLimitPercent:10,disableRFQs:!0},{odosResponse:s,status:i}=await c.callOdosAPI(r,o);if(i!=="success")throw Error("Odos API Fetch Error");return{outSwapAmountValue:BigInt(s.outputTokens[0].amount),odosDataValue:s.transaction.data}}catch(o){throw console.log({error:o}),Error(d.transactionErrorCodes.NO_ODOS_PRICE)}};exports.getOdosPrice=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../API/callOdosAPI.cjs"),n=require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");const d=require("../../constants/protocol.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const a=require("../../error-handling/error-codes.constants.cjs"),q=require("./etherFunctions.cjs");require("axios");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const A=async(r,e,o,u)=>{try{const t={chainId:r.getCurrentChainId()!==31337?r.getCurrentChainId():n.localhostNetwork,inputTokens:[{tokenAddress:e?.wrappedErc20TokenAddress??e.erc20TokenAddress,amount:q.getAmountInWei(e,u).toString()}],outputTokens:[{tokenAddress:o?.wrappedErc20TokenAddress??o.erc20TokenAddress,proportion:1}],userAddr:n.networkRegistry[r.getCurrentChainId()].contractData.odosExternalActionInstanceAddress||d.zeroAddress,slippageLimitPercent:10,disableRFQs:!0},{odosResponse:s,status:i}=await c.callOdosAPI(r.getCurrentChainId(),t);if(i!=="success")throw Error("Odos API Fetch Error");return{outSwapAmountValue:BigInt(s.outputTokens[0].amount),odosDataValue:s.transaction.data}}catch(t){throw console.log({error:t}),Error(a.transactionErrorCodes.NO_ODOS_PRICE)}};exports.getOdosPrice=A;

package/functions/web3/odosAPI.d.ts

@@ -1,5 +1,6 @@
+import { IHinkal } from '../../data-structures';
 import { ERC20Token } from '../../types';
-export declare const getOdosPrice: (chainId: number, inSwapToken: ERC20Token, outSwapToken: ERC20Token, inSwapAmount: string) => Promise<{
+export declare const getOdosPrice: (hinkal: IHinkal, inSwapToken: ERC20Token, outSwapToken: ERC20Token, inSwapAmount: string) => Promise<{
     outSwapAmountValue: bigint;
     odosDataValue: string;
 }>;

package/functions/web3/odosAPI.mjs

@@ -1,6 +1,5 @@
-import { callOdosAPI as m } from "../../API/callOdosAPI.mjs";
-import "../../constants/token-data/index.mjs";
-import { localhostNetwork as n, networkRegistry as d } from "../../constants/chains.constants.mjs";
+import { callOdosAPI as d } from "../../API/callOdosAPI.mjs";
+import { localhostNetwork as p, networkRegistry as m } from "../../constants/chains.constants.mjs";
 import "../../constants/vite.constants.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
@@ -20,40 +19,40 @@ import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-const z = async (r, o, s, i) => {
+const b = async (r, t, e, i) => {
   try {
-    const t = {
-      chainId: r !== 31337 ? r : n,
+    const o = {
+      chainId: r.getCurrentChainId() !== 31337 ? r.getCurrentChainId() : p,
       inputTokens: [
         {
-          tokenAddress: o?.wrappedErc20TokenAddress ?? o.erc20TokenAddress,
-          amount: u(o, i).toString()
+          tokenAddress: t?.wrappedErc20TokenAddress ?? t.erc20TokenAddress,
+          amount: u(t, i).toString()
         }
       ],
       outputTokens: [
         {
-          tokenAddress: s?.wrappedErc20TokenAddress ?? s.erc20TokenAddress,
+          tokenAddress: e?.wrappedErc20TokenAddress ?? e.erc20TokenAddress,
           proportion: 1
         }
       ],
-      userAddr: d[r].contractData.odosExternalActionInstanceAddress || a,
+      userAddr: m[r.getCurrentChainId()].contractData.odosExternalActionInstanceAddress || a,
       slippageLimitPercent: 10,
       disableRFQs: !0
       // sometimes swap fails because of RFQs
-    }, { odosResponse: e, status: p } = await m(
-      r,
-      t
+    }, { odosResponse: s, status: n } = await d(
+      r.getCurrentChainId(),
+      o
     );
-    if (p !== "success")
+    if (n !== "success")
       throw Error("Odos API Fetch Error");
     return {
-      outSwapAmountValue: BigInt(e.outputTokens[0].amount),
-      odosDataValue: e.transaction.data
+      outSwapAmountValue: BigInt(s.outputTokens[0].amount),
+      odosDataValue: s.transaction.data
     };
-  } catch (t) {
-    throw console.log({ error: t }), Error(c.NO_ODOS_PRICE);
+  } catch (o) {
+    throw console.log({ error: o }), Error(c.NO_ODOS_PRICE);
   }
 };
 export {
-  z as getOdosPrice
+  b as getOdosPrice
 };

package/functions/web3/oneInchAPI.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../API/callOneInchAPI.cjs");require("../../constants/token-data/index.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");const e=require("../../constants/protocol.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const u=require("../../error-handling/error-codes.constants.cjs"),a=require("./etherFunctions.cjs");require("axios");require("../../types/circom-data.types.cjs");const d=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const q=require("./getContractMetadata.cjs"),l=async(s,t,n,c)=>{try{const o={fromTokenAddress:t.erc20TokenAddress!==e.zeroAddress?t.erc20TokenAddress:e.oneInchZeroAddress,toTokenAddress:n.erc20TokenAddress!==e.zeroAddress?n.erc20TokenAddress:e.oneInchZeroAddress,fromAddress:e.zeroAddress,destReceiver:q.getContractMetadata(d.ContractType.OneInchExternalActionContract,s).address,amount:a.getAmountInWei(t,c),slippage:10,disableEstimate:!0,allowPartialFill:!1},r=await i.callOneInchAPI(s,o);if(!r||!r.tx)throw Error("OneInch API price fetch error");return{outSwapAmountValue:BigInt(r.toAmount),oneInchDataValue:r.tx.data}}catch(o){throw console.log({error:o}),Error(u.transactionErrorCodes.NO_ONEINCH_PRICE)}};exports.getOneInchPrice=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../API/callOneInchAPI.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");const e=require("../../constants/protocol.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const u=require("../../error-handling/error-codes.constants.cjs"),d=require("./etherFunctions.cjs");require("axios");require("../../types/circom-data.types.cjs");const a=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const q=async(s,t,n,c)=>{try{const o={fromTokenAddress:t.erc20TokenAddress!==e.zeroAddress?t.erc20TokenAddress:e.oneInchZeroAddress,toTokenAddress:n.erc20TokenAddress!==e.zeroAddress?n.erc20TokenAddress:e.oneInchZeroAddress,fromAddress:e.zeroAddress,destReceiver:s.getContractMetadata(a.ContractType.OneInchExternalActionContract).address,amount:d.getAmountInWei(t,c),slippage:10,disableEstimate:!0,allowPartialFill:!1},r=await i.callOneInchAPI(s.getCurrentChainId(),o);if(!r||!r.tx)throw Error("OneInch API price fetch error");return{outSwapAmountValue:BigInt(r.toAmount),oneInchDataValue:r.tx.data}}catch(o){throw console.log({error:o}),Error(u.transactionErrorCodes.NO_ONEINCH_PRICE)}};exports.getOneInchPrice=q;

package/functions/web3/oneInchAPI.d.ts

@@ -1,5 +1,6 @@
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { ERC20Token } from '../../types';
-export declare const getOneInchPrice: (chainId: number, inSwapToken: ERC20Token, outSwapToken: ERC20Token, inSwapAmount: string) => Promise<{
+export declare const getOneInchPrice: (hinkal: IHinkal, inSwapToken: ERC20Token, outSwapToken: ERC20Token, inSwapAmount: string) => Promise<{
     outSwapAmountValue: bigint;
     oneInchDataValue: string;
 }>;

package/functions/web3/oneInchAPI.mjs

@@ -1,19 +1,18 @@
-import { callOneInchAPI as p } from "../../API/callOneInchAPI.mjs";
-import "../../constants/token-data/index.mjs";
+import { callOneInchAPI as a } from "../../API/callOneInchAPI.mjs";
 import "../../constants/chains.constants.mjs";
 import "../../constants/vite.constants.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
-import { zeroAddress as e, oneInchZeroAddress as s } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as e, oneInchZeroAddress as m } from "../../constants/protocol.constants.mjs";
 import "../../constants/coingecko.constants.mjs";
 import "../../constants/axelar.constants.mjs";
 import "../../constants/rewards.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
-import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
-import { getAmountInWei as c } from "./etherFunctions.mjs";
+import { transactionErrorCodes as c } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInWei as d } from "./etherFunctions.mjs";
 import "axios";
 import "../../types/circom-data.types.mjs";
-import { ContractType as d } from "../../types/ethereum-network.types.mjs";
+import { ContractType as p } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
 import "ethers";
@@ -21,16 +20,15 @@ import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-import { getContractMetadata as l } from "./getContractMetadata.mjs";
-const D = async (m, o, i, n) => {
+const v = async (s, t, i, n) => {
   try {
-    const t = {
-      fromTokenAddress: o.erc20TokenAddress !== e ? o.erc20TokenAddress : s,
-      toTokenAddress: i.erc20TokenAddress !== e ? i.erc20TokenAddress : s,
+    const o = {
+      fromTokenAddress: t.erc20TokenAddress !== e ? t.erc20TokenAddress : m,
+      toTokenAddress: i.erc20TokenAddress !== e ? i.erc20TokenAddress : m,
       fromAddress: e,
       // we user zero address here because this paramater is not relevant to us, only destReceiver is
-      destReceiver: l(d.OneInchExternalActionContract, m).address,
-      amount: c(o, n),
+      destReceiver: s.getContractMetadata(p.OneInchExternalActionContract).address,
+      amount: d(t, n),
       slippage: 10,
       disableEstimate: !0,
       // disable gas estimation, we don't need it
@@ -39,7 +37,7 @@ const D = async (m, o, i, n) => {
       // and returning leftover tokens to fromAddress
       // this is not what we want
       allowPartialFill: !1
-    }, r = await p(m, t);
+    }, r = await a(s.getCurrentChainId(), o);
     if (!r || !r.tx)
       throw Error("OneInch API price fetch error");
     return {
@@ -47,10 +45,10 @@ const D = async (m, o, i, n) => {
       oneInchDataValue: r.tx.data
       // calldata to use
     };
-  } catch (t) {
-    throw console.log({ error: t }), Error(a.NO_ONEINCH_PRICE);
+  } catch (o) {
+    throw console.log({ error: o }), Error(c.NO_ONEINCH_PRICE);
   }
 };
 export {
-  D as getOneInchPrice
+  v as getOneInchPrice
 };

package/functions/web3/uniswapAPI.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("ethers");require("../../constants/token-data/index.cjs");const d=require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");const C=require("../../constants/protocol.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const l=require("../../error-handling/error-codes.constants.cjs"),P=require("./etherFunctions.cjs");require("axios");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const h=require("../../error-handling/logError.cjs"),w=async(s,t,c,r)=>{const o=(await Promise.all([100,500,3e3,1e4].map(async e=>({poolAddress:await t.getPool(c,r,e),fee:e})))).filter(({poolAddress:e})=>e!==C.zeroAddress),n=await Promise.all(o.map(async e=>({poolAddress:e.poolAddress,fee:e.fee,token1Balance:(await s.balanceOf(e.poolAddress)).toBigInt()}))),i=n.map(e=>e.token1Balance).reduce((e,p)=>p>=e?p:e,0n);if(i===0n)throw new Error(l.transactionErrorCodes.UNISWAP_NOT_ENOUGH_LIQUIDITY);return n.find(e=>e.token1Balance===i)},q=async(s,t,c,r,o,n)=>{try{if(!d.networkRegistry[t].quoterV2Address)throw Error("No Quoter Contract Provided");return(await s.getContractWithFetcherByChainId(t,u.ContractType.UniswapV3QuoterContract,d.networkRegistry[t].quoterV2Address).callStatic.quoteExactInputSingle({tokenIn:c.wrappedErc20TokenAddress??c.erc20TokenAddress,tokenOut:r.wrappedErc20TokenAddress??r.erc20TokenAddress,fee:o,amountIn:n,sqrtPriceLimitX96:0})).amountOut.toBigInt()}catch(a){throw h.logError(a),a}},A=async(s,t,c,r)=>{try{const o=s.getContractWithFetcherByChainId(t,u.ContractType.UniswapV3FactoryContract,d.networkRegistry[t].uniswapV3FactoryAddress),n=s.getContractWithFetcherByChainId(t,u.ContractType.ERC20Contract,r.wrappedErc20TokenAddress??r.erc20TokenAddress),{fee:a}=await w(n,o,c.wrappedErc20TokenAddress??c.erc20TokenAddress,r.wrappedErc20TokenAddress??r.erc20TokenAddress);return a}catch(o){throw console.log("Error in getUniswapFee",o),o}},E=async(s,t,c,r,o)=>{try{const n=await A(s,t,r,o),a=g.utils.defaultAbiCoder.encode(["uint24"],[n]),i=P.getAmountInWei(r,c);return{tokenPrice:await q(s,t,r,o,n,i),poolFee:a}}catch{throw Error(l.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=A;exports.getUniswapPrice=E;exports.getUniswapPriceHelper=q;exports.searchPoolAndFee=w;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("ethers"),d=require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");const C=require("../../constants/protocol.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const l=require("../../error-handling/error-codes.constants.cjs"),y=require("./etherFunctions.cjs");require("axios");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const h=require("../../error-handling/logError.cjs"),w=async(t,s,r,o)=>{const c=(await Promise.all([100,500,3e3,1e4].map(async e=>({poolAddress:await s.getPool(r,o,e),fee:e})))).filter(({poolAddress:e})=>e!==C.zeroAddress),n=await Promise.all(c.map(async e=>({poolAddress:e.poolAddress,fee:e.fee,token1Balance:(await t.balanceOf(e.poolAddress)).toBigInt()}))),i=n.map(e=>e.token1Balance).reduce((e,p)=>p>=e?p:e,0n);if(i===0n)throw new Error(l.transactionErrorCodes.UNISWAP_NOT_ENOUGH_LIQUIDITY);return n.find(e=>e.token1Balance===i)},q=async(t,s,r,o,c)=>{try{if(!d.networkRegistry[t.getCurrentChainId()].quoterV2Address)throw Error("No Quoter Contract Provided");return(await t.getContractWithFetcher(u.ContractType.UniswapV3QuoterContract,d.networkRegistry[t.getCurrentChainId()].quoterV2Address).callStatic.quoteExactInputSingle({tokenIn:s.wrappedErc20TokenAddress??s.erc20TokenAddress,tokenOut:r.wrappedErc20TokenAddress??r.erc20TokenAddress,fee:o,amountIn:c,sqrtPriceLimitX96:0})).amountOut.toBigInt()}catch(n){throw h.logError(n),n}},g=async(t,s,r)=>{try{const o=t.getCurrentChainId(),c=t.getContractWithFetcher(u.ContractType.UniswapV3FactoryContract,d.networkRegistry[o].uniswapV3FactoryAddress),n=t.getContractWithFetcher(u.ContractType.ERC20Contract,r.wrappedErc20TokenAddress??r.erc20TokenAddress),{fee:a}=await w(n,c,s.wrappedErc20TokenAddress??s.erc20TokenAddress,r.wrappedErc20TokenAddress??r.erc20TokenAddress);return a}catch(o){throw console.log("Error in getUniswapFee",o),o}},P=async(t,s,r,o)=>{try{const c=await g(t,r,o),n=A.utils.defaultAbiCoder.encode(["uint24"],[c]),a=y.getAmountInWei(r,s);return{tokenPrice:await q(t,r,o,c,a),poolFee:n}}catch{throw Error(l.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=g;exports.getUniswapPrice=P;exports.getUniswapPriceHelper=q;exports.searchPoolAndFee=w;

package/functions/web3/uniswapAPI.d.ts

@@ -1,15 +1,15 @@
 import { Contract } from 'ethers';
+import { IHinkal } from '../../data-structures';
 import { ERC20Token } from '../../types';
-import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 interface PoolAndFee {
     poolAddress: string;
     fee: number;
     token1Balance: bigint;
 }
 export declare const searchPoolAndFee: (token1Contract: Contract, factory: Contract, token0Address: string, token1Address: string) => Promise<PoolAndFee>;
-export declare const getUniswapPriceHelper: (hinkal: IHinkal, chainId: number, token0: ERC20Token, token1: ERC20Token, fee: number, inSwapAmount: bigint) => Promise<bigint>;
-export declare const getUniswapFee: (hinkal: IHinkal, chainId: number, token0: ERC20Token, token1: ERC20Token) => Promise<number>;
-export declare const getUniswapPrice: (hinkal: IHinkal, chainId: number, inSwapAmount: string, inSwapToken: ERC20Token, outSwapToken: ERC20Token) => Promise<{
+export declare const getUniswapPriceHelper: (hinkal: IHinkal, token0: ERC20Token, token1: ERC20Token, fee: number, inSwapAmount: bigint) => Promise<bigint>;
+export declare const getUniswapFee: (hinkal: IHinkal, token0: ERC20Token, token1: ERC20Token) => Promise<number>;
+export declare const getUniswapPrice: (hinkal: IHinkal, inSwapAmount: string, inSwapToken: ERC20Token, outSwapToken: ERC20Token) => Promise<{
     tokenPrice: bigint;
     poolFee: string;
 }>;

package/functions/web3/uniswapAPI.mjs

@@ -1,98 +1,87 @@
-import { utils as A } from "ethers";
-import "../../constants/token-data/index.mjs";
-import { networkRegistry as p } from "../../constants/chains.constants.mjs";
+import { utils as w } from "ethers";
+import { networkRegistry as d } from "../../constants/chains.constants.mjs";
 import "../../constants/vite.constants.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
-import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as A } from "../../constants/protocol.constants.mjs";
 import "../../constants/coingecko.constants.mjs";
 import "../../constants/axelar.constants.mjs";
 import "../../constants/rewards.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
-import { transactionErrorCodes as l } from "../../error-handling/error-codes.constants.mjs";
-import { getAmountInWei as f } from "./etherFunctions.mjs";
+import { transactionErrorCodes as u } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInWei as l } from "./etherFunctions.mjs";
 import "axios";
 import "../../types/circom-data.types.mjs";
-import { ContractType as d } from "../../types/ethereum-network.types.mjs";
+import { ContractType as p } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-import { logError as y } from "../../error-handling/logError.mjs";
-const C = async (s, o, a, t) => {
-  const e = (await Promise.all(
+import { logError as C } from "../../error-handling/logError.mjs";
+const f = async (e, s, t, o) => {
+  const c = (await Promise.all(
     [100, 500, 3e3, 1e4].map(async (r) => ({
-      poolAddress: await o.getPool(a, t, r),
+      poolAddress: await s.getPool(t, o, r),
       fee: r
     }))
-  )).filter(({ poolAddress: r }) => r !== u), n = await Promise.all(
-    e.map(async (r) => ({
+  )).filter(({ poolAddress: r }) => r !== A), n = await Promise.all(
+    c.map(async (r) => ({
       poolAddress: r.poolAddress,
       fee: r.fee,
-      token1Balance: (await s.balanceOf(r.poolAddress)).toBigInt()
+      token1Balance: (await e.balanceOf(r.poolAddress)).toBigInt()
     }))
   ), i = n.map((r) => r.token1Balance).reduce((r, m) => m >= r ? m : r, 0n);
   if (i === 0n)
-    throw new Error(l.UNISWAP_NOT_ENOUGH_LIQUIDITY);
+    throw new Error(u.UNISWAP_NOT_ENOUGH_LIQUIDITY);
   return n.find((r) => r.token1Balance === i);
-}, g = async (s, o, a, t, e, n) => {
+}, g = async (e, s, t, o, c) => {
   try {
-    if (!p[o].quoterV2Address)
+    if (!d[e.getCurrentChainId()].quoterV2Address)
       throw Error("No Quoter Contract Provided");
-    return (await s.getContractWithFetcherByChainId(
-      o,
-      d.UniswapV3QuoterContract,
-      p[o].quoterV2Address
+    return (await e.getContractWithFetcher(
+      p.UniswapV3QuoterContract,
+      d[e.getCurrentChainId()].quoterV2Address
     ).callStatic.quoteExactInputSingle({
-      tokenIn: a.wrappedErc20TokenAddress ?? a.erc20TokenAddress,
+      tokenIn: s.wrappedErc20TokenAddress ?? s.erc20TokenAddress,
       tokenOut: t.wrappedErc20TokenAddress ?? t.erc20TokenAddress,
-      fee: e,
-      amountIn: n,
+      fee: o,
+      amountIn: c,
       sqrtPriceLimitX96: 0
     })).amountOut.toBigInt();
-  } catch (c) {
-    throw y(c), c;
+  } catch (n) {
+    throw C(n), n;
   }
-}, E = async (s, o, a, t) => {
+}, I = async (e, s, t) => {
   try {
-    const e = s.getContractWithFetcherByChainId(
-      o,
-      d.UniswapV3FactoryContract,
-      p[o].uniswapV3FactoryAddress
-    ), n = s.getContractWithFetcherByChainId(
-      o,
-      d.ERC20Contract,
+    const o = e.getCurrentChainId(), c = e.getContractWithFetcher(
+      p.UniswapV3FactoryContract,
+      d[o].uniswapV3FactoryAddress
+    ), n = e.getContractWithFetcher(
+      p.ERC20Contract,
       t.wrappedErc20TokenAddress ?? t.erc20TokenAddress
-    ), { fee: c } = await C(
+    ), { fee: a } = await f(
       n,
-      e,
-      a.wrappedErc20TokenAddress ?? a.erc20TokenAddress,
+      c,
+      s.wrappedErc20TokenAddress ?? s.erc20TokenAddress,
       t.wrappedErc20TokenAddress ?? t.erc20TokenAddress
     );
-    return c;
-  } catch (e) {
-    throw console.log("Error in getUniswapFee", e), e;
+    return a;
+  } catch (o) {
+    throw console.log("Error in getUniswapFee", o), o;
   }
-}, G = async (s, o, a, t, e) => {
+}, D = async (e, s, t, o) => {
   try {
-    const n = await E(s, o, t, e), c = A.defaultAbiCoder.encode(["uint24"], [n]), i = f(t, a);
-    return { tokenPrice: await g(
-      s,
-      o,
-      t,
-      e,
-      n,
-      i
-    ), poolFee: c };
+    const c = await I(e, t, o), n = w.defaultAbiCoder.encode(["uint24"], [c]), a = l(t, s);
+    return { tokenPrice: await g(e, t, o, c, a), poolFee: n };
   } catch {
-    throw Error(l.NO_UNISWAP_PRICE);
+    throw Error(u.NO_UNISWAP_PRICE);
   }
 };
 export {
-  E as getUniswapFee,
-  G as getUniswapPrice,
+  I as getUniswapFee,
+  D as getUniswapPrice,
   g as getUniswapPriceHelper,
-  C as searchPoolAndFee
+  f as searchPoolAndFee
 };