@hinkal/common 0.1.33 → 0.1.35

package/functions/web3/events/getShieldedBalance.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("async-mutex"),q=require("../../../constants/token-data/ERC20Registry.cjs"),I=require("../../utils/erc20tokenFunctions.cjs"),p=require("../../utils/caseInsensitive.utils.cjs"),k=require("../../utils/volatile-patcher.utils.cjs"),U=require("../../../data-structures/utxo/Utxo.cjs"),w=require("../../../data-structures/custom-token-registry/CustomTokenRegistry.cjs"),x=require("../../../data-structures/volatile-helper/VolatileHelper.cjs"),P=require("../etherFunctions.cjs"),S=require("../../../error-handling/customErrors/ErrorWithAmount.cjs"),y=require("./getInputUtxoAndBalance.cjs"),b=new A.Mutex,v=async a=>{const r=await b.acquire(),{inputUtxos:c}=await y.getInputUtxoAndBalance({hinkal:a,sliceIfMore6:!1}),n=a.getCurrentChainId(),u=[...q.getERC20Registry(n),...w.customTokenRegistry.getCustomTokens(n)];await k.patchRegistry(n);const h=u.map(e=>({token:e,balance:c.reduce((t,i)=>{const s=e.isVolatile?e.sharedAddress:e.erc20TokenAddress;return p.caseInsensitiveEqual(s,i.erc20TokenAddress)?t+i.amount:t},0n),timestamp:c.filter(t=>p.caseInsensitiveEqual(t.erc20TokenAddress,e.erc20TokenAddress))[0]?.timeStamp,nfts:c.filter(t=>p.caseInsensitiveEqual(t.erc20TokenAddress,e.erc20TokenAddress)&&t.tokenId!==0).map(t=>({tokenId:t.tokenId,timestamp:t.timeStamp}))})),m=await Promise.all(h.map(async e=>{if(!e.token.isVolatile)return e;e.token?.sharedAddress||console.log("VolatileToken must have a corresponding sharedAddress");let t=0n;return e.balance>0n&&(t=await x.VolatileHelper.getVolatileTokenBalance(n,e.token.sharedAddress,e.balance)),{...e,balance:BigInt(t)}}));return r(),m},E=async(a,r,c,n=6,u=r.map(()=>0),h=!1)=>{const{userKeys:m}=a,e=[],t=[];let i=0;for(let s=0;s<r.length;s+=1)if(h===!1){const{inputUtxos:o}=await y.getInputUtxoAndBalance({hinkal:a,erc20TokenAddress:r[s],tokenId:u[s],sliceIfMore6:!1});i=Math.max(o.length,i),t.push(o)}else t.push([]);return console.log({maxUtxoNum:i}),i===2?t:(t.forEach((s,o)=>{if(s.length>n){const l=s.slice(0,n),d=l.reduce((g,f)=>g+f.amount,0n);if(c[o]<0n&&d<-c[o]){const g=I.getERC20Token(r[o],a.getCurrentChainId()),f=Number(P.getAmountWithPrecision(d,g,2)),T=`Unfortunately your transaction did not go through due to UTXOs limitations. 
- Please try again with ${g.symbol}`;throw new S.ErrorWithAmount(f,T)}e.push(l)}else if(s.length<=n){const l=[...s];let d=n-s.length;for(;d>0;)d-=1,l.push(new U.Utxo({amount:0n,erc20TokenAddress:r[o],shieldedPrivateKey:m.getShieldedPrivateKey(),tokenId:u[o]}));e.push(l)}}),e)};exports.addPaddingToUtxos=E;exports.getShieldedBalance=v;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("async-mutex"),q=require("../../../constants/token-data/ERC20Registry.cjs"),I=require("../../utils/erc20tokenFunctions.cjs"),p=require("../../utils/caseInsensitive.utils.cjs"),k=require("../../utils/volatile-patcher.utils.cjs"),U=require("../../../data-structures/utxo/Utxo.cjs"),w=require("../../../data-structures/custom-token-registry/CustomTokenRegistry.cjs"),x=require("../../../data-structures/volatile-helper/VolatileHelper.cjs"),P=require("../etherFunctions.cjs"),S=require("../../../error-handling/customErrors/ErrorWithAmount.cjs"),y=require("./getInputUtxoAndBalance.cjs"),b=new A.Mutex,v=async i=>{const r=await b.acquire(),{inputUtxos:a}=await y.getInputUtxoAndBalance({hinkal:i,sliceIfMore6:!1}),n=i.getCurrentChainId(),u=[...q.getERC20Registry(n),...w.customTokenRegistry.getCustomTokens(n)];await k.patchRegistry(n);const h=u.map(e=>({token:e,balance:a.reduce((t,c)=>{const s=e.isVolatile?e.sharedAddress:e.erc20TokenAddress;return p.caseInsensitiveEqual(s,c.erc20TokenAddress)?t+c.amount:t},0n),timestamp:a.filter(t=>p.caseInsensitiveEqual(t.erc20TokenAddress,e.erc20TokenAddress))[0]?.timeStamp,nfts:a.filter(t=>p.caseInsensitiveEqual(t.erc20TokenAddress,e.erc20TokenAddress)&&t.tokenId!==0).map(t=>({tokenId:t.tokenId,timestamp:t.timeStamp}))})),m=await Promise.all(h.map(async e=>{if(!e.token.isVolatile)return e;e.token?.sharedAddress||console.log("VolatileToken must have a corresponding sharedAddress");let t=0n;return e.balance>0n&&(t=await x.VolatileHelper.getVolatileTokenBalance(n,e.token.sharedAddress,e.balance)),{...e,balance:BigInt(t)}}));return r(),m},E=async(i,r,a,n=6,u=r.map(()=>0),h=!1)=>{const{userKeys:m}=i,e=[],t=[];let c=0;for(let s=0;s<r.length;s+=1)if(h===!1){const{inputUtxos:o}=await y.getInputUtxoAndBalance({hinkal:i,erc20TokenAddress:r[s],tokenId:u[s],sliceIfMore6:!1});c=Math.max(o.length,c),t.push(o)}else t.push([]);return c===2?t:(t.forEach((s,o)=>{if(s.length>n){const d=s.slice(0,n),l=d.reduce((g,f)=>g+f.amount,0n);if(a[o]<0n&&l<-a[o]){const g=I.getERC20Token(r[o],i.getCurrentChainId()),f=Number(P.getAmountWithPrecision(l,g,2)),T=`Unfortunately your transaction did not go through due to UTXOs limitations. 
+ Please try again with ${g.symbol}`;throw new S.ErrorWithAmount(f,T)}e.push(d)}else if(s.length<=n){const d=[...s];let l=n-s.length;for(;l>0;)l-=1,d.push(new U.Utxo({amount:0n,erc20TokenAddress:r[o],shieldedPrivateKey:m.getShieldedPrivateKey(),tokenId:u[o]}));e.push(d)}}),e)};exports.addPaddingToUtxos=E;exports.getShieldedBalance=v;

