@hinkal/common 0.3.2 → 0.3.3

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

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

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

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

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

@@ -1,11 +1,11 @@
-import { Logger as e } from "../../error-handling/logger.mjs";
-import { simulateVolatileTokenTransfer as t } from "../../API/simulate-transaction.mjs";
+import { simulateVolatileTokenTransfer as e } from "../../API/simulate-transaction.mjs";
+import { Logger as t } from "../../error-handling/logger.mjs";
 import "../../error-handling/index.mjs";
 import { TokenChecker as n } from "../../data-structures/token-price-fetcher/TokenChecker.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/getVolatileTransferAmount.ts
 var r = async (r, i, a, o) => {
 	try {
-		let e = i.map((e, t) => {
+		let t = i.map((e, t) => {
 			let r = a[t];
 			return e && n.isPotentiallyVolatile(e) ? {
 				tokenAddress: e.erc20TokenAddress,
@@ -14,18 +14,18 @@ var r = async (r, i, a, o) => {
 				originalIndex: t
 			} : null;
 		}).filter((e) => e !== null);
-		if (e.length === 0) return a;
-		let s = await t(r, e);
-		return a.map((t, n) => {
-			let r = e.findIndex((e) => e.originalIndex === n);
+		if (t.length === 0) return a;
+		let s = await e(r, t);
+		return a.map((e, n) => {
+			let r = t.findIndex((e) => e.originalIndex === n);
 			if (r !== -1 && s[r].success) {
-				let e = s[r].balanceDifference;
-				return e ? BigInt(e) : t;
+				let t = s[r].balanceDifference;
+				return t ? BigInt(t) : e;
 			}
-			return t;
+			return e;
 		});
-	} catch (t) {
-		return e.error("Volatile transfer simulation failed:", t), a;
+	} catch (e) {
+		return t.error("Volatile transfer simulation failed:", e), a;
 	}
 };
 //#endregion

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

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

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

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

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

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

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})];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;
+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;

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

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

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

@@ -13,19 +13,18 @@ var i = (i, a, o, s, c = !0, l, u) => {
 		timeStamp: s,
 		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint
 	})];
-	if (l !== void 0 && u !== void 0) {
-		let [e, t, n, , , i] = l.split(",");
+	return l !== void 0 && u !== void 0 && l.forEach((e, t) => {
+		let [n, i, a, , , o] = e.split(",");
 		m.push(new r({
-			amount: u,
+			amount: u[t],
 			erc20TokenAddress: f,
 			mintAddress: p,
-			H0: [BigInt(t), BigInt(n)],
-			stealthAddress: e,
-			encryptionKey: i,
+			H0: [BigInt(i), BigInt(a)],
+			stealthAddress: n,
+			encryptionKey: o,
 			timeStamp: s
 		}));
-	}
-	return { outputUtxos: m };
+	}), { outputUtxos: m };
 };
 //#endregion
 export { i as outputUtxoProcessing };

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

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

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

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

