@hinkal/common 0.2.18 → 0.2.20

package/data-structures/Hinkal/hinkalSignSubAccount.mjs

@@ -1,22 +1,24 @@
-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
+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
     );
   else {
-    if (!i)
+    if (!a)
       throw Error("dataHash must be provided if typedData is not provided");
-    r = await n.signMessageFromPrivateKey(a, t.privateKey, i);
+    e = await o.signMessageFromPrivateKey(t, i, a);
   }
-  return r;
+  return e;
 };
 export {
-  d as hinkalSignSubAccount
+  u as hinkalSignSubAccount
 };

package/data-structures/Hinkal/hinkalSolanaDeposit.cjs

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

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

@@ -1,4 +1,5 @@
 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>;
+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>;

package/data-structures/Hinkal/hinkalSolanaDeposit.mjs

@@ -1,24 +1,25 @@
-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 { 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 { 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 { solanaNativeAddress as K } from "../../constants/protocol.constants.mjs";
+import { PublicKey as d } 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 { 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 "../../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 { API as F } from "../../API/API.mjs";
+import "../../API/tenderly.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";
@@ -26,108 +27,96 @@ 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)
+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)
     throw new Error("No IDL configured for Solana program on this network");
-  if (!d)
+  if (!m)
     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 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 { 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)
+    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)
       throw new Error("missing wallet");
-    return H(a.provider, w, C, E);
+    return _(c.provider, P, E, I);
   }
-  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,
+  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,
     originalDeployer: r,
     storageAccount: g,
-    storageVault: S,
-    merkleAccount: K,
-    tokenLimitStorage: b,
-    storageVaultAta: y,
+    storageVault: y,
+    merkleAccount: b,
+    tokenLimitStorage: w,
+    storageVaultAta: f,
     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)
+}, 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)
     throw new Error("No IDL configured for Solana program on this network");
-  if (!c)
+  if (!S)
     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(
+  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(
     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 (!$)
+    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)
       throw new Error("missing wallet");
-    return H(r.provider, p, R, U);
+    return _(r.provider, p, R, $);
   }
-  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,
+  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,
     signer: u,
-    signerAta: A,
+    signerAta: k,
     originalDeployer: i,
-    storageAccount: K,
-    storageVault: h,
-    merkleAccount: k,
-    tokenLimitStorage: C,
-    storageVaultAta: A,
+    storageAccount: b,
+    storageVault: A,
+    merkleAccount: T,
+    tokenLimitStorage: E,
+    storageVaultAta: k,
     accessTokenOwner: null
   }).rpc();
 };
 export {
-  Ct as hinkalSolanaDeposit,
-  Et as hinkalSolanaDepositForOther,
-  Rt as hinkalSolanaMultiPaymentDeposit
+  Tt as hinkalSolanaDeposit,
+  Ct as hinkalSolanaDepositForOther,
+  Vt as hinkalSolanaMultiPaymentDeposit
 };

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

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

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

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