@hinkal/common 0.3.13 → 0.3.14

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../functions/utils/receive-vault.utils.cjs`),i=require(`../../API/receiveVaultCalls.cjs`),a=require(`../../functions/pre-transaction/getFeeStructure.cjs`),o=require(`../../functions/utils/receive-vault-account.utils.cjs`),s=require(`./hinkalReceiveVaultSettle.cjs`);var c=async(e,t,n,a)=>{let o=r.getReceiveVaultParams(e,a),c=s.buildReceiveVaultEncryptedOutput(o,t);return i.registerReceiveVault(a,o,t,n,c,await r.signReceiveVaultOutput(e,a,c))},l=(e,n,r)=>e.filter(e=>e.chainId===n&&t.caseInsensitiveEqual(e.token,r)).reduce((e,t)=>Math.max(e,t.index+1),0),u=async(t,i,o,s,d,f)=>{let{flatFee:p}=await a.getFeeStructure(i,o,[o],n.ExternalActionId.ReceiveVaultSettle,[],e.RECEIVE_VAULT_VARIABLE_RATE),m=r.getReceiveVaultFeeCeiling(p).toString(),h=r.getReceiveVaultExpiry().toString(),g=r.buildReceiveVaultRecord(t,{index:l(f,i,o),chainId:i,token:o,maxFlatFee:m,maxVariableRate:Number(e.RECEIVE_VAULT_VARIABLE_RATE),expiry:h});return await c(t,s,d,g)?u(t,i,o,s,d,[...f,g]):g},d=(e,n,i)=>e.filter(e=>e.chainId===n&&t.caseInsensitiveEqual(e.token,i)&&!r.isReceiveVaultExpired(e)).sort((e,t)=>t.index-e.index)[0],f=async(e,t,n,i=!1)=>{if(!r.isReceiveVaultSupported(t))throw Error(`receive vault: no factory on chain ${t}`);let{userKeys:a}=e,s=r.getReceiveVaultEncryptionKey(a),l=r.getReceiveVaultAccountKey(a),{records:f}=await o.getReceiveVaultAccountSnapshot(a);if(!i){let e=d(f,t,n);if(e&&!await c(a,s,l,e))return e}return u(a,t,n,s,l,f)};exports.hinkalReceiveVaultCreate=f;
+const e=require(`../../functions/utils/receive-vault.utils.cjs`),t=require(`../../API/receiveVaultCalls.cjs`),n=require(`../../functions/utils/receive-vault-account.utils.cjs`),r=require(`./hinkalReceiveVaultSettle.cjs`);var i=async(n,i,a,o)=>{let s=e.getReceiveVaultParams(n,o),c=r.buildReceiveVaultEncryptedOutput(s,i);return t.registerReceiveVault(o,s,i,a,c,await Promise.all(e.receiveVaultChainsForNetwork(o.network).map(async t=>({chainId:t,signature:await e.signReceiveVaultOutput(n,o,c,t)}))))},a=async(t,r,a,o)=>{let s=await e.buildReceiveVaultRecord(t,{index:await n.getReceiveVaultNextIndex(t,r),network:r,version:(await e.getReceiveVaultCurrentVersion(r)).toString()});return await i(t,a,o,s),s},o=(e,t)=>e.filter(e=>e.network===t).sort((e,t)=>t.index-e.index)[0],s=async(t,r,i=!1)=>{if(e.receiveVaultChainsForNetwork(r).length===0)throw Error(`receive vault: no factory for network ${r}`);let{userKeys:s}=t,c=e.getReceiveVaultEncryptionKey(s),l=e.getReceiveVaultAccountKey(s);if(!i){let{records:e}=await n.getReceiveVaultAccountSnapshot(s),t=o(e,r);if(t)return t}return a(s,r,c,l)};exports.hinkalReceiveVaultCreate=s;

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

@@ -1,3 +1,3 @@
-import { ReceiveVaultRecord } from '../../types/receive-vault.types';
+import { ReceiveVaultNetwork, ReceiveVaultRecord } from '../../types/receive-vault.types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalReceiveVaultCreate: (hinkal: IHinkal, chainId: number, token: string, forceFresh?: boolean) => Promise<ReceiveVaultRecord>;
+export declare const hinkalReceiveVaultCreate: (hinkal: IHinkal, network: ReceiveVaultNetwork, forceFresh?: boolean) => Promise<ReceiveVaultRecord>;

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

@@ -1,33 +1,29 @@
-import { RECEIVE_VAULT_VARIABLE_RATE as e } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as t } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { ExternalActionId as n } from "../../types/external-action.types.mjs";
-import { buildReceiveVaultRecord as r, getReceiveVaultAccountKey as i, getReceiveVaultEncryptionKey as a, getReceiveVaultExpiry as o, getReceiveVaultFeeCeiling as s, getReceiveVaultParams as c, isReceiveVaultExpired as l, isReceiveVaultSupported as u, signReceiveVaultOutput as d } from "../../functions/utils/receive-vault.utils.mjs";
-import { registerReceiveVault as f } from "../../API/receiveVaultCalls.mjs";
-import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getReceiveVaultAccountSnapshot as m } from "../../functions/utils/receive-vault-account.utils.mjs";
-import { buildReceiveVaultEncryptedOutput as h } from "./hinkalReceiveVaultSettle.mjs";
+import { buildReceiveVaultRecord as e, getReceiveVaultAccountKey as t, getReceiveVaultCurrentVersion as n, getReceiveVaultEncryptionKey as r, getReceiveVaultParams as i, receiveVaultChainsForNetwork as a, signReceiveVaultOutput as o } from "../../functions/utils/receive-vault.utils.mjs";
+import { registerReceiveVault as s } from "../../API/receiveVaultCalls.mjs";
+import { getReceiveVaultAccountSnapshot as c, getReceiveVaultNextIndex as l } from "../../functions/utils/receive-vault-account.utils.mjs";
+import { buildReceiveVaultEncryptedOutput as u } from "./hinkalReceiveVaultSettle.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalReceiveVaultCreate.ts
-var g = async (e, t, n, r) => {
-	let i = c(e, r), a = h(i, t);
-	return f(r, i, t, n, a, await d(e, r, a));
-}, _ = (e, n, r) => e.filter((e) => e.chainId === n && t(e.token, r)).reduce((e, t) => Math.max(e, t.index + 1), 0), v = async (t, i, a, c, l, u) => {
-	let { flatFee: d } = await p(i, a, [a], n.ReceiveVaultSettle, [], e), f = s(d).toString(), m = o().toString(), h = r(t, {
-		index: _(u, i, a),
-		chainId: i,
-		token: a,
-		maxFlatFee: f,
-		maxVariableRate: Number(e),
-		expiry: m
+var d = async (e, t, n, r) => {
+	let c = i(e, r), l = u(c, t);
+	return s(r, c, t, n, l, await Promise.all(a(r.network).map(async (t) => ({
+		chainId: t,
+		signature: await o(e, r, l, t)
+	}))));
+}, f = async (t, r, i, a) => {
+	let o = await e(t, {
+		index: await l(t, r),
+		network: r,
+		version: (await n(r)).toString()
 	});
-	return await g(t, c, l, h) ? v(t, i, a, c, l, [...u, h]) : h;
-}, y = (e, n, r) => e.filter((e) => e.chainId === n && t(e.token, r) && !l(e)).sort((e, t) => t.index - e.index)[0], b = async (e, t, n, r = !1) => {
-	if (!u(t)) throw Error(`receive vault: no factory on chain ${t}`);
-	let { userKeys: o } = e, s = a(o), c = i(o), { records: l } = await m(o);
-	if (!r) {
-		let e = y(l, t, n);
-		if (e && !await g(o, s, c, e)) return e;
+	return await d(t, i, a, o), o;
+}, p = (e, t) => e.filter((e) => e.network === t).sort((e, t) => t.index - e.index)[0], m = async (e, n, i = !1) => {
+	if (a(n).length === 0) throw Error(`receive vault: no factory for network ${n}`);
+	let { userKeys: o } = e, s = r(o), l = t(o);
+	if (!i) {
+		let { records: e } = await c(o), t = p(e, n);
+		if (t) return t;
 	}
-	return v(o, t, n, s, c, l);
+	return f(o, n, s, l);
 };
 //#endregion
-export { b as hinkalReceiveVaultCreate };
+export { m as hinkalReceiveVaultCreate };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/tron.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../functions/utils/receive-vault.utils.cjs`),a=require(`../../functions/utils/string.utils.cjs`),o=require(`../../error-handling/get-error.message.cjs`);let s=require(`ethers`);var c={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.`},l=e=>{let t=e?.revert?.name;if(t&&c[t])return c[t];let n=JSON.stringify(e??``),r=Object.keys(c).find(e=>n.includes(s.ethers.id(`${e}()`).slice(2,10)));if(r)return c[r];let i=e?.message;return i&&s.ethers.isHexString(`0x${i}`)?a.hexToUtf8(i):e?.shortMessage??o.getErrorMessage(e)},u=async(a,o,s,c,u,d=!1)=>{let f=i.getReceiveVaultFactoryAddress(c);if(!f)throw Error(`receive vault: no factory on chain ${c}`);let p=BigInt(Math.floor(Date.now()/1e3)+900),m=await i.signReceiveVaultRecovery(a.userKeys,o,s,c,u,p),h=[i.receiveVaultParamsToTuple(i.getReceiveVaultParams(a.userKeys,o)),n.addressToHexFormat(s),n.addressToHexFormat(u),p,m];if(e.isTronLike(c)){let{receiveVaultFactoryABI:r}=e.networkRegistry[c].contractData;if(!r)throw Error(`receive vault: no factory ABI on chain ${c}`);let i=a.getTronWeb(),o=n.evmHexToTronBase58Address(f);if(d){let{transaction:e}=await i.transactionBuilder.triggerSmartContract(o,``,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:0,input:n.createTronCallData(r,`recover`,h)},[],await a.getEthereumAddressByChain(c));return e}let s=i.contract(r,o);try{return await s.recover(...h).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN})}catch(e){throw Error(l(e))}}let g=a.getContractWithSigner(c,r.ContractType.ReceiveVaultFactoryContract);try{return d?g.recover.populateTransaction(...h):(await g.recover(...h)).hash}catch(e){throw Error(l(e))}};exports.hinkalReceiveVaultRecover=u;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/tron.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../functions/utils/receive-vault.utils.cjs`),a=require(`../../functions/utils/string.utils.cjs`),o=require(`../../error-handling/get-error.message.cjs`),s=require(`./hinkalSolanaReceiveVault.cjs`);let c=require(`ethers`);var l={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.`},u=e=>{let t=e?.revert?.name;if(t&&l[t])return l[t];let n=JSON.stringify(e??``),r=Object.keys(l).find(e=>n.includes(c.ethers.id(`${e}()`).slice(2,10)));if(r)return l[r];let i=e?.message;return i&&c.ethers.isHexString(`0x${i}`)?a.hexToUtf8(i):e?.shortMessage??o.getErrorMessage(e)},d=async(a,o,c,l,d,f=!1)=>{let p=i.getReceiveVaultFactoryAddress(l);if(!p)throw Error(`receive vault: no factory on chain ${l}`);if(o.network!==i.receiveVaultNetworkOf(l))throw Error(`receive vault: network mismatch`);let m=BigInt(Math.floor(Date.now()/1e3)+900),h=await i.signReceiveVaultRecovery(a.userKeys,o,c,l,d,m);if(e.isSolanaLike(l)){let e=await a.getEthereumAddressByChain(l);return s.hinkalSolanaReceiveVaultRecover(a,l,i.getReceiveVaultParams(a.userKeys,o),c,d,m,h,e,f)}let g=[i.receiveVaultParamsToTuple(i.getReceiveVaultParams(a.userKeys,o)),n.addressToHexFormat(c),n.addressToHexFormat(d),m,h];if(e.isTronLike(l)){let{receiveVaultFactoryABI:r}=e.networkRegistry[l].contractData;if(!r)throw Error(`receive vault: no factory ABI on chain ${l}`);let i=a.getTronWeb(),o=n.evmHexToTronBase58Address(p);if(f){let{transaction:e}=await i.transactionBuilder.triggerSmartContract(o,``,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:0,input:n.createTronCallData(r,`recover`,g)},[],await a.getEthereumAddressByChain(l));return e}let s=i.contract(r,o);try{return await s.recover(...g).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN})}catch(e){throw Error(u(e))}}let _=a.getContractWithSigner(l,r.ContractType.ReceiveVaultFactoryContract);try{return f?_.recover.populateTransaction(...g):(await _.recover(...g)).hash}catch(e){throw Error(u(e))}};exports.hinkalReceiveVaultRecover=d;

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

@@ -1,59 +1,66 @@
-import { isTronLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
-import { TRON_DEFAULT_FEE_LIMIT_SUN as n } from "../../constants/protocol.constants.mjs";
-import { addressToHexFormat as r, createTronCallData as i, evmHexToTronBase58Address as a } from "../../functions/utils/tron.utils.mjs";
-import { ContractType as o } from "../../types/ethereum-network.types.mjs";
-import { getReceiveVaultFactoryAddress as s, getReceiveVaultParams as c, receiveVaultParamsToTuple as l, signReceiveVaultRecovery as u } from "../../functions/utils/receive-vault.utils.mjs";
-import { hexToUtf8 as d } from "../../functions/utils/string.utils.mjs";
-import { getErrorMessage as f } from "../../error-handling/get-error.message.mjs";
-import { ethers as p } from "ethers";
+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 m = {
+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."
-}, h = (e) => {
+}, v = (e) => {
 	let t = e?.revert?.name;
-	if (t && m[t]) return m[t];
-	let n = JSON.stringify(e ?? ""), r = Object.keys(m).find((e) => n.includes(p.id(`${e}()`).slice(2, 10)));
-	if (r) return m[r];
+	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 && p.isHexString(`0x${i}`) ? d(i) : e?.shortMessage ?? f(e);
-}, g = async (d, f, p, m, g, _ = !1) => {
-	let v = s(m);
-	if (!v) throw Error(`receive vault: no factory on chain ${m}`);
-	let y = BigInt(Math.floor(Date.now() / 1e3) + 900), b = await u(d.userKeys, f, p, m, g, y), x = [
-		l(c(d.userKeys, f)),
-		r(p),
-		r(g),
-		y,
-		b
+	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 (e(m)) {
-		let { receiveVaultFactoryABI: e } = t[m].contractData;
-		if (!e) throw Error(`receive vault: no factory ABI on chain ${m}`);
-		let r = d.getTronWeb(), o = a(v);
-		if (_) {
-			let { transaction: t } = await r.transactionBuilder.triggerSmartContract(o, "", {
-				feeLimit: n,
+	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: i(e, "recover", x)
-			}, [], await d.getEthereumAddressByChain(m));
-			return t;
+				input: a(e, "recover", w)
+			}, [], await p.getEthereumAddressByChain(_));
+			return n;
 		}
-		let s = r.contract(e, o);
+		let s = t.contract(e, i);
 		try {
-			return await s.recover(...x).send({ feeLimit: n });
+			return await s.recover(...w).send({ feeLimit: r });
 		} catch (e) {
-			throw Error(h(e));
+			throw Error(v(e));
 		}
 	}
-	let S = d.getContractWithSigner(m, o.ReceiveVaultFactoryContract);
+	let T = p.getContractWithSigner(_, s.ReceiveVaultFactoryContract);
 	try {
-		return _ ? S.recover.populateTransaction(...x) : (await S.recover(...x)).hash;
+		return b ? T.recover.populateTransaction(...w) : (await T.recover(...w)).hash;
 	} catch (e) {
-		throw Error(h(e));
+		throw Error(v(e));
 	}
 };
 //#endregion
-export { g as hinkalReceiveVaultRecover };
+export { y as hinkalReceiveVaultRecover };

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

@@ -1,6 +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, encryptionKey: string, depositAmount: bigint) => Promise<TransactProof>;
+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/hinkalSolanaDeposit.cjs

@@ -1 +1 @@
-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(`../../error-handling/retrySolanaError.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=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 g.VersionedTransaction(new g.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(f.shouldRetryForSolanaError(e)&&!a)continue;throw e}}return``},x=(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)},S=async(e,t,n,r,i,a=!1,o,s=!1)=>{x(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 f=await b(c.connection,c.wallet,c.publicKey,[u]);return await p.emitTxPublicData(l),f},C=async(e,t,n,r,i,a,o=!1,s,c=!1)=>{x(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:f}=await m.buildSolanaTransferInstructions(l.connection,l.publicKey,new g.PublicKey(u),t,a),h=await y(l,n,r,i,o),_=[...f,h];if(c){let{blockhash:e}=await l.connection.getLatestBlockhash(),t=new g.Transaction().add(..._);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 b(l.connection,l.wallet,l.publicKey,_);return await p.emitTxPublicData(S),C},w=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 S(e,n,[t],[s],[c],!1,void 0,r)},T=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 C(e,i,[t],[u],[d],f,!1,l,o)};exports.hinkalSolanaDeposit=w,exports.hinkalSolanaDepositForOther=T,exports.submitSolanaProoflessDeposit=S;
+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.mjs

