@hinkal/common 0.3.12 → 0.3.14

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

@@ -0,0 +1,5 @@
+import { ethers } from 'ethers';
+import { Types as TronWebTypes } from 'tronweb';
+import { ReceiveVaultRecord } from '../../types/receive-vault.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalReceiveVaultRecover: (hinkal: IHinkal, record: ReceiveVaultRecord, token: string, chainId: number, to: string, returnTxData?: boolean) => Promise<string | ethers.TransactionRequest | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;

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

@@ -0,0 +1,66 @@
+import { isSolanaLike as e, isTronLike as t, networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { TRON_DEFAULT_FEE_LIMIT_SUN as r } from "../../constants/protocol.constants.mjs";
+import { addressToHexFormat as i, createTronCallData as a, evmHexToTronBase58Address as o } from "../../functions/utils/tron.utils.mjs";
+import { ContractType as s } from "../../types/ethereum-network.types.mjs";
+import { getReceiveVaultFactoryAddress as c, getReceiveVaultParams as l, receiveVaultNetworkOf as u, receiveVaultParamsToTuple as d, signReceiveVaultRecovery as f } from "../../functions/utils/receive-vault.utils.mjs";
+import { hexToUtf8 as p } from "../../functions/utils/string.utils.mjs";
+import { getErrorMessage as m } from "../../error-handling/get-error.message.mjs";
+import { hinkalSolanaReceiveVaultRecover as h } from "./hinkalSolanaReceiveVault.mjs";
+import { ethers as g } from "ethers";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalReceiveVaultRecover.ts
+var _ = {
+	NothingToSettle: "These funds have already been moved out of the receive address.",
+	RecoveryExpired: "The recovery request expired before it was confirmed. Please try again.",
+	BadRecoverySignature: "This wallet cannot recover these funds. Reconnect the account that generated the address.",
+	RecoveryAlreadyUsed: "This recovery was already submitted. Please try again."
+}, v = (e) => {
+	let t = e?.revert?.name;
+	if (t && _[t]) return _[t];
+	let n = JSON.stringify(e ?? ""), r = Object.keys(_).find((e) => n.includes(g.id(`${e}()`).slice(2, 10)));
+	if (r) return _[r];
+	let i = e?.message;
+	return i && g.isHexString(`0x${i}`) ? p(i) : e?.shortMessage ?? m(e);
+}, y = async (p, m, g, _, y, b = !1) => {
+	let x = c(_);
+	if (!x) throw Error(`receive vault: no factory on chain ${_}`);
+	if (m.network !== u(_)) throw Error("receive vault: network mismatch");
+	let S = BigInt(Math.floor(Date.now() / 1e3) + 900), C = await f(p.userKeys, m, g, _, y, S);
+	if (e(_)) {
+		let e = await p.getEthereumAddressByChain(_);
+		return h(p, _, l(p.userKeys, m), g, y, S, C, e, b);
+	}
+	let w = [
+		d(l(p.userKeys, m)),
+		i(g),
+		i(y),
+		S,
+		C
+	];
+	if (t(_)) {
+		let { receiveVaultFactoryABI: e } = n[_].contractData;
+		if (!e) throw Error(`receive vault: no factory ABI on chain ${_}`);
+		let t = p.getTronWeb(), i = o(x);
+		if (b) {
+			let { transaction: n } = await t.transactionBuilder.triggerSmartContract(i, "", {
+				feeLimit: r,
+				callValue: 0,
+				input: a(e, "recover", w)
+			}, [], await p.getEthereumAddressByChain(_));
+			return n;
+		}
+		let s = t.contract(e, i);
+		try {
+			return await s.recover(...w).send({ feeLimit: r });
+		} catch (e) {
+			throw Error(v(e));
+		}
+	}
+	let T = p.getContractWithSigner(_, s.ReceiveVaultFactoryContract);
+	try {
+		return b ? T.recover.populateTransaction(...w) : (await T.recover(...w)).hash;
+	} catch (e) {
+		throw Error(v(e));
+	}
+};
+//#endregion
+export { y as hinkalReceiveVaultRecover };

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

@@ -0,0 +1 @@
+require(`../../functions/utils/tron.utils.cjs`),require(`../../functions/utils/receive-vault.utils.cjs`),require(`./hinkalTransact.cjs`);const e=require(`./hinkalProoflessDeposit.utils.cjs`);var t=(t,n)=>e.buildProoflessEncryptedOutputs([t.recipient],[n])[0];exports.buildReceiveVaultEncryptedOutput=t;

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

@@ -0,0 +1,6 @@
+import { ReceiveVaultParams } from '../../types/receive-vault.types';
+import { TransactProof } from '../../types/transact.types';
+import { IHinkal } from './IHinkal';
+export declare const buildReceiveVaultSettleProof: (hinkal: IHinkal, chainId: number, vaultAddress: string, params: ReceiveVaultParams, token: string, encryptionKey: string, depositAmount: bigint) => Promise<TransactProof>;
+/** The encrypted note the settlement deposits on behalf of whoever paid the address. */
+export declare const buildReceiveVaultEncryptedOutput: (params: ReceiveVaultParams, encryptionKey: string) => string;

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

@@ -0,0 +1,8 @@
+import "../../functions/utils/tron.utils.mjs";
+import "../../functions/utils/receive-vault.utils.mjs";
+import "./hinkalTransact.mjs";
+import { buildProoflessEncryptedOutputs as e } from "./hinkalProoflessDeposit.utils.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalReceiveVaultSettle.ts
+var t = (t, n) => e([t.recipient], [n])[0];
+//#endregion
+export { t as buildReceiveVaultEncryptedOutput };

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`);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;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../constants/fees.constants.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../crypto-keys/keys.cjs`),o=require(`../../functions/utils/solanaMint.utils.cjs`),s=require(`../../functions/utils/addresses.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/solana.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),p=require(`../../API/admin-calls.cjs`),m=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`),h=require(`./hinkalProoflessDeposit.utils.cjs`);let g=require(`@solana/web3.js`),_=require(`@coral-xyz/anchor`);var v=(n,r)=>{let i=c.validateAndGetChainId([r]),a=r.erc20TokenAddress,{hinkalIdl:s,hinkalAddress:l,originalDeployer:d}=e.networkRegistry[i].contractData;if(!s)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let f=n.getSolanaProgram(s),p=n.getSolanaPublicKey(),{connection:m,wallet:h}=f.provider;if(!h)throw Error(`missing solana wallet`);let _=new g.PublicKey(d),v=new g.PublicKey(l),{mintPublicKey:y}=o.formatMintAddress(a),b=y.toString()===t.solanaNativeAddress;return{chainId:i,mintAddress:a,program:f,publicKey:p,connection:m,wallet:h,originalDeployer:_,mintPublicKey:y,mint:b?null:y,atasValue:b?null:void 0,storageAccount:u.getStorageAccountPublicKey(v,_),storageVault:u.getStorageVaultPublicKey(v,_),merkleAccount:u.getMerkleAccountPublicKey(v,_)}},y=async(e,t,n,r,i)=>{let a=n.map(e=>u.buildAnchorStealthAddressStructure(e)),o=h.buildProoflessEncryptedOutputs(n,r).map(e=>Buffer.from(e.slice(2),`hex`)),{current:s,next:c}=await u.resolveSolanaRootBuckets(e.program,e.merkleAccount,t.length);return e.program.methods.multiPaymentDeposit(t.map(e=>new _.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()},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`);h.assertNoDuplicateStealthAddressStructures(t)},x=async(e,t,n,r,i,a=!1,o,s=!1)=>{b(n,r);let c=v(e,t),l=d.constructAdminData(o,c.chainId,Array(n.length).fill(c.mintAddress),n,await e.getEthereumAddress()),u=await y(c,n,r,i,a);if(s){let{blockhash:e}=await c.connection.getLatestBlockhash(),t=new g.Transaction().add(u);return t.recentBlockhash=e,t.feePayer=c.publicKey,Buffer.from(t.serialize({requireAllSignatures:!1})).toString(`base64`)}let m=await f.sendInstructions(c.connection,c.wallet,c.publicKey,[u]);return p.emitTxPublicData(l),m},S=async(e,t,n,r,i,a,o=!1,s,c=!1)=>{b(n,r);let l=v(e,t),u=await e.getRandomRelay(l.chainId,!1);if(!u)throw Error(`No relay available for chainId ${l.chainId}`);let{instructions:h}=await m.buildSolanaTransferInstructions(l.connection,l.publicKey,new g.PublicKey(u),t,a),_=await y(l,n,r,i,o),x=[...h,_];if(c){let{blockhash:e}=await l.connection.getLatestBlockhash(),t=new g.Transaction().add(...x);return t.recentBlockhash=e,t.feePayer=l.publicKey,Buffer.from(t.serialize({requireAllSignatures:!1})).toString(`base64`)}let S=d.constructAdminData(s,l.chainId,Array(n.length).fill(l.mintAddress),n,await e.getEthereumAddress()),C=await f.sendInstructions(l.connection,l.wallet,l.publicKey,x);return await p.emitTxPublicData(S),C},C=async(e,t,n,r=!1)=>{let o=e.userKeys.getShieldedPrivateKey(),s=l.calcStealthAddressStructure(a.UserKeys.findCorrectRandomization(i.randomBigInt(31),o),o,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint),c=a.UserKeys.getEncryptionKeyPair(o).publicKey;return x(e,n,[t],[s],[c],!1,void 0,r)},w=async(e,t,i,a,o=!1,c=0n,l)=>{if(!s.isValidPrivateAddress(a))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let u=s.constructStealthAddressStructure(a),d=s.getEncryptionKeyFromRecipientInfo(a),f=c>0n?t*c/n.BPS_DENOMINATOR:0n;return S(e,i,[t],[u],[d],f,!1,l,o)};exports.hinkalSolanaDeposit=C,exports.hinkalSolanaDepositForOther=w,exports.submitSolanaProoflessDeposit=x;

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

@@ -3,6 +3,6 @@ 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[], 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 hinkalSolanaProoflessDepositWithPublicFee: (hinkal: IHinkal, token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], recipientEncryptionKeys: string[], feeAmount: bigint, createBlockedUtxos?: boolean, action?: AdminTransactionType, returnTxData?: boolean) => 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>;
+export declare const hinkalSolanaDepositForOther: (hinkal: IHinkal, amount: bigint, token: ERC20Token, recipientInfo: string, returnTxData?: boolean, variableRate?: bigint, action?: AdminTransactionType) => Promise<string>;

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

@@ -1,45 +1,46 @@
 import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-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, 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 { BPS_DENOMINATOR as n } from "../../constants/fees.constants.mjs";
+import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
+import { UserKeys as a } from "../crypto-keys/keys.mjs";
+import { formatMintAddress as o } from "../../functions/utils/solanaMint.utils.mjs";
+import { constructStealthAddressStructure as s, getEncryptionKeyFromRecipientInfo as c, isValidPrivateAddress as l } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
+import { calcStealthAddressStructure as d } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { buildAnchorStealthAddressStructure as f, getMerkleAccountPublicKey as p, getStorageAccountPublicKey as m, getStorageVaultPublicKey as h, resolveSolanaRootBuckets as g } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as _ } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { sendInstructions as v } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { emitTxPublicData as y } from "../../API/admin-calls.mjs";
+import { buildSolanaTransferInstructions as b } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { assertNoDuplicateStealthAddressStructures as x, buildProoflessEncryptedOutputs as S } from "./hinkalProoflessDeposit.utils.mjs";
+import { PublicKey as C, Transaction 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 E = (n, r) => {
-	let i = l([r]), o = r.erc20TokenAddress, { hinkalIdl: s, hinkalAddress: c, originalDeployer: u } = e[i].contractData;
+	let i = u([r]), a = r.erc20TokenAddress, { hinkalIdl: s, hinkalAddress: c, originalDeployer: l } = e[i].contractData;
 	if (!s) throw Error("No IDL configured for Solana program on this network");
-	if (!u) throw Error("missing original deployer");
-	let d = n.getSolanaProgram(s), h = n.getSolanaPublicKey(), { connection: g, wallet: _ } = d.provider;
+	if (!l) throw Error("missing original deployer");
+	let d = n.getSolanaProgram(s), f = n.getSolanaPublicKey(), { connection: g, wallet: _ } = d.provider;
 	if (!_) throw Error("missing solana wallet");
-	let v = new x(u), y = new x(c), { mintPublicKey: b } = a(o), S = b.toString() === t;
+	let v = new C(l), y = new C(c), { mintPublicKey: b } = o(a), x = b.toString() === t;
 	return {
 		chainId: i,
-		mintAddress: o,
+		mintAddress: a,
 		program: d,
-		publicKey: h,
+		publicKey: f,
 		connection: g,
 		wallet: _,
 		originalDeployer: v,
 		mintPublicKey: b,
-		mint: S ? null : b,
-		atasValue: S ? null : void 0,
-		storageAccount: p(y, v),
-		storageVault: m(y, v),
-		merkleAccount: f(y, v)
+		mint: x ? null : b,
+		atasValue: x ? null : void 0,
+		storageAccount: m(y, v),
+		storageVault: h(y, v),
+		merkleAccount: p(y, v)
 	};
 }, 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);
+	let a = n.map((e) => f(e)), o = S(n, r).map((e) => Buffer.from(e.slice(2), "hex")), { current: s, next: c } = await g(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,
@@ -52,47 +53,38 @@ var E = (n, r) => {
 		rootBucketNext: c ?? e.program.programId,
 		storageVaultAta: e.atasValue
 	}).instruction();
-}, 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 w(new C({
-				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 (_(e) && !a) continue;
-			throw e;
-		}
-	}
-	return "";
-}, k = (e, t) => {
+}, O = (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");
-	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);
+	x(t);
+}, k = async (e, t, n, r, i, a = !1, o, s = !1) => {
+	O(n, r);
+	let c = E(e, t), l = _(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);
+		let { blockhash: e } = await c.connection.getLatestBlockhash(), t = new w().add(u);
 		return t.recentBlockhash = e, t.feePayer = c.publicKey, Buffer.from(t.serialize({ requireAllSignatures: !1 })).toString("base64");
 	}
-	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);
+	let d = await v(c.connection, c.wallet, c.publicKey, [u]);
+	return y(l), d;
+}, A = async (e, t, n, r, i, a, o = !1, s, c = !1) => {
+	O(n, r);
+	let l = E(e, t), u = await e.getRandomRelay(l.chainId, !1);
+	if (!u) throw Error(`No relay available for chainId ${l.chainId}`);
+	let { instructions: d } = await b(l.connection, l.publicKey, new C(u), t, a), f = await D(l, n, r, i, o), p = [...d, f];
+	if (c) {
+		let { blockhash: e } = await l.connection.getLatestBlockhash(), t = new w().add(...p);
+		return t.recentBlockhash = e, t.feePayer = l.publicKey, Buffer.from(t.serialize({ requireAllSignatures: !1 })).toString("base64");
+	}
+	let m = _(s, l.chainId, Array(n.length).fill(l.mintAddress), n, await e.getEthereumAddress()), h = await v(l.connection, l.wallet, l.publicKey, p);
+	return await y(m), h;
+}, j = async (e, t, n, r = !1) => {
+	let o = e.userKeys.getShieldedPrivateKey(), s = d(a.findCorrectRandomization(i(31), o), o, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint), c = a.getEncryptionKeyPair(o).publicKey;
+	return k(e, n, [t], [s], [c], !1, void 0, r);
+}, M = async (e, t, i, a, o = !1, u = 0n, d) => {
+	if (!l(a)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
+	let f = s(a), p = c(a), m = u > 0n ? t * u / n : 0n;
+	return A(e, i, [t], [f], [p], m, !1, d, o);
 };
 //#endregion
-export { j as hinkalSolanaDeposit, M as hinkalSolanaDepositForOther, A as submitSolanaProoflessDeposit };
+export { j as hinkalSolanaDeposit, M as hinkalSolanaDepositForOther, k 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(`../../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;
+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/utils/erc20tokenFunctions.cjs`),p=require(`../../functions/snarkjs/common.snarkjs.cjs`),m=require(`../../functions/pre-transaction/solana.cjs`),h=require(`../../functions/pre-transaction/constructAdminData.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/utils/fees.utils.cjs`),v=require(`../../functions/pre-transaction/speculativeUtxo.cjs`);require(`../../functions/pre-transaction/index.cjs`);const y=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),b=require(`../../functions/utils/admin-dimensions.cjs`);require(`../../functions/web3/index.cjs`);const x=require(`./hinkalProoflessDeposit.utils.cjs`),S=require(`./hinkalSolanaTransact.cjs`);let C=require(`ethers`),w=require(`@solana/web3.js`),T=require(`@coral-xyz/anchor`);var E=(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 f=n.userKeys.getShieldedPrivateKey(),h=n.getSolanaProgram(l),g=n.getSolanaPublicKey(),_=new w.PublicKey(d),v=new w.PublicKey(u),{mintPublicKey:y}=s.formatMintAddress(o.erc20TokenAddress),b=y.toString(),x=m.getStorageAccountPublicKey(v,_),S=m.getStorageVaultPublicKey(v,_),C=m.getMerkleAccountPublicKey(v,_),T=c.map(()=>p.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),f),f,n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint)),E=T.map(e=>m.buildAnchorStealthAddressStructure(e)),D=i.UserKeys.getEncryptionKeyPair(f).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:T,anchorStealthStructures:E,ownEncryptionKey:D}},D=async(e,t)=>{let n=x.buildProoflessEncryptedOutputs(e.stealthAddressStructures,e.amounts.map(()=>e.ownEncryptionKey)).map(e=>Buffer.from(e.slice(2),`hex`)),{current:r,next:i}=await m.resolveSolanaRootBuckets(e.program,e.merkleAccount,e.amounts.length);return e.program.methods.multiPaymentDepositAt(e.amounts.map(e=>new T.BN(e.toString())),e.anchorStealthStructures,n,!0,t?new T.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})},O=async(r,i,c,l,d,p,m,g,y,x)=>{let C=c.erc20TokenAddress;if(l.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:w}=e.networkRegistry[i].contractData;if(!w)throw Error(`missing data`);let T=await r.getRandomRelay(i,!0);if(!T)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let E=a.getCurrentTimeInSeconds().toString(),D=r.generateProofRemotely?5:1,O=[];for(let e=0;e<l.length;e+=D){let n=l.slice(e,e+D),a=await Promise.all(n.map(async({recipientAddress:n,utxo:a},l)=>{let w=e+l,D={recipient:n,mint:C===`11111111111111111111111111111111`?void 0:C},O=await _.calculateModifiedFeeStructure(i,c,p[w],d),k=y?.tokenAddress?await f.getErc20TokenFromAPI(y.chainId??i,y.tokenAddress):void 0,A=b.resolveSwapPairTokens(m,[c],k),j=h.constructAdminData(m,i,[C],[p[w]],await r.getEthereumAddress(),A),{compressedAddress:M}=s.formatMintAddress(t.solanaNativeAddress),N=new o.Utxo({amount:0n,mintAddress:C,erc20TokenAddress:M,nullifyingKey:r.userKeys.getShieldedPrivateKey(),timeStamp:E,spendingPublicKey:r.userKeys.getSpendingKeyPair().pubSpendingBJJPoint}),{args:P,commitmentValidationData:F}=await S.hinkalSolanaTransact(r,{chainId:i,mintAddresses:[C],amountChanges:[-a.amount],relayAddress:T,recipient:n,signer:T,functionName:`transact`,accounts:D,relayerFee:O.flatFee,variableRate:O.variableRate,inputUtxos:[[a,N]],useBlockedUtxos:!0,speculative:x&&{pendingLeaves:x,inputUtxos:[[v.toSpeculativeUtxo(a)]]},submit:{mode:u.SolanaSubmitMode.ProofOnly}});return{relayAddress:T,functionName:`transact`,chainId:i,recipientAmount:p[w].toString(),args:P,accounts:D,adminData:j,commitmentValidationData:F,displayRecipient:g?.[w],destinationChainId:y?.chainId,destinationTokenAddress:y?.tokenAddress,destinationTokenAmount:y?.tokenAmounts?.[w]}}));O.push(...a)}return O},k=async(e,t,n,r,i,u,f,p,m,h,v)=>{let b=d.validateAndGetChainId([t]),x=t.erc20TokenAddress,S=c.hashEthereumAddress(await e.getEthereumAddressByChain(b)),w=m?c.hashString(m):void 0,T=u??await g.getFeeStructure(b,x,[x],l.ExternalActionId.Transact,[],25n,{mintTo:x,recipient:r[0],nullifierCount:1}),k=n.map(e=>e+_.calculateTotalFee(e,T)),A=E(e,b,t,k),j=a.getCurrentTimeInSeconds().toString(),{compressedAddress:M}=s.formatMintAddress(x),N=A.stealthAddressStructures.map((t,n)=>({recipientAddress:r[n],utxo:new o.Utxo({amount:k[n],timeStamp:j,nullifyingKey:e.userKeys.getShieldedPrivateKey(),mintAddress:x,erc20TokenAddress:M,stealthAddress:C.ethers.toBeHex(t.stealthAddress),H0:[t.H0x,t.H0y]})})),{connection:P,wallet:F}=A.program.provider,I=async()=>{let e=await(await D(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(),O(e,b,t,N,T,n,p,h,v,L)]);return{depositTxHash:R,scheduleId:await y.solanaTransactCallRelayerBatch(b,z,S,i,f,w,R)}};exports.hinkalSolanaDepositAndWithdraw=k;

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

@@ -10,28 +10,30 @@ import { hashEthereumAddress as c, hashString as l } from "../../functions/utils
 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 { 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 { getFeeStructure as b } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { toSpeculativeUtxo as x } from "../../functions/pre-transaction/speculativeUtxo.mjs";
+import { getErc20TokenFromAPI as p } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { calcStealthAddressStructure as m } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { buildAnchorStealthAddressStructure as h, getMerkleAccountPublicKey as g, getStorageAccountPublicKey as _, getStorageVaultPublicKey as v, resolveSolanaRootBuckets as y } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as b } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as x } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { calculateModifiedFeeStructure as S, calculateTotalFee as C } from "../../functions/utils/fees.utils.mjs";
+import { toSpeculativeUtxo as w } from "../../functions/pre-transaction/speculativeUtxo.mjs";
 import "../../functions/pre-transaction/index.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 { solanaTransactCallRelayerBatch as T } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { resolveSwapPairTokens as E } from "../../functions/utils/admin-dimensions.mjs";
 import "../../functions/web3/index.mjs";
-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";
+import { buildProoflessEncryptedOutputs as D } from "./hinkalProoflessDeposit.utils.mjs";
+import { hinkalSolanaTransact as O } from "./hinkalSolanaTransact.mjs";
+import { ethers as k } from "ethers";
+import { PublicKey as A } from "@solana/web3.js";
+import { BN as j } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.ts
-var A = (n, a, o, c) => {
+var M = (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(), 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;
+	let f = n.userKeys.getShieldedPrivateKey(), p = n.getSolanaProgram(l), y = n.getSolanaPublicKey(), b = new A(d), x = new A(u), { mintPublicKey: S } = s(o.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = c.map(() => m(i.findCorrectRandomization(r(31), f), f, n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint)), O = D.map((e) => h(e)), k = i.getEncryptionKeyPair(f).publicKey, j = C === t;
 	return {
-		program: v,
+		program: p,
 		publicKey: y,
 		originalDeployer: b,
 		mint: j ? null : S,
@@ -42,12 +44,12 @@ var A = (n, a, o, c) => {
 		amounts: c,
 		mintAddressString: C,
 		stealthAddressStructures: D,
-		anchorStealthStructures: k,
-		ownEncryptionKey: A
+		anchorStealthStructures: O,
+		ownEncryptionKey: k
 	};
-}, 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({
+}, N = async (e, t) => {
+	let n = D(e.stealthAddressStructures, e.amounts.map(() => e.ownEncryptionKey)).map((e) => Buffer.from(e.slice(2), "hex")), { current: r, next: i } = await y(e.program, e.merkleAccount, e.amounts.length);
+	return e.program.methods.multiPaymentDepositAt(e.amounts.map((e) => new j(e.toString())), e.anchorStealthStructures, n, !0, t ? new j(t) : null).accounts({
 		mint: e.mint,
 		signer: e.publicKey,
 		signerAta: e.atasValue,
@@ -59,87 +61,87 @@ var A = (n, a, o, c) => {
 		rootBucketNext: i ?? e.program.programId,
 		storageVaultAta: e.atasValue
 	});
-}, M = async (r, i, c, l, u, f, p, m, h, g) => {
-	let _ = c.erc20TokenAddress;
+}, P = async (r, i, c, l, u, f, m, h, g, _) => {
+	let v = 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 = {
+	let { originalDeployer: y } = e[i].contractData;
+	if (!y) throw Error("missing data");
+	let x = await r.getRandomRelay(i, !0);
+	if (!x) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let C = a().toString(), T = r.generateProofRemotely ? 5 : 1, D = [];
+	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 y = e + l, T = {
 				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({
+				mint: v === "11111111111111111111111111111111" ? void 0 : v
+			}, D = await S(i, c, f[y], u), k = g?.tokenAddress ? await p(g.chainId ?? i, g.tokenAddress) : void 0, A = E(m, [c], k), j = b(m, i, [v], [f[y]], await r.getEthereumAddress(), A), { compressedAddress: M } = s(t), N = new o({
 				amount: 0n,
-				mintAddress: _,
-				erc20TokenAddress: O,
+				mintAddress: v,
+				erc20TokenAddress: M,
 				nullifyingKey: r.userKeys.getShieldedPrivateKey(),
-				timeStamp: S,
+				timeStamp: C,
 				spendingPublicKey: r.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
-			}), { args: A, commitmentValidationData: j } = await E(r, {
+			}), { args: P, commitmentValidationData: F } = await O(r, {
 				chainId: i,
-				mintAddresses: [_],
+				mintAddresses: [v],
 				amountChanges: [-a.amount],
-				relayAddress: b,
+				relayAddress: x,
 				recipient: n,
-				signer: b,
+				signer: x,
 				functionName: "transact",
-				accounts: w,
-				relayerFee: T.flatFee,
-				variableRate: T.variableRate,
-				inputUtxos: [[a, k]],
+				accounts: T,
+				relayerFee: D.flatFee,
+				variableRate: D.variableRate,
+				inputUtxos: [[a, N]],
 				useBlockedUtxos: !0,
-				speculative: g && {
-					pendingLeaves: g,
-					inputUtxos: [[x(a)]]
+				speculative: _ && {
+					pendingLeaves: _,
+					inputUtxos: [[w(a)]]
 				},
 				submit: { mode: d.ProofOnly }
 			});
 			return {
-				relayAddress: b,
+				relayAddress: x,
 				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]
+				recipientAmount: f[y].toString(),
+				args: P,
+				accounts: T,
+				adminData: j,
+				commitmentValidationData: F,
+				displayRecipient: h?.[y],
+				destinationChainId: g?.chainId,
+				destinationTokenAddress: g?.tokenAddress,
+				destinationTokenAmount: g?.tokenAmounts?.[y]
 			};
 		}));
-		T.push(...a);
+		D.push(...a);
 	}
-	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, {
+	return D;
+}, F = async (e, t, n, r, i, d, p, m, h, g, _) => {
+	let v = f([t]), y = t.erc20TokenAddress, b = c(await e.getEthereumAddressByChain(v)), S = h ? l(h) : void 0, w = d ?? await x(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) => ({
+	}), E = n.map((e) => e + C(e, w)), D = M(e, v, t, E), O = a().toString(), { compressedAddress: A } = s(y), j = D.stealthAddressStructures.map((t, n) => ({
 		recipientAddress: r[n],
 		utxo: new o({
 			amount: E[n],
-			timeStamp: k,
+			timeStamp: O,
 			nullifyingKey: e.userKeys.getShieldedPrivateKey(),
 			mintAddress: y,
-			erc20TokenAddress: N,
-			stealthAddress: D.toBeHex(t.stealthAddress),
+			erc20TokenAddress: A,
+			stealthAddress: k.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)]);
+	})), { connection: F, wallet: I } = D.program.provider, L = async () => {
+		let e = await (await N(D, O)).transaction();
+		return e.recentBlockhash = (await F.getLatestBlockhash()).blockhash, e.feePayer = D.publicKey, F.sendRawTransaction((await I.signTransaction(e)).serialize());
+	}, R = j.map(({ utxo: e }) => BigInt(e.getCommitment()).toString()), [z, B] = await Promise.all([L(), P(e, v, t, j, w, n, m, g, _, R)]);
 	return {
 		depositTxHash: z,
-		scheduleId: await S(v, B, x, i, p, C, z)
+		scheduleId: await T(v, B, b, i, p, S, z)
 	};
 };
 //#endregion
-export { N as hinkalSolanaDepositAndWithdraw };
+export { F as hinkalSolanaDepositAndWithdraw };

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{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;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/create-provider.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/pre-transaction/constructAdminData.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(r,a,o,l)=>{let u=n.validateAndGetChainId([r]),d=i.AccountActions.getAddressFromSubAccount(u,o);if(!d)throw Error(`Public account address is not available`);let{rpcUrl:f}=e.networkRegistry[u],p=t.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),r,a);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,t,n,i,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(t,n,i,s),e.getEthereumAddress()]),h=await a.sendProxyV0Transaction({connection:u,chainId:d,subAccount:i,payerPublicKey:f,instructions:p});return o.emitTxPublicData(r.constructAdminData(c,d,[t.erc20TokenAddress],[n],m)),h};exports.hinkalSolanaProxySend=u;

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

@@ -1,17 +1,17 @@
 import { networkRegistry as e } from "../../constants/chains.constants.mjs";
-import { validateAndGetChainId as t } from "../../functions/utils/token-check.utils.mjs";
-import { constructAdminData as n } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { createCustomSolanaConnection as r } from "../../functions/utils/create-provider.mjs";
+import { createCustomSolanaConnection as t } from "../../functions/utils/create-provider.mjs";
+import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as r } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { AccountActions as i } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as a } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { emitTxPublicData as o } from "../../API/admin-calls.mjs";
 import { buildSolanaTransferInstructions as s } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
 import { PublicKey as c } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySend.ts
-var l = async (n, a, o, l) => {
-	let u = t([n]), d = i.getAddressFromSubAccount(u, o);
+var l = async (r, a, o, l) => {
+	let u = n([r]), d = i.getAddressFromSubAccount(u, o);
 	if (!d) throw Error("Public account address is not available");
-	let { rpcUrl: f } = e[u], p = r(f), m = new c(d), { instructions: h, programId: g } = await s(p, m, new c(l), n, a);
+	let { rpcUrl: f } = e[u], p = t(f), m = new c(d), { instructions: h, programId: g } = await s(p, m, new c(l), r, a);
 	return {
 		connection: p,
 		chainId: u,
@@ -20,15 +20,15 @@ var l = async (n, a, o, l) => {
 		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({
+}, u = async (e, t, n, i, s, c) => {
+	let [{ connection: u, chainId: d, senderPublickey: f, instructions: p }, m] = await Promise.all([l(t, n, i, s), e.getEthereumAddress()]), h = await a({
 		connection: u,
 		chainId: d,
 		subAccount: i,
 		payerPublicKey: f,
 		instructions: p
 	});
-	return o(n(c, d, [t.erc20TokenAddress], [r], m)), h;
+	return o(r(c, d, [t.erc20TokenAddress], [n], m)), h;
 };
 //#endregion
 export { u as hinkalSolanaProxySend };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/solanaMint.utils.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/pre-transaction/solana.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/utils/create-provider.cjs`),c=require(`../AccountActions/AccountActions.cjs`),l=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),u=require(`../../functions/utils/solana-program.utils.cjs`),d=require(`../../API/admin-calls.cjs`),f=require(`../../functions/utils/fees.utils.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 _=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,stealthAddressStructure:i,recipientEncryptionKey:o,senderPublickey:s,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBuckets:f,createBlockedUtxos:p})=>{let h=new g.BN(r.toString()),_=a.buildAnchorStealthAddressStructure(i),v=n===`11111111111111111111111111111111`?null:t,y=n===`11111111111111111111111111111111`?null:void 0,[b]=m.buildProoflessEncryptedOutputs([i],[o]),x=Buffer.from(b.slice(2),`hex`),{current:S,next:C}=f;return e.methods.prooflessDeposit(h,_,x,p).accounts({mint:v,signer:s,signerAta:y,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBucketCurrent:S,rootBucketNext:C??e.programId,storageVaultAta:y}).instruction()},v=async({chainId:i,token:o,tokenAmount:c,senderAddress:l,recipientInfo:d,createBlockedUtxos:f=!1})=>{if(!r.isValidPrivateAddress(d))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let{hinkalIdl:p,hinkalAddress:m,originalDeployer:g}=e.networkRegistry[i].contractData;if(!p)throw Error(`No IDL configured for Solana program on this network`);if(!g)throw Error(`missing original deployer`);let{rpcUrl:v}=e.networkRegistry[i],y=s.createCustomSolanaConnection(v),b=u.createReadOnlySolanaProgram(y,p),x=new h.PublicKey(g),S=new h.PublicKey(m),C=new h.PublicKey(l),{erc20TokenAddress:w}=o,{mintPublicKey:T}=n.formatMintAddress(w),E=T.toString(),D=a.getStorageAccountPublicKey(S,x),O=a.getStorageVaultPublicKey(S,x),k=a.getMerkleAccountPublicKey(S,x),A=r.constructStealthAddressStructure(d),j=r.getEncryptionKeyFromRecipientInfo(d),M=await a.resolveSolanaRootBuckets(b,k,1),N=await _({program:b,mintPublicKey:T,mintAddressString:E,tokenAmount:c,stealthAddressStructure:A,recipientEncryptionKey:j,senderPublickey:C,originalDeployer:x,storageAccount:D,storageVault:O,merkleAccount:k,rootBuckets:M,createBlockedUtxos:f}),P=n.getSolanaTokenProgramId(o.is2022Program);return{connection:y,senderAddress:l,senderPublickey:C,instructions:[N],storageAccount:D,storageVault:O,rootBucketCurrent:M.current,programId:P}},y=async(e,n,r,i,a,o,s=!1,l=0n)=>{let u=c.AccountActions.getAddressFromSubAccount(n,a);if(!u)throw Error(`Public account address is not available`);let d=await v({chainId:n,token:r,tokenAmount:i,senderAddress:u,recipientInfo:o??e.getRecipientInfo(),createBlockedUtxos:s});if(l<=0n)return d;let m=await e.getRandomRelay(n,!1);if(!m)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{instructions:g}=await p.buildSolanaTransferInstructions(d.connection,d.senderPublickey,new h.PublicKey(m),r,f.calculateVariableFee(i,l));return{...d,instructions:[...g,...d.instructions]}},b=async(e,t,n,r,a,s=!1,c=0n,u)=>{if(!r)throw Error(`subAccount is required`);let f=i.validateAndGetChainId([t]),[{connection:p,senderPublickey:m,instructions:h},g]=await Promise.all([y(e,f,t,n,r,a,s,c),e.getEthereumAddress()]),_=await l.sendProxyV0Transaction({connection:p,chainId:f,subAccount:r,payerPublicKey:m,instructions:h});return d.emitTxPublicData(o.constructAdminData(u,f,[t.erc20TokenAddress],[n],g)),_};exports.hinkalSolanaProxyShield=b;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/solanaMint.utils.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../functions/utils/create-provider.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../../functions/pre-transaction/solana.cjs`),s=require(`../../functions/pre-transaction/constructAdminData.cjs`),c=require(`../AccountActions/AccountActions.cjs`),l=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/utils/solana-program.utils.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 _=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,stealthAddressStructure:i,recipientEncryptionKey:a,senderPublickey:s,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBuckets:f,createBlockedUtxos:p})=>{let h=new g.BN(r.toString()),_=o.buildAnchorStealthAddressStructure(i),v=n===`11111111111111111111111111111111`?null:t,y=n===`11111111111111111111111111111111`?null:void 0,[b]=m.buildProoflessEncryptedOutputs([i],[a]),x=Buffer.from(b.slice(2),`hex`),{current:S,next:C}=f;return e.methods.prooflessDeposit(h,_,x,p).accounts({mint:v,signer:s,signerAta:y,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBucketCurrent:S,rootBucketNext:C??e.programId,storageVaultAta:y}).instruction()},v=async({chainId:a,token:s,tokenAmount:c,senderAddress:l,recipientInfo:u,createBlockedUtxos:f=!1})=>{if(!r.isValidPrivateAddress(u))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let{hinkalIdl:p,hinkalAddress:m,originalDeployer:g}=e.networkRegistry[a].contractData;if(!p)throw Error(`No IDL configured for Solana program on this network`);if(!g)throw Error(`missing original deployer`);let{rpcUrl:v}=e.networkRegistry[a],y=i.createCustomSolanaConnection(v),b=d.createReadOnlySolanaProgram(y,p),x=new h.PublicKey(g),S=new h.PublicKey(m),C=new h.PublicKey(l),{erc20TokenAddress:w}=s,{mintPublicKey:T}=n.formatMintAddress(w),E=T.toString(),D=o.getStorageAccountPublicKey(S,x),O=o.getStorageVaultPublicKey(S,x),k=o.getMerkleAccountPublicKey(S,x),A=r.constructStealthAddressStructure(u),j=r.getEncryptionKeyFromRecipientInfo(u),M=await o.resolveSolanaRootBuckets(b,k,1),N=await _({program:b,mintPublicKey:T,mintAddressString:E,tokenAmount:c,stealthAddressStructure:A,recipientEncryptionKey:j,senderPublickey:C,originalDeployer:x,storageAccount:D,storageVault:O,merkleAccount:k,rootBuckets:M,createBlockedUtxos:f}),P=n.getSolanaTokenProgramId(s.is2022Program);return{connection:y,senderAddress:l,senderPublickey:C,instructions:[N],storageAccount:D,storageVault:O,rootBucketCurrent:M.current,programId:P}},y=async(e,n,r,i,a,o,s=!1,l=0n)=>{let d=c.AccountActions.getAddressFromSubAccount(n,a);if(!d)throw Error(`Public account address is not available`);let f=await v({chainId:n,token:r,tokenAmount:i,senderAddress:d,recipientInfo:o??e.getRecipientInfo(),createBlockedUtxos:s});if(l<=0n)return f;let m=await e.getRandomRelay(n,!1);if(!m)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{instructions:g}=await p.buildSolanaTransferInstructions(f.connection,f.senderPublickey,new h.PublicKey(m),r,u.calculateVariableFee(i,l));return{...f,instructions:[...g,...f.instructions]}},b=async(e,t,n,r,i,o=!1,c=0n,u)=>{if(!r)throw Error(`subAccount is required`);let d=a.validateAndGetChainId([t]),[{connection:p,senderPublickey:m,instructions:h},g]=await Promise.all([y(e,d,t,n,r,i,o,c),e.getEthereumAddress()]),_=await l.sendProxyV0Transaction({connection:p,chainId:d,subAccount:r,payerPublicKey:m,instructions:h});return f.emitTxPublicData(s.constructAdminData(u,d,[t.erc20TokenAddress],[n],g)),_};exports.hinkalSolanaProxyShield=b;