@hinkal/common 0.2.26 → 0.2.28

package/data-structures/Hinkal/hinkalDepositAndBridge.mjs

@@ -0,0 +1,259 @@
+import { PAY_SEND_VARIABLE_RATE as et, zeroAddress as A } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as rt } from "../../error-handling/error-codes.constants.mjs";
+import { constructEmporiumProof as it } from "../../functions/snarkjs/constructEmporiumProof.mjs";
+import { transactCallRelayerBatch as st } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as P } from "../../types/external-action.types.mjs";
+import { Utxo as K } from "../utxo/Utxo.mjs";
+import "../../types/circom-data.types.mjs";
+import { ContractType as mt } from "../../types/ethereum-network.types.mjs";
+import { networkRegistry as at } from "../../constants/chains.constants.mjs";
+import "../../types/activities.types.mjs";
+import { DepositAndWithdrawPhase as W } from "../../types/scheduled-transactions.types.mjs";
+import { getKycAndSignatureData as nt } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { getCurrentTimeInSeconds as pt } from "../../functions/utils/time.utils.mjs";
+import { getFeeStructure as ct } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hashEthereumAddress as dt } from "../../functions/utils/addresses.mjs";
+import { SWAP_ROUTER_ADDRESSES as z } from "../../constants/addresses.constants.mjs";
+import "idb-keyval";
+import "@solana/web3.js";
+import "../http/HttpClient.mjs";
+import "../../constants/vite.constants.mjs";
+import "ethers";
+import { getERC20Token as ut } from "../../functions/utils/erc20tokenFunctions.mjs";
+import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
+import "../../constants/server.constants.mjs";
+import "../../API/getServerURL.mjs";
+import "axios";
+import { caseInsensitiveEqual as I } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { constructAdminData as ft } from "../../functions/pre-transaction/constructAdminData.mjs";
+import "@coral-xyz/anchor";
+import "circomlibjs-hinkal-fork";
+import "@solana/spl-token";
+import "tweetnacl";
+import "bs58";
+import "buffer";
+import "../crypto-keys/keys.mjs";
+import "libsodium-wrappers";
+import "lodash";
+import { waitForDepositedUtxosInMerkleTree as lt } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import "../../constants/token-data/index.mjs";
+import "../../constants/contracts.constants.mjs";
+import "../../constants/kyc.constants.mjs";
+import "../../constants/coingecko.constants.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import "../../constants/token.limits.constants.mjs";
+import "../../constants/presale.constants.mjs";
+import "../../constants/activity.constants.mjs";
+import "../../constants/tasks.constants.mjs";
+import "../../constants/events.constants.mjs";
+import "../../constants/schedule.constants.mjs";
+import "../../constants/tokens.constants.mjs";
+import "../../functions/utils/userAgent.mjs";
+import { convertEmporiumOpToCallInfo as At } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import "multiformats";
+import { validateAndGetChainId as Et } from "../../functions/utils/token-check.utils.mjs";
+import "async-mutex";
+import "process";
+import "../../providers/EthersProviderAdapter.mjs";
+import { calculateTotalFee as Tt } from "../../functions/utils/fees.utils.mjs";
+import "node-forge";
+import "../../API/enclaveUtxoCalls.mjs";
+import "tronweb";
+import { hinkalDepositOnChainUtxos as H } from "./hinkalDepositOnChainUtxos.mjs";
+import { createLifiBridgeOps as q } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { API as wt } from "../../API/API.mjs";
+import { safeUpdateDepositAndWithdrawStatus as O } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import "../../functions/web3/events/getApprovedBalance.mjs";
+import "../../functions/web3/getTokenHolder.mjs";
+const gt = async (e, t, s, E, T, p, v, D, c, r) => {
+  if (E.length === 0)
+    throw new Error("No recipients to bridge");
+  const m = s.erc20TokenAddress, { contractData: h } = at[t], { emporiumAddress: a } = h;
+  if (!a)
+    throw Error("No Emporium Address");
+  const C = z[P.Lifi][t];
+  if (!C)
+    throw new Error(`LIFI not configured for chain ${t}`);
+  const S = await e.getRandomRelay(t);
+  if (!S)
+    throw Error(rt.RELAYER_NOT_AVAILABLE);
+  const w = await e.getEthereumAddressByChain(t), F = pt().toString(), g = e.generateProofRemotely ? 5 : 1, y = [];
+  for (let d = 0; d < E.length; d += g) {
+    const R = E.slice(d, d + g), U = await Promise.all(
+      R.map(async ({ utxo: u, nativeUtxo: o, bridgeAmount: i, quote: f, temporarySubAccount: n, recipientAddress: M }) => {
+        await wt.addTemporaryWalletNonce(t, p, n.index);
+        const V = f.nativeFee > 0n && !I(m, A), l = [m], B = [-u.amount], L = [!1], _ = new K({
+          amount: 0n,
+          erc20TokenAddress: m,
+          shieldedPrivateKey: e.userKeys.getShieldedPrivateKey(),
+          timeStamp: F,
+          tokenId: 0
+        }), k = [[u, _]], N = [[_]];
+        if (V && o) {
+          const b = new K({
+            amount: 0n,
+            erc20TokenAddress: A,
+            shieldedPrivateKey: e.userKeys.getShieldedPrivateKey(),
+            timeStamp: F,
+            tokenId: 0
+          });
+          l.push(A), B.push(-o.amount), L.push(!1), k.push([o, b]), N.push([b]);
+        }
+        const Y = q(
+          e,
+          t,
+          n.ethAddress,
+          C,
+          m,
+          u.amount,
+          i,
+          f
+        ), { patchAccessTokenMerkleTree: Z, signatureData: $ } = await nt(
+          e,
+          t,
+          l,
+          B,
+          w
+        ), j = Tt(i, T), G = {
+          feeToken: T.feeToken,
+          flatFee: j,
+          variableRate: 0n
+        }, J = ft(r, t, l, [-u.amount], w), { zkCallData: Q, circomData: X, dimData: tt, authorizationData: ot } = await it(
+          "v1x1",
+          e.merkleTreeHinkalByChain[t],
+          e.merkleTreeAccessTokenByChain[t],
+          l,
+          l.map(() => 0),
+          k,
+          N,
+          e.userKeys,
+          l.length,
+          k[0].length,
+          a,
+          Y,
+          e.generateProofRemotely,
+          S ?? A,
+          t,
+          L,
+          void 0,
+          n.privateKey,
+          void 0,
+          Z,
+          void 0,
+          G,
+          e.getContractWithFetcher(t, mt.HinkalHelperContract),
+          $
+        );
+        return { zkCallData: Q, dimData: tt, circomData: X, authorizationData: ot, recipientAddress: M, adminData: J };
+      })
+    );
+    y.push(...U);
+  }
+  await O({
+    id: v,
+    chainId: t,
+    hashedEthereumAddress: p,
+    phase: W.BEFORE_SCHEDULE_WITHDRAW
+  });
+  const x = await st(
+    t,
+    y,
+    p,
+    D,
+    c
+  );
+  return await O({
+    id: v,
+    chainId: t,
+    hashedEthereumAddress: p,
+    phase: W.AFTER_SCHEDULE_WITHDRAW,
+    scheduleId: x
+  }), x;
+}, No = async (e, t, s, E, T, p, v, D = !0) => {
+  const c = t.erc20TokenAddress, r = Et([t]), m = dt(await e.getEthereumAddressByChain(r)), h = z[P.Lifi][r];
+  if (!h)
+    throw Error("LIFI router not configured");
+  let a;
+  if (T)
+    a = T;
+  else {
+    const o = s[0], f = q(
+      e,
+      r,
+      o.temporarySubAccount.ethAddress,
+      h,
+      c,
+      o.bridgeAmount,
+      o.bridgeAmount,
+      o.quote
+    ).map(
+      (n) => At(n, o.temporarySubAccount.ethAddress, r)
+    );
+    a = await ct(
+      r,
+      c,
+      [c],
+      P.Emporium,
+      f,
+      et
+    );
+  }
+  const C = {
+    feeToken: a.feeToken,
+    flatFee: 0n,
+    variableRate: 0n
+  }, w = s.reduce((o, i) => o + i.quote.nativeFee, 0n) > 0n && !I(c, A), F = s.map((o) => o.bridgeAmount), g = s.map((o) => o.recipientAddress), {
+    userDepositedUtxos: y,
+    statusId: x,
+    depositTxHash: d
+  } = await H(
+    e,
+    r,
+    t,
+    F,
+    g,
+    a,
+    m,
+    D
+  );
+  let R = [];
+  if (w) {
+    const o = ut(A, r);
+    if (!o)
+      throw Error("No native token");
+    const i = s.map((n) => n.quote.nativeFee), { userDepositedUtxos: f } = await H(
+      e,
+      r,
+      o,
+      i,
+      g,
+      C,
+      m,
+      D
+    );
+    R = f;
+  }
+  const U = [...y, ...R];
+  await lt(e, r, U);
+  const u = s.map((o, i) => ({
+    ...o,
+    utxo: y[i].utxo,
+    nativeUtxo: w ? R[i]?.utxo : void 0
+  }));
+  return await gt(
+    e,
+    r,
+    t,
+    u,
+    a,
+    m,
+    x,
+    E,
+    p,
+    v
+  ), d;
+};
+export {
+  No as hinkalDepositAndBridge
+};

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,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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../constants/protocol.constants.cjs"),G=require("../../error-handling/error-codes.constants.cjs"),V=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),Y=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),j=require("../../types/external-action.types.cjs"),f=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const $=require("../../types/ethereum-network.types.cjs"),J=require("../../constants/chains.constants.cjs");require("../../types/activities.types.cjs");const F=require("../../types/scheduled-transactions.types.cjs"),Q=require("../../functions/pre-transaction/getKycAndSignatureData.cjs"),X=require("../../functions/utils/time.utils.cjs"),ee=require("../../functions/pre-transaction/getFeeStructure.cjs"),re=require("../../functions/utils/addresses.cjs"),te=require("./hinkalDepositOnChainUtxos.cjs"),se=require("../../functions/pre-transaction/constructAdminData.cjs"),P=require("../../API/deposit-and-withdraw-status-calls.cjs"),ae=require("../../functions/utils/token-check.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("ethers");require("circomlibjs-hinkal-fork");require("../../constants/kyc.constants.cjs");require("idb-keyval");require("../http/HttpClient.cjs");require("../../constants/vite.constants.cjs");require("../../constants/token-data/index.cjs");require("../../constants/tokens.constants.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("axios");const oe=require("../../functions/utils/caseInsensitive.utils.cjs");require("@solana/spl-token");require("tweetnacl");require("bs58");require("buffer");require("../crypto-keys/keys.cjs");require("libsodium-wrappers");require("lodash");const ie=require("../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../../constants/schedule.constants.cjs");require("../../functions/utils/userAgent.cjs");require("multiformats");require("async-mutex");require("process");require("../../providers/EthersProviderAdapter.cjs");const ne=require("../../functions/utils/fees.utils.cjs");require("node-forge");require("../../API/enclaveUtxoCalls.cjs");const w=require("../../functions/utils/tron.utils.cjs");require("../../functions/web3/events/getInputUtxoAndBalance.cjs");require("../../functions/web3/events/getApprovedBalance.cjs");require("../../functions/web3/getTokenHolder.cjs");const ue=async(r,e,d,a,m,q,o,l,h,s,A)=>{const i=J.isTronLike(e);if(a.length===0)throw new Error("userDepositedUtxos must not be empty");const t=d.erc20TokenAddress,[n,p]=await Promise.all([r.getRandomRelay(e),r.getEthereumAddressByChain(e)]);if(!n)throw Error(G.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const T=X.getCurrentTimeInSeconds().toString(),x=r.generateProofRemotely&&!i?5:1,D=[],E=w.addressToHexFormat(p);for(let u=0;u<a.length;u+=x){const H=a.slice(u,u+x),W=await Promise.all(H.map(async({recipientAddress:C,utxo:c})=>{const B=w.addressToHexFormat(C),b=[-c.amount],S=new f.Utxo({amount:0n,erc20TokenAddress:t,shieldedPrivateKey:r.userKeys.getShieldedPrivateKey(),timeStamp:T,tokenId:0}),_=[[oe.caseInsensitiveEqual(c.erc20TokenAddress,t)?c:f.Utxo.createFrom(c,{erc20TokenAddress:t}),S]],M=[[S]],L=`swapperM1x${_[0].length}x1`,{patchAccessTokenMerkleTree:I,signatureData:K}=await Q.getKycAndSignatureData(r,e,[t],b,E),y={externalActionId:0n,externalAddress:B,externalActionMetadata:"0x00"},O=se.constructAdminData(A,e,[t],[-c.amount],E),z=ne.calculateTotalFee(m[u],q),N={feeToken:q.feeToken,flatFee:z,variableRate:0n},{zkCallData:k,circomData:R,dimData:v}=await V.constructZkProof("v1x1",r.merkleTreeHinkalByChain[e],r.merkleTreeAccessTokenByChain[e],_,M,r.userKeys,L,y.externalActionId,y.externalAddress,y.externalActionMetadata,r.generateProofRemotely,n??U.zeroAddress,e,void 0,void 0,void 0,I,void 0,void 0,N,r.getContractWithFetcher(e,$.ContractType.HinkalHelperContract),K),Z=await w.reorderZkCallData(i,k,v,R);return{zkCallData:k,dimData:v,circomData:R,adminData:O,recipientAddress:C,tronProofSignature:Z}}));D.push(...W)}await P.safeUpdateDepositAndWithdrawStatus({id:l,chainId:e,hashedEthereumAddress:o,phase:F.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await Y.transactCallRelayerBatch(e,D,o,h,s);return await P.safeUpdateDepositAndWithdrawStatus({id:l,chainId:e,hashedEthereumAddress:o,phase:F.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},ce=async(r,e,d,a,m,q,o,l,h=!0)=>{const s=ae.validateAndGetChainId([e]),A=e.erc20TokenAddress,i=re.hashEthereumAddress(w.addressToHexFormat(await r.getEthereumAddressByChain(s))),t=q??await ee.getFeeStructure(s,A,[A],j.ExternalActionId.Transact,[],U.PAY_SEND_VARIABLE_RATE),{userDepositedUtxos:n,statusId:p,depositTxHash:T}=await te.hinkalDepositOnChainUtxos(r,s,e,d,a,t,i,h);return await ie.waitForDepositedUtxosInMerkleTree(r,s,n),await ue(r,s,e,n,d,t,i,p,m,o,l),T};exports.hinkalDepositAndWithdraw=ce;

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

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

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -1,134 +1,191 @@
-import { zeroAddress as k } from "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as F } from "../../error-handling/error-codes.constants.mjs";
-import { constructZkProof as L } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayerBatch as O } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as z } from "../../types/external-action.types.mjs";
-import { Utxo as B } from "../utxo/Utxo.mjs";
+import { PAY_SEND_VARIABLE_RATE as Y, zeroAddress as Z } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as q } from "../../error-handling/error-codes.constants.mjs";
+import { constructZkProof as G } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayerBatch as $ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as j } from "../../types/external-action.types.mjs";
+import { Utxo as P } from "../utxo/Utxo.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as q } from "../../types/ethereum-network.types.mjs";
-import { AdminTransactionType as N } from "../../types/admin.types.mjs";
+import { ContractType as J } from "../../types/ethereum-network.types.mjs";
+import { isTronLike as Q } from "../../constants/chains.constants.mjs";
 import "../../types/activities.types.mjs";