@@ -10,14 +10,14 @@ import { validateAndGetChainId as u } from "../../functions/utils/token-check.ut
 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 { shouldRetryForSolanaError as v } from "../../error-handling/retrySolanaError.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, TransactionMessage as T, VersionedTransaction as E } from "@solana/web3.js";
-import { BN as D } from "@coral-xyz/anchor";
+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 O = (n, r) => {
+var E = (n, r) => {
 	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 (!l) throw Error("missing original deployer");
@@ -39,9 +39,9 @@ var O = (n, r) => {
 		storageVault: h(y, v),
 		merkleAccount: p(y, v)
 	};
-}, k = async (e, t, n, r, i) => {
+}, D = async (e, t, n, r, i) => {
 	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 D(e.toString())), a, o, i).accounts({
+	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,
@@ -53,58 +53,38 @@ var O = (n, r) => {
 		rootBucketNext: c ?? e.program.programId,
 		storageVaultAta: e.atasValue
 	}).instruction();
-}, A = 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 E(new T({
-				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 (v(e) && !a) continue;
-			throw e;
-		}
-	}
-	return "";
-}, j = (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");
 	x(t);
-}, M = async (e, t, n, r, i, a = !1, o, s = !1) => {
-	j(n, r);
-	let c = O(e, t), l = _(o, c.chainId, Array(n.length).fill(c.mintAddress), n, await e.getEthereumAddress()), u = await k(c, n, r, i, a);
+}, 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 w().add(u);
 		return t.recentBlockhash = e, t.feePayer = c.publicKey, Buffer.from(t.serialize({ requireAllSignatures: !1 })).toString("base64");
 	}
