@hinkal/common 0.2.19 → 0.2.21

package/data-structures/Hinkal/hinkalProxyToPrivate.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("../../error-handling/error-codes.constants.cjs"),A=require("../../functions/utils/addresses.cjs"),C=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),f=require("../../functions/private-wallet/emporium.helpers.cjs"),q=require("../../functions/pre-transaction/getFeeStructure.cjs"),g=require("../../types/external-action.types.cjs"),T=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),w=require("../crypto-keys/keys.cjs"),I=require("../../functions/utils/token-check.utils.cjs"),O=async(n,r,l,d,o,m,i,p,v=!1)=>{if(!i)throw Error("hinkalProxyToPrivate: subAccount should be provided");if(!o)throw new Error("Fee token is required in hinkalProxyToPrivate");if(!A.isValidPrivateAddress(d))throw Error(E.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const e=I.validateAndGetChainId(r),u=w.UserKeys.getSignerAddressFromPrivateKey(e,i.privateKey),s=r.map(t=>t.erc20TokenAddress),a=await C.modifyVolatileTokenAmountChanges(e,r,l,u),c=f.createTransaferEmporiumOpsBatch(n,e,s,a),h=m??await q.getFeeStructure(e,o,s,g.ExternalActionId.Emporium,c.map(t=>T.convertEmporiumOpToCallInfo(t,u,e))),y=r.map((t,P)=>({token:t,amount:-1n*a[P]}));return n.actionPrivateWallet(e,[s[0]],[0n],[!1],c,y,i,o,h,void 0,void 0,void 0,p,{recipientInfo:d,amount:a[0],token:r[0]},v)};exports.hinkalProxyToPrivate=O;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const P=require("../../error-handling/error-codes.constants.cjs"),f=require("../../functions/utils/addresses.cjs"),C=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),q=require("../../functions/private-wallet/emporium.helpers.cjs"),y=require("../../functions/pre-transaction/getFeeStructure.cjs"),g=require("../../types/external-action.types.cjs"),w=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),T=require("../../functions/utils/token-check.utils.cjs"),I=require("../AccountActions/AccountActions.cjs"),O=async(s,r,l,c,o,m,n,p,A=!1)=>{if(!n)throw Error("hinkalProxyToPrivate: subAccount should be provided");if(!o)throw new Error("Fee token is required in hinkalProxyToPrivate");if(!f.isValidPrivateAddress(c))throw Error(P.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const e=T.validateAndGetChainId(r),i=I.AccountActions.getAddressFromSubAccount(e,n);if(!i)throw Error("Public account address is not available");const u=r.map(t=>t.erc20TokenAddress),a=await C.modifyVolatileTokenAmountChanges(e,r,l,i),d=q.createTransaferEmporiumOpsBatch(s,e,u,a),h=m??await y.getFeeStructure(e,o,u,g.ExternalActionId.Emporium,d.map(t=>w.convertEmporiumOpToCallInfo(t,i,e))),v=r.map((t,E)=>({token:t,amount:-1n*a[E]}));return s.actionPrivateWallet(e,[r[0]],[0n],[!1],d,v,n,o,h,void 0,void 0,void 0,p,{recipientInfo:c,amount:a[0],token:r[0]},A)};exports.hinkalProxyToPrivate=O;

package/data-structures/Hinkal/hinkalProxyToPrivate.mjs

@@ -1,47 +1,50 @@
-import { transactionErrorCodes as P } from "../../error-handling/error-codes.constants.mjs";
-import { isValidPrivateAddress as A } from "../../functions/utils/addresses.mjs";
-import { modifyVolatileTokenAmountChanges as y } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+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 w } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { ExternalActionId as I } from "../../types/external-action.types.mjs";
-import { convertEmporiumOpToCallInfo as g } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { UserKeys as x } from "../crypto-keys/keys.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";
-const q = async (n, o, l, s, e, f, i, c, u = !1) => {
+import { AccountActions as g } from "../AccountActions/AccountActions.mjs";
+const B = async (n, r, l, s, a, p, i, u, f = !1) => {
   if (!i)
     throw Error("hinkalProxyToPrivate: subAccount should be provided");
-  if (!e)
+  if (!a)
     throw new Error("Fee token is required in hinkalProxyToPrivate");
-  if (!A(s))
-    throw Error(P.RECIPIENT_FORMAT_INCORRECT);
-  const r = O(o), d = x.getSignerAddressFromPrivateKey(r, i.privateKey), a = o.map((t) => t.erc20TokenAddress), m = await y(r, o, l, d), p = C(n, r, a, m), v = f ?? await w(
-    r,
-    e,
+  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,
-    I.Emporium,
-    p.map((t) => g(t, d, r))
-  ), h = o.map((t, E) => ({
+    d,
+    x.Emporium,
+    c.map((t) => y(t, e, o))
+  ), v = r.map((t, A) => ({
     token: t,
-    amount: -1n * m[E]
+    amount: -1n * m[A]
   }));
   return n.actionPrivateWallet(
-    r,
-    [a[0]],
+    o,
+    [r[0]],
     [0n],
     [!1],
-    p,
-    h,
-    i,
-    e,
+    c,
     v,
+    i,
+    a,
+    h,
     void 0,
     void 0,
     void 0,
-    c,
-    { recipientInfo: s, amount: m[0], token: o[0] },
-    u
+    u,
+    { recipientInfo: s, amount: m[0], token: r[0] },
+    f
   );
 };
 export {
-  q as hinkalProxyToPrivate
+  B as hinkalProxyToPrivate
 };

package/data-structures/Hinkal/hinkalSignSubAccount.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../crypto-keys/keys.cjs"),n=async(i,t,e,s)=>{let r;if(e)r=await a.UserKeys.signTypedDataFromPrivateKey(i,s.privateKey,e.domain,e.types,e.value);else{if(!t)throw Error("dataHash must be provided if typedData is not provided");r=await a.UserKeys.signMessageFromPrivateKey(i,s.privateKey,t)}return r};exports.hinkalSignSubAccount=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../AccountActions/AccountActions.cjs"),a=async(e,n,t,c)=>{let i;const o=r.AccountActions.getPrivateKeyFromSubAccount(e,c);if(!o)throw Error("Private key is not available");if(t)i=await r.AccountActions.signTypedDataFromPrivateKey(e,o,t.domain,t.types,t.value);else{if(!n)throw Error("dataHash must be provided if typedData is not provided");i=await r.AccountActions.signMessageFromPrivateKey(e,o,n)}return i};exports.hinkalSignSubAccount=a;

package/data-structures/Hinkal/hinkalSignSubAccount.mjs

@@ -1,21 +1,24 @@
-import { UserKeys as o } from "../crypto-keys/keys.mjs";
-const n = async (i, t, e, a) => {
-  let r;
-  if (e)
-    r = await o.signTypedDataFromPrivateKey(
+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,
-      a.privateKey,
-      e.domain,
-      e.types,
-      e.value
+      r.domain,
+      r.types,
+      r.value
     );
   else {
-    if (!t)
+    if (!a)
       throw Error("dataHash must be provided if typedData is not provided");
-    r = await o.signMessageFromPrivateKey(i, a.privateKey, t);
+    e = await o.signMessageFromPrivateKey(t, i, a);
   }
-  return r;
+  return e;
 };
 export {
-  n as hinkalSignSubAccount
+  u 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"),N=require("../../constants/chains.constants.cjs"),K=require("../../constants/protocol.constants.cjs"),d=require("@solana/web3.js"),_=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 L=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 B=require("./hinkalCheckSolanaTokenRegistry.cjs"),O=require("../../functions/web3/signAndSendSerializedTransaction.cjs"),x=require("../../functions/utils/token-check.utils.cjs"),F=async(e,r,a,n)=>{const o=x.validateAndGetChainId([a]),c=a.erc20TokenAddress,{hinkalIdl:m,hinkalAddress:y,originalDeployer:g}=N.networkRegistry[o].contractData;if(!m)throw new Error("No IDL configured for Solana program on this network");if(!g)throw new Error("missing original deployer");const l=e.getSolanaProgram(m),D=e.getSolanaPublicKey(),t=new d.PublicKey(g),S=new d.PublicKey(y),{mintPublicKey:s}=M.formatMintAddress(c),u=s.toString(),h=i.getStorageAccountPublicKey(S,t),P=i.getStorageVaultPublicKey(S,t),f=i.getMerkleAccountPublicKey(S,t),p=i.buildAnchorStealthAddressStructure(n);if(await B.hinkalCheckSolanaTokenRegistry(l,new d.PublicKey(t),[c],[r])){const{serializedTransaction:q,blockhash:T,lastValidBlockHeight:I}=await L.API.generateProoflessDepositLimitless({amount:r.toString(),payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:c,stealthAddressStructure:p,chainId:o}),{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(r.toString()),p).accounts({mint:v,signer:D,signerAta:w,originalDeployer:t,storageAccount:h,storageVault:P,merkleAccount:f,tokenLimitStorage:k,storageVaultAta:w,accessTokenOwner:null}).rpc()},$=async(e,r,a)=>{const n=e.userKeys.getShieldedPrivateKey(),o=V.Utxo.findCorrectRandomization(z.randomBigInt(31),n),c=_.calcStealthAddressStructure(o,n);return F(e,r,a,c)},J=async(e,r,a,n)=>{if(!E.isValidPrivateAddress(n))throw Error(H.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const o=E.constructStealthAddressStructure(n);return F(e,r,a,o)},Q=async(e,r,a)=>{const n=x.validateAndGetChainId([a]),o=a.erc20TokenAddress,{hinkalIdl:c,hinkalAddress:m,originalDeployer:y}=N.networkRegistry[n].contractData;if(!c)throw new Error("No IDL configured for Solana program on this network");if(!y)throw new Error("missing original deployer");const g=e.userKeys.getShieldedPrivateKey(),l=V.Utxo.findCorrectRandomization(z.randomBigInt(31),g),D=_.calcStealthAddressStructure(l,g),t=e.getSolanaProgram(c),S=e.getSolanaPublicKey(),s=new d.PublicKey(y),u=new d.PublicKey(m),{mintPublicKey:h}=M.formatMintAddress(o),P=h.toString(),f=i.getStorageAccountPublicKey(u,s),p=i.getStorageVaultPublicKey(u,s),C=i.getMerkleAccountPublicKey(u,s),k=i.buildAnchorStealthAddressStructure(D),v=r.reduce((A,R)=>A+R,0n),w=await B.hinkalCheckSolanaTokenRegistry(t,new d.PublicKey(s),[o],[v]),q=r.map(A=>`${A}`);if(w){const{serializedTransaction:A,blockhash:R,lastValidBlockHeight:j}=await L.API.generateMultiPaymentDepositLimitless({amounts:q,payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:o,stealthAddressStructure:k,chainId:n}),{wallet:U}=t.provider;if(!U)throw new Error("missing wallet");return O.signAndSendSerializedTransaction(t.provider,A,R,j)}const T=i.getTokenLimitStorageAccountPublicKey(t.programId,s,h),I=P===K.solanaNativeAddress?null:h,b=P===K.solanaNativeAddress?null:void 0;return t.methods.multiPaymentDeposit(q,k).accounts({mint:I,signer:S,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 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.mjs

@@ -1,10 +1,10 @@
-import { Utxo as V } from "../utxo/Utxo.mjs";
-import { formatMintAddress as C } from "../../functions/utils/solanaMint.utils.mjs";
-import { randomBigInt as z } from "../../functions/web3/etherFunctions.mjs";
-import { networkRegistry as L } from "../../constants/chains.constants.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 K } from "../../constants/protocol.constants.mjs";
 import { PublicKey as d } from "@solana/web3.js";
-import { calcStealthAddressStructure as B } from "../../functions/snarkjs/common.snarkjs.mjs";
+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";
@@ -30,85 +30,85 @@ 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, o, s, e) => {
-  const n = G([s]), a = s.erc20TokenAddress, { hinkalIdl: h, hinkalAddress: S, originalDeployer: m } = L[n].contractData;
+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 (!m)
     throw new Error("missing original deployer");
-  const c = t.getSolanaProgram(h), D = t.getSolanaPublicKey(), r = new d(m), u = new d(S), { mintPublicKey: i } = C(a), l = i.toString(), g = N(u, r), A = M(u, r), b = O(u, r), y = x(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],
-    [o]
+    [n]
   )) {
     const { serializedTransaction: P, blockhash: E, lastValidBlockHeight: I } = await F.generateProoflessDepositLimitless({
-      amount: o.toString(),
+      amount: n.toString(),
       payer: t.getSolanaPublicKey().toBase58(),
-      ethereumAddress: await t.getEthereumAddress(),
+      ethereumAddress: await t.getEthereumAddressByChain(e),
       mint: a,
-      stealthAddressStructure: y,
-      chainId: n
+      stealthAddressStructure: A,
+      chainId: e
     }), { wallet: k } = c.provider;
     if (!k)
       throw new Error("missing wallet");
     return _(c.provider, P, E, I);
   }
   const w = q(c.programId, r, i), v = l === K ? null : i, f = l === K ? null : void 0;
-  return c.methods.prooflessDeposit(new J(o.toString()), y).accounts({
+  return c.methods.prooflessDeposit(new J(n.toString()), A).accounts({
     mint: v,
     signer: D,
     signerAta: f,
     originalDeployer: r,
     storageAccount: g,
-    storageVault: A,
+    storageVault: y,
     merkleAccount: b,
     tokenLimitStorage: w,
     storageVaultAta: f,
     accessTokenOwner: null
   }).rpc();
-}, Tt = async (t, o, s) => {
-  const e = t.userKeys.getShieldedPrivateKey(), n = V.findCorrectRandomization(z(31), e), a = B(n, e);
-  return U(t, o, s, a);
-}, Vt = async (t, o, s, e) => {
-  if (!Q(e))
+}, 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 n = W(e);
-  return U(t, o, s, n);
-}, Ct = async (t, o, s) => {
-  const e = G([s]), n = s.erc20TokenAddress, { hinkalIdl: a, hinkalAddress: h, originalDeployer: S } = L[e].contractData;
+  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 (!S)
     throw new Error("missing original deployer");
-  const m = t.userKeys.getShieldedPrivateKey(), c = V.findCorrectRandomization(z(31), m), D = B(c, m), r = t.getSolanaProgram(a), u = t.getSolanaPublicKey(), i = new d(S), l = new d(h), { mintPublicKey: g } = C(n), A = g.toString(), b = N(l, i), y = M(l, i), T = O(l, i), w = x(D), v = o.reduce((p, R) => p + R, 0n), f = await H(
+  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 d(i),
-    [n],
+    [e],
     [v]
-  ), P = o.map((p) => `${p}`);
+  ), 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.getEthereumAddress(),
-      mint: n,
+      ethereumAddress: await t.getEthereumAddressByChain(o),
+      mint: e,
       stealthAddressStructure: w,
-      chainId: e
+      chainId: o
     }), { wallet: j } = r.provider;
     if (!j)
       throw new Error("missing wallet");
     return _(r.provider, p, R, $);
   }
