@gurge/sdk 0.3.150 → 0.3.151

package/common/src/functions/pre-transaction/buildCommitmentValidationData.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../utils/solanaMint.utils.cjs`),r=require(`../snarkjs/common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`);var s=async(s,c,l,u)=>{if(r.hasOnlyZeroAmounts(u))return;let d=e.isSolanaLike(s),f=u.map(e=>e.map(e=>e.amount.toString())),p=u.map(e=>e.map(e=>e.timeStamp)),m=u.map(e=>e.map(e=>r.getUtxoCircuitInRandomization(e))),h=u.map(e=>e.map(e=>e.getConstructableParams())),g=u.map(e=>e.map(e=>e.amount===0n?`0`:BigInt(e.getCommitment()).toString())),_=await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:h}}}),v=c.getShieldedPrivateKey(),y=c.getSpendingKeyPair().pubSpendingBJJPoint,b=d?l.map(e=>{let{compressedAddress:t}=n.formatMintAddress(e);return BigInt(t).toString()}):l.map(e=>BigInt(e).toString());u.forEach((e,n)=>{e.forEach((e,r)=>{let i=e.getStealthAddress(),a=e.spendingPublicKey??y,o=e.isNewStyle&&e.H0?t.UserKeys.getStealthAddressNewStyle(e.H0,v,a):t.UserKeys.getStealthAddress(BigInt(e.randomization),v);if(BigInt(i).toString()!==BigInt(o).toString())throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`)})});let x={nullifyingPrivateKey:v,spendingPublicKey:y,erc20TokenAddresses:b,inAmounts:f,inRandomizations:m,inH0Ax:u.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:u.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:u.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:p,inCommitments:g,inNullifiers:_};if(!(!l.length||!u[0]?.length))return{tokenAddresses:b,inAmounts:f,inTimeStamps:p,inRandomizations:m,inCommitments:g,inNullifiers:_,verifierName:`commitmentCalculator${l.length}x${u[0].length}`,commitmentInput:x}},c=(e,t)=>{if(!(!e||!t))return{tokenAddresses:e.tokenAddresses,inAmounts:e.inAmounts,inTimeStamps:e.inTimeStamps,inRandomizations:e.inRandomizations,inCommitments:e.inCommitments,inNullifiers:e.inNullifiers,proof:{a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2]}}};exports.buildCommitmentValidationData=s,exports.buildCommitmentValidationDataFromProof=c;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../utils/solanaMint.utils.cjs`),r=require(`../snarkjs/common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`);var s=async(s,c,l,u)=>{if(r.hasOnlyZeroAmounts(u))return;let d=e.isSolanaLike(s),f=u.map(e=>e.map(e=>e.amount.toString())),p=u.map(e=>e.map(e=>e.timeStamp)),m=u.map(e=>e.map(e=>e.getConstructableParams())),h=u.map(e=>e.map(e=>e.amount===0n?`0`:BigInt(e.getCommitment()).toString())),g=await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:m}}}),_=c.getShieldedPrivateKey(),v=c.getSpendingKeyPair().pubSpendingBJJPoint,y=d?l.map(e=>{let{compressedAddress:t}=n.formatMintAddress(e);return BigInt(t).toString()}):l.map(e=>BigInt(e).toString());u.forEach((e,n)=>{e.forEach((e,r)=>{let i=e.getStealthAddress(),a=e.spendingPublicKey??v;if(!e.H0)throw Error(`Commitment validation missing H0 at tokenIdx=${n}, utxoIdx=${r}`);let o=t.UserKeys.getStealthAddress(e.H0,_,a);if(BigInt(i).toString()!==BigInt(o).toString())throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`)})});let b={nullifyingPrivateKey:_,spendingPublicKey:v,erc20TokenAddresses:y,inAmounts:f,inH0Ax:u.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:u.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[1].toString())),inTimeStamps:p,inCommitments:h,inNullifiers:g};if(!(!l.length||!u[0]?.length))return{tokenAddresses:y,inAmounts:f,inTimeStamps:p,inCommitments:h,inNullifiers:g,verifierName:`commitmentCalculator${l.length}x${u[0].length}`,commitmentInput:b}},c=(e,t)=>{if(!(!e||!t))return{tokenAddresses:e.tokenAddresses,inAmounts:e.inAmounts,inTimeStamps:e.inTimeStamps,inCommitments:e.inCommitments,inNullifiers:e.inNullifiers,proof:{a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2]}}};exports.buildCommitmentValidationData=s,exports.buildCommitmentValidationDataFromProof=c;

package/common/src/functions/pre-transaction/buildCommitmentValidationData.mjs

@@ -1,58 +1,56 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
 import { UserKeys as t } from "../../data-structures/crypto-keys/keys.mjs";
 import { formatMintAddress as n } from "../utils/solanaMint.utils.mjs";
