@sabaaa1/common 0.1.7 → 0.1.14

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -0,0 +1,167 @@
+import { ethers as z } from "ethers";
+import { zeroAddress as b } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as j } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as $ } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as M } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as q } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { transactCallDirect as B } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayerBatch as L } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as H } from "../../types/external-action.types.mjs";
+import { Utxo as N } from "../utxo/Utxo.mjs";
+import "../../types/circom-data.types.mjs";
+import { ContractType as U } from "../../types/ethereum-network.types.mjs";
+import "../../types/transactions.types.mjs";
+import "../../types/activities.types.mjs";
+import { getSignatureDataForTransact as K } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as k } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getCurrentTimeInSeconds as Z } from "../../functions/utils/time.utils.mjs";
+import { getUtxosFromReceipt as _ } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
+import { getFeeStructure as V } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { calculateTotalFee as X } from "../../functions/utils/fees.utils.mjs";
+const Y = async (t, s, m, u) => {
+  const c = s.erc20TokenAddress, o = {};
+  Object.entries(m).forEach(([e, r]) => {
+    o[e] = r + X(r, u);
+  });
+  const a = Object.values(o), n = [c], p = [0n], v = [!0], { patchAccessTokenMerkleTree: x, kycRequired: C, hasAccessToken: P } = await k(
+    t,
+    n,
+    p
+  ), i = await K(
+    t.getCurrentChainId(),
+    await t.getEthereumAddress(),
+    t.userKeys,
+    C,
+    P
+  ), d = [...await q(t, n, p)], g = [];
+  for (let e = 0; e < d.length; e += 1) {
+    const { outputUtxos: r } = $(t.userKeys, d[e], p[e]);
+    g.push(r);
+  }
+  const E = a.reduce((e, r) => e + r, 0n), f = z.utils.defaultAbiCoder.encode(["uint256[]"], [a]), h = t.getContractWithSigner(U.HinkalWrapper), w = t.getContractWithSigner(U.DepositOnChainUtxos), {
+    zkCallData: y,
+    circomData: I,
+    dimData: R
+  } = await M(
+    "v1x1",
+    t.merkleTreeHinkal,
+    t.merkleTreeAccessToken,
+    d,
+    g,
+    t.userKeys,
+    `swapperM1x${d[0].length}x1`,
+    H.DepositOnChainUtxos,
+    w.address,
+    f,
+    t.generateProofRemotely,
+    b,
+    t.getCurrentChainId(),
+    v,
+    void 0,
+    void 0,
+    void 0,
+    x,
+    void 0,
+    void 0,
+    void 0,
+    t.getContractWithFetcher(U.HinkalHelperContract),
+    i,
+    h.address
+  ), S = await (await B(
+    t,
+    E,
+    s,
+    y,
+    I,
+    R,
+    w,
+    h
+  )).wait(), O = _(S, t, c), D = /* @__PURE__ */ new Map(), l = [...O];
+  return Object.entries(o).forEach(([e, r]) => {
+    const A = l.find((W) => W.amount === r);
+    if (!A)
+      throw new Error(`Could not find newly created UTXO with amount ${r} for recipient ${e}.`);
+    D.set(e, A);
+    const F = l.indexOf(A);
+    l.splice(F, 1);
+  }), D;
+}, G = async (t, s, m, u, c) => {
+  const o = Array.from(m.entries());
+  if (o.length === 0)
+    throw new Error("userDepositedUtxos must not be empty");
+  const a = s.erc20TokenAddress, n = await t.getRandomRelay();
+  if (!n)
+    throw Error(j.RELAYER_NOT_AVAILABLE);
+  const p = await t.getEthereumAddress(), v = Z().toString(), x = t.generateProofRemotely ? 5 : 1, C = [];
+  for (let i = 0; i < o.length; i += x) {
+    const d = o.slice(i, i + x), g = await Promise.all(
+      d.map(async ([E, f]) => {
+        const h = [-f.amount], w = new N({
+          amount: 0n,
+          erc20TokenAddress: a,
+          shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
+          timeStamp: v,
+          tokenId: 0
+        }), y = [[f, w]], I = [[w]], R = `swapperM1x${y[0].length}x1`, T = {
+          externalActionId: 0n,
+          externalAddress: E,
+          externalActionMetadata: "0x00"
+        }, {
+          patchAccessTokenMerkleTree: S,
+          kycRequired: O,
+          hasAccessToken: D
+        } = await k(t, [a], h), l = await K(
+          t.getCurrentChainId(),
+          p,
+          t.userKeys,
+          O,
+          D
+        ), { zkCallData: e, circomData: r, dimData: A } = await M(
+          "v1x1",
+          t.merkleTreeHinkal,
+          t.merkleTreeAccessToken,
+          y,
+          I,
+          t.userKeys,
+          R,
+          T.externalActionId,
+          T.externalAddress,
+          T.externalActionMetadata,
+          t.generateProofRemotely,
+          n ?? b,
+          t.getCurrentChainId(),
+          void 0,
+          void 0,
+          void 0,
+          void 0,
+          S,
+          void 0,
+          void 0,
+          u,
+          t.getContractWithFetcher(U.HinkalHelperContract),
+          l
+        );
+        return {
+          zkCallData: e,
+          dimData: A,
+          circomData: r
+        };
+      })
+    );
+    C.push(...g);
+  }
+  return await L(t.getCurrentChainId(), C, c);
+}, gt = async (t, s, m, u, c) => {
+  const o = s.erc20TokenAddress, a = c ?? await V(
+    t.getCurrentChainId(),
+    o,
+    [o],
+    H.Transact,
+    [],
+    0n
+  ), n = await Y(t, s, m, a);
+  return await t.getEventsFromHinkal(), await t.resetMerkleTreesIfNecessary(), G(t, s, n, a, u);
+};
+export {
+  gt as hinkalDepositAndWithdraw
+};