-  const E = q(r.programId, i, g), I = A === K ? null : g, k = A === K ? null : void 0;
+  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: k,
     originalDeployer: i,
     storageAccount: b,
-    storageVault: y,
+    storageVault: A,
     merkleAccount: T,
     tokenLimitStorage: E,
     storageVaultAta: k,
@@ -117,6 +117,6 @@ const U = async (t, o, s, e) => {
 };
 export {
   Tt as hinkalSolanaDeposit,
-  Vt as hinkalSolanaDepositForOther,
-  Ct as hinkalSolanaMultiPaymentDeposit
+  Ct as hinkalSolanaDepositForOther,
+  Vt as hinkalSolanaMultiPaymentDeposit
 };

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const V=require("../../functions/web3/etherFunctions.cjs"),F=require("../utxo/Utxo.cjs"),W=require("../../error-handling/error-codes.constants.cjs"),$=require("ethers");require("idb-keyval");const L=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 M=require("../../functions/utils/solanaMint.utils.cjs"),z=require("@solana/web3.js"),Z=require("../../functions/utils/addresses.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../../constants/token-data/index.cjs");const B=require("../../constants/protocol.constants.cjs"),G=require("../../API/API.cjs"),X=require("../../functions/utils/token-check.utils.cjs");require("async-mutex");require("../../types/circom-data.types.cjs");const Y=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");const x=require("../../functions/pre-transaction/solana.cjs");require("@solana/spl-token");const J=require("@coral-xyz/anchor");require("../../functions/utils/userAgent.cjs");const Q=require("../../functions/utils/time.utils.cjs");require("circomlibjs-hinkal-fork");require("multiformats");require("../../API/tenderly.api.cjs");require("process");require("buffer");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,q,l,d,A)=>{const i=q.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(V.randomBigInt(31),y),K=H.calcStealthAddressStructure(C,y),o=e.getSolanaProgram(m),I=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 p="";if(_){const{serializedTransaction:r,blockhash:a,lastValidBlockHeight:c}=await G.API.generateMultiPaymentDepositLimitless({amounts:b,payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:i,stealthAddressStructure:P,chainId:t}),{wallet:u}=o.provider;if(!u)throw new Error("missing wallet");p=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;p=await o.methods.multiPaymentDeposit(b.map(O=>new J.BN(O)),P).accounts({mint:a,signer:I,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:p},"confirmed")}const T=await o.provider.connection.getTransaction(p,{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,q,l,d,A,i)=>{const n=q.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(V.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),b={tokenNumber:1,nullifierAmount:P.length,outputAmount:k.length},p=H.calcEncryptedOutputs([k])[0][0],T=Array.from($.ethers.utils.arrayify(p)),{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,q,l,d,A)=>{const i=X.validateAndGetChainId([t]),n=t.erc20TokenAddress,m=Z.hashEthereumAddress(await e.getEthereumAddress()),g=A??await ie.getFeeStructure(i,n,[n],Y.ExternalActionId.Transact,[],0n),h=await ae(e,i,t,q,l,g);return ce(e,i,t,h,g,m,d)};exports.hinkalSolanaDepositAndWithdraw=ue;
+"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.mjs