-import { DepositAndWithdrawPhase as y } from "../../types/scheduled-transactions.types.mjs";
-import { getSignatureDataForTransact as V } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as Y } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getCurrentTimeInSeconds as Z } from "../../functions/utils/time.utils.mjs";
-import { getFeeStructure as $ } from "../../functions/pre-transaction/getFeeStructure.mjs";
-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, r, o, w, a, n, h, A) => {
-  if (o.length === 0)
+import { DepositAndWithdrawPhase as H } from "../../types/scheduled-transactions.types.mjs";
+import { getKycAndSignatureData as X } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { getCurrentTimeInSeconds as tt } from "../../functions/utils/time.utils.mjs";
+import { getFeeStructure as rt } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hashEthereumAddress as ot } from "../../functions/utils/addresses.mjs";
+import { hinkalDepositOnChainUtxos as et } from "./hinkalDepositOnChainUtxos.mjs";
+import { constructAdminData as at } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { safeUpdateDepositAndWithdrawStatus as B } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { validateAndGetChainId as it } from "../../functions/utils/token-check.utils.mjs";
+import "@coral-xyz/anchor";
+import "@solana/web3.js";
+import "ethers";
+import "circomlibjs-hinkal-fork";
+import "../../constants/kyc.constants.mjs";
+import "idb-keyval";
+import "../http/HttpClient.mjs";
+import "../../constants/vite.constants.mjs";
+import "../../constants/token-data/index.mjs";
+import "../../constants/tokens.constants.mjs";
+import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
+import "../../constants/server.constants.mjs";
+import "../../API/getServerURL.mjs";
+import "axios";
+import { caseInsensitiveEqual as mt } from "../../functions/utils/caseInsensitive.utils.mjs";
+import "@solana/spl-token";
+import "tweetnacl";
+import "bs58";
+import "buffer";
+import "../crypto-keys/keys.mjs";
+import "libsodium-wrappers";
+import "lodash";
+import { waitForDepositedUtxosInMerkleTree as st } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import "../../constants/contracts.constants.mjs";
+import "../../constants/coingecko.constants.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import "../../constants/addresses.constants.mjs";
+import "../../constants/token.limits.constants.mjs";
+import "../../constants/presale.constants.mjs";
+import "../../constants/activity.constants.mjs";
+import "../../constants/tasks.constants.mjs";
+import "../../constants/events.constants.mjs";
+import "../../constants/schedule.constants.mjs";
+import "../../functions/utils/userAgent.mjs";
+import "multiformats";
+import "async-mutex";
+import "process";
+import "../../providers/EthersProviderAdapter.mjs";
+import { calculateTotalFee as nt } from "../../functions/utils/fees.utils.mjs";
+import "node-forge";
+import "../../API/enclaveUtxoCalls.mjs";
+import { addressToHexFormat as E, reorderZkCallData as pt } from "../../functions/utils/tron.utils.mjs";
+import "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import "../../functions/web3/events/getApprovedBalance.mjs";
+import "../../functions/web3/getTokenHolder.mjs";
+const ct = async (r, t, c, a, w, d, i, A, u, e, l) => {
+  const m = Q(t);
+  if (a.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
-  const e = r.erc20TokenAddress, i = await t.getRandomRelay();
-  if (!i)
-    throw Error(F.RELAYER_NOT_AVAILABLE);
-  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({
+  const o = c.erc20TokenAddress, [s, f] = await Promise.all([
+    r.getRandomRelay(t),
+    r.getEthereumAddressByChain(t)
+  ]);
+  if (!s)
+    throw Error(q.RELAYER_NOT_AVAILABLE);
+  const T = tt().toString(), x = r.generateProofRemotely && !m ? 5 : 1, y = [], D = E(f);
+  for (let n = 0; n < a.length; n += x) {
+    const U = a.slice(n, n + x), _ = await Promise.all(
+      U.map(async ({ recipientAddress: C, utxo: p }) => {
+        const L = E(C), W = [-p.amount], R = new P({
           amount: 0n,
-          erc20TokenAddress: e,
-          shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: c,
+          erc20TokenAddress: o,
+          shieldedPrivateKey: r.userKeys.getShieldedPrivateKey(),
+          timeStamp: T,
           tokenId: 0
-        }), T = [[f, l]], S = [[l]], v = `swapperM1x${T[0].length}x1`, C = {
+        }), S = [[mt(p.erc20TokenAddress, o) ? p : P.createFrom(p, { erc20TokenAddress: o }), R]], b = [[R]], M = `swapperM1x${S[0].length}x1`, { patchAccessTokenMerkleTree: K, signatureData: z } = await X(r, t, [o], W, D), h = {
           externalActionId: 0n,
-          externalAddress: D,
+          externalAddress: L,
           externalActionMetadata: "0x00"
-        }, {
-          patchAccessTokenMerkleTree: H,
-          kycRequired: P,
-          hasAccessToken: U
-        } = await Y(t, [e], R), W = await V(
-          t.getCurrentChainId(),
-          s,
-          t.userKeys,
-          P,
-          U
-        ), K = J(
-          N.WithdrawOnChainUtxos,
-          t.getCurrentChainId(),
-          [e],
-          [-f.amount],
-          s
-        ), { zkCallData: M, circomData: _, dimData: b } = await L(
+        }, I = at(
+          l,
+          t,
+          [o],
+          [-p.amount],
+          D
+        ), O = nt(w[n], d), N = {
+          feeToken: d.feeToken,
+          flatFee: O,
+          variableRate: 0n
+        }, { zkCallData: v, circomData: k, dimData: F } = await G(
           "v1x1",
-          t.merkleTreeHinkal,
-          t.merkleTreeAccessToken,
-          T,
+          r.merkleTreeHinkalByChain[t],
+          r.merkleTreeAccessTokenByChain[t],
           S,
-          t.userKeys,
-          v,
-          C.externalActionId,
-          C.externalAddress,
-          C.externalActionMetadata,
-          t.generateProofRemotely,
-          i ?? k,
-          t.getCurrentChainId(),
+          b,
+          r.userKeys,
+          M,
+          h.externalActionId,
+          h.externalAddress,
+          h.externalActionMetadata,
+          r.generateProofRemotely,
+          s ?? Z,
+          t,
           void 0,
           void 0,
           void 0,
-          H,
+          K,
           void 0,
           void 0,
-          w,
-          t.getContractWithFetcher(q.HinkalHelperContract),
-          W,
-          void 0,
-          !1
-        );
+          N,
+          r.getContractWithFetcher(t, J.HinkalHelperContract),
+          z
+        ), V = await pt(m, v, F, k);
         return {
-          zkCallData: M,
-          dimData: b,
-          circomData: _,
-          adminData: K
+          zkCallData: v,
+          dimData: F,
+          circomData: k,
+          adminData: I,
+          recipientAddress: C,
+          tronProofSignature: V
         };
       })
     );
-    m.push(...E);
+    y.push(..._);
   }
-  const p = t.getCurrentChainId();
-  await x(p, {
-    id: n,
-    hashedEthereumAddress: a,
-    phase: y.BEFORE_SCHEDULE_WITHDRAW
+  await B({
+    id: A,
+    chainId: t,
+    hashedEthereumAddress: i,
+    phase: H.BEFORE_SCHEDULE_WITHDRAW
   });
-  const g = await O(
-    t.getCurrentChainId(),
-    m,
-    a,
-    h,
-    A
+  const g = await $(
+    t,
+    y,
+    i,
+    u,
+    e
   );
-  return await x(p, {
-    id: n,
-    hashedEthereumAddress: a,
-    phase: y.AFTER_SCHEDULE_WITHDRAW,
+  return await B({
+    id: A,
+    chainId: t,
+    hashedEthereumAddress: i,
+    phase: H.AFTER_SCHEDULE_WITHDRAW,
     scheduleId: g
   }), 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,
+}, Dr = async (r, t, c, a, w, d, i, A, u = !0) => {
+  const e = it([t]), l = t.erc20TokenAddress, m = ot(
+    E(await r.getEthereumAddressByChain(e))
+  ), o = d ?? await rt(
+    e,
+    l,
+    [l],
+    j.Transact,
+    [],
+    Y
+  ), { userDepositedUtxos: s, statusId: f, depositTxHash: T } = await et(
     r,
-    o,
-    w,
+    e,
+    t,
     c,
-    s,
-    A
+    a,
+    o,
+    m,
+    u
   );
-  return await Q(
-    t,
+  return await st(r, e, s), await ct(
     r,
-    d,
-    c,
+    e,
+    t,
     s,
+    c,
+    o,
     m,
-    a,
-    h
-  ), p;
+    f,
+    w,
+    i,
+    A
+  ), T;
 };
 export {
-  gt as hinkalDepositAndWithdraw
+  Dr as hinkalDepositAndWithdraw
 };

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.cjs

@@ -1 +1 @@
-"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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const L=require("ethers"),G=require("../../constants/protocol.constants.cjs"),J=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),Q=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),V=require("../../functions/web3/events/getShieldedBalance.cjs"),Y=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),I=require("../../functions/web3/functionCalls/transactCallDirectTron.cjs"),tt=require("../../types/external-action.types.cjs");require("../../types/circom-data.types.cjs");const w=require("../../types/ethereum-network.types.cjs"),B=require("../../constants/chains.constants.cjs"),et=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const F=require("../../types/scheduled-transactions.types.cjs"),ot=require("../../functions/pre-transaction/getKycAndSignatureData.cjs"),rt=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),st=require("../../functions/utils/fees.utils.cjs"),nt=require("../../functions/pre-transaction/constructAdminData.cjs"),at=require("../../API/admin-calls.cjs"),b=require("../../API/deposit-and-withdraw-status-calls.cjs"),it=require("../../functions/utils/tx-confirmation.utils.cjs"),g=require("../../functions/utils/tron.utils.cjs"),ct=async(e,t,a,u)=>{const i=[...await V.addPaddingToUtxos(e,t,a,u)],d=[];for(let r=0;r<i.length;r+=1){const{outputUtxos:p}=J.outputUtxoProcessing(e.userKeys,i[r],u[r]);d.push(p)}return{inputUtxosArray:i,outputUtxosArray:d}},ut=async(e,t,a,u,i,d,r,p=!0)=>{const k=B.isTronLike(t),y=a.erc20TokenAddress,H=await e.getEthereumAddressByChain(t),U=g.addressToHexFormat(H),l=u.map(o=>o+st.calculateTotalFee(o,d)),x=l.reduce((o,s)=>o+s,0n),A=[y],h=[0n],R=[!0],K=L.ethers.AbiCoder.defaultAbiCoder().encode(["uint256[]"],[l]),{hinkalWrapperAddress:C,hinkalWrapperABI:f,depositOnChainUtxosExternalActionAddress:T,depositOnChainUtxosExternalActionABI:q}=B.networkRegistry[t].contractData;if(!C||!f||!T||!q)throw new Error("contract data not set in networkRegistry");const[{patchAccessTokenMerkleTree:M,signatureData:Z},{inputUtxosArray:O,outputUtxosArray:$}]=await Promise.all([ot.getKycAndSignatureData(e,t,A,h,U),ct(e,t,A,h)]),{zkCallData:E,circomData:W,dimData:P}=await Q.constructZkProof("v1x1",e.merkleTreeHinkalByChain[t],e.merkleTreeAccessTokenByChain[t],O,$,e.userKeys,`swapperM1x${O[0].length}x1`,tt.ExternalActionId.DepositOnChainUtxos,T,K,e.generateProofRemotely,G.zeroAddress,t,R,void 0,void 0,M,void 0,void 0,void 0,e.getContractWithFetcher(t,w.ContractType.HinkalHelperContract),Z,C),v=(await b.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:r,phase:F.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0;let n;if(k){const o=e.getTronWeb(),s=o.contract(q,g.evmHexToTronBase58Address(T)),c=o.contract(f,g.evmHexToTronBase58Address(C));n=await I.transactCallDirectTron(e,t,x,a,E,W,P,s,c,p)}else{const o=e.getContractWithSigner(t,w.ContractType.HinkalWrapper),s=e.getContractWithSigner(t,w.ContractType.DepositOnChainUtxos);n=(await Y.transactCallDirect(e,t,x,a,E,W,P,s,o,p)).hash}if(!n)throw new Error("Deposit transaction hash not found");const z=await it.waitForEthereumTransactionConfirmation(t,n);await b.safeUpdateDepositAndWithdrawStatus({id:v,chainId:t,hashedEthereumAddress:r,phase:F.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:n});const S=rt.getOnChainUtxosFromReceipt(z,e,t,y);if(S.length===0)throw new Error("No UTXOs found in deposit transaction. Check contract address and ABI.");const _=[],m=[...S];i.forEach((o,s)=>{const c=l[s],D=m.find(j=>j.amount===c);if(!D)throw new Error(`Could not find newly created UTXO with amount ${c} for recipient ${o}.`);_.push({recipientAddress:o,utxo:D});const X=m.indexOf(D);m.splice(X,1)});const N=nt.constructAdminData(et.AdminTransactionType.DepositOnChainUtxos,t,A,[x],U);return at.emitTxPublicData(N),{userDepositedUtxos:_,statusId:v,depositTxHash:n}};exports.hinkalDepositOnChainUtxos=ut;

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, preEstimateGas?: boolean) => Promise<{
+export declare const hinkalDepositOnChainUtxos: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string, preEstimateGas?: boolean) => Promise<{
     userDepositedUtxos: RecipientUtxo[];
     statusId?: string | undefined;
     depositTxHash: string;