@hinkal/common 0.3.4 → 0.3.6

package/common/src/data-structures/IndexedDB/pay-activity-db.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const t=require(`./activity-db.cjs`);let n=require(`idb-keyval`);new class extends t.ActivityStorage{async savePrivateSendTx(t){let r=this.generateTxId(),i={timestamp:new Date,...t};return await(0,n.update)(e.StorageKeys.TX_ACTIVITY,(e={})=>(e[r]=i,e)),r}async saveMultiplePrivateSendTxs(e){let t=e.map(e=>this.savePrivateSendTx(e));return Promise.all(t)}async getTransactionRecords(){return await(0,n.get)(e.StorageKeys.TX_ACTIVITY)||[]}};
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const t=require(`./activity-db.cjs`);let n=require(`idb-keyval`);var r=e=>{let{token:t,amount:n,amountInDollar:r,...i}=e;return i.tokens?.length?{...i,tokens:[...i.tokens]}:t?{...i,tokens:[{token:t,amount:n??`0`,amountInDollar:r??`0`}]}:{...i,tokens:[]}},i=e=>[e.txHash,e.to?.toLowerCase(),e.activityType,e.sentFrom,e.sentTo].join(`-`),a=e=>{let t={...e},n=new Map,a=!1;return Object.entries(e).forEach(([e,o])=>{let s=r(o);if(s.tokens.length===0||(o.token&&(a=!0),t[e]=s,!s.txHash))return;let c=i(s),l=n.get(c);if(l===void 0){n.set(c,e);return}t[l].tokens.push(...s.tokens),delete t[e],a=!0}),{mergedRecords:t,needsWrite:a}};new class extends t.ActivityStorage{async savePrivateSendTx(t){let r=this.generateTxId(),i={timestamp:new Date,...t};return await(0,n.update)(e.StorageKeys.TX_ACTIVITY,(e={})=>(e[r]=i,e)),r}async saveMultiplePrivateSendTxs(e){let t=e.map(e=>this.savePrivateSendTx(e));return Promise.all(t)}async getTransactionRecords(){let t=await(0,n.get)(e.StorageKeys.TX_ACTIVITY);if(!t)return[];let i=a(t);return i.needsWrite&&await(0,n.update)(e.StorageKeys.TX_ACTIVITY,(e={})=>(i=a(e),i.mergedRecords)),Object.values(i.mergedRecords).map(r).filter(e=>e.tokens.length>0)}};

package/common/src/data-structures/IndexedDB/pay-activity-db.mjs

@@ -2,6 +2,45 @@ import { StorageKeys as e } from "../../types/cache.types.mjs";
 import "../../types/index.mjs";
 import { ActivityStorage as t } from "./activity-db.mjs";
 import { get as n, update as r } from "idb-keyval";
