@hinkal/common 0.2.14 → 0.2.16

package/data-structures/Hinkal/hinkalPrivateWallet.mjs

@@ -1,107 +1,161 @@
-import { networkRegistry as U } from "../../constants/chains.constants.mjs";
-import { transactionErrorCodes as H } 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 "axios";
-import "../../constants/vite.constants.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as K } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as L } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as F } 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 "../../types/curve.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 "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 { constructEmporiumProof as S } from "../../functions/snarkjs/constructEmporiumProof.mjs";
-import { outputUtxoProcessing as W } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { addPaddingToUtxos as O } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as M } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { involvesPermit2Op as q } from "../../functions/utils/involves-permit2-op.mjs";
-import { outputApprovalDataProcessing as z } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { convertEmporiumOpToCallInfo as B } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { calculateSmartContractWalletAddressFromNonce as G } from "../../functions/private-wallet/smartContractWalletCalculator.mjs";
-import { getFeeStructure as N } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { shouldPatchAccessTokenMerkleTree as V } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getSignatureDataForTransact as Y } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-const Et = async (t, s, o, A, m = [], p, l, y, v = !1) => {
-  const C = p === 0n ? void 0 : await G(
-    t.getCurrentChainId(),
-    t.userKeys,
-    p ?? 0n
-  ), { contractData: w } = U[t.getCurrentChainId()], { emporiumAddress: e } = w;
-  if (!e)
+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 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 E = y ?? await N(
-    t.getCurrentChainId(),
-    l,
-    s,
-    L.Emporium,
-    void 0,
-    m.map((r) => B(r, C ?? "", e))
-  ), i = [...await O(t, s, o)], n = [], a = F(o.length, t.userKeys);
-  for (let r = 0; r < s.length; r += 1) {
-    const { outputUtxos: R } = W(
+  const f = F ?? await it(
+    n,
+    S,
+    o,
+    j.Emporium,
+    p.map((r) => et(r, c ?? "", n))
+  ), W = i.find(
+    (r) => J(r.token.erc20TokenAddress, f.feeToken)
+  )?.amount ?? 0n;
+  for (c && await pt(
+    t,
+    c,
+    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,
-      i[r],
-      o[r],
-      void 0,
+      m[r],
+      e[r],
+      y,
       void 0,
       !1
     );
-    n.push(R);
-    const { useApprovalUtxoData: g } = z(t, i[r], o[r]);
-    g && (a.doPreTxApproval = !0, a.useApprovalUtxoData[r] = g, a.interactionAddress = e, a.inHinkalAddress = t.userKeys.getInHinkalAddress(e));
+    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 c = await t.getRandomRelay();
-  if (!c)
-    throw Error(H.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: T, kycRequired: x, hasAccessToken: I } = await V(
+  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,
-    s,
-    o
-  ), P = await Y(
+    o,
+    e
+  ), M = await at(
     t.getCurrentChainId(),
     await t.getEthereumAddress(),
     t.userKeys,
-    x,
-    I
-  ), { zkCallData: u, circomData: d, dimData: f } = await S(
+    O,
+    _
+  ), { zkCallData: P, circomData: l, dimData: x, authorizationData: D } = await Z(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    i,
-    n,
-    t.userKeys,
-    o.length,
-    i.length > 0 ? i[0].length : 0,
-    e,
+    o,
+    o.map(() => 0),
     m,
+    T,
+    t.userKeys,
+    e.length,
+    m.length > 0 ? m[0].length : 0,
+    u,
+    p,
     t.generateProofRemotely,
-    c,
+    v,
     t.getCurrentChainId(),
-    A,
+    d,
     void 0,
-    p,
+    A,
     a,
-    T,
+    N,
     void 0,
-    E,
-    t.getContractWithFetcher(K.HinkalHelperContract),
-    P
-  ), D = q(m);
-  return v ? await M(t, u, f, d) : await _(
-    t.getCurrentChainId(),
-    u,
     f,
-    d,
+    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(),
+    P,
+    x,
+    l,
     !1,
-    D
+    q,
+    D,
+    z
   );
+  return H && st(
+    t,
+    c,
+    A,
+    f.feeToken,
+    C,
+    i,
+    l
+  ), B;
 };
 export {
-  Et as hinkalPrivateWallet
+  er 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"),u=require("../../constants/protocol.constants.cjs"),h=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(h.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)h.caseInsensitiveEqual(o[t].token.erc20TokenAddress,u.zeroAddress)&&await n.getContractWithSigner(l.ContractType.ERC20Contract,o[t].token.erc20TokenAddress).approve(a,o[t].balance)},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),c=o??Array(e.length).fill(f.calcStealthAddressStructure(t,a));if(c.length!==e.length)throw new Error("Stealth address structures length must be equal to erc20 tokens length");await y(n,e,r);const g=e.findIndex(i=>i.erc20TokenAddress===u.zeroAddress),p=r[g]??0n,d=await s.prooflessDeposit(e.map(({erc20TokenAddress:i})=>i),r,e.map(()=>0n),c,{value:p});return await d.wait(),d};exports.hinkalProoflessDeposit=q;
+"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;

package/data-structures/Hinkal/hinkalProoflessDeposit.mjs

@@ -2,15 +2,15 @@ import { calcStealthAddressStructure as m } from "../../functions/snarkjs/common
 import { randomBigInt as g } from "../../functions/web3/etherFunctions.mjs";
 import { ContractType as l } from "../../types/ethereum-network.types.mjs";
 import { Utxo as A } from "../utxo/Utxo.mjs";
-import { zeroAddress as f } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as h } from "../../functions/utils/caseInsensitive.utils.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) {
     let s = !1;
     for (let t = 0; t < o; t += 1)
-      if (h(n[t].token.erc20TokenAddress, r[a].erc20TokenAddress)) {
+      if (p(n[t].token.erc20TokenAddress, r[a].erc20TokenAddress)) {
         n[t].balance += e[a], s = !0;
         break;
       }
@@ -23,23 +23,23 @@ const C = (r, e) => {
 }, 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)
-    h(o[t].token.erc20TokenAddress, f) && await r.getContractWithSigner(
+    p(o[t].token.erc20TokenAddress, h) || await (await r.getContractWithSigner(
       l.ERC20Contract,
       o[t].token.erc20TokenAddress
-    ).approve(s, o[t].balance);
+    ).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)
     throw new Error("Stealth address structures length must be equal to erc20 tokens length");
   await k(r, e, n);
-  const p = e.findIndex((c) => c.erc20TokenAddress === f), u = n[p] ?? 0n, d = await a.prooflessDeposit(
+  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,
     { value: u }
   );
-  return await d.wait(), d;
+  return await f.wait(), f;
 };
 export {
   q 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"),w=require("../../functions/pre-transaction/getFeeStructure.cjs"),E=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),h=require("../../functions/private-wallet/smartContractWalletCalculator.cjs"),y=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),q=require("../../types/ethereum-network.types.cjs"),v=require("../../types/external-action.types.cjs"),_=async(t,e,n,c,u,r,o,l,p=!1)=>{if(!r)throw Error("hinkalActionReceive: wallet nonce should be provided");if(!o)throw new Error("Fee token is required in hinkalActionReceive");const a=t.getCurrentChainId(),i=await h.calculateSmartContractWalletAddressFromNonce(a,t.userKeys,r),s=E.createSwapToEmporiumOps(t,c,C.SWAP_ROUTER_ADDRESSES[c][a],u,e[0],n[0],e[1],n[1],i,!0),m=t.getContractWithFetcher(q.ContractType.HinkalContract),S=l??await w.getFeeStructure(a,o,e,v.ExternalActionId.Emporium,void 0,s.map(d=>y.convertEmporiumOpToCallInfo(d,i,m.address)));return t.actionPrivateWallet([],[],[],s,r,o,S,p)};exports.hinkalProxySwap=_;
+"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.d.ts

@@ -1,5 +1,8 @@
+import { ERC20Token } from '../../types/token.types';
 import { ExternalActionId } from '../../types/external-action.types';
 import { FeeStructure } from '../../types/hinkal.types';
 import { RelayerTransaction } from '../../types/relayer.types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalProxySwap: (hinkal: IHinkal, erc20Addresses: string[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, walletNonce: bigint, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<RelayerTransaction | bigint>;
+import { SubAccount } from '../../types/proxy.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, isTheSameChainSwap: boolean, subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<RelayerTransaction | bigint>;

package/data-structures/Hinkal/hinkalProxySwap.mjs

@@ -1,36 +1,60 @@
-import { SWAP_ROUTER_ADDRESSES as S } from "../../constants/addresses.constants.mjs";
-import { getFeeStructure as d } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { createSwapToEmporiumOps as C } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
-import { calculateSmartContractWalletAddressFromNonce as w } from "../../functions/private-wallet/smartContractWalletCalculator.mjs";
-import { convertEmporiumOpToCallInfo as h } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { ContractType as v } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as R } from "../../types/external-action.types.mjs";
-const P = async (r, t, a, m, p, o, e, s, u = !1) => {
-  if (!o)
-    throw Error("hinkalActionReceive: wallet nonce should be provided");
+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) => {
   if (!e)
-    throw new Error("Fee token is required in hinkalActionReceive");
-  const i = r.getCurrentChainId(), c = await w(i, r.userKeys, o), n = C(
+    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)
+    throw Error(L.RELAYER_NOT_AVAILABLE);
+  const d = await P(
     r,
-    m,
-    S[m][i],
-    p,
+    s,
+    I[s][a],
+    f,
+    i[0],
     t[0],
-    a[0],
     t[1],
-    a[1],
-    c,
+    i[1],
+    A,
+    E,
+    m,
     !0
-  ), f = r.getContractWithFetcher(v.HinkalContract), l = s ?? await d(
+  ), g = S ?? await _(
+    a,
+    e,
     i,
+    v.Emporium,
+    d.map(
+      (o) => l(o, E, r.getCurrentChainId())
+    ),
+    O
+  ), y = p.map((o, C) => ({
+    token: o,
+    amount: t[C]
+  }));
+  return r.actionPrivateWallet(
+    [],
+    [],
+    [],
+    d,
+    y,
+    n,
     e,
-    t,
-    R.Emporium,
+    g,
+    m,
+    u,
+    w,
+    R,
     void 0,
-    n.map((E) => h(E, c, f.address))
+    c
   );
-  return r.actionPrivateWallet([], [], [], n, o, e, l, u);
 };
 export {
-  P as hinkalProxySwap
+  U as hinkalProxySwap
 };

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("../..").RelayerTransaction>;

package/data-structures/Hinkal/hinkalProxyToPrivate.mjs

@@ -0,0 +1,45 @@
+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");
+  if (!i)
+    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]
+  }));
+  return e.actionPrivateWallet(
+    [m[0]],
+    [0n],
+    [!1],
+    p,
+    E,
+    a,
+    i,
+    v,
+    void 0,
+    void 0,
+    void 0,
+    c,
+    { recipientInfo: n, amount: s[0], token: o[0] },
+    u
+  );
+};
+export {
+  _ as hinkalProxyToPrivate
+};