-	let d = await A(c.connection, c.wallet, c.publicKey, [u]);
-	return await y(l), d;
-}, N = async (e, t, n, r, i, a, o = !1, s, c = !1) => {
-	j(n, r);
-	let l = O(e, t), u = await e.getRandomRelay(l.chainId, !1);
+	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 k(l, n, r, i, o), p = [...d, f];
+	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 A(l.connection, l.wallet, l.publicKey, p);
+	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;
-}, P = async (e, t, n, r = !1) => {
+}, 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 M(e, n, [t], [s], [c], !1, void 0, r);
-}, F = async (e, t, i, a, o = !1, u = 0n, d) => {
+	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 N(e, i, [t], [f], [p], m, !1, d, o);
+	return A(e, i, [t], [f], [p], m, !1, d, o);
 };
 //#endregion
-export { P as hinkalSolanaDeposit, F as hinkalSolanaDepositForOther, M 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/utils/fees.utils.cjs`),_=require(`../../functions/pre-transaction/speculativeUtxo.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/web3/functionCalls/transactCallRelayer.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,v,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 g.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:[[_.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:v?.chainId,destinationTokenAddress:v?.tokenAddress,destinationTokenAmount:v?.tokenAmounts?.[S]}}));E.push(...a)}return E},D=async(e,t,n,r,i,u,f,p,m,_,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+g.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,_,y,L)]);return{depositTxHash:R,scheduleId:await v.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 { calculateModifiedFeeStructure as x, calculateTotalFee as S } from "../../functions/utils/fees.utils.mjs";
-import { toSpeculativeUtxo as C } 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 w } from "../../functions/web3/functionCalls/transactCallRelayer.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 x(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: [[C(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 + S(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 w(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;