@hinkal/common 0.2.15 → 0.2.17

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/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>;

package/data-structures/Hinkal/hinkalSolanaDeposit.mjs

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

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../functions/web3/etherFunctions.cjs"),O=require("../utxo/Utxo.cjs"),j=require("../../error-handling/error-codes.constants.cjs"),W=require("ethers");require("idb-keyval");const V=require("../../constants/chains.constants.cjs");require("../crypto-keys/keys.cjs");require("node-forge");require("../../constants/vite.constants.cjs");require("libsodium-wrappers");require("../http/HttpClient.cjs");require("axios");const L=require("../../functions/utils/solanaMint.utils.cjs"),N=require("@solana/web3.js"),$=require("../../functions/utils/addresses.cjs");require("../../constants/server.constants.cjs");require("../../constants/token-data/index.cjs");const R=require("../../constants/protocol.constants.cjs"),Z=require("../../API/API.cjs");require("../../functions/utils/mutexes.utils.cjs");require("../../types/circom-data.types.cjs");const X=require("../../types/external-action.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../functions/web3/events/getApprovedBalance.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.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("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("process");require("buffer");require("../../constants/save-depths.cjs");const Y=require("@coral-xyz/anchor"),b=require("../../functions/pre-transaction/solana.cjs");require("@solana/spl-token");require("../../functions/utils/userAgent.cjs");const G=require("../../functions/utils/time.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const J=require("../../functions/utils/fees.utils.cjs");require("../../functions/web3/getTokenHolder.cjs");const Q=require("../../functions/web3/signAndSendSerializedTransaction.cjs"),M=require("../../functions/snarkjs/common.snarkjs.cjs"),ee=require("./hinkalCheckSolanaTokenRegistry.cjs"),te=require("../../functions/utils/getUtxosFromReceiptSolana.cjs"),re=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),oe=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),ne=require("../../functions/pre-transaction/getFeeStructure.cjs"),ae=async(e,r,i,c,p)=>{const u=i.map(t=>t+J.calculateTotalFee(t,p)),{hinkalIdl:l,hinkalAddress:d,originalDeployer:h}=V.networkRegistry[e.getCurrentChainId()].contractData;if(!l)throw new Error("No IDL configured for Solana program on this network");if(!h)throw new Error("missing original deployer");const y=e.userKeys.getShieldedPrivateKey(),k=O.Utxo.findCorrectRandomization(F.randomBigInt(31),y),v=M.calcStealthAddressStructure(k,y),o=e.getSolanaProgram(l),z=e.getSolanaPublicKey(),n=new N.PublicKey(h),q=new N.PublicKey(d),{mintPublicKey:w}=L.formatMintAddress(r),S=w.toString(),E=b.getStorageAccountPublicKey(q,n),B=b.getStorageVaultPublicKey(q,n),x=b.getMerkleAccountPublicKey(q,n),A=b.buildAnchorStealthAddressStructure(v),f=e.getCurrentChainId(),U=u.reduce((t,a)=>t+a,0n),T=await ee.hinkalCheckSolanaTokenRegistry(o,new N.PublicKey(n),[r],[U]),C=u.map(t=>`${t}`);let g="";if(T){const{serializedTransaction:t,blockhash:a,lastValidBlockHeight:m}=await Z.API.generateMultiPaymentDepositLimitless(f,{amounts:C,payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:r,stealthAddressStructure:A}),{wallet:s}=o.provider;if(!s)throw new Error("missing wallet");g=await Q.signAndSendSerializedTransaction(o.provider,t,a,m)}else{const t=b.getTokenLimitStorageAccountPublicKey(o.programId,n,w),a=S===R.solanaNativeAddress?null:w,m=S===R.solanaNativeAddress?null:void 0;g=await o.methods.multiPaymentDeposit(C.map(_=>new Y.BN(_)),A).accounts({mint:a,signer:z,signerAta:m,originalDeployer:n,storageAccount:E,storageVault:B,merkleAccount:x,tokenLimitStorage:t,storageVaultAta:m,accessTokenOwner:null}).rpc();const s=await o.provider.connection.getLatestBlockhash();await o.provider.connection.confirmTransaction({blockhash:s.blockhash,lastValidBlockHeight:s.lastValidBlockHeight,signature:g},"confirmed")}const I=await o.provider.connection.getTransaction(g,{commitment:"confirmed",maxSupportedTransactionVersion:0});if(!I)throw new Error("Transaction missing");const D=te.getUtxosFromReceiptSolana(I,o,e.userKeys),K=[],P=[...D];return c.forEach((t,a)=>{const m=u[a],s=P.find(H=>H.amount===m);if(!s)throw new Error(`Could not find newly created UTXO with amount ${m} for recipient ${t}.`);K.push({recipientAddress:t,utxo:s});const _=P.indexOf(s);P.splice(_,1)}),K},se=async(e,r,i,c,p,u)=>{if(i.length===0)throw new Error("userDepositedUtxos must not be empty");const{hinkalIdl:l,originalDeployer:d}=V.networkRegistry[e.getCurrentChainId()].contractData;if(!d||!l)throw new Error("missing data");const h=e.getSolanaProgram(l),y=await e.getRandomRelay(!0);if(!y)throw new Error(j.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const k=G.getCurrentTimeInSeconds().toString(),v=e.generateProofRemotely?5:1,o=[];for(let n=0;n<i.length;n+=v){const q=i.slice(n,n+v),w=await Promise.all(q.map(async({recipientAddress:S,utxo:E})=>{const{compressedAddress:B}=L.formatMintAddress(R.solanaNativeAddress),x=new O.Utxo({amount:0n,mintAddress:r,erc20TokenAddress:B,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:k,tokenId:0}),A=[E,x],f=[x],U=O.Utxo.findCorrectRandomization(F.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),T={tokenNumber:1,nullifierAmount:A.length,outputAmount:f.length},C=M.calcEncryptedOutputs([f],!1)[0][0],g=Array.from(W.ethers.utils.arrayify(C)),{proofAArr:I,proofBArr:D,proofCArr:K,publicInputsArr:P}=await re.constructSolanaZkProof(e.generateProofRemotely,d,e.merkleTreeHinkal,e.merkleTreeAccessToken,e.userKeys,h,[r],[A],[f],U,c.flatFee,c.variableRate,S,y,T,[g],e.getCurrentChainId(),void 0,void 0,void 0,void 0,!1),t=r===R.solanaNativeAddress,a={recipient:S,mint:t?void 0:r};return{relayAddress:y,functionName:"transact",args:{proofAArr:I,proofBArr:D,proofCArr:K,publicInputsArr:P,encryptedOutputs:[g],relayerFee:c.flatFee.toString(),dimensions:T},accounts:a}}));o.push(...w)}return await oe.solanaTransactCallRelayerBatch(e.getCurrentChainId(),o,p,u)},ie=async(e,r,i,c,p,u)=>{const l=$.hashEthereumAddress(await e.getEthereumAddress()),d=u??await ne.getFeeStructure(e.getCurrentChainId(),r,[r],X.ExternalActionId.Transact,[],0n),h=await ae(e,r,i,c,d);return se(e,r,h,d,l,p)};exports.hinkalSolanaDepositAndWithdraw=ie;