package/data-structures/Hinkal/hinkalGetRecipientInfo.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../../functions/utils/getRecipientInfoFromUserKeys.cjs"),n=(e,o=!1)=>{if(!e)throw Error("No hinkal provided");const{userKeys:t}=e;return o?r.getExtendedRecipientInfoFromUserKeys(t):r.getRecipientInfoFromUserKeys(t)};exports.getRecipientInfo=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../../functions/utils/getRecipientInfoFromUserKeys.cjs"),o=e=>{if(!e)throw Error("No hinkal provided");const{userKeys:t}=e;return r.getRecipientInfoFromUserKeys(t)};exports.getRecipientInfo=o;

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

@@ -1,2 +1,2 @@
 import { IHinkal } from './IHinkal';
-export declare const getRecipientInfo: (hinkal: IHinkal, extendedInfo?: boolean) => string;
+export declare const getRecipientInfo: (hinkal: IHinkal) => string;

package/data-structures/Hinkal/hinkalGetRecipientInfo.mjs

@@ -1,10 +1,10 @@
-import { getExtendedRecipientInfoFromUserKeys as t, getRecipientInfoFromUserKeys as n } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
-const s = (e, o = !1) => {
+import { getRecipientInfoFromUserKeys as o } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+const i = (e) => {
   if (!e)
     throw Error("No hinkal provided");
   const { userKeys: r } = e;
-  return o ? t(r) : n(r);
+  return o(r);
 };
 export {
-  s as getRecipientInfo
+  i as getRecipientInfo
 };

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"),d=async(i,a,o,t)=>{let r;return t&&(r=t.map(e=>{if(!s.isValidExtendedPrivateAddress(e))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);return s.constructStealthAddressStructure(e)})),await i.prooflessDeposit(a,o,r)};exports.hinkalMultiSendPrivateRecipients=d;
+"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;

package/data-structures/Hinkal/hinkalMultiSend.mjs

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

package/data-structures/Hinkal/hinkalPrivateWallet.cjs

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

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

@@ -1,6 +1,6 @@
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
-import { TokenChanges } from '../../types/token.types';
+import { 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, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;
+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>;

package/data-structures/Hinkal/hinkalPrivateWallet.mjs

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

package/data-structures/Hinkal/hinkalProxySwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../../constants/addresses.constants.cjs"),R=require("../../functions/pre-transaction/getFeeStructure.cjs"),I=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),P=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),f=require("../../types/external-action.types.cjs"),O=require("../../error-handling/error-codes.constants.cjs"),h=require("../../constants/protocol.constants.cjs"),v=require("../crypto-keys/keys.cjs"),T=async(r,a,t,i,E,S,c,o,l,A=!1,_,w,u=!1)=>{if(!o)throw new Error("Fee token is required in hinkalProxySwap");const p=r.getCurrentChainId(),d=v.UserKeys.getSignerAddressFromPrivateKey(c.privateKey),s=a.map(e=>e.erc20TokenAddress),n=await r.getRandomRelay(!u);if(!n)throw Error(O.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const m=await I.createSwapToEmporiumOps(r,i,C.SWAP_ROUTER_ADDRESSES[i][p],E,s[0],t[0],t[1],s[1],S,d,n,!0),y=l??await R.getFeeStructure(p,o,s,f.ExternalActionId.Emporium,m.map(e=>P.convertEmporiumOpToCallInfo(e,d,r.getCurrentChainId())),h.HINKAL_SWAP_VARIABLE_RATE),g=a.map((e,q)=>({token:e,amount:t[q]}));return r.actionPrivateWallet([],[],[],m,g,c,o,y,n,A,_,w,u)};exports.hinkalProxySwap=T;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../../constants/addresses.constants.cjs"),R=require("../../functions/pre-transaction/getFeeStructure.cjs"),I=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),P=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),f=require("../../types/external-action.types.cjs"),v=require("../../error-handling/error-codes.constants.cjs"),O=require("../../constants/protocol.constants.cjs"),h=require("../crypto-keys/keys.cjs"),T=async(r,i,t,c,E,S,u,o,l,A=!1,_,w,p=!1)=>{if(!o)throw new Error("Fee token is required in hinkalProxySwap");const s=r.getCurrentChainId(),d=h.UserKeys.getSignerAddressFromPrivateKey(s,u.privateKey),n=i.map(e=>e.erc20TokenAddress),a=await r.getRandomRelay(!p);if(!a)throw Error(v.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const m=await I.createSwapToEmporiumOps(r,c,C.SWAP_ROUTER_ADDRESSES[c][s],E,n[0],t[0],t[1],n[1],S,d,a,!0),y=l??await R.getFeeStructure(s,o,n,f.ExternalActionId.Emporium,m.map(e=>P.convertEmporiumOpToCallInfo(e,d,r.getCurrentChainId())),O.HINKAL_SWAP_VARIABLE_RATE),g=i.map((e,q)=>({token:e,amount:t[q]}));return r.actionPrivateWallet([],[],[],m,g,u,o,y,a,A,_,w,void 0,p)};exports.hinkalProxySwap=T;

package/data-structures/Hinkal/hinkalProxySwap.mjs

@@ -2,39 +2,39 @@ import { SWAP_ROUTER_ADDRESSES as I } from "../../constants/addresses.constants.
 import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { createSwapToEmporiumOps as P } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
 import { convertEmporiumOpToCallInfo as l } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { ExternalActionId as L } from "../../types/external-action.types.mjs";
-import { transactionErrorCodes as O } from "../../error-handling/error-codes.constants.mjs";
-import { HINKAL_SWAP_VARIABLE_RATE as h } from "../../constants/protocol.constants.mjs";
-import { UserKeys as v } from "../crypto-keys/keys.mjs";
-const U = async (r, i, t, p, d, A, s, e, S, u = !1, w, R, n = !1) => {
+import { ExternalActionId as v } from "../../types/external-action.types.mjs";
+import { transactionErrorCodes as L } from "../../error-handling/error-codes.constants.mjs";
+import { HINKAL_SWAP_VARIABLE_RATE as O } from "../../constants/protocol.constants.mjs";
+import { UserKeys as h } from "../crypto-keys/keys.mjs";
+const U = async (r, p, t, s, f, A, n, e, S, u = !1, w, R, c = !1) => {
   if (!e)
     throw new Error("Fee token is required in hinkalProxySwap");
-  const c = r.getCurrentChainId(), E = v.getSignerAddressFromPrivateKey(s.privateKey), a = i.map((o) => o.erc20TokenAddress), m = await r.getRandomRelay(!n);
+  const a = r.getCurrentChainId(), E = h.getSignerAddressFromPrivateKey(a, n.privateKey), i = p.map((o) => o.erc20TokenAddress), m = await r.getRandomRelay(!c);
   if (!m)
-    throw Error(O.RELAYER_NOT_AVAILABLE);
-  const f = await P(
+    throw Error(L.RELAYER_NOT_AVAILABLE);
+  const d = await P(
     r,
-    p,
-    I[p][c],
-    d,
-    a[0],
+    s,
+    I[s][a],
+    f,
+    i[0],
     t[0],
     t[1],
-    a[1],
+    i[1],
     A,
     E,
     m,
     !0
   ), g = S ?? await _(
-    c,
-    e,
     a,
-    L.Emporium,
-    f.map(
+    e,
+    i,
+    v.Emporium,
+    d.map(
       (o) => l(o, E, r.getCurrentChainId())
     ),
-    h
-  ), y = i.map((o, C) => ({
+    O
+  ), y = p.map((o, C) => ({
     token: o,
     amount: t[C]
   }));
@@ -42,16 +42,17 @@ const U = async (r, i, t, p, d, A, s, e, S, u = !1, w, R, n = !1) => {
     [],
     [],
     [],
-    f,
+    d,
     y,
-    s,
+    n,
     e,
     g,
     m,
     u,
     w,
     R,
-    n
+    void 0,
+    c
   );
 };
 export {

package/data-structures/Hinkal/hinkalProxyToPrivate.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("../../error-handling/error-codes.constants.cjs"),C=require("../../functions/utils/addresses.cjs"),f=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),g=require("../../functions/private-wallet/emporium.helpers.cjs"),A=require("../../functions/pre-transaction/getFeeStructure.cjs"),T=require("../../types/external-action.types.cjs"),q=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),w=require("../crypto-keys/keys.cjs"),I=async(o,e,l,u,s,m,n,p,v=!1)=>{if(!n)throw Error("hinkalProxyToPrivate: subAccount should be provided");if(!s)throw new Error("Fee token is required in hinkalProxyToPrivate");if(!C.isValidPrivateAddress(u))throw Error(E.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const t=o.getCurrentChainId(),d=w.UserKeys.getSignerAddressFromPrivateKey(t,n.privateKey),a=e.map(r=>r.erc20TokenAddress),i=await f.modifyVolatileTokenAmountChanges(t,e,l,d),c=g.createTransaferEmporiumOpsBatch(o,a,i),y=m??await A.getFeeStructure(t,s,a,T.ExternalActionId.Emporium,c.map(r=>q.convertEmporiumOpToCallInfo(r,d,t))),P=e.map((r,h)=>({token:r,amount:-1n*i[h]}));return o.actionPrivateWallet([a[0]],[0n],[!1],c,P,n,s,y,void 0,void 0,void 0,p,{recipientInfo:u,amount:i[0],token:e[0]},v)};exports.hinkalProxyToPrivate=I;

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

@@ -0,0 +1,6 @@
+import { ERC20Token } from '../../types/token.types';
+import { FeeStructure } from '../../types/hinkal.types';
+import { AdminTransactionType } from '../../types/admin.types';
+import { IHinkal } from './IHinkal';
+import { SubAccount } from '../../types/proxy.types';
+export declare const hinkalProxyToPrivate: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientInfo: string, feeToken?: string, feeStructureOverride?: FeeStructure, subAccount?: SubAccount, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;