@hinkal/common 0.2.24 → 0.2.26

package/data-structures/Hinkal/hinkalDeposit.mjs

@@ -1,62 +1,62 @@
-import { zeroAddress as D } from "../../constants/protocol.constants.mjs";
-import { outputUtxoProcessing as R } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as C } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as H } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { transactCallDirect as P } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { Utxo as w } from "../utxo/Utxo.mjs";
-import { transactionErrorCodes as z } from "../../error-handling/error-codes.constants.mjs";
+import { zeroAddress as C } from "../../constants/protocol.constants.mjs";
+import { outputUtxoProcessing as H } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as P } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as z } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { transactCallDirect as I } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { Utxo as D } from "../utxo/Utxo.mjs";
+import { transactionErrorCodes as F } from "../../error-handling/error-codes.constants.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as I } from "../../types/ethereum-network.types.mjs";
-import { AdminTransactionType as K } from "../../types/admin.types.mjs";
+import { ContractType as K } from "../../types/ethereum-network.types.mjs";
+import { AdminTransactionType as M } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
-import { getSignatureDataForTransact as F } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { isValidPrivateAddress as N } from "../../functions/utils/addresses.mjs";
-import { shouldPatchAccessTokenMerkleTree as O } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getCurrentTimeInSeconds as $ } from "../../functions/utils/time.utils.mjs";
-import { emitTxPublicData as M } from "../../API/admin-calls.mjs";
-import { constructAdminData as E } from "../../functions/pre-transaction/constructAdminData.mjs";
-const S = async (t, s, e) => {
-  const { patchAccessTokenMerkleTree: o, kycRequired: r, hasAccessToken: p } = await O(
+import { getSignatureDataForTransact as N } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { isValidPrivateAddress as O } from "../../functions/utils/addresses.mjs";
+import { shouldPatchAccessTokenMerkleTree as $ } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getCurrentTimeInSeconds as b } from "../../functions/utils/time.utils.mjs";
+import { emitTxPublicData as E } from "../../API/admin-calls.mjs";
+import { constructAdminData as S } from "../../functions/pre-transaction/constructAdminData.mjs";
+const U = async (t, s, e) => {
+  const { patchAccessTokenMerkleTree: n, kycRequired: o, hasAccessToken: r } = await $(
     t,
     s,
     e
-  ), c = void 0, A = await t.getEthereumAddress(), i = await F(
+  ), c = void 0, p = await t.getEthereumAddress(), A = await N(
     t.getCurrentChainId(),
-    A,
+    p,
     t.userKeys,
-    r,
-    p
-  ), n = {
+    o,
+    r
+  ), i = {
     externalActionId: 0n,
     externalAddress: await t.getEthereumAddress(),
     externalActionMetadata: "0x00"
   };
   return {
-    signatureData: i,
-    externalActionData: n,
+    signatureData: A,
+    externalActionData: i,
     contractTransaction: c,
     contractToApprove: c,
-    patchAccessTokenMerkleTree: o
+    patchAccessTokenMerkleTree: n
   };
-}, et = async (t, s, e) => {
-  const o = s.map((a) => a.erc20TokenAddress), { externalActionData: r, contractTransaction: p, contractToApprove: c, patchAccessTokenMerkleTree: A, signatureData: i } = await S(t, o, e), n = [...await H(t, o, e)], u = `swapperM${e.length.toString()}x${n[0].length}x1`, d = [], x = $().toString();
+}, rt = async (t, s, e, n = !0) => {
+  const o = s.map((a) => a.erc20TokenAddress), { externalActionData: r, contractTransaction: c, contractToApprove: p, patchAccessTokenMerkleTree: A, signatureData: i } = await U(t, o, e), u = [...await z(t, o, e)], x = `swapperM${e.length.toString()}x${u[0].length}x1`, d = [], T = b().toString();
   for (let a = 0; a < o.length; a += 1) {
-    const { outputUtxos: f } = R(t.userKeys, n[a], e[a], x);
-    d.push(f);
+    const { outputUtxos: w } = H(t.userKeys, u[a], e[a], T);
+    d.push(w);
   }
-  const { zkCallData: T, circomData: g, dimData: y } = await C(
+  const { zkCallData: g, circomData: y, dimData: l } = await P(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    n,
+    u,
     d,
     t.userKeys,
-    u,
+    x,
     r.externalActionId,
     r.externalAddress,
     r.externalActionMetadata,
     t.generateProofRemotely,
-    D,
+    C,
     t.getCurrentChainId(),
     void 0,
     void 0,
@@ -65,82 +65,84 @@ const S = async (t, s, e) => {
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(I.HinkalHelperContract),
+    t.getContractWithFetcher(K.HinkalHelperContract),
     i
-  ), l = await P(
+  ), v = await I(
     t,
     e,
     // for volotile tokens: amountChanges != amountOfTokenToApprove
     s,
-    T,
     g,
     y,
+    l,
+    p,
     c,
-    p
-  ), v = E(
-    K.Onboarding,
+    n
+  ), f = S(
+    M.Onboarding,
     t.getCurrentChainId(),
     o,
     e,
     await t.getEthereumAddress()
   );
-  return M(t.getCurrentChainId(), v), l;
-}, rt = async (t, s, e, o) => {
-  const r = s.map((m) => m.erc20TokenAddress), [p, c, A] = o.split(",");
-  if (!N(o))
-    throw Error(z.RECIPIENT_FORMAT_INCORRECT);
+  return E(t.getCurrentChainId(), f), v;
+}, ot = async (t, s, e, n, o = !0) => {
+  const r = s.map((m) => m.erc20TokenAddress), [c, p, A] = n.split(",");
+  if (!O(n))
+    throw Error(F.RECIPIENT_FORMAT_INCORRECT);
   const i = r.map((m) => [
-    new w({ amount: 0n, erc20TokenAddress: m, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() }),
-    new w({ amount: 0n, erc20TokenAddress: m, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() })
-  ]), n = `swapperM${e.length.toString()}x${i[0].length}x1`, u = r.map((m, U) => [
-    new w({
-      amount: e[U],
+    new D({ amount: 0n, erc20TokenAddress: m, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() }),
+    new D({ amount: 0n, erc20TokenAddress: m, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() })
+  ]), u = `swapperM${e.length.toString()}x${i[0].length}x1`, x = r.map((m, R) => [
+    new D({
+      amount: e[R],
       erc20TokenAddress: m,
-      randomization: BigInt(p),
-      stealthAddress: c,
+      randomization: BigInt(c),
+      stealthAddress: p,
       encryptionKey: A
     })
-  ]), { externalActionData: d, contractTransaction: x, contractToApprove: T, patchAccessTokenMerkleTree: g } = await S(t, r, e), { zkCallData: y, circomData: l, dimData: v } = await C(
+  ]), { externalActionData: d, contractTransaction: T, contractToApprove: g, patchAccessTokenMerkleTree: y } = await U(t, r, e), { zkCallData: l, circomData: v, dimData: f } = await P(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
     i,
-    u,
+    x,
     t.userKeys,
-    n,
+    u,
     d.externalActionId,
     d.externalAddress,
     d.externalActionMetadata,
     t.generateProofRemotely,
-    D,
+    C,
     t.getCurrentChainId(),
     void 0,
     void 0,
     void 0,
-    g,
+    y,
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(I.HinkalHelperContract)
-  ), a = await P(
+    t.getContractWithFetcher(K.HinkalHelperContract)
+  ), a = await I(
     t,
     e,
     s,
-    y,
     l,
     v,
+    f,
+    g,
     T,
-    x
-  ), f = E(
-    K.PaymentLink,
+    o
+  ), w = S(
+    M.PaymentLink,
     t.getCurrentChainId(),
     r,
     e,
     await t.getEthereumAddress()
   );
-  return M(t.getCurrentChainId(), f), a;
+  return E(t.getCurrentChainId(), w), a;
 };
 export {
-  et as hinkalDeposit,
-  rt as hinkalDepositForOther
+  rt as hinkalDeposit,
+  ot as hinkalDepositForOther
 };

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("../../constants/protocol.constants.cjs"),F=require("../../error-handling/error-codes.constants.cjs"),O=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),N=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const D=require("../../types/scheduled-transactions.types.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),G=require("../../functions/utils/time.utils.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),Y=require("../../functions/utils/addresses.cjs"),$=require("./hinkalDepositOnChainUtxos.cjs"),J=require("../../functions/pre-transaction/constructAdminData.cjs"),q=require("../../API/deposit-and-withdraw-status-calls.cjs"),Q=async(e,t,r,w,a,c,A,i)=>{if(r.length===0)throw new Error("userDepositedUtxos must not be empty");const s=t.erc20TokenAddress,n=await e.getRandomRelay();if(!n)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=await e.getEthereumAddress(),l=G.getCurrentTimeInSeconds().toString(),d=e.generateProofRemotely?5:1,u=[];for(let h=0;h<r.length;h+=d){const x=r.slice(h,h+d),S=await Promise.all(x.map(async({recipientAddress:I,utxo:p})=>{const E=[-p.amount],T=new z.Utxo({amount:0n,erc20TokenAddress:s,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:l,tokenId:0}),y=[[p,T]],R=[[T]],P=`swapperM1x${y[0].length}x1`,m={externalActionId:0n,externalAddress:I,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:_,kycRequired:f,hasAccessToken:U}=await j.shouldPatchAccessTokenMerkleTree(e,[s],E),W=await Z.getSignatureDataForTransact(e.getCurrentChainId(),o,e.userKeys,f,U),k=J.constructAdminData(N.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),[s],[-p.amount],o),{zkCallData:v,circomData:H,dimData:M}=await O.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,y,R,e.userKeys,P,m.externalActionId,m.externalAddress,m.externalActionMetadata,e.generateProofRemotely,n??b.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,_,void 0,void 0,w,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:v,dimData:M,circomData:H,adminData:k}}));u.push(...S)}const C=e.getCurrentChainId();await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:a,phase:D.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await K.transactCallRelayerBatch(e.getCurrentChainId(),u,a,A,i);return await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:a,phase:D.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},X=async(e,t,r,w,a,c,A)=>{const i=t.erc20TokenAddress,s=e.getCurrentChainId(),n=Y.hashEthereumAddress(await e.getEthereumAddress()),o=c??await V.getFeeStructure(s,i,[i],L.ExternalActionId.Transact),{userDepositedUtxos:l,statusId:d,depositTxHash:u}=await $.hinkalDepositOnChainUtxos(e,t,r,w,o,n);return await Q(e,t,l,o,n,d,a,A),u};exports.hinkalDepositAndWithdraw=X;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("../../constants/protocol.constants.cjs"),F=require("../../error-handling/error-codes.constants.cjs"),O=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),N=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const D=require("../../types/scheduled-transactions.types.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),G=require("../../functions/utils/time.utils.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),Y=require("../../functions/utils/addresses.cjs"),$=require("./hinkalDepositOnChainUtxos.cjs"),J=require("../../functions/pre-transaction/constructAdminData.cjs"),q=require("../../API/deposit-and-withdraw-status-calls.cjs"),Q=async(e,r,a,A,s,o,l,p)=>{if(a.length===0)throw new Error("userDepositedUtxos must not be empty");const t=r.erc20TokenAddress,c=await e.getRandomRelay();if(!c)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const n=await e.getEthereumAddress(),i=G.getCurrentTimeInSeconds().toString(),d=e.generateProofRemotely?5:1,u=[];for(let w=0;w<a.length;w+=d){const x=a.slice(w,w+d),S=await Promise.all(x.map(async({recipientAddress:I,utxo:m})=>{const E=[-m.amount],T=new z.Utxo({amount:0n,erc20TokenAddress:t,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:i,tokenId:0}),y=[[m,T]],R=[[T]],P=`swapperM1x${y[0].length}x1`,C={externalActionId:0n,externalAddress:I,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:_,kycRequired:f,hasAccessToken:U}=await j.shouldPatchAccessTokenMerkleTree(e,[t],E),W=await Z.getSignatureDataForTransact(e.getCurrentChainId(),n,e.userKeys,f,U),k=J.constructAdminData(N.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),[t],[-m.amount],n),{zkCallData:v,circomData:H,dimData:M}=await O.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,y,R,e.userKeys,P,C.externalActionId,C.externalAddress,C.externalActionMetadata,e.generateProofRemotely,c??b.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,_,void 0,void 0,A,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:v,dimData:M,circomData:H,adminData:k}}));u.push(...S)}const h=e.getCurrentChainId();await q.safeUpdateDepositAndWithdrawStatus(h,{id:o,hashedEthereumAddress:s,phase:D.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await K.transactCallRelayerBatch(e.getCurrentChainId(),u,s,l,p);return await q.safeUpdateDepositAndWithdrawStatus(h,{id:o,hashedEthereumAddress:s,phase:D.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},X=async(e,r,a,A,s,o,l,p=!0)=>{const t=r.erc20TokenAddress,c=e.getCurrentChainId(),n=Y.hashEthereumAddress(await e.getEthereumAddress()),i=o??await V.getFeeStructure(c,t,[t],L.ExternalActionId.Transact),{userDepositedUtxos:d,statusId:u,depositTxHash:h}=await $.hinkalDepositOnChainUtxos(e,r,a,A,i,n,p);return await Q(e,r,d,i,n,u,s,l),h};exports.hinkalDepositAndWithdraw=X;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.d.ts

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
 import { ERC20Token } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalDepositAndWithdraw: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string) => Promise<string>;
+export declare const hinkalDepositAndWithdraw: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, preEstimateGas?: boolean) => Promise<string>;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -17,23 +17,23 @@ import { hashEthereumAddress as j } from "../../functions/utils/addresses.mjs";
 import { hinkalDepositOnChainUtxos as G } from "./hinkalDepositOnChainUtxos.mjs";
 import { constructAdminData as J } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { safeUpdateDepositAndWithdrawStatus as x } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const Q = async (t, e, r, u, o, i, w, c) => {
-  if (r.length === 0)
+const Q = async (t, r, o, w, a, n, h, A) => {
+  if (o.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
-  const a = e.erc20TokenAddress, s = await t.getRandomRelay();
-  if (!s)
+  const e = r.erc20TokenAddress, i = await t.getRandomRelay();
+  if (!i)
     throw Error(F.RELAYER_NOT_AVAILABLE);
-  const n = await t.getEthereumAddress(), h = Z().toString(), d = t.generateProofRemotely ? 5 : 1, m = [];
-  for (let p = 0; p < r.length; p += d) {
-    const I = r.slice(p, p + d), E = await Promise.all(
-      I.map(async ({ recipientAddress: D, utxo: A }) => {
-        const R = [-A.amount], l = new B({
+  const s = await t.getEthereumAddress(), c = Z().toString(), d = t.generateProofRemotely ? 5 : 1, m = [];
+  for (let u = 0; u < o.length; u += d) {
+    const I = o.slice(u, u + d), E = await Promise.all(
+      I.map(async ({ recipientAddress: D, utxo: f }) => {
+        const R = [-f.amount], l = new B({
           amount: 0n,
-          erc20TokenAddress: a,
+          erc20TokenAddress: e,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: h,
+          timeStamp: c,
           tokenId: 0
-        }), T = [[A, l]], S = [[l]], v = `swapperM1x${T[0].length}x1`, f = {
+        }), T = [[f, l]], S = [[l]], v = `swapperM1x${T[0].length}x1`, C = {
           externalActionId: 0n,
           externalAddress: D,
           externalActionMetadata: "0x00"
@@ -41,18 +41,18 @@ const Q = async (t, e, r, u, o, i, w, c) => {
           patchAccessTokenMerkleTree: H,
           kycRequired: P,
           hasAccessToken: U
-        } = await Y(t, [a], R), W = await V(
+        } = await Y(t, [e], R), W = await V(
           t.getCurrentChainId(),
-          n,
+          s,
           t.userKeys,
           P,
           U
         ), K = J(
           N.WithdrawOnChainUtxos,
           t.getCurrentChainId(),
-          [a],
-          [-A.amount],
-          n
+          [e],
+          [-f.amount],
+          s
         ), { zkCallData: M, circomData: _, dimData: b } = await L(
           "v1x1",
           t.merkleTreeHinkal,
@@ -61,11 +61,11 @@ const Q = async (t, e, r, u, o, i, w, c) => {
           S,
           t.userKeys,
           v,
-          f.externalActionId,
-          f.externalAddress,
-          f.externalActionMetadata,
+          C.externalActionId,
+          C.externalAddress,
+          C.externalActionMetadata,
           t.generateProofRemotely,
-          s ?? k,
+          i ?? k,
           t.getCurrentChainId(),
           void 0,
           void 0,
@@ -73,7 +73,7 @@ const Q = async (t, e, r, u, o, i, w, c) => {
           H,
           void 0,
           void 0,
-          u,
+          w,
           t.getContractWithFetcher(q.HinkalHelperContract),
           W,
           void 0,
@@ -89,44 +89,45 @@ const Q = async (t, e, r, u, o, i, w, c) => {
     );
     m.push(...E);
   }
-  const C = t.getCurrentChainId();
-  await x(C, {
-    id: i,
-    hashedEthereumAddress: o,
+  const p = t.getCurrentChainId();
+  await x(p, {
+    id: n,
+    hashedEthereumAddress: a,
     phase: y.BEFORE_SCHEDULE_WITHDRAW
   });
   const g = await O(
     t.getCurrentChainId(),
     m,
-    o,
-    w,
-    c
+    a,
+    h,
+    A
   );
-  return await x(C, {
-    id: i,
-    hashedEthereumAddress: o,
+  return await x(p, {
+    id: n,
+    hashedEthereumAddress: a,
     phase: y.AFTER_SCHEDULE_WITHDRAW,
     scheduleId: g
   }), g;
-}, gt = async (t, e, r, u, o, i, w) => {
-  const c = e.erc20TokenAddress, a = t.getCurrentChainId(), s = j(await t.getEthereumAddress()), n = i ?? await $(a, c, [c], z.Transact), { userDepositedUtxos: h, statusId: d, depositTxHash: m } = await G(
+}, gt = async (t, r, o, w, a, n, h, A = !0) => {
+  const e = r.erc20TokenAddress, i = t.getCurrentChainId(), s = j(await t.getEthereumAddress()), c = n ?? await $(i, e, [e], z.Transact), { userDepositedUtxos: d, statusId: m, depositTxHash: p } = await G(
     t,
-    e,
     r,
-    u,
-    n,
-    s
+    o,
+    w,
+    c,
+    s,
+    A
   );
   return await Q(
     t,
-    e,
-    h,
-    n,
-    s,
+    r,
     d,
-    o,
-    w
-  ), m;
+    c,
+    s,
+    m,
+    a,
+    h
+  ), p;
 };
 export {
   gt as hinkalDepositAndWithdraw

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const z=require("ethers"),B=require("../../constants/protocol.constants.cjs"),j=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),G=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),X=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),J=require("../../types/external-action.types.cjs");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs"),L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const y=require("../../types/scheduled-transactions.types.cjs"),Q=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Y=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),tt=require("../../functions/utils/fees.utils.cjs"),et=require("../../functions/pre-transaction/constructAdminData.cjs"),st=require("../../API/admin-calls.cjs"),f=require("../../API/deposit-and-withdraw-status-calls.cjs"),ot=async(t,p,P,O,S,l)=>{const h=p.erc20TokenAddress,x=await t.getEthereumAddress(),a=P.map(e=>e+tt.calculateTotalFee(e,S)),n=[h],i=[0n],W=[!0],{patchAccessTokenMerkleTree:v,kycRequired:E,hasAccessToken:_}=await V.shouldPatchAccessTokenMerkleTree(t,n,i),F=await Q.getSignatureDataForTransact(t.getCurrentChainId(),x,t.userKeys,E,_),o=[...await N.addPaddingToUtxos(t,n,i)],C=[];for(let e=0;e<o.length;e+=1){const{outputUtxos:s}=j.outputUtxoProcessing(t.userKeys,o[e],i[e]);C.push(s)}const A=a.reduce((e,s)=>e+s,0n),I=z.ethers.AbiCoder.defaultAbiCoder().encode(["uint256[]"],[a]),g=t.getContractWithSigner(u.ContractType.HinkalWrapper),D=t.getContractWithSigner(u.ContractType.DepositOnChainUtxos),{zkCallData:k,circomData:b,dimData:R}=await G.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,o,C,t.userKeys,`swapperM1x${o[0].length}x1`,J.ExternalActionId.DepositOnChainUtxos,await D.getAddress(),I,t.generateProofRemotely,B.zeroAddress,t.getCurrentChainId(),W,void 0,void 0,v,void 0,void 0,void 0,t.getContractWithFetcher(u.ContractType.HinkalHelperContract),F,await g.getAddress(),!1),r=t.getCurrentChainId(),T=(await f.updateDepositAndWithdrawStatus(r,{hashedEthereumAddress:l,phase:y.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,m=await X.transactCallDirect(t,A,p,k,b,R,D,g),H=await m.wait(),w=m.hash;await f.safeUpdateDepositAndWithdrawStatus(r,{id:T,hashedEthereumAddress:l,phase:y.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:w});const M=await Y.getUtxosFromReceipt(H,t,h),q=[],c=[...M];O.forEach((e,s)=>{const U=a[s],d=c.find($=>$.amount===U);if(!d)throw new Error(`Could not find newly created UTXO with amount ${U} for recipient ${e}.`);q.push({recipientAddress:e,utxo:d});const Z=c.indexOf(d);c.splice(Z,1)});const K=et.constructAdminData(L.AdminTransactionType.DepositOnChainUtxos,r,n,[A],x);return st.emitTxPublicData(r,K),{userDepositedUtxos:q,statusId:T,depositTxHash:w}};exports.hinkalDepositOnChainUtxos=ot;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const B=require("ethers"),j=require("../../constants/protocol.constants.cjs"),G=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),N=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),X=require("../../functions/web3/events/getShieldedBalance.cjs"),J=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),L=require("../../types/external-action.types.cjs");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs"),Q=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const y=require("../../types/scheduled-transactions.types.cjs"),V=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),Y=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),tt=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),et=require("../../functions/utils/fees.utils.cjs"),st=require("../../functions/pre-transaction/constructAdminData.cjs"),ot=require("../../API/admin-calls.cjs"),f=require("../../API/deposit-and-withdraw-status-calls.cjs"),rt=async(t,p,P,O,S,l,W=!0)=>{const h=p.erc20TokenAddress,x=await t.getEthereumAddress(),a=P.map(e=>e+et.calculateTotalFee(e,S)),n=[h],i=[0n],v=[!0],{patchAccessTokenMerkleTree:E,kycRequired:_,hasAccessToken:F}=await Y.shouldPatchAccessTokenMerkleTree(t,n,i),I=await V.getSignatureDataForTransact(t.getCurrentChainId(),x,t.userKeys,_,F),o=[...await X.addPaddingToUtxos(t,n,i)],C=[];for(let e=0;e<o.length;e+=1){const{outputUtxos:s}=G.outputUtxoProcessing(t.userKeys,o[e],i[e]);C.push(s)}const A=a.reduce((e,s)=>e+s,0n),k=B.ethers.AbiCoder.defaultAbiCoder().encode(["uint256[]"],[a]),g=t.getContractWithSigner(u.ContractType.HinkalWrapper),D=t.getContractWithSigner(u.ContractType.DepositOnChainUtxos),{zkCallData:b,circomData:R,dimData:H}=await N.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,o,C,t.userKeys,`swapperM1x${o[0].length}x1`,L.ExternalActionId.DepositOnChainUtxos,await D.getAddress(),k,t.generateProofRemotely,j.zeroAddress,t.getCurrentChainId(),v,void 0,void 0,E,void 0,void 0,void 0,t.getContractWithFetcher(u.ContractType.HinkalHelperContract),I,await g.getAddress(),!1),r=t.getCurrentChainId(),T=(await f.updateDepositAndWithdrawStatus(r,{hashedEthereumAddress:l,phase:y.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,m=await J.transactCallDirect(t,A,p,b,R,H,D,g,W),M=await m.wait(),w=m.hash;await f.safeUpdateDepositAndWithdrawStatus(r,{id:T,hashedEthereumAddress:l,phase:y.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:w});const K=await tt.getUtxosFromReceipt(M,t,h),q=[],c=[...K];O.forEach((e,s)=>{const U=a[s],d=c.find(z=>z.amount===U);if(!d)throw new Error(`Could not find newly created UTXO with amount ${U} for recipient ${e}.`);q.push({recipientAddress:e,utxo:d});const $=c.indexOf(d);c.splice($,1)});const Z=st.constructAdminData(Q.AdminTransactionType.DepositOnChainUtxos,r,n,[A],x);return ot.emitTxPublicData(r,Z),{userDepositedUtxos:q,statusId:T,depositTxHash:w}};exports.hinkalDepositOnChainUtxos=rt;

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.d.ts

@@ -1,7 +1,7 @@
 import { IHinkal } from './IHinkal';
 import { ERC20Token, RecipientUtxo } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalDepositOnChainUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string) => Promise<{
+export declare const hinkalDepositOnChainUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string, preEstimateGas?: boolean) => Promise<{
     userDepositedUtxos: RecipientUtxo[];
     statusId?: string | undefined;
     depositTxHash: string;

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.mjs

@@ -1,43 +1,43 @@
-import { ethers as _ } from "ethers";
-import { zeroAddress as q } from "../../constants/protocol.constants.mjs";
-import { outputUtxoProcessing as B } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as X } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as j } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { transactCallDirect as G } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { ExternalActionId as J } from "../../types/external-action.types.mjs";
+import { ethers as q } from "ethers";
+import { zeroAddress as B } from "../../constants/protocol.constants.mjs";
+import { outputUtxoProcessing as X } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as j } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as G } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { transactCallDirect as J } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { ExternalActionId as L } from "../../types/external-action.types.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as p } from "../../types/ethereum-network.types.mjs";
-import { AdminTransactionType as L } from "../../types/admin.types.mjs";
+import { AdminTransactionType as N } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
 import { DepositAndWithdrawPhase as y } from "../../types/scheduled-transactions.types.mjs";
-import { getSignatureDataForTransact as N } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as Q } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getUtxosFromReceipt as V } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
-import { calculateTotalFee as Y } from "../../functions/utils/fees.utils.mjs";
-import { constructAdminData as tt } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { emitTxPublicData as ot } from "../../API/admin-calls.mjs";
-import { updateDepositAndWithdrawStatus as et, safeUpdateDepositAndWithdrawStatus as rt } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const yt = async (t, m, O, E, P, u) => {
-  const f = m.erc20TokenAddress, x = await t.getEthereumAddress(), a = O.map((o) => o + Y(o, P)), i = [f], n = [0n], v = [!0], { patchAccessTokenMerkleTree: I, kycRequired: W, hasAccessToken: S } = await Q(
+import { getSignatureDataForTransact as Q } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as V } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getUtxosFromReceipt as Y } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
+import { calculateTotalFee as tt } from "../../functions/utils/fees.utils.mjs";
+import { constructAdminData as ot } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { emitTxPublicData as et } from "../../API/admin-calls.mjs";
+import { updateDepositAndWithdrawStatus as rt, safeUpdateDepositAndWithdrawStatus as st } from "../../API/deposit-and-withdraw-status-calls.mjs";
+const Ot = async (t, m, O, E, P, u, v = !0) => {
+  const f = m.erc20TokenAddress, x = await t.getEthereumAddress(), a = O.map((o) => o + tt(o, P)), i = [f], n = [0n], I = [!0], { patchAccessTokenMerkleTree: W, kycRequired: S, hasAccessToken: F } = await V(
     t,
     i,
     n
-  ), F = await N(
+  ), H = await Q(
     t.getCurrentChainId(),
     x,
     t.userKeys,
-    W,
-    S
-  ), r = [...await j(t, i, n)], C = [];
+    S,
+    F
+  ), r = [...await G(t, i, n)], C = [];
   for (let o = 0; o < r.length; o += 1) {
-    const { outputUtxos: e } = B(t.userKeys, r[o], n[o]);
+    const { outputUtxos: e } = X(t.userKeys, r[o], n[o]);
     C.push(e);
   }
-  const A = a.reduce((o, e) => o + e, 0n), H = _.AbiCoder.defaultAbiCoder().encode(["uint256[]"], [a]), D = t.getContractWithSigner(p.HinkalWrapper), g = t.getContractWithSigner(p.DepositOnChainUtxos), {
-    zkCallData: R,
-    circomData: b,
-    dimData: K
-  } = await X(
+  const A = a.reduce((o, e) => o + e, 0n), R = q.AbiCoder.defaultAbiCoder().encode(["uint256[]"], [a]), D = t.getContractWithSigner(p.HinkalWrapper), g = t.getContractWithSigner(p.DepositOnChainUtxos), {
+    zkCallData: b,
+    circomData: K,
+    dimData: M
+  } = await j(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
@@ -45,63 +45,64 @@ const yt = async (t, m, O, E, P, u) => {
     C,
     t.userKeys,
     `swapperM1x${r[0].length}x1`,
-    J.DepositOnChainUtxos,
+    L.DepositOnChainUtxos,
     await g.getAddress(),
-    H,
+    R,
     t.generateProofRemotely,
-    q,
+    B,
     t.getCurrentChainId(),
-    v,
+    I,
     void 0,
     void 0,
-    I,
+    W,
     void 0,
     void 0,
     void 0,
     t.getContractWithFetcher(p.HinkalHelperContract),
-    F,
+    H,
     await D.getAddress(),
     !1
-  ), s = t.getCurrentChainId(), h = (await et(s, {
+  ), s = t.getCurrentChainId(), h = (await rt(s, {
     hashedEthereumAddress: u,
     phase: y.BEFORE_DEPOSIT
-  })).id ?? void 0, w = await G(
+  })).id ?? void 0, w = await J(
     t,
     A,
     m,
-    R,
     b,
     K,
+    M,
     g,
-    D
-  ), M = await w.wait(), T = w.hash;
-  await rt(s, {
+    D,
+    v
+  ), $ = await w.wait(), T = w.hash;
+  await st(s, {
     id: h,
     hashedEthereumAddress: u,
     phase: y.AFTER_DEPOSIT,
     depositTxHash: T
   });
-  const $ = await V(M, t, f), l = [], c = [...$];
+  const k = await Y($, t, f), l = [], c = [...k];
   E.forEach((o, e) => {
-    const U = a[e], d = c.find((Z) => Z.amount === U);
+    const U = a[e], d = c.find((_) => _.amount === U);
     if (!d)
       throw new Error(`Could not find newly created UTXO with amount ${U} for recipient ${o}.`);
     l.push({
       recipientAddress: o,
       utxo: d
     });
-    const z = c.indexOf(d);
-    c.splice(z, 1);
+    const Z = c.indexOf(d);
+    c.splice(Z, 1);
   });
-  const k = tt(
-    L.DepositOnChainUtxos,
+  const z = ot(
+    N.DepositOnChainUtxos,
     s,
     i,
     [A],
     x
   );
-  return ot(s, k), { userDepositedUtxos: l, statusId: h, depositTxHash: T };
+  return et(s, z), { userDepositedUtxos: l, statusId: h, depositTxHash: T };
 };
 export {
-  yt as hinkalDepositOnChainUtxos
+  Ot as hinkalDepositOnChainUtxos
 };

package/data-structures/Hinkal/hinkalDepostAndBridge.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("../../constants/protocol.constants.cjs"),X=require("../../error-handling/error-codes.constants.cjs"),ee=require("../../functions/snarkjs/constructEmporiumProof.cjs"),te=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),x=require("../../types/external-action.types.cjs"),W=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const re=require("../../types/ethereum-network.types.cjs");require("../../types/activities.types.cjs");const b=require("../../types/scheduled-transactions.types.cjs"),se=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),oe=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),ne=require("../../functions/utils/time.utils.cjs"),ie=require("../../functions/pre-transaction/getFeeStructure.cjs"),ae=require("../../functions/utils/addresses.cjs"),ce=require("../../constants/chains.constants.cjs"),N=require("../../constants/addresses.constants.cjs");require("idb-keyval");require("@solana/web3.js");require("../http/HttpClient.cjs");require("../../constants/vite.constants.cjs");require("ethers");const ue=require("../../functions/utils/erc20tokenFunctions.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../constants/server.constants.cjs");require("axios");const K=require("../../functions/utils/caseInsensitive.utils.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("../crypto-keys/keys.cjs");require("@solana/spl-token");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.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");require("../../functions/utils/userAgent.cjs");const de=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs");require("multiformats");const le=require("../../API/API.cjs");require("../../API/tenderly.api.cjs");const z=require("./hinkalDepositOnChainUtxos.cjs"),B=require("../../functions/private-wallet/emporium.helpers.cjs"),L=require("../../API/deposit-and-withdraw-status-calls.cjs"),pe=async(e,q,o,v,i,E,d,l)=>{if(o.length===0)throw new Error("No recipients to bridge");const n=q.erc20TokenAddress,r=e.getCurrentChainId(),{contractData:a}=ce.networkRegistry[r],{emporiumAddress:T}=a;if(!T)throw Error("No Emporium Address");const D=N.SWAP_ROUTER_ADDRESSES[x.ExternalActionId.Lifi][r];if(!D)throw new Error(`LIFI not configured for chain ${r}`);const A=await e.getRandomRelay();if(!A)throw Error(X.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const C=await e.getEthereumAddress(),m=ne.getCurrentTimeInSeconds().toString(),f=e.generateProofRemotely?5:1,w=[];for(let c=0;c<o.length;c+=f){const R=o.slice(c,c+f),t=await Promise.all(R.map(async({utxo:s,nativeUtxo:u,bridgeAmount:h,quote:U,temporarySubAccount:S})=>{await le.API.addTemporaryWalletNonce(r,i,S.index);const H=U.nativeFee>0n&&!K.caseInsensitiveEqual(n,p.zeroAddress),g=[n],_=[-s.amount],k=[!1],F=new W.Utxo({amount:0n,erc20TokenAddress:n,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:m,tokenId:0}),I=[[s,F]],P=[[F]];if(H&&u){const O=new W.Utxo({amount:0n,erc20TokenAddress:p.zeroAddress,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:m,tokenId:0});g.push(p.zeroAddress),_.push(-u.amount),k.push(!1),I.push([u,O]),P.push([O])}const M=B.createLifiBridgeOps(e,S.ethAddress,D,n,s.amount,h,U),{patchAccessTokenMerkleTree:j,kycRequired:V,hasAccessToken:Y}=await oe.shouldPatchAccessTokenMerkleTree(e,g,_),Z=await se.getSignatureDataForTransact(r,C,e.userKeys,V,Y),{zkCallData:$,circomData:G,dimData:J,authorizationData:Q}=await ee.constructEmporiumProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,g,g.map(()=>0),I,P,e.userKeys,g.length,I[0].length,T,M,e.generateProofRemotely,A??p.zeroAddress,r,k,void 0,S.privateKey,void 0,j,void 0,v,e.getContractWithFetcher(re.ContractType.HinkalHelperContract),Z,void 0,!1);return{zkCallData:$,dimData:J,circomData:G,authorizationData:Q}}));w.push(...t)}await L.safeUpdateDepositAndWithdrawStatus(r,{id:E,hashedEthereumAddress:i,phase:b.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const y=await te.transactCallRelayerBatch(r,w,i,d,l);return await L.safeUpdateDepositAndWithdrawStatus(r,{id:E,hashedEthereumAddress:i,phase:b.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:y}),y},qe=async(e,q,o,v,i,E)=>{const d=q.erc20TokenAddress,l=e.getCurrentChainId(),n=ae.hashEthereumAddress(await e.getEthereumAddress()),r=N.SWAP_ROUTER_ADDRESSES[x.ExternalActionId.Lifi][l];if(!r)throw Error("LIFI router not configured");let a;if(i)a=i;else{const t=o[0],u=B.createLifiBridgeOps(e,t.temporarySubAccount.ethAddress,r,d,t.bridgeAmount,t.bridgeAmount,t.quote).map(h=>de.convertEmporiumOpToCallInfo(h,t.temporarySubAccount.ethAddress,l));a=await ie.getFeeStructure(l,d,[d],x.ExternalActionId.Emporium,u)}const T={feeToken:a.feeToken,flatFee:0n,variableRate:0n},A=o.reduce((t,s)=>t+s.quote.nativeFee,0n)>0n&&!K.caseInsensitiveEqual(d,p.zeroAddress),C=o.map(t=>t.bridgeAmount),m=o.map(t=>t.recipientAddress),{userDepositedUtxos:f,statusId:w,depositTxHash:y}=await z.hinkalDepositOnChainUtxos(e,q,C,m,a,n);let c=[];if(A){const t=ue.getERC20Token(p.zeroAddress,l);if(!t)throw Error("No native token");const s=o.map(h=>h.quote.nativeFee),{userDepositedUtxos:u}=await z.hinkalDepositOnChainUtxos(e,t,s,m,T,n);c=u}const R=o.map((t,s)=>({...t,utxo:f[s].utxo,nativeUtxo:A?c[s]?.utxo:void 0}));return await pe(e,q,R,a,n,w,v,E),y};exports.hinkalDepositAndBridge=qe;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../constants/protocol.constants.cjs"),X=require("../../error-handling/error-codes.constants.cjs"),ee=require("../../functions/snarkjs/constructEmporiumProof.cjs"),te=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),U=require("../../types/external-action.types.cjs"),W=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const re=require("../../types/ethereum-network.types.cjs");require("../../types/activities.types.cjs");const b=require("../../types/scheduled-transactions.types.cjs"),se=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),oe=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),ne=require("../../functions/utils/time.utils.cjs"),ie=require("../../functions/pre-transaction/getFeeStructure.cjs"),ae=require("../../functions/utils/addresses.cjs"),ce=require("../../constants/chains.constants.cjs"),N=require("../../constants/addresses.constants.cjs");require("idb-keyval");require("@solana/web3.js");require("../http/HttpClient.cjs");require("../../constants/vite.constants.cjs");require("ethers");const ue=require("../../functions/utils/erc20tokenFunctions.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../constants/server.constants.cjs");require("axios");const K=require("../../functions/utils/caseInsensitive.utils.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("../crypto-keys/keys.cjs");require("@solana/spl-token");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.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");require("../../functions/utils/userAgent.cjs");const de=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs");require("multiformats");const le=require("../../API/API.cjs");require("../../API/tenderly.api.cjs");const z=require("./hinkalDepositOnChainUtxos.cjs"),B=require("../../functions/private-wallet/emporium.helpers.cjs"),L=require("../../API/deposit-and-withdraw-status-calls.cjs"),pe=async(e,p,o,D,a,h,C,c)=>{if(o.length===0)throw new Error("No recipients to bridge");const n=p.erc20TokenAddress,r=e.getCurrentChainId(),{contractData:g}=ce.networkRegistry[r],{emporiumAddress:i}=g;if(!i)throw Error("No Emporium Address");const E=N.SWAP_ROUTER_ADDRESSES[U.ExternalActionId.Lifi][r];if(!E)throw new Error(`LIFI not configured for chain ${r}`);const R=await e.getRandomRelay();if(!R)throw Error(X.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const T=await e.getEthereumAddress(),f=ne.getCurrentTimeInSeconds().toString(),q=e.generateProofRemotely?5:1,w=[];for(let u=0;u<o.length;u+=q){const v=o.slice(u,u+q),S=await Promise.all(v.map(async({utxo:t,nativeUtxo:s,bridgeAmount:A,quote:d,temporarySubAccount:I})=>{await le.API.addTemporaryWalletNonce(r,a,I.index);const H=d.nativeFee>0n&&!K.caseInsensitiveEqual(n,l.zeroAddress),m=[n],_=[-t.amount],k=[!1],F=new W.Utxo({amount:0n,erc20TokenAddress:n,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:f,tokenId:0}),x=[[t,F]],P=[[F]];if(H&&s){const O=new W.Utxo({amount:0n,erc20TokenAddress:l.zeroAddress,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:f,tokenId:0});m.push(l.zeroAddress),_.push(-s.amount),k.push(!1),x.push([s,O]),P.push([O])}const M=B.createLifiBridgeOps(e,I.ethAddress,E,n,t.amount,A,d),{patchAccessTokenMerkleTree:j,kycRequired:V,hasAccessToken:Y}=await oe.shouldPatchAccessTokenMerkleTree(e,m,_),Z=await se.getSignatureDataForTransact(r,T,e.userKeys,V,Y),{zkCallData:$,circomData:G,dimData:J,authorizationData:Q}=await ee.constructEmporiumProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,m,m.map(()=>0),x,P,e.userKeys,m.length,x[0].length,i,M,e.generateProofRemotely,R??l.zeroAddress,r,k,void 0,I.privateKey,void 0,j,void 0,D,e.getContractWithFetcher(re.ContractType.HinkalHelperContract),Z,void 0,!1);return{zkCallData:$,dimData:J,circomData:G,authorizationData:Q}}));w.push(...S)}await L.safeUpdateDepositAndWithdrawStatus(r,{id:h,hashedEthereumAddress:a,phase:b.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const y=await te.transactCallRelayerBatch(r,w,a,C,c);return await L.safeUpdateDepositAndWithdrawStatus(r,{id:h,hashedEthereumAddress:a,phase:b.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:y}),y},qe=async(e,p,o,D,a,h,C=!0)=>{const c=p.erc20TokenAddress,n=e.getCurrentChainId(),r=ae.hashEthereumAddress(await e.getEthereumAddress()),g=N.SWAP_ROUTER_ADDRESSES[U.ExternalActionId.Lifi][n];if(!g)throw Error("LIFI router not configured");let i;if(a)i=a;else{const t=o[0],A=B.createLifiBridgeOps(e,t.temporarySubAccount.ethAddress,g,c,t.bridgeAmount,t.bridgeAmount,t.quote).map(d=>de.convertEmporiumOpToCallInfo(d,t.temporarySubAccount.ethAddress,n));i=await ie.getFeeStructure(n,c,[c],U.ExternalActionId.Emporium,A)}const E={feeToken:i.feeToken,flatFee:0n,variableRate:0n},T=o.reduce((t,s)=>t+s.quote.nativeFee,0n)>0n&&!K.caseInsensitiveEqual(c,l.zeroAddress),f=o.map(t=>t.bridgeAmount),q=o.map(t=>t.recipientAddress),{userDepositedUtxos:w,statusId:y,depositTxHash:u}=await z.hinkalDepositOnChainUtxos(e,p,f,q,i,r);let v=[];if(T){const t=ue.getERC20Token(l.zeroAddress,n);if(!t)throw Error("No native token");const s=o.map(d=>d.quote.nativeFee),{userDepositedUtxos:A}=await z.hinkalDepositOnChainUtxos(e,t,s,q,E,r,C);v=A}const S=o.map((t,s)=>({...t,utxo:w[s].utxo,nativeUtxo:T?v[s]?.utxo:void 0}));return await pe(e,p,S,i,r,y,D,h),u};exports.hinkalDepositAndBridge=qe;

package/data-structures/Hinkal/hinkalDepostAndBridge.d.ts

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
 import { BridgeRecipient, ERC20Token } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string) => Promise<string>;
+export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, preEstimateGas?: boolean) => Promise<string>;