-import { getUtxoCircuitH0Coords as r, getUtxoCircuitInRandomization as i, hasOnlyZeroAmounts as a } from "../snarkjs/common.snarkjs.mjs";
-import { WorkerVariant as o } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as s } from "../../webworker/performTaskWithWorker.mjs";
-import { ZKProofWorkerActionType as c } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { getUtxoCircuitH0Coords as r, hasOnlyZeroAmounts as i } from "../snarkjs/common.snarkjs.mjs";
+import { WorkerVariant as a } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as o } from "../../webworker/performTaskWithWorker.mjs";
+import { ZKProofWorkerActionType as s } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/buildCommitmentValidationData.ts
-var l = async (l, u, d, f) => {
-	if (a(f)) return;
-	let p = e(l), m = f.map((e) => e.map((e) => e.amount.toString())), h = f.map((e) => e.map((e) => e.timeStamp)), g = f.map((e) => e.map((e) => i(e))), _ = f.map((e) => e.map((e) => e.getConstructableParams())), v = f.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString())), y = await s({
-		type: o.ZKProof,
+var c = async (c, l, u, d) => {
+	if (i(d)) return;
+	let f = e(c), p = d.map((e) => e.map((e) => e.amount.toString())), m = d.map((e) => e.map((e) => e.timeStamp)), h = d.map((e) => e.map((e) => e.getConstructableParams())), g = d.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString())), _ = await o({
+		type: a.ZKProof,
 		payload: {
-			type: c.BUILD_IN_NULLIFIERS,
-			data: { inputUtxosSerialized: _ }
+			type: s.BUILD_IN_NULLIFIERS,
+			data: { inputUtxosSerialized: h }
 		}
-	}), b = u.getShieldedPrivateKey(), x = u.getSpendingKeyPair().pubSpendingBJJPoint, S = p ? d.map((e) => {
+	}), v = l.getShieldedPrivateKey(), y = l.getSpendingKeyPair().pubSpendingBJJPoint, b = f ? u.map((e) => {
 		let { compressedAddress: t } = n(e);
 		return BigInt(t).toString();
-	}) : d.map((e) => BigInt(e).toString());
-	f.forEach((e, n) => {
+	}) : u.map((e) => BigInt(e).toString());
+	d.forEach((e, n) => {
 		e.forEach((e, r) => {
-			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? x, o = e.isNewStyle && e.H0 ? t.getStealthAddressNewStyle(e.H0, b, a) : t.getStealthAddress(BigInt(e.randomization), b);
+			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? y;
+			if (!e.H0) throw Error(`Commitment validation missing H0 at tokenIdx=${n}, utxoIdx=${r}`);
+			let o = t.getStealthAddress(e.H0, v, a);
 			if (BigInt(i).toString() !== BigInt(o).toString()) throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`);
 		});
 	});
-	let C = {
-		nullifyingPrivateKey: b,
-		spendingPublicKey: x,
-		erc20TokenAddresses: S,
-		inAmounts: m,
-		inRandomizations: g,
-		inH0Ax: f.map((e) => e.map((e) => r(e)[0].toString())),
-		inH0Ay: f.map((e) => e.map((e) => r(e)[1].toString())),
-		isNewStyle: f.map((e) => e.map((e) => !!e.isNewStyle)),
-		inTimeStamps: h,
-		inCommitments: v,
-		inNullifiers: y
+	let x = {
+		nullifyingPrivateKey: v,
+		spendingPublicKey: y,
+		erc20TokenAddresses: b,
+		inAmounts: p,
+		inH0Ax: d.map((e) => e.map((e) => r(e)[0].toString())),
+		inH0Ay: d.map((e) => e.map((e) => r(e)[1].toString())),
+		inTimeStamps: m,
+		inCommitments: g,
+		inNullifiers: _
 	};
-	if (!(!d.length || !f[0]?.length)) return {
-		tokenAddresses: S,
-		inAmounts: m,
-		inTimeStamps: h,
-		inRandomizations: g,
-		inCommitments: v,
-		inNullifiers: y,
-		verifierName: `commitmentCalculator${d.length}x${f[0].length}`,
-		commitmentInput: C
+	if (!(!u.length || !d[0]?.length)) return {
+		tokenAddresses: b,
+		inAmounts: p,
+		inTimeStamps: m,
+		inCommitments: g,
+		inNullifiers: _,
+		verifierName: `commitmentCalculator${u.length}x${d[0].length}`,
+		commitmentInput: x
 	};
-}, u = (e, t) => {
+}, l = (e, t) => {
 	if (!(!e || !t)) return {
 		tokenAddresses: e.tokenAddresses,
 		inAmounts: e.inAmounts,
 		inTimeStamps: e.inTimeStamps,
-		inRandomizations: e.inRandomizations,
 		inCommitments: e.inCommitments,
 		inNullifiers: e.inNullifiers,
 		proof: {
@@ -63,4 +61,4 @@ var l = async (l, u, d, f) => {
 	};
 };
 //#endregion
-export { l as buildCommitmentValidationData, u as buildCommitmentValidationDataFromProof };
+export { c as buildCommitmentValidationData, l as buildCommitmentValidationDataFromProof };

package/common/src/functions/pre-transaction/calculateSolanaNullifierCount.cjs

@@ -1 +1 @@
-require(`../../constants/chains.constants.cjs`),require(`../web3/events/getShieldedBalance.cjs`),require(`./solana.cjs`),require(`../utils/create-provider.cjs`),require(`@solana/web3.js`);
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`../web3/events/getShieldedBalance.cjs`),r=require(`./solana.cjs`),i=require(`../utils/create-provider.cjs`),a=require(`../snarkjs/constructTxEnclave.cjs`);let o=require(`@solana/web3.js`);var s=6,c=async(c,l,u,d)=>{if(!e.isSolanaLike(l)||u.length===0||d.length===0)return 0;if(c.generateProofRemotely)try{return await a.estimateNullifiersEnclaveCall(c,{chainId:l,mintAddresses:u,amountChanges:d})}catch(e){return t.Logger.error(`calculateSolanaNullifierCount: enclave estimate failed, charging maximum rent`,e),s}let f;try{f=(await n.addPaddingToUtxos(c,l,u,d,6)).flat().filter(e=>e.amount!==0n)}catch(e){return t.Logger.log(`Error during getting inputUtxos locally:`,e),s}if(f.length===0)return 0;try{let{contractData:t,rpcUrl:n}=e.networkRegistry[l],{originalDeployer:a,hinkalIdl:s}=t;if(!a)throw Error(`Original deployer not found for chain ID`);if(!s)throw Error(`Hinkal IDL not found for chain ID`);let c=i.createCustomSolanaConnection(n),u=new o.PublicKey(a),d=new o.PublicKey(s.address),p=f.map(e=>r.getNullifierAccount(BigInt(e.getNullifier()),u,d));return(await c.getMultipleAccountsInfo(p)).filter(e=>e===null).length}catch(e){return t.Logger.error(`calculateSolanaNullifierCount: nullifier probe failed, charging for every note`,e),f.length}};exports.calculateSolanaNullifierCount=c;

package/common/src/functions/pre-transaction/calculateSolanaNullifierCount.mjs

@@ -1,5 +1,38 @@
-import "../../constants/chains.constants.mjs";
-import "../web3/events/getShieldedBalance.mjs";
-import "./solana.mjs";
-import "../utils/create-provider.mjs";
-import "@solana/web3.js";
+import { isSolanaLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { Logger as n } from "../../error-handling/logger.mjs";
+import { addPaddingToUtxos as r } from "../web3/events/getShieldedBalance.mjs";
+import { getNullifierAccount as i } from "./solana.mjs";
+import { createCustomSolanaConnection as a } from "../utils/create-provider.mjs";
+import { estimateNullifiersEnclaveCall as o } from "../snarkjs/constructTxEnclave.mjs";
+import { PublicKey as s } from "@solana/web3.js";
+//#region libs/shared/common/src/functions/pre-transaction/calculateSolanaNullifierCount.ts
+var c = 6, l = async (l, u, d, f) => {
+	if (!e(u) || d.length === 0 || f.length === 0) return 0;
+	if (l.generateProofRemotely) try {
+		return await o(l, {
+			chainId: u,
+			mintAddresses: d,
+			amountChanges: f
+		});
+	} catch (e) {
+		return n.error("calculateSolanaNullifierCount: enclave estimate failed, charging maximum rent", e), c;
+	}
+	let p;
+	try {
+		p = (await r(l, u, d, f, 6)).flat().filter((e) => e.amount !== 0n);
+	} catch (e) {
+		return n.log("Error during getting inputUtxos locally:", e), c;
+	}
+	if (p.length === 0) return 0;
+	try {
+		let { contractData: e, rpcUrl: n } = t[u], { originalDeployer: r, hinkalIdl: o } = e;
+		if (!r) throw Error("Original deployer not found for chain ID");
+		if (!o) throw Error("Hinkal IDL not found for chain ID");
+		let c = a(n), l = new s(r), d = new s(o.address), f = p.map((e) => i(BigInt(e.getNullifier()), l, d));
+		return (await c.getMultipleAccountsInfo(f)).filter((e) => e === null).length;
+	} catch (e) {
+		return n.error("calculateSolanaNullifierCount: nullifier probe failed, charging for every note", e), p.length;
+	}
+};
+//#endregion
+export { l as calculateSolanaNullifierCount };

package/common/src/functions/pre-transaction/ensureAmountChanges.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../snarkjs/common.snarkjs.cjs`);let n=require(`lodash`);var r=(r,i,a)=>{let o=t.calcAmountChanges(r,i),s=a.map(t=>t<0n?e.CIRCOM_P+t:t);if(o.length!==s.length||!(0,n.isEqual)(o,s))throw Error(`Amount changes are not equal`)};exports.ensureAmountChanges=r;
+require(`../../constants/protocol.constants.cjs`),require(`../snarkjs/common.snarkjs.cjs`),require(`lodash`);

package/common/src/functions/pre-transaction/ensureAmountChanges.mjs

@@ -1,10 +1,3 @@
-import { CIRCOM_P as e } from "../../constants/protocol.constants.mjs";
-import { calcAmountChanges as t } from "../snarkjs/common.snarkjs.mjs";
-import { isEqual as n } from "lodash";
-//#region libs/shared/common/src/functions/pre-transaction/ensureAmountChanges.ts
-var r = (r, i, a) => {
-	let o = t(r, i), s = a.map((t) => t < 0n ? e + t : t);
-	if (o.length !== s.length || !n(o, s)) throw Error("Amount changes are not equal");
-};
-//#endregion
-export { r as ensureAmountChanges };
+import "../../constants/protocol.constants.mjs";
+import "../snarkjs/common.snarkjs.mjs";
+import "lodash";

package/common/src/functions/pre-transaction/getExternalSwapAddress.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/external-action.types.cjs`);var n=(n,r)=>{let{contractData:i}=e.networkRegistry[n],a;switch(r){case t.ExternalActionId.Uniswap:a=i?.uniswapExternalActionAddress;break;case t.ExternalActionId.Odos:a=i?.odosExternalActionInstanceAddress;break;case t.ExternalActionId.OneInch:a=i?.oneInchExternalActionInstanceAddress;break;case t.ExternalActionId.Lifi:a=i?.hinkalAddress;break;default:a=i?.uniswapExternalActionAddress;break}if(!a)throw Error(`No external Address set during swap`);return a};exports.getExternalSwapAddress=n;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/external-action.types.cjs`);var n=(n,r)=>{if(r!==t.ExternalActionId.Lifi)throw Error(`Unsupported swap external action: ${r}`);let{contractData:i}=e.networkRegistry[n],a=i?.lifiExternalActionInstanceAddress;if(!a)throw Error(`No external Address set during swap`);return a};exports.getExternalSwapAddress=n;

package/common/src/functions/pre-transaction/getExternalSwapAddress.mjs

@@ -2,24 +2,8 @@ import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { ExternalActionId as t } from "../../types/external-action.types.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/getExternalSwapAddress.ts
 var n = (n, r) => {
-	let { contractData: i } = e[n], a;
-	switch (r) {
-		case t.Uniswap:
-			a = i?.uniswapExternalActionAddress;
-			break;
-		case t.Odos:
-			a = i?.odosExternalActionInstanceAddress;
-			break;
-		case t.OneInch:
-			a = i?.oneInchExternalActionInstanceAddress;
-			break;
-		case t.Lifi:
-			a = i?.hinkalAddress;
-			break;
-		default:
-			a = i?.uniswapExternalActionAddress;
-			break;
-	}
+	if (r !== t.Lifi) throw Error(`Unsupported swap external action: ${r}`);
+	let { contractData: i } = e[n], a = i?.lifiExternalActionInstanceAddress;
 	if (!a) throw Error("No external Address set during swap");
 	return a;
 };

package/common/src/functions/pre-transaction/getSolanaCalldataHash.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`);let t=require(`ethers`),n=require(`@coral-xyz/anchor`);var r=(r,i,a,o,s,c,l,u)=>{let d=new n.BN(s.toString()),f=new n.BN(c.toString()),p=o.reduce((e,t)=>[...e,...new n.BN(t.length).toArray(`be`,8),...t],[]),m=l.reduce((e,t)=>{let r=[...new n.BN(t.programIndex).toArray(`be`,1),...new n.BN(t.accountIndexes.length).toArray(`be`,8),...t.accountIndexes,...new n.BN(t.data.length).toArray(`be`,8),...t.data];return[...e,...r]},[]),h=u.reduce((e,t)=>[...e,+!!t.isWritable,...t.pubkey.toBytes()],[]),g=[r.tokenNumber,r.nullifierAmount,r.outputAmount,...i.toBytes(),...a.toBytes(),...p,...d.toArray(`be`,8),...f.toArray(`be`,8),...m,...h];return BigInt(t.ethers.sha256(new Uint8Array(g)))%e.CIRCOM_P};exports.getSolanaCalldataHash=r;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`);let t=require(`ethers`),n=require(`@coral-xyz/anchor`);var r=(r,i,a,o,s,c,l,u,d)=>{let f=new n.BN(c.toString()),p=new n.BN(l.toString()),m=o.reduce((e,t)=>[...e,...new n.BN(t.length).toArray(`be`,8),...t],[]),h=u.reduce((e,t)=>{let r=[...new n.BN(t.programIndex).toArray(`be`,1),...new n.BN(t.accountIndexes.length).toArray(`be`,8),...t.accountIndexes,...new n.BN(t.data.length).toArray(`be`,8),...t.data];return[...e,...r]},[]),g=d.reduce((e,t)=>[...e,+!!t.isWritable,...t.pubkey.toBytes()],[]),_=[r.tokenNumber,r.nullifierAmount,r.outputAmount,...i.toBytes(),...a.toBytes(),...m,...t.ethers.getBytes(s),...f.toArray(`be`,8),...p.toArray(`be`,8),...h,...g];return BigInt(t.ethers.sha256(new Uint8Array(_)))%e.CIRCOM_P};exports.getSolanaCalldataHash=r;

package/common/src/functions/pre-transaction/getSolanaCalldataHash.d.ts

@@ -1,4 +1,4 @@
 import { DimDataType } from '../../types/circom-data.types';
 import { AccountMeta, PublicKey } from '@solana/web3.js';
 import { HinkalInstruction } from './convert-okx-instructions';
-export declare const getSolanaCalldataHash: (dimensions: DimDataType, recipient: PublicKey, signer: PublicKey, encryptedOutputs: number[][], relayerFee: bigint, variableRate: bigint, instructions: HinkalInstruction[], remainingAccounts: AccountMeta[]) => bigint;
+export declare const getSolanaCalldataHash: (dimensions: DimDataType, recipient: PublicKey, signer: PublicKey, encryptedOutputs: number[][], onChainEncryptedOutput: string, relayerFee: bigint, variableRate: bigint, instructions: HinkalInstruction[], remainingAccounts: AccountMeta[]) => bigint;

package/common/src/functions/pre-transaction/getSolanaCalldataHash.mjs

@@ -2,12 +2,12 @@ import { CIRCOM_P as e } from "../../constants/protocol.constants.mjs";
 import { ethers as t } from "ethers";
 import { BN as n } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/functions/pre-transaction/getSolanaCalldataHash.ts
-var r = (r, i, a, o, s, c, l, u) => {
-	let d = new n(s.toString()), f = new n(c.toString()), p = o.reduce((e, t) => [
+var r = (r, i, a, o, s, c, l, u, d) => {
+	let f = new n(c.toString()), p = new n(l.toString()), m = o.reduce((e, t) => [
 		...e,
 		...new n(t.length).toArray("be", 8),
 		...t
-	], []), m = l.reduce((e, t) => {
+	], []), h = u.reduce((e, t) => {
 		let r = [
 			...new n(t.programIndex).toArray("be", 1),
 			...new n(t.accountIndexes.length).toArray("be", 8),
@@ -16,23 +16,24 @@ var r = (r, i, a, o, s, c, l, u) => {
 			...t.data
 		];
 		return [...e, ...r];
-	}, []), h = u.reduce((e, t) => [
+	}, []), g = d.reduce((e, t) => [
 		...e,
 		+!!t.isWritable,
 		...t.pubkey.toBytes()
-	], []), g = [
+	], []), _ = [
 		r.tokenNumber,
 		r.nullifierAmount,
 		r.outputAmount,
 		...i.toBytes(),
 		...a.toBytes(),
-		...p,
-		...d.toArray("be", 8),
-		...f.toArray("be", 8),
 		...m,
-		...h
+		...t.getBytes(s),
+		...f.toArray("be", 8),
+		...p.toArray("be", 8),
+		...h,
+		...g
 	];
-	return BigInt(t.sha256(new Uint8Array(g))) % e;
+	return BigInt(t.sha256(new Uint8Array(_))) % e;
 };
 //#endregion
 export { r as getSolanaCalldataHash };

package/common/src/functions/pre-transaction/getVolatileTransferAmount.cjs

@@ -1 +1 @@
-const e=require(`../../error-handling/logger.cjs`),t=require(`../../API/simulate-transaction.cjs`);require(`../../error-handling/index.cjs`);const n=require(`../../data-structures/token-price-fetcher/TokenChecker.cjs`);var r=async(r,i,a,o)=>{try{let e=i.map((e,t)=>{let r=a[t];return e&&n.TokenChecker.isPotentiallyVolatile(e)?{tokenAddress:e.erc20TokenAddress,amount:r.toString(),...o===void 0?{}:{targetAddress:o},originalIndex:t}:null}).filter(e=>e!==null);if(e.length===0)return a;let s=await t.simulateVolatileTokenTransfer(r,e);return a.map((t,n)=>{let r=e.findIndex(e=>e.originalIndex===n);if(r!==-1&&s[r].success){let e=s[r].balanceDifference;return e?BigInt(e):t}return t})}catch(t){return e.Logger.error(`Volatile transfer simulation failed:`,t),a}};exports.modifyVolatileTokenAmountChanges=r;
+const e=require(`../../error-handling/logger.cjs`),t=require(`../../API/simulate-transaction.cjs`),n=require(`../../data-structures/token-price-fetcher/TokenChecker.cjs`);require(`../../error-handling/index.cjs`);var r=async(r,i,a,o)=>{try{let e=i.map((e,t)=>{let r=a[t];return e&&n.TokenChecker.isPotentiallyVolatile(e)?{tokenAddress:e.erc20TokenAddress,amount:r.toString(),...o===void 0?{}:{targetAddress:o},originalIndex:t}:null}).filter(e=>e!==null);if(e.length===0)return a;let s=await t.simulateVolatileTokenTransfer(r,e);return a.map((t,n)=>{let r=e.findIndex(e=>e.originalIndex===n);if(r!==-1&&s[r].success){let e=s[r].balanceDifference;return e?BigInt(e):t}return t})}catch(t){return e.Logger.error(`Volatile transfer simulation failed:`,t),a}};exports.modifyVolatileTokenAmountChanges=r;

package/common/src/functions/pre-transaction/getVolatileTransferAmount.mjs

@@ -1,7 +1,7 @@
 import { Logger as e } from "../../error-handling/logger.mjs";
 import { simulateVolatileTokenTransfer as t } from "../../API/simulate-transaction.mjs";
-import "../../error-handling/index.mjs";
 import { TokenChecker as n } from "../../data-structures/token-price-fetcher/TokenChecker.mjs";
+import "../../error-handling/index.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/getVolatileTransferAmount.ts
 var r = async (r, i, a, o) => {
 	try {

package/common/src/functions/pre-transaction/index.cjs

@@ -1 +1 @@
-require(`./outputUtxoProcessing.cjs`),require(`./solana.cjs`),require(`./interaction-to-action.cjs`),require(`./process-gas-estimates.cjs`),require(`./getVolatileTransferAmount.cjs`),require(`./constructAdminData.cjs`),require(`./calculateSolanaNullifierCount.cjs`),require(`./addressTableLookup.cjs`),require(`./convert-okx-instructions.cjs`),require(`./sendV0Transaction.cjs`),require(`./store-proof.cjs`),require(`./sendInitNullifiersTransaction.cjs`),require(`./recipientUtxoProcessing.cjs`),require(`./store-instructions.cjs`),require(`./ensureAmountChanges.cjs`),require(`./getFeeStructure.cjs`),require(`./waitForDepositedUtxosInMerkleTree.cjs`),require(`./buildCommitmentValidationData.cjs`);
+require(`./outputUtxoProcessing.cjs`),require(`./solana.cjs`),require(`./process-gas-estimates.cjs`),require(`./getVolatileTransferAmount.cjs`),require(`./constructAdminData.cjs`),require(`./calculateSolanaNullifierCount.cjs`),require(`./addressTableLookup.cjs`),require(`./convert-okx-instructions.cjs`),require(`./sendV0Transaction.cjs`),require(`./store-proof.cjs`),require(`./sendInitNullifiersTransaction.cjs`),require(`./store-instructions.cjs`),require(`./ensureAmountChanges.cjs`),require(`./getFeeStructure.cjs`),require(`./getExternalSwapAddress.cjs`),require(`./speculativeUtxo.cjs`),require(`./buildCommitmentValidationData.cjs`);

package/common/src/functions/pre-transaction/index.d.ts

@@ -1,4 +1,3 @@
-export * from './interaction-to-action';
 export * from './outputUtxoProcessing';
 export * from './process-gas-estimates';
 export * from './getVolatileTransferAmount';
@@ -11,9 +10,10 @@ export * from './convert-okx-instructions';
 export * from './sendV0Transaction';
 export * from './store-proof';
 export * from './sendInitNullifiersTransaction';
-export * from './recipientUtxoProcessing';
 export * from './store-instructions';
 export * from './ensureAmountChanges';
 export * from './getFeeStructure';
+export * from './getExternalSwapAddress';
 export * from './waitForDepositedUtxosInMerkleTree';
+export * from './speculativeUtxo';
 export * from './buildCommitmentValidationData';

package/common/src/functions/pre-transaction/index.mjs

@@ -1,6 +1,5 @@
 import "./outputUtxoProcessing.mjs";
 import "./solana.mjs";
-import "./interaction-to-action.mjs";
 import "./process-gas-estimates.mjs";
 import "./getVolatileTransferAmount.mjs";
 import "./constructAdminData.mjs";
@@ -10,9 +9,9 @@ import "./convert-okx-instructions.mjs";
 import "./sendV0Transaction.mjs";
 import "./store-proof.mjs";
 import "./sendInitNullifiersTransaction.mjs";
-import "./recipientUtxoProcessing.mjs";
 import "./store-instructions.mjs";
 import "./ensureAmountChanges.mjs";
 import "./getFeeStructure.mjs";
-import "./waitForDepositedUtxosInMerkleTree.mjs";
+import "./getExternalSwapAddress.mjs";
+import "./speculativeUtxo.mjs";
 import "./buildCommitmentValidationData.mjs";

package/common/src/functions/pre-transaction/merge-with-fee-structure-emporium.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/amounts.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../private-wallet/emporium.helpers.cjs`),i=require(`./merge-with-fee-structure.cjs`),a=require(`../web3/getPublicAddressBalance.cjs`);var o=async(o,s,c,l,u,d,f,p)=>{let m=0n,h=p<0n?p:0n,g=await a.getPublicAddressBalance(o,s,f.feeToken,c)+h;m=g<0?f.flatFee:t.maxBigInt(f.flatFee-g,0n),m!==0n&&(await i.mergeWithFeeStructure(s,u,d,{...f,flatFee:m}),l.push(r.createTransferToEmporiumOp(f.feeToken===e.zeroAddress?void 0:o.getContractWithFetcher(s,n.ContractType.ERC20Contract,f.feeToken),c,m,!1)))};exports.mergeWithFeeStructureEmporium=o;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/amounts.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../private-wallet/emporium.helpers.cjs`),i=require(`./merge-with-fee-structure.cjs`),a=require(`../web3/getPublicAddressBalance.cjs`);var o=async(o,s,c,l,u,d,f,p)=>{let m=0n,h=p<0n?p:0n,g=await a.getPublicAddressBalance(s,f.feeToken,c)+h;m=g<0?f.flatFee:t.maxBigInt(f.flatFee-g,0n),m!==0n&&(await i.mergeWithFeeStructure(s,u,d,{...f,flatFee:m}),l.push(r.createTransferToEmporiumOp(f.feeToken===e.zeroAddress?void 0:o.getContractWithFetcherByChainId(s,n.ContractType.ERC20Contract,f.feeToken),c,m,!1)))};exports.mergeWithFeeStructureEmporium=o;

package/common/src/functions/pre-transaction/merge-with-fee-structure-emporium.mjs

@@ -6,11 +6,11 @@ import { mergeWithFeeStructure as i } from "./merge-with-fee-structure.mjs";
 import { getPublicAddressBalance as a } from "../web3/getPublicAddressBalance.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/merge-with-fee-structure-emporium.ts
 var o = async (o, s, c, l, u, d, f, p) => {
-	let m = 0n, h = p < 0n ? p : 0n, g = await a(o, s, f.feeToken, c) + h;
+	let m = 0n, h = p < 0n ? p : 0n, g = await a(s, f.feeToken, c) + h;
 	m = g < 0 ? f.flatFee : t(f.flatFee - g, 0n), m !== 0n && (await i(s, u, d, {
 		...f,
 		flatFee: m
-	}), l.push(r(f.feeToken === e ? void 0 : o.getContractWithFetcher(s, n.ERC20Contract, f.feeToken), c, m, !1)));
+	}), l.push(r(f.feeToken === e ? void 0 : o.getContractWithFetcherByChainId(s, n.ERC20Contract, f.feeToken), c, m, !1)));
 };
 //#endregion
 export { o as mergeWithFeeStructureEmporium };

package/common/src/functions/pre-transaction/outputUtxoProcessing.cjs

@@ -1 +1 @@
-const e=require(`../utils/amounts.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);var r=(r,i,a,o,s=!0,c,l)=>{let u=e.countTotalAmountInUtxos(i),{erc20TokenAddress:d,mintAddress:f}=i[0];if(s&&a<0n&&u+a<0n)throw Error(t.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let p=[new n.Utxo({amount:e.bigintMax(u+a,0n),erc20TokenAddress:d,mintAddress:f,nullifyingKey:r.getShieldedPrivateKey(),timeStamp:o,spendingPublicKey:r.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0})];if(c!==void 0&&l!==void 0){let[e,t,r,,i]=c.split(`,`);p.push(new n.Utxo({amount:l,erc20TokenAddress:d,mintAddress:f,H0:[BigInt(t),BigInt(r)],stealthAddress:e,encryptionKey:i,timeStamp:o,isNewStyle:!0}))}return{outputUtxos:p}};exports.outputUtxoProcessing=r;
+const e=require(`../utils/amounts.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../utils/time.utils.cjs`),r=require(`../../data-structures/utxo/Utxo.cjs`);var i=(n,i,a,o,s=!0,c,l)=>{let u=e.countTotalAmountInUtxos(i),{erc20TokenAddress:d,mintAddress:f}=i[0];if(s&&a<0n&&u+a<0n)throw Error(t.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let p=[new r.Utxo({amount:e.bigintMax(u+a,0n),erc20TokenAddress:d,mintAddress:f,nullifyingKey:n.getShieldedPrivateKey(),timeStamp:o,spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint})];return c!==void 0&&l!==void 0&&c.forEach((e,t)=>{let[n,i,a,,,s]=e.split(`,`);p.push(new r.Utxo({amount:l[t],erc20TokenAddress:d,mintAddress:f,H0:[BigInt(i),BigInt(a)],stealthAddress:n,encryptionKey:s,timeStamp:o}))}),{outputUtxos:p}},a=(e,t,r,a,o)=>{let s=n.getCurrentTimeInSeconds().toString();return t.map((t,n)=>i(e,t,r[n],s,!0,a,a===void 0?void 0:o?.map(e=>e[n]??0n)).outputUtxos)};exports.buildOutputUtxos=a,exports.outputUtxoProcessing=i;

package/common/src/functions/pre-transaction/outputUtxoProcessing.d.ts

@@ -1,5 +1,6 @@
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../data-structures/utxo/Utxo';
-export declare const outputUtxoProcessing: (userKeys: UserKeys, inputUtxos: Utxo[], amountChange: bigint, timeStamp?: string, revertIfNegative?: boolean, recipientAddress?: string, recipientAmountChange?: bigint) => {
+export declare const outputUtxoProcessing: (userKeys: UserKeys, inputUtxos: Utxo[], amountChange: bigint, timeStamp?: string, revertIfNegative?: boolean, recipientAddresses?: string[], recipientAmountChanges?: bigint[]) => {
     outputUtxos: Utxo[];
 };
+export declare const buildOutputUtxos: (userKeys: UserKeys, inputUtxosArray: Utxo[][], amountChanges: bigint[], recipientAddresses?: string[], recipientAmountChanges?: bigint[][]) => Utxo[][];

package/common/src/functions/pre-transaction/outputUtxoProcessing.mjs

@@ -1,33 +1,34 @@
 import { bigintMax as e, countTotalAmountInUtxos as t } from "../utils/amounts.utils.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { Utxo as r } from "../../data-structures/utxo/Utxo.mjs";
+import { getCurrentTimeInSeconds as r } from "../utils/time.utils.mjs";
+import { Utxo as i } from "../../data-structures/utxo/Utxo.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/outputUtxoProcessing.ts
-var i = (i, a, o, s, c = !0, l, u) => {
+var a = (r, a, o, s, c = !0, l, u) => {
 	let d = t(a), { erc20TokenAddress: f, mintAddress: p } = a[0];
 	if (c && o < 0n && d + o < 0n) throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let m = [new r({
+	let m = [new i({
 		amount: e(d + o, 0n),
 		erc20TokenAddress: f,
 		mintAddress: p,
-		nullifyingKey: i.getShieldedPrivateKey(),
+		nullifyingKey: r.getShieldedPrivateKey(),
 		timeStamp: s,
-		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
+		spendingPublicKey: r.getSpendingKeyPair().pubSpendingBJJPoint
 	})];
-	if (l !== void 0 && u !== void 0) {
-		let [e, t, n, , i] = l.split(",");
-		m.push(new r({
-			amount: u,
+	return l !== void 0 && u !== void 0 && l.forEach((e, t) => {
+		let [n, r, a, , , o] = e.split(",");
+		m.push(new i({
+			amount: u[t],
 			erc20TokenAddress: f,
 			mintAddress: p,
-			H0: [BigInt(t), BigInt(n)],
-			stealthAddress: e,
-			encryptionKey: i,
-			timeStamp: s,
-			isNewStyle: !0
+			H0: [BigInt(r), BigInt(a)],
+			stealthAddress: n,
+			encryptionKey: o,
+			timeStamp: s
 		}));
-	}
-	return { outputUtxos: m };
+	}), { outputUtxos: m };
+}, o = (e, t, n, i, o) => {
+	let s = r().toString();
+	return t.map((t, r) => a(e, t, n[r], s, !0, i, i === void 0 ? void 0 : o?.map((e) => e[r] ?? 0n)).outputUtxos);
 };
 //#endregion
-export { i as outputUtxoProcessing };
+export { o as buildOutputUtxos, a as outputUtxoProcessing };

package/common/src/functions/pre-transaction/sendV0Transaction.cjs

@@ -1,2 +1,2 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../utils/serialize.utils.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../../data-structures/AccountActions/AccountActions.cjs`),i=require(`../../types/fee.types.cjs`),a=require(`../web3/getSolanaPriorityFee.cjs`),o=require(`../utils/process.utils.cjs`),s=require(`../../error-handling/retrySolanaError.cjs`);let c=require(`@solana/web3.js`);require(`@solana/spl-token`);var l=5e3,u=6e4,d=async(e,t,n=`confirmed`)=>await o.pollForValue(()=>e.getTransaction(t,{commitment:n,maxSupportedTransactionVersion:0}),{timeoutMs:u,intervalMs:l})??null,f=async(r,i,a,o,s=!1)=>{try{let{blockhash:l}=await r.getLatestBlockhash(),u=new c.VersionedTransaction(new c.TransactionMessage({payerKey:i,recentBlockhash:l,instructions:[c.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}),...s?[c.ComputeBudgetProgram.requestHeapFrame({bytes:t.MAX_SOLANA_HEAP_FRAME_BYTES})]:[],...a]}).compileToV0Message(o)),d=await r.simulateTransaction(u,{sigVerify:!1,replaceRecentBlockhash:!0});d.value.err&&n.Logger.error(`Solana compute-unit simulation failed:`,{error:e.safeJsonStringify(d.value.err),logs:d.value.logs});let{unitsConsumed:f}=d.value;if(!f)return t.MAX_COMPUTE_UNIT_LIMIT;let p=Math.ceil(f*(1+t.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(t.MIN_COMPUTE_UNIT_LIMIT,Math.min(p,t.MAX_COMPUTE_UNIT_LIMIT))}catch(e){return n.Logger.error(`Solana compute-unit estimation threw:`,e),t.MAX_COMPUTE_UNIT_LIMIT}},p=(e,t,n,r)=>{let i=new Set;return t&&i.add(t.toBase58()),n?.forEach(e=>i.add(e.toBase58())),e.forEach(e=>{i.add(e.programId.toBase58()),e.keys.forEach(e=>{i.add(e.pubkey.toBase58())})}),r&&r.forEach(e=>{i.add(e.key.toBase58()),e.state.addresses.forEach(e=>{i.add(e.toBase58())})}),[...i].map(e=>new c.PublicKey(e))},m=(t,r)=>{if(!t)throw Error(`Failed to fetch Solana transaction details for signature${r?` ${r}`:``}`);if(t.meta?.err){let i=e.safeJsonStringify(t.meta.err),a=t.meta.logMessages?.join(`
-`);n.Logger.error(`Solana transaction failed on-chain`,{signature:r,error:i,logs:t.meta.logMessages});let o=r?` (signature: ${r})`:``;throw Error(a?`Solana transaction failed on-chain${o}: ${i}\n${a}`:`Solana transaction failed on-chain${o}: ${i}`)}},h=async(e,n,r,i,o,s=!1)=>{if(r.some(e=>e.programId.equals(c.ComputeBudgetProgram.programId)))return r.map(e=>e.programId.equals(c.ComputeBudgetProgram.programId)&&e.data[0]===2?c.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}):e);let l=r.filter(e=>!e.programId.equals(c.ComputeBudgetProgram.programId)),u=await f(e,n,l,i,s),d=c.ComputeBudgetProgram.setComputeUnitLimit({units:u}),m=e.rpcEndpoint.includes(`helius`)?await a.getSolanaPriorityFee(p(l,n,[c.ComputeBudgetProgram.programId],i),o):0;return[d,c.ComputeBudgetProgram.setComputeUnitPrice({microLamports:m}),...s?[c.ComputeBudgetProgram.requestHeapFrame({bytes:t.MAX_SOLANA_HEAP_FRAME_BYTES})]:[],...l]},g=async({connection:e,chainId:t,subAccount:n,payerPublicKey:a,instructions:o,lookupTableAccounts:l})=>{let u=r.AccountActions.getPrivateKeyFromSubAccount(t,n);if(!u)throw Error(`Private key is not available`);for(let t=0;t<10;t+=1){let n=t===9;try{let t=await h(e,a,o,l,n?i.SolanaPriorityFeeMode.HIGH:i.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:s,lastValidBlockHeight:f}=await e.getLatestBlockhash(),p=new c.VersionedTransaction(new c.TransactionMessage({payerKey:a,recentBlockhash:s,instructions:t}).compileToV0Message(l)),g=await r.AccountActions.sendAndSignSolanaTransactionFromPrivateKey(e,u,p,!0);return await e.confirmTransaction({signature:g,blockhash:s,lastValidBlockHeight:f},`confirmed`),m(await d(e,g),g),g}catch(e){if(s.shouldRetryForSolanaError(e)&&!n)continue;throw e}}throw Error(`Failed to send proxy v0 transaction due to expired blockheight after all retries`)};exports.estimateComputeUnitLimit=f,exports.fetchSolanaTransaction=d,exports.getAccountsFromInstructions=p,exports.sendProxyV0Transaction=g;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../utils/serialize.utils.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../../data-structures/AccountActions/AccountActions.cjs`),i=require(`../../types/fee.types.cjs`),a=require(`../../API/solana-priority-fee.cjs`),o=require(`../utils/process.utils.cjs`),s=require(`../../error-handling/retrySolanaError.cjs`);let c=require(`@solana/web3.js`);require(`@solana/spl-token`);var l=5e3,u=6e4,d=async(e,t,n=`confirmed`)=>await o.pollForValue(()=>e.getTransaction(t,{commitment:n,maxSupportedTransactionVersion:0}),{timeoutMs:u,intervalMs:l})??null,f=async(r,i,a,o,s=!1)=>{try{let{blockhash:l}=await r.getLatestBlockhash(),u=new c.VersionedTransaction(new c.TransactionMessage({payerKey:i,recentBlockhash:l,instructions:[c.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}),...s?[c.ComputeBudgetProgram.requestHeapFrame({bytes:t.MAX_SOLANA_HEAP_FRAME_BYTES})]:[],...a]}).compileToV0Message(o)),d=await r.simulateTransaction(u,{sigVerify:!1,replaceRecentBlockhash:!0});d.value.err&&n.Logger.error(`Solana compute-unit simulation failed:`,{error:e.safeJsonStringify(d.value.err),logs:d.value.logs});let{unitsConsumed:f}=d.value;if(!f)return t.MAX_COMPUTE_UNIT_LIMIT;let p=Math.ceil(f*(1+t.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(t.MIN_COMPUTE_UNIT_LIMIT,Math.min(p,t.MAX_COMPUTE_UNIT_LIMIT))}catch(e){return n.Logger.error(`Solana compute-unit estimation threw:`,e),t.MAX_COMPUTE_UNIT_LIMIT}},p=(e,t,n,r)=>{let i=new Set;return t&&i.add(t.toBase58()),n?.forEach(e=>i.add(e.toBase58())),e.forEach(e=>{i.add(e.programId.toBase58()),e.keys.forEach(e=>{i.add(e.pubkey.toBase58())})}),r&&r.forEach(e=>{i.add(e.key.toBase58()),e.state.addresses.forEach(e=>{i.add(e.toBase58())})}),[...i].map(e=>new c.PublicKey(e))},m=(t,r)=>{if(!t)throw Error(`Failed to fetch Solana transaction details for signature${r?` ${r}`:``}`);if(t.meta?.err){let i=e.safeJsonStringify(t.meta.err),a=t.meta.logMessages?.join(`
+`);n.Logger.error(`Solana transaction failed on-chain`,{signature:r,error:i,logs:t.meta.logMessages});let o=r?` (signature: ${r})`:``;throw Error(a?`Solana transaction failed on-chain${o}: ${i}\n${a}`:`Solana transaction failed on-chain${o}: ${i}`)}},h=async(e,n,r,i,o,s=!1)=>{if(r.some(e=>e.programId.equals(c.ComputeBudgetProgram.programId)))return r.map(e=>e.programId.equals(c.ComputeBudgetProgram.programId)&&e.data[0]===2?c.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}):e);let l=r.filter(e=>!e.programId.equals(c.ComputeBudgetProgram.programId)),u=await f(e,n,l,i,s),d=c.ComputeBudgetProgram.setComputeUnitLimit({units:u}),m=await a.getSolanaPriorityFeeFromServer(p(l,n,[c.ComputeBudgetProgram.programId],i),o);return[d,...m>0?[c.ComputeBudgetProgram.setComputeUnitPrice({microLamports:m})]:[],...s?[c.ComputeBudgetProgram.requestHeapFrame({bytes:t.MAX_SOLANA_HEAP_FRAME_BYTES})]:[],...l]},g=async({connection:e,chainId:t,subAccount:n,payerPublicKey:a,instructions:o,lookupTableAccounts:l})=>{let u=r.AccountActions.getPrivateKeyFromSubAccount(t,n);if(!u)throw Error(`Private key is not available`);for(let t=0;t<10;t+=1){let n=t===9;try{let t=await h(e,a,o,l,n?i.SolanaPriorityFeeMode.HIGH:i.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:s,lastValidBlockHeight:f}=await e.getLatestBlockhash(),p=new c.VersionedTransaction(new c.TransactionMessage({payerKey:a,recentBlockhash:s,instructions:t}).compileToV0Message(l)),g=await r.AccountActions.sendAndSignSolanaTransactionFromPrivateKey(e,u,p,!0);return await e.confirmTransaction({signature:g,blockhash:s,lastValidBlockHeight:f},`confirmed`),m(await d(e,g),g),g}catch(e){if(s.shouldRetryForSolanaError(e)&&!n)continue;throw e}}throw Error(`Failed to send proxy v0 transaction due to expired blockheight after all retries`)};exports.estimateComputeUnitLimit=f,exports.fetchSolanaTransaction=d,exports.getAccountsFromInstructions=p,exports.handleSolanaTransactionError=m,exports.sendProxyV0Transaction=g;

package/common/src/functions/pre-transaction/sendV0Transaction.d.ts

@@ -1,9 +1,11 @@
-import { AddressLookupTableAccount, Connection, Finality, Keypair, PublicKey, TransactionInstruction, VersionedTransactionResponse } from '@solana/web3.js';
+import { AddressLookupTableAccount, Connection, Finality, Keypair, PublicKey, TransactionInstruction, VersionedTransaction, VersionedTransactionResponse } from '@solana/web3.js';
 import { SubAccount } from '../../types/proxy.types';
 export declare const fetchSolanaTransaction: (connection: Connection, signature: string, finality?: Finality) => Promise<VersionedTransactionResponse | null>;
 export declare const estimateComputeUnitLimit: (connection: Connection, payerKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[], requestHeapFrame?: boolean) => Promise<number>;
 export declare const getAccountsFromInstructions: (instructions: TransactionInstruction[], payerKey?: PublicKey, additionalAccounts?: PublicKey[], lookupTableAccounts?: AddressLookupTableAccount[]) => PublicKey[];
+export declare const handleSolanaTransactionError: (transactionResponse: VersionedTransactionResponse | null, signature?: string) => void;
 export declare const sendV0Transaction: (connection: Connection, instructions: TransactionInstruction[], payer: Keypair, signers: Keypair[], lookupTableAccounts?: AddressLookupTableAccount[], requestHeapFrame?: boolean) => Promise<string>;
+export declare const sendSignedV0Transaction: (connection: Connection, transaction: VersionedTransaction) => Promise<string>;
 export declare const ensureAtaExists: (connection: Connection, payer: Keypair, mintPubkey: PublicKey | null, owner: PublicKey) => Promise<PublicKey | null>;
 type SendProxyV0TransactionParams = {
     connection: Connection;
@@ -14,5 +16,6 @@ type SendProxyV0TransactionParams = {
     lookupTableAccounts?: AddressLookupTableAccount[];
 };
 export declare const sendProxyV0Transaction: ({ connection, chainId, subAccount, payerPublicKey, instructions, lookupTableAccounts, }: SendProxyV0TransactionParams) => Promise<string>;
-export declare const serializeProxyV0Transaction: (connection: Connection, payerPublicKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
+export declare const buildProxyV0Transaction: (connection: Connection, signerPublicKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[], feePayerPublicKey?: PublicKey) => Promise<VersionedTransaction>;
+export declare const serializeProxyV0Transaction: (connection: Connection, signerPublicKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[], feePayerPublicKey?: PublicKey) => Promise<string>;
 export {};

package/common/src/functions/pre-transaction/sendV0Transaction.mjs

@@ -3,7 +3,7 @@ import { COMPUTE_UNIT_PADDING_PERCENTAGE as t, MAX_COMPUTE_UNIT_LIMIT as n, MAX_
 import { Logger as a } from "../../error-handling/logger.mjs";
 import { AccountActions as o } from "../../data-structures/AccountActions/AccountActions.mjs";
 import { SolanaPriorityFeeMode as s } from "../../types/fee.types.mjs";
-import { getSolanaPriorityFee as c } from "../web3/getSolanaPriorityFee.mjs";
+import { getSolanaPriorityFeeFromServer as c } from "../../API/solana-priority-fee.mjs";
 import { pollForValue as l } from "../utils/process.utils.mjs";
 import { shouldRetryForSolanaError as u } from "../../error-handling/retrySolanaError.mjs";
 import { ComputeBudgetProgram as d, PublicKey as f, TransactionMessage as p, VersionedTransaction as m } from "@solana/web3.js";
@@ -65,10 +65,10 @@ var h = 5e3, g = 6e4, _ = async (e, t, n = "confirmed") => await l(() => e.getTr
 	}
 }, x = async (e, t, i, a, o, s = !1) => {
 	if (i.some((e) => e.programId.equals(d.programId))) return i.map((e) => e.programId.equals(d.programId) && e.data[0] === 2 ? d.setComputeUnitLimit({ units: n }) : e);
-	let l = i.filter((e) => !e.programId.equals(d.programId)), u = await v(e, t, l, a, s), f = d.setComputeUnitLimit({ units: u }), p = e.rpcEndpoint.includes("helius") ? await c(y(l, t, [d.programId], a), o) : 0;
+	let l = i.filter((e) => !e.programId.equals(d.programId)), u = await v(e, t, l, a, s), f = d.setComputeUnitLimit({ units: u }), p = await c(y(l, t, [d.programId], a), o);
 	return [
 		f,
-		d.setComputeUnitPrice({ microLamports: p }),
+		...p > 0 ? [d.setComputeUnitPrice({ microLamports: p })] : [],
 		...s ? [d.requestHeapFrame({ bytes: r })] : [],
 		...l
 	];
@@ -96,4 +96,4 @@ var h = 5e3, g = 6e4, _ = async (e, t, n = "confirmed") => await l(() => e.getTr
 	throw Error("Failed to send proxy v0 transaction due to expired blockheight after all retries");
 };
 //#endregion
-export { v as estimateComputeUnitLimit, _ as fetchSolanaTransaction, y as getAccountsFromInstructions, S as sendProxyV0Transaction };
+export { v as estimateComputeUnitLimit, _ as fetchSolanaTransaction, y as getAccountsFromInstructions, b as handleSolanaTransactionError, S as sendProxyV0Transaction };

package/common/src/functions/pre-transaction/solana-public-signals.d.ts

@@ -3,6 +3,7 @@ export declare const convertSolanaPublicSignals: (publicInputsArr: number[][], d
     nullifierAmount: number;
     outputAmount: number;
 }) => {
+    outH1Ax: number[];
     outH1Ay: number[];
     outStealthAddress: number[];
     message: number[];

package/common/src/functions/pre-transaction/solana.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`@solana/web3.js`),n=require(`@coral-xyz/anchor`);var r=e=>new TextEncoder().encode(e),i=e=>{let t=[],n=e;for(;n>0n;)t.unshift(Number(n%256n)),n/=256n;for(;t.length<32;)t.unshift(0);return t},a=e=>({extraRandomization:i(e.extraRandomization),stealthAddress:i(e.stealthAddress),h0:i(e.H0),h1:i(e.H1)}),o=(e,n)=>{let i=[r(`hinkal`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},s=(e,n)=>{let i=[r(`hinkal_merkle`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},c=(e,i,a)=>{let o=[r(`hinkal_swapper`),i.toBytes(),new Uint8Array(new n.BN(a.toString()).toArray(`be`,32))],[s]=t.PublicKey.findProgramAddressSync(o,e);return s},l=(t,n,r)=>c(t,n,e.poseidonFunction(r)),u=(e,n)=>{let i=[r(`hinkal_vault`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a};exports.buildAnchorStealthAddressStructure=a,exports.encodeToByte32Array=i,exports.getMerkleAccountPublicKey=s,exports.getStorageAccountPublicKey=o,exports.getStorageVaultPublicKey=u,exports.getSwapperAccountPublicKey=c,exports.getSwapperAccountPublicKeyFromSalt=l;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../crypto/poseidon.cjs`);let n=require(`@solana/web3.js`),r=require(`@coral-xyz/anchor`);var i=e=>new TextEncoder().encode(e),a=e=>{let t=[],n=e;for(;n>0n;)t.unshift(Number(n%256n)),n/=256n;for(;t.length<32;)t.unshift(0);return t},o=e=>({h0X:a(e.H0x),h0Y:a(e.H0y),h1X:a(e.H1x),h1Y:a(e.H1y),stealthAddress:a(e.stealthAddress)}),s=(e,t,r)=>{let o=a(e),s=[i(`hinkal_nullifier`),t.toBytes(),new Uint8Array(o)],[c]=n.PublicKey.findProgramAddressSync(s,r);return c},c=(e,t)=>{let r=[i(`hinkal`),t.toBytes()],[a]=n.PublicKey.findProgramAddressSync(r,e);return a},l=(e,t)=>{let r=[i(`hinkal_merkle`),t.toBytes()],[a]=n.PublicKey.findProgramAddressSync(r,e);return a},u=327680n,d=e=>2n**(e-1n),f=e=>e/u,p=e=>e%u,m=(e,t,a)=>{let o=[i(`hinkal_root_bucket`),t.toBytes(),new Uint8Array(new r.BN(a.toString()).toArray(`le`,8))],[s]=n.PublicKey.findProgramAddressSync(o,e);return s},h=async(e,t)=>{let n=await e.account.merkle.fetch(t);return BigInt(`0x${Buffer.from(n.mIndex).toString(`hex`)}`)},g=async(t,n,r)=>{let i=await h(t,n)-d(e.MERKLE_LEVELS),a=f(i);return{current:m(t.programId,n,a),next:i%327680n+BigInt(r)>327680n?m(t.programId,n,a+1n):null}},_=(e,t,a)=>{let o=[i(`hinkal_swapper`),t.toBytes(),new Uint8Array(new r.BN(a.toString()).toArray(`be`,32))],[s]=n.PublicKey.findProgramAddressSync(o,e);return s},v=(e,n,r)=>_(e,n,t.poseidonFunction(r)),y=(e,t)=>{let r=[i(`hinkal_vault`),t.toBytes()],[a]=n.PublicKey.findProgramAddressSync(r,e);return a};exports.ROOT_BUCKET_CAP=u,exports.buildAnchorStealthAddressStructure=o,exports.encodeToByte32Array=a,exports.fetchSolanaMIndex=h,exports.getMerkleAccountPublicKey=l,exports.getMerkleMinimumIndex=d,exports.getNullifierAccount=s,exports.getRootBucketIndex=f,exports.getRootBucketPublicKey=m,exports.getRootBucketSlot=p,exports.getStorageAccountPublicKey=c,exports.getStorageVaultPublicKey=y,exports.getSwapperAccountPublicKey=_,exports.getSwapperAccountPublicKeyFromSalt=v,exports.resolveSolanaRootBuckets=g;

