@hinkal/common 0.3.6 → 0.3.7

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

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

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

@@ -11,9 +11,7 @@ import { PublicKey as c } from "@solana/web3.js";
 var l = async (n, a, o, l) => {
 	let u = t([n]), d = i.getAddressFromSubAccount(u, o);
 	if (!d) throw Error("Public account address is not available");
-	let { fetchRpcUrl: f } = e[u];
-	if (!f) throw Error("RPC URL not found for the specified chain ID");
-	let p = r(f), m = new c(d), { instructions: h, programId: g } = await s(p, m, new c(l), n, a);
+	let { rpcUrl: f } = e[u], p = r(f), m = new c(d), { instructions: h, programId: g } = await s(p, m, new c(l), n, a);
 	return {
 		connection: p,
 		chainId: u,

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(`../../API/admin-calls.cjs`),d=require(`./hinkalProoflessDeposit.utils.cjs`);let f=require(`@solana/web3.js`),p=require(`@coral-xyz/anchor`),m=require(`@solana/spl-token`);var h=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,stealthAddressStructure:i,recipientEncryptionKey:o,senderPublickey:s,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:f,createBlockedUtxos:m})=>{let h=new p.BN(r.toString()),g=a.buildAnchorStealthAddressStructure(i),_=n===`11111111111111111111111111111111`?null:t,v=n===`11111111111111111111111111111111`?null:void 0,[y]=d.buildProoflessEncryptedOutputs([i],[o]),b=Buffer.from(y.slice(2),`hex`),{current:x,next:S}=await a.resolveSolanaRootBuckets(e,f,1);return e.methods.prooflessDeposit(h,g,b,m).accounts({mint:_,signer:s,signerAta:v,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:f,rootBucketCurrent:x,rootBucketNext:S??e.programId,storageVaultAta:v}).instruction()},g=async(i,o,l,u,d,p,g=!1)=>{let _=p??i.getRecipientInfo();if(!r.isValidPrivateAddress(_))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let v=c.AccountActions.getAddressFromSubAccount(o,d);if(!v)throw Error(`Public account address is not available`);let{hinkalIdl:y,hinkalAddress:b,originalDeployer:x}=e.networkRegistry[o].contractData;if(!y)throw Error(`No IDL configured for Solana program on this network`);if(!x)throw Error(`missing original deployer`);let S=i.getSolanaProgram(y),C=new f.PublicKey(x),w=new f.PublicKey(b),T=new f.PublicKey(v),{erc20TokenAddress:E}=l,{fetchRpcUrl:D}=e.networkRegistry[o];if(!D)throw Error(`RPC URL not found for the specified chain ID`);let O=s.createCustomSolanaConnection(D),{mintPublicKey:k}=n.formatMintAddress(E),A=k.toString(),j=a.getStorageAccountPublicKey(w,C),M=a.getStorageVaultPublicKey(w,C),N=a.getMerkleAccountPublicKey(w,C),P=await h({program:S,mintPublicKey:k,mintAddressString:A,tokenAmount:u,stealthAddressStructure:r.constructStealthAddressStructure(_),recipientEncryptionKey:r.getEncryptionKeyFromRecipientInfo(_),senderPublickey:T,originalDeployer:C,storageAccount:j,storageVault:M,merkleAccount:N,createBlockedUtxos:g}),F=l.is2022Program?m.TOKEN_2022_PROGRAM_ID:m.TOKEN_PROGRAM_ID;return{connection:O,senderAddress:v,senderPublickey:T,instructions:[P],storageAccount:j,programId:F}},_=async(e,t,n,r,a,s=!1,c)=>{if(!r)throw Error(`subAccount is required`);let d=i.validateAndGetChainId([t]),[{connection:f,senderPublickey:p,instructions:m},h]=await Promise.all([g(e,d,t,n,r,a,s),e.getEthereumAddress()]),_=await l.sendProxyV0Transaction({connection:f,chainId:d,subAccount:r,payerPublicKey:p,instructions:m});return u.emitTxPublicData(o.constructAdminData(c,d,[t.erc20TokenAddress],[n],h)),_};exports.hinkalSolanaProxyShield=_;
+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;

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

