@hinkal/common 0.2.26 → 0.2.28

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.mjs

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

package/data-structures/Hinkal/hinkalGetZkMeProvider.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../API/API.cjs"),n=r=>({async getAccessToken(){const e=r.getCurrentChainId();return a.API.getZkMeAccessToken(e)},async getUserAccounts(){return[await r.getEthereumAddress()]},async delegateTransaction(e){const t=await r.getProviderAdapter(),s={...e,chainId:Number(e.chainId),type:e.type?e.type:void 0,maxPriorityFeePerGas:e.maxPriorityFeePerGas?e.maxPriorityFeePerGas:void 0,maxFeePerGas:e.maxFeePerGas?e.maxFeePerGas:void 0};return(await t.sendTransaction(s)).hash}});exports.getHinkalZkMeProvider=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../API/API.cjs"),n=r=>({async getAccessToken(){return a.API.getZkMeAccessToken()},async getUserAccounts(){return[await r.getEthereumAddress()]},async delegateTransaction(e){const s=r.getProviderAdapter(Number(e.chainId)),t={...e,chainId:Number(e.chainId),type:e.type?e.type:void 0,maxPriorityFeePerGas:e.maxPriorityFeePerGas?e.maxPriorityFeePerGas:void 0,maxFeePerGas:e.maxFeePerGas?e.maxFeePerGas:void 0};return(await s.sendTransaction(t)).hash}});exports.getHinkalZkMeProvider=n;

package/data-structures/Hinkal/hinkalGetZkMeProvider.mjs

@@ -1,21 +1,20 @@
-import { API as a } from "../../API/API.mjs";
+import { API as t } from "../../API/API.mjs";
 const d = (r) => ({
   async getAccessToken() {
-    const e = r.getCurrentChainId();
-    return a.getZkMeAccessToken(e);
+    return t.getZkMeAccessToken();
   },
   async getUserAccounts() {
     return [await r.getEthereumAddress()];
   },
   async delegateTransaction(e) {
-    const s = await r.getProviderAdapter(), t = {
+    const s = r.getProviderAdapter(Number(e.chainId)), a = {
       ...e,
       chainId: Number(e.chainId),
       type: e.type ? e.type : void 0,
       maxPriorityFeePerGas: e.maxPriorityFeePerGas ? e.maxPriorityFeePerGas : void 0,
       maxFeePerGas: e.maxFeePerGas ? e.maxFeePerGas : void 0
     };
-    return (await s.sendTransaction(t)).hash;
+    return (await s.sendTransaction(a)).hash;
   }
 });
 export {

package/data-structures/Hinkal/hinkalMultiSend.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../error-handling/error-codes.constants.cjs"),s=require("../../functions/utils/addresses.cjs"),u=async(i,a,o,t)=>{let r;return t&&(r=t.map(e=>{if(!s.isValidPrivateAddress(e))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);return s.constructStealthAddressStructure(e)})),await i.prooflessDeposit(a,o,r)};exports.hinkalMultiSendPrivateRecipients=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../error-handling/error-codes.constants.cjs"),s=require("../../functions/utils/addresses.cjs"),u=async(i,o,a,r)=>{let t;return r&&(t=r.map(e=>{if(!s.isValidPrivateAddress(e))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);return s.constructStealthAddressStructure(e)})),i.prooflessDeposit(o,a,t)};exports.hinkalMultiSendPrivateRecipients=u;

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

@@ -1,3 +1,3 @@
 import { type IHinkal } from './IHinkal';
 import { type ERC20Token } from '../../types/token.types';
-export declare const hinkalMultiSendPrivateRecipients: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amounts: bigint[], extendedRecipientInfos?: string[]) => Promise<import("ethers").ContractTransaction>;
+export declare const hinkalMultiSendPrivateRecipients: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amounts: bigint[], extendedRecipientInfos?: string[]) => Promise<string>;

package/data-structures/Hinkal/hinkalMultiSend.mjs

@@ -1,12 +1,12 @@
 import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
