@gurge/sdk 0.3.150 → 0.3.151

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`);require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);const p=require(`./hinkalProoflessDeposit.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 "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { assertNoDuplicateStealthAddressStructures as y, buildProoflessEncryptedOutputs as b } from "./hinkalProoflessDeposit.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/solana-transact.types.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/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/speculativeUtxo.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const y=require(`./hinkalProoflessDeposit.utils.cjs`),b=require(`./hinkalSolanaTransact.cjs`);let x=require(`ethers`),S=require(`@solana/web3.js`),C=require(`@coral-xyz/anchor`);var w=(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 S.PublicKey(d),v=new S.PublicKey(u),{mintPublicKey:y}=s.formatMintAddress(o.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),C=p.getStorageVaultPublicKey(v,_),w=p.getMerkleAccountPublicKey(v,_),T=c.map(()=>f.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),m),m,n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint)),E=T.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:C,merkleAccount:w,amounts:c,mintAddressString:b,stealthAddressStructures:T,anchorStealthStructures:E,ownEncryptionKey:D}},T=async(e,t)=>{let n=y.buildProoflessEncryptedOutputs(e.stealthAddressStructures,e.amounts.map(()=>e.ownEncryptionKey)).map(e=>Buffer.from(e.slice(2),`hex`)),{current:r,next:i}=await p.resolveSolanaRootBuckets(e.program,e.merkleAccount,e.amounts.length);return e.program.methods.multiPaymentDepositAt(e.amounts.map(e=>new C.BN(e.toString())),e.anchorStealthStructures,n,!0,t?new C.BN(t):null).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,rootBucketCurrent:r,rootBucketNext:i??e.program.programId,storageVaultAta:e.atasValue})},E=async(r,i,c,l,d,f,p,h,_,y)=>{let x=c.erc20TokenAddress;if(l.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:S}=e.networkRegistry[i].contractData;if(!S)throw Error(`missing data`);let C=await r.getRandomRelay(i,!0);if(!C)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let w=a.getCurrentTimeInSeconds().toString(),T=r.generateProofRemotely?5:1,E=[];for(let e=0;e<l.length;e+=T){let n=l.slice(e,e+T),a=await Promise.all(n.map(async({recipientAddress:n,utxo:a},l)=>{let S=e+l,T={recipient:n,mint:x===`11111111111111111111111111111111`?void 0:x},E=await v.calculateModifiedFeeStructure(i,c,f[S],d),D=m.constructAdminData(p,i,[x],[f[S]],await r.getEthereumAddress()),{compressedAddress:O}=s.formatMintAddress(t.solanaNativeAddress),k=new o.Utxo({amount:0n,mintAddress:x,erc20TokenAddress:O,nullifyingKey:r.userKeys.getShieldedPrivateKey(),timeStamp:w,spendingPublicKey:r.userKeys.getSpendingKeyPair().pubSpendingBJJPoint}),{args:A,commitmentValidationData:j}=await b.hinkalSolanaTransact(r,{chainId:i,mintAddresses:[x],amountChanges:[-a.amount],relayAddress:C,recipient:n,signer:C,functionName:`transact`,accounts:T,relayerFee:E.flatFee,variableRate:E.variableRate,inputUtxos:[[a,k]],useBlockedUtxos:!0,speculative:y&&{pendingLeaves:y,inputUtxos:[[g.toSpeculativeUtxo(a)]]},submit:{mode:u.SolanaSubmitMode.ProofOnly}});return{relayAddress:C,functionName:`transact`,chainId:i,recipientAmount:f[S].toString(),args:A,accounts:T,adminData:D,commitmentValidationData:j,displayRecipient:h?.[S],destinationChainId:_?.chainId,destinationTokenAddress:_?.tokenAddress,destinationTokenAmount:_?.tokenAmounts?.[S]}}));E.push(...a)}return E},D=async(e,t,n,r,i,u,f,p,m,g,y)=>{let b=d.validateAndGetChainId([t]),S=t.erc20TokenAddress,C=c.hashEthereumAddress(await e.getEthereumAddressByChain(b)),D=m?c.hashString(m):void 0,O=u??await h.getFeeStructure(b,S,[S],l.ExternalActionId.Transact,[],25n,{mintTo:S,recipient:r[0],nullifierCount:1}),k=n.map(e=>e+v.calculateTotalFee(e,O)),A=w(e,b,t,k),j=a.getCurrentTimeInSeconds().toString(),{compressedAddress:M}=s.formatMintAddress(S),N=A.stealthAddressStructures.map((t,n)=>({recipientAddress:r[n],utxo:new o.Utxo({amount:k[n],timeStamp:j,nullifyingKey:e.userKeys.getShieldedPrivateKey(),mintAddress:S,erc20TokenAddress:M,stealthAddress:x.ethers.toBeHex(t.stealthAddress),H0:[t.H0x,t.H0y]})})),{connection:P,wallet:F}=A.program.provider,I=async()=>{let e=await(await T(A,j)).transaction();return e.recentBlockhash=(await P.getLatestBlockhash()).blockhash,e.feePayer=A.publicKey,P.sendRawTransaction((await F.signTransaction(e)).serialize())},L=N.map(({utxo:e})=>BigInt(e.getCommitment()).toString()),[R,z]=await Promise.all([I(),E(e,b,t,N,O,n,p,g,y,L)]);return{depositTxHash:R,scheduleId:await _.solanaTransactCallRelayerBatch(b,z,C,i,f,D,R)}};exports.hinkalSolanaDepositAndWithdraw=D;

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, timeStamp?: string) => 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[], txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string, displayRecipients?: string[], destination?: DestinationMetadata, pendingLeaves?: string[], dependsOnTxHash?: string) => 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>;

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