@@ -1,6 +1,28 @@
+import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { SubAccount } from '../../types/proxy.types';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalSolanaProxyShield: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, createBlockedUtxos?: boolean, action?: AdminTransactionType) => Promise<string>;
-export declare const getSolanaProxyShieldSerializedTransaction: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, createBlockedUtxos?: boolean) => Promise<string>;
+type SolanaProxyShieldContext = {
+    connection: Connection;
+    senderAddress: string;
+    senderPublickey: PublicKey;
+    instructions: TransactionInstruction[];
+    storageAccount: PublicKey;
+    storageVault: PublicKey;
+    rootBucketCurrent: PublicKey;
+    programId: PublicKey;
+};
+type BuildSolanaShieldContextParams = {
+    chainId: number;
+    token: ERC20Token;
+    tokenAmount: bigint;
+    senderAddress: string;
+    recipientInfo: string;
+    createBlockedUtxos?: boolean;
+};
+export declare const buildSolanaShieldContext: ({ chainId, token, tokenAmount, senderAddress, recipientInfo, createBlockedUtxos, }: BuildSolanaShieldContextParams) => Promise<SolanaProxyShieldContext>;
+export declare const buildSolanaProxyShieldContext: (hinkal: IHinkal, chainId: number, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, createBlockedUtxos?: boolean, variableRate?: bigint) => Promise<SolanaProxyShieldContext>;
+export declare const hinkalSolanaProxyShield: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, createBlockedUtxos?: boolean, variableRate?: bigint, action?: AdminTransactionType) => Promise<string>;
+export declare const getSolanaProxyShieldSerializedTransaction: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, createBlockedUtxos?: boolean, variableRate?: bigint) => Promise<string>;
+export {};

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

@@ -1,76 +1,95 @@
 import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