@@ -1,30 +1,36 @@
-import { randomBigInt as F } from "../../functions/web3/etherFunctions.mjs";
+import { randomBigInt as I } from "../../functions/web3/etherFunctions.mjs";
+import "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import "../../constants/token-data/index.mjs";
+import { solanaNativeAddress as R } from "../../constants/protocol.constants.mjs";
+import { networkRegistry as H } from "../../constants/chains.constants.mjs";
 import { Utxo as N } from "../utxo/Utxo.mjs";
 import { transactionErrorCodes as W } from "../../error-handling/error-codes.constants.mjs";
-import { ethers as _ } from "ethers";
 import "idb-keyval";
-import { networkRegistry as H } from "../../constants/chains.constants.mjs";
-import "../crypto-keys/keys.mjs";
-import "node-forge";
+import { API as _ } from "../../API/API.mjs";
 import "../../constants/vite.constants.mjs";
-import "libsodium-wrappers";
-import "../http/HttpClient.mjs";
-import "axios";
-import { formatMintAddress as M } from "../../functions/utils/solanaMint.utils.mjs";
-import { PublicKey as L } from "@solana/web3.js";
-import { hashEthereumAddress as q } from "../../functions/utils/addresses.mjs";
-import "../../constants/server.constants.mjs";
-import "../../API/getServerURL.mjs";
-import "../../constants/token-data/index.mjs";
-import { solanaNativeAddress as B } from "../../constants/protocol.constants.mjs";
-import { API as G } from "../../API/API.mjs";
-import { validateAndGetChainId as X } from "../../functions/utils/token-check.utils.mjs";
+import { validateAndGetChainId as q } from "../../functions/utils/token-check.utils.mjs";
 import "async-mutex";