package/data-structures/Hinkal/hinkalSignSubAccount.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("ethers"),d=require("../../functions/snarkjs/generateZkProofSelf.cjs");require("../../constants/vite.constants.cjs");const g=require("../../functions/private-wallet/smartContractWalletCalculator.cjs"),y=async(e,r,t,i,n)=>{const{userKeys:o}=e,a=o.getShieldedPrivateKey();i&&(await g.isProxyDeployed(e,t)||await e.deploySubAccount(t,n));const u={dataHash:BigInt(r),shieldedPrivateKey:a,hinkalWalletNonce:t},s="EmporiumSignatureCalculator",{zkCallData:c}=await d.generateZkProofSelf("v1x1",e.getCurrentChainId(),s,u);return l.ethers.utils.defaultAbiCoder.encode(["uint256[2]","uint256[2][2]","uint256[2]","uint256[2]"],c)};exports.hinkalSignSubAccount=y;
+"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;

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

@@ -1,3 +1,4 @@
+import { SubAccount } from '../../types/proxy.types';
+import { type TypedData } from '../../types/circom-data.types';
 import { type IHinkal } from './IHinkal';
-export declare const checkValidityOfSignature: (hinkal: IHinkal, walletSalt: string, dataHash: string, signature: string) => Promise<boolean>;
-export declare const hinkalSignSubAccount: (hinkal: IHinkal, dataHash: string, walletNonce: bigint, shouldBeProxyDeployed?: boolean, feeToken?: string) => Promise<string>;
+export declare const hinkalSignSubAccount: (hinkal: IHinkal, messageToSign: string | undefined, typedData: TypedData | undefined, subAccount: SubAccount) => Promise<string>;

