@hinkal/common 0.2.13 → 0.2.14

package/functions/web3/getContractMetadata.mjs

@@ -0,0 +1,30 @@
+import { contractMetadataMapping as s } from "../../constants/contracts.constants.mjs";
+import { networkRegistry as a } from "../../constants/chains.constants.mjs";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { ethers as c } from "ethers";
+const d = (r, e) => {
+  const t = a[e];
+  if (!t)
+    throw new Error(i.UNSUPPORTED_NETWORK);
+  const o = s[r];
+  if (!o)
+    throw new Error(`Unsupported contractType: ${r}`);
+  return o(t.contractData);
+}, f = (r, e, t) => {
+  const o = d(r, e);
+  if (!o.abi)
+    throw new Error(`No ABI configured for contractType: ${r}`);
+  if (o.address && t)
+    throw new Error(`Overriding address is not supported for contractType: ${r}`);
+  const n = o.address ?? t;
+  if (!n)
+    throw new Error(`No contractAddress configured for contractType: ${r}`);
+  return new c.Contract(n, o.abi);
+}, m = (r, e, t = void 0) => f(e, r, t).connect(
+  new c.providers.StaticJsonRpcProvider(a[r].fetchRpcUrl)
+);
+export {
+  f as getContract,
+  d as getContractMetadata,
+  m as getContractWithFetcherByChainId
+};

package/functions/web3/odosAPI.cjs

