@hinkal/common 0.2.28 → 0.2.30

package/data-structures/Hinkal/hinkalSolanaClaimUtxo.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const j=require("ethers");require("../../types/circom-data.types.cjs");const H=require("../../types/external-action.types.cjs"),M=require("../../constants/chains.constants.cjs"),u=require("../../constants/protocol.constants.cjs"),Z=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const G=require("../../functions/utils/token-check.utils.cjs"),l=require("../../error-handling/error-codes.constants.cjs"),Y=require("../../functions/pre-transaction/getFeeStructure.cjs"),J=require("../../functions/utils/time.utils.cjs"),Q=require("../../functions/snarkjs/common.snarkjs.cjs"),W=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),$=require("../../functions/web3/etherFunctions.cjs"),ee=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),te=require("../../functions/pre-transaction/constructAdminData.cjs"),re=require("../crypto-keys/keys.cjs"),a=require("../utxo/Utxo.cjs"),ne=async(o,A,t,C,U)=>{const r=G.validateAndGetChainId([A]),n=A.erc20TokenAddress;if(t.getTokenAddress(r)!==n)throw new Error("Off-chain UTXO token mismatch");if(!t.shieldedPrivateKey)throw new Error("Claimable UTXO shieldedPrivateKey is missing");const{originalDeployer:p,hinkalIdl:y}=M.networkRegistry[r].contractData;if(!p||!y)throw new Error("missing data");const i=new re.UserKeys(void 0,t.shieldedPrivateKey),e=new a.Utxo({amount:t.amount,erc20TokenAddress:t.erc20TokenAddress,mintAddress:t.mintAddress,timeStamp:t.timeStamp,tokenId:t.tokenId,randomization:t.randomization,shieldedPrivateKey:i.getShieldedPrivateKey()}),s=C??await Y.getFeeStructure(r,n,[n],H.ExternalActionId.Transact,void 0,void 0,{mintTo:n,nullifierCount:1});if(s.feeToken!==n)throw new Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");const R=s.variableRate>0n?s.variableRate:u.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(e.amount<=s.flatFee)throw Error(l.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);const c=e.amount-s.flatFee,f=c*R/10000n,h=c-f;if(h<=0n)throw Error(l.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const T=s.flatFee+f,_=o.getRecipientInfo(),[g,k,I]=_.split(",");if(!g||!k||!I)throw new Error("Invalid recipient info");const S=J.getCurrentTimeInSeconds().toString(),q=new a.Utxo({amount:0n,erc20TokenAddress:e.erc20TokenAddress,mintAddress:e.mintAddress,tokenId:e.tokenId,shieldedPrivateKey:i.getShieldedPrivateKey()}),P=new a.Utxo({amount:0n,erc20TokenAddress:e.erc20TokenAddress,mintAddress:e.mintAddress,tokenId:e.tokenId,shieldedPrivateKey:i.getShieldedPrivateKey(),timeStamp:S}),N=new a.Utxo({amount:h,erc20TokenAddress:e.erc20TokenAddress,mintAddress:e.mintAddress,tokenId:e.tokenId,timeStamp:S,randomization:BigInt(g),stealthAddress:k,encryptionKey:I}),v=[e,q],m=[P,N],d=await o.getRandomRelay(r,!0);if(!d)throw Error(l.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const K=a.Utxo.findCorrectRandomization($.randomBigInt(31),i.getShieldedPrivateKey()),E={tokenNumber:1,nullifierAmount:v.length,outputAmount:m.length},w=Q.calcEncryptedOutputs([m])[0].map(X=>Array.from(j.ethers.getBytes(X))),O=o.getSolanaProgram(y),{proofAArr:F,proofBArr:b,proofCArr:x,publicInputsArr:B}=await W.constructSolanaZkProof(o.generateProofRemotely,p,o.merkleTreeHinkalByChain[r],o.merkleTreeAccessTokenByChain[r],i,O,[n],[v],[m],K,T,0n,u.solanaNativeAddress,d,E,w,r),D=n===u.solanaNativeAddress,z={recipient:d,mint:D?void 0:n},L={proofAArr:F,proofBArr:b,proofCArr:x,publicInputsArr:B,encryptedOutputs:w,relayerFee:T.toString(),dimensions:E},V=te.constructAdminData(U??Z.AdminTransactionType.ClaimUtxo,r,[n],[-c],await o.getEthereumAddress());return ee.solanaTransactCallRelayer({chainId:r,relayAddress:d,functionName:"transfer",args:L,accounts:z,adminData:V})};exports.hinkalSolanaClaimUtxo=ne;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../crypto-keys/keys.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/snarkjs/common.snarkjs.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),m=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let h=require(`ethers`);var g=async(g,_,v,y,b)=>{let x=l.validateAndGetChainId([_]),S=_.erc20TokenAddress;if(v.getTokenAddress(x)!==S)throw Error(`Off-chain UTXO token mismatch`);if(!v.shieldedPrivateKey)throw Error(`Claimable UTXO shieldedPrivateKey is missing`);let{originalDeployer:C,hinkalIdl:w}=t.networkRegistry[x].contractData;if(!C||!w)throw Error(`missing data`);let T=new o.UserKeys(void 0,v.shieldedPrivateKey),E=new c.Utxo({amount:v.amount,erc20TokenAddress:v.erc20TokenAddress,mintAddress:v.mintAddress,timeStamp:v.timeStamp,tokenId:v.tokenId,randomization:v.randomization,shieldedPrivateKey:T.getShieldedPrivateKey()}),D=y??await f.getFeeStructure(x,S,[S],e.ExternalActionId.Transact,void 0,void 0,{mintTo:S,nullifierCount:1});if(D.feeToken!==S)throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let O=D.variableRate>0n?D.variableRate:n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(E.amount<=D.flatFee)throw Error(i.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let k=E.amount-D.flatFee,A=k*O/10000n,j=k-A;if(j<=0n)throw Error(i.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let M=D.flatFee+A,[N,P,F]=g.getRecipientInfo().split(`,`);if(!N||!P||!F)throw Error(`Invalid recipient info`);let I=s.getCurrentTimeInSeconds().toString(),L=new c.Utxo({amount:0n,erc20TokenAddress:E.erc20TokenAddress,mintAddress:E.mintAddress,tokenId:E.tokenId,shieldedPrivateKey:T.getShieldedPrivateKey()}),R=new c.Utxo({amount:0n,erc20TokenAddress:E.erc20TokenAddress,mintAddress:E.mintAddress,tokenId:E.tokenId,shieldedPrivateKey:T.getShieldedPrivateKey(),timeStamp:I}),z=new c.Utxo({amount:j,erc20TokenAddress:E.erc20TokenAddress,mintAddress:E.mintAddress,tokenId:E.tokenId,timeStamp:I,randomization:BigInt(N),stealthAddress:P,encryptionKey:F}),B=[E,L],V=[R,z],H=await g.getRandomRelay(x,!0);if(!H)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let U=c.Utxo.findCorrectRandomization(a.randomBigInt(31),T.getShieldedPrivateKey()),W={tokenNumber:1,nullifierAmount:B.length,outputAmount:V.length},G=u.calcEncryptedOutputs([V])[0].map(e=>Array.from(h.ethers.getBytes(e))),K=g.getSolanaProgram(w),{proofAArr:q,proofBArr:J,proofCArr:Y,publicInputsArr:X}=await p.constructSolanaZkProof(g.generateProofRemotely,C,g.merkleTreeHinkalByChain[x],g.merkleTreeAccessTokenByChain[x],T,K,[S],[B],[V],U,M,0n,n.solanaNativeAddress,H,W,G,x),Z={recipient:H,mint:S===`11111111111111111111111111111111`?void 0:S};return m.solanaTransactCallRelayer({chainId:x,relayAddress:H,functionName:`transfer`,args:{proofAArr:q,proofBArr:J,proofCArr:Y,publicInputsArr:X,encryptedOutputs:G,relayerFee:M.toString(),dimensions:W},accounts:Z,adminData:d.constructAdminData(b??r.AdminTransactionType.ClaimUtxo,x,[S],[-k],await g.getEthereumAddress())})};exports.hinkalSolanaClaimUtxo=g;

package/data-structures/Hinkal/hinkalSolanaClaimUtxo.mjs

@@ -1,130 +1,94 @@
-import { ethers as H } from "ethers";
-import "../../types/circom-data.types.mjs";
-import { ExternalActionId as G } from "../../types/external-action.types.mjs";
-import { networkRegistry as M } from "../../constants/chains.constants.mjs";
-import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as Y, solanaNativeAddress as S } from "../../constants/protocol.constants.mjs";
-import { AdminTransactionType as Z } from "../../types/admin.types.mjs";
-import "../../types/activities.types.mjs";
-import { validateAndGetChainId as j } from "../../functions/utils/token-check.utils.mjs";
-import { transactionErrorCodes as p } from "../../error-handling/error-codes.constants.mjs";
-import { getFeeStructure as q } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getCurrentTimeInSeconds as J } from "../../functions/utils/time.utils.mjs";
-import { calcEncryptedOutputs as Q } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructSolanaZkProof as W } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { randomBigInt as $ } from "../../functions/web3/etherFunctions.mjs";
-import { solanaTransactCallRelayer as ee } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { constructAdminData as te } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { UserKeys as re } from "../crypto-keys/keys.mjs";
-import { Utxo as a } from "../utxo/Utxo.mjs";
-const we = async (n, l, t, R, C) => {
-  const r = j([l]), o = l.erc20TokenAddress;
-  if (t.getTokenAddress(r) !== o)
-    throw new Error("Off-chain UTXO token mismatch");
-  if (!t.shieldedPrivateKey)
-    throw new Error("Claimable UTXO shieldedPrivateKey is missing");
-  const { originalDeployer: A, hinkalIdl: f } = M[r].contractData;
-  if (!A || !f)
-    throw new Error("missing data");
-  const s = new re(void 0, t.shieldedPrivateKey), e = new a({
-    amount: t.amount,
-    erc20TokenAddress: t.erc20TokenAddress,
-    mintAddress: t.mintAddress,
-    timeStamp: t.timeStamp,
-    tokenId: t.tokenId,
-    randomization: t.randomization,
-    shieldedPrivateKey: s.getShieldedPrivateKey()
-  }), i = R ?? await q(r, o, [o], G.Transact, void 0, void 0, {
-    mintTo: o,
-    nullifierCount: 1
-  });
-  if (i.feeToken !== o)
-    throw new Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
-  const U = i.variableRate > 0n ? i.variableRate : Y;
-  if (e.amount <= i.flatFee)
-    throw Error(p.INSUFFICIENT_FUNDS_TO_TRANSACT);
-  const m = e.amount - i.flatFee, u = m * U / 10000n, y = m - u;
-  if (y <= 0n)
-    throw Error(p.RECIPIENT_AMOUNT_INVALID);
-  const I = i.flatFee + u, N = n.getRecipientInfo(), [T, g, h] = N.split(",");
-  if (!T || !g || !h)
-    throw new Error("Invalid recipient info");
-  const k = J().toString(), P = new a({
-    amount: 0n,
-    erc20TokenAddress: e.erc20TokenAddress,
-    mintAddress: e.mintAddress,
-    tokenId: e.tokenId,
-    shieldedPrivateKey: s.getShieldedPrivateKey()
-  }), K = new a({
-    amount: 0n,
-    erc20TokenAddress: e.erc20TokenAddress,
-    mintAddress: e.mintAddress,
-    tokenId: e.tokenId,
-    shieldedPrivateKey: s.getShieldedPrivateKey(),
-    timeStamp: k
-  }), O = new a({
-    amount: y,
-    erc20TokenAddress: e.erc20TokenAddress,
-    mintAddress: e.mintAddress,
-    tokenId: e.tokenId,
-    timeStamp: k,
-    randomization: BigInt(T),
-    stealthAddress: g,
-    encryptionKey: h
-  }), v = [e, P], c = [K, O], d = await n.getRandomRelay(r, !0);
-  if (!d)
-    throw Error(p.RELAYER_NOT_AVAILABLE);
-  const _ = a.findCorrectRandomization(
-    $(31),
-    s.getShieldedPrivateKey()
-  ), w = {
-    tokenNumber: 1,
-    nullifierAmount: v.length,
-    outputAmount: c.length
-  }, E = Q([c])[0].map((X) => Array.from(H.getBytes(X))), F = n.getSolanaProgram(f), { proofAArr: b, proofBArr: B, proofCArr: D, publicInputsArr: z } = await W(
-    n.generateProofRemotely,
-    A,
-    n.merkleTreeHinkalByChain[r],
-    n.merkleTreeAccessTokenByChain[r],
-    s,
-    F,
-    [o],
-    [v],
-    [c],
-    _,
-    I,
-    0n,
-    S,
-    d,
-    w,
-    E,
-    r
-  ), L = {
-    recipient: d,
-    mint: o === S ? void 0 : o
-  }, x = {
-    proofAArr: b,
-    proofBArr: B,
-    proofCArr: D,
-    publicInputsArr: z,
-    encryptedOutputs: E,
-    relayerFee: I.toString(),
-    dimensions: w
-  }, V = te(
-    C ?? Z.ClaimUtxo,
-    r,
-    [o],
-    [-m],
-    await n.getEthereumAddress()
-  );
-  return ee({
-    chainId: r,
-    relayAddress: d,
-    functionName: "transfer",
-    args: x,
-    accounts: L,
-    adminData: V
-  });
-};
-export {
-  we as hinkalSolanaClaimUtxo
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as n, solanaNativeAddress as r } from "../../constants/protocol.constants.mjs";
+import { AdminTransactionType as i } from "../../types/admin.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as o } from "../../functions/web3/etherFunctions.mjs";
+import { UserKeys as s } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as c } from "../../functions/utils/time.utils.mjs";
+import { Utxo as l } from "../utxo/Utxo.mjs";
+import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
+import { calcEncryptedOutputs as d } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { constructSolanaZkProof as m } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as h } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as g } from "ethers";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaClaimUtxo.ts
+var _ = async (_, v, y, b, x) => {
+	let S = u([v]), C = v.erc20TokenAddress;
+	if (y.getTokenAddress(S) !== C) throw Error("Off-chain UTXO token mismatch");
+	if (!y.shieldedPrivateKey) throw Error("Claimable UTXO shieldedPrivateKey is missing");
+	let { originalDeployer: w, hinkalIdl: T } = t[S].contractData;
+	if (!w || !T) throw Error("missing data");
+	let E = new s(void 0, y.shieldedPrivateKey), D = new l({
+		amount: y.amount,
+		erc20TokenAddress: y.erc20TokenAddress,
+		mintAddress: y.mintAddress,
+		timeStamp: y.timeStamp,
+		tokenId: y.tokenId,
+		randomization: y.randomization,
+		shieldedPrivateKey: E.getShieldedPrivateKey()
+	}), O = b ?? await p(S, C, [C], e.Transact, void 0, void 0, {
+		mintTo: C,
+		nullifierCount: 1
+	});
+	if (O.feeToken !== C) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
+	let k = O.variableRate > 0n ? O.variableRate : n;
+	if (D.amount <= O.flatFee) throw Error(a.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let A = D.amount - O.flatFee, j = A * k / 10000n, M = A - j;
+	if (M <= 0n) throw Error(a.RECIPIENT_AMOUNT_INVALID);
+	let N = O.flatFee + j, [P, F, I] = _.getRecipientInfo().split(",");
+	if (!P || !F || !I) throw Error("Invalid recipient info");
+	let L = c().toString(), R = new l({
+		amount: 0n,
+		erc20TokenAddress: D.erc20TokenAddress,
+		mintAddress: D.mintAddress,
+		tokenId: D.tokenId,
+		shieldedPrivateKey: E.getShieldedPrivateKey()
+	}), z = new l({
+		amount: 0n,
+		erc20TokenAddress: D.erc20TokenAddress,
+		mintAddress: D.mintAddress,
+		tokenId: D.tokenId,
+		shieldedPrivateKey: E.getShieldedPrivateKey(),
+		timeStamp: L
+	}), B = new l({
+		amount: M,
+		erc20TokenAddress: D.erc20TokenAddress,
+		mintAddress: D.mintAddress,
+		tokenId: D.tokenId,
+		timeStamp: L,
+		randomization: BigInt(P),
+		stealthAddress: F,
+		encryptionKey: I
+	}), V = [D, R], H = [z, B], U = await _.getRandomRelay(S, !0);
+	if (!U) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let W = l.findCorrectRandomization(o(31), E.getShieldedPrivateKey()), G = {
+		tokenNumber: 1,
+		nullifierAmount: V.length,
+		outputAmount: H.length
+	}, K = d([H])[0].map((e) => Array.from(g.getBytes(e))), q = _.getSolanaProgram(T), { proofAArr: J, proofBArr: Y, proofCArr: X, publicInputsArr: Z } = await m(_.generateProofRemotely, w, _.merkleTreeHinkalByChain[S], _.merkleTreeAccessTokenByChain[S], E, q, [C], [V], [H], W, N, 0n, r, U, G, K, S), Q = {
+		recipient: U,
+		mint: C === "11111111111111111111111111111111" ? void 0 : C
+	};
+	return h({
+		chainId: S,
+		relayAddress: U,
+		functionName: "transfer",
+		args: {
+			proofAArr: J,
+			proofBArr: Y,
+			proofCArr: X,
+			publicInputsArr: Z,
+			encryptedOutputs: K,
+			relayerFee: N.toString(),
+			dimensions: G
+		},
+		accounts: Q,
+		adminData: f(x ?? i.ClaimUtxo, S, [C], [-A], await _.getEthereumAddress())
+	});
 };
+//#endregion
+export { _ as hinkalSolanaClaimUtxo };

package/data-structures/Hinkal/hinkalSolanaDeposit.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const z=require("@coral-xyz/anchor"),h=require("@solana/web3.js");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");const F=require("../../constants/chains.constants.cjs"),T=require("../../constants/protocol.constants.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");require("../../constants/schedule.constants.cjs");require("../../constants/tokens.constants.cjs");const f=require("../../API/admin-calls.cjs"),c=require("../../functions/pre-transaction/solana.cjs"),j=require("../../functions/snarkjs/common.snarkjs.cjs"),K=require("../../functions/utils/addresses.cjs"),U=require("../../functions/utils/solanaMint.utils.cjs"),G=require("../../functions/utils/token-check.utils.cjs"),H=require("../../functions/web3/etherFunctions.cjs"),J=require("../../functions/web3/signAndSendSerializedTransaction.cjs"),Q=require("../../error-handling/error-codes.constants.cjs"),W=require("../utxo/Utxo.cjs"),X=require("./hinkalCheckSolanaTokenRegistry.cjs"),C=require("../../types/admin.types.cjs"),Y=require("../../functions/pre-transaction/constructAdminData.cjs"),q=async(r,o,e,n,a)=>{if(e.length===0)throw new Error("amounts must not be empty");if(e.length!==n.length)throw new Error("amounts and stealthAddressStructures length mismatch");if(e.some(t=>t<=0n))throw new Error("all amounts must be positive");const s=G.validateAndGetChainId([o]),u=o.erc20TokenAddress,{hinkalIdl:A,hinkalAddress:E,originalDeployer:S}=F.networkRegistry[s].contractData;if(!A)throw new Error("No IDL configured for Solana program on this network");if(!S)throw new Error("missing original deployer");const y=Y.constructAdminData(a,s,Array(e.length).fill(u),e,await r.getEthereumAddress()),l=r.getSolanaProgram(A),p=r.getSolanaPublicKey(),i=new h.PublicKey(S),d=new h.PublicKey(E),{mintPublicKey:g}=U.formatMintAddress(u),w=g.toString(),v=c.getStorageAccountPublicKey(d,i),I=c.getStorageVaultPublicKey(d,i),R=c.getMerkleAccountPublicKey(d,i),P=n.map(t=>c.buildAnchorStealthAddressStructure(t)),_=e.reduce((t,m)=>t+m,0n),x=await X.hinkalCheckSolanaTokenRegistry(l,new h.PublicKey(i),[u],[_]),k=e.map(t=>t.toString()),b=!1;if(x){const{serializedTransaction:t,blockhash:m,lastValidBlockHeight:O}=await L.API.generateMultiPaymentDepositLimitless({amounts:k,payer:p.toBase58(),ethereumAddress:await r.getEthereumAddressByChain(s),mint:u,stealthAddressStructures:P,chainId:s,createBlockedUtxos:b}),V=await J.signAndSendSerializedTransaction(l.provider,t,m,O);return await f.emitTxPublicData(y),V}const B=c.getTokenLimitStorageAccountPublicKey(l.programId,i,g),M=w===T.solanaNativeAddress?null:g,D=w===T.solanaNativeAddress?null:void 0,N=await l.methods.multiPaymentDeposit(k.map(t=>new z.BN(t)),P,b).accounts({mint:M,signer:p,signerAta:D,originalDeployer:i,storageAccount:v,storageVault:I,merkleAccount:R,tokenLimitStorage:B,storageVaultAta:D,accessTokenOwner:null}).rpc();return await f.emitTxPublicData(y),N},Z=async(r,o,e)=>{const n=r.userKeys.getShieldedPrivateKey(),a=W.Utxo.findCorrectRandomization(H.randomBigInt(31),n),s=j.calcStealthAddressStructure(a,n);return q(r,e,[o],[s],C.AdminTransactionType.ProoflessDeposit)},$=async(r,o,e,n)=>{if(!K.isValidPrivateAddress(n))throw Error(Q.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const a=K.constructStealthAddressStructure(n);return q(r,e,[o],[a],C.AdminTransactionType.PaymentLink)};exports.hinkalSolanaDeposit=Z;exports.hinkalSolanaDepositForOther=$;exports.submitSolanaProoflessDeposit=q;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../types/admin.types.cjs`),n=require(`../../functions/utils/addresses.cjs`),r=require(`../../API/API.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../../API/admin-calls.cjs`);require(`../../API/index.cjs`);const s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/pre-transaction/solana.cjs`),l=require(`./hinkalCheckSolanaTokenRegistry.cjs`),u=require(`../../functions/utils/solanaMint.utils.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/web3/signAndSendSerializedTransaction.cjs`);let h=require(`@solana/web3.js`),g=require(`@coral-xyz/anchor`);var _=async(t,n,i,a,s)=>{if(i.length===0)throw Error(`amounts must not be empty`);if(i.length!==a.length)throw Error(`amounts and stealthAddressStructures length mismatch`);if(i.some(e=>e<=0n))throw Error(`all amounts must be positive`);let f=d.validateAndGetChainId([n]),_=n.erc20TokenAddress,{hinkalIdl:v,hinkalAddress:y,originalDeployer:b}=e.networkRegistry[f].contractData;if(!v)throw Error(`No IDL configured for Solana program on this network`);if(!b)throw Error(`missing original deployer`);let x=p.constructAdminData(s,f,Array(i.length).fill(_),i,await t.getEthereumAddress()),S=t.getSolanaProgram(v),C=t.getSolanaPublicKey(),w=new h.PublicKey(b),T=new h.PublicKey(y),{mintPublicKey:E}=u.formatMintAddress(_),D=E.toString(),O=c.getStorageAccountPublicKey(T,w),k=c.getStorageVaultPublicKey(T,w),A=c.getMerkleAccountPublicKey(T,w),j=a.map(e=>c.buildAnchorStealthAddressStructure(e)),M=i.reduce((e,t)=>e+t,0n),N=await l.hinkalCheckSolanaTokenRegistry(S,new h.PublicKey(w),[_],[M]),P=i.map(e=>e.toString());if(N){let{serializedTransaction:e,blockhash:n,lastValidBlockHeight:i}=await r.API.generateMultiPaymentDepositLimitless({amounts:P,payer:C.toBase58(),ethereumAddress:await t.getEthereumAddressByChain(f),mint:_,stealthAddressStructures:j,chainId:f,createBlockedUtxos:!1}),a=await m.signAndSendSerializedTransaction(S.provider,e,n,i);return await o.emitTxPublicData(x),a}let F=c.getTokenLimitStorageAccountPublicKey(S.programId,w,E),I=D===`11111111111111111111111111111111`?null:E,L=D===`11111111111111111111111111111111`?null:void 0,R=await S.methods.multiPaymentDeposit(P.map(e=>new g.BN(e)),j,!1).accounts({mint:I,signer:C,signerAta:L,originalDeployer:w,storageAccount:O,storageVault:k,merkleAccount:A,tokenLimitStorage:F,storageVaultAta:L,accessTokenOwner:null}).rpc();return await o.emitTxPublicData(x),R},v=async(e,n,r)=>{let i=e.userKeys.getShieldedPrivateKey(),o=f.calcStealthAddressStructure(s.Utxo.findCorrectRandomization(a.randomBigInt(31),i),i);return _(e,r,[n],[o],t.AdminTransactionType.ProoflessDeposit)},y=async(e,r,a,o)=>{if(!n.isValidPrivateAddress(o))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let s=n.constructStealthAddressStructure(o);return _(e,a,[r],[s],t.AdminTransactionType.PaymentLink)};exports.hinkalSolanaDeposit=v,exports.hinkalSolanaDepositForOther=y,exports.submitSolanaProoflessDeposit=_;

package/data-structures/Hinkal/hinkalSolanaDeposit.mjs

@@ -1,121 +1,63 @@
-import { BN as M } from "@coral-xyz/anchor";
-import { PublicKey as u } from "@solana/web3.js";
-import "../../API/getServerURL.mjs";
-import "axios";
-import "../../constants/coingecko.constants.mjs";
-import "../../constants/server.constants.mjs";
-import "../http/HttpClient.mjs";
-import { API as O } from "../../API/API.mjs";
-import "../../API/tenderly.api.mjs";
-import "../../constants/token-data/index.mjs";
-import { networkRegistry as F } from "../../constants/chains.constants.mjs";
-import { solanaNativeAddress as b } from "../../constants/protocol.constants.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";
-import "../../constants/presale.constants.mjs";
-import "../../constants/activity.constants.mjs";
-import "../../constants/tasks.constants.mjs";
-import "../../constants/events.constants.mjs";
-import "../../constants/schedule.constants.mjs";
-import "../../constants/tokens.constants.mjs";
-import { emitTxPublicData as D } from "../../API/admin-calls.mjs";
-import { getStorageAccountPublicKey as U, getStorageVaultPublicKey as _, getMerkleAccountPublicKey as q, buildAnchorStealthAddressStructure as G, getTokenLimitStorageAccountPublicKey as H } from "../../functions/pre-transaction/solana.mjs";
-import { calcStealthAddressStructure as j } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { isValidPrivateAddress as J, constructStealthAddressStructure as Q } from "../../functions/utils/addresses.mjs";
-import { formatMintAddress as W } from "../../functions/utils/solanaMint.utils.mjs";
-import { validateAndGetChainId as X } from "../../functions/utils/token-check.utils.mjs";
-import { randomBigInt as Y } from "../../functions/web3/etherFunctions.mjs";
-import { signAndSendSerializedTransaction as Z } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
-import { transactionErrorCodes as $ } from "../../error-handling/error-codes.constants.mjs";
-import { Utxo as tt } from "../utxo/Utxo.mjs";
-import { hinkalCheckSolanaTokenRegistry as rt } from "./hinkalCheckSolanaTokenRegistry.mjs";
-import { AdminTransactionType as E } from "../../types/admin.types.mjs";
-import { constructAdminData as ot } from "../../functions/pre-transaction/constructAdminData.mjs";
-const T = async (o, i, t, e, s) => {
-  if (t.length === 0)
-    throw new Error("amounts must not be empty");
-  if (t.length !== e.length)
-    throw new Error("amounts and stealthAddressStructures length mismatch");
-  if (t.some((r) => r <= 0n))
-    throw new Error("all amounts must be positive");
-  const n = X([i]), m = i.erc20TokenAddress, { hinkalIdl: g, hinkalAddress: K, originalDeployer: h } = F[n].contractData;
-  if (!g)
-    throw new Error("No IDL configured for Solana program on this network");
-  if (!h)
-    throw new Error("missing original deployer");
-  const A = ot(
-    s,
-    n,
-    Array(t.length).fill(m),
-    t,
-    await o.getEthereumAddress()
-  ), c = o.getSolanaProgram(g), f = o.getSolanaPublicKey(), a = new u(h), l = new u(K), { mintPublicKey: d } = W(m), S = d.toString(), I = U(l, a), R = _(l, a), v = q(l, a), y = e.map((r) => G(r)), C = t.reduce((r, p) => r + p, 0n), B = await rt(
-    c,
-    new u(a),
-    [m],
-    [C]
-  ), w = t.map((r) => r.toString()), P = !1;
-  if (B) {
-    const { serializedTransaction: r, blockhash: p, lastValidBlockHeight: N } = await O.generateMultiPaymentDepositLimitless({
-      amounts: w,
-      payer: f.toBase58(),
-      ethereumAddress: await o.getEthereumAddressByChain(n),
-      mint: m,
-      stealthAddressStructures: y,
-      chainId: n,
-      createBlockedUtxos: P
-    }), z = await Z(
-      c.provider,
-      r,
-      p,
-      N
-    );
-    return await D(A), z;
-  }
-  const V = H(c.programId, a, d), x = S === b ? null : d, k = S === b ? null : void 0, L = await c.methods.multiPaymentDeposit(
-    w.map((r) => new M(r)),
-    y,
-    P
-  ).accounts({
-    mint: x,
-    signer: f,
-    signerAta: k,
-    originalDeployer: a,
-    storageAccount: I,
-    storageVault: R,
-    merkleAccount: v,
-    tokenLimitStorage: V,
-    storageVaultAta: k,
-    accessTokenOwner: null
-  }).rpc();
-  return await D(A), L;
-}, Ft = async (o, i, t) => {
-  const e = o.userKeys.getShieldedPrivateKey(), s = tt.findCorrectRandomization(Y(31), e), n = j(s, e);
-  return T(
-    o,
-    t,
-    [i],
-    [n],
-    E.ProoflessDeposit
-  );
-}, Ut = async (o, i, t, e) => {
-  if (!J(e))
-    throw Error($.RECIPIENT_FORMAT_INCORRECT);
-  const s = Q(e);
-  return T(
-    o,
-    t,
-    [i],
-    [s],
-    E.PaymentLink
-  );
-};
-export {
-  Ft as hinkalSolanaDeposit,
-  Ut as hinkalSolanaDepositForOther,
-  T as submitSolanaProoflessDeposit
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import "../../constants/protocol.constants.mjs";
+import { AdminTransactionType as t } from "../../types/admin.types.mjs";
+import { constructStealthAddressStructure as n, isValidPrivateAddress as r } from "../../functions/utils/addresses.mjs";
+import { API as i } from "../../API/API.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as o } from "../../functions/web3/etherFunctions.mjs";
+import { emitTxPublicData as s } from "../../API/admin-calls.mjs";
+import "../../API/index.mjs";
+import { Utxo as c } from "../utxo/Utxo.mjs";
+import { buildAnchorStealthAddressStructure as l, getMerkleAccountPublicKey as u, getStorageAccountPublicKey as d, getStorageVaultPublicKey as f, getTokenLimitStorageAccountPublicKey as p } from "../../functions/pre-transaction/solana.mjs";
+import { hinkalCheckSolanaTokenRegistry as m } from "./hinkalCheckSolanaTokenRegistry.mjs";
+import { formatMintAddress as h } from "../../functions/utils/solanaMint.utils.mjs";
+import { validateAndGetChainId as g } from "../../functions/utils/token-check.utils.mjs";
+import { calcStealthAddressStructure as _ } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructAdminData as v } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { signAndSendSerializedTransaction as y } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
+import { PublicKey as b } from "@solana/web3.js";
+import { BN as x } from "@coral-xyz/anchor";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDeposit.ts
+var S = async (t, n, r, a, o) => {
+	if (r.length === 0) throw Error("amounts must not be empty");
+	if (r.length !== a.length) throw Error("amounts and stealthAddressStructures length mismatch");
+	if (r.some((e) => e <= 0n)) throw Error("all amounts must be positive");
+	let c = g([n]), _ = n.erc20TokenAddress, { hinkalIdl: S, hinkalAddress: C, originalDeployer: w } = e[c].contractData;
+	if (!S) throw Error("No IDL configured for Solana program on this network");
+	if (!w) throw Error("missing original deployer");
+	let T = v(o, c, Array(r.length).fill(_), r, await t.getEthereumAddress()), E = t.getSolanaProgram(S), D = t.getSolanaPublicKey(), O = new b(w), k = new b(C), { mintPublicKey: A } = h(_), j = A.toString(), M = d(k, O), N = f(k, O), P = u(k, O), F = a.map((e) => l(e)), I = r.reduce((e, t) => e + t, 0n), L = await m(E, new b(O), [_], [I]), R = r.map((e) => e.toString());
+	if (L) {
+		let { serializedTransaction: e, blockhash: n, lastValidBlockHeight: r } = await i.generateMultiPaymentDepositLimitless({
+			amounts: R,
+			payer: D.toBase58(),
+			ethereumAddress: await t.getEthereumAddressByChain(c),
+			mint: _,
+			stealthAddressStructures: F,
+			chainId: c,
+			createBlockedUtxos: !1
+		}), a = await y(E.provider, e, n, r);
+		return await s(T), a;
+	}
+	let z = p(E.programId, O, A), B = j === "11111111111111111111111111111111" ? null : A, V = j === "11111111111111111111111111111111" ? null : void 0, H = await E.methods.multiPaymentDeposit(R.map((e) => new x(e)), F, !1).accounts({
+		mint: B,
+		signer: D,
+		signerAta: V,
+		originalDeployer: O,
+		storageAccount: M,
+		storageVault: N,
+		merkleAccount: P,
+		tokenLimitStorage: z,
+		storageVaultAta: V,
+		accessTokenOwner: null
+	}).rpc();
+	return await s(T), H;
+}, C = async (e, n, r) => {
+	let i = e.userKeys.getShieldedPrivateKey(), a = _(c.findCorrectRandomization(o(31), i), i);
+	return S(e, r, [n], [a], t.ProoflessDeposit);
+}, w = async (e, i, o, s) => {
+	if (!r(s)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
+	let c = n(s);
+	return S(e, o, [i], [c], t.PaymentLink);
 };
+//#endregion
+export { C as hinkalSolanaDeposit, w as hinkalSolanaDepositForOther, S as submitSolanaProoflessDeposit };

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

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

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

@@ -2,4 +2,5 @@ import { FeeStructure } from '../../types/hinkal.types';
 import { IHinkal } from './IHinkal';
 import { AdminTransactionType } from '../../types';
 import { ERC20Token } from '../../types/token.types';
-export declare const hinkalSolanaDepositAndWithdraw: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType) => Promise<string>;
+export declare const hinkalSolanaDepositAndWithdraw: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, // Should be passed fee for only one withdraw transaction, multiplication happening in this function
+ref?: string, action?: AdminTransactionType) => Promise<string>;