@@ -5,159 +5,141 @@ import { randomBigInt as r } from "../../functions/web3/etherFunctions.mjs";
 import { UserKeys as i } from "../crypto-keys/keys.mjs";
 import { getCurrentTimeInSeconds as a } from "../../functions/utils/time.utils.mjs";
 import { Utxo as o } from "../utxo/Utxo.mjs";
-import { ExternalActionId as s } from "../../types/external-action.types.mjs";
-import { DepositAndWithdrawPhase as c } from "../../types/scheduled-transactions.types.mjs";
-import "../../types/index.mjs";
-import { formatMintAddress as l } from "../../functions/utils/solanaMint.utils.mjs";
-import { hashEthereumAddress as u, hashString as d } from "../../functions/utils/addresses.mjs";
+import { formatMintAddress as s } from "../../functions/utils/solanaMint.utils.mjs";
+import { hashEthereumAddress as c, hashString as l } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as u } from "../../types/external-action.types.mjs";
+import { SolanaSubmitMode as d } from "../../types/solana-transact.types.mjs";
 import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
-import { calcEncryptedOutputs as p, calcStealthAddressStructure as m } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { buildAnchorStealthAddressStructure as h, getMerkleAccountPublicKey as g, getStorageAccountPublicKey as _, getStorageVaultPublicKey as v } from "../../functions/pre-transaction/solana.mjs";
+import { calcStealthAddressStructure as p } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { buildAnchorStealthAddressStructure as m, getMerkleAccountPublicKey as h, getStorageAccountPublicKey as g, getStorageVaultPublicKey as _, resolveSolanaRootBuckets as v } from "../../functions/pre-transaction/solana.mjs";
 import { constructAdminData as y } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { fetchSolanaTransaction as b } from "../../functions/pre-transaction/sendV0Transaction.mjs";