+//#region libs/shared/common/src/data-structures/IndexedDB/pay-activity-db.ts
+var i = (e) => {
+	let { token: t, amount: n, amountInDollar: r, ...i } = e;
+	return i.tokens?.length ? {
+		...i,
+		tokens: [...i.tokens]
+	} : t ? {
+		...i,
+		tokens: [{
+			token: t,
+			amount: n ?? "0",
+			amountInDollar: r ?? "0"
+		}]
+	} : {
+		...i,
+		tokens: []
+	};
+}, a = (e) => [
+	e.txHash,
+	e.to?.toLowerCase(),
+	e.activityType,
+	e.sentFrom,
+	e.sentTo
+].join("-"), o = (e) => {
+	let t = { ...e }, n = /* @__PURE__ */ new Map(), r = !1;
+	return Object.entries(e).forEach(([e, o]) => {
+		let s = i(o);
+		if (s.tokens.length === 0 || (o.token && (r = !0), t[e] = s, !s.txHash)) return;
+		let c = a(s), l = n.get(c);
+		if (l === void 0) {
+			n.set(c, e);
+			return;
+		}
+		t[l].tokens.push(...s.tokens), delete t[e], r = !0;
+	}), {
+		mergedRecords: t,
+		needsWrite: r
+	};
+};
 new class extends t {
 	async savePrivateSendTx(t) {
 		let n = this.generateTxId(), i = {
@@ -15,7 +54,10 @@ new class extends t {
 		return Promise.all(t);
 	}
 	async getTransactionRecords() {
-		return await n(e.TX_ACTIVITY) || [];
+		let t = await n(e.TX_ACTIVITY);
+		if (!t) return [];
+		let a = o(t);
+		return a.needsWrite && await r(e.TX_ACTIVITY, (e = {}) => (a = o(e), a.mergedRecords)), Object.values(a.mergedRecords).map(i).filter((e) => e.tokens.length > 0);
 	}
 }();
 //#endregion

package/common/src/functions/index.cjs

@@ -1 +1 @@
-require(`./utils/abi.utils.cjs`),require(`./utils/serialize.utils.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/amounts.utils.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/enclaveHandshakeService.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/customEnclaveFunctionsRegister.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/legacyKeys.cjs`),require(`./utils/auth.utils.cjs`),require(`./utils/string.utils.cjs`),require(`./utils/token-check.utils.cjs`),require(`./utils/map.utils.cjs`),require(`./utils/mutexes.utils.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./web3/events/getShieldedBalance.cjs`),require(`./pre-transaction/outputUtxoProcessing.cjs`),require(`./utils/external-action.utils.cjs`),require(`./snarkjs/common.snarkjs.cjs`),require(`./pre-transaction/solana.cjs`),require(`./snarkjs/signedMessageHash.cjs`),require(`./pre-transaction/process-gas-estimates.cjs`),require(`./pre-transaction/getVolatileTransferAmount.cjs`),require(`./pre-transaction/constructAdminData.cjs`),require(`./utils/create-provider.cjs`),require(`./pre-transaction/calculateSolanaNullifierCount.cjs`),require(`./pre-transaction/convert-okx-instructions.cjs`),require(`./web3/getSolanaPriorityFee.cjs`),require(`./utils/process.utils.cjs`),require(`./pre-transaction/sendV0Transaction.cjs`),require(`./utils/bytes32.utils.cjs`),require(`./pre-transaction/ensureAmountChanges.cjs`),require(`./pre-transaction/getFeeStructure.cjs`),require(`./pre-transaction/getExternalSwapAddress.cjs`),require(`./pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`./pre-transaction/buildCommitmentValidationData.cjs`),require(`./pre-transaction/index.cjs`),require(`./snarkjs/generateZkProof.cjs`),require(`./snarkjs/generateMainAndCommitmentZkProof.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./utils/getContractAddress.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getRecipientInfoFromUserKeys.cjs`),require(`./utils/resolve-sync.utils.cjs`),require(`./utils/reloadPage.cjs`),require(`./utils/cacheDevice.utils.cjs`),require(`./utils/involves-permit2-op.cjs`),require(`./utils/convertEmporiumOpToCallInfo.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/proxyAvatar.utils.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/temp-wallet.utils.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./web3/lifiAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/index.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/index.cjs`),require(`./private-wallet/emporium.swap.helpers.cjs`),require(`./private-wallet/index.cjs`),require(`./auto-deposit-back-helpers/get-tokens-to-deposit-back.cjs`),require(`./auto-deposit-back-helpers/get-gas-token-records.cjs`),require(`./auto-deposit-back-helpers/select-gas-token.cjs`),require(`./auto-deposit-back-helpers/update-hinkal.cjs`),require(`./auto-deposit-back-helpers/index.cjs`);
+require(`./utils/abi.utils.cjs`),require(`./utils/serialize.utils.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/amounts.utils.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/enclaveHandshakeService.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/customEnclaveFunctionsRegister.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/legacyKeys.cjs`),require(`./utils/auth.utils.cjs`),require(`./utils/string.utils.cjs`),require(`./utils/token-check.utils.cjs`),require(`./utils/map.utils.cjs`),require(`./utils/mutexes.utils.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./web3/events/getShieldedBalance.cjs`),require(`./pre-transaction/outputUtxoProcessing.cjs`),require(`./utils/external-action.utils.cjs`),require(`./snarkjs/common.snarkjs.cjs`),require(`./pre-transaction/solana.cjs`),require(`./snarkjs/signedMessageHash.cjs`),require(`./pre-transaction/process-gas-estimates.cjs`),require(`./pre-transaction/getVolatileTransferAmount.cjs`),require(`./pre-transaction/constructAdminData.cjs`),require(`./utils/create-provider.cjs`),require(`./pre-transaction/calculateSolanaNullifierCount.cjs`),require(`./pre-transaction/convert-okx-instructions.cjs`),require(`./web3/getSolanaPriorityFee.cjs`),require(`./utils/process.utils.cjs`),require(`./pre-transaction/sendV0Transaction.cjs`),require(`./utils/bytes32.utils.cjs`),require(`./pre-transaction/getFeeStructure.cjs`),require(`./pre-transaction/getExternalSwapAddress.cjs`),require(`./pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`./pre-transaction/buildCommitmentValidationData.cjs`),require(`./pre-transaction/index.cjs`),require(`./snarkjs/generateZkProof.cjs`),require(`./snarkjs/generateMainAndCommitmentZkProof.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./utils/getContractAddress.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getRecipientInfoFromUserKeys.cjs`),require(`./utils/resolve-sync.utils.cjs`),require(`./utils/reloadPage.cjs`),require(`./utils/cacheDevice.utils.cjs`),require(`./utils/involves-permit2-op.cjs`),require(`./utils/convertEmporiumOpToCallInfo.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/proxyAvatar.utils.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/temp-wallet.utils.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./web3/lifiAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/index.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/index.cjs`),require(`./private-wallet/emporium.swap.helpers.cjs`),require(`./private-wallet/index.cjs`),require(`./auto-deposit-back-helpers/get-tokens-to-deposit-back.cjs`),require(`./auto-deposit-back-helpers/get-gas-token-records.cjs`),require(`./auto-deposit-back-helpers/select-gas-token.cjs`),require(`./auto-deposit-back-helpers/update-hinkal.cjs`),require(`./auto-deposit-back-helpers/index.cjs`);

package/common/src/functions/index.mjs

@@ -37,7 +37,6 @@ import "./web3/getSolanaPriorityFee.mjs";
 import "./utils/process.utils.mjs";
 import "./pre-transaction/sendV0Transaction.mjs";
 import "./utils/bytes32.utils.mjs";
-import "./pre-transaction/ensureAmountChanges.mjs";
 import "./pre-transaction/getFeeStructure.mjs";
 import "./pre-transaction/getExternalSwapAddress.mjs";
 import "./pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";

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/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})];return c!==void 0&&l!==void 0&&c.forEach((e,t)=>{let[r,i,a,,,s]=e.split(`,`);p.push(new n.Utxo({amount:l[t],erc20TokenAddress:d,mintAddress:f,H0:[BigInt(i),BigInt(a)],stealthAddress:r,encryptionKey:s,timeStamp:o}))}),{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

@@ -3,3 +3,4 @@ import { Utxo } from '../../data-structures/utxo/Utxo';
 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,30 +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
+		spendingPublicKey: r.getSpendingKeyPair().pubSpendingBJJPoint
 	})];
 	return l !== void 0 && u !== void 0 && l.forEach((e, t) => {
-		let [n, i, a, , , o] = e.split(",");
-		m.push(new r({
+		let [n, r, a, , , o] = e.split(",");
+		m.push(new i({
 			amount: u[t],
 			erc20TokenAddress: f,
 			mintAddress: p,
-			H0: [BigInt(i), BigInt(a)],
+			H0: [BigInt(r), BigInt(a)],
 			stealthAddress: n,
 			encryptionKey: o,
 			timeStamp: s
 		}));
 	}), { 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/snarkjs/constructSolanaZkProof.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../crypto/poseidon.cjs`),n=require(`../web3/etherFunctions.cjs`),r=require(`../../data-structures/crypto-keys/keys.cjs`),i=require(`../utils/solanaMint.utils.cjs`),a=require(`./common.snarkjs.cjs`),o=require(`../pre-transaction/solana.cjs`),s=require(`./signedMessageHash.cjs`);require(`../pre-transaction/index.cjs`);const c=require(`./generateMainAndCommitmentZkProof.cjs`),l=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`);require(`../web3/index.cjs`);const u=require(`../pre-transaction/getSolanaCalldataHash.cjs`);let d=require(`ethers`),f=require(`@solana/web3.js`);var p=async(p,m,h,g,_,v,y,b,x,S,C,w=[],T=e.chainIds.solanaLocalnet,E=[],D=[],O=0n)=>{let k=new f.PublicKey(x),ee=new f.PublicKey(S),A=m.getShieldedPrivateKey(),{pubSpendingBJJPoint:j}=m.getSpendingKeyPair(),M=a.calcStealthAddressStructure(v,A,m.getSpendingKeyPair().pubSpendingBJJPoint),N=w.some(Boolean)?a.calcOnchainEncryptedOutput(r.UserKeys.getEncryptionKeyPair(A).publicKey,M):`0x`,P=a.calcEncryptedOutputs(_).flatMap((e,t)=>w[t]?e.map(()=>[]):e.map(e=>[...d.ethers.getBytes(e)])),F=n.randomBigInt(31),I=t.poseidonFunction(F),L=t.poseidonFunction(O),R=h.map(e=>i.formatMintAddress(e)),z=R.map(e=>e.mintAccountPart1),B=R.map(e=>e.mintAccountPart2),V=u.getSolanaCalldataHash(C,k,ee,P,N,y,b,E,D),H=`${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`,U=a.calcAmountChanges(g,_),{inCommitmentSiblings:W,inCommitmentSiblingSides:G,rootHashHinkal:K,rootHashHinkalIndex:q,inNullifiers:J}=await l.getDataFromWorkers(T,p,g.map(e=>e.map(e=>e.getConstructableParams()))),Y=a.buildOutCommitments(_),X=M.H0x,Z=M.H0y,Q=s.computeSignedMessageHashSolana({rootHashHinkal:K,mintAccountPart1:z,mintAccountPart2:B,amountChanges:U,outTimeStamp:BigInt(_[0][0].timeStamp),inNullifiers:J,outCommitments:Y,calldataHash:V,message:I,swapperAccountAdditionalSeed:L,outH1Ay:M.H1y,H0Ax:X,H0Ay:Z}),{R8:$,S:te}=m.signEddsa(Q),ne={rootHashHinkal:K,spendingPublicKey:j,eddsaSignature:[$[0],$[1],te],signedMessageHash:Q,nullifyingPrivateKey:A,mintAccountPart1:z,mintAccountPart2:B,amountChanges:U,inAmounts:g.map(e=>e.map(e=>e.amount.toString())),inH0Ax:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[1].toString())),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inNullifiers:J,inCommitmentSiblings:W,inCommitmentSiblingSides:G,outAmounts:_.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(_[0][0].timeStamp),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:Y,calldataHash:V,messageSeed:F,swapperAccountSalt:O,H0Ax:X,H0Ay:Z},{zkCallData:re,publicSignals:ie,commitmentValidationData:ae}=await c.generateMainAndCommitmentZkProof(T,m,h,g,`mainSolanaCircuit${H}`,ne),[oe,se,ce]=re;return{proofAArr:oe.map(BigInt).map(o.encodeToByte32Array).flat(),proofBArr:se.flat().map(BigInt).map(o.encodeToByte32Array).flat(),proofCArr:ce.map(BigInt).map(o.encodeToByte32Array).flat(),publicInputsArr:ie.map(BigInt).map(o.encodeToByte32Array),commitmentValidationData:ae,rootHashHinkalIndex:q,encryptedOutputs:P,onChainEncryptedOutput:N}};exports.constructSolanaZkProof=p;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../crypto/poseidon.cjs`),n=require(`../web3/etherFunctions.cjs`),r=require(`../../data-structures/crypto-keys/keys.cjs`),i=require(`../utils/solanaMint.utils.cjs`),a=require(`./common.snarkjs.cjs`),o=require(`../pre-transaction/solana.cjs`),s=require(`./signedMessageHash.cjs`);require(`../pre-transaction/index.cjs`);const c=require(`./generateMainAndCommitmentZkProof.cjs`),l=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`);require(`../web3/index.cjs`);const u=require(`../pre-transaction/getSolanaCalldataHash.cjs`);let d=require(`ethers`),f=require(`@solana/web3.js`);var p=async(p,m,h,g,_,v,y,b,x,S,C=[],w=e.chainIds.solanaLocalnet,T=[],E=[],D=0n)=>{let O=new f.PublicKey(b),k=new f.PublicKey(x),A=m.getShieldedPrivateKey(),{pubSpendingBJJPoint:j}=m.getSpendingKeyPair(),M=a.calcStealthAddressStructure(r.UserKeys.findCorrectRandomization(n.randomBigInt(31),A),A,m.getSpendingKeyPair().pubSpendingBJJPoint),N=C.some(Boolean)?a.calcOnchainEncryptedOutput(r.UserKeys.getEncryptionKeyPair(A).publicKey,M):`0x`,P=a.calcEncryptedOutputs(_).flatMap((e,t)=>C[t]?e.map(()=>[]):e.map(e=>[...d.ethers.getBytes(e)])),F=n.randomBigInt(31),I=t.poseidonFunction(F),L=t.poseidonFunction(D),R=h.map(e=>i.formatMintAddress(e)),z=R.map(e=>e.mintAccountPart1),B=R.map(e=>e.mintAccountPart2),V=u.getSolanaCalldataHash(S,O,k,P,N,v,y,T,E),H=`${S.tokenNumber}x${S.nullifierAmount}x${S.outputAmount}`,U=a.calcAmountChanges(g,_),{inCommitmentSiblings:W,inCommitmentSiblingSides:G,rootHashHinkal:K,rootHashHinkalIndex:q,inNullifiers:J}=await l.getDataFromWorkers(w,p,g.map(e=>e.map(e=>e.getConstructableParams()))),Y=a.buildOutCommitments(_),X=M.H0x,Z=M.H0y,Q=s.computeSignedMessageHashSolana({rootHashHinkal:K,mintAccountPart1:z,mintAccountPart2:B,amountChanges:U,outTimeStamp:BigInt(_[0][0].timeStamp),inNullifiers:J,outCommitments:Y,calldataHash:V,message:I,swapperAccountAdditionalSeed:L,outH1Ay:M.H1y,H0Ax:X,H0Ay:Z}),{R8:$,S:ee}=m.signEddsa(Q),te={rootHashHinkal:K,spendingPublicKey:j,eddsaSignature:[$[0],$[1],ee],signedMessageHash:Q,nullifyingPrivateKey:A,mintAccountPart1:z,mintAccountPart2:B,amountChanges:U,inAmounts:g.map(e=>e.map(e=>e.amount.toString())),inH0Ax:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[1].toString())),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inNullifiers:J,inCommitmentSiblings:W,inCommitmentSiblingSides:G,outAmounts:_.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(_[0][0].timeStamp),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:Y,calldataHash:V,messageSeed:F,swapperAccountSalt:D,H0Ax:X,H0Ay:Z},{zkCallData:ne,publicSignals:re,commitmentValidationData:ie}=await c.generateMainAndCommitmentZkProof(w,m,h,g,`mainSolanaCircuit${H}`,te),[ae,oe,se]=ne;return{proofAArr:ae.map(BigInt).map(o.encodeToByte32Array).flat(),proofBArr:oe.flat().map(BigInt).map(o.encodeToByte32Array).flat(),proofCArr:se.map(BigInt).map(o.encodeToByte32Array).flat(),publicInputsArr:re.map(BigInt).map(o.encodeToByte32Array),commitmentValidationData:ie,rootHashHinkalIndex:q,encryptedOutputs:P,onChainEncryptedOutput:N}};exports.constructSolanaZkProof=p;