-import { isValidPrivateAddress as u, constructStealthAddressStructure as c } from "../../functions/utils/addresses.mjs";
-const m = async (o, a, e, r) => {
+import { isValidPrivateAddress as u, constructStealthAddressStructure as d } from "../../functions/utils/addresses.mjs";
+const m = async (o, e, a, r) => {
   let t;
   return r && (t = r.map((s) => {
     if (!u(s))
       throw Error(i.RECIPIENT_FORMAT_INCORRECT);
-    return c(s);
-  })), await o.prooflessDeposit(a, e, t);
+    return d(s);
+  })), o.prooflessDeposit(e, a, t);
 };
 export {
   m as hinkalMultiSendPrivateRecipients

package/data-structures/Hinkal/hinkalPrivateWallet.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const z=require("../../constants/chains.constants.cjs"),I=require("../../error-handling/error-codes.constants.cjs");require("ethers");require("../../types/circom-data.types.cjs");const V=require("../../types/ethereum-network.types.cjs"),b=require("../../types/external-action.types.cjs"),j=require("../../types/hinkal.types.cjs"),S=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/save-depths.cjs");const G=require("../../functions/utils/caseInsensitive.utils.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");const Y=require("../crypto-keys/keys.cjs"),J=require("../../functions/utils/time.utils.cjs"),Q=require("../../functions/snarkjs/constructEmporiumProof.cjs"),X=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),$=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),ee=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),re=require("../../functions/utils/involves-permit2-op.cjs"),te=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),oe=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),se=require("../../functions/pre-transaction/getFeeStructure.cjs"),ie=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),ae=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),ne=require("../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs"),ue=require("./handleAutoDepositBack.cjs");require("../../constants/token-data/index.cjs");const ce=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const de=require("../../functions/pre-transaction/recipientUtxoProcessing.cjs"),pe=require("../../functions/utils/addresses.cjs"),qe=async(e,t,o,l,n,s,m,R,U,_,F=!1,C,g,u,v=!1)=>{if(u&&!pe.isValidPrivateAddress(u.recipientInfo))throw Error(I.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const c=e.getCurrentChainId(),d=Y.UserKeys.getSignerAddressFromPrivateKey(c,m.privateKey),{contractData:K}=z.networkRegistry[c],{emporiumAddress:p}=K;if(!p)throw Error("No Emporium Address Provided");const q=U??await se.getFeeStructure(c,R,t,b.ExternalActionId.Emporium,n.map(r=>oe.convertEmporiumOpToCallInfo(r,d??"",c))),k=s.find(r=>G.caseInsensitiveEqual(r.token.erc20TokenAddress,q.feeToken))?.amount??0n;for(d&&await ne.mergeWithFeeStructureEmporium(e,d,n,t,o,q,k);l.length<t.length;)l.push(!1);const i=[...await Z.addPaddingToUtxos(e,t,o)],A=[],a=j.defaultHinkalLogicArgs(o.length,e.userKeys),f=J.getCurrentTimeInSeconds().toString();for(let r=0;r<t.length;r+=1){const{outputUtxos:B}=X.outputUtxoProcessing(e.userKeys,i[r],o[r],f,void 0,!1);A.push(B);const{useApprovalUtxoData:x}=te.outputApprovalDataProcessing(e,i[r],o[r]);x&&(a.doPreTxApproval=!0,a.useApprovalUtxoData[r]=x,a.interactionAddress=p,a.inHinkalAddress=e.userKeys.getInHinkalAddress(p))}u&&de.recipientUtxoProcessing(u,A,o,f);const E=_??await e.getRandomRelay(!v);if(!E)throw Error(I.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:O,kycRequired:W,hasAccessToken:h}=await ie.shouldPatchAccessTokenMerkleTree(e,t,o),H=await ae.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,W,h),{zkCallData:w,circomData:y,dimData:P,authorizationData:D}=await Q.constructEmporiumProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,t,t.map(()=>0),i,A,e.userKeys,o.length,i.length>0?i[0].length:0,p,n,e.generateProofRemotely,E,e.getCurrentChainId(),l,void 0,m.privateKey,a,O,void 0,q,e.getContractWithFetcher(V.ContractType.HinkalHelperContract),H),L=re.uniswapWorkaround(n);if(v)return await $.estimateGasRelayer(e,w,P,y,D);const T=g===S.AdminTransactionType.FundApproveAndTransact,M=ce.constructAdminData(g,e.getCurrentChainId(),s.map(r=>r.token.erc20TokenAddress),s.map(r=>r.amount),await e.getEthereumAddress(),g===S.AdminTransactionType.PublicSwap?s.map(({token:r})=>r):void 0,T?o:void 0,T?t:void 0,T?s:void 0),N=await ee.transactCallRelayer(e.getCurrentChainId(),w,P,y,!1,L,D,M);return F&&ue.handleAutoDepositBack(e,d,m,q.feeToken,C,s,y),N};exports.hinkalPrivateWallet=qe;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const N=require("../../constants/chains.constants.cjs"),D=require("../../error-handling/error-codes.constants.cjs");require("ethers");require("../../types/circom-data.types.cjs");const C=require("../../types/ethereum-network.types.cjs"),M=require("../../types/external-action.types.cjs"),z=require("../../types/hinkal.types.cjs"),L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");require("../../constants/vite.constants.cjs");const V=require("../../functions/snarkjs/constructEmporiumProof.cjs"),j=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),Y=require("../../functions/web3/events/getShieldedBalance.cjs"),G=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),J=require("../../functions/utils/involves-permit2-op.cjs"),Q=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),X=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),Z=require("../../functions/pre-transaction/getFeeStructure.cjs"),$=require("../../functions/pre-transaction/getKycAndSignatureData.cjs"),I=require("../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs"),h=require("../../functions/utils/caseInsensitive.utils.cjs"),ee=require("../../functions/utils/time.utils.cjs"),re=require("./handleAutoDepositBack.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("../../constants/token-data/index.cjs");require("../../constants/tokens.constants.cjs");const te=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");const S=require("../AccountActions/AccountActions.cjs");require("buffer");const oe=require("../../functions/pre-transaction/recipientUtxoProcessing.cjs");require("../crypto-keys/keys.cjs");require("libsodium-wrappers");require("lodash");const se=require("../../functions/utils/addresses.cjs"),ue=async(r,e,A,o,u,n,i)=>{const c=[...await Y.addPaddingToUtxos(r,e,A,o)],l=[],q=ee.getCurrentTimeInSeconds().toString();for(let s=0;s<A.length;s+=1){const{outputUtxos:y}=j.outputUtxoProcessing(r.userKeys,c[s],o[s],q,void 0,!1);l.push(y);const{useApprovalUtxoData:d}=Q.outputApprovalDataProcessing(r,e,c[s],o[s]);d&&(u.doPreTxApproval=!0,u.useApprovalUtxoData[s]=d,u.interactionAddress=n,u.inHinkalAddress=r.userKeys.getInHinkalAddress(n))}return i&&oe.recipientUtxoProcessing(i,l,o,q),{inputUtxosArray:c,outputUtxosArray:l}},ie=async(r,e,A,o,u,n,i,c,l,q,s,y=!1,d,P,g)=>{if(g&&!se.isValidPrivateAddress(g.recipientInfo))throw Error(D.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const a=A.map(t=>t.erc20TokenAddress),v=await r.getEthereumAddressByChain(e),p=S.AccountActions.getAddressFromSubAccount(e,c);if(!p)throw Error("Public account address is not available");const{contractData:U}=N.networkRegistry[e],{emporiumAddress:E}=U;if(!E)throw Error("No Emporium Address Provided");const m=q??await Z.getFeeStructure(e,l,a,M.ExternalActionId.Emporium,n.map(t=>X.convertEmporiumOpToCallInfo(t,p??"",e))),_=i.find(t=>h.caseInsensitiveEqual(t.token.erc20TokenAddress,m.feeToken))?.amount??0n;for(p&&await I.mergeWithFeeStructureEmporium(r,e,p,n,a,o,m,_);u.length<a.length;)u.push(!1);const w=z.defaultHinkalLogicArgs(o.length,r.userKeys),[{inputUtxosArray:f,outputUtxosArray:R},T,{patchAccessTokenMerkleTree:k,signatureData:F}]=await Promise.all([ue(r,e,a,o,w,E,g),s??await r.getRandomRelay(e,!0),$.getKycAndSignatureData(r,e,a,o,v)]);if(!T)throw Error(D.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{zkCallData:O,circomData:x,dimData:B,authorizationData:H}=await V.constructEmporiumProof("v1x1",r.merkleTreeHinkalByChain[e],r.merkleTreeAccessTokenByChain[e],a,a.map(()=>0),f,R,r.userKeys,o.length,f.length>0?f[0].length:0,E,n,r.generateProofRemotely,T,e,u,void 0,S.AccountActions.getPrivateKeyFromSubAccount(e,c),w,k,void 0,m,r.getContractWithFetcher(e,C.ContractType.HinkalHelperContract),F),K=J.uniswapWorkaround(n),W=te.constructAdminData(P,e,i.map(t=>t.token.erc20TokenAddress),i.map(t=>t.amount),v,P===L.AdminTransactionType.PublicSwap?i.map(({token:t})=>t):void 0),b=await G.transactCallRelayer(e,O,B,x,K,H,W);return y&&re.handleAutoDepositBack(r,e,p,c,m.feeToken,d,i,x),b};exports.hinkalPrivateWallet=ie;

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

@@ -1,6 +1,6 @@
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
-import { PrivateRecipientInfo, TokenChanges } from '../../types/token.types';
+import { ERC20Token, PrivateRecipientInfo, TokenChanges } from '../../types/token.types';
 import { SubAccount } from '../../types/proxy.types';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalPrivateWallet: (hinkal: IHinkal, erc20Addresses: string[], deltaChanges: bigint[], onChainCreation: boolean[], ops: string[], emporiumTokenChanges: TokenChanges<bigint>[], subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, relayOverride?: string, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, privateRecipientInfo?: PrivateRecipientInfo, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;
+export declare const hinkalPrivateWallet: (hinkal: IHinkal, chainId: number, erc20Tokens: ERC20Token[], deltaChanges: bigint[], onChainCreation: boolean[], ops: string[], emporiumTokenChanges: TokenChanges<bigint>[], subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, relayOverride?: string, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, privateRecipientInfo?: PrivateRecipientInfo) => Promise<string>;

package/data-structures/Hinkal/hinkalPrivateWallet.mjs

@@ -1,160 +1,156 @@
-import { networkRegistry as k } from "../../constants/chains.constants.mjs";
-import { transactionErrorCodes as R } from "../../error-handling/error-codes.constants.mjs";
+import { networkRegistry as z } from "../../constants/chains.constants.mjs";
+import { transactionErrorCodes as U } from "../../error-handling/error-codes.constants.mjs";
 import "ethers";
 import "../../types/circom-data.types.mjs";
-import { ContractType as Y } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as j } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as G } from "../../types/hinkal.types.mjs";
-import { AdminTransactionType as U } from "../../types/admin.types.mjs";
+import { ContractType as L } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as M } from "../../types/external-action.types.mjs";
+import { defaultHinkalLogicArgs as V } from "../../types/hinkal.types.mjs";
+import { AdminTransactionType as q } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
+import "../../constants/vite.constants.mjs";
+import { constructEmporiumProof as Y } from "../../functions/snarkjs/constructEmporiumProof.mjs";
+import { outputUtxoProcessing as j } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { addPaddingToUtxos as C } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { transactCallRelayer as G } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { uniswapWorkaround as J } from "../../functions/utils/involves-permit2-op.mjs";
+import { outputApprovalDataProcessing as Q } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { convertEmporiumOpToCallInfo as X } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { getFeeStructure as Z } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getKycAndSignatureData as $ } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { mergeWithFeeStructureEmporium as I } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
+import { caseInsensitiveEqual as h } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { getCurrentTimeInSeconds as tt } from "../../functions/utils/time.utils.mjs";
+import { handleAutoDepositBack as rt } from "./handleAutoDepositBack.mjs";
 import "../../constants/server.constants.mjs";
 import "../../API/getServerURL.mjs";
 import "../http/HttpClient.mjs";
 import "axios";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../constants/vite.constants.mjs";
