@hinkal/common 0.3.1 → 0.3.2

package/common/src/functions/auto-deposit-back-helpers/select-gas-token.mjs

@@ -1,9 +1,9 @@
 import { caseInsensitiveEqual as e } from "../utils/caseInsensitive.utils.mjs";
 import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
-import { ExternalActionId as n } from "../../types/external-action.types.mjs";
-import { MessagesFromOffscreen as r } from "../../types/offscreen.types.mjs";
+import { Logger as n } from "../../error-handling/logger.mjs";
+import { ExternalActionId as r } from "../../types/external-action.types.mjs";
+import { MessagesFromOffscreen as i } from "../../types/offscreen.types.mjs";
 import "../../types/index.mjs";
-import { Logger as i } from "../../error-handling/logger.mjs";
 import "../../error-handling/index.mjs";
 import { getFeeStructure as a } from "../pre-transaction/getFeeStructure.mjs";
 import "../pre-transaction/index.mjs";
@@ -14,19 +14,19 @@ import "../utils/index.mjs";
 var c = async (c, l, u, d, f, p, m, h, g) => {
 	try {
 		if (!((p.find(({ erc20Token: t }) => e(t.erc20TokenAddress, c))?.totalUsdBalance ?? 0) >= l)) {
-			let i = p.find((t) => t.totalUsdBalance <= l ? !1 : d.find(({ erc20TokenAddress: n }) => e(n, t.erc20Token.erc20TokenAddress)) ? t.publicUsdBalance > l : !0);
-			if (!i) {
-				s(r.AutoShieldTxStatus, { message: t.AUTO_SHIELD_INSUFFICIENT_GAS });
+			let n = p.find((t) => t.totalUsdBalance <= l ? !1 : d.find(({ erc20TokenAddress: n }) => e(n, t.erc20Token.erc20TokenAddress)) ? t.publicUsdBalance > l : !0);
+			if (!n) {
+				s(i.AutoShieldTxStatus, { message: t.AUTO_SHIELD_INSUFFICIENT_GAS });
 				return;
 			}
-			c = i.erc20Token.erc20TokenAddress, m = await a(u, c, h, n.Emporium, f.map((e) => o(e, g, u)));
+			c = n.erc20Token.erc20TokenAddress, m = await a(u, c, h, r.Emporium, f.map((e) => o(e, g, u)));
 		}
 		return {
 			feeToken: c,
 			feeStructure: m
 		};
 	} catch (e) {
-		i.error("selectGasToken error", { error: e });
+		n.error("selectGasToken error", { error: e });
 		return;
 	}
 };

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/customEnclaveFunctionsRegister.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/get-signature-header.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(`./utils/bit.operations.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/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/recipientUtxoProcessing.cjs`),require(`./pre-transaction/ensureAmountChanges.cjs`),require(`./pre-transaction/getFeeStructure.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(`./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/getRecipientInfoFromUserKeys.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/proxyAvatar.utils.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/temp-wallet.utils.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.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/customEnclaveFunctionsRegister.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/get-signature-header.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/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/recipientUtxoProcessing.cjs`),require(`./pre-transaction/ensureAmountChanges.cjs`),require(`./pre-transaction/getFeeStructure.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(`./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/getRecipientInfoFromUserKeys.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/proxyAvatar.utils.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/temp-wallet.utils.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.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

@@ -15,6 +15,7 @@ import "./utils/addresses.mjs";
 import "./utils/tron.utils.mjs";
 import "./web3/events/getInputUtxoAndBalance.mjs";
 import "./utils/get-signature-header.mjs";
+import "./utils/legacyKeys.mjs";
 import "./utils/auth.utils.mjs";
 import "./utils/string.utils.mjs";
 import "./utils/token-check.utils.mjs";
@@ -24,7 +25,6 @@ import "./utils/erc20tokenFunctions.mjs";
 import "./web3/events/getShieldedBalance.mjs";
 import "./pre-transaction/outputUtxoProcessing.mjs";
 import "./utils/external-action.utils.mjs";
-import "./utils/bit.operations.mjs";
 import "./snarkjs/common.snarkjs.mjs";
 import "./pre-transaction/solana.mjs";
 import "./snarkjs/signedMessageHash.mjs";

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

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

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

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

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

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

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

@@ -11,11 +11,10 @@ var i = (i, a, o, s, c = !0, l, u) => {
 		mintAddress: p,
 		nullifyingKey: i.getShieldedPrivateKey(),
 		timeStamp: s,
-		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
+		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint
 	})];
 	if (l !== void 0 && u !== void 0) {
-		let [e, t, n, , i] = l.split(",");
+		let [e, t, n, , , i] = l.split(",");
 		m.push(new r({
 			amount: u,
 			erc20TokenAddress: f,
@@ -23,8 +22,7 @@ var i = (i, a, o, s, c = !0, l, u) => {
 			H0: [BigInt(t), BigInt(n)],
 			stealthAddress: e,
 			encryptionKey: i,
-			timeStamp: s,
-			isNewStyle: !0
+			timeStamp: s
 		}));
 	}
 	return { outputUtxos: m };

package/common/src/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,,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;
+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});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});e.push(n)}})};exports.recipientUtxoProcessing=n;

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

@@ -2,14 +2,13 @@ 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, , f] = o.split(","), p = r.findIndex((t) => t.find((t) => e(t.erc20TokenAddress, n?.token.erc20TokenAddress)) !== void 0), m = 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,
 		H0: [BigInt(u), BigInt(d)],
 		stealthAddress: l,
-		encryptionKey: f,
-		isNewStyle: !0
+		encryptionKey: f
 	});
 	if (p === -1) throw Error("Private recipient index not found");
 	r.forEach((e, n) => {
@@ -21,8 +20,7 @@ var n = (n, r, i, a) => {
 				timeStamp: a,
 				H0: [BigInt(u), BigInt(d)],
 				stealthAddress: l,
-				encryptionKey: f,
-				isNewStyle: !0
+				encryptionKey: f
 			});
 			e.push(n);
 		}

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

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

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`@solana/web3.js`),n=require(`@coral-xyz/anchor`);var r=e=>new TextEncoder().encode(e),i=e=>{let t=[],n=e;for(;n>0n;)t.unshift(Number(n%256n)),n/=256n;for(;t.length<32;)t.unshift(0);return t},a=e=>({extraRandomization:i(e.extraRandomization),stealthAddress:i(e.stealthAddress),h0:i(e.H0),h1:i(e.H1)}),o=(e,n)=>{let i=[r(`hinkal`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},s=(e,n)=>{let i=[r(`hinkal_merkle`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},c=(e,i,a)=>{let o=[r(`hinkal_swapper`),i.toBytes(),new Uint8Array(new n.BN(a.toString()).toArray(`be`,32))],[s]=t.PublicKey.findProgramAddressSync(o,e);return s},l=(t,n,r)=>c(t,n,e.poseidonFunction(r)),u=(e,n)=>{let i=[r(`hinkal_vault`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a};exports.buildAnchorStealthAddressStructure=a,exports.encodeToByte32Array=i,exports.getMerkleAccountPublicKey=s,exports.getStorageAccountPublicKey=o,exports.getStorageVaultPublicKey=u,exports.getSwapperAccountPublicKey=c,exports.getSwapperAccountPublicKeyFromSalt=l;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`@solana/web3.js`),n=require(`@coral-xyz/anchor`);var r=e=>new TextEncoder().encode(e),i=e=>{let t=[],n=e;for(;n>0n;)t.unshift(Number(n%256n)),n/=256n;for(;t.length<32;)t.unshift(0);return t},a=e=>({h0X:i(e.H0x),h0Y:i(e.H0y),h1X:i(e.H1x),h1Y:i(e.H1y),stealthAddress:i(e.stealthAddress)}),o=(e,n)=>{let i=[r(`hinkal`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},s=(e,n)=>{let i=[r(`hinkal_merkle`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},c=(e,i,a)=>{let o=[r(`hinkal_swapper`),i.toBytes(),new Uint8Array(new n.BN(a.toString()).toArray(`be`,32))],[s]=t.PublicKey.findProgramAddressSync(o,e);return s},l=(t,n,r)=>c(t,n,e.poseidonFunction(r)),u=(e,n)=>{let i=[r(`hinkal_vault`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a};exports.buildAnchorStealthAddressStructure=a,exports.encodeToByte32Array=i,exports.getMerkleAccountPublicKey=s,exports.getStorageAccountPublicKey=o,exports.getStorageVaultPublicKey=u,exports.getSwapperAccountPublicKey=c,exports.getSwapperAccountPublicKeyFromSalt=l;

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

@@ -8,10 +8,11 @@ var r = (e) => new TextEncoder().encode(e), i = (e) => {
 	for (; t.length < 32;) t.unshift(0);
 	return t;
 }, a = (e) => ({
-	extraRandomization: i(e.extraRandomization),
-	stealthAddress: i(e.stealthAddress),
-	h0: i(e.H0),
-	h1: i(e.H1)
+	h0X: i(e.H0x),
+	h0Y: i(e.H0y),
+	h1X: i(e.H1x),
+	h1Y: i(e.H1y),
+	stealthAddress: i(e.stealthAddress)
 }), o = (e, n) => {
 	let i = [r("hinkal"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
 	return a;

package/common/src/functions/private-wallet/emporium.helpers.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../utils/caseInsensitive.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/create-provider.cjs`),o=require(`../../data-structures/AccountActions/AccountActions.cjs`),s=require(`../utils/getContractAddress.cjs`);require(`../utils/index.cjs`);let c=require(`ethers`);var l=e=>{if(typeof e.target==`string`)return e.target;if(e.address)return e.address;throw Error(`Contract address not found`)},u=({contract:e,func:t,args:n,callDataString:r,invokeWallet:i,value:a})=>{let o=new Uint8Array,s=r?c.ethers.getBytesCopy(r):new Uint8Array;if(typeof e==`object`){if(o=c.ethers.getBytesCopy(l(e)),r?.length&&r?.length>0)throw Error(`If function and args are providedm no calldata is needed`);t&&n&&!r&&(s=c.ethers.getBytesCopy(e.interface.encodeFunctionData(t,n)))}else o=c.ethers.getBytesCopy(e);let u=c.ethers.getBytesCopy(new Uint8Array([+!!i])),d=c.ethers.zeroPadValue(c.ethers.toBeHex(a??0n),16),f=c.ethers.concat([o,u,d,s]);return c.ethers.hexlify(f)},d=async(n,r,i,a,s,l)=>{let u=e.getOnchainChainId(n),d=i?await o.AccountActions.signTypedDataFromPrivateKey(u,i,{name:`Emporium`,version:`1.0.0`,chainId:u,verifyingContract:r},{EmporiumSignature:[{name:`message`,type:`uint256`},{name:`ops`,type:`bytes[]`}]},{message:s,ops:a}):void 0,{v:f,r:p,s:m}=d?c.ethers.Signature.from(d):{v:0,r:c.ethers.ZeroHash,s:c.ethers.ZeroHash};return c.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)`],[{v:f,r:p,s:m,message:s??0n,signerAddress:l??t.zeroAddress,ops:a}])},f=(e,t,n,r)=>u(e?{contract:e,func:`transfer`,args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),p=(e,i,a,o,c)=>{let l=e.getContractWithFetcher(i,r.ContractType.HinkalContract);return a.map((a,u)=>f(n.caseInsensitiveEqual(a,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.ContractType.ERC20Contract,a),c??s.getContractAddress(l),o[u],!0))},m=(e,t,n,r)=>u({contract:e,func:`approve`,args:[t,n],invokeWallet:r}),h=(e,i,a,o,s,c,l,u)=>{let d=[];for(let s=0;s<a.length;s+=1){let c=a[s],u=n.caseInsensitiveEqual(c,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.ContractType.ERC20Contract,c);d.push(f(u,l,o[s],!1))}if(u)for(let a=0;a<s.length;a+=1){let o=s[a];if(!n.caseInsensitiveEqual(o,t.zeroAddress)){let t=e.getContractWithFetcher(i,r.ContractType.ERC20Contract,o);d.push(m(t,u,c[a],!0))}}return d},g=(e,r,i,a,o,s,c,l)=>{let d=[],f=[o],p=[s];l.nativeFee>0n&&!n.caseInsensitiveEqual(o,t.zeroAddress)&&(f.push(t.zeroAddress),p.push(l.nativeFee));let m=h(e,r,f,p,[o],[c],i,a);d.push(...m);let g=l.nativeFee;return n.caseInsensitiveEqual(o,t.zeroAddress)&&(g+=c),d.push(u({contract:a,callDataString:l.calldata,value:g>0n?g:void 0,invokeWallet:!0})),d},_=`0xef0100`,v=async(e,t)=>{try{let n=a.createJsonRpcProvider(e),r=await n.getCode(t);if(r===`0x`||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(_)&&r.length===48){let e=`0x${r.slice(8)}`,i=await n.getTransactionCount(t);return{delegated:!0,implementation:c.ethers.getAddress(e),nonce:i}}else throw Error(`checkEOAWithDelegation: It is a contract`)}catch(e){throw i.Logger.error(`checkEOAWithDelegation error`,{error:e}),e}},y=r=>{let{hinkalWalletAddress:i}=e.networkRegistry[r].contractData;if(!i||n.caseInsensitiveEqual(i,t.zeroAddress))throw Error(`Hinkal Wallet Address is not set`);return i},b=async(t,r)=>{if(t===e.chainIds.localhost||!r)return;let i=e.getOnchainChainId(t),{delegated:a,implementation:s}=await v(t,o.AccountActions.getSignerAddressFromPrivateKey(t,r)),c=y(t);if(!a||!n.caseInsensitiveEqual(s,c)){let e=await o.AccountActions.authorizeDelegation(i,r,c);return{v:e.signature.v.toString(),r:e.signature.r,s:e.signature.s,nonce:e.nonce.toString(),address:c,chainId:String(i)}}};exports.checkEOAWithDelegation=v,exports.createApproveEmporiumOp=m,exports.createLifiBridgeOps=g,exports.createTransaferEmporiumOpsBatch=p,exports.createTransferToEmporiumOp=f,exports.emporiumOp=u,exports.encodeEmporiumMetadata=d,exports.generateFundAndApproveOps=h,exports.getAuthorizationDataIfNeeded=b;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../utils/caseInsensitive.utils.cjs`),r=require(`../../error-handling/logger.cjs`),i=require(`../../types/ethereum-network.types.cjs`),a=require(`../utils/create-provider.cjs`),o=require(`../../data-structures/AccountActions/AccountActions.cjs`),s=require(`../utils/getContractAddress.cjs`);require(`../utils/index.cjs`);let c=require(`ethers`);var l=e=>{if(typeof e.target==`string`)return e.target;if(e.address)return e.address;throw Error(`Contract address not found`)},u=`tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)`,d=`tuple(uint8 v, bytes32 r, bytes32 s, address signerAddress, ${u}[] ops)`,f=e=>{let[t]=c.ethers.AbiCoder.defaultAbiCoder().decode([u],e);return{endpoint:t.endpoint,invokeWallet:t.invokeWallet,value:BigInt(t.value),callData:t.callData}},p=({contract:e,func:t,args:n,callDataString:r,invokeWallet:i,value:a})=>{let o,s=r??`0x`;if(typeof e==`object`){if(o=l(e),r?.length&&r?.length>0)throw Error(`If function and args are providedm no calldata is needed`);t&&n&&!r&&(s=e.interface.encodeFunctionData(t,n))}else o=e;return c.ethers.AbiCoder.defaultAbiCoder().encode([u],[{endpoint:o,invokeWallet:!!i,value:a??0n,callData:s}])},m=async(n,r,i,a,s,l)=>{let u=e.getOnchainChainId(n),p=a.map(f),m=i?await o.AccountActions.signTypedDataFromPrivateKey(u,i,{name:`Emporium`,version:`1.0.0`,chainId:u,verifyingContract:r},{EmporiumSignature:[{name:`message`,type:`uint256`},{name:`ops`,type:`EmporiumOperation[]`}],EmporiumOperation:[{name:`endpoint`,type:`address`},{name:`invokeWallet`,type:`bool`},{name:`value`,type:`uint128`},{name:`callData`,type:`bytes`}]},{message:s,ops:p}):void 0,{v:h,r:g,s:_}=m?c.ethers.Signature.from(m):{v:0,r:c.ethers.ZeroHash,s:c.ethers.ZeroHash};return c.ethers.AbiCoder.defaultAbiCoder().encode([d],[{v:h,r:g,s:_,signerAddress:l??t.zeroAddress,ops:p}])},h=(e,t,n,r)=>p(e?{contract:e,func:`transfer`,args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),g=(e,r,a,o,c)=>{let l=e.getContractWithFetcher(r,i.ContractType.HinkalContract);return a.map((a,u)=>h(n.caseInsensitiveEqual(a,t.zeroAddress)?void 0:e.getContractWithFetcher(r,i.ContractType.ERC20Contract,a),c??s.getContractAddress(l),o[u],!0))},_=(e,t,n,r)=>p({contract:e,func:`approve`,args:[t,n],invokeWallet:r}),v=(e,r,a,o,s,c,l,u)=>{let d=[];for(let s=0;s<a.length;s+=1){let c=a[s],u=n.caseInsensitiveEqual(c,t.zeroAddress)?void 0:e.getContractWithFetcher(r,i.ContractType.ERC20Contract,c);d.push(h(u,l,o[s],!1))}if(u)for(let a=0;a<s.length;a+=1){let o=s[a];if(!n.caseInsensitiveEqual(o,t.zeroAddress)){let t=e.getContractWithFetcher(r,i.ContractType.ERC20Contract,o);d.push(_(t,u,c[a],!0))}}return d},y=(e,r,i,a,o,s,c,l)=>{let u=[],d=[o],f=[s];l.nativeFee>0n&&!n.caseInsensitiveEqual(o,t.zeroAddress)&&(d.push(t.zeroAddress),f.push(l.nativeFee));let m=v(e,r,d,f,[o],[c],i,a);u.push(...m);let h=l.nativeFee;return n.caseInsensitiveEqual(o,t.zeroAddress)&&(h+=c),u.push(p({contract:a,callDataString:l.calldata,value:h>0n?h:void 0,invokeWallet:!0})),u},b=`0xef0100`,x=async(e,t)=>{try{let n=a.createJsonRpcProvider(e),r=await n.getCode(t);if(r===`0x`||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(b)&&r.length===48){let e=`0x${r.slice(8)}`,i=await n.getTransactionCount(t);return{delegated:!0,implementation:c.ethers.getAddress(e),nonce:i}}else throw Error(`checkEOAWithDelegation: It is a contract`)}catch(e){throw r.Logger.error(`checkEOAWithDelegation error`,{error:e}),e}},S=r=>{let{hinkalWalletAddress:i}=e.networkRegistry[r].contractData;if(!i||n.caseInsensitiveEqual(i,t.zeroAddress))throw Error(`Hinkal Wallet Address is not set`);return i},C=async(t,r)=>{if(t===e.chainIds.localhost||!r)return;let i=e.getOnchainChainId(t),{delegated:a,implementation:s}=await x(t,o.AccountActions.getSignerAddressFromPrivateKey(t,r)),c=S(t);if(!a||!n.caseInsensitiveEqual(s,c)){let e=await o.AccountActions.authorizeDelegation(i,r,c);return{v:e.signature.v.toString(),r:e.signature.r,s:e.signature.s,nonce:e.nonce.toString(),address:c,chainId:String(i)}}};exports.checkEOAWithDelegation=x,exports.createApproveEmporiumOp=_,exports.createLifiBridgeOps=y,exports.createTransaferEmporiumOpsBatch=g,exports.createTransferToEmporiumOp=h,exports.emporiumOp=p,exports.encodeEmporiumMetadata=m,exports.generateFundAndApproveOps=v,exports.getAuthorizationDataIfNeeded=C;

package/common/src/functions/private-wallet/emporium.helpers.d.ts

@@ -19,12 +19,11 @@ export declare const emporiumOp: ({ contract, func, args, callDataString, invoke
     invokeWallet?: boolean;
     value?: bigint;
 }) => string;
-export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], message?: bigint, signerAddress?: string) => Promise<string>;
+export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], emporiumMessage?: bigint, signerAddress?: string) => Promise<string>;
 export declare const decodeEmporiumMetadata: (metadata: string) => {
     v: number;
     r: string;
     s: string;
-    message: bigint;
     signerAddress: string;
     ops: string[];
 };

