@hinkal/common 0.2.31 → 0.2.33

package/functions/index.mjs

@@ -2,18 +2,20 @@ import "./utils/serialize.utils.mjs";
 import "./utils/get-signature-header.mjs";
 import "./utils/caseInsensitive.utils.mjs";
 import "./utils/addresses.mjs";
+import "./utils/auth.utils.mjs";
 import "./kyc/openDefaultPassportWindow.mjs";
 import "./web3/etherFunctions.mjs";
 import "./utils/amounts.utils.mjs";
 import "./utils/erc20tokenFunctions.mjs";
+import "./utils/bytes32.utils.mjs";
 import "./utils/time.utils.mjs";
-import "./pre-transaction/solana.mjs";
-import "./web3/functionCalls/accessTokenCalls.mjs";
+import "./utils/bit.operations.mjs";
 import "./utils/upToDateState.mjs";
 import "./utils/getDataFromTransaction.mjs";
-import "./utils/getContractAddress.mjs";
 import "./utils/cacheFunctions.mjs";
+import "./utils/encryptInputForEnclave.mjs";
 import "./utils/solanaMint.utils.mjs";
+import "./utils/customEnclaveFunctionsRegister.mjs";
 import "./utils/tron.utils.mjs";
 import "./web3/events/getInputUtxoAndBalance.mjs";
 import "./utils/string.utils.mjs";
@@ -23,8 +25,10 @@ import "./web3/events/getShieldedBalance.mjs";
 import "./pre-transaction/outputUtxoProcessing.mjs";
 import "./utils/external-action.utils.mjs";
 import "./snarkjs/common.snarkjs.mjs";
+import "./pre-transaction/solana.mjs";
+import "./snarkjs/signedMessageHash.mjs";
 import "./snarkjs/generateZkProof.mjs";
-import "./utils/fees.utils.mjs";
+import "./utils/serialize-utxos.utils.mjs";
 import "./utils/create-provider.mjs";
 import "./utils/requireEnv.mjs";
 import "./utils/resolve-sync.utils.mjs";
@@ -32,10 +36,9 @@ import "./utils/convertIntegrationProviderToExternalActionId.mjs";
 import "./pre-transaction/interaction-to-action.mjs";
 import "./pre-transaction/process-gas-estimates.mjs";
 import "./pre-transaction/getFlatFees.mjs";
-import "./utils/processUseApprovalUtxoData.mjs";
-import "./pre-transaction/outputApprovalDataProcessing.mjs";
 import "./pre-transaction/getVolatileTransferAmount.mjs";
 import "./pre-transaction/constructAdminData.mjs";
+import "./pre-transaction/calculateSolanaNullifierCount.mjs";
 import "./pre-transaction/addressTableLookup.mjs";
 import "./pre-transaction/solana-public-signals.mjs";
 import "./pre-transaction/convert-okx-instructions.mjs";
@@ -43,15 +46,13 @@ import "./web3/getSolanaPriorityFee.mjs";
 import "./utils/process.utils.mjs";
 import "./pre-transaction/sendV0Transaction.mjs";
 import "./pre-transaction/store-proof.mjs";
-import "./utils/bytes32.utils.mjs";
 import "./pre-transaction/sendInitNullifiersTransaction.mjs";
-import "./pre-transaction/initTokenLimitIfNeeded.mjs";
 import "./pre-transaction/recipientUtxoProcessing.mjs";
 import "./pre-transaction/store-instructions.mjs";
 import "./pre-transaction/ensureAmountChanges.mjs";
 import "./pre-transaction/getFeeStructure.mjs";
-import "./pre-transaction/getKycAndSignatureData.mjs";
 import "./pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import "./pre-transaction/buildCommitmentValidationData.mjs";
 import "./pre-transaction/index.mjs";
 import "./utils/evmNetworkFunctions.mjs";
 import "./utils/userAgent.mjs";
@@ -72,30 +73,35 @@ import "./utils/inLogicMetadata.mjs";
 import "./utils/networks.utils.mjs";
 import "./utils/is-valid-url.mjs";
 import "./utils/postToOffscreen.mjs";
+import "./utils/solanaSendPreflight.utils.mjs";
 import "./utils/prepareHinkal.mjs";
+import "./utils/getContractAddress.mjs";
 import "./utils/getUtxosFromReceipt.utils.mjs";
 import "./utils/getUtxosFromReceiptSolana.mjs";
+import "./utils/fees.utils.mjs";
 import "./utils/proxyAvatar.utils.mjs";
 import "./utils/validateUsername.mjs";
-import "./utils/serialize-utxos.utils.mjs";
 import "./utils/enclave-utxo-storage.mjs";
 import "./utils/enclave-signature-storage.mjs";
 import "./utils/tx-confirmation.utils.mjs";
 import "./utils/buildClaimableDepositPlan.mjs";
+import "./utils/pay-routing.utils.mjs";
+import "./utils/formatter.mjs";
 import "./utils/tronSimulation.utils.mjs";
 import "./utils/getSignerFromContract.mjs";
+import "./utils/deposit-claimable.utils.mjs";
+import "./utils/transfer-claimable.utils.mjs";
 import "./utils/getWalletGroupKey.utils.mjs";
+import "./web3/events/balanceChangedHandler.mjs";
+import "./utils/dispatchBalanceRefreshes.mjs";
+import "./utils/lifi.utils.mjs";
+import "./utils/enclave-recipient-info-storage.mjs";
+import "./utils/solana-memo.mjs";
+import "./utils/mnemonics.mjs";
 import "./utils/index.mjs";
 import "./snarkjs/fetchOnChainRootHashes.mjs";