-import "../../constants/save-depths.mjs";
-import { caseInsensitiveEqual as J } from "../../functions/utils/caseInsensitive.utils.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../../functions/utils/mutexes.utils.mjs";
+import "../../constants/token-data/index.mjs";
+import "../../constants/tokens.constants.mjs";
+import { constructAdminData as ot } from "../../functions/pre-transaction/constructAdminData.mjs";
 import "@coral-xyz/anchor";
 import "@solana/web3.js";
-import { UserKeys as Q } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as X } from "../../functions/utils/time.utils.mjs";
-import { constructEmporiumProof as Z } from "../../functions/snarkjs/constructEmporiumProof.mjs";
-import { outputUtxoProcessing as $ } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { addPaddingToUtxos as b } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as h } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as tt } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { uniswapWorkaround as rt } from "../../functions/utils/involves-permit2-op.mjs";
-import { outputApprovalDataProcessing as ot } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { convertEmporiumOpToCallInfo as et } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { getFeeStructure as it } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { shouldPatchAccessTokenMerkleTree as mt } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getSignatureDataForTransact as at } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { mergeWithFeeStructureEmporium as pt } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
-import { handleAutoDepositBack as st } from "./handleAutoDepositBack.mjs";
-import "../../constants/token-data/index.mjs";
-import { constructAdminData as nt } from "../../functions/pre-transaction/constructAdminData.mjs";
+import "circomlibjs-hinkal-fork";
 import "@solana/spl-token";
