@hinkal/common 0.1.33 → 0.1.34

package/functions/web3/runContractFunction.mjs

@@ -1,6 +1,6 @@
-import { UserFriendlyErrorCodes as l, transactionErrorCodes as g } 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 T } from "../../error-handling/get-error.message.mjs";
+import { getErrorMessage as p } from "../../error-handling/get-error.message.mjs";
 import "axios";
 import "../../constants/chains.constants.mjs";
 import "../../constants/vite.constants.mjs";
@@ -9,70 +9,70 @@ import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
 import "circomlibjs";
 import "../../constants/reorg-depths.constants.mjs";
-const p = 5e4, w = 1, P = 11, d = 15, m = async (a, e) => {
+const w = 5e4, l = 1, P = 11, d = 15, m = async (o, e) => {
   try {
-    const t = await a.getFeeData(), s = e === 0 ? P : d, r = t.gasPrice?.mul(s).div(10) ?? void 0;
-    return console.log("getGasPrice , ", r?.toBigInt(), { gasPremiumType: e }), r;
+    const t = await o.getFeeData(), a = e === 0 ? P : d;
+    return t.gasPrice?.mul(a).div(10) ?? void 0;
   } catch (t) {
     console.log("getGasPrice error: ", { err: t });
     return;
   }
-}, E = (a, e, t) => new Promise((s, r) => {
-  const n = setTimeout(() => {
-    r(new Error(g.TRANSACTION_TIMEOUT));
+}, E = (o, e, t) => new Promise((a, s) => {
+  const i = setTimeout(() => {
+    s(new Error(T.TRANSACTION_TIMEOUT));
   }, t);
-  a.wait(e).then((o) => {
-    clearTimeout(n), s(o);
-  }).catch((o) => {
-    clearTimeout(n), r(o);
+  o.wait(e).then((r) => {
+    clearTimeout(i), a(r);
+  }).catch((r) => {
+    clearTimeout(i), s(r);
   });
 }), u = async ({
-  contractFunction: a,
+  contractFunction: o,
   args: e,
   gasPrice: t,
-  gasLimit: s,
-  nonce: r,
-  confirmations: n,
-  waitTime: o
+  gasLimit: a,
+  nonce: s,
+  confirmations: i,
+  waitTime: r
 }) => {
-  const i = await a(...e, {
+  const n = await o(...e, {
     type: 0,
-    gasLimit: s,
+    gasLimit: a,
     gasPrice: t,
-    nonce: r
+    nonce: s
   });
-  return console.log("runTransaction: ", i?.hash), await E(
-    i,
-    n ?? w,
-    o ?? p
+  return await E(
+    n,
+    i ?? l,
+    r ?? w
   );
 }, N = async ({
-  provider: a,
+  provider: o,
   contractFunction: e,
   args: t,
-  gasLimit: s,
-  nonce: r,
-  confirmations: n
+  gasLimit: a,
+  nonce: s,
+  confirmations: i
 }) => {
   try {
-    const o = await m(
-      a,
+    const r = await m(
+      o,
       0
       /* Initial */
     );
-    return await u({ contractFunction: e, args: t, gasPrice: o, gasLimit: s, nonce: r, confirmations: n });
-  } catch (o) {
-    const i = T(o);
-    if (i === l.MAX_FEE_GAS_ERROR || i === g.TRANSACTION_TIMEOUT) {
+    return await u({ contractFunction: e, args: t, gasPrice: r, gasLimit: a, nonce: s, confirmations: i });
+  } catch (r) {
+    const n = p(r);
+    if (n === g.MAX_FEE_GAS_ERROR || n === T.TRANSACTION_TIMEOUT) {
       console.log("Timeout Hit: Increase gas");
       const c = await m(
-        a,
+        o,
         1
         /* Secondary */
       );
-      return await u({ contractFunction: e, args: t, gasPrice: c, gasLimit: s, nonce: r, confirmations: n });
+      return await u({ contractFunction: e, args: t, gasPrice: c, gasLimit: a, nonce: s, confirmations: i });
     }
-    throw o;
+    throw r;
   }
 };
 export {

package/functions/web3/uniswapAPI.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const q=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");const h=require("../../error-handling/logError.cjs"),w=async(t,c,r,o)=>{const n=(await Promise.all([100,500,3e3,1e4].map(async e=>({poolAddress:await c.getPool(r,o,e),fee:e})))).filter(({poolAddress:e})=>e!==C.zeroAddress),s=await Promise.all(n.map(async e=>({poolAddress:e.poolAddress,fee:e.fee,token1Balance:(await t.balanceOf(e.poolAddress)).toBigInt()}))),i=s.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 s.find(e=>e.token1Balance===i)},g=async(t,c,r,o,n)=>{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:c.wrappedErc20TokenAddress??c.erc20TokenAddress,tokenOut:r.wrappedErc20TokenAddress??r.erc20TokenAddress,fee:o,amountIn:n,sqrtPriceLimitX96:0})).amountOut.toBigInt()}catch(s){throw h.logError(s),s}},A=async(t,c,r)=>{try{const o=t.getCurrentChainId(),n=t.getContractWithFetcher(u.ContractType.UniswapV3FactoryContract,d.networkRegistry[o].uniswapV3FactoryAddress),s=t.getContractWithFetcher(u.ContractType.ERC20Contract,r.wrappedErc20TokenAddress??r.erc20TokenAddress),{fee:a}=await w(s,n,c.wrappedErc20TokenAddress??c.erc20TokenAddress,r.wrappedErc20TokenAddress??r.erc20TokenAddress);return a}catch(o){throw console.log("Error in getUniswapFee",o),o}},P=async(t,c,r,o)=>{try{const n=await A(t,r,o),s=q.utils.defaultAbiCoder.encode(["uint24"],[n]),a=y.getAmountInWei(r,c);return{tokenPrice:await g(t,r,o,n,a),poolFee:s}}catch(n){throw console.log({error:n}),Error(l.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=A;exports.getUniswapPrice=P;exports.getUniswapPriceHelper=g;exports.searchPoolAndFee=w;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const q=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");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)},g=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}},A=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 A(t,r,o),n=q.utils.defaultAbiCoder.encode(["uint24"],[c]),a=y.getAmountInWei(r,s);return{tokenPrice:await g(t,r,o,c,a),poolFee:n}}catch{throw Error(l.transactionErrorCodes.NO_UNISWAP_PRICE)}};exports.getUniswapFee=A;exports.getUniswapPrice=P;exports.getUniswapPriceHelper=g;exports.searchPoolAndFee=w;

package/functions/web3/uniswapAPI.mjs

@@ -1,15 +1,15 @@
-import { utils as l } from "ethers";
+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 w } 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 u } from "../../error-handling/error-codes.constants.mjs";
-import { getAmountInWei as A } from "./etherFunctions.mjs";
+import { getAmountInWei as l } from "./etherFunctions.mjs";
 import "axios";
 import "../../types/circom-data.types.mjs";
 import { ContractType as p } from "../../types/ethereum-network.types.mjs";
@@ -17,23 +17,23 @@ import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
 import "circomlibjs";
 import { logError as C } from "../../error-handling/logError.mjs";
-const g = async (e, c, t, o) => {
-  const n = (await Promise.all(
+const f = async (e, s, t, o) => {
+  const c = (await Promise.all(
     [100, 500, 3e3, 1e4].map(async (r) => ({
-      poolAddress: await c.getPool(t, o, r),
+      poolAddress: await s.getPool(t, o, r),
       fee: r
     }))
-  )).filter(({ poolAddress: r }) => r !== w), s = await Promise.all(
-    n.map(async (r) => ({
+  )).filter(({ poolAddress: r }) => r !== A), n = await Promise.all(
+    c.map(async (r) => ({
       poolAddress: r.poolAddress,
       fee: r.fee,
       token1Balance: (await e.balanceOf(r.poolAddress)).toBigInt()
     }))
-  ), i = s.map((r) => r.token1Balance).reduce((r, m) => m >= r ? m : r, 0n);
+  ), 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);
-  return s.find((r) => r.token1Balance === i);
-}, f = async (e, c, t, o, n) => {
+  return n.find((r) => r.token1Balance === i);
+}, g = async (e, s, t, o, c) => {
   try {
     if (!d[e.getCurrentChainId()].quoterV2Address)
       throw Error("No Quoter Contract Provided");
@@ -41,44 +41,44 @@ const g = async (e, c, t, o) => {
       p.UniswapV3QuoterContract,
       d[e.getCurrentChainId()].quoterV2Address
     ).callStatic.quoteExactInputSingle({
-      tokenIn: c.wrappedErc20TokenAddress ?? c.erc20TokenAddress,
+      tokenIn: s.wrappedErc20TokenAddress ?? s.erc20TokenAddress,
       tokenOut: t.wrappedErc20TokenAddress ?? t.erc20TokenAddress,
       fee: o,
-      amountIn: n,
+      amountIn: c,
       sqrtPriceLimitX96: 0
     })).amountOut.toBigInt();
-  } catch (s) {
-    throw C(s), s;
+  } catch (n) {
+    throw C(n), n;
   }
-}, I = async (e, c, t) => {
+}, I = async (e, s, t) => {
   try {
-    const o = e.getCurrentChainId(), n = e.getContractWithFetcher(
+    const o = e.getCurrentChainId(), c = e.getContractWithFetcher(
       p.UniswapV3FactoryContract,
       d[o].uniswapV3FactoryAddress
-    ), s = e.getContractWithFetcher(
+    ), n = e.getContractWithFetcher(
       p.ERC20Contract,
       t.wrappedErc20TokenAddress ?? t.erc20TokenAddress
-    ), { fee: a } = await g(
-      s,
+    ), { fee: a } = await f(
       n,
-      c.wrappedErc20TokenAddress ?? c.erc20TokenAddress,
+      c,
+      s.wrappedErc20TokenAddress ?? s.erc20TokenAddress,
       t.wrappedErc20TokenAddress ?? t.erc20TokenAddress
     );
     return a;
   } catch (o) {
     throw console.log("Error in getUniswapFee", o), o;
   }
-}, L = async (e, c, t, o) => {
+}, L = async (e, s, t, o) => {
   try {
-    const n = await I(e, t, o), s = l.defaultAbiCoder.encode(["uint24"], [n]), a = A(t, c);
-    return { tokenPrice: await f(e, t, o, n, a), poolFee: s };
-  } catch (n) {
-    throw console.log({ error: n }), Error(u.NO_UNISWAP_PRICE);
+    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(u.NO_UNISWAP_PRICE);
   }
 };
 export {
   I as getUniswapFee,
   L as getUniswapPrice,
-  f as getUniswapPriceHelper,
-  g as searchPoolAndFee
+  g as getUniswapPriceHelper,
+  f as searchPoolAndFee
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hinkal/common",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "homepage": "hinkal.pro",
   "author": {
     "name": "Hinkal Protocol"

package/webworker/snarkjsWorker/snarkjsWorkerLauncher.cjs

@@ -1 +1 @@
-"use strict";const e=""+(typeof document>"u"?require("url").pathToFileURL(__dirname+"/../../assets/snarkjsWorkerLauncher-T9sCESzH.js").href:new URL("../../assets/snarkjsWorkerLauncher-T9sCESzH.js",document.currentScript&&document.currentScript.src||document.baseURI).href);module.exports=e;
+"use strict";const e=""+(typeof document>"u"?require("url").pathToFileURL(__dirname+"/../../assets/snarkjsWorkerLauncher-D2n9Ry7V.js").href:new URL("../../assets/snarkjsWorkerLauncher-D2n9Ry7V.js",document.currentScript&&document.currentScript.src||document.baseURI).href);module.exports=e;

package/webworker/snarkjsWorker/snarkjsWorkerLauncher.mjs

@@ -1,4 +1,4 @@
-const r = "" + new URL("../../assets/snarkjsWorkerLauncher-T9sCESzH.js", import.meta.url).href;
+const r = "" + new URL("../../assets/snarkjsWorkerLauncher-D2n9Ry7V.js", import.meta.url).href;
 export {
   r as default
 };

package/webworker/snarkjsWorker/snarkjsWorkerLogic.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const P=require("../workerProxy.cjs"),r=require("../../constants/vite.constants.cjs"),m=require("snarkjs");function w(t){const c=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const e in t)if(e!=="default"){const o=Object.getOwnPropertyDescriptor(t,e);Object.defineProperty(c,e,o.get?o:{enumerable:!0,get:()=>t[e]})}}return c.default=t,Object.freeze(c)}const p=w(m),l=new P.WorkerProxy,f=async t=>{const{input:c,wasmFilePath:e,zKeyFilePath:o,chainId:h}=t.payload.data,{hostLocation:{origin:u},constants:{isDevelopment:g,chains:{chainIds:b}}}=t.metadata;let s=e,i=o;const n=s.startsWith("https://");if(r.isNode&&!n){r.isWebpack?(s=`libs/hardhat/test/circuits/${e}`,i=`libs/hardhat/test/circuits/${o}`):!r.isWebpack&&g&&(s=`test/circuits/${e}`,i=`test/circuits/${o}`);const a=require("path");s=a.resolve(s),i=a.resolve(i)}r.isNode&&n?process.browser=!0:h===b.localhost&&!r.isNode&&(s=`${u}/${e}`,i=`${u}/${o}`);try{console.log({isNode:r.isNode,isWebpack:r.isWebpack,isOnline:n,message:"file before actual proof",wasmFullFilePath:s});const{proof:a,publicSignals:d}=await p.groth16.fullProve(c,s,i),k=await p.groth16.exportSolidityCallData(a,d),y=JSON.parse(`[${k}]`);l.postMessageToMainThread({zkCallData:y,proof:a,publicSignals:d})}catch(a){console.log(a)}};l.attachWorkerSideOnMessage(f);exports.default=l;exports.onWorkerMessage=f;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const P=require("../workerProxy.cjs"),n=require("../../constants/vite.constants.cjs"),w=require("snarkjs");function $(t){const i=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const e in t)if(e!=="default"){const s=Object.getOwnPropertyDescriptor(t,e);Object.defineProperty(i,e,s.get?s:{enumerable:!0,get:()=>t[e]})}}return i.default=t,Object.freeze(i)}const h=$(w),c=new P.WorkerProxy,p=async t=>{const{input:i,wasmFilePath:e,zKeyFilePath:s,chainId:f}=t.payload.data,{hostLocation:{origin:l},constants:{isDevelopment:g,chains:{chainIds:b}}}=t.metadata;let o=e,r=s;const u=o.startsWith("https://");if(n.isNode&&!u){n.isWebpack?(o=`libs/hardhat/test/circuits/${e}`,r=`libs/hardhat/test/circuits/${s}`):!n.isWebpack&&g&&(o=`test/circuits/${e}`,r=`test/circuits/${s}`);const a=require("path");o=a.resolve(o),r=a.resolve(r)}n.isNode&&u?process.browser=!0:f===b.localhost&&!n.isNode&&(o=`${l}/${e}`,r=`${l}/${s}`);try{const{proof:a,publicSignals:d}=await h.groth16.fullProve(i,o,r),k=await h.groth16.exportSolidityCallData(a,d),y=JSON.parse(`[${k}]`);c.postMessageToMainThread({zkCallData:y,proof:a,publicSignals:d})}catch(a){console.log(a)}};c.attachWorkerSideOnMessage(p);exports.default=c;exports.onWorkerMessage=p;

package/webworker/snarkjsWorker/snarkjsWorkerLogic.mjs

@@ -1,32 +1,31 @@
 import { WorkerProxy as w } from "../workerProxy.mjs";
-import { isNode as r, isWebpack as l } from "../../constants/vite.constants.mjs";
+import { isNode as i, isWebpack as h } from "../../constants/vite.constants.mjs";
 import * as p from "snarkjs";
-const f = new w(), y = async (c) => {
-  const { input: u, wasmFilePath: a, zKeyFilePath: o, chainId: d } = c.payload.data, {
-    hostLocation: { origin: n },
+const u = new w(), y = async (r) => {
+  const { input: d, wasmFilePath: e, zKeyFilePath: o, chainId: f } = r.payload.data, {
+    hostLocation: { origin: l },
     constants: {
       isDevelopment: m,
-      chains: { chainIds: g }
+      chains: { chainIds: $ }
     }
-  } = c.metadata;
-  let t = a, e = o;
-  const i = t.startsWith("https://");
-  if (r && !i) {
-    l ? (t = `libs/hardhat/test/circuits/${a}`, e = `libs/hardhat/test/circuits/${o}`) : !l && m && (t = `test/circuits/${a}`, e = `test/circuits/${o}`);
+  } = r.metadata;
+  let t = e, a = o;
+  const c = t.startsWith("https://");
+  if (i && !c) {
+    h ? (t = `libs/hardhat/test/circuits/${e}`, a = `libs/hardhat/test/circuits/${o}`) : !h && m && (t = `test/circuits/${e}`, a = `test/circuits/${o}`);
     const s = require("path");
-    t = s.resolve(t), e = s.resolve(e);
+    t = s.resolve(t), a = s.resolve(a);
   }
-  r && i ? process.browser = !0 : d === g.localhost && !r && (t = `${n}/${a}`, e = `${n}/${o}`);
+  i && c ? process.browser = !0 : f === $.localhost && !i && (t = `${l}/${e}`, a = `${l}/${o}`);
   try {
-    console.log({ isNode: r, isWebpack: l, isOnline: i, message: "file before actual proof", wasmFullFilePath: t });
-    const { proof: s, publicSignals: h } = await p.groth16.fullProve(u, t, e), $ = await p.groth16.exportSolidityCallData(s, h), k = JSON.parse(`[${$}]`);
-    f.postMessageToMainThread({ zkCallData: k, proof: s, publicSignals: h });
+    const { proof: s, publicSignals: n } = await p.groth16.fullProve(d, t, a), g = await p.groth16.exportSolidityCallData(s, n), k = JSON.parse(`[${g}]`);
+    u.postMessageToMainThread({ zkCallData: k, proof: s, publicSignals: n });
   } catch (s) {
     console.log(s);
   }
 };
-f.attachWorkerSideOnMessage(y);
+u.attachWorkerSideOnMessage(y);
 export {
-  f as default,
+  u as default,
   y as onWorkerMessage
 };