@@ -1,34 +1,58 @@
-import { poseidonFunction as e } from "../../crypto/poseidon.mjs";
-import { PublicKey as t } from "@solana/web3.js";
-import { BN as n } from "@coral-xyz/anchor";
+import { MERKLE_LEVELS as e } from "../../constants/protocol.constants.mjs";
+import { poseidonFunction as t } from "../../crypto/poseidon.mjs";
+import { PublicKey as n } from "@solana/web3.js";
+import { BN as r } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/functions/pre-transaction/solana.ts
-var r = (e) => new TextEncoder().encode(e), i = (e) => {
+var i = (e) => new TextEncoder().encode(e), a = (e) => {
 	let t = [], n = e;
 	for (; n > 0n;) t.unshift(Number(n % 256n)), n /= 256n;
 	for (; t.length < 32;) t.unshift(0);
 	return t;
-}, 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.findProgramAddressSync(i, e);
+}, o = (e) => ({
+	h0X: a(e.H0x),
+	h0Y: a(e.H0y),
+	h1X: a(e.H1x),
+	h1Y: a(e.H1y),
+	stealthAddress: a(e.stealthAddress)
+}), s = (e, t, r) => {
+	let o = a(e), s = [
+		i("hinkal_nullifier"),
+		t.toBytes(),
+		new Uint8Array(o)
+	], [c] = n.findProgramAddressSync(s, r);
+	return c;
+}, c = (e, t) => {
+	let r = [i("hinkal"), t.toBytes()], [a] = n.findProgramAddressSync(r, e);
 	return a;
-}, s = (e, n) => {
-	let i = [r("hinkal_merkle"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+}, l = (e, t) => {
+	let r = [i("hinkal_merkle"), t.toBytes()], [a] = n.findProgramAddressSync(r, e);
 	return a;
-}, c = (e, i, a) => {
+}, u = 327680n, d = (e) => 2n ** (e - 1n), f = (e) => e / u, p = (e) => e % u, m = (e, t, a) => {
 	let o = [
-		r("hinkal_swapper"),
-		i.toBytes(),
-		new Uint8Array(new n(a.toString()).toArray("be", 32))
-	], [s] = t.findProgramAddressSync(o, e);
+		i("hinkal_root_bucket"),
+		t.toBytes(),
+		new Uint8Array(new r(a.toString()).toArray("le", 8))
+	], [s] = n.findProgramAddressSync(o, e);
 	return s;
-}, l = (t, n, r) => c(t, n, e(r)), u = (e, n) => {
-	let i = [r("hinkal_vault"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+}, h = async (e, t) => {
+	let n = await e.account.merkle.fetch(t);
+	return BigInt(`0x${Buffer.from(n.mIndex).toString("hex")}`);
+}, g = async (t, n, r) => {
+	let i = await h(t, n) - d(e), a = f(i);
+	return {
+		current: m(t.programId, n, a),
+		next: i % 327680n + BigInt(r) > 327680n ? m(t.programId, n, a + 1n) : null
+	};
+}, _ = (e, t, a) => {
+	let o = [
+		i("hinkal_swapper"),
+		t.toBytes(),
+		new Uint8Array(new r(a.toString()).toArray("be", 32))
+	], [s] = n.findProgramAddressSync(o, e);
+	return s;
+}, v = (e, n, r) => _(e, n, t(r)), y = (e, t) => {
+	let r = [i("hinkal_vault"), t.toBytes()], [a] = n.findProgramAddressSync(r, e);
 	return a;
 };
 //#endregion
-export { a as buildAnchorStealthAddressStructure, i as encodeToByte32Array, s as getMerkleAccountPublicKey, o as getStorageAccountPublicKey, u as getStorageVaultPublicKey, c as getSwapperAccountPublicKey, l as getSwapperAccountPublicKeyFromSalt };
+export { u as ROOT_BUCKET_CAP, o as buildAnchorStealthAddressStructure, a as encodeToByte32Array, h as fetchSolanaMIndex, l as getMerkleAccountPublicKey, d as getMerkleMinimumIndex, s as getNullifierAccount, f as getRootBucketIndex, m as getRootBucketPublicKey, p as getRootBucketSlot, c as getStorageAccountPublicKey, y as getStorageVaultPublicKey, _ as getSwapperAccountPublicKey, v as getSwapperAccountPublicKeyFromSalt, g as resolveSolanaRootBuckets };

package/common/src/functions/pre-transaction/store-proof.cjs

@@ -1 +1 @@
-require(`../../constants/protocol.constants.cjs`),require(`./solana.cjs`),require(`./sendV0Transaction.cjs`);
+require(`../../constants/protocol.constants.cjs`),require(`./solana.cjs`),require(`./sendV0Transaction.cjs`),require(`ethers`);

package/common/src/functions/pre-transaction/store-proof.d.ts

@@ -1,6 +1,6 @@
 import { Program } from '@coral-xyz/anchor';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
-export declare const storeProof: (connection: Connection, hinkalProgram: Program, signer: Keypair, originalDeployer: PublicKey, id: bigint, encryptedOutputs: number[][], proofAArr: number[], proofBArr: number[], proofCArr: number[], publicInputsArr: number[][]) => Promise<{
+export declare const storeProof: (connection: Connection, hinkalProgram: Program, signer: Keypair, originalDeployer: PublicKey, id: bigint, encryptedOutputs: number[][], onChainEncryptedOutput: string, onChainCreation: boolean[], proofAArr: number[], proofBArr: number[], proofCArr: number[], publicInputsArr: number[][]) => Promise<{
     proofAccountPart1: PublicKey;
     proofAccountPart2: PublicKey;
     encryptedOutputsAccount: PublicKey;

package/common/src/functions/pre-transaction/store-proof.mjs

@@ -1,3 +1,4 @@
 import "../../constants/protocol.constants.mjs";
 import "./solana.mjs";
 import "./sendV0Transaction.mjs";
+import "ethers";

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

@@ -1 +1 @@
-const e=require(`../utils/time.utils.cjs`);var t=60,n=(e,t)=>{if(!e.length)return!0;let n=new Set(t.map(e=>e.toString()));return e.every(({utxo:e})=>{let t=BigInt(e.getCommitment());return n.has(t.toString())})},r=(e,t,n=20)=>{let r=e.merkleTreeHinkalByChain[t],i=r.getStartIndex(),{count:a}=r.toJSON(),o=BigInt(a);if(o===0n)return[];let s=r.getMerkleData(),c=[],l=o<BigInt(n)?o:BigInt(n);for(let e=0n;e<l;e+=1n){let t=i+o-1n-e,n=s.get(t);n&&n!==0n&&c.push(n)}return c},i=async(i,a,o)=>{if(o.length){for(let s=0;s<t;s+=1){if(n(o,r(i,a)))return;await e.waitLittle()}throw Error(`Timeout while waiting for deposited UTXOs to appear in Merkle tree.`)}};exports.waitForDepositedUtxosInMerkleTree=i;
+const e=require(`../utils/time.utils.cjs`);var t=60,n=(e,t)=>{if(!e.length)return!0;let n=new Set(t.map(e=>e.toString()));return e.every(({utxo:e})=>{let t=BigInt(e.getCommitment());return n.has(t.toString())})},r=(e,t,n=20)=>{let r=e.merkleTreeHinkalByChain[t],i=r.getStartIndex(),{count:a}=r.toJSON(),o=BigInt(a);if(o===0n)return[];let s=r.getMerkleData(),c=[],l=o<BigInt(n)?o:BigInt(n);for(let e=0n;e<l;e+=1n){let t=i+o-1n-e,n=s.get(t);n&&n!==0n&&c.push(n)}return c},i=async(i,a,o)=>{if(o.length&&!i.generateProofRemotely){for(let s=0;s<t;s+=1){if(n(o,r(i,a)))return;await e.waitLittle()}throw Error(`Timeout while waiting for deposited UTXOs to appear in Merkle tree.`)}};exports.waitForDepositedUtxosInMerkleTree=i;

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

@@ -17,7 +17,7 @@ var t = 60, n = (e, t) => {
 	}
 	return c;
 }, i = async (i, a, o) => {
-	if (o.length) {
+	if (o.length && !i.generateProofRemotely) {
 		for (let s = 0; s < t; s += 1) {
 			if (n(o, r(i, a))) return;
 			await e();

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(`../../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;
+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`);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,i,a,o,c)=>{let l=e.getContractWithFetcher(i,r.ContractType.HinkalContract);return a.map((a,u)=>h(n.caseInsensitiveEqual(a,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.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,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(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(i,r.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 i.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.mjs

@@ -1,12 +1,11 @@
 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 { Logger as a } from "../../error-handling/logger.mjs";
-import { ContractType as o } from "../../types/ethereum-network.types.mjs";
+import { ContractType as a } from "../../types/ethereum-network.types.mjs";
+import { Logger as o } from "../../error-handling/logger.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";
-import "../utils/index.mjs";
 import { ethers as u } from "ethers";
 //#region libs/shared/common/src/functions/private-wallet/emporium.helpers.ts
 var d = (e) => {
@@ -89,24 +88,24 @@ var d = (e) => {
 	contract: t,
 	value: n,
 	invokeWallet: r
-}), 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));
+}), v = (e, t, n, o, s) => {
+	let c = e.getContractWithFetcher(t, a.HinkalContract);
+	return n.map((n, u) => _(i(n, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, n), s ?? l(c), o[u], !0));
 }, y = (e, t, n, r) => h({
 	contract: e,
 	func: "approve",
 	args: [t, n],
 	invokeWallet: r
-}), b = (e, t, n, a, s, c, l, u) => {
+}), b = (e, t, n, o, 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, o.ERC20Contract, c);
-		d.push(_(u, l, a[s], !1));
+		let c = n[s], u = i(c, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, c);
+		d.push(_(u, l, o[s], !1));
 	}
 	if (u) for (let n = 0; n < s.length; n += 1) {
-		let a = s[n];
-		if (!i(a, r)) {
-			let r = e.getContractWithFetcher(t, o.ERC20Contract, a);
+		let o = s[n];
+		if (!i(o, r)) {
+			let r = e.getContractWithFetcher(t, a.ERC20Contract, o);
 			d.push(y(r, u, c[n], !0));
 		}
 	}
@@ -140,7 +139,7 @@ var d = (e) => {
 			};
 		} else throw Error("checkEOAWithDelegation: It is a contract");
 	} catch (e) {
-		throw a.error("checkEOAWithDelegation error", { error: e }), e;
+		throw o.error("checkEOAWithDelegation error", { error: e }), e;
 	}
 }, w = (e) => {
 	let { hinkalWalletAddress: t } = n[e].contractData;

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(`../../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=_;
+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(`../pre-transaction/getExternalSwapAddress.cjs`),c=require(`../utils/getContractAddress.cjs`),l=require(`./emporium.helpers.cjs`),u=require(`../../constants/addresses.constants.cjs`);let d=require(`ethers`);var f=(e,t,n,r,i,o,c=!1)=>l.emporiumOp({contract:n,callDataString:a.replaceAllInstances(r,s.getExternalSwapAddress(e,t).slice(2),i.slice(2)),value:o,invokeWallet:c}),p=async(e,n)=>{let r=(await o.getErc20TokensForChainAPI(n)).find(e=>e.symbol===`USDT`);return r?t.caseInsensitiveEqual(e,r.erc20TokenAddress):!1},m=async(e,t,n,r,a,o)=>{if(await p(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)}},h=async(t,r,i,a,o,s,c,f)=>{if(i!==e.zeroAddress){let f=u.SWAP_FEE_TAKER_ADDRESSES[r],p=t.getContractWithFetcher(r,n.ContractType.ERC20Contract,i),h=await p.balanceOf(a);await m(r,s,p,a,f,c),s.push(l.createApproveEmporiumOp(p,f,2n**256n-1n,c));let g=new d.ethers.Contract(f,[`function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable`]),_=o;s.push(l.emporiumOp({contract:g,func:`takeSwapFee`,args:[i,h,e.HINKAL_SWAP_VARIABLE_RATE,_],invokeWallet:c}))}else{let t=o;s.push(l.emporiumOp({contract:t,value:f*e.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:c}))}},g=async(t,i,a,o,s,c,u,d,p,m,g,_,v=!1)=>{if(a!==r.ExternalActionId.Lifi)throw Error(`Unsupported swap external action for emporium ops: ${a}`);let y=u<0n?-1n*u:u,b=[];if(c!==e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,c);b.push(l.createApproveEmporiumOp(e,o,y,v))}let x=0n;c===e.zeroAddress&&(x+=y),d&&p===e.zeroAddress&&d<0n&&(x+=-1n*d);let S=x>0n?x:void 0;return b.push(f(i,a,o,s,g,S,v)),m&&p&&d!==void 0&&await h(t,i,p,g,_,b,v,d),b};exports.createSwapToEmporiumOps=g;

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

@@ -1,4 +1,3 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { ExternalActionId } from '../../types/external-action.types';
-export declare const createSwapToEmporiumOpForUniswap: (routerAddress: string, inputTokenAddress: string, positiveAmountInput: bigint, outputTokenAddress: string, recipient: string, data: string, invokeWallet?: boolean) => string;
 export declare const createSwapToEmporiumOps: (hinkal: IHinkal, chainId: number, externalActionId: ExternalActionId, routerAddress: string, data: string, inputTokenAddress: string, inputAmount: bigint, outputAmount: bigint | undefined, outputTokenAddress: string | undefined, isTheSameChainSwap: boolean, walletAddress: string, relay: string, invokeWallet?: boolean) => Promise<string[]>;

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

@@ -1,107 +1,65 @@
 import { HINKAL_SWAP_VARIABLE_RATE as e, zeroAddress as t } from "../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as n } from "../utils/caseInsensitive.utils.mjs";
-import { Logger as r } from "../../error-handling/logger.mjs";
-import { ContractType as i } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { ContractType as r } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as i } from "../../types/external-action.types.mjs";
+import { Logger as a } from "../../error-handling/logger.mjs";
 import { replaceAllInstances as o } from "../utils/string.utils.mjs";
 import { getErc20TokensForChainAPI as s } from "../utils/erc20tokenFunctions.mjs";
-import { NATIVE_TOKEN_WRAPPER_ADDRESSES as c, SWAP_FEE_TAKER_ADDRESSES as l, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as u } from "../../constants/addresses.constants.mjs";
-import { getContractAddress as d } from "../utils/getContractAddress.mjs";
-import { createApproveEmporiumOp as f, emporiumOp as p } from "./emporium.helpers.mjs";
-import { getExternalSwapAddress as m } from "../pre-transaction/getExternalSwapAddress.mjs";
-import { ethers as h } from "ethers";
+import { getExternalSwapAddress as c } from "../pre-transaction/getExternalSwapAddress.mjs";
+import { getContractAddress as l } from "../utils/getContractAddress.mjs";
+import { createApproveEmporiumOp as u, emporiumOp as d } from "./emporium.helpers.mjs";
+import { SWAP_FEE_TAKER_ADDRESSES as f } from "../../constants/addresses.constants.mjs";
+import { ethers as p } from "ethers";
 //#region libs/shared/common/src/functions/private-wallet/emporium.swap.helpers.ts
-var g = (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 p({
-		contract: new h.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
-	});
-}, _ = (e, t, n, r, i, a, s = !1) => p({
+var m = (e, t, n, r, i, a, s = !1) => d({
 	contract: n,
-	callDataString: o(r, m(e, t).slice(2), i.slice(2)),
+	callDataString: o(r, c(e, t).slice(2), i.slice(2)),
 	value: a,
 	invokeWallet: s
-}), v = async (e, t) => {
+}), h = async (e, t) => {
 	let r = (await s(t)).find((e) => e.symbol === "USDT");
 	return r ? n(e, r.erc20TokenAddress) : !1;
-}, y = async (e, t, n, i, a, o) => {
-	if (await v(d(n), e)) try {
-		await n.allowance(i, a) > 0n && t.push(f(n, a, 0n, o));
+}, g = async (e, t, n, r, i, o) => {
+	if (await h(l(n), e)) try {
+		await n.allowance(r, i) > 0n && t.push(u(n, i, 0n, o));
 	} catch (e) {
-		r.error("Error in nullifyUsdtApprovalIfNeeded", e);
+		a.error("Error in nullifyUsdtApprovalIfNeeded", e);
 	}
-}, b = async (n, r, a, o, s, c, u, d) => {
+}, _ = async (n, i, a, o, s, c, l, m) => {
 	if (a !== t) {
-		let t = l[r], d = n.getContractWithFetcher(r, i.ERC20Contract, a), m = await d.balanceOf(o);
-		await y(r, c, d, o, t, u), c.push(f(d, t, 2n ** 256n - 1n, u));
-		let g = new h.Contract(t, ["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"]), _ = s;
-		c.push(p({
-			contract: g,
+		let t = f[i], m = n.getContractWithFetcher(i, r.ERC20Contract, a), h = await m.balanceOf(o);
+		await g(i, c, m, o, t, l), c.push(u(m, t, 2n ** 256n - 1n, l));
+		let _ = new p.Contract(t, ["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"]), v = s;
+		c.push(d({
+			contract: _,
 			func: "takeSwapFee",
 			args: [
 				a,
-				m,
+				h,
 				e,
-				_
+				v
 			],
-			invokeWallet: u
+			invokeWallet: l
 		}));
 	} else {
 		let t = s;
-		c.push(p({
+		c.push(d({
 			contract: t,
-			value: d * e / 10000n,
-			invokeWallet: u
+			value: m * e / 10000n,
+			invokeWallet: l
 		}));
 	}
-}, x = async (e, n, r, o, s, l, d, m, v, x, S, C, w = !1) => {
-	let T = d < 0n ? -1n * d : d, E = [], D = c[n], O = !1, k;
-	if (r === a.OneInch || r === a.Lifi) {
-		if (l !== t) {
-			let t = e.getContractWithFetcher(n, i.ERC20Contract, l);
-			E.push(f(t, o, T, w));
-		}
-		let c = 0n;
-		return l === t && (c += T), m && v === t && m < 0n && (c += -1n * m), k = _(n, r, o, s, S, c > 0n ? c : void 0, w), E.push(k), (r === a.OneInch || x && r === a.Lifi) && v && m !== void 0 && await b(e, n, v, S, C, E, w, m), E;
+}, v = async (e, n, a, o, s, c, l, d, f, p, h, g, v = !1) => {
+	if (a !== i.Lifi) throw Error(`Unsupported swap external action for emporium ops: ${a}`);
+	let y = l < 0n ? -1n * l : l, b = [];
+	if (c !== t) {
+		let t = e.getContractWithFetcher(n, r.ERC20Contract, c);
+		b.push(u(t, o, y, v));
 	}
-	if (!v || !m) throw Error("There should be output token for UniSwap and Odos");
-	if (l === t) {
-		let t = e.getContractWithFetcher(n, i.ERC20Contract, D);
-		E.push(p({
-			contract: t,
-			func: "deposit",
-			value: T,
-			invokeWallet: w
-		})), l = D;
-	}
-	let A = 0n;
-	if (v === t && (v = D, O = !0, A = await e.getContractWithFetcher(n, i.ERC20Contract, D).balanceOf(S)), l !== t) {
-		let t = e.getContractWithFetcher(n, i.ERC20Contract, l);
-		await y(n, E, t, S, o, w), E.push(f(t, o, T, w));
-	}
-	if (k = r === a.Uniswap ? g(o, l, T, v, S, s, w) : _(n, r, o, s, S, void 0, w), E.push(k), await b(e, n, v, S, C, E, w, m), O) {
-		let t = u[n], r = e.getContractWithFetcher(n, i.ERC20Contract, D);
-		E.push(f(r, t, 2n ** 256n - 1n, w));
-		let a = new h.Contract(t, ["function withdrawBalanceDifference(uint256 beforeBalance) external"]);
-		E.push(p({
-			contract: a,
-			func: "withdrawBalanceDifference",
-			args: [A],
-			invokeWallet: w
-		}));
-	}
-	return E;
+	let x = 0n;
+	c === t && (x += y), d && f === t && d < 0n && (x += -1n * d);
+	let S = x > 0n ? x : void 0;
+	return b.push(m(n, a, o, s, h, S, v)), p && f && d !== void 0 && await _(e, n, f, h, g, b, v, d), b;
 };
 //#endregion
-export { g as createSwapToEmporiumOpForUniswap, x as createSwapToEmporiumOps };
+export { v as createSwapToEmporiumOps };

package/common/src/functions/private-wallet/index.cjs

@@ -1 +1 @@
-require(`./emporium.helpers.cjs`),require(`./opProducer.cjs`),require(`./emporium.swap.helpers.cjs`);
+require(`./emporium.helpers.cjs`),require(`./emporium.swap.helpers.cjs`);

package/common/src/functions/private-wallet/index.d.ts

@@ -1,3 +1,2 @@
 export * from './emporium.helpers';
-export * from './opProducer';
 export * from './emporium.swap.helpers';

package/common/src/functions/private-wallet/index.mjs

@@ -1,3 +1,2 @@
 import "./emporium.helpers.mjs";
-import "./opProducer.mjs";
 import "./emporium.swap.helpers.mjs";