-import { getFeeStructure as x } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { waitForDepositedUtxosInMerkleTree as S } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import { getFeeStructure as b } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { toSpeculativeUtxo as x } from "../../functions/pre-transaction/speculativeUtxo.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { getOnChainUtxosFromReceiptSolana as C } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
-import { calculateModifiedFeeStructure as w, calculateTotalFee as T } from "../../functions/utils/fees.utils.mjs";
+import { solanaTransactCallRelayerBatch as S } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { calculateModifiedFeeStructure as C, calculateTotalFee as w } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/web3/index.mjs";
-import { constructSolanaZkProof as E } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayerBatch as D } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as O, updateDepositAndWithdrawStatus as k } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import "../../functions/index.mjs";
-import { ethers as A } from "ethers";
-import { PublicKey as j } from "@solana/web3.js";
-import { BN as M } from "@coral-xyz/anchor";
+import { buildProoflessEncryptedOutputs as T } from "./hinkalProoflessDeposit.utils.mjs";
+import { hinkalSolanaTransact as E } from "./hinkalSolanaTransact.mjs";
+import { ethers as D } from "ethers";
+import { PublicKey as O } from "@solana/web3.js";
+import { BN as k } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.ts
-var N = (n, a, o, s) => {
-	let { hinkalIdl: c, hinkalAddress: u, originalDeployer: d } = e[a].contractData;
-	if (!c) throw Error("No IDL configured for Solana program on this network");
+var A = (n, a, o, c) => {
+	let { hinkalIdl: l, hinkalAddress: u, originalDeployer: d } = e[a].contractData;
+	if (!l) throw Error("No IDL configured for Solana program on this network");
 	if (!d) throw Error("missing original deployer");
-	let f = n.userKeys.getShieldedPrivateKey(), p = n.getSolanaProgram(c), y = n.getSolanaPublicKey(), b = new j(d), x = new j(u), { mintPublicKey: S } = l(o.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = s.map(() => h(m(i.findCorrectRandomization(r(31), f), f, n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))), O = C === t;
+	let f = n.userKeys.getShieldedPrivateKey(), v = n.getSolanaProgram(l), y = n.getSolanaPublicKey(), b = new O(d), x = new O(u), { mintPublicKey: S } = s(o.erc20TokenAddress), C = S.toString(), w = g(x, b), T = _(x, b), E = h(x, b), D = c.map(() => p(i.findCorrectRandomization(r(31), f), f, n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint)), k = D.map((e) => m(e)), A = i.getEncryptionKeyPair(f).publicKey, j = C === t;
 	return {
-		program: p,
+		program: v,
 		publicKey: y,
 		originalDeployer: b,
-		mint: O ? null : S,
-		atasValue: O ? null : void 0,
+		mint: j ? null : S,
+		atasValue: j ? null : void 0,
 		storageAccount: w,
 		storageVault: T,
 		merkleAccount: E,
-		amounts: s,
-		anchorStealthStructures: D
+		amounts: c,
+		mintAddressString: C,
+		stealthAddressStructures: D,
+		anchorStealthStructures: k,
+		ownEncryptionKey: A
 	};
-}, P = (e) => e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new M(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
-}), F = async (e, t, n, r, i, a, o) => {
-	let s = r.map((e) => e + T(e, a)), u = N(e, t, n, s), d = (await k({
-		chainId: t,
-		hashedEthereumAddress: o,
-		phase: c.BEFORE_DEPOSIT
-	})).id ?? void 0, f = await P(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 b(u.program.provider.connection, f, "finalized");
-	if (!m) throw Error("Transaction missing");
-	await O({
-		id: d,
-		chainId: t,
-		hashedEthereumAddress: o,
-		phase: c.AFTER_DEPOSIT,
-		depositTxHash: f
+}, j = async (e, t) => {
+	let n = T(e.stealthAddressStructures, e.amounts.map(() => e.ownEncryptionKey)).map((e) => Buffer.from(e.slice(2), "hex")), { current: r, next: i } = await v(e.program, e.merkleAccount, e.amounts.length);
+	return e.program.methods.multiPaymentDepositAt(e.amounts.map((e) => new k(e.toString())), e.anchorStealthStructures, n, !0, t ? new k(t) : null).accounts({
+		mint: e.mint,
+		signer: e.publicKey,
+		signerAta: e.atasValue,
+		originalDeployer: e.originalDeployer,
+		storageAccount: e.storageAccount,
+		storageVault: e.storageVault,
+		merkleAccount: e.merkleAccount,
+		rootBucketCurrent: r,
+		rootBucketNext: i ?? e.program.programId,
+		storageVaultAta: e.atasValue
 	});
-	let { compressedAddress: h } = l(n.erc20TokenAddress), g = C(m, u.program, e.userKeys, h), _ = [], v = [...g];
-	return i.forEach((e, t) => {
-		let n = s[t], r = v.find((e) => e.amount === n);
-		if (!r) throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);
-		_.push({
-			recipientAddress: e,
-			utxo: r
-		}), v.splice(v.indexOf(r), 1);
-	}), {
-		userDepositedUtxos: _,
-		depositTxHash: f,
-		statusId: d
-	};
-}, I = async (s, u, d, f, m, h, g, _, v, b, x, S, C) => {
-	let T = d.erc20TokenAddress;
-	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let { originalDeployer: k } = e[u].contractData;
-	if (!k) throw Error("missing data");
-	let j = await s.getRandomRelay(u, !0);
-	if (!j) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let M = a().toString(), N = s.generateProofRemotely ? 5 : 1, P = [];
-	for (let e = 0; e < f.length; e += N) {
-		let n = f.slice(e, e + N), a = await Promise.all(n.map(async ({ recipientAddress: e, utxo: n }, a) => {
-			let { compressedAddress: c } = l(t), f = new o({
+}, M = async (r, i, c, l, u, f, p, m, h, g) => {
+	let _ = c.erc20TokenAddress;
+	if (l.length === 0) throw Error("userDepositedUtxos must not be empty");
+	let { originalDeployer: v } = e[i].contractData;
+	if (!v) throw Error("missing data");
+	let b = await r.getRandomRelay(i, !0);
+	if (!b) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let S = a().toString(), w = r.generateProofRemotely ? 5 : 1, T = [];
+	for (let e = 0; e < l.length; e += w) {
+		let n = l.slice(e, e + w), a = await Promise.all(n.map(async ({ recipientAddress: n, utxo: a }, l) => {
+			let v = e + l, w = {
+				recipient: n,
+				mint: _ === "11111111111111111111111111111111" ? void 0 : _
+			}, T = await C(i, c, f[v], u), D = y(p, i, [_], [f[v]], await r.getEthereumAddress()), { compressedAddress: O } = s(t), k = new o({
 				amount: 0n,
-				mintAddress: T,
-				erc20TokenAddress: c,
-				nullifyingKey: s.userKeys.getShieldedPrivateKey(),
-				timeStamp: M,
-				...n.isNewStyle ? {
-					spendingPublicKey: s.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-					isNewStyle: !0
-				} : { isNewStyle: !1 }
-			}), h = [n, f], _ = [f], v = i.findCorrectRandomization(r(31), s.userKeys.getShieldedPrivateKey()), b = {
-				tokenNumber: 1,
-				nullifierAmount: h.length,
-				outputAmount: _.length
-			}, S = p([_])[0][0], D = Array.from(A.getBytes(S)), O = await w(u, d, g[a], m), k = y(x, u, [T], [g[a]], await s.getEthereumAddress()), { proofAArr: N, proofBArr: P, proofCArr: F, publicInputsArr: I, commitmentValidationData: L } = await E(s.generateProofRemotely, s.merkleTreeHinkalByChain[u], s.userKeys, [T], [h], [_], v, O.flatFee, O.variableRate, e, j, b, [D], u), R = {
-				recipient: e,
-				mint: T === "11111111111111111111111111111111" ? void 0 : T
-			};
-			return {
-				relayAddress: j,
+				mintAddress: _,
+				erc20TokenAddress: O,
+				nullifyingKey: r.userKeys.getShieldedPrivateKey(),
+				timeStamp: S,
+				spendingPublicKey: r.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+			}), { args: A, commitmentValidationData: j } = await E(r, {
+				chainId: i,
+				mintAddresses: [_],
+				amountChanges: [-a.amount],
+				relayAddress: b,
+				recipient: n,
+				signer: b,
 				functionName: "transact",
-				chainId: u,
-				recipientAmount: g[a].toString(),
-				args: {
-					proofAArr: N,
-					proofBArr: P,
-					proofCArr: F,
-					publicInputsArr: I,
-					encryptedOutputs: [D],
-					relayerFee: O.flatFee.toString(),
-					dimensions: b
+				accounts: w,
+				relayerFee: T.flatFee,
+				variableRate: T.variableRate,
+				inputUtxos: [[a, k]],
+				useBlockedUtxos: !0,
+				speculative: g && {
+					pendingLeaves: g,
+					inputUtxos: [[x(a)]]
 				},
-				accounts: R,
-				adminData: k,
-				commitmentValidationData: L,
-				displayRecipient: C?.[a]
+				submit: { mode: d.ProofOnly }
+			});
+			return {
+				relayAddress: b,
+				functionName: "transact",
+				chainId: i,
+				recipientAmount: f[v].toString(),
+				args: A,
+				accounts: w,
+				adminData: D,
+				commitmentValidationData: j,
+				displayRecipient: m?.[v],
+				destinationChainId: h?.chainId,
+				destinationTokenAddress: h?.tokenAddress,
+				destinationTokenAmount: h?.tokenAmounts?.[v]
 			};
 		}));
-		P.push(...a);
+		T.push(...a);
 	}
-	await O({
-		id: _,
-		chainId: u,
-		hashedEthereumAddress: h,
-		phase: c.BEFORE_SCHEDULE_WITHDRAW
-	});
-	let F = await D(u, P, h, v, b, S);
-	return await O({
-		id: _,
-		chainId: u,
-		hashedEthereumAddress: h,
-		phase: c.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: F
-	}), F;
-}, L = async (e, t, n, r, i, a, o, c, l, p) => {
-	let m = f([t]), h = t.erc20TokenAddress, g = u(await e.getEthereumAddressByChain(m)), _ = l ? d(l) : void 0, v = a ?? await x(m, h, [h], s.Transact, [], 5n), { userDepositedUtxos: y, depositTxHash: b, statusId: C } = await F(e, m, t, n, r, v, g);
-	return await S(e, m, y), {
-		depositTxHash: b,
-		scheduleId: await I(e, m, t, y, v, g, n, C, i, o, c, _, p)
+	return T;
+}, N = async (e, t, n, r, i, d, p, m, h, g, _) => {
+	let v = f([t]), y = t.erc20TokenAddress, x = c(await e.getEthereumAddressByChain(v)), C = h ? l(h) : void 0, T = d ?? await b(v, y, [y], u.Transact, [], 25n, {
+		mintTo: y,
+		recipient: r[0],
+		nullifierCount: 1
+	}), E = n.map((e) => e + w(e, T)), O = A(e, v, t, E), k = a().toString(), { compressedAddress: N } = s(y), P = O.stealthAddressStructures.map((t, n) => ({
+		recipientAddress: r[n],
+		utxo: new o({
+			amount: E[n],
+			timeStamp: k,
+			nullifyingKey: e.userKeys.getShieldedPrivateKey(),
+			mintAddress: y,
+			erc20TokenAddress: N,
+			stealthAddress: D.toBeHex(t.stealthAddress),
+			H0: [t.H0x, t.H0y]
+		})
+	})), { connection: F, wallet: I } = O.program.provider, L = async () => {
+		let e = await (await j(O, k)).transaction();
+		return e.recentBlockhash = (await F.getLatestBlockhash()).blockhash, e.feePayer = O.publicKey, F.sendRawTransaction((await I.signTransaction(e)).serialize());
+	}, R = P.map(({ utxo: e }) => BigInt(e.getCommitment()).toString()), [z, B] = await Promise.all([L(), M(e, v, t, P, T, n, m, g, _, R)]);
+	return {
+		depositTxHash: z,
+		scheduleId: await S(v, B, x, i, p, C, z)
 	};
 };
 //#endregion
-export { L as hinkalSolanaDepositAndWithdraw };
+export { N as hinkalSolanaDepositAndWithdraw };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/token-check.utils.cjs`),n=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),r=require(`./hinkalSolanaDeposit.cjs`);var i=async(i,a,o,s,c,l=!1)=>{if(a.length===0)throw Error(`erc20Tokens must not be empty`);if(a.length!==o.length)throw Error(`erc20Tokens and amountChanges length mismatch`);if(!e.isSolanaLike(t.validateAndGetChainId(a)))throw Error(`hinkalSolanaProoflessDepositHash: non-Solana chain`);let u=a[0];if(!a.every(e=>e.erc20TokenAddress===u.erc20TokenAddress))throw Error(`Solana prooflessDeposit supports one mint per transaction`);if(s&&s.length!==o.length)throw Error(`Stealth address structures length mismatch`);return r.submitSolanaProoflessDeposit(i,u,o,s??o.map(()=>n.getStealthAddressStructureFromUserKeys(i.userKeys)),c,l)};exports.hinkalSolanaProoflessDeposit=i;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/addresses.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),i=require(`./hinkalSolanaDeposit.cjs`);var a=async(a,o,s,c,l,u=!1,d,f=!1)=>{if(o.length===0)throw Error(`erc20Tokens must not be empty`);if(o.length!==s.length)throw Error(`erc20Tokens and amountChanges length mismatch`);if(!e.isSolanaLike(n.validateAndGetChainId(o)))throw Error(`hinkalSolanaProoflessDepositHash: non-Solana chain`);let p=o[0];if(!o.every(e=>e.erc20TokenAddress===p.erc20TokenAddress))throw Error(`Solana prooflessDeposit supports one mint per transaction`);if(c&&c.length!==s.length)throw Error(`Stealth address structures length mismatch`);if(l&&l.length!==s.length)throw Error(`Recipient encryption keys length mismatch`);if(c&&!l)throw Error(`recipientEncryptionKeysOverride is required when stealthAddressStructuresOverride is provided`);let m=r.getRecipientInfoFromUserKeys(a.userKeys);return i.submitSolanaProoflessDeposit(a,p,s,c??s.map(()=>t.constructStealthAddressStructure(m)),l??s.map(()=>t.getEncryptionKeyFromRecipientInfo(m)),u,d,f)};exports.hinkalSolanaProoflessDeposit=a;

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

@@ -2,4 +2,4 @@ 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 hinkalSolanaProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean) => Promise<string>;
+export declare const hinkalSolanaProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], recipientEncryptionKeysOverride?: string[], createBlockedUtxos?: boolean, action?: AdminTransactionType, returnTxData?: boolean) => Promise<string>;

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

@@ -1,16 +1,20 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
-import { validateAndGetChainId as t } from "../../functions/utils/token-check.utils.mjs";
-import { getStealthAddressStructureFromUserKeys as n } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
-import { submitSolanaProoflessDeposit as r } from "./hinkalSolanaDeposit.mjs";
+import { constructStealthAddressStructure as t, getEncryptionKeyFromRecipientInfo as n } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as r } from "../../functions/utils/token-check.utils.mjs";
+import { getRecipientInfoFromUserKeys as i } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+import { submitSolanaProoflessDeposit as a } from "./hinkalSolanaDeposit.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProoflessDeposit.ts
-var i = async (i, a, o, s, c, l = !1) => {
-	if (a.length === 0) throw Error("erc20Tokens must not be empty");
-	if (a.length !== o.length) throw Error("erc20Tokens and amountChanges length mismatch");
-	if (!e(t(a))) throw Error("hinkalSolanaProoflessDepositHash: non-Solana chain");
-	let u = a[0];
-	if (!a.every((e) => e.erc20TokenAddress === u.erc20TokenAddress)) throw Error("Solana prooflessDeposit supports one mint per transaction");
-	if (s && s.length !== o.length) throw Error("Stealth address structures length mismatch");
-	return r(i, u, o, s ?? o.map(() => n(i.userKeys)), c, l);
+var o = async (o, s, c, l, u, d = !1, f, p = !1) => {
+	if (s.length === 0) throw Error("erc20Tokens must not be empty");
+	if (s.length !== c.length) throw Error("erc20Tokens and amountChanges length mismatch");
+	if (!e(r(s))) throw Error("hinkalSolanaProoflessDepositHash: non-Solana chain");
+	let m = s[0];
+	if (!s.every((e) => e.erc20TokenAddress === m.erc20TokenAddress)) throw Error("Solana prooflessDeposit supports one mint per transaction");
+	if (l && l.length !== c.length) throw Error("Stealth address structures length mismatch");
+	if (u && u.length !== c.length) throw Error("Recipient encryption keys length mismatch");
+	if (l && !u) throw Error("recipientEncryptionKeysOverride is required when stealthAddressStructuresOverride is provided");
+	let h = i(o.userKeys);
+	return a(o, m, c, l ?? c.map(() => t(h)), u ?? c.map(() => n(h)), d, f, p);
 };
 //#endregion
-export { i as hinkalSolanaProoflessDeposit };
+export { o as hinkalSolanaProoflessDeposit };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/token-check.utils.cjs`),n=require(`../../functions/pre-transaction/constructAdminData.cjs`),r=require(`../../functions/utils/create-provider.cjs`),i=require(`../AccountActions/AccountActions.cjs`),a=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),o=require(`../../API/admin-calls.cjs`),s=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let c=require(`@solana/web3.js`);var l=async(n,a,o,l)=>{let u=t.validateAndGetChainId([n]),d=i.AccountActions.getAddressFromSubAccount(u,o);if(!d)throw Error(`Public account address is not available`);let{fetchRpcUrl:f}=e.networkRegistry[u];if(!f)throw Error(`RPC URL not found for the specified chain ID`);let p=r.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),n,a);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,t,r,i,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(t,r,i,s),e.getEthereumAddress()]),h=await a.sendProxyV0Transaction({connection:u,chainId:d,subAccount:i,payerPublicKey:f,instructions:p});return o.emitTxPublicData(n.constructAdminData(c,d,[t.erc20TokenAddress],[r],m)),h};exports.hinkalSolanaProxySend=u;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/token-check.utils.cjs`),n=require(`../../functions/pre-transaction/constructAdminData.cjs`),r=require(`../../functions/utils/create-provider.cjs`),i=require(`../AccountActions/AccountActions.cjs`),a=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),o=require(`../../API/admin-calls.cjs`),s=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let c=require(`@solana/web3.js`);var l=async(n,a,o,l)=>{let u=t.validateAndGetChainId([n]),d=i.AccountActions.getAddressFromSubAccount(u,o);if(!d)throw Error(`Public account address is not available`);let{rpcUrl:f}=e.networkRegistry[u],p=r.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),n,a);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,t,r,i,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(t,r,i,s),e.getEthereumAddress()]),h=await a.sendProxyV0Transaction({connection:u,chainId:d,subAccount:i,payerPublicKey:f,instructions:p});return o.emitTxPublicData(n.constructAdminData(c,d,[t.erc20TokenAddress],[r],m)),h};exports.hinkalSolanaProxySend=u;