package/common/src/functions/snarkjs/constructSolanaZkProof.d.ts

@@ -4,7 +4,7 @@ import { AccountMeta } from '@solana/web3.js';
 import { DimDataType } from '../../types/circom-data.types';
 import { MerkleTree } from '../../data-structures/merkle-tree';
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
-export declare const constructSolanaZkProof: (merkleTreeHinkal: MerkleTree<bigint>, userKeys: UserKeys, mintAddresses: string[], inputUtxosArray: Utxo[][], outputUtxosArray: Utxo[][], extraRandomization: bigint, relayerFee: bigint, variableRate: bigint, recipientAddress: string, signerAddress: string, dimensions: DimDataType, onChainCreation?: boolean[], chainId?: number, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[], swapperAccountSalt?: bigint) => Promise<{
+export declare const constructSolanaZkProof: (merkleTreeHinkal: MerkleTree<bigint>, userKeys: UserKeys, mintAddresses: string[], inputUtxosArray: Utxo[][], outputUtxosArray: Utxo[][], relayerFee: bigint, variableRate: bigint, recipientAddress: string, signerAddress: string, dimensions: DimDataType, onChainCreation?: boolean[], chainId?: number, instructions?: HinkalInstruction[], remainingAccounts?: AccountMeta[], swapperAccountSalt?: bigint) => Promise<{
     proofAArr: number[];
     proofBArr: number[];
     proofCArr: number[];

package/common/src/functions/snarkjs/constructSolanaZkProof.mjs

@@ -1,26 +1,26 @@
 import { chainIds as e } from "../../constants/chains.constants.mjs";
 import { poseidonFunction as t } from "../../crypto/poseidon.mjs";
-import { randomBigInt as ee } from "../web3/etherFunctions.mjs";
-import { UserKeys as te } from "../../data-structures/crypto-keys/keys.mjs";
-import { formatMintAddress as n } from "../utils/solanaMint.utils.mjs";
-import { buildOutCommitments as r, calcAmountChanges as i, calcEncryptedOutputs as a, calcOnchainEncryptedOutput as o, calcStealthAddressStructure as s, getUtxoCircuitH0Coords as c } from "./common.snarkjs.mjs";
-import { encodeToByte32Array as l } from "../pre-transaction/solana.mjs";
-import { computeSignedMessageHashSolana as ne } from "./signedMessageHash.mjs";
+import { randomBigInt as n } from "../web3/etherFunctions.mjs";
+import { UserKeys as r } from "../../data-structures/crypto-keys/keys.mjs";
+import { formatMintAddress as i } from "../utils/solanaMint.utils.mjs";
+import { buildOutCommitments as a, calcAmountChanges as o, calcEncryptedOutputs as s, calcOnchainEncryptedOutput as c, calcStealthAddressStructure as l, getUtxoCircuitH0Coords as u } from "./common.snarkjs.mjs";
+import { encodeToByte32Array as d } from "../pre-transaction/solana.mjs";
+import { computeSignedMessageHashSolana as f } from "./signedMessageHash.mjs";
 import "../pre-transaction/index.mjs";
-import { generateMainAndCommitmentZkProof as u } from "./generateMainAndCommitmentZkProof.mjs";
-import { getDataFromWorkers as d } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { generateMainAndCommitmentZkProof as p } from "./generateMainAndCommitmentZkProof.mjs";
+import { getDataFromWorkers as ee } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
 import "../web3/index.mjs";
-import { getSolanaCalldataHash as f } from "../pre-transaction/getSolanaCalldataHash.mjs";
-import { ethers as p } from "ethers";
-import { PublicKey as m } from "@solana/web3.js";
+import { getSolanaCalldataHash as te } from "../pre-transaction/getSolanaCalldataHash.mjs";
+import { ethers as m } from "ethers";
+import { PublicKey as h } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/snarkjs/constructSolanaZkProof.ts
-var h = async (h, g, _, v, y, b, x, S, re, ie, C, w = [], T = e.solanaLocalnet, ae = [], E = [], D = 0n) => {
-	let O = new m(re), k = new m(ie), A = g.getShieldedPrivateKey(), { pubSpendingBJJPoint: j } = g.getSpendingKeyPair(), M = s(b, A, g.getSpendingKeyPair().pubSpendingBJJPoint), N = w.some(Boolean) ? o(te.getEncryptionKeyPair(A).publicKey, M) : "0x", P = a(y).flatMap((e, t) => w[t] ? e.map(() => []) : e.map((e) => [...p.getBytes(e)])), F = ee(31), I = t(F), L = t(D), R = _.map((e) => n(e)), z = R.map((e) => e.mintAccountPart1), B = R.map((e) => e.mintAccountPart2), V = f(C, O, k, P, N, x, S, ae, E), oe = `${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`, H = i(v, y), { inCommitmentSiblings: U, inCommitmentSiblingSides: W, rootHashHinkal: G, rootHashHinkalIndex: K, inNullifiers: q } = await d(T, h, v.map((e) => e.map((e) => e.getConstructableParams()))), J = r(y), Y = M.H0x, X = M.H0y, Z = ne({
+var g = async (g, _, v, y, b, x, S, C, w, T, E = [], D = e.solanaLocalnet, ne = [], re = [], O = 0n) => {
+	let ie = new h(C), k = new h(w), A = _.getShieldedPrivateKey(), { pubSpendingBJJPoint: j } = _.getSpendingKeyPair(), M = l(r.findCorrectRandomization(n(31), A), A, _.getSpendingKeyPair().pubSpendingBJJPoint), N = E.some(Boolean) ? c(r.getEncryptionKeyPair(A).publicKey, M) : "0x", P = s(b).flatMap((e, t) => E[t] ? e.map(() => []) : e.map((e) => [...m.getBytes(e)])), F = n(31), I = t(F), L = t(O), R = v.map((e) => i(e)), z = R.map((e) => e.mintAccountPart1), B = R.map((e) => e.mintAccountPart2), V = te(T, ie, k, P, N, x, S, ne, re), H = `${T.tokenNumber}x${T.nullifierAmount}x${T.outputAmount}`, U = o(y, b), { inCommitmentSiblings: W, inCommitmentSiblingSides: ae, rootHashHinkal: G, rootHashHinkalIndex: K, inNullifiers: q } = await ee(D, g, y.map((e) => e.map((e) => e.getConstructableParams()))), J = a(b), Y = M.H0x, X = M.H0y, Z = f({
 		rootHashHinkal: G,
 		mintAccountPart1: z,
 		mintAccountPart2: B,
-		amountChanges: H,
-		outTimeStamp: BigInt(y[0][0].timeStamp),
+		amountChanges: U,
+		outTimeStamp: BigInt(b[0][0].timeStamp),
 		inNullifiers: q,
 		outCommitments: J,
 		calldataHash: V,
@@ -29,46 +29,46 @@ var h = async (h, g, _, v, y, b, x, S, re, ie, C, w = [], T = e.solanaLocalnet,
 		outH1Ay: M.H1y,
 		H0Ax: Y,
 		H0Ay: X
-	}), { R8: Q, S: se } = g.signEddsa(Z), ce = {
+	}), { R8: Q, S: oe } = _.signEddsa(Z), se = {
 		rootHashHinkal: G,
 		spendingPublicKey: j,
 		eddsaSignature: [
 			Q[0],
 			Q[1],
-			se
+			oe
 		],
 		signedMessageHash: Z,
 		nullifyingPrivateKey: A,
 		mintAccountPart1: z,
 		mintAccountPart2: B,
-		amountChanges: H,
-		inAmounts: v.map((e) => e.map((e) => e.amount.toString())),
-		inH0Ax: v.map((e) => e.map((e) => c(e)[0].toString())),
-		inH0Ay: v.map((e) => e.map((e) => c(e)[1].toString())),
-		inTimeStamps: v.map((e) => e.map((e) => e.timeStamp)),
+		amountChanges: U,
+		inAmounts: y.map((e) => e.map((e) => e.amount.toString())),
+		inH0Ax: y.map((e) => e.map((e) => u(e)[0].toString())),
+		inH0Ay: y.map((e) => e.map((e) => u(e)[1].toString())),
+		inTimeStamps: y.map((e) => e.map((e) => e.timeStamp)),
 		inNullifiers: q,
-		inCommitmentSiblings: U,
-		inCommitmentSiblingSides: W,
-		outAmounts: y.map((e) => e.map((e) => e.amount.toString())),
-		outTimeStamp: BigInt(y[0][0].timeStamp),
-		outPublicKeys: y.map((e) => e.map((e) => e.getStealthAddress())),
+		inCommitmentSiblings: W,
+		inCommitmentSiblingSides: ae,
+		outAmounts: b.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: BigInt(b[0][0].timeStamp),
+		outPublicKeys: b.map((e) => e.map((e) => e.getStealthAddress())),
 		outCommitments: J,
 		calldataHash: V,
 		messageSeed: F,
-		swapperAccountSalt: D,
+		swapperAccountSalt: O,
 		H0Ax: Y,
 		H0Ay: X
-	}, { zkCallData: le, publicSignals: $, commitmentValidationData: ue } = await u(T, g, _, v, `mainSolanaCircuit${oe}`, ce), [de, fe, pe] = le;
+	}, { zkCallData: ce, publicSignals: le, commitmentValidationData: $ } = await p(D, _, v, y, `mainSolanaCircuit${H}`, se), [ue, de, fe] = ce;
 	return {
-		proofAArr: de.map(BigInt).map(l).flat(),
-		proofBArr: fe.flat().map(BigInt).map(l).flat(),
-		proofCArr: pe.map(BigInt).map(l).flat(),
-		publicInputsArr: $.map(BigInt).map(l),
-		commitmentValidationData: ue,
+		proofAArr: ue.map(BigInt).map(d).flat(),
+		proofBArr: de.flat().map(BigInt).map(d).flat(),
+		proofCArr: fe.map(BigInt).map(d).flat(),
+		publicInputsArr: le.map(BigInt).map(d),
+		commitmentValidationData: $,
 		rootHashHinkalIndex: K,
 		encryptedOutputs: P,
 		onChainEncryptedOutput: N
 	};
 };
 //#endregion
-export { h as constructSolanaZkProof };
+export { g as constructSolanaZkProof };

package/common/src/functions/snarkjs/constructTxEnclave.cjs

@@ -1 +1 @@
-const e=require(`./constant.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./verifySignedEnclaveResponse.cjs`);var i=async(i,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await n.makeEnclaveHandshakeAndEncryptInput(a),c=await t.httpClient.post(`${e.ENCLAVE_URL}${i}`,{key:o,inputs:s});return r.verifySignedEnclaveResponse(c.data,c.signature)},a=e=>{if(Array.isArray(e))return`[${e.map(a).join(`,`)}]`;if(e&&typeof e==`object`){let t=e;return`{${Object.keys(t).filter(e=>t[e]!==void 0).sort().map(e=>`${JSON.stringify(e)}:${a(t[e])}`).join(`,`)}}`}return JSON.stringify(e)},o=(e,t)=>{if(a({chainId:String(e.chainId),erc20Addresses:e.erc20Addresses,amountChanges:e.amountChanges,externalAddress:e.externalAddress,...e.originalSender?{originalSender:e.originalSender}:{},relay:e.relay??``,feeStructure:e.feeStructure?{feeToken:e.feeStructure.feeToken,flatFee:e.feeStructure.flatFee.toString(),variableRate:e.feeStructure.variableRate.toString()}:null,externalActionId:e.externalActionId??``,externalActionMetadata:e.externalActionMetadata??``,onChainCreation:e.onChainCreation??null,recipientAddress:e.recipientAddress??null,recipientAmounts:e.recipientAmounts??null,selfOutputAmounts:e.selfOutputAmounts??null,inputCommitments:e.inputCommitments??null,useBlockedUtxos:e.useBlockedUtxos??!1,createBlockedUtxos:e.createBlockedUtxos??!1,...e.forceEmptyUtxos?{forceEmptyUtxos:!0}:{},messageSeed:e.messageSeed??``,skipLock:e.skipLock??!1})!==a(t))throw Error(`Enclave prepare-tx response does not match the request sent - refusing to sign`)},s=(e,t)=>{let n={chainId:String(e.chainId),mintAddresses:e.mintAddresses,amountChanges:e.amountChanges,relayAddress:e.relayAddress,recipient:e.recipient,signer:e.signer??e.relayAddress,functionName:e.functionName??`transact`,accounts:e.accounts,onChainCreation:e.onChainCreation??null,relayerFee:e.relayerFee??`0`,variableRate:e.variableRate??`0`,hinkalInstructions:e.hinkalInstructions??null,remainingAccounts:e.remainingAccounts??null,swapperAccountSalt:e.swapperAccountSalt??`0`,recipientAddress:e.recipientAddress??``,recipientAmounts:e.recipientAmounts??null,inputCommitments:e.inputCommitments??null,useBlockedUtxos:e.useBlockedUtxos??!1,messageSeed:e.messageSeed??``};if(e.recipientAmount&&(n.recipientAmount=e.recipientAmount),e.displayRecipient&&(n.displayRecipient=e.displayRecipient),a(n)!==a(t))throw Error(`Enclave prepare-solana-tx response does not match the request sent - refusing to sign`)},c=e=>({R8:e.R8.map(String),S:e.S.toString()}),l=e=>({feeToken:e.feeToken,flatFee:e.flatFee.toString(),variableRate:e.variableRate.toString()}),u=(e,t)=>{if(a({chainId:String(e.chainId),erc20Address:e.erc20Address,externalAddress:e.externalAddress,relay:e.relay,feeStructure:{feeToken:e.feeStructure.feeToken,flatFee:e.feeStructure.flatFee.toString(),variableRate:e.feeStructure.variableRate.toString()},hashedEthereumAddress:e.hashedEthereumAddress})!==a(t))throw Error(`Enclave prepare-stuck-withdraw response does not match the request sent - refusing to sign`)},d=async(e,t,n=e.userKeys)=>{let r={...t,amountChanges:t.amountChanges.map(String),recipientAmounts:t.recipientAmounts?.map(e=>e.map(String)),selfOutputAmounts:t.selfOutputAmounts?.map(String),messageSeed:t.messageSeed?.toString(),nullifyingKey:n.getShieldedPrivateKey(),spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},a=await i(`/prepare-tx`,r);return o(r,a.request),a},f=async(e,t)=>{let{nullifierCount:n}=await i(`/estimate-nullifiers`,{...t,amountChanges:t.amountChanges.map(String),nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return n},p=async(e,t,n=e.userKeys)=>{let r={...t,amountChanges:t.amountChanges.map(String),relayerFee:t.relayerFee?.toString(),variableRate:t.variableRate?.toString(),swapperAccountSalt:t.swapperAccountSalt?.toString(),recipientAmounts:t.recipientAmounts?.map(String),messageSeed:t.messageSeed?.toString(),nullifyingKey:n.getShieldedPrivateKey(),spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},a=await i(`/prepare-solana-tx`,r);return s(r,a.request),a},m=async(e,t)=>{let n={...t,nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},{jobs:r,request:a}=await i(`/prepare-stuck-withdraw`,n);return u(n,a),r},h=async(e,t)=>{let n=Object.fromEntries(Object.entries(t.feeStructures).map(([e,t])=>[e,l(t)])),{jobs:r}=await i(`/prepare-solana-stuck-withdraw`,{...t,feeStructures:n,nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return r},g=async(e,t)=>i(`/finalize-tx`,{jobId:e,eddsaSignature:c(t)}),_=async(e,t)=>i(`/finalize-solana-tx`,{jobId:e,eddsaSignature:c(t)}),v=async(e,t,n,r)=>{let{txHash:a}=await i(`/finalize-tx-relay`,{jobId:e,eddsaSignature:c(t),chainId:n,adminData:r?.adminData,authorizationData:r?.authorizationData,withUniswapWorkAround:r?.withUniswapWorkAround});return a},y=async(e,t,n,r)=>{let{txHash:a}=await i(`/finalize-solana-tx-relay`,{jobId:e,eddsaSignature:c(t),chainId:n,adminData:r?.adminData});return a};exports.estimateNullifiersEnclaveCall=f,exports.finalizeSolanaTxEnclaveCall=_,exports.finalizeSolanaTxEnclaveCallRelay=y,exports.finalizeTxEnclaveCall=g,exports.finalizeTxEnclaveCallRelay=v,exports.prepareSolanaStuckWithdrawEnclaveCall=h,exports.prepareSolanaTxEnclaveCall=p,exports.prepareStuckWithdrawEnclaveCall=m,exports.prepareTxEnclaveCall=d;
+const e=require(`./constant.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./verifySignedEnclaveResponse.cjs`);var i=e=>e?.flat().filter(e=>e.amount>0n).map(e=>e.getCommitment()),a=async(i,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await n.makeEnclaveHandshakeAndEncryptInput(a),c=await t.httpClient.post(`${e.ENCLAVE_URL}${i}`,{key:o,inputs:s});return r.verifySignedEnclaveResponse(c.data,c.signature)},o=e=>{if(Array.isArray(e))return`[${e.map(o).join(`,`)}]`;if(e&&typeof e==`object`){let t=e;return`{${Object.keys(t).filter(e=>t[e]!==void 0).sort().map(e=>`${JSON.stringify(e)}:${o(t[e])}`).join(`,`)}}`}return JSON.stringify(e)},s=(e,t)=>{if(o({chainId:String(e.chainId),erc20Addresses:e.erc20Addresses,amountChanges:e.amountChanges,externalAddress:e.externalAddress,...e.originalSender?{originalSender:e.originalSender}:{},relay:e.relay??``,feeStructure:e.feeStructure?{feeToken:e.feeStructure.feeToken,flatFee:e.feeStructure.flatFee.toString(),variableRate:e.feeStructure.variableRate.toString()}:null,externalActionId:e.externalActionId??``,externalActionMetadata:e.externalActionMetadata??``,onChainCreation:e.onChainCreation??null,recipientAddress:e.recipientAddress??null,recipientAmounts:e.recipientAmounts??null,selfOutputAmounts:e.selfOutputAmounts??null,inputCommitments:e.inputCommitments??null,useBlockedUtxos:e.useBlockedUtxos??!1,createBlockedUtxos:e.createBlockedUtxos??!1,...e.forceEmptyUtxos?{forceEmptyUtxos:!0}:{},messageSeed:e.messageSeed??``,skipLock:e.skipLock??!1})!==o(t))throw Error(`Enclave prepare-tx response does not match the request sent - refusing to sign`)},c=(e,t)=>{let n={chainId:String(e.chainId),mintAddresses:e.mintAddresses,amountChanges:e.amountChanges,relayAddress:e.relayAddress,recipient:e.recipient,signer:e.signer??e.relayAddress,functionName:e.functionName??`transact`,accounts:e.accounts,onChainCreation:e.onChainCreation??null,relayerFee:e.relayerFee??`0`,variableRate:e.variableRate??`0`,hinkalInstructions:e.hinkalInstructions??null,remainingAccounts:e.remainingAccounts??null,swapperAccountSalt:e.swapperAccountSalt??`0`,recipientAddress:e.recipientAddress??``,recipientAmounts:e.recipientAmounts??null,inputCommitments:e.inputCommitments??null,useBlockedUtxos:e.useBlockedUtxos??!1,messageSeed:e.messageSeed??``};if(e.recipientAmount&&(n.recipientAmount=e.recipientAmount),e.displayRecipient&&(n.displayRecipient=e.displayRecipient),o(n)!==o(t))throw Error(`Enclave prepare-solana-tx response does not match the request sent - refusing to sign`)},l=e=>({R8:e.R8.map(String),S:e.S.toString()}),u=e=>({feeToken:e.feeToken,flatFee:e.flatFee.toString(),variableRate:e.variableRate.toString()}),d=(e,t)=>{if(o({chainId:String(e.chainId),erc20Address:e.erc20Address,externalAddress:e.externalAddress,relay:e.relay,feeStructure:{feeToken:e.feeStructure.feeToken,flatFee:e.feeStructure.flatFee.toString(),variableRate:e.feeStructure.variableRate.toString()},hashedEthereumAddress:e.hashedEthereumAddress})!==o(t))throw Error(`Enclave prepare-stuck-withdraw response does not match the request sent - refusing to sign`)},f=async(e,t,n=e.userKeys)=>{let r={...t,amountChanges:t.amountChanges.map(String),recipientAmounts:t.recipientAmounts?.map(e=>e.map(String)),selfOutputAmounts:t.selfOutputAmounts?.map(String),messageSeed:t.messageSeed?.toString(),nullifyingKey:n.getShieldedPrivateKey(),spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},i=await a(`/prepare-tx`,r);return s(r,i.request),i},p=async(e,t)=>{let{nullifierCount:n}=await a(`/estimate-nullifiers`,{...t,amountChanges:t.amountChanges.map(String),nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return n},m=async(e,t,n=e.userKeys)=>{let r={...t,amountChanges:t.amountChanges.map(String),relayerFee:t.relayerFee?.toString(),variableRate:t.variableRate?.toString(),swapperAccountSalt:t.swapperAccountSalt?.toString(),recipientAmounts:t.recipientAmounts?.map(String),messageSeed:t.messageSeed?.toString(),nullifyingKey:n.getShieldedPrivateKey(),spendingPublicKey:n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},i=await a(`/prepare-solana-tx`,r);return c(r,i.request),i},h=async(e,t)=>{let n={...t,nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)},{jobs:r,request:i}=await a(`/prepare-stuck-withdraw`,n);return d(n,i),r},g=async(e,t)=>{let n=Object.fromEntries(Object.entries(t.feeStructures).map(([e,t])=>[e,u(t)])),{jobs:r}=await a(`/prepare-solana-stuck-withdraw`,{...t,feeStructures:n,nullifyingKey:e.userKeys.getShieldedPrivateKey(),spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)});return r},_=async(e,t)=>a(`/finalize-tx`,{jobId:e,eddsaSignature:l(t)}),v=async(e,t)=>a(`/finalize-solana-tx`,{jobId:e,eddsaSignature:l(t)}),y=async(e,t,n,r)=>{let{txHash:i}=await a(`/finalize-tx-relay`,{jobId:e,eddsaSignature:l(t),chainId:n,adminData:r?.adminData,authorizationData:r?.authorizationData,withUniswapWorkAround:r?.withUniswapWorkAround});return i},b=async(e,t,n,r)=>{let{txHash:i}=await a(`/finalize-solana-tx-relay`,{jobId:e,eddsaSignature:l(t),chainId:n,adminData:r?.adminData});return i};exports.collectInputCommitments=i,exports.estimateNullifiersEnclaveCall=p,exports.finalizeSolanaTxEnclaveCall=v,exports.finalizeSolanaTxEnclaveCallRelay=b,exports.finalizeTxEnclaveCall=_,exports.finalizeTxEnclaveCallRelay=y,exports.prepareSolanaStuckWithdrawEnclaveCall=g,exports.prepareSolanaTxEnclaveCall=m,exports.prepareStuckWithdrawEnclaveCall=h,exports.prepareTxEnclaveCall=f;

package/common/src/functions/snarkjs/constructTxEnclave.d.ts

@@ -1,8 +1,10 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
+import { Utxo } from '../../data-structures/utxo/Utxo';
 import { EstimateNullifiersParams, FinalizeSolanaTxResponseType, FinalizeTxResponseType, PreparedJobType, PrepareSolanaStuckWithdrawParams, PrepareSolanaTxParams, PrepareSolanaTxResponseType, PrepareStuckWithdrawRequestType, PrepareTxParams, PrepareTxResponseType } from '../../types/remote-tx-build.types';
 import { AdminDataType } from '../../types/admin.types';
 import { AuthorizationData } from '../../types/hinkal.types';
+export declare const collectInputCommitments: (inputUtxos?: Utxo[][]) => string[] | undefined;
 export declare const prepareTxEnclaveCall: (hinkal: IHinkal, params: PrepareTxParams, userKeys?: UserKeys) => Promise<PrepareTxResponseType>;
 export declare const estimateNullifiersEnclaveCall: (hinkal: IHinkal, params: EstimateNullifiersParams) => Promise<number>;
 export declare const prepareSolanaTxEnclaveCall: (hinkal: IHinkal, params: PrepareSolanaTxParams, userKeys?: UserKeys) => Promise<PrepareSolanaTxResponseType>;

package/common/src/functions/snarkjs/constructTxEnclave.mjs

@@ -4,21 +4,21 @@ import "../../data-structures/http/index.mjs";
 import { makeEnclaveHandshakeAndEncryptInput as n } from "../utils/encryptInputForEnclave.mjs";
 import { verifySignedEnclaveResponse as r } from "./verifySignedEnclaveResponse.mjs";
 //#region libs/shared/common/src/functions/snarkjs/constructTxEnclave.ts
-var i = async (i, a) => {
+var i = (e) => e?.flat().filter((e) => e.amount > 0n).map((e) => e.getCommitment()), a = async (i, a) => {
 	let { keyCiphertext: o, inputCiphertext: s } = await n(a), c = await t.post(`${e}${i}`, {
 		key: o,
 		inputs: s
 	});
 	return r(c.data, c.signature);
-}, a = (e) => {
-	if (Array.isArray(e)) return `[${e.map(a).join(",")}]`;
+}, o = (e) => {
+	if (Array.isArray(e)) return `[${e.map(o).join(",")}]`;
 	if (e && typeof e == "object") {
 		let t = e;
-		return `{${Object.keys(t).filter((e) => t[e] !== void 0).sort().map((e) => `${JSON.stringify(e)}:${a(t[e])}`).join(",")}}`;
+		return `{${Object.keys(t).filter((e) => t[e] !== void 0).sort().map((e) => `${JSON.stringify(e)}:${o(t[e])}`).join(",")}}`;
 	}
 	return JSON.stringify(e);
-}, o = (e, t) => {
-	if (a({
+}, s = (e, t) => {
+	if (o({
 		chainId: String(e.chainId),
 		erc20Addresses: e.erc20Addresses,
 		amountChanges: e.amountChanges,
@@ -42,8 +42,8 @@ var i = async (i, a) => {
 		...e.forceEmptyUtxos ? { forceEmptyUtxos: !0 } : {},
 		messageSeed: e.messageSeed ?? "",
 		skipLock: e.skipLock ?? !1
-	}) !== a(t)) throw Error("Enclave prepare-tx response does not match the request sent - refusing to sign");
-}, s = (e, t) => {
+	}) !== o(t)) throw Error("Enclave prepare-tx response does not match the request sent - refusing to sign");
+}, c = (e, t) => {
 	let n = {
 		chainId: String(e.chainId),
 		mintAddresses: e.mintAddresses,
@@ -65,16 +65,16 @@ var i = async (i, a) => {
 		useBlockedUtxos: e.useBlockedUtxos ?? !1,
 		messageSeed: e.messageSeed ?? ""
 	};
-	if (e.recipientAmount && (n.recipientAmount = e.recipientAmount), e.displayRecipient && (n.displayRecipient = e.displayRecipient), a(n) !== a(t)) throw Error("Enclave prepare-solana-tx response does not match the request sent - refusing to sign");
-}, c = (e) => ({
+	if (e.recipientAmount && (n.recipientAmount = e.recipientAmount), e.displayRecipient && (n.displayRecipient = e.displayRecipient), o(n) !== o(t)) throw Error("Enclave prepare-solana-tx response does not match the request sent - refusing to sign");
+}, l = (e) => ({
 	R8: e.R8.map(String),
 	S: e.S.toString()
-}), l = (e) => ({
+}), u = (e) => ({
 	feeToken: e.feeToken,
 	flatFee: e.flatFee.toString(),
 	variableRate: e.variableRate.toString()
-}), u = (e, t) => {
-	if (a({
+}), d = (e, t) => {
+	if (o({
 		chainId: String(e.chainId),
 		erc20Address: e.erc20Address,
 		externalAddress: e.externalAddress,
@@ -85,8 +85,8 @@ var i = async (i, a) => {
 			variableRate: e.feeStructure.variableRate.toString()
 		},
 		hashedEthereumAddress: e.hashedEthereumAddress
-	}) !== a(t)) throw Error("Enclave prepare-stuck-withdraw response does not match the request sent - refusing to sign");
-}, d = async (e, t, n = e.userKeys) => {
+	}) !== o(t)) throw Error("Enclave prepare-stuck-withdraw response does not match the request sent - refusing to sign");
+}, f = async (e, t, n = e.userKeys) => {
 	let r = {
 		...t,
 		amountChanges: t.amountChanges.map(String),
@@ -95,17 +95,17 @@ var i = async (i, a) => {
 		messageSeed: t.messageSeed?.toString(),
 		nullifyingKey: n.getShieldedPrivateKey(),
 		spendingPublicKey: n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
-	}, a = await i("/prepare-tx", r);
-	return o(r, a.request), a;
-}, f = async (e, t) => {
-	let { nullifierCount: n } = await i("/estimate-nullifiers", {
+	}, i = await a("/prepare-tx", r);
+	return s(r, i.request), i;
+}, p = async (e, t) => {
+	let { nullifierCount: n } = await a("/estimate-nullifiers", {
 		...t,
 		amountChanges: t.amountChanges.map(String),
 		nullifyingKey: e.userKeys.getShieldedPrivateKey(),
 		spendingPublicKey: e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
 	});
 	return n;
-}, p = async (e, t, n = e.userKeys) => {
+}, m = async (e, t, n = e.userKeys) => {
 	let r = {
 		...t,
 		amountChanges: t.amountChanges.map(String),
@@ -116,47 +116,47 @@ var i = async (i, a) => {
 		messageSeed: t.messageSeed?.toString(),
 		nullifyingKey: n.getShieldedPrivateKey(),
 		spendingPublicKey: n.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
-	}, a = await i("/prepare-solana-tx", r);
-	return s(r, a.request), a;
-}, m = async (e, t) => {
+	}, i = await a("/prepare-solana-tx", r);
+	return c(r, i.request), i;
+}, h = async (e, t) => {
 	let n = {
 		...t,
 		nullifyingKey: e.userKeys.getShieldedPrivateKey(),
 		spendingPublicKey: e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
-	}, { jobs: r, request: a } = await i("/prepare-stuck-withdraw", n);
-	return u(n, a), r;
-}, h = async (e, t) => {
-	let n = Object.fromEntries(Object.entries(t.feeStructures).map(([e, t]) => [e, l(t)])), { jobs: r } = await i("/prepare-solana-stuck-withdraw", {
+	}, { jobs: r, request: i } = await a("/prepare-stuck-withdraw", n);
+	return d(n, i), r;
+}, g = async (e, t) => {
+	let n = Object.fromEntries(Object.entries(t.feeStructures).map(([e, t]) => [e, u(t)])), { jobs: r } = await a("/prepare-solana-stuck-withdraw", {
 		...t,
 		feeStructures: n,
 		nullifyingKey: e.userKeys.getShieldedPrivateKey(),
 		spendingPublicKey: e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint.map(String)
 	});
 	return r;
-}, g = async (e, t) => i("/finalize-tx", {
+}, _ = async (e, t) => a("/finalize-tx", {
 	jobId: e,
-	eddsaSignature: c(t)
-}), _ = async (e, t) => i("/finalize-solana-tx", {
+	eddsaSignature: l(t)
+}), v = async (e, t) => a("/finalize-solana-tx", {
 	jobId: e,
-	eddsaSignature: c(t)
-}), v = async (e, t, n, r) => {
-	let { txHash: a } = await i("/finalize-tx-relay", {
+	eddsaSignature: l(t)
+}), y = async (e, t, n, r) => {
+	let { txHash: i } = await a("/finalize-tx-relay", {
 		jobId: e,
-		eddsaSignature: c(t),
+		eddsaSignature: l(t),
 		chainId: n,
 		adminData: r?.adminData,
 		authorizationData: r?.authorizationData,
 		withUniswapWorkAround: r?.withUniswapWorkAround
 	});
-	return a;
-}, y = async (e, t, n, r) => {
-	let { txHash: a } = await i("/finalize-solana-tx-relay", {
+	return i;
+}, b = async (e, t, n, r) => {
+	let { txHash: i } = await a("/finalize-solana-tx-relay", {
 		jobId: e,
-		eddsaSignature: c(t),
+		eddsaSignature: l(t),
 		chainId: n,
 		adminData: r?.adminData
 	});
-	return a;
+	return i;
 };
 //#endregion
-export { f as estimateNullifiersEnclaveCall, _ as finalizeSolanaTxEnclaveCall, y as finalizeSolanaTxEnclaveCallRelay, g as finalizeTxEnclaveCall, v as finalizeTxEnclaveCallRelay, h as prepareSolanaStuckWithdrawEnclaveCall, p as prepareSolanaTxEnclaveCall, m as prepareStuckWithdrawEnclaveCall, d as prepareTxEnclaveCall };
+export { i as collectInputCommitments, p as estimateNullifiersEnclaveCall, v as finalizeSolanaTxEnclaveCall, b as finalizeSolanaTxEnclaveCallRelay, _ as finalizeTxEnclaveCall, y as finalizeTxEnclaveCallRelay, g as prepareSolanaStuckWithdrawEnclaveCall, m as prepareSolanaTxEnclaveCall, h as prepareStuckWithdrawEnclaveCall, f as prepareTxEnclaveCall };

package/common/src/functions/utils/enum.utils.cjs

@@ -0,0 +1 @@
+const e=require(`./serialize.utils.cjs`);function t(e,t){return Object.values(e).includes(t)}function n(n,r,i=!1){if(t(n,r))return r;let a=`Value ${e.safeJsonStringify(r)} is not a valid member of enum ${e.safeJsonStringify(n)}.`;if(i)throw Error(a)}exports.toEnumValue=n;

package/common/src/functions/utils/enum.utils.mjs

@@ -0,0 +1,12 @@
+import { safeJsonStringify as e } from "./serialize.utils.mjs";
+//#region libs/shared/common/src/functions/utils/enum.utils.ts
+function t(e, t) {
+	return Object.values(e).includes(t);
+}
+function n(n, r, i = !1) {
+	if (t(n, r)) return r;
+	let a = `Value ${e(r)} is not a valid member of enum ${e(n)}.`;
+	if (i) throw Error(a);
+}
+//#endregion
+export { n as toEnumValue };

package/common/src/functions/utils/index.cjs

@@ -1 +1 @@
-require(`./abi.utils.cjs`),require(`./serialize.utils.cjs`),require(`./caseInsensitive.utils.cjs`),require(`./amounts.utils.cjs`),require(`./time.utils.cjs`),require(`./upToDateState.cjs`),require(`./cacheFunctions.cjs`),require(`./enclaveHandshakeService.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./addresses.cjs`),require(`./tron.utils.cjs`),require(`./legacyKeys.cjs`),require(`./auth.utils.cjs`),require(`./string.utils.cjs`),require(`./token-check.utils.cjs`),require(`./map.utils.cjs`),require(`./mutexes.utils.cjs`),require(`./erc20tokenFunctions.cjs`),require(`../pre-transaction/outputUtxoProcessing.cjs`),require(`./external-action.utils.cjs`),require(`../pre-transaction/solana.cjs`),require(`../pre-transaction/process-gas-estimates.cjs`),require(`../pre-transaction/getVolatileTransferAmount.cjs`),require(`../pre-transaction/constructAdminData.cjs`),require(`./create-provider.cjs`),require(`../pre-transaction/calculateSolanaNullifierCount.cjs`),require(`../pre-transaction/convert-okx-instructions.cjs`),require(`./process.utils.cjs`),require(`../pre-transaction/sendV0Transaction.cjs`),require(`./bytes32.utils.cjs`),require(`../pre-transaction/ensureAmountChanges.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/getExternalSwapAddress.cjs`),require(`../pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./getContractAddress.cjs`),require(`./getSignerFromContract.cjs`),require(`./tronSimulation.utils.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./resolve-domain-address.cjs`),require(`./resolve-sync.utils.cjs`),require(`./convertIntegrationProviderToExternalActionId.cjs`),require(`./evmNetworkFunctions.cjs`),require(`./userAgent.cjs`),require(`./reloadPage.cjs`),require(`./cacheDevice.utils.cjs`),require(`./getBlockExplorerUrl.cjs`),require(`./involves-permit2-op.cjs`),require(`./convertEmporiumOpToCallInfo.cjs`),require(`./publicBalance.utils.cjs`),require(`./rpc-int-encode.cjs`),require(`./walletBalances.utils.cjs`),require(`./nftTokenFunctions.cjs`),require(`./inLogicMetadata.cjs`),require(`./networks.utils.cjs`),require(`./postToOffscreen.cjs`),require(`./solanaSendPreflight.utils.cjs`),require(`./voidWallets.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./proxyAvatar.utils.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./formatter.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./bridge-flow.utils.cjs`),require(`./bridge-claimable.utils.cjs`),require(`./temp-wallet.utils.cjs`),require(`./dispatchBalanceRefreshes.cjs`),require(`./lifi.utils.cjs`),require(`./enclave-recipient-info-storage.cjs`),require(`./solana-memo.cjs`),require(`./mnemonics.cjs`),require(`./nearIntents.utils.cjs`),require(`./enclaveSessionSigning.cjs`),require(`./validateWalletAddress.cjs`),require(`./waasStamp.cjs`);
+require(`./abi.utils.cjs`),require(`./serialize.utils.cjs`),require(`./caseInsensitive.utils.cjs`),require(`./amounts.utils.cjs`),require(`./time.utils.cjs`),require(`./upToDateState.cjs`),require(`./cacheFunctions.cjs`),require(`./enclaveHandshakeService.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./addresses.cjs`),require(`./tron.utils.cjs`),require(`./legacyKeys.cjs`),require(`./auth.utils.cjs`),require(`./string.utils.cjs`),require(`./token-check.utils.cjs`),require(`./map.utils.cjs`),require(`./mutexes.utils.cjs`),require(`./erc20tokenFunctions.cjs`),require(`../pre-transaction/outputUtxoProcessing.cjs`),require(`./external-action.utils.cjs`),require(`../pre-transaction/solana.cjs`),require(`../pre-transaction/process-gas-estimates.cjs`),require(`../pre-transaction/getVolatileTransferAmount.cjs`),require(`../pre-transaction/constructAdminData.cjs`),require(`./create-provider.cjs`),require(`../pre-transaction/calculateSolanaNullifierCount.cjs`),require(`../pre-transaction/convert-okx-instructions.cjs`),require(`./process.utils.cjs`),require(`../pre-transaction/sendV0Transaction.cjs`),require(`./bytes32.utils.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/getExternalSwapAddress.cjs`),require(`../pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./getContractAddress.cjs`),require(`./getSignerFromContract.cjs`),require(`./tronSimulation.utils.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./resolve-domain-address.cjs`),require(`./resolve-sync.utils.cjs`),require(`./convertIntegrationProviderToExternalActionId.cjs`),require(`./evmNetworkFunctions.cjs`),require(`./userAgent.cjs`),require(`./reloadPage.cjs`),require(`./cacheDevice.utils.cjs`),require(`./getBlockExplorerUrl.cjs`),require(`./involves-permit2-op.cjs`),require(`./convertEmporiumOpToCallInfo.cjs`),require(`./publicBalance.utils.cjs`),require(`./rpc-int-encode.cjs`),require(`./walletBalances.utils.cjs`),require(`./nftTokenFunctions.cjs`),require(`./inLogicMetadata.cjs`),require(`./networks.utils.cjs`),require(`./postToOffscreen.cjs`),require(`./solanaSendPreflight.utils.cjs`),require(`./voidWallets.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./proxyAvatar.utils.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./formatter.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./bridge-flow.utils.cjs`),require(`./bridge-claimable.utils.cjs`),require(`./temp-wallet.utils.cjs`),require(`./dispatchBalanceRefreshes.cjs`),require(`./lifi.utils.cjs`),require(`./enclave-recipient-info-storage.cjs`),require(`./solana-memo.cjs`),require(`./mnemonics.cjs`),require(`./nearIntents.utils.cjs`),require(`./enclaveSessionSigning.cjs`),require(`./validateWalletAddress.cjs`),require(`./waasStamp.cjs`);

package/common/src/functions/utils/index.mjs

@@ -31,7 +31,6 @@ import "../pre-transaction/convert-okx-instructions.mjs";
 import "./process.utils.mjs";
 import "../pre-transaction/sendV0Transaction.mjs";
 import "./bytes32.utils.mjs";
-import "../pre-transaction/ensureAmountChanges.mjs";
 import "../pre-transaction/getFeeStructure.mjs";
 import "../pre-transaction/getExternalSwapAddress.mjs";
 import "../pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";

package/common/src/types/index.cjs

@@ -1 +1 @@
-require(`./chains.types.cjs`),require(`./hinkal.types.cjs`),require(`./circom-data.types.cjs`),require(`./ethereum-network.types.cjs`),require(`./external-action.types.cjs`),require(`./token.types.cjs`),require(`./transactions.types.cjs`),require(`./admin.types.cjs`),require(`./activities.types.cjs`),require(`./transaction.types.cjs`),require(`./balances.types.cjs`),require(`./cache.types.cjs`),require(`./eip5792.types.cjs`),require(`./offscreen.types.cjs`),require(`./scheduled-transactions.types.cjs`),require(`./events.types.cjs`),require(`./schedule.types.cjs`),require(`./transact.types.cjs`);
+require(`./chains.types.cjs`),require(`./hinkal.types.cjs`),require(`./circom-data.types.cjs`),require(`./ethereum-network.types.cjs`),require(`./external-action.types.cjs`),require(`./token.types.cjs`),require(`./transactions.types.cjs`),require(`./admin.types.cjs`),require(`./activities.types.cjs`),require(`./transaction.types.cjs`),require(`./balances.types.cjs`),require(`./cache.types.cjs`),require(`./eip5792.types.cjs`),require(`./offscreen.types.cjs`),require(`./scheduled-transactions.types.cjs`),require(`./events.types.cjs`),require(`./schedule.types.cjs`),require(`./transact.types.cjs`),require(`./solana-transact.types.cjs`);

package/common/src/types/index.d.ts

@@ -58,3 +58,4 @@ export * from './enclaveApi.types';
 export * from './transact.types';
 export * from './proxy-progress.types';
 export * from './bridging-tx.types';
+export * from './solana-transact.types';

package/common/src/types/index.mjs

@@ -16,3 +16,4 @@ import "./scheduled-transactions.types.mjs";
 import "./events.types.mjs";
 import "./schedule.types.mjs";
 import "./transact.types.mjs";
+import "./solana-transact.types.mjs";