+import { formatMintAddress as M } from "../../functions/utils/solanaMint.utils.mjs";
 import "../../types/circom-data.types.mjs";
-import { ExternalActionId as Y } from "../../types/external-action.types.mjs";
+import { ExternalActionId as G } from "../../types/external-action.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import "../../functions/web3/events/getApprovedBalance.mjs";
+import { ethers as X } from "ethers";
+import { PublicKey as L } from "@solana/web3.js";
+import "../http/HttpClient.mjs";
+import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
+import "../../constants/server.constants.mjs";
+import "../../API/getServerURL.mjs";
+import "axios";
+import { hashEthereumAddress as Y } from "../../functions/utils/addresses.mjs";
+import { getStorageAccountPublicKey as Z, getStorageVaultPublicKey as j, getMerkleAccountPublicKey as J, buildAnchorStealthAddressStructure as Q, getTokenLimitStorageAccountPublicKey as tt } from "../../functions/pre-transaction/solana.mjs";
+import "@solana/spl-token";
+import "ethers-v6h";
+import "tweetnacl";
+import "bs58";
+import { BN as ot } from "@coral-xyz/anchor";
+import "buffer";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
 import "../../constants/coingecko.constants.mjs";
@@ -35,68 +41,64 @@ import "../../constants/presale.constants.mjs";
 import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