package/functions/web3/events/getShieldedBalance.mjs

@@ -1,7 +1,7 @@
 import { Mutex as A } from "async-mutex";
 import { getERC20Registry as w } from "../../../constants/token-data/ERC20Registry.mjs";
 import { getERC20Token as k } from "../../utils/erc20tokenFunctions.mjs";
-import { caseInsensitiveEqual as h } from "../../utils/caseInsensitive.utils.mjs";
+import { caseInsensitiveEqual as g } from "../../utils/caseInsensitive.utils.mjs";
 import { patchRegistry as I } from "../../utils/volatile-patcher.utils.mjs";
 import { Utxo as U } from "../../../data-structures/utxo/Utxo.mjs";
 import { customTokenRegistry as P } from "../../../data-structures/custom-token-registry/CustomTokenRegistry.mjs";
@@ -9,20 +9,20 @@ import { VolatileHelper as b } from "../../../data-structures/volatile-helper/Vo
 import { getAmountWithPrecision as x } from "../etherFunctions.mjs";
 import { ErrorWithAmount as S } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
 import { getInputUtxoAndBalance as T } from "./getInputUtxoAndBalance.mjs";
-const C = new A(), O = async (a) => {
-  const n = await C.acquire(), { inputUtxos: d } = await T({ hinkal: a, sliceIfMore6: !1 }), s = a.getCurrentChainId(), c = [...w(s), ...P.getCustomTokens(s)];
+const C = new A(), O = async (i) => {
+  const n = await C.acquire(), { inputUtxos: a } = await T({ hinkal: i, sliceIfMore6: !1 }), s = i.getCurrentChainId(), c = [...w(s), ...P.getCustomTokens(s)];
   await I(s);
   const p = c.map((e) => ({
     token: e,
-    balance: d.reduce((t, i) => {
+    balance: a.reduce((t, d) => {
       const o = e.isVolatile ? e.sharedAddress : e.erc20TokenAddress;
-      return h(o, i.erc20TokenAddress) ? t + i.amount : t;
+      return g(o, d.erc20TokenAddress) ? t + d.amount : t;
     }, 0n),
-    timestamp: d.filter(
-      (t) => h(t.erc20TokenAddress, e.erc20TokenAddress)
+    timestamp: a.filter(
+      (t) => g(t.erc20TokenAddress, e.erc20TokenAddress)
     )[0]?.timeStamp,
-    nfts: d.filter(
-      (t) => h(t.erc20TokenAddress, e.erc20TokenAddress) && t.tokenId !== 0
+    nfts: a.filter(
+      (t) => g(t.erc20TokenAddress, e.erc20TokenAddress) && t.tokenId !== 0
     ).map((t) => ({ tokenId: t.tokenId, timestamp: t.timeStamp }))
   })), u = await Promise.all(
     p.map(async (e) => {
@@ -41,34 +41,34 @@ const C = new A(), O = async (a) => {
     })
   );
   return n(), u;
-}, X = async (a, n, d, s = 6, c = n.map(() => 0), p = !1) => {
-  const { userKeys: u } = a, e = [], t = [];
-  let i = 0;
+}, X = async (i, n, a, s = 6, c = n.map(() => 0), p = !1) => {
+  const { userKeys: u } = i, e = [], t = [];
+  let d = 0;
   for (let o = 0; o < n.length; o += 1)
     if (p === !1) {
       const { inputUtxos: r } = await T({
-        hinkal: a,
+        hinkal: i,
         erc20TokenAddress: n[o],
         tokenId: c[o],
         sliceIfMore6: !1
       });
-      i = Math.max(r.length, i), t.push(r);
+      d = Math.max(r.length, d), t.push(r);
     } else
       t.push([]);
-  return console.log({ maxUtxoNum: i }), i === 2 ? t : (t.forEach((o, r) => {
+  return d === 2 ? t : (t.forEach((o, r) => {
     if (o.length > s) {
-      const l = o.slice(0, s), m = l.reduce((f, g) => f + g.amount, 0n);
-      if (d[r] < 0n && m < -d[r]) {
-        const f = k(n[r], a.getCurrentChainId()), g = Number(x(m, f, 2)), y = `Unfortunately your transaction did not go through due to UTXOs limitations. 
+      const m = o.slice(0, s), l = m.reduce((f, h) => f + h.amount, 0n);
+      if (a[r] < 0n && l < -a[r]) {
+        const f = k(n[r], i.getCurrentChainId()), h = Number(x(l, f, 2)), y = `Unfortunately your transaction did not go through due to UTXOs limitations. 
  Please try again with ${f.symbol}`;
-        throw new S(g, y);
+        throw new S(h, y);
       }
-      e.push(l);
+      e.push(m);
     } else if (o.length <= s) {
-      const l = [...o];
-      let m = s - o.length;
-      for (; m > 0; )
-        m -= 1, l.push(
+      const m = [...o];
+      let l = s - o.length;
+      for (; l > 0; )
+        l -= 1, m.push(
           new U({
             amount: 0n,
             erc20TokenAddress: n[r],
@@ -76,7 +76,7 @@ const C = new A(), O = async (a) => {
             tokenId: c[r]
           })
         );
-      e.push(l);
+      e.push(m);
     }
   }), e);
 };

package/functions/web3/functionCalls/transactCallDirect.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../../constants/protocol.constants.cjs"),T=require("../../../types/ethereum-network.types.cjs"),f=require("./approveToken.cjs"),A=require("../../utils/time.utils.cjs"),b=async(r,o,s,t,i,n,u,h)=>{const a=r.getContractWithSigner(T.ContractType.HinkalContract),p=await r.getEthereumAddress(),v=u??a,d=h??a,g="transact";console.log("before the direct transaction"),o>0n&&s.erc20TokenAddress!==l.zeroAddress&&await f.approveTokenToHinkal(r,v,o,s);const c={value:o>0n&&s.erc20TokenAddress===l.zeroAddress?BigInt(o).toString():void 0};let e;try{e=(await d.estimateGas[g](t[0],t[1],t[2],n,i,{...c,from:p})).toNumber(),console.log({"gas costs of deposit":e})}catch(y){console.log("hinkalDeposit: gas estimation error: ",{err:y})}const m=e&&e>=0?Math.ceil(e*12/10):void 0;return c.gasLimit=m,await A.waitLittle(),await d[g](t[0],t[1],t[2],n,i,c)};exports.transactCallDirect=b;
+"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.mjs

@@ -1,28 +1,28 @@
-import { zeroAddress as m } from "../../../constants/protocol.constants.mjs";
-import { ContractType as A } from "../../../types/ethereum-network.types.mjs";
-import { approveTokenToHinkal as T } from "./approveToken.mjs";
-import { waitLittle as y } from "../../utils/time.utils.mjs";
-const H = async (s, r, e, t, c, n, f, p) => {
-  const a = s.getContractWithSigner(A.HinkalContract), h = await s.getEthereumAddress(), l = f ?? a, d = p ?? a, g = "transact";
-  console.log("before the direct transaction"), r > 0n && e.erc20TokenAddress !== m && await T(s, l, r, e);
+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 === m ? BigInt(r).toString() : void 0
+    value: r > 0n && e.erc20TokenAddress === g ? BigInt(r).toString() : void 0
   };
   let o;
   try {
-    o = (await d.estimateGas[g](
+    o = (await d.estimateGas[m](
       t[0],
       t[1],
       t[2],
       n,
       c,
       { ...i, from: h }
-    )).toNumber(), console.log({ "gas costs of deposit": o });
-  } catch (x) {
-    console.log("hinkalDeposit: gas estimation error: ", { err: x });
+    )).toNumber();
+  } catch (A) {
+    console.log("hinkalDeposit: gas estimation error: ", { err: A });
   }
-  const v = o && o >= 0 ? Math.ceil(o * 12 / 10) : void 0;
-  return i.gasLimit = v, await y(), await d[g](
+  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],
@@ -32,5 +32,5 @@ const H = async (s, r, e, t, c, n, f, p) => {
   );
 };
 export {
-  H as transactCallDirect
+  S as transactCallDirect
 };

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("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");require("../../constants/reorg-depths.constants.cjs");const d=5e4,m=1,w=11,q=15,g=async(s,o)=>{try{const r=await s.getFeeData(),n=o===0?w:q,e=r.gasPrice?.mul(n).div(10)??void 0;return console.log("getGasPrice , ",e?.toBigInt(),{gasPremiumType:o}),e}catch(r){console.log("getGasPrice error: ",{err:r});return}},E=(s,o,r)=>new Promise((n,e)=>{const a=setTimeout(()=>{e(new Error(c.transactionErrorCodes.TRANSACTION_TIMEOUT))},r);s.wait(o).then(t=>{clearTimeout(a),n(t)}).catch(t=>{clearTimeout(a),e(t)})}),l=async({contractFunction:s,args:o,gasPrice:r,gasLimit:n,nonce:e,confirmations:a,waitTime:t})=>{const i=await s(...o,{type:0,gasLimit:n,gasPrice:r,nonce:e});return console.log("runTransaction: ",i?.hash),await E(i,a??m,t??d)},P=async({provider:s,contractFunction:o,args:r,gasLimit:n,nonce:e,confirmations:a})=>{try{const t=await g(s,0);return await l({contractFunction:o,args:r,gasPrice:t,gasLimit:n,nonce:e,confirmations:a})}catch(t){const i=T.getErrorMessage(t);if(i===c.UserFriendlyErrorCodes.MAX_FEE_GAS_ERROR||i===c.transactionErrorCodes.TRANSACTION_TIMEOUT){console.log("Timeout Hit: Increase gas");const u=await g(s,1);return await l({contractFunction:o,args:r,gasPrice:u,gasLimit:n,nonce:e,confirmations:a})}throw t}};exports.runContractFunction=P;
+"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");require("../../constants/reorg-depths.constants.cjs");const l=5e4,d=1,w=11,P=15,g=async(t,s)=>{try{const r=await t.getFeeData(),a=s===0?w:P;return r.gasPrice?.mul(a).div(10)??void 0}catch(r){console.log("getGasPrice error: ",{err:r});return}},q=(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 q(i,n??d,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;

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.35",
   "homepage": "hinkal.pro",
   "author": {
     "name": "Hinkal Protocol"

package/types/relayer.types.d.ts

@@ -1,3 +1,25 @@
 export interface RelayerTransaction {
+    to: string;
+    from: string;
+    contractAddress: string | null;
+    gasUsed: {
+        type: string;
+        hex: string;
+    };
+    logsBloom: string;
+    blockHash: string;
     transactionHash: string;
+    blockNumber: number;
+    confirmations: number;
+    cumulativeGasUsed: {
+        type: string;
+        hex: string;
+    };
+    effectiveGasPrice: {
+        type: string;
+        hex: string;
+    };
+    status: number;
+    type: number;
+    byzantium: boolean;
 }

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
 };