@hinkal/common 0.2.17 → 0.2.19

package/functions/web3/okxAPI.mjs

@@ -1,43 +1,43 @@
-import { PublicKey as r } from "@solana/web3.js";
-import { getAmountInWei as P } from "./etherFunctions.mjs";
-import { isSolanaLike as h, networkRegistry as K } from "../../constants/chains.constants.mjs";
-import { getSwapperAccountPublicKey as O } from "../pre-transaction/solana.mjs";
-import { callOkxAPI as T } from "../../API/callOkxAPI.mjs";
-const D = (o, e, n, s, i = 0.7) => ({
+import { PublicKey as o } from "@solana/web3.js";
+import { randomBigInt as P, getAmountInWei as I } from "./etherFunctions.mjs";
+import { isSolanaLike as K, networkRegistry as O } from "../../constants/chains.constants.mjs";
+import { getSwapperAccountPublicKeyFromSalt as T } from "../pre-transaction/solana.mjs";
+import { callOkxAPI as D } from "../../API/callOkxAPI.mjs";
+const E = (r, t, n, s, i = 0.7) => ({
   amount: `${n}`,
   chainIndex: "501",
   // Solana mainnet
-  fromTokenAddress: o.toString(),
-  toTokenAddress: e.toString(),
+  fromTokenAddress: r.toString(),
+  toTokenAddress: t.toString(),
   userWalletAddress: s,
   slippagePercent: `${i}`,
   directRoute: !0
-}), $ = async (o, e, n, s, i = 0.5, a, c) => {
-  if (!h(o))
+}), q = async (r, t, n, s, i = 0.5, a, c) => {
+  if (!K(r))
     throw new Error("OKX is only supported on Solana");
-  const d = P(e, s), { hinkalAddress: l, originalDeployer: u } = K[o].contractData;
-  if (!u)
+  const u = P(31), p = I(t, s), { hinkalAddress: d, originalDeployer: l } = O[r].contractData;
+  if (!l)
     throw new Error("No original deployer configured for Solana program");
   if (c && !a)
     throw new Error("Proxy wallet address is required");
-  const w = new r(l), g = new r(u), m = c && a ? new r(a) : O(w, g), p = new r(e.erc20TokenAddress), f = new r(n.erc20TokenAddress), A = D(
-    p,
+  const w = new o(d), g = new o(l), m = c && a ? new o(a) : T(w, g, u), A = new o(t.erc20TokenAddress), f = new o(n.erc20TokenAddress), S = E(
+    A,
     f,
-    d,
+    p,
     m.toString(),
     i
-  ), { okxResponse: t, status: k } = await T(o, { quote: A });
+  ), { okxResponse: e, status: k } = await D({ quote: S });
   if (k !== "success")
     throw Error("OKX API Fetch Error");
-  if (t.code !== "0")
-    throw new Error(`OKX API error: ${t.msg}`);
-  const S = BigInt(t.data.routerResult.toTokenAmount), y = JSON.stringify(t);
+  if (e.code !== "0")
+    throw new Error(`OKX API error: ${e.msg}`);
+  const h = BigInt(e.data.routerResult.toTokenAmount), y = JSON.stringify({ ...e, swapperAccountSalt: u.toString() });
   return {
-    outSwapAmountValue: S,
+    outSwapAmountValue: h,
     okxDataValue: y
   };
 };
 export {
-  D as createOKXQuote,
-  $ as getOKXPrice
+  E as createOKXQuote,
+  q as getOKXPrice
 };

package/functions/web3/oneInchAPI.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../API/callOneInchAPI.cjs");require("../../constants/token-data/index.cjs");require("../../constants/chains.constants.cjs");const e=require("../../constants/protocol.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const q=require("../../error-handling/error-codes.constants.cjs"),a=require("./etherFunctions.cjs");require("../../types/circom-data.types.cjs");const d=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const l=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("../../data-structures/crypto-keys/keys.cjs");const A=require("./getContractMetadata.cjs"),I=async(s,t,i,n,u=.7)=>{try{const o={fromTokenAddress:t.erc20TokenAddress!==e.zeroAddress?t.erc20TokenAddress:e.oneInchZeroAddress,toTokenAddress:i.erc20TokenAddress!==e.zeroAddress?i.erc20TokenAddress:e.oneInchZeroAddress,fromAddress:e.zeroAddress,destReceiver:A.getContractMetadata(d.ContractType.OneInchExternalActionContract,s).address,amount:a.getAmountInWei(t,n),slippage:u,disableEstimate:!0,allowPartialFill:!1},r=await c.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 l.Logger.log({error:o}),Error(q.transactionErrorCodes.NO_ONEINCH_PRICE)}};exports.getOneInchPrice=I;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("../../API/callOneInchAPI.cjs");require("../../constants/token-data/index.cjs");require("../../constants/chains.constants.cjs");const e=require("../../constants/protocol.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const a=require("../../error-handling/error-codes.constants.cjs"),d=require("./etherFunctions.cjs");require("../../types/circom-data.types.cjs");const q=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const l=require("../../error-handling/logger.cjs"),A=require("./getContractMetadata.cjs"),I=async(s,t,n,c,i=.7)=>{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:A.getContractMetadata(q.ContractType.OneInchExternalActionContract,s).address,amount:d.getAmountInWei(t,c),slippage:i,disableEstimate:!0,allowPartialFill:!1},r=await u.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 l.Logger.log({error:o}),Error(a.transactionErrorCodes.NO_ONEINCH_PRICE)}};exports.getOneInchPrice=I;

package/functions/web3/oneInchAPI.mjs

@@ -1,7 +1,7 @@
 import { callOneInchAPI as a } from "../../API/callOneInchAPI.mjs";
 import "../../constants/token-data/index.mjs";
 import "../../constants/chains.constants.mjs";
-import { zeroAddress as e, oneInchZeroAddress as p } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as e, oneInchZeroAddress as s } from "../../constants/protocol.constants.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
 import "../../constants/server.constants.mjs";
@@ -20,31 +20,18 @@ import "../../types/circom-data.types.mjs";
 import { ContractType as A } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import "../../API/getServerURL.mjs";
-import "../../data-structures/http/HttpClient.mjs";
-import "axios";
-import "ethers";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../constants/save-depths.mjs";
-import "../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
 import { Logger as l } from "../../error-handling/logger.mjs";
-import "@solana/web3.js";
-import "../../data-structures/crypto-keys/keys.mjs";
 import { getContractMetadata as f } from "./getContractMetadata.mjs";
-const $ = async (m, o, i, s, n = 0.7) => {
+const H = async (m, o, i, n, p = 0.7) => {
   try {
     const t = {
-      fromTokenAddress: o.erc20TokenAddress !== e ? o.erc20TokenAddress : p,
-      toTokenAddress: i.erc20TokenAddress !== e ? i.erc20TokenAddress : p,
+      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: f(A.OneInchExternalActionContract, m).address,
-      amount: d(o, s),
-      slippage: n,
+      amount: d(o, n),
+      slippage: p,
       disableEstimate: !0,
       // disable gas estimation, we don't need it
       // disable partial filling:
@@ -65,5 +52,5 @@ const $ = async (m, o, i, s, n = 0.7) => {
   }
 };
 export {
-  $ as getOneInchPrice
+  H 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 T=require("../../error-handling/get-error.message.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/chains.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../../data-structures/crypto-keys/keys.cjs");const m=5e4,l=1,d=11,w=15,q=async(t,i)=>{try{const r=await t.getFeeData(),s=i===0?d:w;return r.gasPrice?.mul(s).div(10)??void 0}catch(r){console.log("getGasPrice error: ",{err:r});return}},P=(t,i,r)=>new Promise((s,a)=>{const o=setTimeout(()=>{a(new Error(c.transactionErrorCodes.TRANSACTION_TIMEOUT))},r);t.wait(i).then(e=>{clearTimeout(o),s(e)}).catch(e=>{clearTimeout(o),a(e)})}),g=async({contractFunction:t,args:i,gasPrice:r,gasLimit:s,nonce:a,confirmations:o,waitTime:e})=>{const n=await t(...i,{type:0,gasLimit:s,gasPrice:r,nonce:a});return await P(n,o??l,e??m)},E=async({provider:t,contractFunction:i,args:r,gasLimit:s,nonce:a,confirmations:o})=>{try{const e=await q(t,0);return await g({contractFunction:i,args:r,gasPrice:e,gasLimit:s,nonce:a,confirmations:o})}catch(e){const n=T.getErrorMessage(e);if(n===c.UserFriendlyErrorCodes.MAX_FEE_GAS_ERROR||n===c.transactionErrorCodes.TRANSACTION_TIMEOUT){console.log("Timeout Hit: Increase gas");const u=await q(t,1);return await g({contractFunction:i,args:r,gasPrice:u,gasLimit:s,nonce:a,confirmations:o})}throw e}};exports.runContractFunction=E;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../error-handling/error-codes.constants.cjs");require("ethers");const m=require("../../error-handling/get-error.message.cjs");require("../../constants/vite.constants.cjs");const l=5e4,d=1,w=11,P=15,g=async(e,s)=>{try{const t=await e.getFeeData(),a=s===0?w:P;return t.gasPrice?.mul(a).div(10)??void 0}catch(t){console.log("getGasPrice error: ",{err:t});return}},E=(e,s,t)=>new Promise((a,o)=>{const n=setTimeout(()=>{o(new Error(i.transactionErrorCodes.TRANSACTION_TIMEOUT))},t);e.wait(s).then(r=>{clearTimeout(n),a(r)}).catch(r=>{clearTimeout(n),o(r)})}),T=async({contractFunction:e,args:s,gasPrice:t,gasLimit:a,nonce:o,confirmations:n,waitTime:r})=>{const c=await e(...s,{type:0,gasLimit:a,gasPrice:t,nonce:o});return await E(c,n??d,r??l)},y=async({provider:e,contractFunction:s,args:t,gasLimit:a,nonce:o,confirmations:n})=>{try{const r=await g(e,0);return await T({contractFunction:s,args:t,gasPrice:r,gasLimit:a,nonce:o,confirmations:n})}catch(r){const c=m.getErrorMessage(r);if(c===i.UserFriendlyErrorCodes.MAX_FEE_GAS_ERROR||c===i.transactionErrorCodes.TRANSACTION_TIMEOUT){console.log("Timeout Hit: Increase gas");const u=await g(e,1);return await T({contractFunction:s,args:t,gasPrice:u,gasLimit:a,nonce:o,confirmations:n})}throw r}};exports.runContractFunction=y;

package/functions/web3/runContractFunction.mjs

@@ -1,91 +1,73 @@
-import { UserFriendlyErrorCodes as T, transactionErrorCodes as u } from "../../error-handling/error-codes.constants.mjs";
+import { UserFriendlyErrorCodes as g, transactionErrorCodes as T } from "../../error-handling/error-codes.constants.mjs";
 import "ethers";
-import { getErrorMessage as g } from "../../error-handling/get-error.message.mjs";
-import "../../constants/server.constants.mjs";
-import "../../API/getServerURL.mjs";
-import "../../data-structures/http/HttpClient.mjs";
-import "axios";
-import "../../constants/chains.constants.mjs";
-import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
-import "../../types/activities.types.mjs";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
+import { getErrorMessage as w } from "../../error-handling/get-error.message.mjs";
 import "../../constants/vite.constants.mjs";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import "@solana/web3.js";
-import "../../data-structures/crypto-keys/keys.mjs";
-const w = 5e4, l = 1, P = 11, d = 15, m = async (o, i) => {
+const l = 5e4, P = 1, d = 11, E = 15, m = async (e, a) => {
   try {
-    const t = await o.getFeeData(), e = i === 0 ? P : d;
-    return t.gasPrice?.mul(e).div(10) ?? void 0;
+    const t = await e.getFeeData(), o = a === 0 ? d : E;
+    return t.gasPrice?.mul(o).div(10) ?? void 0;
   } catch (t) {
     console.log("getGasPrice error: ", { err: t });
     return;
   }
-}, E = (o, i, t) => new Promise((e, a) => {
-  const s = setTimeout(() => {
-    a(new Error(u.TRANSACTION_TIMEOUT));
+}, y = (e, a, t) => new Promise((o, s) => {
+  const n = setTimeout(() => {
+    s(new Error(T.TRANSACTION_TIMEOUT));
   }, t);
-  o.wait(i).then((r) => {
-    clearTimeout(s), e(r);
+  e.wait(a).then((r) => {
+    clearTimeout(n), o(r);
   }).catch((r) => {
-    clearTimeout(s), a(r);
+    clearTimeout(n), s(r);
   });
-}), p = async ({
-  contractFunction: o,
-  args: i,
+}), u = async ({
+  contractFunction: e,
+  args: a,
   gasPrice: t,
-  gasLimit: e,
-  nonce: a,
-  confirmations: s,
+  gasLimit: o,
+  nonce: s,
+  confirmations: n,
   waitTime: r
 }) => {
-  const n = await o(...i, {
+  const c = await e(...a, {
     type: 0,
-    gasLimit: e,
+    gasLimit: o,
     gasPrice: t,
-    nonce: a
+    nonce: s
   });
-  return await E(
-    n,
-    s ?? l,
-    r ?? w
+  return await y(
+    c,
+    n ?? P,
+    r ?? l
   );
-}, q = async ({
-  provider: o,
-  contractFunction: i,
+}, I = async ({
+  provider: e,
+  contractFunction: a,
   args: t,
-  gasLimit: e,
-  nonce: a,
-  confirmations: s
+  gasLimit: o,
+  nonce: s,
+  confirmations: n
 }) => {
   try {
     const r = await m(
-      o,
+      e,
       0
       /* Initial */
     );
-    return await p({ contractFunction: i, args: t, gasPrice: r, gasLimit: e, nonce: a, confirmations: s });
+    return await u({ contractFunction: a, args: t, gasPrice: r, gasLimit: o, nonce: s, confirmations: n });
   } catch (r) {
-    const n = g(r);
-    if (n === T.MAX_FEE_GAS_ERROR || n === u.TRANSACTION_TIMEOUT) {
+    const c = w(r);
+    if (c === g.MAX_FEE_GAS_ERROR || c === T.TRANSACTION_TIMEOUT) {
       console.log("Timeout Hit: Increase gas");
-      const c = await m(
-        o,
+      const i = await m(
+        e,
         1
         /* Secondary */
       );
-      return await p({ contractFunction: i, args: t, gasPrice: c, gasLimit: e, nonce: a, confirmations: s });
+      return await u({ contractFunction: a, args: t, gasPrice: i, gasLimit: o, nonce: s, confirmations: n });
     }
     throw r;
   }
 };
 export {
-  q as runContractFunction
+  I as runContractFunction
 };

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 u=require("../../constants/chains.constants.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const p=require("../../error-handling/error-codes.constants.cjs"),P=require("./etherFunctions.cjs");require("../../types/circom-data.types.cjs");const d=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const h=require("../../error-handling/logError.cjs");require("../../constants/save-depths.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../../data-structures/crypto-keys/keys.cjs");const l=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()}))),a=n.map(e=>e.token1Balance).reduce((e,q)=>q>=e?q:e,0n);if(a===0n)throw new Error(p.transactionErrorCodes.UNISWAP_NOT_ENOUGH_LIQUIDITY);return n.find(e=>e.token1Balance===a)},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(i){throw h.logError(i),i}},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:i}=await l(n,o,c.wrappedErc20TokenAddress??c.erc20TokenAddress,r.wrappedErc20TokenAddress??r.erc20TokenAddress);return i}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),i=g.utils.defaultAbiCoder.encode(["uint24"],[n]),a=P.getAmountInWei(r,c);return{tokenPrice:await w(s,t,r,o,n,a),poolFee:i}}catch{throw Error(p.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=A;exports.getUniswapPrice=E;exports.getUniswapPriceHelper=w;exports.searchPoolAndFee=l;
+"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"),C=require("../../constants/protocol.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const l=require("../../error-handling/error-codes.constants.cjs"),P=require("./etherFunctions.cjs");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");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;

package/functions/web3/uniswapAPI.mjs

@@ -17,26 +17,14 @@ import "../../constants/events.constants.mjs";
 import { transactionErrorCodes as l } from "../../error-handling/error-codes.constants.mjs";
 import { getAmountInWei as f } from "./etherFunctions.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as m } from "../../types/ethereum-network.types.mjs";
+import { ContractType as d } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import "../../API/getServerURL.mjs";
-import "../../data-structures/http/HttpClient.mjs";
-import "axios";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
 import { logError as y } from "../../error-handling/logError.mjs";
-import "../../constants/save-depths.mjs";
-import "../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import "@solana/web3.js";
-import "../../data-structures/crypto-keys/keys.mjs";
-const C = async (s, o, i, t) => {
+const C = async (s, o, a, t) => {
   const e = (await Promise.all(
     [100, 500, 3e3, 1e4].map(async (r) => ({
-      poolAddress: await o.getPool(i, t, r),
+      poolAddress: await o.getPool(a, t, r),
       fee: r
     }))
   )).filter(({ poolAddress: r }) => r !== u), n = await Promise.all(
@@ -45,66 +33,66 @@ const C = async (s, o, i, t) => {
       fee: r.fee,
       token1Balance: (await s.balanceOf(r.poolAddress)).toBigInt()
     }))
-  ), c = n.map((r) => r.token1Balance).reduce((r, d) => d >= r ? d : r, 0n);
-  if (c === 0n)
+  ), 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);
-  return n.find((r) => r.token1Balance === c);
-}, g = async (s, o, i, t, e, n) => {
+  return n.find((r) => r.token1Balance === i);
+}, g = async (s, o, a, t, e, n) => {
   try {
     if (!p[o].quoterV2Address)
       throw Error("No Quoter Contract Provided");
     return (await s.getContractWithFetcherByChainId(
       o,
-      m.UniswapV3QuoterContract,
+      d.UniswapV3QuoterContract,
       p[o].quoterV2Address
     ).callStatic.quoteExactInputSingle({
-      tokenIn: i.wrappedErc20TokenAddress ?? i.erc20TokenAddress,
+      tokenIn: a.wrappedErc20TokenAddress ?? a.erc20TokenAddress,
       tokenOut: t.wrappedErc20TokenAddress ?? t.erc20TokenAddress,
       fee: e,
       amountIn: n,
       sqrtPriceLimitX96: 0
     })).amountOut.toBigInt();
-  } catch (a) {
-    throw y(a), a;
+  } catch (c) {
+    throw y(c), c;
   }
-}, E = async (s, o, i, t) => {
+}, E = async (s, o, a, t) => {
   try {
     const e = s.getContractWithFetcherByChainId(
       o,
-      m.UniswapV3FactoryContract,
+      d.UniswapV3FactoryContract,
       p[o].uniswapV3FactoryAddress
     ), n = s.getContractWithFetcherByChainId(
       o,
-      m.ERC20Contract,
+      d.ERC20Contract,
       t.wrappedErc20TokenAddress ?? t.erc20TokenAddress
-    ), { fee: a } = await C(
+    ), { fee: c } = await C(
       n,
       e,
-      i.wrappedErc20TokenAddress ?? i.erc20TokenAddress,
+      a.wrappedErc20TokenAddress ?? a.erc20TokenAddress,
       t.wrappedErc20TokenAddress ?? t.erc20TokenAddress
     );
-    return a;
+    return c;
   } catch (e) {
     throw console.log("Error in getUniswapFee", e), e;
   }
-}, or = async (s, o, i, t, e) => {
+}, G = async (s, o, a, t, e) => {
   try {
-    const n = await E(s, o, t, e), a = A.defaultAbiCoder.encode(["uint24"], [n]), c = f(t, i);
+    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,
-      c
-    ), poolFee: a };
+      i
+    ), poolFee: c };
   } catch {
     throw Error(l.NO_UNISWAP_PRICE);
   }
 };
 export {
   E as getUniswapFee,
-  or as getUniswapPrice,
+  G as getUniswapPrice,
   g as getUniswapPriceHelper,
   C as searchPoolAndFee
 };