package/common/src/functions/pre-transaction/solana.d.ts

@@ -1,3 +1,4 @@
+import { Idl, Program } from '@coral-xyz/anchor';
 import { AnchorStealthAddressStructure, StealthAddressStructure } from '../../types/circom-data.types';
 import { PublicKey } from '@solana/web3.js';
 export declare const encodeToByte32Array: (value: bigint) => number[];
@@ -5,6 +6,18 @@ export declare const buildAnchorStealthAddressStructure: (structure: StealthAddr
 export declare const getNullifierAccount: (nullifier: bigint, originalDeployer: PublicKey, programId: PublicKey) => PublicKey;
 export declare const getStorageAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getMerkleAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
+export declare const ROOT_BUCKET_CAP = 327680n;
+export declare const getMerkleMinimumIndex: (levels: bigint) => bigint;
+export declare const getRootBucketIndex: (relativeIndex: bigint) => bigint;
+export declare const getRootBucketSlot: (relativeIndex: bigint) => bigint;
+export declare const getRootBucketIndexFromAbsolute: (absoluteIndex: bigint, levels: bigint) => bigint;
+export declare const getRootBucketPublicKey: (programId: PublicKey, merkleAccount: PublicKey, bucketIndex: bigint) => PublicKey;
+export declare const fetchSolanaMIndex: (program: Program<Idl>, merkleAccount: PublicKey) => Promise<bigint>;
+export declare const resolveSolanaRootBuckets: (program: Program<Idl>, merkleAccount: PublicKey, insertCount: number) => Promise<{
+    current: PublicKey;
+    next: PublicKey | null;
+}>;
+export declare const resolveSolanaVerifyBucket: (programId: PublicKey, merkleAccount: PublicKey, rootIndexAbsolute: bigint) => PublicKey;
 export declare const getSwapperAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey, swapperAccountAdditionalSeed: bigint) => PublicKey;
 export declare const getSwapperAccountPublicKeyFromSalt: (programId: PublicKey, originalDeployer: PublicKey, swapperAccountSalt: bigint) => PublicKey;
 export declare const getStorageVaultPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;