package/common/src/functions/private-wallet/emporium.helpers.mjs

@@ -1,8 +1,8 @@
 import { chainIds as e, getOnchainChainId as t, networkRegistry as n } from "../../constants/chains.constants.mjs";
 import { zeroAddress as r } from "../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as i } from "../utils/caseInsensitive.utils.mjs";
-import { ContractType as a } from "../../types/ethereum-network.types.mjs";
-import { Logger as o } from "../../error-handling/logger.mjs";
+import { Logger as a } from "../../error-handling/logger.mjs";
+import { ContractType as o } from "../../types/ethereum-network.types.mjs";
 import { createJsonRpcProvider as s } from "../utils/create-provider.mjs";
 import { AccountActions as c } from "../../data-structures/AccountActions/AccountActions.mjs";
 import { getContractAddress as l } from "../utils/getContractAddress.mjs";
@@ -13,48 +13,74 @@ var d = (e) => {
 	if (typeof e.target == "string") return e.target;
 	if (e.address) return e.address;
 	throw Error("Contract address not found");
-}, f = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, value: a }) => {
-	let o = new Uint8Array(), s = r ? u.getBytesCopy(r) : new Uint8Array();
+}, f = "tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)", p = `tuple(uint8 v, bytes32 r, bytes32 s, address signerAddress, ${f}[] ops)`, m = (e) => {
+	let [t] = u.AbiCoder.defaultAbiCoder().decode([f], e);
+	return {
+		endpoint: t.endpoint,
+		invokeWallet: t.invokeWallet,
+		value: BigInt(t.value),
+		callData: t.callData
+	};
+}, h = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, value: a }) => {
+	let o, s = r ?? "0x";
 	if (typeof e == "object") {
-		if (o = u.getBytesCopy(d(e)), r?.length && r?.length > 0) throw Error("If function and args are providedm no calldata is needed");
-		t && n && !r && (s = u.getBytesCopy(e.interface.encodeFunctionData(t, n)));
-	} else o = u.getBytesCopy(e);
-	let c = u.getBytesCopy(new Uint8Array([+!!i])), l = u.zeroPadValue(u.toBeHex(a ?? 0n), 16), f = u.concat([
-		o,
-		c,
-		l,
-		s
-	]);
-	return u.hexlify(f);
-}, p = async (e, n, i, a, o, s) => {
-	let l = t(e), d = i ? await c.signTypedDataFromPrivateKey(l, i, {
+		if (o = d(e), r?.length && r?.length > 0) throw Error("If function and args are providedm no calldata is needed");
+		t && n && !r && (s = e.interface.encodeFunctionData(t, n));
+	} else o = e;
+	return u.AbiCoder.defaultAbiCoder().encode([f], [{
+		endpoint: o,
+		invokeWallet: !!i,
+		value: a ?? 0n,
+		callData: s
+	}]);
+}, g = async (e, n, i, a, o, s) => {
+	let l = t(e), d = a.map(m), f = i ? await c.signTypedDataFromPrivateKey(l, i, {
 		name: "Emporium",
 		version: "1.0.0",
 		chainId: l,
 		verifyingContract: n
-	}, { EmporiumSignature: [{
-		name: "message",
-		type: "uint256"
 	}, {
-		name: "ops",
-		type: "bytes[]"
-	}] }, {
+		EmporiumSignature: [{
+			name: "message",
+			type: "uint256"
+		}, {
+			name: "ops",
+			type: "EmporiumOperation[]"
+		}],
+		EmporiumOperation: [
+			{
+				name: "endpoint",
+				type: "address"
+			},
+			{
+				name: "invokeWallet",
+				type: "bool"
+			},
+			{
+				name: "value",
+				type: "uint128"
+			},
+			{
+				name: "callData",
+				type: "bytes"
+			}
+		]
+	}, {
 		message: o,
-		ops: a
-	}) : void 0, { v: f, r: p, s: m } = d ? u.Signature.from(d) : {
+		ops: d
+	}) : void 0, { v: h, r: g, s: _ } = f ? u.Signature.from(f) : {
 		v: 0,
 		r: u.ZeroHash,
 		s: u.ZeroHash
 	};
-	return u.AbiCoder.defaultAbiCoder().encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"], [{
-		v: f,
-		r: p,
-		s: m,
-		message: o ?? 0n,
+	return u.AbiCoder.defaultAbiCoder().encode([p], [{
+		v: h,
+		r: g,
+		s: _,
 		signerAddress: s ?? r,
-		ops: a
+		ops: d
 	}]);
-}, m = (e, t, n, r) => f(e ? {
+}, _ = (e, t, n, r) => h(e ? {
 	contract: e,
 	func: "transfer",
 	args: [t, n],
@@ -63,41 +89,41 @@ var d = (e) => {
 	contract: t,
 	value: n,
 	invokeWallet: r
-}), h = (e, t, n, o, s) => {
-	let c = e.getContractWithFetcher(t, a.HinkalContract);
-	return n.map((n, u) => m(i(n, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, n), s ?? l(c), o[u], !0));
-}, g = (e, t, n, r) => f({
+}), v = (e, t, n, a, s) => {
+	let c = e.getContractWithFetcher(t, o.HinkalContract);
+	return n.map((n, u) => _(i(n, r) ? void 0 : e.getContractWithFetcher(t, o.ERC20Contract, n), s ?? l(c), a[u], !0));
+}, y = (e, t, n, r) => h({
 	contract: e,
 	func: "approve",
 	args: [t, n],
 	invokeWallet: r
-}), _ = (e, t, n, o, s, c, l, u) => {
+}), b = (e, t, n, a, s, c, l, u) => {
 	let d = [];
 	for (let s = 0; s < n.length; s += 1) {
-		let c = n[s], u = i(c, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, c);
-		d.push(m(u, l, o[s], !1));
+		let c = n[s], u = i(c, r) ? void 0 : e.getContractWithFetcher(t, o.ERC20Contract, c);
+		d.push(_(u, l, a[s], !1));
 	}
 	if (u) for (let n = 0; n < s.length; n += 1) {
-		let o = s[n];
-		if (!i(o, r)) {
-			let r = e.getContractWithFetcher(t, a.ERC20Contract, o);
-			d.push(g(r, u, c[n], !0));
+		let a = s[n];
+		if (!i(a, r)) {
+			let r = e.getContractWithFetcher(t, o.ERC20Contract, a);
+			d.push(y(r, u, c[n], !0));
 		}
 	}
 	return d;
-}, v = (e, t, n, a, o, s, c, l) => {
-	let u = [], d = [o], p = [s];
-	l.nativeFee > 0n && !i(o, r) && (d.push(r), p.push(l.nativeFee));
-	let m = _(e, t, d, p, [o], [c], n, a);
-	u.push(...m);
-	let h = l.nativeFee;
-	return i(o, r) && (h += c), u.push(f({
+}, x = (e, t, n, a, o, s, c, l) => {
+	let u = [], d = [o], f = [s];
+	l.nativeFee > 0n && !i(o, r) && (d.push(r), f.push(l.nativeFee));
+	let p = b(e, t, d, f, [o], [c], n, a);
+	u.push(...p);
+	let m = l.nativeFee;
+	return i(o, r) && (m += c), u.push(h({
 		contract: a,
 		callDataString: l.calldata,
-		value: h > 0n ? h : void 0,
+		value: m > 0n ? m : void 0,
 		invokeWallet: !0
 	})), u;
-}, y = "0xef0100", b = async (e, t) => {
+}, S = "0xef0100", C = async (e, t) => {
 	try {
 		let n = s(e), r = await n.getCode(t);
 		if (r === "0x" || !r) return {
@@ -105,7 +131,7 @@ var d = (e) => {
 			implementation: void 0,
 			nonce: void 0
 		};
-		if (r.toLowerCase().startsWith(y) && r.length === 48) {
+		if (r.toLowerCase().startsWith(S) && r.length === 48) {
 			let e = `0x${r.slice(8)}`, i = await n.getTransactionCount(t);
 			return {
 				delegated: !0,
@@ -114,15 +140,15 @@ var d = (e) => {
 			};
 		} else throw Error("checkEOAWithDelegation: It is a contract");
 	} catch (e) {
-		throw o.error("checkEOAWithDelegation error", { error: e }), e;
+		throw a.error("checkEOAWithDelegation error", { error: e }), e;
 	}
-}, x = (e) => {
+}, w = (e) => {
 	let { hinkalWalletAddress: t } = n[e].contractData;
 	if (!t || i(t, r)) throw Error("Hinkal Wallet Address is not set");
 	return t;
-}, S = async (n, r) => {
+}, T = async (n, r) => {
 	if (n === e.localhost || !r) return;
-	let a = t(n), { delegated: o, implementation: s } = await b(n, c.getSignerAddressFromPrivateKey(n, r)), l = x(n);
+	let a = t(n), { delegated: o, implementation: s } = await C(n, c.getSignerAddressFromPrivateKey(n, r)), l = w(n);
 	if (!o || !i(s, l)) {
 		let e = await c.authorizeDelegation(a, r, l);
 		return {
@@ -136,4 +162,4 @@ var d = (e) => {
 	}
 };
 //#endregion
-export { b as checkEOAWithDelegation, g as createApproveEmporiumOp, v as createLifiBridgeOps, h as createTransaferEmporiumOpsBatch, m as createTransferToEmporiumOp, f as emporiumOp, p as encodeEmporiumMetadata, _ as generateFundAndApproveOps, S as getAuthorizationDataIfNeeded };
+export { C as checkEOAWithDelegation, y as createApproveEmporiumOp, x as createLifiBridgeOps, v as createTransaferEmporiumOpsBatch, _ as createTransferToEmporiumOp, h as emporiumOp, g as encodeEmporiumMetadata, b as generateFundAndApproveOps, T as getAuthorizationDataIfNeeded };

package/common/src/functions/private-wallet/emporium.swap.helpers.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/string.utils.cjs`),o=require(`../utils/erc20tokenFunctions.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../utils/getContractAddress.cjs`),l=require(`./emporium.helpers.cjs`),u=require(`../pre-transaction/getExternalSwapAddress.cjs`);let d=require(`ethers`);var f=(e,t,n,r,i,a,o=!1)=>{let s={tokenIn:t,tokenOut:r,fee:BigInt(a),recipient:i,amountIn:n,amountOutMinimum:0,sqrtPriceLimitX96:0};return l.emporiumOp({contract:new d.ethers.Contract(e,[`function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)`]),func:`exactInputSingle`,args:[s],invokeWallet:o})},p=(e,t,n,r,i,o,s=!1)=>l.emporiumOp({contract:n,callDataString:a.replaceAllInstances(r,u.getExternalSwapAddress(e,t).slice(2),i.slice(2)),value:o,invokeWallet:s}),m=async(e,n)=>{let r=(await o.getErc20TokensForChainAPI(n)).find(e=>e.symbol===`USDT`);return r?t.caseInsensitiveEqual(e,r.erc20TokenAddress):!1},h=async(e,t,n,r,a,o)=>{if(await m(c.getContractAddress(n),e))try{await n.allowance(r,a)>0n&&t.push(l.createApproveEmporiumOp(n,a,0n,o))}catch(e){i.Logger.error(`Error in nullifyUsdtApprovalIfNeeded`,e)}},g=async(t,r,i,a,o,c,u,f)=>{if(i!==e.zeroAddress){let f=s.SWAP_FEE_TAKER_ADDRESSES[r],p=t.getContractWithFetcher(r,n.ContractType.ERC20Contract,i),m=await p.balanceOf(a);await h(r,c,p,a,f,u),c.push(l.createApproveEmporiumOp(p,f,2n**256n-1n,u));let g=new d.ethers.Contract(f,[`function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable`]),_=o;c.push(l.emporiumOp({contract:g,func:`takeSwapFee`,args:[i,m,e.HINKAL_SWAP_VARIABLE_RATE,_],invokeWallet:u}))}else{let t=o;c.push(l.emporiumOp({contract:t,value:f*e.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:u}))}},_=async(t,i,a,o,c,u,m,_,v,y,b,x,S=!1)=>{let C=m<0n?-1n*m:m,w=[],T=s.NATIVE_TOKEN_WRAPPER_ADDRESSES[i],E=!1,D;if(a===r.ExternalActionId.OneInch||a===r.ExternalActionId.Lifi){if(u!==e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,u);w.push(l.createApproveEmporiumOp(e,o,C,S))}let s=0n;return u===e.zeroAddress&&(s+=C),_&&v===e.zeroAddress&&_<0n&&(s+=-1n*_),D=p(i,a,o,c,b,s>0n?s:void 0,S),w.push(D),(a===r.ExternalActionId.OneInch||y&&a===r.ExternalActionId.Lifi)&&v&&_!==void 0&&await g(t,i,v,b,x,w,S,_),w}if(!v||!_)throw Error(`There should be output token for UniSwap and Odos`);if(u===e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T);w.push(l.emporiumOp({contract:e,func:`deposit`,value:C,invokeWallet:S})),u=T}let O=0n;if(v===e.zeroAddress&&(v=T,E=!0,O=await t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T).balanceOf(b)),u!==e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,u);await h(i,w,e,b,o,S),w.push(l.createApproveEmporiumOp(e,o,C,S))}if(D=a===r.ExternalActionId.Uniswap?f(o,u,C,v,b,c,S):p(i,a,o,c,b,void 0,S),w.push(D),await g(t,i,v,b,x,w,S,_),E){let e=s.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[i],r=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T);w.push(l.createApproveEmporiumOp(r,e,2n**256n-1n,S));let a=new d.ethers.Contract(e,[`function withdrawBalanceDifference(uint256 beforeBalance) external`]);w.push(l.emporiumOp({contract:a,func:`withdrawBalanceDifference`,args:[O],invokeWallet:S}))}return w};exports.createSwapToEmporiumOpForUniswap=f,exports.createSwapToEmporiumOps=_;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../utils/string.utils.cjs`),o=require(`../utils/erc20tokenFunctions.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../utils/getContractAddress.cjs`),l=require(`./emporium.helpers.cjs`),u=require(`../pre-transaction/getExternalSwapAddress.cjs`);let d=require(`ethers`);var f=(e,t,n,r,i,a,o=!1)=>{let s={tokenIn:t,tokenOut:r,fee:BigInt(a),recipient:i,amountIn:n,amountOutMinimum:0,sqrtPriceLimitX96:0};return l.emporiumOp({contract:new d.ethers.Contract(e,[`function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)`]),func:`exactInputSingle`,args:[s],invokeWallet:o})},p=(e,t,n,r,i,o,s=!1)=>l.emporiumOp({contract:n,callDataString:a.replaceAllInstances(r,u.getExternalSwapAddress(e,t).slice(2),i.slice(2)),value:o,invokeWallet:s}),m=async(e,n)=>{let r=(await o.getErc20TokensForChainAPI(n)).find(e=>e.symbol===`USDT`);return r?t.caseInsensitiveEqual(e,r.erc20TokenAddress):!1},h=async(e,t,r,i,a,o)=>{if(await m(c.getContractAddress(r),e))try{await r.allowance(i,a)>0n&&t.push(l.createApproveEmporiumOp(r,a,0n,o))}catch(e){n.Logger.error(`Error in nullifyUsdtApprovalIfNeeded`,e)}},g=async(t,n,i,a,o,c,u,f)=>{if(i!==e.zeroAddress){let f=s.SWAP_FEE_TAKER_ADDRESSES[n],p=t.getContractWithFetcher(n,r.ContractType.ERC20Contract,i),m=await p.balanceOf(a);await h(n,c,p,a,f,u),c.push(l.createApproveEmporiumOp(p,f,2n**256n-1n,u));let g=new d.ethers.Contract(f,[`function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable`]),_=o;c.push(l.emporiumOp({contract:g,func:`takeSwapFee`,args:[i,m,e.HINKAL_SWAP_VARIABLE_RATE,_],invokeWallet:u}))}else{let t=o;c.push(l.emporiumOp({contract:t,value:f*e.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:u}))}},_=async(t,n,a,o,c,u,m,_,v,y,b,x,S=!1)=>{let C=m<0n?-1n*m:m,w=[],T=s.NATIVE_TOKEN_WRAPPER_ADDRESSES[n],E=!1,D;if(a===i.ExternalActionId.OneInch||a===i.ExternalActionId.Lifi){if(u!==e.zeroAddress){let e=t.getContractWithFetcher(n,r.ContractType.ERC20Contract,u);w.push(l.createApproveEmporiumOp(e,o,C,S))}let s=0n;return u===e.zeroAddress&&(s+=C),_&&v===e.zeroAddress&&_<0n&&(s+=-1n*_),D=p(n,a,o,c,b,s>0n?s:void 0,S),w.push(D),(a===i.ExternalActionId.OneInch||y&&a===i.ExternalActionId.Lifi)&&v&&_!==void 0&&await g(t,n,v,b,x,w,S,_),w}if(!v||!_)throw Error(`There should be output token for UniSwap and Odos`);if(u===e.zeroAddress){let e=t.getContractWithFetcher(n,r.ContractType.ERC20Contract,T);w.push(l.emporiumOp({contract:e,func:`deposit`,value:C,invokeWallet:S})),u=T}let O=0n;if(v===e.zeroAddress&&(v=T,E=!0,O=await t.getContractWithFetcher(n,r.ContractType.ERC20Contract,T).balanceOf(b)),u!==e.zeroAddress){let e=t.getContractWithFetcher(n,r.ContractType.ERC20Contract,u);await h(n,w,e,b,o,S),w.push(l.createApproveEmporiumOp(e,o,C,S))}if(D=a===i.ExternalActionId.Uniswap?f(o,u,C,v,b,c,S):p(n,a,o,c,b,void 0,S),w.push(D),await g(t,n,v,b,x,w,S,_),E){let e=s.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[n],i=t.getContractWithFetcher(n,r.ContractType.ERC20Contract,T);w.push(l.createApproveEmporiumOp(i,e,2n**256n-1n,S));let a=new d.ethers.Contract(e,[`function withdrawBalanceDifference(uint256 beforeBalance) external`]);w.push(l.emporiumOp({contract:a,func:`withdrawBalanceDifference`,args:[O],invokeWallet:S}))}return w};exports.createSwapToEmporiumOpForUniswap=f,exports.createSwapToEmporiumOps=_;