-import "./snarkjs/constructGeneralZkProof.mjs";
 import "./private-wallet/emporium.helpers.mjs";
-import "./snarkjs/constructEmporiumProof.mjs";
-import "./snarkjs/constructSolanaZkProof.mjs";
-import "./snarkjs/index.mjs";
-import "./kyc/passportHelper.mjs";
-import "./web3/events/balanceChangedHandler.mjs";
-import "./web3/events/balanceChangedCustomHandler.mjs";
-import "./web3/events/getApprovedBalance.mjs";
+import "./snarkjs/constructGeneralZkProof.mjs";
 import "./web3/events/getTransactionLogEvents.mjs";
 import "./web3/uniswapAPI.mjs";
 import "./web3/odosAPI.mjs";
@@ -107,9 +113,12 @@ import "./web3/getTokenHolder.mjs";
 import "./web3/EIP-712.mjs";
 import "./web3/signAndSendSerializedTransaction.mjs";
 import "./web3/connectors.utils.mjs";
-import "./web3/tron-wagmi-adapter.mjs";
 import "./web3/crypto.mjs";
 import "./web3/index.mjs";
+import "./snarkjs/constructSolanaZkProof.mjs";
+import "./snarkjs/verifyCommitmentValidationData.mjs";
+import "./snarkjs/index.mjs";
+import "./kyc/passportHelper.mjs";
 import "./kyc/checkTokenLimitsUSD.mjs";
 import "./kyc/index.mjs";
 import "./private-wallet/opProducer.mjs";

package/functions/kyc/checkTokenLimitsUSD.cjs

@@ -1 +1 @@
-const e=require(`../../API/getTokenPrice.cjs`);require(`../../constants/kyc.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../web3/etherFunctions.cjs`),r=require(`../utils/erc20tokenFunctions.cjs`);require(`../../constants/index.cjs`),require(`../../API/index.cjs`),require(`../../error-handling/index.cjs`),require(`../utils/index.cjs`),require(`../web3/index.cjs`);var i=async(i,a,o)=>{if(!a.length||!o.length)return!1;let s=a.map(e=>r.getERC20Token(e,i)),c=[];try{c=(await e.getTokenPrices(i,a)).prices||[]}catch{throw Error(t.transactionErrorCodes.KYC_PRICE_FETCH_FAILED)}for(let e=0;e<a.length;e++){let t=s[e],r=o[e],i=c[e];if(!t||r===0n||!i)continue;let a=n.getAmountInToken(t,r);if(Number(a)*i>1e4)return!0}return!1};exports.checkTokenLimitsUSD=i;
+const e=require(`../../API/getTokenPrice.cjs`),t=require(`../../constants/kyc.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../web3/etherFunctions.cjs`),i=require(`../utils/erc20tokenFunctions.cjs`);require(`../../constants/index.cjs`),require(`../../API/index.cjs`),require(`../../error-handling/index.cjs`),require(`../utils/index.cjs`),require(`../web3/index.cjs`);var a=async(a,o,s)=>{if(!o.length||!s.length)return!1;let c=o.map(e=>i.getERC20Token(e,a)),l=[];try{l=(await e.getTokenPrices(a,o)).prices||[]}catch{throw Error(n.transactionErrorCodes.KYC_PRICE_FETCH_FAILED)}for(let e=0;e<o.length;e++){let n=c[e],i=s[e],a=l[e];if(!n||i===0n||!a)continue;let o=r.getAmountInToken(n,i);if(Number(o)*a>t.KYC_LIMIT)return!0}return!1};exports.checkTokenLimitsUSD=a;

package/functions/kyc/checkTokenLimitsUSD.mjs

@@ -1,29 +1,29 @@
 import { getTokenPrices as e } from "../../API/getTokenPrice.mjs";
-import "../../constants/kyc.constants.mjs";
-import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
-import { getAmountInToken as n } from "../web3/etherFunctions.mjs";
-import { getERC20Token as r } from "../utils/erc20tokenFunctions.mjs";
+import { KYC_LIMIT as t } from "../../constants/kyc.constants.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInToken as r } from "../web3/etherFunctions.mjs";
+import { getERC20Token as i } from "../utils/erc20tokenFunctions.mjs";
 import "../../constants/index.mjs";
 import "../../API/index.mjs";
 import "../../error-handling/index.mjs";
 import "../utils/index.mjs";
 import "../web3/index.mjs";
 //#region libs/shared/common/src/functions/kyc/checkTokenLimitsUSD.ts
