@hinkal/common 0.3.1 → 0.3.3

package/common/src/data-structures/Hinkal/hinkalSolanaClaimUtxo.mjs

@@ -8,70 +8,89 @@ import { Utxo as s } from "../utxo/Utxo.mjs";
 import { ExternalActionId as c } from "../../types/external-action.types.mjs";
 import "../../types/index.mjs";
 import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
-import { calcEncryptedOutputs as u } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { getFeeStructure as d } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { constructSolanaZkProof as f } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { finalizeSolanaTxEnclaveCallRelay as u, prepareSolanaTxEnclaveCall as d } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { solanaTransactCallRelayer as p } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as m } from "ethers";
+import { constructSolanaZkProof as m } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaClaimUtxo.ts
-var h = async (h, g, _, v, y) => {
-	let b = l([g]), x = g.erc20TokenAddress;
-	if (_.getTokenAddress(b) !== x) throw Error("Off-chain UTXO token mismatch");
-	let S = y ? new a(y) : new a(_.nullifyingKey, _.nullifyingKey);
-	if (!_.nullifyingKey && !y) throw Error("Claimable UTXO nullifyingKey is missing");
-	let C = S.getShieldedPrivateKey();
-	if (_.nullifyingKey && _.nullifyingKey !== C) throw Error("Claimable UTXO key mismatch");
-	let { originalDeployer: w } = e[b].contractData;
-	if (!w) throw Error("missing data");
-	let T = s.createFrom(_, { nullifyingKey: C }), E = v ?? await d(b, x, [x], c.Transact, void 0, void 0, {
-		mintTo: x,
-		nullifierCount: 1
+var h = async (e, t, r, i, a, o, s, c, l, f, p) => {
+	let { jobId: m, signedMessageHash: h } = await d(e, {
+		chainId: t,
+		mintAddresses: [r],
+		amountChanges: i,
+		relayAddress: a,
+		recipient: n,
+		signer: a,
+		functionName: "transfer",
+		accounts: o,
+		relayerFee: l,
+		variableRate: 0n,
+		hinkalInstructions: [],
+		remainingAccounts: [],
+		recipientAddress: s,
+		recipientAmounts: [c],
+		inputCommitments: [p]
+	}, f), { R8: g, S: _ } = f.signEddsa(BigInt(h));
+	return u(m, {
+		R8: g,
+		S: _
+	}, t);
+}, g = async (u, d, g, _, v) => {
+	let y = l([d]), b = d.erc20TokenAddress;
+	if (g.getTokenAddress(y) !== b) throw Error("Off-chain UTXO token mismatch");
+	let x = v ? new a(v) : new a(g.nullifyingKey, g.nullifyingKey);
+	if (!g.nullifyingKey && !v) throw Error("Claimable UTXO nullifyingKey is missing");
+	let S = x.getShieldedPrivateKey();
+	if (g.nullifyingKey && g.nullifyingKey !== S) throw Error("Claimable UTXO key mismatch");
+	let { originalDeployer: C } = e[y].contractData;
+	if (!C) throw Error("missing data");
+	let w = s.createFrom(g, { nullifyingKey: S }), T = _ ?? await f(y, b, [b], c.Transact, void 0, void 0, {
+		mintTo: b,
+		nullifierCount: 1,
+		rootInsertCount: 2
 	});
-	if (E.feeToken !== x) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
-	let D = E.variableRate > 0n ? E.variableRate : t;
-	if (T.amount <= E.flatFee) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let O = T.amount - E.flatFee, k = O * D / 10000n, A = O - k;
-	if (A <= 0n) throw Error(r.RECIPIENT_AMOUNT_INVALID);
-	let j = E.flatFee + k, [M, N, P, , F] = h.getRecipientInfo().split(",");
+	if (T.feeToken !== b) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
+	let E = T.variableRate > 0n ? T.variableRate : t;
+	if (w.amount <= T.flatFee) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let D = w.amount - T.flatFee, O = D * E / 10000n, k = D - O;
+	if (k <= 0n) throw Error(r.RECIPIENT_AMOUNT_INVALID);
+	let A = T.flatFee + O, j = u.getRecipientInfo(), [M, N, P, , , F] = j.split(",");
 	if (!N || !P || !M || !F) throw Error("Invalid recipient info");
 	let I = o().toString(), L = new s({
 		amount: 0n,
-		erc20TokenAddress: T.erc20TokenAddress,
-		mintAddress: T.mintAddress,
-		nullifyingKey: S.getShieldedPrivateKey(),
-		...T.isNewStyle ? {
-			spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint,
-			isNewStyle: !0
-		} : { isNewStyle: !1 }
+		erc20TokenAddress: w.erc20TokenAddress,
+		mintAddress: w.mintAddress,
+		nullifyingKey: x.getShieldedPrivateKey(),
+		spendingPublicKey: x.getSpendingKeyPair().pubSpendingBJJPoint
 	}), R = new s({
 		amount: 0n,
-		erc20TokenAddress: T.erc20TokenAddress,
-		mintAddress: T.mintAddress,
-		nullifyingKey: S.getShieldedPrivateKey(),
+		erc20TokenAddress: w.erc20TokenAddress,
+		mintAddress: w.mintAddress,
+		nullifyingKey: x.getShieldedPrivateKey(),
 		timeStamp: I,
-		spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
+		spendingPublicKey: x.getSpendingKeyPair().pubSpendingBJJPoint
 	}), z = new s({
-		amount: A,
-		erc20TokenAddress: T.erc20TokenAddress,
-		mintAddress: T.mintAddress,
+		amount: k,
+		erc20TokenAddress: w.erc20TokenAddress,
+		mintAddress: w.mintAddress,
 		timeStamp: I,
 		H0: [BigInt(N), BigInt(P)],
 		stealthAddress: M,
-		encryptionKey: F,
-		isNewStyle: !0
-	}), B = [T, L], V = [R, z], H = await h.getRandomRelay(b, !0);
+		encryptionKey: F
+	}), B = [w, L], V = [R, z], H = await u.getRandomRelay(y, !0);
 	if (!H) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let U = a.findCorrectRandomization(i(31), S.getShieldedPrivateKey()), W = {
+	let U = {
+		recipient: H,
+		mint: b === "11111111111111111111111111111111" ? void 0 : b
+	};
+	if (u.generateProofRemotely) return h(u, y, b, [-(k + A)], H, U, j, k, A, x, w.getCommitment());
+	let W = a.findCorrectRandomization(i(31), x.getShieldedPrivateKey()), G = {
 		tokenNumber: 1,
 		nullifierAmount: B.length,
 		outputAmount: V.length
-	}, G = u([V])[0].map((e) => Array.from(m.getBytes(e))), { proofAArr: K, proofBArr: q, proofCArr: J, publicInputsArr: Y, commitmentValidationData: X } = await f(h.generateProofRemotely, h.merkleTreeHinkalByChain[b], S, [x], [B], [V], U, j, 0n, n, H, W, G, b), Z = {
-		recipient: H,
-		mint: x === "11111111111111111111111111111111" ? void 0 : x
-	};
+	}, { proofAArr: K, proofBArr: q, proofCArr: J, publicInputsArr: Y, commitmentValidationData: X, rootHashHinkalIndex: Z, encryptedOutputs: Q } = await m(u.merkleTreeHinkalByChain[y], x, [b], [B], [V], W, A, 0n, n, H, G, void 0, y);
 	return p({
-		chainId: b,
+		chainId: y,
 		relayAddress: H,
 		functionName: "transfer",
 		args: {
@@ -79,13 +98,14 @@ var h = async (h, g, _, v, y) => {
 			proofBArr: q,
 			proofCArr: J,
 			publicInputsArr: Y,
-			encryptedOutputs: G,
-			relayerFee: j.toString(),
-			dimensions: W
+			encryptedOutputs: Q,
+			relayerFee: A.toString(),
+			dimensions: G,
+			rootHashIndex: Z.toString()
 		},
-		accounts: Z,
+		accounts: U,
 		commitmentValidationData: X
 	});
 };
 //#endregion
-export { h as hinkalSolanaClaimUtxo };
+export { g as hinkalSolanaClaimUtxo };

package/common/src/data-structures/Hinkal/hinkalSolanaDeposit.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/solanaMint.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/snarkjs/common.snarkjs.cjs`),l=require(`../../functions/pre-transaction/solana.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../error-handling/retrySolanaError.cjs`),f=require(`../../API/admin-calls.cjs`),p=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`),m=require(`./hinkalProoflessDeposit.utils.cjs`);let h=require(`@solana/web3.js`),g=require(`@coral-xyz/anchor`);var _=(n,r)=>{let i=s.validateAndGetChainId([r]),o=r.erc20TokenAddress,{hinkalIdl:c,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[i].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let f=n.getSolanaProgram(c),p=n.getSolanaPublicKey(),{connection:m,wallet:g}=f.provider;if(!g)throw Error(`missing solana wallet`);let _=new h.PublicKey(d),v=new h.PublicKey(u),{mintPublicKey:y}=a.formatMintAddress(o),b=y.toString()===t.solanaNativeAddress;return{chainId:i,mintAddress:o,program:f,publicKey:p,connection:m,wallet:g,originalDeployer:_,mintPublicKey:y,mint:b?null:y,atasValue:b?null:void 0,storageAccount:l.getStorageAccountPublicKey(v,_),storageVault:l.getStorageVaultPublicKey(v,_),merkleAccount:l.getMerkleAccountPublicKey(v,_)}},v=(e,t,n)=>{let r=n.map(e=>l.buildAnchorStealthAddressStructure(e));return e.program.methods.multiPaymentDeposit(t.map(e=>new g.BN(e.toString())),r,!1).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}).instruction()},y=async(e,t,n,r)=>{for(let i=0;i<10;i+=1){let a=i===9;try{let{blockhash:i,lastValidBlockHeight:a}=await e.getLatestBlockhash(),o=new h.VersionedTransaction(new h.TransactionMessage({payerKey:n,recentBlockhash:i,instructions:r}).compileToV0Message()),s=await t.signTransaction(o),c=await e.sendTransaction(s);return await e.confirmTransaction({signature:c,blockhash:i,lastValidBlockHeight:a},`confirmed`),c}catch(e){if(d.shouldRetryForSolanaError(e)&&!a)continue;throw e}}return``},b=(e,t)=>{if(e.length===0)throw Error(`amounts must not be empty`);if(e.length!==t.length)throw Error(`amounts and stealthAddressStructures length mismatch`);if(e.some(e=>e<=0n))throw Error(`all amounts must be positive`);m.assertNoDuplicateStealthAddressStructures(t)},x=async(e,t,n,r,i,a=!1)=>{b(n,r);let o=_(e,t),s=u.constructAdminData(i,o.chainId,Array(n.length).fill(o.mintAddress),n,await e.getEthereumAddress()),c=await v(o,n,r);if(a){let{blockhash:e}=await o.connection.getLatestBlockhash(),t=new h.Transaction().add(c);return t.recentBlockhash=e,t.feePayer=o.publicKey,Buffer.from(t.serialize({requireAllSignatures:!1})).toString(`base64`)}let l=await y(o.connection,o.wallet,o.publicKey,[c]);return await f.emitTxPublicData(s),l},S=async(e,t,n,r,i,a)=>{b(n,r);let o=_(e,t),s=await e.getRandomRelay(o.chainId,!1);if(!s)throw Error(`No relay available for chainId ${o.chainId}`);let{instructions:c}=await p.buildSolanaTransferInstructions(o.connection,o.publicKey,new h.PublicKey(s),t,i),l=await v(o,n,r),d=u.constructAdminData(a,o.chainId,Array(n.length).fill(o.mintAddress),n,await e.getEthereumAddress()),m=await y(o.connection,o.wallet,o.publicKey,[...c,l]);return await f.emitTxPublicData(d),m},C=async(e,t,n,a=!1)=>{let o=e.userKeys.getShieldedPrivateKey(),s=c.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),o),o,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint);return x(e,n,[t],[s],void 0,a)},w=async(e,t,r,i,a=!1,s)=>{if(!o.isValidPrivateAddress(i))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let c=o.constructStealthAddressStructure(i);return x(e,r,[t],[c],s,a)};exports.hinkalSolanaDeposit=C,exports.hinkalSolanaDepositForOther=w,exports.hinkalSolanaProoflessDepositWithPublicFee=S,exports.submitSolanaProoflessDeposit=x;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/solanaMint.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/snarkjs/common.snarkjs.cjs`),l=require(`../../functions/pre-transaction/solana.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../error-handling/retrySolanaError.cjs`),f=require(`../../API/admin-calls.cjs`),p=require(`./hinkalProoflessDeposit.utils.cjs`);require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let m=require(`@solana/web3.js`),h=require(`@coral-xyz/anchor`);var g=(n,r)=>{let i=s.validateAndGetChainId([r]),o=r.erc20TokenAddress,{hinkalIdl:c,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[i].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let f=n.getSolanaProgram(c),p=n.getSolanaPublicKey(),{connection:h,wallet:g}=f.provider;if(!g)throw Error(`missing solana wallet`);let _=new m.PublicKey(d),v=new m.PublicKey(u),{mintPublicKey:y}=a.formatMintAddress(o),b=y.toString()===t.solanaNativeAddress;return{chainId:i,mintAddress:o,program:f,publicKey:p,connection:h,wallet:g,originalDeployer:_,mintPublicKey:y,mint:b?null:y,atasValue:b?null:void 0,storageAccount:l.getStorageAccountPublicKey(v,_),storageVault:l.getStorageVaultPublicKey(v,_),merkleAccount:l.getMerkleAccountPublicKey(v,_)}},_=async(e,t,n,r,i)=>{let a=n.map(e=>l.buildAnchorStealthAddressStructure(e)),o=p.buildProoflessEncryptedOutputs(n,r).map(e=>Buffer.from(e.slice(2),`hex`)),{current:s,next:c}=await l.resolveSolanaRootBuckets(e.program,e.merkleAccount,t.length);return e.program.methods.multiPaymentDeposit(t.map(e=>new h.BN(e.toString())),a,o,i).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,rootBucketCurrent:s,rootBucketNext:c??e.program.programId,storageVaultAta:e.atasValue}).instruction()},v=async(e,t,n,r)=>{for(let i=0;i<10;i+=1){let a=i===9;try{let{blockhash:i,lastValidBlockHeight:a}=await e.getLatestBlockhash(),o=new m.VersionedTransaction(new m.TransactionMessage({payerKey:n,recentBlockhash:i,instructions:r}).compileToV0Message()),s=await t.signTransaction(o),c=await e.sendTransaction(s);return await e.confirmTransaction({signature:c,blockhash:i,lastValidBlockHeight:a},`confirmed`),c}catch(e){if(d.shouldRetryForSolanaError(e)&&!a)continue;throw e}}return``},y=(e,t)=>{if(e.length===0)throw Error(`amounts must not be empty`);if(e.length!==t.length)throw Error(`amounts and stealthAddressStructures length mismatch`);if(e.some(e=>e<=0n))throw Error(`all amounts must be positive`);p.assertNoDuplicateStealthAddressStructures(t)},b=async(e,t,n,r,i,a=!1,o,s=!1)=>{y(n,r);let c=g(e,t),l=u.constructAdminData(o,c.chainId,Array(n.length).fill(c.mintAddress),n,await e.getEthereumAddress()),d=await _(c,n,r,i,a);if(s){let{blockhash:e}=await c.connection.getLatestBlockhash(),t=new m.Transaction().add(d);return t.recentBlockhash=e,t.feePayer=c.publicKey,Buffer.from(t.serialize({requireAllSignatures:!1})).toString(`base64`)}let p=await v(c.connection,c.wallet,c.publicKey,[d]);return await f.emitTxPublicData(l),p},x=async(e,t,n,a=!1)=>{let o=e.userKeys.getShieldedPrivateKey(),s=c.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),o),o,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint),l=i.UserKeys.getEncryptionKeyPair(o).publicKey;return b(e,n,[t],[s],[l],!1,void 0,a)},S=async(e,t,r,i,a=!1,s)=>{if(!o.isValidPrivateAddress(i))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let c=o.constructStealthAddressStructure(i),l=o.getEncryptionKeyFromRecipientInfo(i);return b(e,r,[t],[c],[l],!1,s,a)};exports.hinkalSolanaDeposit=x,exports.hinkalSolanaDepositForOther=S,exports.submitSolanaProoflessDeposit=b;

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

@@ -2,7 +2,7 @@ import { StealthAddressStructure } from '../../types/circom-data.types';
 import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const submitSolanaProoflessDeposit: (hinkal: IHinkal, token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean) => Promise<string>;
-export declare const hinkalSolanaProoflessDepositWithPublicFee: (hinkal: IHinkal, token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], feeAmount: bigint, action?: AdminTransactionType) => Promise<string>;
+export declare const submitSolanaProoflessDeposit: (hinkal: IHinkal, token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], recipientEncryptionKeys: string[], createBlockedUtxos?: boolean, action?: AdminTransactionType, returnTxData?: boolean) => Promise<string>;
+export declare const hinkalSolanaProoflessDepositWithPublicFee: (hinkal: IHinkal, token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], recipientEncryptionKeys: string[], feeAmount: bigint, createBlockedUtxos?: boolean, action?: AdminTransactionType) => Promise<string>;
 export declare const hinkalSolanaDeposit: (hinkal: IHinkal, amount: bigint, token: ERC20Token, returnTxData?: boolean) => Promise<string>;
 export declare const hinkalSolanaDepositForOther: (hinkal: IHinkal, amount: bigint, token: ERC20Token, recipientInfo: string, returnTxData?: boolean, action?: AdminTransactionType) => Promise<string>;

package/common/src/data-structures/Hinkal/hinkalSolanaDeposit.mjs

@@ -4,43 +4,43 @@ import { transactionErrorCodes as n } from "../../error-handling/error-codes.con
 import { randomBigInt as r } from "../../functions/web3/etherFunctions.mjs";
 import { UserKeys as i } from "../crypto-keys/keys.mjs";
 import { formatMintAddress as a } from "../../functions/utils/solanaMint.utils.mjs";
-import { constructStealthAddressStructure as o, isValidPrivateAddress as s } from "../../functions/utils/addresses.mjs";
-import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
-import { calcStealthAddressStructure as l } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { buildAnchorStealthAddressStructure as u, getMerkleAccountPublicKey as d, getStorageAccountPublicKey as f, getStorageVaultPublicKey as p } from "../../functions/pre-transaction/solana.mjs";
-import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { shouldRetryForSolanaError as h } from "../../error-handling/retrySolanaError.mjs";
-import { emitTxPublicData as g } from "../../API/admin-calls.mjs";
-import { buildSolanaTransferInstructions as _ } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
-import { assertNoDuplicateStealthAddressStructures as v } from "./hinkalProoflessDeposit.utils.mjs";
-import { PublicKey as y, Transaction as b, TransactionMessage as x, VersionedTransaction as S } from "@solana/web3.js";
-import { BN as C } from "@coral-xyz/anchor";
+import { constructStealthAddressStructure as o, getEncryptionKeyFromRecipientInfo as s, isValidPrivateAddress as c } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
+import { calcStealthAddressStructure as u } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { buildAnchorStealthAddressStructure as d, getMerkleAccountPublicKey as f, getStorageAccountPublicKey as p, getStorageVaultPublicKey as m, resolveSolanaRootBuckets as h } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { shouldRetryForSolanaError as _ } from "../../error-handling/retrySolanaError.mjs";
+import { emitTxPublicData as v } from "../../API/admin-calls.mjs";
+import { assertNoDuplicateStealthAddressStructures as y, buildProoflessEncryptedOutputs as b } from "./hinkalProoflessDeposit.utils.mjs";
+import "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { PublicKey as x, Transaction as S, TransactionMessage as C, VersionedTransaction as w } from "@solana/web3.js";
+import { BN as T } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDeposit.ts
-var w = (n, r) => {
-	let i = c([r]), o = r.erc20TokenAddress, { hinkalIdl: s, hinkalAddress: l, originalDeployer: u } = e[i].contractData;
+var E = (n, r) => {
+	let i = l([r]), o = r.erc20TokenAddress, { hinkalIdl: s, hinkalAddress: c, originalDeployer: u } = e[i].contractData;
 	if (!s) throw Error("No IDL configured for Solana program on this network");
 	if (!u) throw Error("missing original deployer");
-	let m = n.getSolanaProgram(s), h = n.getSolanaPublicKey(), { connection: g, wallet: _ } = m.provider;
+	let d = n.getSolanaProgram(s), h = n.getSolanaPublicKey(), { connection: g, wallet: _ } = d.provider;
 	if (!_) throw Error("missing solana wallet");
-	let v = new y(u), b = new y(l), { mintPublicKey: x } = a(o), S = x.toString() === t;
+	let v = new x(u), y = new x(c), { mintPublicKey: b } = a(o), S = b.toString() === t;
 	return {
 		chainId: i,
 		mintAddress: o,
-		program: m,
+		program: d,
 		publicKey: h,
 		connection: g,
 		wallet: _,
 		originalDeployer: v,
-		mintPublicKey: x,
-		mint: S ? null : x,
+		mintPublicKey: b,
+		mint: S ? null : b,
 		atasValue: S ? null : void 0,
-		storageAccount: f(b, v),
-		storageVault: p(b, v),
-		merkleAccount: d(b, v)
+		storageAccount: p(y, v),
+		storageVault: m(y, v),
+		merkleAccount: f(y, v)
 	};
-}, T = (e, t, n) => {
-	let r = n.map((e) => u(e));
-	return e.program.methods.multiPaymentDeposit(t.map((e) => new C(e.toString())), r, !1).accounts({
+}, D = async (e, t, n, r, i) => {
+	let a = n.map((e) => d(e)), o = b(n, r).map((e) => Buffer.from(e.slice(2), "hex")), { current: s, next: c } = await h(e.program, e.merkleAccount, t.length);
+	return e.program.methods.multiPaymentDeposit(t.map((e) => new T(e.toString())), a, o, i).accounts({
 		mint: e.mint,
 		signer: e.publicKey,
 		signerAta: e.atasValue,
@@ -48,13 +48,15 @@ var w = (n, r) => {
 		storageAccount: e.storageAccount,
 		storageVault: e.storageVault,
 		merkleAccount: e.merkleAccount,
+		rootBucketCurrent: s,
+		rootBucketNext: c ?? e.program.programId,
 		storageVaultAta: e.atasValue
 	}).instruction();
-}, E = async (e, t, n, r) => {
+}, O = async (e, t, n, r) => {
 	for (let i = 0; i < 10; i += 1) {
 		let a = i === 9;
 		try {
-			let { blockhash: i, lastValidBlockHeight: a } = await e.getLatestBlockhash(), o = new S(new x({
+			let { blockhash: i, lastValidBlockHeight: a } = await e.getLatestBlockhash(), o = new w(new C({
 				payerKey: n,
 				recentBlockhash: i,
 				instructions: r
@@ -65,38 +67,32 @@ var w = (n, r) => {
 				lastValidBlockHeight: a
 			}, "confirmed"), c;
 		} catch (e) {
-			if (h(e) && !a) continue;
+			if (_(e) && !a) continue;
 			throw e;
 		}
 	}
 	return "";
-}, D = (e, t) => {
+}, k = (e, t) => {
 	if (e.length === 0) throw Error("amounts must not be empty");
 	if (e.length !== t.length) throw Error("amounts and stealthAddressStructures length mismatch");
 	if (e.some((e) => e <= 0n)) throw Error("all amounts must be positive");
-	v(t);
-}, O = async (e, t, n, r, i, a = !1) => {
-	D(n, r);
-	let o = w(e, t), s = m(i, o.chainId, Array(n.length).fill(o.mintAddress), n, await e.getEthereumAddress()), c = await T(o, n, r);
-	if (a) {
-		let { blockhash: e } = await o.connection.getLatestBlockhash(), t = new b().add(c);
-		return t.recentBlockhash = e, t.feePayer = o.publicKey, Buffer.from(t.serialize({ requireAllSignatures: !1 })).toString("base64");
+	y(t);
+}, A = async (e, t, n, r, i, a = !1, o, s = !1) => {
+	k(n, r);
+	let c = E(e, t), l = g(o, c.chainId, Array(n.length).fill(c.mintAddress), n, await e.getEthereumAddress()), u = await D(c, n, r, i, a);
+	if (s) {
+		let { blockhash: e } = await c.connection.getLatestBlockhash(), t = new S().add(u);
+		return t.recentBlockhash = e, t.feePayer = c.publicKey, Buffer.from(t.serialize({ requireAllSignatures: !1 })).toString("base64");
 	}
-	let l = await E(o.connection, o.wallet, o.publicKey, [c]);
-	return await g(s), l;
-}, k = async (e, t, n, r, i, a) => {
-	D(n, r);
-	let o = w(e, t), s = await e.getRandomRelay(o.chainId, !1);
-	if (!s) throw Error(`No relay available for chainId ${o.chainId}`);
-	let { instructions: c } = await _(o.connection, o.publicKey, new y(s), t, i), l = await T(o, n, r), u = m(a, o.chainId, Array(n.length).fill(o.mintAddress), n, await e.getEthereumAddress()), d = await E(o.connection, o.wallet, o.publicKey, [...c, l]);
-	return await g(u), d;
-}, A = async (e, t, n, a = !1) => {
-	let o = e.userKeys.getShieldedPrivateKey(), s = l(i.findCorrectRandomization(r(31), o), o, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint);
-	return O(e, n, [t], [s], void 0, a);
-}, j = async (e, t, r, i, a = !1, c) => {
-	if (!s(i)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
-	let l = o(i);
-	return O(e, r, [t], [l], c, a);
+	let d = await O(c.connection, c.wallet, c.publicKey, [u]);
+	return await v(l), d;
+}, j = async (e, t, n, a = !1) => {
+	let o = e.userKeys.getShieldedPrivateKey(), s = u(i.findCorrectRandomization(r(31), o), o, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint), c = i.getEncryptionKeyPair(o).publicKey;
+	return A(e, n, [t], [s], [c], !1, void 0, a);
+}, M = async (e, t, r, i, a = !1, l) => {
+	if (!c(i)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
+	let u = o(i), d = s(i);
+	return A(e, r, [t], [u], [d], !1, l, a);
 };
 //#endregion
-export { A as hinkalSolanaDeposit, j as hinkalSolanaDepositForOther, k as hinkalSolanaProoflessDepositWithPublicFee, O as submitSolanaProoflessDeposit };
+export { j as hinkalSolanaDeposit, M as hinkalSolanaDepositForOther, A as submitSolanaProoflessDeposit };

package/common/src/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const l=require(`../../functions/utils/solanaMint.utils.cjs`),u=require(`../../functions/utils/addresses.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/solana.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),y=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const b=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),x=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),S=require(`../../API/deposit-and-withdraw-status-calls.cjs`);require(`../../functions/index.cjs`);let C=require(`ethers`),w=require(`@solana/web3.js`),T=require(`@coral-xyz/anchor`);var E=(n,a,o,s)=>{let{hinkalIdl:c,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[a].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let m=n.userKeys.getShieldedPrivateKey(),h=n.getSolanaProgram(c),g=n.getSolanaPublicKey(),_=new w.PublicKey(d),v=new w.PublicKey(u),{mintPublicKey:y}=l.formatMintAddress(o.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),S=p.getStorageVaultPublicKey(v,_),C=p.getMerkleAccountPublicKey(v,_),T=s.map(()=>p.buildAnchorStealthAddressStructure(f.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),m),m,n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))),E=b===t.solanaNativeAddress;return{program:h,publicKey:g,originalDeployer:_,mint:E?null:y,atasValue:E?null:void 0,storageAccount:x,storageVault:S,merkleAccount:C,amounts:s,anchorStealthStructures:T}},D=e=>e.program.methods.multiPaymentDeposit(e.amounts.map(e=>new T.BN(e.toString())),e.anchorStealthStructures,!0).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}),O=async(e,t,n,r,i,a,o)=>{let s=r.map(e=>e+y.calculateTotalFee(e,a)),u=E(e,t,n,s),d=(await S.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:o,phase:c.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,f=await D(u).rpc(),p=await u.program.provider.connection.getLatestBlockhash();await u.program.provider.connection.confirmTransaction({blockhash:p.blockhash,lastValidBlockHeight:p.lastValidBlockHeight,signature:f},`finalized`);let m=await h.fetchSolanaTransaction(u.program.provider.connection,f,`finalized`);if(!m)throw Error(`Transaction missing`);await S.safeUpdateDepositAndWithdrawStatus({id:d,chainId:t,hashedEthereumAddress:o,phase:c.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:f});let{compressedAddress:g}=l.formatMintAddress(n.erc20TokenAddress),_=v.getOnChainUtxosFromReceiptSolana(m,u.program,e.userKeys,g),b=[],x=[..._];return i.forEach((e,t)=>{let n=s[t],r=x.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);b.push({recipientAddress:e,utxo:r}),x.splice(x.indexOf(r),1)}),{userDepositedUtxos:b,depositTxHash:f,statusId:d}},k=async(s,u,d,p,h,g,_,v,w,T,E,D,O)=>{let k=d.erc20TokenAddress;if(p.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:A}=e.networkRegistry[u].contractData;if(!A)throw Error(`missing data`);let j=await s.getRandomRelay(u,!0);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=a.getCurrentTimeInSeconds().toString(),N=s.generateProofRemotely?5:1,P=[];for(let e=0;e<p.length;e+=N){let n=p.slice(e,e+N),a=await Promise.all(n.map(async({recipientAddress:e,utxo:n},a)=>{let{compressedAddress:c}=l.formatMintAddress(t.solanaNativeAddress),p=new o.Utxo({amount:0n,mintAddress:k,erc20TokenAddress:c,nullifyingKey:s.userKeys.getShieldedPrivateKey(),timeStamp:M,...n.isNewStyle?{spendingPublicKey:s.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),g=[n,p],v=[p],x=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),s.userKeys.getShieldedPrivateKey()),S={tokenNumber:1,nullifierAmount:g.length,outputAmount:v.length},w=f.calcEncryptedOutputs([v])[0][0],T=Array.from(C.ethers.getBytes(w)),D=await y.calculateModifiedFeeStructure(u,d,_[a],h),A=m.constructAdminData(E,u,[k],[_[a]],await s.getEthereumAddress()),{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,commitmentValidationData:L}=await b.constructSolanaZkProof(s.generateProofRemotely,s.merkleTreeHinkalByChain[u],s.userKeys,[k],[g],[v],x,D.flatFee,D.variableRate,e,j,S,[T],u),R={recipient:e,mint:k===`11111111111111111111111111111111`?void 0:k};return{relayAddress:j,functionName:`transact`,chainId:u,recipientAmount:_[a].toString(),args:{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,encryptedOutputs:[T],relayerFee:D.flatFee.toString(),dimensions:S},accounts:R,adminData:A,commitmentValidationData:L,displayRecipient:O?.[a]}}));P.push(...a)}await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:u,hashedEthereumAddress:g,phase:c.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let F=await x.solanaTransactCallRelayerBatch(u,P,g,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:u,hashedEthereumAddress:g,phase:c.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:F}),F},A=async(e,t,n,r,i,a,o,c,l,f)=>{let p=d.validateAndGetChainId([t]),m=t.erc20TokenAddress,h=u.hashEthereumAddress(await e.getEthereumAddressByChain(p)),v=l?u.hashString(l):void 0,y=a??await g.getFeeStructure(p,m,[m],s.ExternalActionId.Transact,[],5n),{userDepositedUtxos:b,depositTxHash:x,statusId:S}=await O(e,p,t,n,r,y,h);return await _.waitForDepositedUtxosInMerkleTree(e,p,b),{depositTxHash:x,scheduleId:await k(e,p,t,b,y,h,n,S,i,o,c,v,f)}};exports.hinkalSolanaDepositAndWithdraw=A;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../functions/utils/solanaMint.utils.cjs`),c=require(`../../functions/utils/addresses.cjs`),l=require(`../../types/external-action.types.cjs`),u=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/solana.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/snarkjs/constructTxEnclave.cjs`),g=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),_=require(`../../functions/pre-transaction/getFeeStructure.cjs`),v=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const y=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),b=require(`./hinkalProoflessDeposit.utils.cjs`),x=require(`../../API/deposit-and-withdraw-status-calls.cjs`),S=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),C=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const w=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);require(`../../functions/index.cjs`);let T=require(`@solana/web3.js`),E=require(`@coral-xyz/anchor`);var D=(n,a,o,c)=>{let{hinkalIdl:l,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[a].contractData;if(!l)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let m=n.userKeys.getShieldedPrivateKey(),h=n.getSolanaProgram(l),g=n.getSolanaPublicKey(),_=new T.PublicKey(d),v=new T.PublicKey(u),{mintPublicKey:y}=s.formatMintAddress(o.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),S=p.getStorageVaultPublicKey(v,_),C=p.getMerkleAccountPublicKey(v,_),w=c.map(()=>f.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),m),m,n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint)),E=w.map(e=>p.buildAnchorStealthAddressStructure(e)),D=i.UserKeys.getEncryptionKeyPair(m).publicKey,O=b===t.solanaNativeAddress;return{program:h,publicKey:g,originalDeployer:_,mint:O?null:y,atasValue:O?null:void 0,storageAccount:x,storageVault:S,merkleAccount:C,amounts:c,mintAddressString:b,stealthAddressStructures:w,anchorStealthStructures:E,ownEncryptionKey:D}},O=async e=>{let t=b.buildProoflessEncryptedOutputs(e.stealthAddressStructures,e.amounts.map(()=>e.ownEncryptionKey)).map(e=>Buffer.from(e.slice(2),`hex`)),{current:n,next:r}=await p.resolveSolanaRootBuckets(e.program,e.merkleAccount,e.amounts.length);return e.program.methods.multiPaymentDeposit(e.amounts.map(e=>new E.BN(e.toString())),e.anchorStealthStructures,t,!0).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,rootBucketCurrent:n,rootBucketNext:r??e.program.programId,storageVaultAta:e.atasValue})},k=async(e,t,n,r,i,a,o)=>{let c=r.map(e=>e+C.calculateTotalFee(e,a)),l=D(e,t,n,c),d=(await x.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:o,phase:u.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,f=await(await O(l)).rpc(),p=await l.program.provider.connection.getLatestBlockhash();await l.program.provider.connection.confirmTransaction({blockhash:p.blockhash,lastValidBlockHeight:p.lastValidBlockHeight,signature:f},`finalized`);let m=await g.fetchSolanaTransaction(l.program.provider.connection,f,`finalized`);if(!m)throw Error(`Transaction missing`);await x.safeUpdateDepositAndWithdrawStatus({id:d,chainId:t,hashedEthereumAddress:o,phase:u.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:f});let{compressedAddress:h}=s.formatMintAddress(n.erc20TokenAddress),_=S.getOnChainUtxosFromReceiptSolana(m,l.program,e.userKeys,h),v=[],y=[..._];return i.forEach((e,t)=>{let n=c[t],r=y.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);v.push({recipientAddress:e,utxo:r}),y.splice(y.indexOf(r),1)}),{userDepositedUtxos:v,depositTxHash:f,statusId:d}},A=async(e,t,n,r,i,a,o,s)=>{let{jobId:c,signedMessageHash:l}=await h.prepareSolanaTxEnclaveCall(e,{chainId:t,mintAddresses:[n],amountChanges:[-r.amount],relayAddress:a,recipient:i,signer:a,functionName:`transact`,accounts:o,relayerFee:s.flatFee,variableRate:s.variableRate,hinkalInstructions:[],remainingAccounts:[],inputCommitments:[r.getCommitment()],useBlockedUtxos:!0}),{R8:u,S:d}=e.userKeys.signEddsa(BigInt(l));return h.finalizeSolanaTxEnclaveCall(c,{R8:u,S:d})},j=async(c,l,d,f,p,h,g,_,v,b,S,T,E,D)=>{let O=d.erc20TokenAddress;if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:k}=e.networkRegistry[l].contractData;if(!k)throw Error(`missing data`);let j=await c.getRandomRelay(l,!0);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=a.getCurrentTimeInSeconds().toString(),N=c.generateProofRemotely,P=N?5:1,F=[];for(let e=0;e<f.length;e+=P){let n=f.slice(e,e+P),a=await Promise.all(n.map(async({recipientAddress:n,utxo:a},u)=>{let f=e+u,h={recipient:n,mint:O===`11111111111111111111111111111111`?void 0:O},_=await C.calculateModifiedFeeStructure(l,d,g[f],p),v=m.constructAdminData(S,l,[O],[g[f]],await c.getEthereumAddress());if(N){let{solanaArgs:e,commitmentValidationData:t}=await A(c,l,O,a,n,j,h,_);return{relayAddress:j,functionName:`transact`,chainId:l,recipientAmount:g[f].toString(),args:e,accounts:h,adminData:v,commitmentValidationData:t,displayRecipient:E?.[f],destinationChainId:D?.chainId,destinationTokenAddress:D?.tokenAddress,destinationTokenAmount:D?.tokenAmounts?.[f]}}let{compressedAddress:y}=s.formatMintAddress(t.solanaNativeAddress),b=new o.Utxo({amount:0n,mintAddress:O,erc20TokenAddress:y,nullifyingKey:c.userKeys.getShieldedPrivateKey(),timeStamp:M,spendingPublicKey:c.userKeys.getSpendingKeyPair().pubSpendingBJJPoint}),x=[a,b],T=[b],k=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),c.userKeys.getShieldedPrivateKey()),P={tokenNumber:1,nullifierAmount:x.length,outputAmount:T.length},{proofAArr:F,proofBArr:I,proofCArr:L,publicInputsArr:R,commitmentValidationData:z,rootHashHinkalIndex:B,encryptedOutputs:V}=await w.constructSolanaZkProof(c.merkleTreeHinkalByChain[l],c.userKeys,[O],[x],[T],k,_.flatFee,_.variableRate,n,j,P,void 0,l);return{relayAddress:j,functionName:`transact`,chainId:l,recipientAmount:g[f].toString(),args:{proofAArr:F,proofBArr:I,proofCArr:L,publicInputsArr:R,encryptedOutputs:V,relayerFee:_.flatFee.toString(),dimensions:P,rootHashIndex:B.toString()},accounts:h,adminData:v,commitmentValidationData:z,displayRecipient:E?.[f],destinationChainId:D?.chainId,destinationTokenAddress:D?.tokenAddress,destinationTokenAmount:D?.tokenAmounts?.[f]}}));F.push(...a)}await x.safeUpdateDepositAndWithdrawStatus({id:_,chainId:l,hashedEthereumAddress:h,phase:u.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let I=await y.solanaTransactCallRelayerBatch(l,F,h,v,b,T);return await x.safeUpdateDepositAndWithdrawStatus({id:_,chainId:l,hashedEthereumAddress:h,phase:u.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:I}),I},M=async(e,t,n,r,i,a,o,s,u,f,p)=>{let m=d.validateAndGetChainId([t]),h=t.erc20TokenAddress,g=c.hashEthereumAddress(await e.getEthereumAddressByChain(m)),y=u?c.hashString(u):void 0,b=a??await _.getFeeStructure(m,h,[h],l.ExternalActionId.Transact,[],5n,{mintTo:h,recipient:r[0],nullifierCount:1}),{userDepositedUtxos:x,depositTxHash:S,statusId:C}=await k(e,m,t,n,r,b,g);return await v.waitForDepositedUtxosInMerkleTree(e,m,x),{depositTxHash:S,scheduleId:await j(e,m,t,x,b,g,n,C,i,o,s,y,f,p)}};exports.hinkalSolanaDepositAndWithdraw=M;

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

@@ -1,3 +1,4 @@
+import { DestinationMetadata } from '../../types/bridging-tx.types';
 import { FeeStructure } from '../../types/hinkal.types';
 import { IHinkal } from './IHinkal';
 import { PublicKey } from '@solana/web3.js';
@@ -13,12 +14,15 @@ export declare const buildMultiPaymentDepositSetup: (hinkal: IHinkal, chainId: n
     storageVault: PublicKey;
     merkleAccount: PublicKey;
     amounts: bigint[];
+    mintAddressString: string;
+    stealthAddressStructures: import('../..').StealthAddressStructure[];
     anchorStealthStructures: import('../..').AnchorStealthAddressStructure[];
+    ownEncryptionKey: string;
 };
 export type MultiPaymentDepositSetup = ReturnType<typeof buildMultiPaymentDepositSetup>;
-export declare const buildMultiPaymentDepositBuilder: (setup: MultiPaymentDepositSetup) => import('@coral-xyz/anchor/dist/cjs/program/namespace/methods').MethodsBuilder<import('@coral-xyz/anchor').Idl, import('@coral-xyz/anchor/dist/cjs/idl').IdlInstruction & {
+export declare const buildMultiPaymentDepositBuilder: (setup: MultiPaymentDepositSetup) => Promise<import('@coral-xyz/anchor/dist/cjs/program/namespace/methods').MethodsBuilder<import('@coral-xyz/anchor').Idl, import('@coral-xyz/anchor/dist/cjs/idl').IdlInstruction & {
     name: string;
-}, import('@coral-xyz/anchor/dist/cjs/idl').IdlInstructionAccountItem>;
-export declare const hinkalSolanaWithdrawBatch: (hinkal: IHinkal, chainId: number, token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, recipientAmounts: bigint[], statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string, displayRecipients?: string[]) => Promise<string>;
+}, import('@coral-xyz/anchor/dist/cjs/idl').IdlInstructionAccountItem>>;
+export declare const hinkalSolanaWithdrawBatch: (hinkal: IHinkal, chainId: number, token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, recipientAmounts: bigint[], statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string, displayRecipients?: string[], destination?: DestinationMetadata) => 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, dashboardAccountId?: string, displayRecipients?: string[]) => Promise<DepositAndSendExtendedResult>;
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, displayRecipients?: string[], destination?: DestinationMetadata) => Promise<DepositAndSendExtendedResult>;