-import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
-import { getStorageAccountPublicKey as Z, getStorageVaultPublicKey as j, getMerkleAccountPublicKey as J, buildAnchorStealthAddressStructure as Q, getTokenLimitStorageAccountPublicKey as tt } from "../../functions/pre-transaction/solana.mjs";
-import "@solana/spl-token";
-import { BN as ot } from "@coral-xyz/anchor";
 import "../../functions/utils/userAgent.mjs";
 import { getCurrentTimeInSeconds as rt } from "../../functions/utils/time.utils.mjs";
 import "circomlibjs-hinkal-fork";
+import "../crypto-keys/keys.mjs";
+import "libsodium-wrappers";
 import "multiformats";
-import "../../API/tenderly.api.mjs";
 import "process";
-import "buffer";
 import "../../providers/EthersProviderAdapter.mjs";
 import { calculateTotalFee as et } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/web3/getTokenHolder.mjs";
-import { signAndSendSerializedTransaction as nt } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
-import { calcStealthAddressStructure as it, calcEncryptedOutputs as st } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { signAndSendSerializedTransaction as it } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
+import { calcStealthAddressStructure as nt, calcEncryptedOutputs as st } from "../../functions/snarkjs/common.snarkjs.mjs";
 import { hinkalCheckSolanaTokenRegistry as at } from "./hinkalCheckSolanaTokenRegistry.mjs";
 import { getUtxosFromReceiptSolana as ct } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
 import { constructSolanaZkProof as mt } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 import { solanaTransactCallRelayerBatch as lt } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { getFeeStructure as dt } from "../../functions/pre-transaction/getFeeStructure.mjs";
