@hinkal/common 0.3.11 → 0.3.13

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

@@ -6,9 +6,9 @@ import { validateAndGetChainId as r } from "../../functions/utils/token-check.ut
 import { modifyVolatileTokenAmountChanges as i } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
 import { AccountActions as a } from "../AccountActions/AccountActions.mjs";
 import { getFeeStructure as o } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { createTransaferEmporiumOpsBatch as s } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { convertEmporiumOpToCallInfo as c } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { calculateModifiedFeeStructureForTokens as l } from "../../functions/utils/fees.utils.mjs";
+import { calculateModifiedFeeStructureForTokens as s } from "../../functions/utils/fees.utils.mjs";
+import { createTransaferEmporiumOpsBatch as c } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { convertEmporiumOpToCallInfo as l } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProxyToPrivate.ts
 var u = async (u, d, f, p, m, h, g, _) => {
 	if (!g) throw Error("hinkalProxyToPrivate: subAccount should be provided");
@@ -16,7 +16,7 @@ var u = async (u, d, f, p, m, h, g, _) => {
 	if (!t(p)) throw Error(e.RECIPIENT_FORMAT_INCORRECT);
 	let v = r(d), y = a.getAddressFromSubAccount(v, g);
 	if (!y) throw Error("Public account address is not available");
-	let b = d.map((e) => e.erc20TokenAddress), x = await i(v, d, f, y), S = s(u, v, b, x), C = await l(v, d, x, h ?? await o(v, m, b, n.Emporium, S.map((e) => c(e, y, v)), 25n)), w = d.map((e, t) => ({
+	let b = d.map((e) => e.erc20TokenAddress), x = await i(v, d, f, y), S = c(u, v, b, x), C = await s(v, d, x, h ?? await o(v, m, b, n.Emporium, S.map((e) => l(e, y, v)), 25n)), w = d.map((e, t) => ({
 		token: e,
 		amount: -1n * x[t]
 	}));

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

@@ -0,0 +1 @@
+const e=require(`../../functions/utils/erc20tokenFunctions.cjs`),t=require(`../../functions/utils/receive-vault-account.utils.cjs`),n=require(`../../functions/utils/receive-vault-scan.utils.cjs`);var r=async r=>{let{records:i,blocks:a}=await t.getReceiveVaultAccountSnapshot(r.userKeys);return{entries:(await Promise.all(i.map(async t=>{let n=await e.getErc20TokenFromAPI(t.chainId,t.token);return n?{record:t,token:n,expiresAt:new Date(Number(t.expiry)*1e3)}:void 0}))).filter(e=>!!e).sort((e,t)=>t.expiresAt.getTime()-e.expiresAt.getTime()),blockedFunds:await n.getReceiveVaultBlockedFunds(i,a)}};exports.hinkalGetReceiveVaultAccount=r;

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

@@ -0,0 +1,3 @@
+import { ReceiveVaultAccount } from '../../types/receive-vault.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalGetReceiveVaultAccount: (hinkal: IHinkal) => Promise<ReceiveVaultAccount>;

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

@@ -0,0 +1,20 @@
+import { getErc20TokenFromAPI as e } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { getReceiveVaultAccountSnapshot as t } from "../../functions/utils/receive-vault-account.utils.mjs";
+import { getReceiveVaultBlockedFunds as n } from "../../functions/utils/receive-vault-scan.utils.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalReceiveVaultAccount.ts
+var r = async (r) => {
+	let { records: i, blocks: a } = await t(r.userKeys);
+	return {
+		entries: (await Promise.all(i.map(async (t) => {
+			let n = await e(t.chainId, t.token);
+			return n ? {
+				record: t,
+				token: n,
+				expiresAt: /* @__PURE__ */ new Date(Number(t.expiry) * 1e3)
+			} : void 0;
+		}))).filter((e) => !!e).sort((e, t) => t.expiresAt.getTime() - e.expiresAt.getTime()),
+		blockedFunds: await n(i, a)
+	};
+};
+//#endregion
+export { r as hinkalGetReceiveVaultAccount };

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

@@ -0,0 +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;

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

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

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

@@ -0,0 +1,33 @@
+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";
+//#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
+	});
+	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 v(o, t, n, s, c, l);
+};
+//#endregion
+export { b as hinkalReceiveVaultCreate };

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

@@ -0,0 +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;

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,59 @@
+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";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalReceiveVaultRecover.ts
+var m = {
+	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) => {
+	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];
+	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
+	];
+	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,
+				callValue: 0,
+				input: i(e, "recover", x)
+			}, [], await d.getEthereumAddressByChain(m));
+			return t;
+		}
+		let s = r.contract(e, o);
+		try {
+			return await s.recover(...x).send({ feeLimit: n });
+		} catch (e) {
+			throw Error(h(e));
+		}
+	}
+	let S = d.getContractWithSigner(m, o.ReceiveVaultFactoryContract);
+	try {
+		return _ ? S.recover.populateTransaction(...x) : (await S.recover(...x)).hash;
+	} catch (e) {
+		throw Error(h(e));
+	}
+};
+//#endregion
+export { g 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, 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(`../../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;

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,46 +1,47 @@
 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 { BN as T } from "@coral-xyz/anchor";
+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 { shouldRetryForSolanaError as v } from "../../error-handling/retrySolanaError.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";
 //#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;
+var O = (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 (!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);
-	return e.program.methods.multiPaymentDeposit(t.map((e) => new T(e.toString())), a, o, i).accounts({
+}, k = 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({
 		mint: e.mint,
 		signer: e.publicKey,
 		signerAta: e.atasValue,
@@ -52,11 +53,11 @@ var E = (n, r) => {
 		rootBucketNext: c ?? e.program.programId,
 		storageVaultAta: e.atasValue
 	}).instruction();
-}, O = async (e, t, n, r) => {
+}, 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 w(new C({
+			let { blockhash: i, lastValidBlockHeight: a } = await e.getLatestBlockhash(), o = new E(new T({
 				payerKey: n,
 				recentBlockhash: i,
 				instructions: r
@@ -67,32 +68,43 @@ var E = (n, r) => {
 				lastValidBlockHeight: a
 			}, "confirmed"), c;
 		} catch (e) {
-			if (_(e) && !a) continue;
+			if (v(e) && !a) continue;
 			throw e;
 		}
 	}
 	return "";
-}, k = (e, t) => {
+}, j = (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);
+}, 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);
 	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 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);
+	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];
+	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);
+	return await y(m), h;
+}, P = 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) => {
+	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);
 };
 //#endregion
-export { j as hinkalSolanaDeposit, M as hinkalSolanaDepositForOther, A as submitSolanaProoflessDeposit };
+export { P as hinkalSolanaDeposit, F as hinkalSolanaDepositForOther, M 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/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;

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

@@ -14,10 +14,10 @@ import { calcStealthAddressStructure as p } from "../../functions/snarkjs/common
 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 { calculateModifiedFeeStructure as x, calculateTotalFee as S } from "../../functions/utils/fees.utils.mjs";
+import { toSpeculativeUtxo as C } 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 w } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import "../../functions/web3/index.mjs";
 import { buildProoflessEncryptedOutputs as T } from "./hinkalProoflessDeposit.utils.mjs";
 import { hinkalSolanaTransact as E } from "./hinkalSolanaTransact.mjs";
@@ -72,7 +72,7 @@ var A = (n, a, o, c) => {
 			let v = e + l, w = {
 				recipient: n,
 				mint: _ === "11111111111111111111111111111111" ? void 0 : _
-			}, T = await C(i, c, f[v], u), D = y(p, i, [_], [f[v]], await r.getEthereumAddress()), { compressedAddress: O } = s(t), k = new o({
+			}, T = await x(i, c, f[v], u), D = y(p, i, [_], [f[v]], await r.getEthereumAddress()), { compressedAddress: O } = s(t), k = new o({
 				amount: 0n,
 				mintAddress: _,
 				erc20TokenAddress: O,
@@ -94,7 +94,7 @@ var A = (n, a, o, c) => {
 				useBlockedUtxos: !0,
 				speculative: g && {
 					pendingLeaves: g,
-					inputUtxos: [[x(a)]]
+					inputUtxos: [[C(a)]]
 				},
 				submit: { mode: d.ProofOnly }
 			});
@@ -121,7 +121,7 @@ var A = (n, a, o, c) => {
 		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 + S(e, T)), O = A(e, v, t, E), k = a().toString(), { compressedAddress: N } = s(y), P = O.stealthAddressStructures.map((t, n) => ({
 		recipientAddress: r[n],
 		utxo: new o({
 			amount: E[n],
@@ -138,7 +138,7 @@ var A = (n, a, o, c) => {
 	}, R = P.map(({ utxo: e }) => BigInt(e.getCommitment()).toString()), [z, B] = await Promise.all([L(), M(e, v, t, P, T, n, m, g, _, R)]);
 	return {
 		depositTxHash: z,
-		scheduleId: await S(v, B, x, i, p, C, z)
+		scheduleId: await w(v, B, x, i, p, C, z)
 	};
 };
 //#endregion

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/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/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: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:u,createBlockedUtxos:f=!1})=>{if(!r.isValidPrivateAddress(u))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=d.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(u),j=r.getEncryptionKeyFromRecipientInfo(u),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 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,a,s=!1,c=0n,u)=>{if(!r)throw Error(`subAccount is required`);let d=i.validateAndGetChainId([t]),[{connection:p,senderPublickey:m,instructions:h},g]=await Promise.all([y(e,d,t,n,r,a,s,c),e.getEthereumAddress()]),_=await l.sendProxyV0Transaction({connection:p,chainId:d,subAccount:r,payerPublicKey:m,instructions:h});return f.emitTxPublicData(o.constructAdminData(u,d,[t.erc20TokenAddress],[n],g)),_};exports.hinkalSolanaProxyShield=b;

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

@@ -9,9 +9,9 @@ import { constructAdminData as p } from "../../functions/pre-transaction/constru
 import { createCustomSolanaConnection as m } from "../../functions/utils/create-provider.mjs";
 import { AccountActions as h } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as g } from "../../functions/pre-transaction/sendV0Transaction.mjs";
-import { createReadOnlySolanaProgram as _ } from "../../functions/utils/solana-program.utils.mjs";
-import { emitTxPublicData as v } from "../../API/admin-calls.mjs";
-import { calculateVariableFee as y } from "../../functions/utils/fees.utils.mjs";
+import { calculateVariableFee as _ } from "../../functions/utils/fees.utils.mjs";
+import { createReadOnlySolanaProgram as v } from "../../functions/utils/solana-program.utils.mjs";
+import { emitTxPublicData as y } from "../../API/admin-calls.mjs";
 import { buildSolanaTransferInstructions as b } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
 import { buildProoflessEncryptedOutputs as x } from "./hinkalProoflessDeposit.utils.mjs";
 import { PublicKey as S } from "@solana/web3.js";
@@ -31,12 +31,12 @@ var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		rootBucketNext: S ?? e.programId,
 		storageVaultAta: _
 	}).instruction();
-}, T = async ({ chainId: s, token: c, tokenAmount: p, senderAddress: h, recipientInfo: g, createBlockedUtxos: v = !1 }) => {
+}, T = async ({ chainId: s, token: c, tokenAmount: p, senderAddress: h, recipientInfo: g, createBlockedUtxos: _ = !1 }) => {
 	if (!o(g)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
 	let { hinkalIdl: y, hinkalAddress: b, originalDeployer: x } = e[s].contractData;
 	if (!y) throw Error("No IDL configured for Solana program on this network");
 	if (!x) throw Error("missing original deployer");
-	let { rpcUrl: C } = e[s], T = m(C), E = _(T, y), D = new S(x), O = new S(b), k = new S(h), { erc20TokenAddress: A } = c, { mintPublicKey: j } = n(A), M = j.toString(), N = u(O, D), P = d(O, D), F = l(O, D), I = i(g), L = a(g), R = await f(E, F, 1), z = await w({
+	let { rpcUrl: C } = e[s], T = m(C), E = v(T, y), D = new S(x), O = new S(b), k = new S(h), { erc20TokenAddress: A } = c, { mintPublicKey: j } = n(A), M = j.toString(), N = u(O, D), P = d(O, D), F = l(O, D), I = i(g), L = a(g), R = await f(E, F, 1), z = await w({
 		program: E,
 		mintPublicKey: j,
 		mintAddressString: M,
@@ -49,7 +49,7 @@ var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		storageVault: P,
 		merkleAccount: F,
 		rootBuckets: R,
-		createBlockedUtxos: v
+		createBlockedUtxos: _
 	}), B = r(c.is2022Program);
 	return {
 		connection: T,
@@ -75,7 +75,7 @@ var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 	if (c <= 0n) return u;
 	let d = await e.getRandomRelay(n, !1);
 	if (!d) throw Error(t.RELAYER_NOT_AVAILABLE);
-	let { instructions: f } = await b(u.connection, u.senderPublickey, new S(d), r, y(i, c));
+	let { instructions: f } = await b(u.connection, u.senderPublickey, new S(d), r, _(i, c));
 	return {
 		...u,
 		instructions: [...f, ...u.instructions]
@@ -89,7 +89,7 @@ var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		payerPublicKey: d,
 		instructions: f
 	});
-	return v(p(c, l, [t.erc20TokenAddress], [n], m)), h;
+	return y(p(c, l, [t.erc20TokenAddress], [n], m)), h;
 };
 //#endregion
 export { D as hinkalSolanaProxyShield };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/pre-transaction/constructAdminData.cjs`),a=require(`../../functions/utils/create-provider.cjs`),o=require(`../AccountActions/AccountActions.cjs`),s=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),c=require(`../../functions/pre-transaction/getFeeStructure.cjs`),l=require(`../../API/admin-calls.cjs`);require(`../../constants/index.cjs`);const u=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);require(`../AccountActions/index.cjs`);let d=require(`@solana/web3.js`);var f=async(e,t)=>{let{addressLookupTableAccount:n,instructionLists:r}=JSON.parse(t).data,i=await Promise.all(n.map(async t=>{let n=await e.getAddressLookupTable(new d.PublicKey(t));if(!n.value)throw Error(`Failed to fetch lookup table: ${t}`);return n.value}));if(r.length===0)throw Error(`No instructions found`);return{instructions:r.map(e=>new d.TransactionInstruction({keys:e.accounts.map(e=>({pubkey:new d.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new d.PublicKey(e.programId),data:Buffer.from(e.data,`base64`)})),lookupTableAccounts:i}},p=async(e,t)=>{let n=d.VersionedTransaction.deserialize(Buffer.from(t,`base64`)),r=await Promise.all(n.message.addressTableLookups.map(async({accountKey:t})=>{let n=await e.getAddressLookupTable(t);if(!n.value)throw Error(`Failed to fetch lookup table: ${t.toBase58()}`);return n.value})),{instructions:i}=d.TransactionMessage.decompile(n.message,{addressLookupTableAccounts:r});return{instructions:i,lookupTableAccounts:r}},m=async(t,r,i,s)=>{let c=o.AccountActions.getAddressFromSubAccount(t,i);if(!c)throw Error(`Public account address is not available`);let{rpcUrl:l}=e.networkRegistry[t],u=a.createCustomSolanaConnection(l),m=new d.PublicKey(c),{instructions:h,lookupTableAccounts:g}=s===n.ExternalActionId.Lifi?await p(u,r):await f(u,r);return{connection:u,walletPublicKey:m,instructions:h,lookupTableAccounts:g}},h=async(e,a,o,f,p,h,g,_,v,y)=>{let b=r.validateAndGetChainId(a),[{connection:x,walletPublicKey:S,instructions:C,lookupTableAccounts:w},T,E]=await Promise.all([m(b,f,p,h),g?e.getRandomRelay(b):Promise.resolve(null),e.getEthereumAddressByChain(b)]),D=C;if(g){if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let e=a[1],r=o[1]*(v??await c.getFeeStructure(b,_,a.map(e=>e.erc20TokenAddress),n.ExternalActionId.Emporium)).variableRate/10000n,{instructions:i}=await u.buildSolanaTransferInstructions(x,S,new d.PublicKey(T),e,r);D=[...C,...i]}let O=await s.sendProxyV0Transaction({connection:x,chainId:b,subAccount:p,payerPublicKey:S,instructions:D,lookupTableAccounts:w});return l.emitTxPublicData(i.constructAdminData(y,b,a.map(e=>e.erc20TokenAddress),o,E,a)),O};exports.hinkalSolanaProxySwap=h;
+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(`../../types/external-action.types.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/utils/erc20tokenFunctions.cjs`),a=require(`../../functions/pre-transaction/constructAdminData.cjs`),o=require(`../../functions/utils/create-provider.cjs`),s=require(`../AccountActions/AccountActions.cjs`),c=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../API/admin-calls.cjs`);require(`../../constants/index.cjs`);const f=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);require(`../AccountActions/index.cjs`);let p=require(`@solana/web3.js`);var m=async(e,t)=>{let{addressLookupTableAccount:n,instructionLists:r}=JSON.parse(t).data,i=await Promise.all(n.map(async t=>{let n=await e.getAddressLookupTable(new p.PublicKey(t));if(!n.value)throw Error(`Failed to fetch lookup table: ${t}`);return n.value}));if(r.length===0)throw Error(`No instructions found`);return{instructions:r.map(e=>new p.TransactionInstruction({keys:e.accounts.map(e=>({pubkey:new p.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new p.PublicKey(e.programId),data:Buffer.from(e.data,`base64`)})),lookupTableAccounts:i}},h=async(e,t)=>{let n=p.VersionedTransaction.deserialize(Buffer.from(t,`base64`)),r=await Promise.all(n.message.addressTableLookups.map(async({accountKey:t})=>{let n=await e.getAddressLookupTable(t);if(!n.value)throw Error(`Failed to fetch lookup table: ${t.toBase58()}`);return n.value})),{instructions:i}=p.TransactionMessage.decompile(n.message,{addressLookupTableAccounts:r});return{instructions:i,lookupTableAccounts:r}},g=async(t,r,i,a)=>{let c=s.AccountActions.getAddressFromSubAccount(t,i);if(!c)throw Error(`Public account address is not available`);let{rpcUrl:l}=e.networkRegistry[t],u=o.createCustomSolanaConnection(l),d=new p.PublicKey(c),{instructions:f,lookupTableAccounts:g}=a===n.ExternalActionId.Lifi?await h(u,r):await m(u,r);return{connection:u,walletPublicKey:d,instructions:f,lookupTableAccounts:g}},_=async(e,o,s,m,h,_,v,y,b,x,S,C)=>{let w=r.validateAndGetChainId(o),[{connection:T,walletPublicKey:E,instructions:D,lookupTableAccounts:O},k,A]=await Promise.all([g(w,m,h,_),e.getRandomRelay(w),e.getEthereumAddressByChain(w)]);if(!k)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j=D,M=b??await l.getFeeStructure(w,y,o.map(e=>e.erc20TokenAddress),n.ExternalActionId.Emporium,[],35n);if(v){let e=o[1],t=s[1]*M.variableRate/10000n,{instructions:n}=await f.buildSolanaTransferInstructions(T,E,new p.PublicKey(k),e,t);j=[...D,...n]}else{let e={...M,flatFee:0n},t=S&&C!==void 0?await u.calculateModifiedFeeStructure(w,S,C,e):e;if(t.flatFee>0n){let e=await i.getErc20TokenFromAPI(w,t.feeToken);if(!e)throw Error(`Failed to find fee token`);let{instructions:n}=await f.buildSolanaTransferInstructions(T,E,new p.PublicKey(k),e,t.flatFee);j=[...D,...n]}}let N=await c.sendProxyV0Transaction({connection:T,chainId:w,subAccount:h,payerPublicKey:E,instructions:j,lookupTableAccounts:O});return d.emitTxPublicData(a.constructAdminData(x,w,o.map(e=>e.erc20TokenAddress),s,A,o)),N};exports.hinkalSolanaProxySwap=_;

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

@@ -2,5 +2,5 @@ import { AdminTransactionType, ERC20Token, SubAccount } from '../../types';
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
 import { ExternalActionId } from '../../types/external-action.types';
-export declare const hinkalSolanaProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], data: string, subAccount: SubAccount, externalActionId: ExternalActionId, isTheSameChainSwap: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;
+export declare const hinkalSolanaProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], data: string, subAccount: SubAccount, externalActionId: ExternalActionId, isTheSameChainSwap: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, bridgedToken?: ERC20Token, bridgedTokenAmount?: bigint) => Promise<string>;
 export declare const getSolanaProxySwapSerializedTransaction: (chainId: number, data: string, subAccount: SubAccount, externalActionId: ExternalActionId) => Promise<string>;