-var i = async (i, a, o) => {
-	if (!a.length || !o.length) return !1;
-	let s = a.map((e) => r(e, i)), c = [];
+var a = async (a, o, s) => {
+	if (!o.length || !s.length) return !1;
+	let c = o.map((e) => i(e, a)), l = [];
 	try {
-		c = (await e(i, a)).prices || [];
+		l = (await e(a, o)).prices || [];
 	} catch {
-		throw Error(t.KYC_PRICE_FETCH_FAILED);
+		throw Error(n.KYC_PRICE_FETCH_FAILED);
 	}
-	for (let e = 0; e < a.length; e++) {
-		let t = s[e], r = o[e], i = c[e];
-		if (!t || r === 0n || !i) continue;
-		let a = n(t, r);
-		if (Number(a) * i > 1e4) return !0;
+	for (let e = 0; e < o.length; e++) {
+		let n = c[e], i = s[e], a = l[e];
+		if (!n || i === 0n || !a) continue;
+		let o = r(n, i);
+		if (Number(o) * a > t) return !0;
 	}
 	return !1;
 };
 //#endregion
-export { i as checkTokenLimitsUSD };
+export { a as checkTokenLimitsUSD };

package/functions/kyc/index.cjs

@@ -1 +1 @@
-require(`./openDefaultPassportWindow.cjs`),require(`../web3/functionCalls/accessTokenCalls.cjs`),require(`./passportHelper.cjs`),require(`./checkTokenLimitsUSD.cjs`);
+require(`./openDefaultPassportWindow.cjs`),require(`./passportHelper.cjs`),require(`./checkTokenLimitsUSD.cjs`);

package/functions/kyc/index.d.ts

@@ -1,4 +1,3 @@
-export * from '../web3/functionCalls/accessTokenCalls';
 export * from './passportHelper';
 export * from './openDefaultPassportWindow';
 export * from './checkTokenLimitsUSD';

package/functions/kyc/index.mjs

@@ -1,4 +1,3 @@
 import "./openDefaultPassportWindow.mjs";
-import "../web3/functionCalls/accessTokenCalls.mjs";
 import "./passportHelper.mjs";
 import "./checkTokenLimitsUSD.mjs";

package/functions/pre-transaction/addressTableLookup.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/time.utils.cjs`);let n=require(`@solana/web3.js`);var r=async(e,t)=>{if(!t)return;let r=[...new Set(t)];return Promise.all(r.map(async t=>{let r=(await e.connection.getAddressLookupTable(new n.PublicKey(t))).value;if(!r)throw Error(`failed to fetch lookup table ${t}`);return r}))},i=async(r,i,a)=>{let[o,{blockhash:s}]=await Promise.all([r.connection.getSlot(`finalized`),r.connection.getLatestBlockhash(`finalized`)]),c=o,[l,u]=n.AddressLookupTableProgram.createLookupTable({authority:a.publicKey,payer:a.publicKey,recentSlot:c}),d=n.ComputeBudgetProgram.setComputeUnitPrice({microLamports:e.MAX_MICRO_LAMPORTS_PER_CU}),f=new n.Transaction().add(d).add(l);f.recentBlockhash=s,f.feePayer=a.publicKey,f.sign(a),await(0,n.sendAndConfirmTransaction)(r.connection,f,[a],{commitment:`confirmed`});for(let e=0;e<20&&!(await r.connection.getAddressLookupTable(u,{commitment:`confirmed`})).value;e+=1){if(e===19)throw Error(`Lookup table ${u.toBase58()} not visible after creation`);await t.waitLittle(500)}let p=n.AddressLookupTableProgram.extendLookupTable({payer:a.publicKey,authority:a.publicKey,lookupTable:u,addresses:i}),m=n.ComputeBudgetProgram.setComputeUnitPrice({microLamports:e.MAX_MICRO_LAMPORTS_PER_CU}),{blockhash:h}=await r.connection.getLatestBlockhash(),g=new n.Transaction().add(m).add(p);return g.recentBlockhash=h,g.feePayer=a.publicKey,g.sign(a),await(0,n.sendAndConfirmTransaction)(r.connection,g,[a],{commitment:`confirmed`}),u};exports.createAndExtendAddressLookupTable=i,exports.getAddressLookupTableAccounts=r;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/time.utils.cjs`);let n=require(`@solana/web3.js`);var r=30,i=async(e,t)=>{if(!t)return;let r=[...new Set(t)];return Promise.all(r.map(async t=>{let r=(await e.connection.getAddressLookupTable(new n.PublicKey(t))).value;if(!r)throw Error(`failed to fetch lookup table ${t}`);return r}))},a=async(i,a,o)=>{let[s,{blockhash:c}]=await Promise.all([i.connection.getSlot(`finalized`),i.connection.getLatestBlockhash(`finalized`)]),l=s,[u,d]=n.AddressLookupTableProgram.createLookupTable({authority:o.publicKey,payer:o.publicKey,recentSlot:l}),f=n.ComputeBudgetProgram.setComputeUnitPrice({microLamports:e.MAX_MICRO_LAMPORTS_PER_CU}),p=new n.Transaction().add(f).add(u);p.recentBlockhash=c,p.feePayer=o.publicKey,p.sign(o),await(0,n.sendAndConfirmTransaction)(i.connection,p,[o],{commitment:`confirmed`});for(let e=0;e<20&&!(await i.connection.getAddressLookupTable(d,{commitment:`confirmed`})).value;e+=1){if(e===19)throw Error(`Lookup table ${d.toBase58()} not visible after creation`);await t.waitLittle(500)}for(let e=0;e<a.length;e+=r){let t=a.slice(e,e+r),s=n.AddressLookupTableProgram.extendLookupTable({payer:o.publicKey,authority:o.publicKey,lookupTable:d,addresses:t}),{blockhash:c}=await i.connection.getLatestBlockhash(),l=new n.Transaction().add(s);l.recentBlockhash=c,l.feePayer=o.publicKey,l.sign(o),await(0,n.sendAndConfirmTransaction)(i.connection,l,[o],{commitment:`confirmed`})}return d};exports.createAndExtendAddressLookupTable=a,exports.getAddressLookupTableAccounts=i;

package/functions/pre-transaction/addressTableLookup.mjs

@@ -2,7 +2,7 @@ import { MAX_MICRO_LAMPORTS_PER_CU as e } from "../../constants/protocol.constan
 import { waitLittle as t } from "../utils/time.utils.mjs";
 import { AddressLookupTableProgram as n, ComputeBudgetProgram as r, PublicKey as i, Transaction as a, sendAndConfirmTransaction as o } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/pre-transaction/addressTableLookup.ts
-var s = async (e, t) => {
+var s = 30, c = async (e, t) => {
 	if (!t) return;
 	let n = [...new Set(t)];
 	return Promise.all(n.map(async (t) => {
@@ -10,24 +10,27 @@ var s = async (e, t) => {
 		if (!n) throw Error(`failed to fetch lookup table ${t}`);
 		return n;
 	}));
-}, c = async (i, s, c) => {
-	let [l, { blockhash: u }] = await Promise.all([i.connection.getSlot("finalized"), i.connection.getLatestBlockhash("finalized")]), d = l, [f, p] = n.createLookupTable({
-		authority: c.publicKey,
-		payer: c.publicKey,
-		recentSlot: d
-	}), m = r.setComputeUnitPrice({ microLamports: e }), h = new a().add(m).add(f);
-	h.recentBlockhash = u, h.feePayer = c.publicKey, h.sign(c), await o(i.connection, h, [c], { commitment: "confirmed" });
-	for (let e = 0; e < 20 && !(await i.connection.getAddressLookupTable(p, { commitment: "confirmed" })).value; e += 1) {
-		if (e === 19) throw Error(`Lookup table ${p.toBase58()} not visible after creation`);
+}, l = async (i, c, l) => {
+	let [u, { blockhash: d }] = await Promise.all([i.connection.getSlot("finalized"), i.connection.getLatestBlockhash("finalized")]), f = u, [p, m] = n.createLookupTable({
+		authority: l.publicKey,
+		payer: l.publicKey,
+		recentSlot: f
+	}), h = r.setComputeUnitPrice({ microLamports: e }), g = new a().add(h).add(p);
+	g.recentBlockhash = d, g.feePayer = l.publicKey, g.sign(l), await o(i.connection, g, [l], { commitment: "confirmed" });
+	for (let e = 0; e < 20 && !(await i.connection.getAddressLookupTable(m, { commitment: "confirmed" })).value; e += 1) {
+		if (e === 19) throw Error(`Lookup table ${m.toBase58()} not visible after creation`);
 		await t(500);
 	}
-	let g = n.extendLookupTable({
-		payer: c.publicKey,
-		authority: c.publicKey,
-		lookupTable: p,
-		addresses: s
-	}), _ = r.setComputeUnitPrice({ microLamports: e }), { blockhash: v } = await i.connection.getLatestBlockhash(), y = new a().add(_).add(g);
-	return y.recentBlockhash = v, y.feePayer = c.publicKey, y.sign(c), await o(i.connection, y, [c], { commitment: "confirmed" }), p;
+	for (let e = 0; e < c.length; e += s) {
+		let t = c.slice(e, e + s), r = n.extendLookupTable({
+			payer: l.publicKey,
+			authority: l.publicKey,
+			lookupTable: m,
+			addresses: t
+		}), { blockhash: u } = await i.connection.getLatestBlockhash(), d = new a().add(r);
+		d.recentBlockhash = u, d.feePayer = l.publicKey, d.sign(l), await o(i.connection, d, [l], { commitment: "confirmed" });
+	}
+	return m;
 };
 //#endregion
-export { c as createAndExtendAddressLookupTable, s as getAddressLookupTableAccounts };
+export { l as createAndExtendAddressLookupTable, c as getAddressLookupTableAccounts };

package/functions/pre-transaction/buildCommitmentValidationData.cjs

@@ -0,0 +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(`../snarkjs/generateZkProof.cjs`),s=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`);var c=async(c,l,u,d)=>{let f=e.isSolanaLike(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=>r.getUtxoCircuitInRandomization(e))),g=d.map(e=>e.map(e=>e.getConstructableParams())),_=d.map(e=>e.map(e=>e.amount===0n?`0`:BigInt(e.getCommitment()).toString())),v=await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:s.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:g}}}),y=l.getShieldedPrivateKey(),b=l.getSpendingKeyPair().pubSpendingBJJPoint,x=f?u.map(e=>{let{compressedAddress:t}=n.formatMintAddress(e);return BigInt(t).toString()}):u.map(e=>BigInt(e).toString());d.forEach((e,n)=>{e.forEach((e,r)=>{let i=e.getStealthAddress(),a=e.spendingPublicKey??b,o=e.isNewStyle&&e.H0?t.UserKeys.getStealthAddressNewStyle(e.H0,y,a):t.UserKeys.getStealthAddress(BigInt(e.randomization),y);if(BigInt(i).toString()!==BigInt(o).toString())throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`)})});let S={nullifyingPrivateKey:y,spendingPublicKey:b,erc20TokenAddresses:x,inAmounts:p,inRandomizations:h,inH0Ax:d.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:d.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:d.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:m,inCommitments:_,inNullifiers:v};if(!u.length||!d[0]?.length)return;let{zkCallData:C}=await o.generateZkProof(c,`commitmentCalculator${u.length}x${d[0].length}`,S,!1);if(!Array.isArray(C?.[0])||!Array.isArray(C?.[1])||!Array.isArray(C?.[2]))throw Error(`Invalid zkCallData shape for commitment validation`);return{tokenAddresses:x,inAmounts:p,inTimeStamps:m,inRandomizations:h,inCommitments:_,inNullifiers:v,proof:{a:C[0],b:C[1],c:C[2]}}};exports.buildCommitmentValidationData=c;

