@hinkal/common 0.2.21 → 0.2.23

package/data-structures/Hinkal/hinkalProxySwap.mjs

@@ -1,64 +1,60 @@
 import { SWAP_ROUTER_ADDRESSES as I } from "../../constants/addresses.constants.mjs";
-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) => {
+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 hinkalProxySwap");
-  const r = C(a), m = x.getAddressFromSubAccount(r, c);
+  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("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,
+    throw Error(L.RELAYER_NOT_AVAILABLE);
+  const d = await P(
     r,
-    p,
-    I[p][r],
+    s,
+    I[s][a],
     f,
-    n[0],
     i[0],
+    t[0],
+    t[1],
     i[1],
-    n[1],
+    A,
     E,
     m,
-    s,
     !0
-  ), R = u ?? await P(
-    r,
+  ), g = S ?? await _(
+    a,
     e,
-    n,
-    O.Emporium,
-    A.map((o) => L(o, m, r)),
-    y
-  ), _ = a.map((o, h) => ({
+    i,
+    v.Emporium,
+    d.map(
+      (o) => l(o, E, r.getCurrentChainId())
+    ),
+    O
+  ), y = p.map((o, C) => ({
     token: o,
-    amount: i[h]
+    amount: t[C]
   }));
-  return t.actionPrivateWallet(
-    r,
+  return r.actionPrivateWallet(
     [],
     [],
     [],
-    A,
-    _,
-    c,
+    d,
+    y,
+    n,
     e,
-    R,
-    s,
-    l,
+    g,
+    m,
+    u,
     w,
-    S,
+    R,
     void 0,
-    d
+    c
   );
 };
 export {
-  H as hinkalProxySwap
+  U as hinkalProxySwap
 };

package/data-structures/Hinkal/hinkalProxyToPrivate.cjs

@@ -1 +1 @@
-"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;
+"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.mjs

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

package/data-structures/Hinkal/hinkalSignSubAccount.cjs

@@ -1 +1 @@
-"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;
+"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';
-export declare const hinkalSignSubAccount: (chainId: number, messageToSign: string | undefined, typedData: TypedData | undefined, subAccount: SubAccount) => Promise<string>;
+import { type IHinkal } from './IHinkal';
+export declare const hinkalSignSubAccount: (hinkal: IHinkal, messageToSign: string | undefined, typedData: TypedData | undefined, subAccount: SubAccount) => Promise<string>;

package/data-structures/Hinkal/hinkalSignSubAccount.mjs

@@ -1,24 +1,22 @@
-import { AccountActions as o } from "../AccountActions/AccountActions.mjs";
-const u = async (t, a, r, n) => {
-  let e;
-  const i = o.getPrivateKeyFromSubAccount(t, n);
-  if (!i)
-    throw Error("Private key is not available");
-  if (r)
-    e = await o.signTypedDataFromPrivateKey(
-      t,
-      i,
-      r.domain,
-      r.types,
-      r.value
+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 (!a)
+    if (!i)
       throw Error("dataHash must be provided if typedData is not provided");
-    e = await o.signMessageFromPrivateKey(t, i, a);
+    r = await n.signMessageFromPrivateKey(a, t.privateKey, i);
   }
-  return e;
+  return r;
 };
 export {
-  u as hinkalSignSubAccount
+  d as hinkalSignSubAccount
 };

package/data-structures/Hinkal/hinkalSolanaDeposit.cjs

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

@@ -1,5 +1,4 @@
 import { IHinkal } from './IHinkal';
-import { ERC20Token } from '../../types/token.types';
-export declare const hinkalSolanaDeposit: (hinkal: IHinkal, amount: bigint, token: ERC20Token) => Promise<string>;
-export declare const hinkalSolanaDepositForOther: (hinkal: IHinkal, amount: bigint, token: ERC20Token, recipientInfo: string) => Promise<string>;
-export declare const hinkalSolanaMultiPaymentDeposit: (hinkal: IHinkal, amounts: bigint[], token: ERC20Token) => Promise<string>;
+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

@@ -1,25 +1,24 @@
-import { Utxo as C } from "../utxo/Utxo.mjs";
-import { formatMintAddress as V } from "../../functions/utils/solanaMint.utils.mjs";
-import { randomBigInt as B } from "../../functions/web3/etherFunctions.mjs";
+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 K } from "../../constants/protocol.constants.mjs";
-import { PublicKey as d } from "@solana/web3.js";
+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 Q, constructStealthAddressStructure as W } from "../../functions/utils/addresses.mjs";
-import { transactionErrorCodes as X } from "../../error-handling/error-codes.constants.mjs";
-import { getStorageAccountPublicKey as N, getStorageVaultPublicKey as M, getMerkleAccountPublicKey as O, buildAnchorStealthAddressStructure as x, getTokenLimitStorageAccountPublicKey as q } from "../../functions/pre-transaction/solana.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 { API as F } from "../../API/API.mjs";
-import "../../API/tenderly.api.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/vite.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
@@ -27,96 +26,108 @@ import "../../constants/presale.constants.mjs";
 import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
-import { hinkalCheckSolanaTokenRegistry as H } from "./hinkalCheckSolanaTokenRegistry.mjs";
-import { signAndSendSerializedTransaction as _ } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
-import { validateAndGetChainId as G } from "../../functions/utils/token-check.utils.mjs";
-const U = async (t, n, s, o) => {
-  const e = G([s]), a = s.erc20TokenAddress, { hinkalIdl: h, hinkalAddress: S, originalDeployer: m } = z[e].contractData;
-  if (!h)
+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 (!m)
+  if (!d)
     throw new Error("missing original deployer");
-  const c = t.getSolanaProgram(h), D = t.getSolanaPublicKey(), r = new d(m), u = new d(S), { mintPublicKey: i } = V(a), l = i.toString(), g = N(u, r), y = M(u, r), b = O(u, r), A = x(o);
-  if (await H(
-    c,
-    new d(r),
-    [a],
-    [n]
+  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: P, blockhash: E, lastValidBlockHeight: I } = await F.generateProoflessDepositLimitless({
-      amount: n.toString(),
-      payer: t.getSolanaPublicKey().toBase58(),
-      ethereumAddress: await t.getEthereumAddressByChain(e),
-      mint: a,
-      stealthAddressStructure: A,
-      chainId: e
-    }), { wallet: k } = c.provider;
-    if (!k)
+    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 _(c.provider, P, E, I);
+    return H(a.provider, w, C, E);
   }
-  const w = q(c.programId, r, i), v = l === K ? null : i, f = l === K ? null : void 0;
-  return c.methods.prooflessDeposit(new J(n.toString()), A).accounts({
-    mint: v,
-    signer: D,
-    signerAta: f,
+  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: y,
-    merkleAccount: b,
-    tokenLimitStorage: w,
-    storageVaultAta: f,
+    storageVault: S,
+    merkleAccount: K,
+    tokenLimitStorage: b,
+    storageVaultAta: y,
     accessTokenOwner: null
   }).rpc();
-}, Tt = async (t, n, s) => {
-  const o = t.userKeys.getShieldedPrivateKey(), e = C.findCorrectRandomization(B(31), o), a = L(e, o);
-  return U(t, n, s, a);
-}, Ct = async (t, n, s, o) => {
-  if (!Q(o))
-    throw Error(X.RECIPIENT_FORMAT_INCORRECT);
-  const e = W(o);
-  return U(t, n, s, e);
-}, Vt = async (t, n, s) => {
-  const o = G([s]), e = s.erc20TokenAddress, { hinkalIdl: a, hinkalAddress: h, originalDeployer: S } = z[o].contractData;
-  if (!a)
+}, 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 (!S)
+  if (!c)
     throw new Error("missing original deployer");
-  const m = t.userKeys.getShieldedPrivateKey(), c = C.findCorrectRandomization(B(31), m), D = L(c, m), r = t.getSolanaProgram(a), u = t.getSolanaPublicKey(), i = new d(S), l = new d(h), { mintPublicKey: g } = V(e), y = g.toString(), b = N(l, i), A = M(l, i), T = O(l, i), w = x(D), v = n.reduce((p, R) => p + R, 0n), f = await H(
+  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 d(i),
-    [e],
-    [v]
-  ), P = n.map((p) => `${p}`);
-  if (f) {
-    const { serializedTransaction: p, blockhash: R, lastValidBlockHeight: $ } = await F.generateMultiPaymentDepositLimitless({
-      amounts: P,
-      payer: t.getSolanaPublicKey().toBase58(),
-      ethereumAddress: await t.getEthereumAddressByChain(o),
-      mint: e,
-      stealthAddressStructure: w,
-      chainId: o
-    }), { wallet: j } = r.provider;
-    if (!j)
+    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 _(r.provider, p, R, $);
+    return H(r.provider, p, R, U);
   }
-  const E = q(r.programId, i, g), I = y === K ? null : g, k = y === K ? null : void 0;
-  return r.methods.multiPaymentDeposit(P, w).accounts({
-    mint: I,
+  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: k,
+    signerAta: A,
     originalDeployer: i,
-    storageAccount: b,
-    storageVault: A,
-    merkleAccount: T,
-    tokenLimitStorage: E,
-    storageVaultAta: k,
+    storageAccount: K,
+    storageVault: h,
+    merkleAccount: k,
+    tokenLimitStorage: C,
+    storageVaultAta: A,
     accessTokenOwner: null
   }).rpc();
 };
 export {
-  Tt as hinkalSolanaDeposit,
-  Ct as hinkalSolanaDepositForOther,
-  Vt as hinkalSolanaMultiPaymentDeposit
+  Ct as hinkalSolanaDeposit,
+  Et as hinkalSolanaDepositForOther,
+  Rt as hinkalSolanaMultiPaymentDeposit
 };

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

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

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

@@ -1,4 +1,3 @@
 import { FeeStructure } from '../../types/hinkal.types';
 import { IHinkal } from './IHinkal';
-import { ERC20Token } from '../../types/token.types';
-export declare const hinkalSolanaDepositAndWithdraw: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure) => Promise<string>;
+export declare const hinkalSolanaDepositAndWithdraw: (hinkal: IHinkal, mintAddress: string, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string) => Promise<string>;