@@ -1 +1 @@
-"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;
+"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"),a=require("../../constants/protocol.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.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("../../types/activities.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;

package/functions/web3/odosAPI.d.ts

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

package/functions/web3/odosAPI.mjs

@@ -1,58 +1,62 @@
-import { callOdosAPI as d } from "../../API/callOdosAPI.mjs";
-import { localhostNetwork as p, networkRegistry as m } from "../../constants/chains.constants.mjs";
+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 { zeroAddress as a } from "../../constants/protocol.constants.mjs";
 import "../../constants/vite.constants.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.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 "../../constants/addresses.constants.mjs";
+import "../../constants/token.limits.constants.mjs";
 import { transactionErrorCodes as c } from "../../error-handling/error-codes.constants.mjs";
 import { getAmountInWei as u } from "./etherFunctions.mjs";
 import "axios";
 import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
+import "../../types/activities.types.mjs";
 import "ethers";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-const b = async (r, t, e, i) => {
+const Q = async (r, o, s, i) => {
   try {
-    const o = {
-      chainId: r.getCurrentChainId() !== 31337 ? r.getCurrentChainId() : p,
+    const t = {
+      chainId: r !== 31337 ? r : n,
       inputTokens: [
         {
-          tokenAddress: t?.wrappedErc20TokenAddress ?? t.erc20TokenAddress,
-          amount: u(t, i).toString()
+          tokenAddress: o?.wrappedErc20TokenAddress ?? o.erc20TokenAddress,
+          amount: u(o, i).toString()
         }
       ],
       outputTokens: [
         {
-          tokenAddress: e?.wrappedErc20TokenAddress ?? e.erc20TokenAddress,
+          tokenAddress: s?.wrappedErc20TokenAddress ?? s.erc20TokenAddress,
           proportion: 1
         }
       ],
-      userAddr: m[r.getCurrentChainId()].contractData.odosExternalActionInstanceAddress || a,
+      userAddr: d[r].contractData.odosExternalActionInstanceAddress || a,
       slippageLimitPercent: 10,
       disableRFQs: !0
       // sometimes swap fails because of RFQs
-    }, { odosResponse: s, status: n } = await d(
-      r.getCurrentChainId(),
-      o
+    }, { odosResponse: e, status: p } = await m(
+      r,
+      t
     );
-    if (n !== "success")
+    if (p !== "success")
       throw Error("Odos API Fetch Error");
     return {
-      outSwapAmountValue: BigInt(s.outputTokens[0].amount),
-      odosDataValue: s.transaction.data
+      outSwapAmountValue: BigInt(e.outputTokens[0].amount),
+      odosDataValue: e.transaction.data
     };
-  } catch (o) {
-    throw console.log({ error: o }), Error(c.NO_ODOS_PRICE);
+  } catch (t) {
+    throw console.log({ error: t }), Error(c.NO_ODOS_PRICE);
   }
 };
 export {
-  b as getOdosPrice
+  Q 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/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;
+"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");const e=require("../../constants/protocol.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.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("../../types/activities.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;

package/functions/web3/oneInchAPI.d.ts

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

package/functions/web3/oneInchAPI.mjs

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

package/functions/web3/runContractFunction.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../error-handling/error-codes.constants.cjs");require("ethers");const m=require("../../error-handling/get-error.message.cjs");require("axios");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/reorg-depths.constants.cjs");const l=5e4,q=1,d=11,w=15,g=async(t,s)=>{try{const r=await t.getFeeData(),a=s===0?d:w;return r.gasPrice?.mul(a).div(10)??void 0}catch(r){console.log("getGasPrice error: ",{err:r});return}},P=(t,s,r)=>new Promise((a,o)=>{const n=setTimeout(()=>{o(new Error(c.transactionErrorCodes.TRANSACTION_TIMEOUT))},r);t.wait(s).then(e=>{clearTimeout(n),a(e)}).catch(e=>{clearTimeout(n),o(e)})}),T=async({contractFunction:t,args:s,gasPrice:r,gasLimit:a,nonce:o,confirmations:n,waitTime:e})=>{const i=await t(...s,{type:0,gasLimit:a,gasPrice:r,nonce:o});return await P(i,n??q,e??l)},E=async({provider:t,contractFunction:s,args:r,gasLimit:a,nonce:o,confirmations:n})=>{try{const e=await g(t,0);return await T({contractFunction:s,args:r,gasPrice:e,gasLimit:a,nonce:o,confirmations:n})}catch(e){const i=m.getErrorMessage(e);if(i===c.UserFriendlyErrorCodes.MAX_FEE_GAS_ERROR||i===c.transactionErrorCodes.TRANSACTION_TIMEOUT){console.log("Timeout Hit: Increase gas");const u=await g(t,1);return await T({contractFunction:s,args:r,gasPrice:u,gasLimit:a,nonce:o,confirmations:n})}throw e}};exports.runContractFunction=E;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../error-handling/error-codes.constants.cjs");require("ethers");const m=require("../../error-handling/get-error.message.cjs");require("axios");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/reorg-depths.constants.cjs");const q=5e4,l=1,d=11,w=15,g=async(t,s)=>{try{const r=await t.getFeeData(),a=s===0?d:w;return r.gasPrice?.mul(a).div(10)??void 0}catch(r){console.log("getGasPrice error: ",{err:r});return}},P=(t,s,r)=>new Promise((a,o)=>{const i=setTimeout(()=>{o(new Error(c.transactionErrorCodes.TRANSACTION_TIMEOUT))},r);t.wait(s).then(e=>{clearTimeout(i),a(e)}).catch(e=>{clearTimeout(i),o(e)})}),T=async({contractFunction:t,args:s,gasPrice:r,gasLimit:a,nonce:o,confirmations:i,waitTime:e})=>{const n=await t(...s,{type:0,gasLimit:a,gasPrice:r,nonce:o});return await P(n,i??l,e??q)},E=async({provider:t,contractFunction:s,args:r,gasLimit:a,nonce:o,confirmations:i})=>{try{const e=await g(t,0);return await T({contractFunction:s,args:r,gasPrice:e,gasLimit:a,nonce:o,confirmations:i})}catch(e){const n=m.getErrorMessage(e);if(n===c.UserFriendlyErrorCodes.MAX_FEE_GAS_ERROR||n===c.transactionErrorCodes.TRANSACTION_TIMEOUT){console.log("Timeout Hit: Increase gas");const u=await g(t,1);return await T({contractFunction:s,args:r,gasPrice:u,gasLimit:a,nonce:o,confirmations:i})}throw e}};exports.runContractFunction=E;

package/functions/web3/runContractFunction.mjs

@@ -7,6 +7,7 @@ import "../../constants/vite.constants.mjs";
 import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
+import "../../types/activities.types.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
@@ -49,7 +50,7 @@ const w = 5e4, l = 1, P = 11, d = 15, m = async (o, e) => {
     s ?? l,
     r ?? w
   );
-}, U = async ({
+}, v = async ({
   provider: o,
   contractFunction: e,
   args: t,
@@ -79,5 +80,5 @@ const w = 5e4, l = 1, P = 11, d = 15, m = async (o, e) => {
   }
 };
 export {
-  U as runContractFunction
+  v as runContractFunction
 };

package/functions/web3/uniswapAPI.cjs

@@ -1 +1 @@
-"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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("ethers");require("../../constants/token-data/index.cjs");const u=require("../../constants/chains.constants.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/axelar.constants.cjs");require("../../constants/rewards.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");const l=require("../../error-handling/error-codes.constants.cjs"),P=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("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const h=require("../../error-handling/logError.cjs"),q=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)},w=async(s,t,c,r,o,n)=>{try{if(!u.networkRegistry[t].quoterV2Address)throw Error("No Quoter Contract Provided");return(await s.getContractWithFetcherByChainId(t,d.ContractType.UniswapV3QuoterContract,u.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,d.ContractType.UniswapV3FactoryContract,u.networkRegistry[t].uniswapV3FactoryAddress),n=s.getContractWithFetcherByChainId(t,d.ContractType.ERC20Contract,r.wrappedErc20TokenAddress??r.erc20TokenAddress),{fee:a}=await q(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 w(s,t,r,o,n,i),poolFee:a}}catch{throw Error(l.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=A;exports.getUniswapPrice=E;exports.getUniswapPriceHelper=w;exports.searchPoolAndFee=q;

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, 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<{
+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<{
     tokenPrice: bigint;
     poolFee: string;
 }>;

package/functions/web3/uniswapAPI.mjs

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