-import { formatMintAddress as n } from "../../functions/utils/solanaMint.utils.mjs";
-import { constructStealthAddressStructure as r, getEncryptionKeyFromRecipientInfo as i, isValidPrivateAddress as a } from "../../functions/utils/addresses.mjs";
-import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
-import { buildAnchorStealthAddressStructure as s, getMerkleAccountPublicKey as c, getStorageAccountPublicKey as l, getStorageVaultPublicKey as u, resolveSolanaRootBuckets as d } from "../../functions/pre-transaction/solana.mjs";
-import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { createCustomSolanaConnection as p } from "../../functions/utils/create-provider.mjs";
-import { AccountActions as m } from "../AccountActions/AccountActions.mjs";
-import { sendProxyV0Transaction as h } from "../../functions/pre-transaction/sendV0Transaction.mjs";
-import { emitTxPublicData as g } from "../../API/admin-calls.mjs";
-import { buildProoflessEncryptedOutputs as _ } from "./hinkalProoflessDeposit.utils.mjs";
-import { PublicKey as v } from "@solana/web3.js";
-import { BN as y } from "@coral-xyz/anchor";
-import { TOKEN_2022_PROGRAM_ID as b, TOKEN_PROGRAM_ID as x } from "@solana/spl-token";
+import { formatMintAddress as n, getSolanaTokenProgramId as r } from "../../functions/utils/solanaMint.utils.mjs";
+import { constructStealthAddressStructure as i, getEncryptionKeyFromRecipientInfo as a, isValidPrivateAddress as o } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as s } from "../../functions/utils/token-check.utils.mjs";
+import { buildAnchorStealthAddressStructure as c, getMerkleAccountPublicKey as l, getStorageAccountPublicKey as u, getStorageVaultPublicKey as d, resolveSolanaRootBuckets as f } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
+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 { 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";
+import { BN as C } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxyShield.ts
-var S = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount: r, stealthAddressStructure: i, recipientEncryptionKey: a, senderPublickey: o, originalDeployer: c, storageAccount: l, storageVault: u, merkleAccount: f, createBlockedUtxos: p }) => {
-	let m = new y(r.toString()), h = s(i), g = n === "11111111111111111111111111111111" ? null : t, v = n === "11111111111111111111111111111111" ? null : void 0, [b] = _([i], [a]), x = Buffer.from(b.slice(2), "hex"), { current: S, next: C } = await d(e, f, 1);
-	return e.methods.prooflessDeposit(m, h, x, p).accounts({
+var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount: r, stealthAddressStructure: i, recipientEncryptionKey: a, senderPublickey: o, originalDeployer: s, storageAccount: l, storageVault: u, merkleAccount: d, rootBuckets: f, createBlockedUtxos: p }) => {
+	let m = new C(r.toString()), h = c(i), g = n === "11111111111111111111111111111111" ? null : t, _ = n === "11111111111111111111111111111111" ? null : void 0, [v] = x([i], [a]), y = Buffer.from(v.slice(2), "hex"), { current: b, next: S } = f;
+	return e.methods.prooflessDeposit(m, h, y, p).accounts({
 		mint: g,
 		signer: o,
-		signerAta: v,
-		originalDeployer: c,
+		signerAta: _,
+		originalDeployer: s,
 		storageAccount: l,
 		storageVault: u,
-		merkleAccount: f,
-		rootBucketCurrent: S,
-		rootBucketNext: C ?? e.programId,
-		storageVaultAta: v
+		merkleAccount: d,
+		rootBucketCurrent: b,
+		rootBucketNext: S ?? e.programId,
+		storageVaultAta: _
 	}).instruction();
-}, C = async (o, s, d, f, h, g, _ = !1) => {
-	let y = g ?? o.getRecipientInfo();
-	if (!a(y)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
-	let C = m.getAddressFromSubAccount(s, h);
-	if (!C) throw Error("Public account address is not available");
-	let { hinkalIdl: w, hinkalAddress: T, originalDeployer: E } = e[s].contractData;
-	if (!w) throw Error("No IDL configured for Solana program on this network");
-	if (!E) throw Error("missing original deployer");
-	let D = o.getSolanaProgram(w), O = new v(E), k = new v(T), A = new v(C), { erc20TokenAddress: j } = d, { fetchRpcUrl: M } = e[s];
-	if (!M) throw Error("RPC URL not found for the specified chain ID");
-	let N = p(M), { mintPublicKey: P } = n(j), F = P.toString(), I = l(k, O), L = u(k, O), R = c(k, O), z = await S({
-		program: D,
-		mintPublicKey: P,
-		mintAddressString: F,
-		tokenAmount: f,
-		stealthAddressStructure: r(y),
-		recipientEncryptionKey: i(y),
-		senderPublickey: A,
-		originalDeployer: O,
-		storageAccount: I,
-		storageVault: L,
-		merkleAccount: R,
-		createBlockedUtxos: _
-	}), B = d.is2022Program ? b : x;
+}, T = async ({ chainId: s, token: c, tokenAmount: p, senderAddress: h, recipientInfo: g, createBlockedUtxos: v = !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({
+		program: E,
+		mintPublicKey: j,
+		mintAddressString: M,
+		tokenAmount: p,
+		stealthAddressStructure: I,
+		recipientEncryptionKey: L,
+		senderPublickey: k,
+		originalDeployer: D,
+		storageAccount: N,
+		storageVault: P,
+		merkleAccount: F,
+		rootBuckets: R,
+		createBlockedUtxos: v
+	}), B = r(c.is2022Program);
 	return {
-		connection: N,
-		senderAddress: C,
-		senderPublickey: A,
+		connection: T,
+		senderAddress: h,
+		senderPublickey: k,
 		instructions: [z],
-		storageAccount: I,
+		storageAccount: N,
+		storageVault: P,
+		rootBucketCurrent: R.current,
 		programId: B
 	};
-}, w = async (e, t, n, r, i, a = !1, s) => {
+}, E = async (e, n, r, i, a, o, s = !1, c = 0n) => {
+	let l = h.getAddressFromSubAccount(n, a);
+	if (!l) throw Error("Public account address is not available");
+	let u = await T({
+		chainId: n,
+		token: r,
+		tokenAmount: i,
+		senderAddress: l,
+		recipientInfo: o ?? e.getRecipientInfo(),
+		createBlockedUtxos: s
+	});
+	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));
+	return {
+		...u,
+		instructions: [...f, ...u.instructions]
+	};
+}, D = async (e, t, n, r, i, a = !1, o = 0n, c) => {
 	if (!r) throw Error("subAccount is required");
-	let c = o([t]), [{ connection: l, senderPublickey: u, instructions: d }, p] = await Promise.all([C(e, c, t, n, r, i, a), e.getEthereumAddress()]), m = await h({
-		connection: l,
-		chainId: c,
+	let l = s([t]), [{ connection: u, senderPublickey: d, instructions: f }, m] = await Promise.all([E(e, l, t, n, r, i, a, o), e.getEthereumAddress()]), h = await g({
+		connection: u,
+		chainId: l,
 		subAccount: r,
-		payerPublicKey: u,
-		instructions: d
+		payerPublicKey: d,
+		instructions: f
 	});
-	return g(f(s, c, [t.erc20TokenAddress], [n], p)), m;
+	return v(p(c, l, [t.erc20TokenAddress], [n], m)), h;
 };
 //#endregion
-export { w as hinkalSolanaProxyShield };
+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{fetchRpcUrl:l}=e.networkRegistry[t];if(!l)throw Error(`RPC URL not found for the specified chain ID`);let 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)=>{let y=r.validateAndGetChainId(a),b=h===n.ExternalActionId.Lifi,[{connection:x,walletPublicKey:S,instructions:C,lookupTableAccounts:w},T,E]=await Promise.all([m(y,f,p,h),b?Promise.resolve(null):e.getRandomRelay(y),e.getEthereumAddressByChain(y)]),D=C;if(!b){if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let e=a[1],r=o[1]*(_??await c.getFeeStructure(y,g,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:y,subAccount:p,payerPublicKey:S,instructions:D,lookupTableAccounts:w});return l.emitTxPublicData(i.constructAdminData(v,y,a.map(e=>e.erc20TokenAddress),o,E,a)),O};exports.hinkalSolanaProxySwap=h;
+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)=>{let y=r.validateAndGetChainId(a),b=h===n.ExternalActionId.Lifi,[{connection:x,walletPublicKey:S,instructions:C,lookupTableAccounts:w},T,E]=await Promise.all([m(y,f,p,h),b?Promise.resolve(null):e.getRandomRelay(y),e.getEthereumAddressByChain(y)]),D=C;if(!b){if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let e=a[1],r=o[1]*(_??await c.getFeeStructure(y,g,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:y,subAccount:p,payerPublicKey:S,instructions:D,lookupTableAccounts:w});return l.emitTxPublicData(i.constructAdminData(v,y,a.map(e=>e.erc20TokenAddress),o,E,a)),O};exports.hinkalSolanaProxySwap=h;

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

@@ -45,9 +45,7 @@ var h = async (e, t) => {
 }, _ = async (t, r, i, s) => {
 	let c = o.getAddressFromSubAccount(t, i);
 	if (!c) throw Error("Public account address is not available");
-	let { fetchRpcUrl: l } = e[t];
-	if (!l) throw Error("RPC URL not found for the specified chain ID");
-	let u = a(l), f = new d(c), { instructions: p, lookupTableAccounts: m } = s === n.Lifi ? await g(u, r) : await h(u, r);
+	let { rpcUrl: l } = e[t], u = a(l), f = new d(c), { instructions: p, lookupTableAccounts: m } = s === n.Lifi ? await g(u, r) : await h(u, r);
 	return {
 		connection: u,
 		walletPublicKey: f,

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

@@ -0,0 +1,5 @@
+import { AdminTransactionType } from '../../types/admin.types';
+import { SubAccount } from '../../types/proxy.types';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalSolanaSponsoredProxySend: (hinkal: IHinkal, token: ERC20Token, tempSubAccount: SubAccount, landedAmount: bigint, recipientAddress: string, action?: AdminTransactionType) => Promise<string>;

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

@@ -0,0 +1 @@
+const e=require(`../../types/solana.types.cjs`),t=require(`../../functions/utils/token-check.utils.cjs`),n=require(`../../functions/pre-transaction/constructAdminData.cjs`),r=require(`../AccountActions/AccountActions.cjs`),i=require(`../../API/admin-calls.cjs`),a=require(`../../functions/utils/solana-sponsored.utils.cjs`);var o=async(o,s,c,l,u,d)=>{let f=t.validateAndGetChainId([s]),p=r.AccountActions.getAddressFromSubAccount(f,c);if(!p)throw Error(`Missing temp wallet address for bridge shield`);let m=await o.getRandomRelay(f,!0);if(!m)throw Error(`No Solana relayer available for bridge shield`);let{txHash:h,feeWei:g}=await a.sendSolanaSponsoredTx({chainId:f,tempSubAccount:c,intent:{kind:e.SolanaSponsoredTxKind.Shield,tokenAddress:s.erc20TokenAddress,amount:l.toString(),senderAddress:p,relayAddress:m,recipientInfo:u}}),_=l-g;return i.emitTxPublicData(n.constructAdminData(d,f,[s.erc20TokenAddress],[_],p)),{txHash:h,shieldedAmount:_}};exports.hinkalSolanaSponsoredShield=o;

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

@@ -0,0 +1,8 @@
+import { AdminTransactionType } from '../../types/admin.types';
+import { SubAccount } from '../../types/proxy.types';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalSolanaSponsoredShield: (hinkal: IHinkal, token: ERC20Token, tempSubAccount: SubAccount, landedAmount: bigint, recipientInfo: string, action?: AdminTransactionType) => Promise<{
+    txHash: string;
+    shieldedAmount: bigint;
+}>;

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

@@ -0,0 +1,31 @@
+import { SolanaSponsoredTxKind as e } from "../../types/solana.types.mjs";
+import { validateAndGetChainId as t } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as n } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as r } from "../AccountActions/AccountActions.mjs";
+import { emitTxPublicData as i } from "../../API/admin-calls.mjs";
+import { sendSolanaSponsoredTx as a } from "../../functions/utils/solana-sponsored.utils.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaSponsoredShield.ts
+var o = async (o, s, c, l, u, d) => {
+	let f = t([s]), p = r.getAddressFromSubAccount(f, c);
+	if (!p) throw Error("Missing temp wallet address for bridge shield");
+	let m = await o.getRandomRelay(f, !0);
+	if (!m) throw Error("No Solana relayer available for bridge shield");
+	let { txHash: h, feeWei: g } = await a({
+		chainId: f,
+		tempSubAccount: c,
+		intent: {
+			kind: e.Shield,
+			tokenAddress: s.erc20TokenAddress,
+			amount: l.toString(),
+			senderAddress: p,
+			relayAddress: m,
+			recipientInfo: u
+		}
+	}), _ = l - g;
+	return i(n(d, f, [s.erc20TokenAddress], [_], p)), {
+		txHash: h,
+		shieldedAmount: _
+	};
+};
+//#endregion
+export { o as hinkalSolanaSponsoredShield };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/solana-transact.types.cjs`),t=require(`../../functions/web3/events/getShieldedBalance.cjs`),n=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),r=require(`../../functions/snarkjs/common.snarkjs.cjs`),i=require(`../../functions/snarkjs/constructTxEnclave.cjs`),a=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),o=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);let s=require(`ethers`),c=require(`@solana/web3.js`);var l=(e=[])=>e.map(({accountIndexes:e,data:t,programIndex:n})=>({accountIndexes:Buffer.from(e),data:Buffer.from(t),programIndex:n})),u=(e=[])=>e.map(({pubkey:e,isSigner:t,isWritable:n})=>({pubkey:new c.PublicKey(e),isSigner:t,isWritable:n})),d=async(e,n)=>{let{inputUtxos:r,chainId:i,mintAddresses:a,amountChanges:o,useBlockedUtxos:s}=n;return r||[...await t.addPaddingToUtxos(e,i,a,o,void 0,void 0,s)]},f=(e,t,r)=>{let{amountChanges:i,recipientAddress:a,recipientAmounts:o}=e;return n.buildOutputUtxos(t,r,i,a===void 0?void 0:[a],a===void 0?void 0:[o??[]])},p=async(e,t,n)=>{let{chainId:i,mintAddresses:a,relayAddress:c,recipient:p,relayerFee:m,variableRate:h,functionName:g,hinkalInstructions:_,remainingAccounts:v,swapperAccountSalt:y,onChainCreation:b}=t,x=await d(e,t),S=f(t,n,x),C={tokenNumber:a.length,nullifierAmount:x[0].length,outputAmount:S[0].length},{proofAArr:w,proofBArr:T,proofCArr:E,publicInputsArr:D,commitmentValidationData:O,rootHashHinkalIndex:k,encryptedOutputs:A,onChainEncryptedOutput:j}=await o.constructSolanaZkProof(e.merkleTreeHinkalByChain[i],n,a,x,S,m??0n,h??0n,p,c,C,b,i,l(_),u(v),y);return{args:{proofAArr:w,proofBArr:T,proofCArr:E,publicInputsArr:D,encryptedOutputs:A,relayerFee:(m??0n).toString(),...g===`swap`?{variableRate:(h??0n).toString(),onChainEncryptedOutput:j,onChainCreation:b??[],hinkalInstructions:_??[]}:{},dimensions:C,rootHashIndex:k.toString()},commitmentValidationData:O,notes:{inputNullifiers:x.flat().filter(e=>e.amount>0n).map(e=>e.getNullifier()),outCommitments:r.buildOutCommitments(S).flat(),encryptedOutputs:A.map(e=>s.ethers.hexlify(new Uint8Array(e)))}}},m=async(e,t,n)=>{let{inputUtxos:r}=t,{jobId:a,signedMessageHash:o}=await i.prepareSolanaTxEnclaveCall(e,{chainId:t.chainId,mintAddresses:t.mintAddresses,amountChanges:t.amountChanges,relayAddress:t.relayAddress,recipient:t.recipient,signer:t.signer,functionName:t.functionName,accounts:t.accounts,onChainCreation:t.onChainCreation,relayerFee:t.relayerFee,variableRate:t.variableRate,swapperAccountSalt:t.swapperAccountSalt,hinkalInstructions:t.hinkalInstructions,remainingAccounts:t.remainingAccounts,recipientAddress:t.recipientAddress,recipientAmounts:t.recipientAmounts,recipientAmount:t.recipientAmount,displayRecipient:t.displayRecipient,useBlockedUtxos:t.useBlockedUtxos,messageSeed:t.messageSeed,inputCommitments:i.collectInputCommitments(r)},n),{R8:s,S:c}=n.signEddsa(BigInt(o));return{jobId:a,eddsaSignature:{R8:s,S:c}}},h=(t,n)=>{let{chainId:r,relayAddress:i,functionName:o,accounts:s,submit:c}=t;if(c.mode!==e.SolanaSubmitMode.Relayer)throw Error(`hinkalSolanaTransact: relayer submit expected`);return a.solanaTransactCallRelayer({chainId:r,relayAddress:i,functionName:o,args:n.args,accounts:s,commitmentValidationData:n.commitmentValidationData,adminData:c.adminData})},g=async(t,n)=>{if(t.submit.mode!==e.SolanaSubmitMode.Relayer)return n;let r=await h(t,n);return n.notes&&t.onTxSubmitLocally?.(n.notes),r},_=async(t,n)=>{if(n.userKeys&&!n.inputUtxos)throw Error(`hinkalSolanaTransact: userKeys requires explicit inputUtxos`);let r=n.userKeys??t.userKeys,{chainId:a,submit:o}=n;if(t.generateProofRemotely){let{jobId:s,eddsaSignature:c}=await m(t,n,r);if(o.mode===e.SolanaSubmitMode.Relayer)return i.finalizeSolanaTxEnclaveCallRelay(s,c,a,{adminData:o.adminData});let{solanaArgs:l,commitmentValidationData:u}=await i.finalizeSolanaTxEnclaveCall(s,c);return g(n,{args:l,commitmentValidationData:u})}return g(n,await p(t,n,r))};exports.hinkalSolanaTransact=_;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/solana-transact.types.cjs`),t=require(`../../functions/web3/events/getShieldedBalance.cjs`),n=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),r=require(`../../functions/snarkjs/common.snarkjs.cjs`),i=require(`../../functions/snarkjs/constructTxEnclave.cjs`),a=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),o=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),s=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);let c=require(`ethers`),l=require(`@solana/web3.js`);var u=(e=[])=>e.map(({accountIndexes:e,data:t,programIndex:n})=>({accountIndexes:Buffer.from(e),data:Buffer.from(t),programIndex:n})),d=(e=[])=>e.map(({pubkey:e,isSigner:t,isWritable:n})=>({pubkey:new l.PublicKey(e),isSigner:t,isWritable:n})),f=async(e,n)=>{let{inputUtxos:r,chainId:i,mintAddresses:a,amountChanges:o,useBlockedUtxos:s}=n;return r||[...await t.addPaddingToUtxos(e,i,a,o,void 0,void 0,s)]},p=(e,t,r)=>{let{amountChanges:i,recipientAddress:a,recipientAmounts:o}=e;return n.buildOutputUtxos(t,r,i,a===void 0?void 0:[a],a===void 0?void 0:[o??[]])},m=async(e,t,n)=>{let{chainId:i,mintAddresses:o,relayAddress:l,recipient:m,relayerFee:h,variableRate:g,functionName:_,hinkalInstructions:v,remainingAccounts:y,swapperAccountSalt:b,onChainCreation:x,speculative:S}=t,C=await f(e,t),w=p(t,n,C),T=e.merkleTreeHinkalByChain[i],E=S?a.speculativeMerkleTree(T,C,S.pendingLeaves):T,D={tokenNumber:o.length,nullifierAmount:C[0].length,outputAmount:w[0].length},{proofAArr:O,proofBArr:k,proofCArr:A,publicInputsArr:j,commitmentValidationData:M,rootHashHinkalIndex:N,encryptedOutputs:P,onChainEncryptedOutput:F}=await s.constructSolanaZkProof(E,n,o,C,w,h??0n,g??0n,m,l,D,x,i,u(v),d(y),b,E!==T);return{args:{proofAArr:O,proofBArr:k,proofCArr:A,publicInputsArr:j,encryptedOutputs:P,relayerFee:(h??0n).toString(),..._===`swap`?{variableRate:(g??0n).toString(),onChainEncryptedOutput:F,onChainCreation:x??[],hinkalInstructions:v??[]}:{},dimensions:D,rootHashIndex:N.toString()},commitmentValidationData:M,notes:{inputNullifiers:C.flat().filter(e=>e.amount>0n).map(e=>e.getNullifier()),outCommitments:r.buildOutCommitments(w).flat(),encryptedOutputs:P.map(e=>c.ethers.hexlify(new Uint8Array(e)))}}},h=async(e,t,n)=>{let{inputUtxos:r}=t,{jobId:a,signedMessageHash:o}=await i.prepareSolanaTxEnclaveCall(e,{chainId:t.chainId,mintAddresses:t.mintAddresses,amountChanges:t.amountChanges,relayAddress:t.relayAddress,recipient:t.recipient,signer:t.signer,functionName:t.functionName,accounts:t.accounts,onChainCreation:t.onChainCreation,relayerFee:t.relayerFee,variableRate:t.variableRate,swapperAccountSalt:t.swapperAccountSalt,hinkalInstructions:t.hinkalInstructions,remainingAccounts:t.remainingAccounts,recipientAddress:t.recipientAddress,recipientAmounts:t.recipientAmounts,recipientAmount:t.recipientAmount,displayRecipient:t.displayRecipient,useBlockedUtxos:t.useBlockedUtxos,messageSeed:t.messageSeed,inputCommitments:t.speculative?void 0:i.collectInputCommitments(r),speculative:t.speculative},n),{R8:s,S:c}=n.signEddsa(BigInt(o));return{jobId:a,eddsaSignature:{R8:s,S:c}}},g=(t,n)=>{let{chainId:r,relayAddress:i,functionName:a,accounts:s,submit:c}=t;if(c.mode!==e.SolanaSubmitMode.Relayer)throw Error(`hinkalSolanaTransact: relayer submit expected`);return o.solanaTransactCallRelayer({chainId:r,relayAddress:i,functionName:a,args:n.args,accounts:s,commitmentValidationData:n.commitmentValidationData,adminData:c.adminData})},_=async(t,n)=>{if(t.submit.mode!==e.SolanaSubmitMode.Relayer)return n;let r=await g(t,n);return n.notes&&t.onTxSubmitLocally?.(n.notes),r},v=async(t,n)=>{if(n.userKeys&&!n.inputUtxos)throw Error(`hinkalSolanaTransact: userKeys requires explicit inputUtxos`);let r=n.userKeys??t.userKeys,{chainId:a,submit:o}=n;if(t.generateProofRemotely){let{jobId:s,eddsaSignature:c}=await h(t,n,r);if(o.mode===e.SolanaSubmitMode.Relayer)return i.finalizeSolanaTxEnclaveCallRelay(s,c,a,{adminData:o.adminData});let{solanaArgs:l,commitmentValidationData:u}=await i.finalizeSolanaTxEnclaveCall(s,c);return _(n,{args:l,commitmentValidationData:u})}return _(n,await m(t,n,r))};exports.hinkalSolanaTransact=v;