-const pt = async (t, o, y, l, d, w) => {
-  const s = y.erc20TokenAddress, n = l.map((r) => r + et(r, w)), { hinkalIdl: p, hinkalAddress: u, originalDeployer: g } = H[o].contractData;
+const pt = async (t, o, h, l, d, w) => {
+  const s = h.erc20TokenAddress, i = l.map((r) => r + et(r, w)), { hinkalIdl: p, hinkalAddress: u, originalDeployer: g } = H[o].contractData;
   if (!p)
     throw new Error("No IDL configured for Solana program on this network");
   if (!g)
     throw new Error("missing original deployer");
-  const f = t.userKeys.getShieldedPrivateKey(), D = N.findCorrectRandomization(F(31), f), E = it(D, f), e = t.getSolanaProgram(p), I = t.getSolanaPublicKey(), i = new L(g), A = new L(u), { mintPublicKey: S } = M(s), P = S.toString(), C = Z(A, i), U = j(A, i), K = J(A, i), T = Q(E), v = n.reduce((r, c) => r + c, 0n), O = await at(
+  const f = t.userKeys.getShieldedPrivateKey(), C = N.findCorrectRandomization(I(31), f), E = nt(C, f), e = t.getSolanaProgram(p), F = t.getSolanaPublicKey(), n = new L(g), A = new L(u), { mintPublicKey: S } = M(s), P = S.toString(), D = Z(A, n), U = j(A, n), K = J(A, n), T = Q(E), v = i.reduce((r, c) => r + c, 0n), O = await at(
     e,
-    new L(i),
+    new L(n),
     [s],
     [v]
-  ), b = n.map((r) => `${r}`);
-  let h = "";
+  ), b = i.map((r) => `${r}`);
+  let y = "";
   if (O) {
-    const { serializedTransaction: r, blockhash: c, lastValidBlockHeight: a } = await G.generateMultiPaymentDepositLimitless({
+    const { serializedTransaction: r, blockhash: c, lastValidBlockHeight: a } = await _.generateMultiPaymentDepositLimitless({
       amounts: b,
       payer: t.getSolanaPublicKey().toBase58(),
-      ethereumAddress: await t.getEthereumAddress(),
+      ethereumAddress: await t.getEthereumAddressByChain(o),
       mint: s,
       stealthAddressStructure: T,
       chainId: o
     }), { wallet: m } = e.provider;
     if (!m)
       throw new Error("missing wallet");
-    h = await nt(
+    y = await it(
       e.provider,
       r,
       c,
       a
     );
   } else {
-    const r = tt(e.programId, i, S), c = P === B ? null : S, a = P === B ? null : void 0;
-    h = await e.methods.multiPaymentDeposit(
+    const r = tt(e.programId, n, S), c = P === R ? null : S, a = P === R ? null : void 0;
+    y = await e.methods.multiPaymentDeposit(
       b.map((z) => new ot(z)),
       T
     ).accounts({
       mint: c,
-      signer: I,
+      signer: F,
       signerAta: a,
-      originalDeployer: i,
-      storageAccount: C,
+      originalDeployer: n,
+      storageAccount: D,
       storageVault: U,
       merkleAccount: K,
       tokenLimitStorage: r,
@@ -108,31 +110,31 @@ const pt = async (t, o, y, l, d, w) => {
       {
         blockhash: m.blockhash,
         lastValidBlockHeight: m.lastValidBlockHeight,
-        signature: h
+        signature: y
       },
       "confirmed"
     );
   }
-  const x = await e.provider.connection.getTransaction(h, {
+  const x = await e.provider.connection.getTransaction(y, {
     commitment: "confirmed",
     maxSupportedTransactionVersion: 0
   });
   if (!x)
     throw new Error("Transaction missing");
-  const V = ct(x, e, t.userKeys), R = [], k = [...V];
+  const V = ct(x, e, t.userKeys), B = [], k = [...V];
   return d.forEach((r, c) => {
-    const a = n[c], m = k.find(($) => $.amount === a);
+    const a = i[c], m = k.find(($) => $.amount === a);
     if (!m)
       throw new Error(`Could not find newly created UTXO with amount ${a} for recipient ${r}.`);
-    R.push({
+    B.push({
       recipientAddress: r,
       utxo: m
     });
     const z = k.indexOf(m);
     k.splice(z, 1);
-  }), R;
-}, ut = async (t, o, y, l, d, w, s) => {
-  const n = y.erc20TokenAddress;
+  }), B;
+}, ut = async (t, o, h, l, d, w, s) => {
+  const i = h.erc20TokenAddress;
   if (l.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
   const { hinkalIdl: p, originalDeployer: u } = H[o].contractData;
@@ -141,32 +143,32 @@ const pt = async (t, o, y, l, d, w) => {
   const g = t.getSolanaProgram(p), f = await t.getRandomRelay(o, !0);
   if (!f)
     throw new Error(W.RELAYER_NOT_AVAILABLE);
-  const D = rt().toString(), E = t.generateProofRemotely ? 5 : 1, e = [];
-  for (let i = 0; i < l.length; i += E) {
-    const A = l.slice(i, i + E), S = await Promise.all(
-      A.map(async ({ recipientAddress: P, utxo: C }) => {
-        const { compressedAddress: U } = M(B), K = new N({
+  const C = rt().toString(), E = t.generateProofRemotely ? 5 : 1, e = [];
+  for (let n = 0; n < l.length; n += E) {
+    const A = l.slice(n, n + E), S = await Promise.all(
+      A.map(async ({ recipientAddress: P, utxo: D }) => {
+        const { compressedAddress: U } = M(R), K = new N({
           amount: 0n,
-          mintAddress: n,
+          mintAddress: i,
           erc20TokenAddress: U,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: D,
+          timeStamp: C,
           tokenId: 0
-        }), T = [C, K], v = [K], O = N.findCorrectRandomization(
-          F(31),
+        }), T = [D, K], v = [K], O = N.findCorrectRandomization(
+          I(31),
           t.userKeys.getShieldedPrivateKey()
         ), b = {
           tokenNumber: 1,
           nullifierAmount: T.length,
           outputAmount: v.length
-        }, h = st([v])[0][0], x = Array.from(_.utils.arrayify(h)), { proofAArr: V, proofBArr: R, proofCArr: k, publicInputsArr: r } = await mt(
+        }, y = st([v])[0][0], x = Array.from(X.utils.arrayify(y)), { proofAArr: V, proofBArr: B, proofCArr: k, publicInputsArr: r } = await mt(
           t.generateProofRemotely,
           u,
           t.merkleTreeHinkalByChain[o],
           t.merkleTreeAccessTokenByChain[o],
           t.userKeys,
           g,
-          [n],
+          [i],
           [T],
           [v],
           O,
@@ -185,7 +187,7 @@ const pt = async (t, o, y, l, d, w) => {
           !1
         ), a = {
           recipient: P,
-          mint: n === B ? void 0 : n
+          mint: i === R ? void 0 : i
         };
         return {
           relayAddress: f,
@@ -193,7 +195,7 @@ const pt = async (t, o, y, l, d, w) => {
           chainId: o,
           args: {
             proofAArr: V,
-            proofBArr: R,
+            proofBArr: B,
             proofCArr: k,
             publicInputsArr: r,
             encryptedOutputs: [x],
@@ -212,12 +214,12 @@ const pt = async (t, o, y, l, d, w) => {
     w,
     s
   );
-}, Ao = async (t, o, y, l, d, w) => {
-  const s = X([o]), n = o.erc20TokenAddress, p = q(await t.getEthereumAddress()), u = w ?? await dt(s, n, [n], Y.Transact, [], 0n), g = await pt(
+}, Po = async (t, o, h, l, d, w) => {
+  const s = q([o]), i = o.erc20TokenAddress, p = Y(await t.getEthereumAddressByChain(s)), u = w ?? await dt(s, i, [i], G.Transact, [], 0n), g = await pt(
     t,
     s,
     o,
-    y,
+    h,
     l,
     u
   );
@@ -232,5 +234,5 @@ const pt = async (t, o, y, l, d, w) => {
   );
 };
 export {
-  Ao as hinkalSolanaDepositAndWithdraw
+  Po as hinkalSolanaDepositAndWithdraw
 };

package/data-structures/Hinkal/hinkalSolanaProxySend.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@solana/web3.js"),P=require("../../constants/chains.constants.cjs"),y=require("../../functions/pre-transaction/sendV0Transaction.cjs"),f=require("../../functions/pre-transaction/solanaTransfer.utils.cjs"),h=require("../crypto-keys/keys.cjs"),g=require("../../functions/utils/create-provider.cjs"),w=require("../../functions/utils/token-check.utils.cjs"),S=async(e,a,r,o)=>{const n=w.validateAndGetChainId([e]),t=h.UserKeys.getSignerAddressFromPrivateKey(n,r.privateKey),{fetchRpcUrl:s}=P.networkRegistry[n];if(!s)throw new Error("RPC URL not found for the specified chain ID");const i=g.createCustomSolanaConnection(s),c=new u.PublicKey(t),{instructions:d,programId:l}=await f.buildSolanaTransferInstructions(i,c,new u.PublicKey(o),e,a);return{connection:i,chainId:n,senderAddress:t,senderPublickey:c,programId:l,instructions:d}},b=async(e,a,r,o,n=!1)=>{if(n)throw new Error("onlyGasEstimate is not supported for Solana proxy send");const{connection:t,chainId:s,senderAddress:i,senderPublickey:c,programId:d,instructions:l}=await S(e,a,r,o);return y.sendProxyV0Transaction({connection:t,chainId:s,subAccount:r,payerPublicKey:c,instructions:l,convertParams:{fromAddress:i,toAddress:o,programAddress:d.toString()}})},p=async(e,a,r,o)=>{const{connection:n,senderPublickey:t,instructions:s}=await S(e,a,r,o);return y.serializeProxyV0Transaction(n,t,s)};exports.getSolanaProxySendSerializedTransaction=p;exports.hinkalSolanaProxySend=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@solana/web3.js"),P=require("../../constants/chains.constants.cjs"),y=require("../../functions/pre-transaction/sendV0Transaction.cjs"),b=require("../../functions/pre-transaction/solanaTransfer.utils.cjs"),f=require("../../functions/utils/create-provider.cjs"),h=require("../../functions/utils/token-check.utils.cjs"),w=require("../AccountActions/AccountActions.cjs"),S=async(r,a,o,t)=>{const n=h.validateAndGetChainId([r]),e=w.AccountActions.getAddressFromSubAccount(n,o);if(!e)throw Error("Public account address is not available");const{fetchRpcUrl:s}=P.networkRegistry[n];if(!s)throw new Error("RPC URL not found for the specified chain ID");const i=f.createCustomSolanaConnection(s),c=new u.PublicKey(e),{instructions:d,programId:l}=await b.buildSolanaTransferInstructions(i,c,new u.PublicKey(t),r,a);return{connection:i,chainId:n,senderAddress:e,senderPublickey:c,programId:l,instructions:d}},g=async(r,a,o,t,n=!1)=>{if(n)throw new Error("onlyGasEstimate is not supported for Solana proxy send");const{connection:e,chainId:s,senderAddress:i,senderPublickey:c,programId:d,instructions:l}=await S(r,a,o,t);return y.sendProxyV0Transaction({connection:e,chainId:s,subAccount:o,payerPublicKey:c,instructions:l,convertParams:{fromAddress:i,toAddress:t,programAddress:d.toString()}})},A=async(r,a,o,t)=>{const{connection:n,senderPublickey:e,instructions:s}=await S(r,a,o,t);return y.serializeProxyV0Transaction(n,e,s)};exports.getSolanaProxySendSerializedTransaction=A;exports.hinkalSolanaProxySend=g;