-import { recipientUtxoProcessing as ct } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
-import { isValidPrivateAddress as ut } from "../../functions/utils/addresses.mjs";
-const or = async (t, o, e, d, p, i, A, K, S, F, H = !1, C, g, s, y = !1) => {
-  if (s && !ut(s.recipientInfo))
-    throw Error(R.RECIPIENT_FORMAT_INCORRECT);
-  const n = t.getCurrentChainId(), c = Q.getSignerAddressFromPrivateKey(n, A.privateKey), { contractData: L } = k[n], { emporiumAddress: u } = L;
-  if (!u)
+import { AccountActions as S } from "../AccountActions/AccountActions.mjs";
+import "buffer";
+import { recipientUtxoProcessing as et } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
+import "../crypto-keys/keys.mjs";
+import "libsodium-wrappers";
+import "lodash";
+import { isValidPrivateAddress as mt } from "../../functions/utils/addresses.mjs";
+const st = async (r, t, f, e, s, p, i) => {
+  const a = [...await C(r, t, f, e)], n = [], A = tt().toString();
+  for (let m = 0; m < f.length; m += 1) {
+    const { outputUtxos: y } = j(
+      r.userKeys,
+      a[m],
+      e[m],
+      A,
+      void 0,
+      !1
+    );
+    n.push(y);
+    const { useApprovalUtxoData: d } = Q(r, t, a[m], e[m]);
+    d && (s.doPreTxApproval = !0, s.useApprovalUtxoData[m] = d, s.interactionAddress = p, s.inHinkalAddress = r.userKeys.getInHinkalAddress(p));
+  }
+  return i && et(i, n, e, A), { inputUtxosArray: a, outputUtxosArray: n };
+}, Jt = async (r, t, f, e, s, p, i, a, n, A, m, y = !1, d, x, w) => {
+  if (w && !mt(w.recipientInfo))
+    throw Error(U.RECIPIENT_FORMAT_INCORRECT);
+  const u = f.map((o) => o.erc20TokenAddress), g = await r.getEthereumAddressByChain(t), c = S.getAddressFromSubAccount(t, a);
+  if (!c)
+    throw Error("Public account address is not available");
+  const { contractData: R } = z[t], { emporiumAddress: E } = R;
+  if (!E)
     throw Error("No Emporium Address Provided");
-  const f = S ?? await it(
+  const l = A ?? await Z(
+    t,
     n,
-    K,
-    o,
-    j.Emporium,
-    p.map((r) => et(r, c ?? "", n))
-  ), W = i.find(
-    (r) => J(r.token.erc20TokenAddress, f.feeToken)
+    u,
+    M.Emporium,
+    p.map((o) => X(o, c ?? "", t))
+  ), H = i.find(
+    (o) => h(o.token.erc20TokenAddress, l.feeToken)
   )?.amount ?? 0n;
-  for (c && await pt(
+  for (c && await I(
+    r,
     t,
     c,
     p,
-    o,
+    u,
     e,
-    f,
-    W
-  ); d.length < o.length; )
-    d.push(!1);
-  const m = [...await b(t, o, e)], T = [], a = G(e.length, t.userKeys), E = X().toString();
-  for (let r = 0; r < o.length; r += 1) {
-    const { outputUtxos: V } = $(
-      t.userKeys,
-      m[r],
-      e[r],
+    l,
+    H
+  ); s.length < u.length; )
+    s.push(!1);
+  const P = V(e.length, r.userKeys), [{ inputUtxosArray: T, outputUtxosArray: F }, v, { patchAccessTokenMerkleTree: K, signatureData: B }] = await Promise.all([
+    st(
+      r,
+      t,
+      u,
+      e,
+      P,
       E,
-      void 0,
-      !1
-    );
-    T.push(V);
-    const { useApprovalUtxoData: I } = ot(t, m[r], e[r]);
-    I && (a.doPreTxApproval = !0, a.useApprovalUtxoData[r] = I, a.interactionAddress = u, a.inHinkalAddress = t.userKeys.getInHinkalAddress(u));
-  }
-  s && ct(s, T, e, E);
-  const v = F ?? await t.getRandomRelay(!y);
+      w
+    ),
+    m ?? await r.getRandomRelay(t, !0),
+    $(r, t, u, e, g)
+  ]);
   if (!v)
-    throw Error(R.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: N, kycRequired: O, hasAccessToken: _ } = await mt(
-    t,
-    o,
-    e
-  ), M = await at(
-    t.getCurrentChainId(),
-    await t.getEthereumAddress(),
-    t.userKeys,
-    O,
-    _
-  ), { zkCallData: P, circomData: l, dimData: x, authorizationData: D } = await Z(
+    throw Error(U.RELAYER_NOT_AVAILABLE);
+  const { zkCallData: O, circomData: D, dimData: W, authorizationData: k } = await Y(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    o,
-    o.map(() => 0),
-    m,
+    r.merkleTreeHinkalByChain[t],
+    r.merkleTreeAccessTokenByChain[t],
+    u,
+    u.map(() => 0),
     T,
-    t.userKeys,
+    F,
+    r.userKeys,
     e.length,
-    m.length > 0 ? m[0].length : 0,
-    u,
+    T.length > 0 ? T[0].length : 0,
+    E,
     p,
-    t.generateProofRemotely,
+    r.generateProofRemotely,
     v,
-    t.getCurrentChainId(),
-    d,
-    void 0,
-    A.privateKey,
-    a,
-    N,
+    t,
+    s,
     void 0,
-    f,
-    t.getContractWithFetcher(Y.HinkalHelperContract),
-    M
-  ), q = rt(p);
-  if (y)
-    return await h(t, P, x, l, D);
-  const w = g === U.FundApproveAndTransact, z = nt(
-    g,
-    t.getCurrentChainId(),
-    i.map((r) => r.token.erc20TokenAddress),
-    i.map((r) => r.amount),
-    await t.getEthereumAddress(),
-    g === U.PublicSwap ? i.map(({ token: r }) => r) : void 0,
-    w ? e : void 0,
-    // fundAmounts
-    w ? o : void 0,
-    // erc20AddressesToFund
-    w ? i : void 0
-  ), B = await tt(
-    t.getCurrentChainId(),
+    S.getPrivateKeyFromSubAccount(t, a),
     P,
-    x,
+    K,
+    void 0,
     l,
-    !1,
-    q,
+    r.getContractWithFetcher(t, L.HinkalHelperContract),
+    B
+  ), N = J(p), _ = ot(
+    x,
+    t,
+    i.map((o) => o.token.erc20TokenAddress),
+    i.map((o) => o.amount),
+    g,
+    x === q.PublicSwap ? i.map(({ token: o }) => o) : void 0
+  ), b = await G(
+    t,
+    O,
+    W,
     D,
-    z
+    N,
+    k,
+    _
   );
-  return H && st(
+  return y && rt(
+    r,
     t,
     c,
-    A,
-    f.feeToken,
-    C,
+    a,
+    l.feeToken,
+    d,
     i,
-    l
-  ), B;
+    D
+  ), b;
 };
 export {
-  or as hinkalPrivateWallet
+  Jt as hinkalPrivateWallet
 };