@hinkal/common 0.2.17 → 0.2.19

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

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

@@ -3,4 +3,4 @@ import { FeeStructure } from '../../types/hinkal.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, privateRecipientInfo?: PrivateRecipientInfo, onlyGasEstimate?: boolean) => Promise<bigint | import("../..").RelayerTransaction>;
+export declare const hinkalPrivateWallet: (hinkal: IHinkal, chainId: number, 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,4 +1,4 @@
-import { networkRegistry as k } from "../../constants/chains.constants.mjs";
+import { networkRegistry as V } from "../../constants/chains.constants.mjs";
 import { transactionErrorCodes as R } from "../../error-handling/error-codes.constants.mjs";
 import "ethers";
 import "../../types/circom-data.types.mjs";
@@ -6,156 +6,148 @@ 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 { AdminTransactionType as J } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
+import "../../constants/vite.constants.mjs";
+import { constructEmporiumProof as Q } from "../../functions/snarkjs/constructEmporiumProof.mjs";
+import { outputUtxoProcessing as X } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { addPaddingToUtxos as Z } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { estimateGasRelayer as $ } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { uniswapWorkaround as C } from "../../functions/utils/involves-permit2-op.mjs";
+import { outputApprovalDataProcessing as I } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { convertEmporiumOpToCallInfo as h } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { getFeeStructure as tt } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { shouldPatchAccessTokenMerkleTree as rt } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as ot } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { mergeWithFeeStructureEmporium as et } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
+import { caseInsensitiveEqual as mt } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { getCurrentTimeInSeconds as it } from "../../functions/utils/time.utils.mjs";
+import { handleAutoDepositBack as st } from "./handleAutoDepositBack.mjs";
+import { UserKeys as at } from "../crypto-keys/keys.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 { constructAdminData as pt } 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 { recipientUtxoProcessing as ft } 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))
+const bt = async (o, t, e, m, l, p, i, A, U, S, k, K = !1, F, y, f, T = !1) => {
+  if (f && !ut(f.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)
+  const u = at.getSignerAddressFromPrivateKey(t, A.privateKey), { contractData: H } = V[t], { emporiumAddress: n } = H;
+  if (!n)
     throw Error("No Emporium Address Provided");
-  const f = F ?? await it(
-    n,
-    S,
-    o,
+  const c = S ?? await tt(
+    t,
+    U,
+    e,
     j.Emporium,
-    p.map((r) => et(r, c ?? "", n))
-  ), W = i.find(
-    (r) => J(r.token.erc20TokenAddress, f.feeToken)
+    p.map((r) => h(r, u ?? "", t))
+  ), L = i.find(
+    (r) => mt(r.token.erc20TokenAddress, c.feeToken)
   )?.amount ?? 0n;
-  for (c && await pt(
+  for (u && await et(
+    o,
     t,
-    c,
+    u,
     p,
-    o,
     e,
-    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: V } = $(
-      t.userKeys,
+    m,
+    c,
+    L
+  ); l.length < e.length; )
+    l.push(!1);
+  const s = [...await Z(o, t, e, m)], g = [], a = G(m.length, o.userKeys), E = it().toString();
+  for (let r = 0; r < e.length; r += 1) {
+    const { outputUtxos: z } = X(
+      o.userKeys,
+      s[r],
       m[r],
-      e[r],
-      y,
+      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));
+    g.push(z);
+    const { useApprovalUtxoData: D } = I(o, t, s[r], m[r]);
+    D && (a.doPreTxApproval = !0, a.useApprovalUtxoData[r] = D, a.interactionAddress = n, a.inHinkalAddress = o.userKeys.getInHinkalAddress(n));
   }
-  s && ct(s, T, e, y);
-  const v = K ?? await t.getRandomRelay(!E);
-  if (!v)
+  f && ft(f, g, m, E);
+  const P = k ?? await o.getRandomRelay(t, !T);
+  if (!P)
     throw Error(R.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: N, kycRequired: O, hasAccessToken: _ } = await mt(
-    t,
+  const { patchAccessTokenMerkleTree: W, kycRequired: B, hasAccessToken: N } = await rt(
     o,
-    e
-  ), M = await at(
-    t.getCurrentChainId(),
-    await t.getEthereumAddress(),
-    t.userKeys,
-    O,
-    _
-  ), { zkCallData: P, circomData: l, dimData: x, authorizationData: D } = await Z(
+    t,
+    e,
+    m
+  ), O = await ot(
+    t,
+    await o.getEthereumAddress(),
+    o.userKeys,
+    B,
+    N
+  ), { zkCallData: d, circomData: w, dimData: v, authorizationData: x } = await Q(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    o,
-    o.map(() => 0),
-    m,
-    T,
-    t.userKeys,
-    e.length,
-    m.length > 0 ? m[0].length : 0,
-    u,
+    o.merkleTreeHinkalByChain[t],
+    o.merkleTreeAccessTokenByChain[t],
+    e,
+    e.map(() => 0),
+    s,
+    g,
+    o.userKeys,
+    m.length,
+    s.length > 0 ? s[0].length : 0,
+    n,
     p,
-    t.generateProofRemotely,
-    v,
-    t.getCurrentChainId(),
-    d,
+    o.generateProofRemotely,
+    P,
+    t,
+    l,
     void 0,
     A,
     a,
-    N,
+    W,
     void 0,
-    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(),
+    c,
+    o.getContractWithFetcher(t, Y.HinkalHelperContract),
+    O
+  ), _ = C(p);
+  if (T)
+    return await $(t, d, v, w, x);
+  const M = pt(
+    y,
+    t,
     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(),
-    P,
-    x,
-    l,
+    await o.getEthereumAddress(),
+    y === J.PublicSwap ? i.map(({ token: r }) => r) : void 0
+  ), q = await b(
+    t,
+    d,
+    v,
+    w,
     !1,
-    q,
-    D,
-    z
+    _,
+    x,
+    M
   );
-  return H && st(
+  return K && st(
+    o,
     t,
-    c,
+    u,
     A,
-    f.feeToken,
-    C,
+    c.feeToken,
+    F,
     i,
-    l
-  ), B;
+    w
+  ), q;
 };
 export {
-  er as hinkalPrivateWallet
+  bt as hinkalPrivateWallet
 };

package/data-structures/Hinkal/hinkalProoflessDeposit.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../functions/snarkjs/common.snarkjs.cjs"),C=require("../../functions/web3/etherFunctions.cjs"),l=require("../../types/ethereum-network.types.cjs"),k=require("../utxo/Utxo.cjs"),h=require("../../constants/protocol.constants.cjs"),g=require("../../functions/utils/caseInsensitive.utils.cjs"),A=(n,e)=>{const r=[];let o=0;for(let s=0;s<n.length;s+=1){let a=!1;for(let t=0;t<o;t+=1)if(g.caseInsensitiveEqual(r[t].token.erc20TokenAddress,n[s].erc20TokenAddress)){r[t].balance+=e[s],a=!0;break}a||(r[o]={token:n[s],balance:e[s]},o+=1)}return r},y=async(n,e,r)=>{const o=A(e,r),a=n.getContractWithSigner(l.ContractType.HinkalContract).address;for(let t=0;t<o.length;t+=1)g.caseInsensitiveEqual(o[t].token.erc20TokenAddress,h.zeroAddress)||await(await n.getContractWithSigner(l.ContractType.ERC20Contract,o[t].token.erc20TokenAddress).approve(a,o[t].balance)).wait()},q=async(n,e,r,o)=>{const s=n.getContractWithSigner(l.ContractType.HinkalContract),a=n.userKeys.getShieldedPrivateKey(),t=k.Utxo.findCorrectRandomization(C.randomBigInt(31),a),i=o??Array(e.length).fill(f.calcStealthAddressStructure(t,a));if(i.length!==e.length)throw new Error("Stealth address structures length must be equal to erc20 tokens length");await y(n,e,r);const d=e.findIndex(c=>c.erc20TokenAddress===h.zeroAddress),p=r[d]??0n,u=await s.prooflessDeposit(e.map(({erc20TokenAddress:c})=>c),r,e.map(()=>0n),i,{value:p});return await u.wait(),u};exports.hinkalProoflessDeposit=q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../functions/snarkjs/common.snarkjs.cjs"),A=require("../../functions/web3/etherFunctions.cjs"),d=require("../../types/ethereum-network.types.cjs"),k=require("../utxo/Utxo.cjs"),g=require("../../constants/protocol.constants.cjs"),y=require("../../functions/utils/caseInsensitive.utils.cjs"),u=require("../../functions/utils/token-check.utils.cjs"),q=(n,t)=>{const o=[];let r=0;for(let e=0;e<n.length;e+=1){let i=!1;for(let a=0;a<r;a+=1)if(u.isSameERC20Token(o[a].token,n[e])){o[a].balance+=t[e],i=!0;break}i||(o[r]={token:n[e],balance:t[e]},r+=1)}return o},v=async(n,t,o)=>{const r=q(t,o),e=u.validateAndGetChainId(t),a=n.getContractWithSigner(e,d.ContractType.HinkalContract).address;for(let s=0;s<r.length;s+=1)y.caseInsensitiveEqual(r[s].token.erc20TokenAddress,g.zeroAddress)||await(await n.getContractWithSigner(e,d.ContractType.ERC20Contract,r[s].token.erc20TokenAddress).approve(a,r[s].balance)).wait()},S=async(n,t,o,r)=>{const e=u.validateAndGetChainId(t),i=n.getContractWithSigner(e,d.ContractType.HinkalContract),a=n.userKeys.getShieldedPrivateKey(),s=k.Utxo.findCorrectRandomization(A.randomBigInt(31),a),c=r??Array(t.length).fill(f.calcStealthAddressStructure(s,a));if(c.length!==t.length)throw new Error("Stealth address structures length must be equal to erc20 tokens length");await v(n,t,o);const h=t.findIndex(l=>l.erc20TokenAddress===g.zeroAddress),p=o[h]??0n,C=await i.prooflessDeposit(t.map(({erc20TokenAddress:l})=>l),o,t.map(()=>0n),c,{value:p});return await C.wait(),C};exports.hinkalProoflessDeposit=S;

package/data-structures/Hinkal/hinkalProoflessDeposit.mjs

@@ -1,46 +1,48 @@
-import { calcStealthAddressStructure as m } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { randomBigInt as g } from "../../functions/web3/etherFunctions.mjs";
-import { ContractType as l } from "../../types/ethereum-network.types.mjs";
+import { calcStealthAddressStructure as g } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { randomBigInt as C } from "../../functions/web3/etherFunctions.mjs";
+import { ContractType as d } from "../../types/ethereum-network.types.mjs";
 import { Utxo as A } from "../utxo/Utxo.mjs";
-import { zeroAddress as h } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as p } from "../../functions/utils/caseInsensitive.utils.mjs";
-const C = (r, e) => {
-  const n = [];
-  let o = 0;
-  for (let a = 0; a < r.length; a += 1) {
+import { zeroAddress as m } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as w } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { validateAndGetChainId as p, isSameERC20Token as S } from "../../functions/utils/token-check.utils.mjs";
+const k = (n, t) => {
+  const o = [];
+  let r = 0;
+  for (let e = 0; e < n.length; e += 1) {
     let s = !1;
-    for (let t = 0; t < o; t += 1)
-      if (p(n[t].token.erc20TokenAddress, r[a].erc20TokenAddress)) {
-        n[t].balance += e[a], s = !0;
+    for (let a = 0; a < r; a += 1)
+      if (S(o[a].token, n[e])) {
+        o[a].balance += t[e], s = !0;
         break;
       }
-    s || (n[o] = {
-      token: r[a],
-      balance: e[a]
-    }, o += 1);
+    s || (o[r] = {
+      token: n[e],
+      balance: t[e]
+    }, r += 1);
   }
-  return n;
-}, k = async (r, e, n) => {
-  const o = C(e, n), s = r.getContractWithSigner(l.HinkalContract).address;
-  for (let t = 0; t < o.length; t += 1)
-    p(o[t].token.erc20TokenAddress, h) || await (await r.getContractWithSigner(
-      l.ERC20Contract,
-      o[t].token.erc20TokenAddress
-    ).approve(s, o[t].balance)).wait();
-}, q = async (r, e, n, o) => {
-  const a = r.getContractWithSigner(l.HinkalContract), s = r.userKeys.getShieldedPrivateKey(), t = A.findCorrectRandomization(g(31), s), i = o ?? Array(e.length).fill(m(t, s));
-  if (i.length !== e.length)
+  return o;
+}, v = async (n, t, o) => {
+  const r = k(t, o), e = p(t), a = n.getContractWithSigner(e, d.HinkalContract).address;
+  for (let i = 0; i < r.length; i += 1)
+    w(r[i].token.erc20TokenAddress, m) || await (await n.getContractWithSigner(
+      e,
+      d.ERC20Contract,
+      r[i].token.erc20TokenAddress
+    ).approve(a, r[i].balance)).wait();
+}, W = async (n, t, o, r) => {
+  const e = p(t), s = n.getContractWithSigner(e, d.HinkalContract), a = n.userKeys.getShieldedPrivateKey(), i = A.findCorrectRandomization(C(31), a), c = r ?? Array(t.length).fill(g(i, a));
+  if (c.length !== t.length)
     throw new Error("Stealth address structures length must be equal to erc20 tokens length");
-  await k(r, e, n);
-  const d = e.findIndex((c) => c.erc20TokenAddress === h), u = n[d] ?? 0n, f = await a.prooflessDeposit(
-    e.map(({ erc20TokenAddress: c }) => c),
-    n,
-    e.map(() => 0n),
-    i,
+  await v(n, t, o);
+  const h = t.findIndex((l) => l.erc20TokenAddress === m), u = o[h] ?? 0n, f = await s.prooflessDeposit(
+    t.map(({ erc20TokenAddress: l }) => l),
+    o,
+    t.map(() => 0n),
+    c,
     { value: u }
   );
   return await f.wait(), f;
 };
 export {
-  q as hinkalProoflessDeposit
+  W as hinkalProoflessDeposit
 };

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

package/data-structures/Hinkal/hinkalProxySwap.mjs

@@ -1,60 +1,61 @@
-import { SWAP_ROUTER_ADDRESSES as I } from "../../constants/addresses.constants.mjs";
-import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { SWAP_ROUTER_ADDRESSES as v } from "../../constants/addresses.constants.mjs";
+import { getFeeStructure as I } 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 v } from "../../types/external-action.types.mjs";
+import { convertEmporiumOpToCallInfo as g } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { ExternalActionId as h } 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)
+import { UserKeys as C } from "../crypto-keys/keys.mjs";
+import { validateAndGetChainId as K } from "../../functions/utils/token-check.utils.mjs";
+const q = async (t, e, a, s, E, A, n, i, S, w = !1, R, l, c = !1) => {
+  if (!i)
     throw new Error("Fee token is required in hinkalProxySwap");
-  const a = r.getCurrentChainId(), E = h.getSignerAddressFromPrivateKey(a, n.privateKey), i = p.map((o) => o.erc20TokenAddress), m = await r.getRandomRelay(!c);
-  if (!m)
+  const r = K(e), d = C.getSignerAddressFromPrivateKey(r, n.privateKey), m = e.map((o) => o.erc20TokenAddress), p = await t.getRandomRelay(r, !c);
+  if (!p)
     throw Error(L.RELAYER_NOT_AVAILABLE);
-  const d = await P(
+  const f = await P(
+    t,
     r,
     s,
-    I[s][a],
-    f,
-    i[0],
-    t[0],
-    t[1],
-    i[1],
-    A,
+    v[s][r],
     E,
-    m,
+    m[0],
+    a[0],
+    a[1],
+    m[1],
+    A,
+    d,
+    p,
     !0
-  ), g = S ?? await _(
-    a,
-    e,
+  ), u = S ?? await I(
+    r,
     i,
-    v.Emporium,
-    d.map(
-      (o) => l(o, E, r.getCurrentChainId())
-    ),
+    m,
+    h.Emporium,
+    f.map((o) => g(o, d, r)),
     O
-  ), y = p.map((o, C) => ({
+  ), y = e.map((o, _) => ({
     token: o,
-    amount: t[C]
+    amount: a[_]
   }));
-  return r.actionPrivateWallet(
+  return t.actionPrivateWallet(
+    r,
     [],
     [],
     [],
-    d,
+    f,
     y,
     n,
-    e,
-    g,
-    m,
+    i,
     u,
+    p,
     w,
     R,
+    l,
     void 0,
     c
   );
 };
 export {
-  U as hinkalProxySwap
+  q as hinkalProxySwap
 };

package/data-structures/Hinkal/hinkalProxyToPrivate.cjs

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

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

@@ -3,4 +3,4 @@ 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("../..").RelayerTransaction>;
+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>;

package/data-structures/Hinkal/hinkalProxyToPrivate.mjs

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

package/data-structures/Hinkal/hinkalSignSubAccount.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../crypto-keys/keys.cjs"),o=async(s,r,e,t)=>{const a=s.getCurrentChainId();let i;if(e)i=await n.UserKeys.signTypedDataFromPrivateKey(a,t.privateKey,e.domain,e.types,e.value);else{if(!r)throw Error("dataHash must be provided if typedData is not provided");i=await n.UserKeys.signMessageFromPrivateKey(a,t.privateKey,r)}return i};exports.hinkalSignSubAccount=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../crypto-keys/keys.cjs"),n=async(i,t,e,s)=>{let r;if(e)r=await a.UserKeys.signTypedDataFromPrivateKey(i,s.privateKey,e.domain,e.types,e.value);else{if(!t)throw Error("dataHash must be provided if typedData is not provided");r=await a.UserKeys.signMessageFromPrivateKey(i,s.privateKey,t)}return r};exports.hinkalSignSubAccount=n;