@hinkal/common 0.2.24 → 0.2.26

package/data-structures/Hinkal/hinkalDepostAndBridge.mjs

@@ -1,8 +1,8 @@
-import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as d } from "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as X } from "../../error-handling/error-codes.constants.mjs";
 import { constructEmporiumProof as tt } from "../../functions/snarkjs/constructEmporiumProof.mjs";
 import { transactCallRelayerBatch as et } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as S } from "../../types/external-action.types.mjs";
+import { ExternalActionId as U } from "../../types/external-action.types.mjs";
 import { Utxo as N } from "../utxo/Utxo.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as ot } from "../../types/ethereum-network.types.mjs";
@@ -53,55 +53,55 @@ import "../../API/tenderly.api.mjs";
 import { hinkalDepositOnChainUtxos as H } from "./hinkalDepositOnChainUtxos.mjs";
 import { createLifiBridgeOps as B } from "../../functions/private-wallet/emporium.helpers.mjs";
 import { safeUpdateDepositAndWithdrawStatus as _ } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const ut = async (t, f, s, R, a, T, c, d) => {
+const ut = async (t, u, s, C, n, h, D, m) => {
   if (s.length === 0)
     throw new Error("No recipients to bridge");
-  const i = f.erc20TokenAddress, o = t.getCurrentChainId(), { contractData: n } = mt[o], { emporiumAddress: w } = n;
-  if (!w)
+  const i = u.erc20TokenAddress, o = t.getCurrentChainId(), { contractData: g } = mt[o], { emporiumAddress: a } = g;
+  if (!a)
     throw Error("No Emporium Address");
-  const C = O[S.Lifi][o];
-  if (!C)
+  const T = O[U.Lifi][o];
+  if (!T)
     throw new Error(`LIFI not configured for chain ${o}`);
-  const A = await t.getRandomRelay();
-  if (!A)
+  const I = await t.getRandomRelay();
+  if (!I)
     throw Error(X.RELAYER_NOT_AVAILABLE);
-  const D = await t.getEthereumAddress(), l = it().toString(), E = t.generateProofRemotely ? 5 : 1, v = [];
-  for (let m = 0; m < s.length; m += E) {
-    const I = s.slice(m, m + E), e = await Promise.all(
-      I.map(async ({ utxo: r, nativeUtxo: p, bridgeAmount: h, quote: U, temporarySubAccount: x }) => {
-        await dt.addTemporaryWalletNonce(o, a, x.index);
-        const q = U.nativeFee > 0n && !z(i, u), g = [i], k = [-r.amount], P = [!1], L = new N({
+  const w = await t.getEthereumAddress(), E = it().toString(), f = t.generateProofRemotely ? 5 : 1, v = [];
+  for (let p = 0; p < s.length; p += f) {
+    const R = s.slice(p, p + f), x = await Promise.all(
+      R.map(async ({ utxo: e, nativeUtxo: r, bridgeAmount: A, quote: c, temporarySubAccount: F }) => {
+        await dt.addTemporaryWalletNonce(o, n, F.index);
+        const q = c.nativeFee > 0n && !z(i, d), l = [i], k = [-e.amount], P = [!1], L = new N({
           amount: 0n,
           erc20TokenAddress: i,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: l,
+          timeStamp: E,
           tokenId: 0
-        }), F = [[r, L]], b = [[L]];
-        if (q && p) {
+        }), S = [[e, L]], b = [[L]];
+        if (q && r) {
           const K = new N({
             amount: 0n,
-            erc20TokenAddress: u,
+            erc20TokenAddress: d,
             shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-            timeStamp: l,
+            timeStamp: E,
             tokenId: 0
           });
-          g.push(u), k.push(-p.amount), P.push(!1), F.push([p, K]), b.push([K]);
+          l.push(d), k.push(-r.amount), P.push(!1), S.push([r, K]), b.push([K]);
         }
         const M = B(
           t,
-          x.ethAddress,
-          C,
+          F.ethAddress,
+          T,
           i,
-          r.amount,
-          h,
-          U
+          e.amount,
+          A,
+          c
         ), { patchAccessTokenMerkleTree: V, kycRequired: Y, hasAccessToken: Z } = await st(
           t,
-          g,
+          l,
           k
         ), $ = await rt(
           o,
-          D,
+          w,
           t.userKeys,
           Y,
           Z
@@ -109,25 +109,25 @@ const ut = async (t, f, s, R, a, T, c, d) => {
           "v1x1",
           t.merkleTreeHinkal,
           t.merkleTreeAccessToken,
-          g,
-          g.map(() => 0),
-          F,
+          l,
+          l.map(() => 0),
+          S,
           b,
           t.userKeys,
-          g.length,
-          F[0].length,
-          w,
+          l.length,
+          S[0].length,
+          a,
           M,
           t.generateProofRemotely,
-          A ?? u,
+          I ?? d,
           o,
           P,
           void 0,
-          x.privateKey,
+          F.privateKey,
           void 0,
           V,
           void 0,
-          R,
+          C,
           t.getContractWithFetcher(ot.HinkalHelperContract),
           $,
           void 0,
@@ -136,93 +136,94 @@ const ut = async (t, f, s, R, a, T, c, d) => {
         return { zkCallData: j, dimData: J, circomData: G, authorizationData: Q };
       })
     );
-    v.push(...e);
+    v.push(...x);
   }
   await _(o, {
-    id: T,
-    hashedEthereumAddress: a,
+    id: h,
+    hashedEthereumAddress: n,
     phase: W.BEFORE_SCHEDULE_WITHDRAW
   });
   const y = await et(
     o,
     v,
-    a,
-    c,
-    d
+    n,
+    D,
+    m
   );
   return await _(o, {
-    id: T,
-    hashedEthereumAddress: a,
+    id: h,
+    hashedEthereumAddress: n,
     phase: W.AFTER_SCHEDULE_WITHDRAW,
     scheduleId: y
   }), y;
-}, Ae = async (t, f, s, R, a, T) => {
-  const c = f.erc20TokenAddress, d = t.getCurrentChainId(), i = nt(await t.getEthereumAddress()), o = O[S.Lifi][d];
-  if (!o)
+}, Ae = async (t, u, s, C, n, h, D = !0) => {
+  const m = u.erc20TokenAddress, i = t.getCurrentChainId(), o = nt(await t.getEthereumAddress()), g = O[U.Lifi][i];
+  if (!g)
     throw Error("LIFI router not configured");
-  let n;
-  if (a)
-    n = a;
+  let a;
+  if (n)
+    a = n;
   else {
-    const e = s[0], p = B(
+    const e = s[0], A = B(
       t,
       e.temporarySubAccount.ethAddress,
-      o,
-      c,
+      g,
+      m,
       e.bridgeAmount,
       e.bridgeAmount,
       e.quote
     ).map(
-      (h) => ct(h, e.temporarySubAccount.ethAddress, d)
+      (c) => ct(c, e.temporarySubAccount.ethAddress, i)
     );
-    n = await at(d, c, [c], S.Emporium, p);
+    a = await at(i, m, [m], U.Emporium, A);
   }
-  const w = {
-    feeToken: n.feeToken,
+  const T = {
+    feeToken: a.feeToken,
     flatFee: 0n,
     variableRate: 0n
-  }, A = s.reduce((e, r) => e + r.quote.nativeFee, 0n) > 0n && !z(c, u), D = s.map((e) => e.bridgeAmount), l = s.map((e) => e.recipientAddress), {
-    userDepositedUtxos: E,
-    statusId: v,
-    depositTxHash: y
+  }, w = s.reduce((e, r) => e + r.quote.nativeFee, 0n) > 0n && !z(m, d), E = s.map((e) => e.bridgeAmount), f = s.map((e) => e.recipientAddress), {
+    userDepositedUtxos: v,
+    statusId: y,
+    depositTxHash: p
   } = await H(
     t,
+    u,
+    E,
     f,
-    D,
-    l,
-    n,
-    i
+    a,
+    o
   );
-  let m = [];
-  if (A) {
-    const e = pt(u, d);
+  let R = [];
+  if (w) {
+    const e = pt(d, i);
     if (!e)
       throw Error("No native token");
-    const r = s.map((h) => h.quote.nativeFee), { userDepositedUtxos: p } = await H(
+    const r = s.map((c) => c.quote.nativeFee), { userDepositedUtxos: A } = await H(
       t,
       e,
       r,
-      l,
-      w,
-      i
+      f,
+      T,
+      o,
+      D
     );
-    m = p;
+    R = A;
   }
-  const I = s.map((e, r) => ({
+  const x = s.map((e, r) => ({
     ...e,
-    utxo: E[r].utxo,
-    nativeUtxo: A ? m[r]?.utxo : void 0
+    utxo: v[r].utxo,
+    nativeUtxo: w ? R[r]?.utxo : void 0
   }));
   return await ut(
     t,
-    f,
-    I,
-    n,
-    i,
-    v,
-    R,
-    T
-  ), y;
+    u,
+    x,
+    a,
+    o,
+    y,
+    C,
+    h
+  ), p;
 };
 export {
   Ae as hinkalDepositAndBridge

package/functions/web3/functionCalls/transactCallDirect.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("ethers"),f=require("../../../constants/protocol.constants.cjs"),I=require("../../../types/ethereum-network.types.cjs"),S=require("../../utils/time.utils.cjs"),F=require("./approveTokensToHinkal.cjs"),N=require("./constructBatchCall.cjs"),_=require("./recoverTransactionFromError.cjs"),z=require("../../utils/getContractAddress.cjs"),G=async(r,d,l,s,p,A,q,x)=>{const n=Array.isArray(d)?d:[d],e=Array.isArray(l)?l:[l];if(n.length!==e.length)throw new Error("token and amount length mismatch");const w=r.getContractWithSigner(I.ContractType.HinkalContract),b=await r.getEthereumAddress(),v=q??w,a=x??w,m="transact",C=e.findIndex(({erc20TokenAddress:t})=>t===f.zeroAddress),k=e.some(({erc20TokenAddress:t})=>t!==f.zeroAddress),h=C===-1?0n:n[C],g=r.getProviderAdapter();if(k&&await g.supportsBatchCall?.()&&g.sendBatchCallsTransaction){const t=e.map(B=>B.erc20TokenAddress),i=await N.buildApproveAndTransactCalls(t,n,z.getContractAddress(v),a,s,A,p,h);return await g.sendBatchCallsTransaction(i)}await F.approveTokensToHinkal(r,v,e,n);const T={value:h>0n?BigInt(h).toString():void 0};let o;const y=[s[0],s[1],s[2],A,p,{...T,from:b}],{runner:c}=a;if(!(c instanceof E.ethers.AbstractSigner))throw new Error("expected signer");try{o=Number(await a[m].estimateGas(...y)),console.log({gasCosts:o}),console.log({signerAddress:await c.getAddress(),chainIdHinkal:r.getCurrentChainId(),ethersNetwork:await c.provider.getNetwork()})}catch(t){console.log("hinkalDeposit: gas estimation error",{err:t})}const H=o&&o>=0?Math.ceil(o*12/10):void 0;T.gasLimit=H,await S.waitLittle();let u;try{u=await a[m](...y)}catch(t){if(!t?.transactionHash)throw t;const i=await _.recoverTransactionFromError(c.provider,t.transactionHash);if(!i)throw t;u=i}return u};exports.transactCallDirect=G;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const I=require("ethers"),f=require("../../../constants/protocol.constants.cjs"),S=require("../../../types/ethereum-network.types.cjs"),F=require("../../utils/time.utils.cjs"),N=require("./approveTokensToHinkal.cjs"),_=require("./constructBatchCall.cjs"),z=require("./recoverTransactionFromError.cjs"),G=require("../../utils/getContractAddress.cjs"),L=async(r,d,l,s,p,A,q,x,b=!0)=>{const n=Array.isArray(d)?d:[d],e=Array.isArray(l)?l:[l];if(n.length!==e.length)throw new Error("token and amount length mismatch");const w=r.getContractWithSigner(S.ContractType.HinkalContract),k=await r.getEthereumAddress(),v=q??w,a=x??w,m="transact",C=e.findIndex(({erc20TokenAddress:t})=>t===f.zeroAddress),H=e.some(({erc20TokenAddress:t})=>t!==f.zeroAddress),h=C===-1?0n:n[C],u=r.getProviderAdapter();if(H&&await u.supportsBatchCall?.()&&u.sendBatchCallsTransaction){const t=e.map(E=>E.erc20TokenAddress),i=await _.buildApproveAndTransactCalls(t,n,G.getContractAddress(v),a,s,A,p,h);return await u.sendBatchCallsTransaction(i)}await N.approveTokensToHinkal(r,v,e,n);const T={value:h>0n?BigInt(h).toString():void 0};let o;const y=[s[0],s[1],s[2],A,p,{...T,from:k}],{runner:c}=a;if(!(c instanceof I.ethers.AbstractSigner))throw new Error("expected signer");if(b)try{o=Number(await a[m].estimateGas(...y)),console.log({gasCosts:o}),console.log({signerAddress:await c.getAddress(),chainIdHinkal:r.getCurrentChainId(),ethersNetwork:await c.provider.getNetwork()})}catch(t){console.log("hinkalDeposit: gas estimation error",{err:t})}const B=o&&o>=0?Math.ceil(o*12/10):void 0;T.gasLimit=B,await F.waitLittle();let g;try{g=await a[m](...y)}catch(t){if(!t?.transactionHash)throw t;const i=await z.recoverTransactionFromError(c.provider,t.transactionHash);if(!i)throw t;g=i}return g};exports.transactCallDirect=L;

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

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

package/functions/web3/functionCalls/transactCallDirect.mjs

@@ -1,21 +1,21 @@
-import { ethers as k } from "ethers";
+import { ethers as F } from "ethers";
 import { zeroAddress as T } from "../../../constants/protocol.constants.mjs";
-import { ContractType as F } from "../../../types/ethereum-network.types.mjs";
-import { waitLittle as N } from "../../utils/time.utils.mjs";
-import { approveTokensToHinkal as S } from "./approveTokensToHinkal.mjs";
-import { buildApproveAndTransactCalls as G } from "./constructBatchCall.mjs";
-import { recoverTransactionFromError as L } from "./recoverTransactionFromError.mjs";
-import { getContractAddress as z } from "../../utils/getContractAddress.mjs";
-const R = async (r, d, m, s, g, A, y, H) => {
+import { ContractType as N } from "../../../types/ethereum-network.types.mjs";
+import { waitLittle as S } from "../../utils/time.utils.mjs";
+import { approveTokensToHinkal as G } from "./approveTokensToHinkal.mjs";
+import { buildApproveAndTransactCalls as L } from "./constructBatchCall.mjs";
+import { recoverTransactionFromError as z } from "./recoverTransactionFromError.mjs";
+import { getContractAddress as M } from "../../utils/getContractAddress.mjs";
+const U = async (r, d, m, s, g, A, y, H, I = !0) => {
   const n = Array.isArray(d) ? d : [d], o = Array.isArray(m) ? m : [m];
   if (n.length !== o.length)
     throw new Error("token and amount length mismatch");
-  const w = r.getContractWithSigner(F.HinkalContract), I = await r.getEthereumAddress(), f = y ?? w, a = H ?? w, v = "transact", C = o.findIndex(({ erc20TokenAddress: t }) => t === T), b = o.some(({ erc20TokenAddress: t }) => t !== T), l = C === -1 ? 0n : n[C], p = r.getProviderAdapter();
-  if (b && await p.supportsBatchCall?.() && p.sendBatchCallsTransaction) {
-    const t = o.map((E) => E.erc20TokenAddress), c = await G(
+  const f = r.getContractWithSigner(N.HinkalContract), b = await r.getEthereumAddress(), w = y ?? f, a = H ?? f, v = "transact", u = o.findIndex(({ erc20TokenAddress: t }) => t === T), B = o.some(({ erc20TokenAddress: t }) => t !== T), l = u === -1 ? 0n : n[u], p = r.getProviderAdapter();
+  if (B && await p.supportsBatchCall?.() && p.sendBatchCallsTransaction) {
+    const t = o.map((k) => k.erc20TokenAddress), c = await L(
       t,
       n,
-      z(f),
+      M(w),
       a,
       s,
       A,
@@ -24,8 +24,8 @@ const R = async (r, d, m, s, g, A, y, H) => {
     );
     return await p.sendBatchCallsTransaction(c);
   }
-  await S(r, f, o, n);
-  const u = {
+  await G(r, w, o, n);
+  const C = {
     value: l > 0n ? BigInt(l).toString() : void 0
   };
   let e;
@@ -35,28 +35,29 @@ const R = async (r, d, m, s, g, A, y, H) => {
     s[2],
     A,
     g,
-    { ...u, from: I }
+    { ...C, from: b }
   ], { runner: i } = a;
-  if (!(i instanceof k.AbstractSigner))
+  if (!(i instanceof F.AbstractSigner))
     throw new Error("expected signer");
-  try {
-    e = Number(await a[v].estimateGas(...x)), console.log({ gasCosts: e }), console.log({
-      signerAddress: await i.getAddress(),
-      chainIdHinkal: r.getCurrentChainId(),
-      ethersNetwork: await i.provider.getNetwork()
-    });
-  } catch (t) {
-    console.log("hinkalDeposit: gas estimation error", { err: t });
-  }
-  const B = e && e >= 0 ? Math.ceil(e * 12 / 10) : void 0;
-  u.gasLimit = B, await N();
+  if (I)
+    try {
+      e = Number(await a[v].estimateGas(...x)), console.log({ gasCosts: e }), console.log({
+        signerAddress: await i.getAddress(),
+        chainIdHinkal: r.getCurrentChainId(),
+        ethersNetwork: await i.provider.getNetwork()
+      });
+    } catch (t) {
+      console.log("hinkalDeposit: gas estimation error", { err: t });
+    }
+  const E = e && e >= 0 ? Math.ceil(e * 12 / 10) : void 0;
+  C.gasLimit = E, await S();
   let h;
   try {
     h = await a[v](...x);
   } catch (t) {
     if (!t?.transactionHash)
       throw t;
-    const c = await L(i.provider, t.transactionHash);
+    const c = await z(i.provider, t.transactionHash);
     if (!c)
       throw t;
     h = c;
@@ -64,5 +65,5 @@ const R = async (r, d, m, s, g, A, y, H) => {
   return h;
 };
 export {
-  R as transactCallDirect
+  U as transactCallDirect
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hinkal/common",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"