@hinkal/common 0.2.18 → 0.2.20

package/data-structures/Hinkal/hinkalPrivateWallet.mjs

@@ -1,4 +1,4 @@
-import { networkRegistry as k } from "../../constants/chains.constants.mjs";
+import { networkRegistry as C } 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,152 @@ 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 I } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { uniswapWorkaround as h } from "../../functions/utils/involves-permit2-op.mjs";
+import { outputApprovalDataProcessing as rr } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { convertEmporiumOpToCallInfo as tr } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { getFeeStructure as or } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { shouldPatchAccessTokenMerkleTree as er } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as sr } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { mergeWithFeeStructureEmporium as mr } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
+import { caseInsensitiveEqual as ir } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { getCurrentTimeInSeconds as ar } from "../../functions/utils/time.utils.mjs";
+import { handleAutoDepositBack as pr } 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 { constructAdminData as cr } 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 er = async (t, o, e, d, p, i, A, S, F, K, H = !1, C, g, s, E = !1) => {
-  if (s && !ut(s.recipientInfo))
+import { AccountActions as S } from "../AccountActions/AccountActions.mjs";
+import "buffer";
+import { recipientUtxoProcessing as ur } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
+import { isValidPrivateAddress as fr } from "../../functions/utils/addresses.mjs";
+const Ir = async (o, r, k, e, A, c, m, l, U, F, B, H = !1, K, w, u, T = !1) => {
+  if (u && !fr(u.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 s = k.map((t) => t.erc20TokenAddress), i = S.getAddressFromSubAccount(r, l);
+  if (!i)
+    throw Error("Public account address is not available");
+  const { contractData: L } = C[r], { emporiumAddress: f } = L;
+  if (!f)
     throw Error("No Emporium Address Provided");
-  const f = F ?? await it(
-    n,
-    S,
-    o,
+  const n = F ?? await or(
+    r,
+    U,
+    s,
     j.Emporium,
-    p.map((r) => et(r, c ?? "", n))
-  ), W = i.find(
-    (r) => J(r.token.erc20TokenAddress, f.feeToken)
+    c.map((t) => tr(t, i ?? "", r))
+  ), W = m.find(
+    (t) => ir(t.token.erc20TokenAddress, n.feeToken)
   )?.amount ?? 0n;
-  for (c && await pt(
-    t,
-    c,
-    p,
+  for (i && await mr(
     o,
+    r,
+    i,
+    c,
+    s,
     e,
-    f,
+    n,
     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[r],
-      e[r],
+  ); A.length < s.length; )
+    A.push(!1);
+  const a = [...await Z(o, r, s, e)], d = [], p = G(e.length, o.userKeys), y = ar().toString();
+  for (let t = 0; t < s.length; t += 1) {
+    const { outputUtxos: V } = X(
+      o.userKeys,
+      a[t],
+      e[t],
       y,
       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));
+    d.push(V);
+    const { useApprovalUtxoData: D } = rr(o, r, a[t], e[t]);
+    D && (p.doPreTxApproval = !0, p.useApprovalUtxoData[t] = D, p.interactionAddress = f, p.inHinkalAddress = o.userKeys.getInHinkalAddress(f));
   }
-  s && ct(s, T, e, y);
-  const v = K ?? await t.getRandomRelay(!E);
-  if (!v)
+  u && ur(u, d, e, y);
+  const E = B ?? await o.getRandomRelay(r, !T);
+  if (!E)
     throw Error(R.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: N, kycRequired: O, hasAccessToken: _ } = await mt(
-    t,
+  const { patchAccessTokenMerkleTree: N, kycRequired: O, hasAccessToken: _ } = await er(
     o,
+    r,
+    s,
     e
-  ), M = await at(
-    t.getCurrentChainId(),
-    await t.getEthereumAddress(),
-    t.userKeys,
+  ), b = await sr(
+    r,
+    await o.getEthereumAddressByChain(r),
+    o.userKeys,
     O,
     _
-  ), { zkCallData: P, circomData: l, dimData: x, authorizationData: D } = await Z(
+  ), { zkCallData: P, circomData: g, 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,
-    p,
-    t.generateProofRemotely,
-    v,
-    t.getCurrentChainId(),
+    o.merkleTreeHinkalByChain[r],
+    o.merkleTreeAccessTokenByChain[r],
+    s,
+    s.map(() => 0),
+    a,
     d,
-    void 0,
+    o.userKeys,
+    e.length,
+    a.length > 0 ? a[0].length : 0,
+    f,
+    c,
+    o.generateProofRemotely,
+    E,
+    r,
     A,
-    a,
+    void 0,
+    S.getPrivateKeyFromSubAccount(r, l),
+    p,
     N,
     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(),
-    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(),
+    n,
+    o.getContractWithFetcher(r, Y.HinkalHelperContract),
+    b
+  ), M = h(c);
+  if (T)
+    return await $(r, P, v, g, x);
+  const q = cr(
+    w,
+    r,
+    m.map((t) => t.token.erc20TokenAddress),
+    m.map((t) => t.amount),
+    await o.getEthereumAddressByChain(r),
+    w === J.PublicSwap ? m.map(({ token: t }) => t) : void 0
+  ), z = await I(
+    r,
     P,
-    x,
-    l,
+    v,
+    g,
     !1,
-    q,
-    D,
-    z
+    M,
+    x,
+    q
   );
-  return H && st(
-    t,
-    c,
-    A,
-    f.feeToken,
-    C,
+  return H && pr(
+    o,
+    r,
     i,
-    l
-  ), B;
+    l,
+    n.feeToken,
+    K,
+    m,
+    g
+  ), z;
 };
 export {
-  er as hinkalPrivateWallet
+  Ir 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 f=require("../../constants/addresses.constants.cjs"),y=require("../../functions/pre-transaction/getFeeStructure.cjs"),P=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),g=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),v=require("../../types/external-action.types.cjs"),C=require("../../error-handling/error-codes.constants.cjs"),I=require("../../constants/protocol.constants.cjs"),O=require("../../functions/utils/token-check.utils.cjs"),L=require("../AccountActions/AccountActions.cjs"),T=async(t,o,s,u,A,m,p,n,E,S=!1,_,w,d=!1)=>{if(!n)throw new Error("Fee token is required in hinkalProxySwap");const r=O.validateAndGetChainId(o),a=L.AccountActions.getAddressFromSubAccount(r,p);if(!a)throw Error("Public account address is not available");const c=o.map(e=>e.erc20TokenAddress),i=await t.getRandomRelay(r,!d);if(!i)throw Error(C.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const l=await P.createSwapToEmporiumOps(t,r,u,f.SWAP_ROUTER_ADDRESSES[u][r],A,c[0],s[0],s[1],c[1],m,a,i,!0),q=E??await y.getFeeStructure(r,n,c,v.ExternalActionId.Emporium,l.map(e=>g.convertEmporiumOpToCallInfo(e,a,r)),I.HINKAL_SWAP_VARIABLE_RATE),h=o.map((e,R)=>({token:e,amount:s[R]}));return t.actionPrivateWallet(r,[],[],[],l,h,p,n,q,i,S,_,w,void 0,d)};exports.hinkalProxySwap=T;

package/data-structures/Hinkal/hinkalProxySwap.mjs

@@ -1,60 +1,64 @@
 import { SWAP_ROUTER_ADDRESSES as I } from "../../constants/addresses.constants.mjs";
-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 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) => {
+import { getFeeStructure as P } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { createSwapToEmporiumOps as v } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
+import { convertEmporiumOpToCallInfo as L } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { ExternalActionId as O } from "../../types/external-action.types.mjs";
+import { transactionErrorCodes as g } from "../../error-handling/error-codes.constants.mjs";
+import { HINKAL_SWAP_VARIABLE_RATE as y } from "../../constants/protocol.constants.mjs";
+import { validateAndGetChainId as C } from "../../functions/utils/token-check.utils.mjs";
+import { AccountActions as x } from "../AccountActions/AccountActions.mjs";
+const H = async (t, a, i, p, f, E, c, e, u, l = !1, w, S, d = !1) => {
   if (!e)
     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);
+  const r = C(a), m = x.getAddressFromSubAccount(r, c);
   if (!m)
-    throw Error(L.RELAYER_NOT_AVAILABLE);
-  const d = await P(
+    throw Error("Public account address is not available");
+  const n = a.map((o) => o.erc20TokenAddress), s = await t.getRandomRelay(r, !d);
+  if (!s)
+    throw Error(g.RELAYER_NOT_AVAILABLE);
+  const A = await v(
+    t,
     r,
-    s,
-    I[s][a],
+    p,
+    I[p][r],
     f,
+    n[0],
     i[0],
-    t[0],
-    t[1],
     i[1],
-    A,
+    n[1],
     E,
     m,
+    s,
     !0
-  ), g = S ?? await _(
-    a,
+  ), R = u ?? await P(
+    r,
     e,
-    i,
-    v.Emporium,
-    d.map(
-      (o) => l(o, E, r.getCurrentChainId())
-    ),
-    O
-  ), y = p.map((o, C) => ({
+    n,
+    O.Emporium,
+    A.map((o) => L(o, m, r)),
+    y
+  ), _ = a.map((o, h) => ({
     token: o,
-    amount: t[C]
+    amount: i[h]
   }));
-  return r.actionPrivateWallet(
+  return t.actionPrivateWallet(
+    r,
     [],
     [],
     [],
-    d,
-    y,
-    n,
+    A,
+    _,
+    c,
     e,
-    g,
-    m,
-    u,
-    w,
     R,
+    s,
+    l,
+    w,
+    S,
     void 0,
-    c
+    d
   );
 };
 export {
-  U as hinkalProxySwap
+  H 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 P=require("../../error-handling/error-codes.constants.cjs"),f=require("../../functions/utils/addresses.cjs"),C=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),q=require("../../functions/private-wallet/emporium.helpers.cjs"),y=require("../../functions/pre-transaction/getFeeStructure.cjs"),g=require("../../types/external-action.types.cjs"),w=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),T=require("../../functions/utils/token-check.utils.cjs"),I=require("../AccountActions/AccountActions.cjs"),O=async(s,r,l,c,o,m,n,p,A=!1)=>{if(!n)throw Error("hinkalProxyToPrivate: subAccount should be provided");if(!o)throw new Error("Fee token is required in hinkalProxyToPrivate");if(!f.isValidPrivateAddress(c))throw Error(P.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const e=T.validateAndGetChainId(r),i=I.AccountActions.getAddressFromSubAccount(e,n);if(!i)throw Error("Public account address is not available");const u=r.map(t=>t.erc20TokenAddress),a=await C.modifyVolatileTokenAmountChanges(e,r,l,i),d=q.createTransaferEmporiumOpsBatch(s,e,u,a),h=m??await y.getFeeStructure(e,o,u,g.ExternalActionId.Emporium,d.map(t=>w.convertEmporiumOpToCallInfo(t,i,e))),v=r.map((t,E)=>({token:t,amount:-1n*a[E]}));return s.actionPrivateWallet(e,[r[0]],[0n],[!1],d,v,n,o,h,void 0,void 0,void 0,p,{recipientInfo:c,amount:a[0],token:r[0]},A)};exports.hinkalProxyToPrivate=O;

package/data-structures/Hinkal/hinkalProxyToPrivate.mjs

@@ -1,45 +1,50 @@
-import { transactionErrorCodes as P } from "../../error-handling/error-codes.constants.mjs";
-import { isValidPrivateAddress as C } 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 { 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 { transactionErrorCodes as E } from "../../error-handling/error-codes.constants.mjs";
+import { isValidPrivateAddress as P } from "../../functions/utils/addresses.mjs";
+import { modifyVolatileTokenAmountChanges as w } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { createTransaferEmporiumOpsBatch as C } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { getFeeStructure as I } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { ExternalActionId as x } from "../../types/external-action.types.mjs";
+import { convertEmporiumOpToCallInfo as y } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { validateAndGetChainId as O } from "../../functions/utils/token-check.utils.mjs";
+import { AccountActions as g } from "../AccountActions/AccountActions.mjs";
+const B = async (n, r, l, s, a, p, i, u, f = !1) => {
   if (!i)
+    throw Error("hinkalProxyToPrivate: subAccount should be provided");
+  if (!a)
     throw new Error("Fee token is required in hinkalProxyToPrivate");
-  if (!C(n))
-    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]
+  if (!P(s))
+    throw Error(E.RECIPIENT_FORMAT_INCORRECT);
+  const o = O(r), e = g.getAddressFromSubAccount(o, i);
+  if (!e)
+    throw Error("Public account address is not available");
+  const d = r.map((t) => t.erc20TokenAddress), m = await w(o, r, l, e), c = C(n, o, d, m), h = p ?? await I(
+    o,
+    a,
+    d,
+    x.Emporium,
+    c.map((t) => y(t, e, o))
+  ), v = r.map((t, A) => ({
+    token: t,
+    amount: -1n * m[A]
   }));
-  return e.actionPrivateWallet(
-    [m[0]],
+  return n.actionPrivateWallet(
+    o,
+    [r[0]],
     [0n],
     [!1],
-    p,
-    E,
-    a,
-    i,
+    c,
     v,
+    i,
+    a,
+    h,
     void 0,
     void 0,
     void 0,
-    c,
-    { recipientInfo: n, amount: s[0], token: o[0] },
-    u
+    u,
+    { recipientInfo: s, amount: m[0], token: r[0] },
+    f
   );
 };
 export {
-  _ as hinkalProxyToPrivate
+  B 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 r=require("../AccountActions/AccountActions.cjs"),a=async(e,n,t,c)=>{let i;const o=r.AccountActions.getPrivateKeyFromSubAccount(e,c);if(!o)throw Error("Private key is not available");if(t)i=await r.AccountActions.signTypedDataFromPrivateKey(e,o,t.domain,t.types,t.value);else{if(!n)throw Error("dataHash must be provided if typedData is not provided");i=await r.AccountActions.signMessageFromPrivateKey(e,o,n)}return i};exports.hinkalSignSubAccount=a;

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

@@ -1,4 +1,3 @@
 import { SubAccount } from '../../types/proxy.types';
 import { type TypedData } from '../../types/circom-data.types';
-import { type IHinkal } from './IHinkal';
-export declare const hinkalSignSubAccount: (hinkal: IHinkal, messageToSign: string | undefined, typedData: TypedData | undefined, subAccount: SubAccount) => Promise<string>;
+export declare const hinkalSignSubAccount: (chainId: number, messageToSign: string | undefined, typedData: TypedData | undefined, subAccount: SubAccount) => Promise<string>;