package/functions/pre-transaction/buildCommitmentValidationData.d.ts

@@ -0,0 +1,4 @@
+import { UserKeys } from '../../data-structures/crypto-keys/keys';
+import { Utxo } from '../../data-structures/utxo/Utxo';
+import { CommitmentValidationDataType } from '../../types';
+export declare const buildCommitmentValidationData: (chainId: number, userKeys: UserKeys, erc20Addresses: string[], inputUtxosArray: Utxo[][]) => Promise<CommitmentValidationDataType | undefined>;

package/functions/pre-transaction/buildCommitmentValidationData.mjs

@@ -0,0 +1,58 @@
+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 } from "../snarkjs/common.snarkjs.mjs";
+import { WorkerVariant as a } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as o } from "../../webworker/performTaskWithWorker.mjs";
+import { generateZkProof as s } from "../snarkjs/generateZkProof.mjs";
+import { ZKProofWorkerActionType as c } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+//#region libs/shared/common/src/functions/pre-transaction/buildCommitmentValidationData.ts
+var l = async (l, u, d, f) => {
+	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 o({
+		type: a.ZKProof,
+		payload: {
+			type: c.BUILD_IN_NULLIFIERS,
+			data: { inputUtxosSerialized: _ }
+		}
+	}), b = u.getShieldedPrivateKey(), x = u.getSpendingKeyPair().pubSpendingBJJPoint, S = p ? d.map((e) => {
+		let { compressedAddress: t } = n(e);
+		return BigInt(t).toString();
+	}) : d.map((e) => BigInt(e).toString());
+	f.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);
+			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
+	};
+	if (!d.length || !f[0]?.length) return;
+	let { zkCallData: w } = await s(l, `commitmentCalculator${d.length}x${f[0].length}`, C, !1);
+	if (!Array.isArray(w?.[0]) || !Array.isArray(w?.[1]) || !Array.isArray(w?.[2])) throw Error("Invalid zkCallData shape for commitment validation");
+	return {
+		tokenAddresses: S,
+		inAmounts: m,
+		inTimeStamps: h,
+		inRandomizations: g,
+		inCommitments: v,
+		inNullifiers: y,
+		proof: {
+			a: w[0],
+			b: w[1],
+			c: w[2]
+		}
+	};
+};
+//#endregion
+export { l as buildCommitmentValidationData };