package/data-structures/Hinkal/hinkalSignSubAccount.mjs

@@ -1,20 +1,22 @@
-import { ethers as d } from "ethers";
-import { generateZkProofSelf as p } from "../../functions/snarkjs/generateZkProofSelf.mjs";
-import "../../constants/vite.constants.mjs";
-import { isProxyDeployed as l } from "../../functions/private-wallet/smartContractWalletCalculator.mjs";
-const h = async (t, i, e, o, r) => {
-  const { userKeys: n } = t, a = n.getShieldedPrivateKey();
-  o && (await l(t, e) || await t.deploySubAccount(e, r));
-  const s = {
-    dataHash: BigInt(i),
-    shieldedPrivateKey: a,
-    hinkalWalletNonce: e
-  }, u = "EmporiumSignatureCalculator", { zkCallData: c } = await p("v1x1", t.getCurrentChainId(), u, s);
-  return d.utils.defaultAbiCoder.encode(
-    ["uint256[2]", "uint256[2][2]", "uint256[2]", "uint256[2]"],
-    c
-  );
+import { UserKeys as n } from "../crypto-keys/keys.mjs";
+const d = async (o, i, e, t) => {
+  const a = o.getCurrentChainId();
+  let r;
+  if (e)
+    r = await n.signTypedDataFromPrivateKey(
+      a,
+      t.privateKey,
+      e.domain,
+      e.types,
+      e.value
+    );
+  else {
+    if (!i)
+      throw Error("dataHash must be provided if typedData is not provided");
+    r = await n.signMessageFromPrivateKey(a, t.privateKey, i);
+  }
+  return r;
 };
 export {
-  h as hinkalSignSubAccount
+  d as hinkalSignSubAccount
 };

package/data-structures/Hinkal/hinkalSolanaDeposit.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("../utxo/Utxo.cjs"),V=require("../../functions/utils/solanaMint.utils.cjs"),M=require("../../functions/web3/etherFunctions.cjs"),z=require("../../constants/chains.constants.cjs"),q=require("../../constants/protocol.constants.cjs"),d=require("@solana/web3.js"),N=require("../../functions/snarkjs/common.snarkjs.cjs"),j=require("@coral-xyz/anchor"),T=require("../../functions/utils/addresses.cjs"),U=require("../../error-handling/error-codes.constants.cjs"),i=require("../../functions/pre-transaction/solana.cjs");require("../../API/getServerURL.cjs");require("axios");require("../../constants/coingecko.constants.cjs");require("../../constants/server.constants.cjs");require("../http/HttpClient.cjs");require("../../constants/vite.constants.cjs");const L=require("../../API/API.cjs");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../../API/tenderly.api.cjs");const _=require("./hinkalCheckSolanaTokenRegistry.cjs"),B=require("../../functions/web3/signAndSendSerializedTransaction.cjs"),O=async(e,o,r,n)=>{const{hinkalIdl:a,hinkalAddress:l,originalDeployer:g}=z.networkRegistry[e.getCurrentChainId()].contractData;if(!a)throw new Error("No IDL configured for Solana program on this network");if(!g)throw new Error("missing original deployer");const c=e.getSolanaProgram(a),k=e.getSolanaPublicKey(),t=new d.PublicKey(g),S=new d.PublicKey(l),{mintPublicKey:s}=V.formatMintAddress(r),u=s.toString(),h=i.getStorageAccountPublicKey(S,t),m=i.getStorageVaultPublicKey(S,t),b=i.getMerkleAccountPublicKey(S,t),A=i.buildAnchorStealthAddressStructure(n),K=e.getCurrentChainId();if(await _.hinkalCheckSolanaTokenRegistry(c,new d.PublicKey(t),[r],[o])){const{serializedTransaction:p,blockhash:C,lastValidBlockHeight:v}=await L.API.generateProoflessDepositLimitless(K,{amount:o.toString(),payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:r,stealthAddressStructure:A}),{wallet:w}=c.provider;if(!w)throw new Error("missing wallet");return B.signAndSendSerializedTransaction(c.provider,p,C,v)}const f=i.getTokenLimitStorageAccountPublicKey(c.programId,t,s),I=u===q.solanaNativeAddress?null:s,P=u===q.solanaNativeAddress?null:void 0;return c.methods.prooflessDeposit(new j.BN(o.toString()),A).accounts({mint:I,signer:k,signerAta:P,originalDeployer:t,storageAccount:h,storageVault:m,merkleAccount:b,tokenLimitStorage:f,storageVaultAta:P,accessTokenOwner:null}).rpc()},H=async(e,o,r)=>{const n=e.userKeys.getShieldedPrivateKey(),a=E.Utxo.findCorrectRandomization(M.randomBigInt(31),n),l=N.calcStealthAddressStructure(a,n);return O(e,o,r,l)},$=async(e,o,r,n)=>{if(!T.isValidPrivateAddress(n))throw Error(U.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const a=T.constructStealthAddressStructure(n);return O(e,o,r,a)},G=async(e,o,r)=>{const{hinkalIdl:n,hinkalAddress:a,originalDeployer:l}=z.networkRegistry[e.getCurrentChainId()].contractData;if(!n)throw new Error("No IDL configured for Solana program on this network");if(!l)throw new Error("missing original deployer");const g=e.userKeys.getShieldedPrivateKey(),c=E.Utxo.findCorrectRandomization(M.randomBigInt(31),g),k=N.calcStealthAddressStructure(c,g),t=e.getSolanaProgram(n),S=e.getSolanaPublicKey(),s=new d.PublicKey(l),u=new d.PublicKey(a),{mintPublicKey:h}=V.formatMintAddress(r),m=h.toString(),b=i.getStorageAccountPublicKey(u,s),A=i.getStorageVaultPublicKey(u,s),K=i.getMerkleAccountPublicKey(u,s),D=i.buildAnchorStealthAddressStructure(k),f=e.getCurrentChainId(),I=o.reduce((y,R)=>y+R,0n),P=await _.hinkalCheckSolanaTokenRegistry(t,new d.PublicKey(s),[r],[I]),p=o.map(y=>`${y}`);if(P){const{serializedTransaction:y,blockhash:R,lastValidBlockHeight:x}=await L.API.generateMultiPaymentDepositLimitless(f,{amounts:p,payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:r,stealthAddressStructure:D}),{wallet:F}=t.provider;if(!F)throw new Error("missing wallet");return B.signAndSendSerializedTransaction(t.provider,y,R,x)}const C=i.getTokenLimitStorageAccountPublicKey(t.programId,s,h),v=m===q.solanaNativeAddress?null:h,w=m===q.solanaNativeAddress?null:void 0;return t.methods.multiPaymentDeposit(p,D).accounts({mint:v,signer:S,signerAta:w,originalDeployer:s,storageAccount:b,storageVault:A,merkleAccount:K,tokenLimitStorage:C,storageVaultAta:w,accessTokenOwner:null}).rpc()};exports.hinkalSolanaDeposit=H;exports.hinkalSolanaDepositForOther=$;exports.hinkalSolanaMultiPaymentDeposit=G;

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

@@ -0,0 +1,4 @@
+import { IHinkal } from './IHinkal';
+export declare const hinkalSolanaDeposit: (hinkal: IHinkal, amount: bigint, mintAddress: string) => Promise<string>;
+export declare const hinkalSolanaDepositForOther: (hinkal: IHinkal, amount: bigint, mintAddress: string, recipientInfo: string) => Promise<string>;
+export declare const hinkalSolanaMultiPaymentDeposit: (hinkal: IHinkal, amounts: bigint[], mintAddress: string) => Promise<string>;