package/functions/pre-transaction/calculateSolanaNullifierCount.cjs

@@ -0,0 +1 @@
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../web3/events/getShieldedBalance.cjs`),n=require(`./solana.cjs`),r=require(`../utils/create-provider.cjs`);let i=require(`@solana/web3.js`);var a=async(a,o,s,c)=>{if(!e.isSolanaLike(o)||s.length===0||c.length===0)return 0;try{let l=(await t.addPaddingToUtxos(a,o,s,c,6)).flat().filter(e=>e.amount!==0n);if(l.length===0)return 0;let{fetchRpcUrl:u,contractData:d}=e.networkRegistry[o],{originalDeployer:f,hinkalIdl:p}=d;if(!u)throw Error(`RPC URL not found for chain ID`);if(!f)throw Error(`Original deployer not found for chain ID`);if(!p)throw Error(`Hinkal IDL not found for chain ID`);let m=r.createCustomSolanaConnection(u),h=new i.PublicKey(f),g=new i.PublicKey(p.address),_=l.map(e=>n.getNullifierAccount(BigInt(e.getNullifier()),h,g));return(await m.getMultipleAccountsInfo(_)).filter(e=>e===null).length}catch(e){return(e instanceof Error?e.message:String(e)).toLowerCase().includes(`utxos limitations`)?6:0}};exports.calculateSolanaNullifierCount=a;

package/functions/pre-transaction/calculateSolanaNullifierCount.d.ts

@@ -0,0 +1,2 @@
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
+export declare const calculateSolanaNullifierCount: (hinkal: IHinkal, chainId: number, mintAddresses: string[], amountChanges: bigint[]) => Promise<number>;

package/functions/pre-transaction/calculateSolanaNullifierCount.mjs

@@ -0,0 +1,23 @@
+import { isSolanaLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { addPaddingToUtxos as n } from "../web3/events/getShieldedBalance.mjs";
+import { getNullifierAccount as r } from "./solana.mjs";
+import { createCustomSolanaConnection as i } from "../utils/create-provider.mjs";
+import { PublicKey as a } from "@solana/web3.js";
+//#region libs/shared/common/src/functions/pre-transaction/calculateSolanaNullifierCount.ts
+var o = async (o, s, c, l) => {
+	if (!e(s) || c.length === 0 || l.length === 0) return 0;
+	try {
+		let e = (await n(o, s, c, l, 6)).flat().filter((e) => e.amount !== 0n);
+		if (e.length === 0) return 0;
+		let { fetchRpcUrl: u, contractData: d } = t[s], { originalDeployer: f, hinkalIdl: p } = d;
+		if (!u) throw Error("RPC URL not found for chain ID");
+		if (!f) throw Error("Original deployer not found for chain ID");
+		if (!p) throw Error("Hinkal IDL not found for chain ID");
+		let m = i(u), h = new a(f), g = new a(p.address), _ = e.map((e) => r(BigInt(e.getNullifier()), h, g));
+		return (await m.getMultipleAccountsInfo(_)).filter((e) => e === null).length;
+	} catch (e) {
+		return (e instanceof Error ? e.message : String(e)).toLowerCase().includes("utxos limitations") ? 6 : 0;
+	}
+};
+//#endregion
+export { o as calculateSolanaNullifierCount };

package/functions/pre-transaction/constructAdminData.cjs

@@ -1 +1 @@
-const e=require(`../utils/addresses.cjs`);var t=(t,n,r,i,a,o)=>{if(!t)return;let s;return o&&(s={tokenIn:{symbol:o[0].symbol,address:o[0].erc20TokenAddress.toLowerCase()},tokenOut:{symbol:o[1].symbol,address:o[1].erc20TokenAddress.toLowerCase()}}),{hashedOwner:e.hashEthereumAddress(a),chainId:n,timestamp:Date.now(),action:t,erc20TokenAddresses:r,erc20TokenAmount:i.map(String),swapPair:s}};exports.constructAdminData=t;
+const e=require(`../utils/addresses.cjs`);var t=(t,n,r,i,a,o)=>{if(!t)return;let s;return o&&(s={tokenIn:{symbol:o[0]?.symbol,address:o[0]?.erc20TokenAddress.toLowerCase()},tokenOut:{symbol:o[1]?.symbol,address:o[1]?.erc20TokenAddress.toLowerCase()}}),{hashedOwner:e.hashEthereumAddress(a),chainId:n,timestamp:Date.now(),action:t,erc20TokenAddresses:r,erc20TokenAmount:i.map(String),swapPair:s}};exports.constructAdminData=t;

package/functions/pre-transaction/constructAdminData.mjs

@@ -5,12 +5,12 @@ var t = (t, n, r, i, a, o) => {
 	let s;
 	return o && (s = {
 		tokenIn: {
-			symbol: o[0].symbol,
-			address: o[0].erc20TokenAddress.toLowerCase()
+			symbol: o[0]?.symbol,
+			address: o[0]?.erc20TokenAddress.toLowerCase()
 		},
 		tokenOut: {
-			symbol: o[1].symbol,
-			address: o[1].erc20TokenAddress.toLowerCase()
+			symbol: o[1]?.symbol,
+			address: o[1]?.erc20TokenAddress.toLowerCase()
 		}
 	}), {
 		hashedOwner: e(a),

package/functions/pre-transaction/index.cjs

@@ -1 +1 @@
-require(`./solana.cjs`),require(`./outputUtxoProcessing.cjs`),require(`./interaction-to-action.cjs`),require(`./process-gas-estimates.cjs`),require(`./getFlatFees.cjs`),require(`./outputApprovalDataProcessing.cjs`),require(`./getVolatileTransferAmount.cjs`),require(`./constructAdminData.cjs`),require(`./addressTableLookup.cjs`),require(`./solana-public-signals.cjs`),require(`./convert-okx-instructions.cjs`),require(`./sendV0Transaction.cjs`),require(`./store-proof.cjs`),require(`./sendInitNullifiersTransaction.cjs`),require(`./initTokenLimitIfNeeded.cjs`),require(`./recipientUtxoProcessing.cjs`),require(`./store-instructions.cjs`),require(`./ensureAmountChanges.cjs`),require(`./getFeeStructure.cjs`),require(`./getKycAndSignatureData.cjs`),require(`./waitForDepositedUtxosInMerkleTree.cjs`);
+require(`./outputUtxoProcessing.cjs`),require(`./solana.cjs`),require(`./interaction-to-action.cjs`),require(`./process-gas-estimates.cjs`),require(`./getFlatFees.cjs`),require(`./getVolatileTransferAmount.cjs`),require(`./constructAdminData.cjs`),require(`./calculateSolanaNullifierCount.cjs`),require(`./addressTableLookup.cjs`),require(`./solana-public-signals.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`);

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

@@ -2,20 +2,19 @@ export * from './interaction-to-action';
 export * from './outputUtxoProcessing';
 export * from './process-gas-estimates';
 export * from './getFlatFees';
-export * from './outputApprovalDataProcessing';
 export * from './getVolatileTransferAmount';
 export * from './constructAdminData';
 export * from './solana';
+export * from './calculateSolanaNullifierCount';
 export * from './addressTableLookup';
 export * from './solana-public-signals';
 export * from './convert-okx-instructions';
 export * from './sendV0Transaction';
 export * from './store-proof';
 export * from './sendInitNullifiersTransaction';
-export * from './initTokenLimitIfNeeded';
 export * from './recipientUtxoProcessing';
 export * from './store-instructions';
 export * from './ensureAmountChanges';
 export * from './getFeeStructure';
-export * from './getKycAndSignatureData';
 export * from './waitForDepositedUtxosInMerkleTree';
+export * from './buildCommitmentValidationData';

package/functions/pre-transaction/index.mjs

@@ -1,21 +1,20 @@
-import "./solana.mjs";
 import "./outputUtxoProcessing.mjs";
+import "./solana.mjs";
 import "./interaction-to-action.mjs";
 import "./process-gas-estimates.mjs";
 import "./getFlatFees.mjs";
-import "./outputApprovalDataProcessing.mjs";
 import "./getVolatileTransferAmount.mjs";
 import "./constructAdminData.mjs";
+import "./calculateSolanaNullifierCount.mjs";
 import "./addressTableLookup.mjs";
 import "./solana-public-signals.mjs";
 import "./convert-okx-instructions.mjs";
 import "./sendV0Transaction.mjs";
 import "./store-proof.mjs";
 import "./sendInitNullifiersTransaction.mjs";
-import "./initTokenLimitIfNeeded.mjs";
 import "./recipientUtxoProcessing.mjs";
 import "./store-instructions.mjs";
 import "./ensureAmountChanges.mjs";
 import "./getFeeStructure.mjs";
-import "./getKycAndSignatureData.mjs";
 import "./waitForDepositedUtxosInMerkleTree.mjs";
+import "./buildCommitmentValidationData.mjs";

package/functions/pre-transaction/outputUtxoProcessing.cjs

@@ -1 +1 @@
-const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../utils/amounts.utils.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);var r=(r,i,a,o,s,c=!0,l,u)=>{let d=t.countTotalAmountInUtxos(i),{erc20TokenAddress:f,mintAddress:p}=i[0];if(c&&a<0n&&d+a<0n)throw Error(e.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let m=[new n.Utxo({amount:t.bigintMax(d+a,0n),erc20TokenAddress:f,mintAddress:p,shieldedPrivateKey:r.getShieldedPrivateKey(),timeStamp:o,tokenId:s})];if(l!==void 0&&u!==void 0){let[e,t,r]=l.split(`,`);m.push(new n.Utxo({amount:u,erc20TokenAddress:f,randomization:BigInt(e),stealthAddress:t,encryptionKey:r,timeStamp:o}))}return{outputUtxos:m}};exports.outputUtxoProcessing=r;
+const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../utils/amounts.utils.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);var r=(r,i,a,o,s=!0,c,l)=>{let u=t.countTotalAmountInUtxos(i),{erc20TokenAddress:d,mintAddress:f}=i[0];if(s&&a<0n&&u+a<0n)throw Error(e.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let p=[new n.Utxo({amount:t.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;

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

@@ -1,5 +1,5 @@
 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, tokenId?: number, revertIfNegative?: boolean, recipientAddress?: string, recipientAmountChange?: bigint) => {
+export declare const outputUtxoProcessing: (userKeys: UserKeys, inputUtxos: Utxo[], amountChange: bigint, timeStamp?: string, revertIfNegative?: boolean, recipientAddress?: string, recipientAmountChange?: bigint) => {
     outputUtxos: Utxo[];
 };

package/functions/pre-transaction/outputUtxoProcessing.mjs

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

package/functions/pre-transaction/recipientUtxoProcessing.cjs

@@ -1 +1 @@
-const e=require(`../utils/caseInsensitive.utils.cjs`),t=require(`../../data-structures/utxo/Utxo.cjs`);var n=(n,r,i,a)=>{let{recipientInfo:o,amount:s,token:c}=n,[l,u,d]=o.split(`,`),f=r.findIndex(t=>t.find(t=>e.caseInsensitiveEqual(t.erc20TokenAddress,n?.token.erc20TokenAddress))!==void 0),p=new t.Utxo({amount:s,erc20TokenAddress:c.erc20TokenAddress,timeStamp:a,randomization:BigInt(l),stealthAddress:u,encryptionKey:d});if(f===-1)throw Error(`Private recipient index not found`);r.forEach((e,n)=>{if(n===f)e.push(p),i[n]+=s;else{let n=new t.Utxo({amount:0n,erc20TokenAddress:e[0].erc20TokenAddress,timeStamp:a,randomization:BigInt(l),stealthAddress:u,encryptionKey:d});e.push(n)}})};exports.recipientUtxoProcessing=n;
+const e=require(`../utils/caseInsensitive.utils.cjs`),t=require(`../../data-structures/utxo/Utxo.cjs`);var n=(n,r,i,a)=>{let{recipientInfo:o,amount:s,token:c}=n,[l,u,d,,f]=o.split(`,`),p=r.findIndex(t=>t.find(t=>e.caseInsensitiveEqual(t.erc20TokenAddress,n?.token.erc20TokenAddress))!==void 0),m=new t.Utxo({amount:s,erc20TokenAddress:c.erc20TokenAddress,timeStamp:a,H0:[BigInt(u),BigInt(d)],stealthAddress:l,encryptionKey:f,isNewStyle:!0});if(p===-1)throw Error(`Private recipient index not found`);r.forEach((e,n)=>{if(n===p)e.push(m),i[n]+=s;else{let n=new t.Utxo({amount:0n,erc20TokenAddress:e[0].erc20TokenAddress,timeStamp:a,H0:[BigInt(u),BigInt(d)],stealthAddress:l,encryptionKey:f,isNewStyle:!0});e.push(n)}})};exports.recipientUtxoProcessing=n;

package/functions/pre-transaction/recipientUtxoProcessing.mjs

@@ -2,25 +2,27 @@ import { caseInsensitiveEqual as e } from "../utils/caseInsensitive.utils.mjs";
 import { Utxo as t } from "../../data-structures/utxo/Utxo.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/recipientUtxoProcessing.ts
 var n = (n, r, i, a) => {
-	let { recipientInfo: o, amount: s, token: c } = n, [l, u, d] = o.split(","), f = r.findIndex((t) => t.find((t) => e(t.erc20TokenAddress, n?.token.erc20TokenAddress)) !== void 0), p = new t({
+	let { recipientInfo: o, amount: s, token: c } = n, [l, u, d, , f] = o.split(","), p = r.findIndex((t) => t.find((t) => e(t.erc20TokenAddress, n?.token.erc20TokenAddress)) !== void 0), m = new t({
 		amount: s,
 		erc20TokenAddress: c.erc20TokenAddress,
 		timeStamp: a,
-		randomization: BigInt(l),
-		stealthAddress: u,
-		encryptionKey: d
+		H0: [BigInt(u), BigInt(d)],
+		stealthAddress: l,
+		encryptionKey: f,
+		isNewStyle: !0
 	});
-	if (f === -1) throw Error("Private recipient index not found");
+	if (p === -1) throw Error("Private recipient index not found");
 	r.forEach((e, n) => {
-		if (n === f) e.push(p), i[n] += s;
+		if (n === p) e.push(m), i[n] += s;
 		else {
 			let n = new t({
 				amount: 0n,
 				erc20TokenAddress: e[0].erc20TokenAddress,
 				timeStamp: a,
-				randomization: BigInt(l),
-				stealthAddress: u,
-				encryptionKey: d
+				H0: [BigInt(u), BigInt(d)],
+				stealthAddress: l,
+				encryptionKey: f,
+				isNewStyle: !0
 			});
 			e.push(n);
 		}

package/functions/pre-transaction/sendInitNullifiersTransaction.cjs

@@ -1 +1 @@
-const e=require(`./solana.cjs`),t=require(`./sendV0Transaction.cjs`),n=require(`../utils/bytes32.utils.cjs`);var r=async(t,r,i,a,o)=>{if(o.every(e=>e===0))return{instruction:void 0,willCreate:!1};let s=e.getNullifierAccount(n.convertBytes32ToBigInt(o),i,r.programId);return await t.getAccountInfo(s)?{instruction:void 0,willCreate:!1}:{instruction:await r.methods.initNullifier(o).accounts({originalDeployer:i,signer:a}).instruction(),willCreate:!0,account:s,nullifier:o}},i=async(e,t,n,i,a)=>{let o=[],s=[];for(let c of a){let{instruction:a,willCreate:l,account:u,nullifier:d}=await r(e,t,n,i,c);a&&o.push(a),l&&u&&d&&s.push({account:u,nullifier:d})}return{instructions:o,createdAccounts:s}},a=async(e,n,r,a,o)=>{let{instructions:s,createdAccounts:c}=await i(e,n,r,a.publicKey,o);return{signature:await t.sendV0Transaction(e,s,a,[a]),createdAccounts:c}};exports.sendInitNullifiersTransaction=a;
+const e=require(`../utils/bytes32.utils.cjs`),t=require(`./solana.cjs`),n=require(`./sendV0Transaction.cjs`);var r=async(n,r,i,a,o)=>{if(o.every(e=>e===0))return{instruction:void 0,willCreate:!1};let s=t.getNullifierAccount(e.convertBytes32ToBigInt(o),i,r.programId);return await n.getAccountInfo(s)?{instruction:void 0,willCreate:!1}:{instruction:await r.methods.initNullifier(o).accounts({originalDeployer:i,signer:a}).instruction(),willCreate:!0,account:s,nullifier:o}},i=async(e,t,n,i,a)=>{let o=[],s=[];for(let c of a){let{instruction:a,willCreate:l,account:u,nullifier:d}=await r(e,t,n,i,c);a&&o.push(a),l&&u&&d&&s.push({account:u,nullifier:d})}return{instructions:o,createdAccounts:s}},a=async(e,t,r,a,o)=>{let{instructions:s,createdAccounts:c}=await i(e,t,r,a.publicKey,o);return{signature:await n.sendV0Transaction(e,s,a,[a]),createdAccounts:c}};exports.sendInitNullifiersTransaction=a;

package/functions/pre-transaction/sendInitNullifiersTransaction.mjs

@@ -1,14 +1,14 @@
-import { getNullifierAccount as e } from "./solana.mjs";
-import { sendV0Transaction as t } from "./sendV0Transaction.mjs";
-import { convertBytes32ToBigInt as n } from "../utils/bytes32.utils.mjs";
+import { convertBytes32ToBigInt as e } from "../utils/bytes32.utils.mjs";
+import { getNullifierAccount as t } from "./solana.mjs";
+import { sendV0Transaction as n } from "./sendV0Transaction.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/sendInitNullifiersTransaction.ts
-var r = async (t, r, i, a, o) => {
+var r = async (n, r, i, a, o) => {
 	if (o.every((e) => e === 0)) return {
 		instruction: void 0,
 		willCreate: !1
 	};
-	let s = e(n(o), i, r.programId);
-	return await t.getAccountInfo(s) ? {
+	let s = t(e(o), i, r.programId);
+	return await n.getAccountInfo(s) ? {
 		instruction: void 0,
 		willCreate: !1
 	} : {
@@ -33,10 +33,10 @@ var r = async (t, r, i, a, o) => {
 		instructions: o,
 		createdAccounts: s
 	};
-}, a = async (e, n, r, a, o) => {
-	let { instructions: s, createdAccounts: c } = await i(e, n, r, a.publicKey, o);
+}, a = async (e, t, r, a, o) => {
+	let { instructions: s, createdAccounts: c } = await i(e, t, r, a.publicKey, o);
 	return {
-		signature: await t(e, s, a, [a]),
+		signature: await n(e, s, a, [a]),
 		createdAccounts: c
 	};
 };