@hinkal/common 0.2.28 → 0.2.29

package/functions/pre-transaction/getSolanaCalldataHash.mjs

@@ -1,36 +1,38 @@
-import { BN as t } from "@coral-xyz/anchor";
-import { ethers as w } from "ethers";
-import { CIRCOM_P as B } from "../../constants/protocol.constants.mjs";
-const x = (o, r, a, s, c, d, y, u) => {
-  const b = new t(c.toString()), i = new t(d.toString()), l = s.reduce(
-    (n, e) => [...n, ...new t(e.length).toArray("be", 8), ...e],
-    []
-  ), m = y.reduce((n, e) => {
-    const p = [
-      ...new t(e.programIndex).toArray("be", 1),
-      ...new t(e.accountIndexes.length).toArray("be", 8),
-      ...e.accountIndexes,
-      ...new t(e.data.length).toArray("be", 8),
-      ...e.data
-    ];
-    return [...n, ...p];
-  }, []), A = u.reduce(
-    (n, e) => [...n, e.isWritable ? 1 : 0, ...e.pubkey.toBytes()],
-    []
-  ), g = [
-    o.tokenNumber,
-    o.nullifierAmount,
-    o.outputAmount,
-    ...r.toBytes(),
-    ...a.toBytes(),
-    ...l,
-    ...b.toArray("be", 8),
-    ...i.toArray("be", 8),
-    ...m,
-    ...A
-  ];
-  return BigInt(w.sha256(new Uint8Array(g))) % B;
-};
-export {
-  x as getSolanaCalldataHash
+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 ../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) => [
+		...e,
+		...new n(t.length).toArray("be", 8),
+		...t
+	], []), m = l.reduce((e, t) => {
+		let r = [
+			...new n(t.programIndex).toArray("be", 1),
+			...new n(t.accountIndexes.length).toArray("be", 8),
+			...t.accountIndexes,
+			...new n(t.data.length).toArray("be", 8),
+			...t.data
+		];
+		return [...e, ...r];
+	}, []), h = u.reduce((e, t) => [
+		...e,
+		+!!t.isWritable,
+		...t.pubkey.toBytes()
+	], []), g = [
+		r.tokenNumber,
+		r.nullifierAmount,
+		r.outputAmount,
+		...i.toBytes(),
+		...a.toBytes(),
+		...p,
+		...d.toArray("be", 8),
+		...f.toArray("be", 8),
+		...m,
+		...h
+	];
+	return BigInt(t.sha256(new Uint8Array(g))) % e;
 };
+//#endregion
+export { r as getSolanaCalldataHash };

package/functions/pre-transaction/getVolatileTransferAmount.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../error-handling/error-codes.constants.cjs");require("ethers");require("../../types/circom-data.types.cjs");require("../../constants/chains.constants.cjs");require("../../types/activities.types.cjs");require("../../constants/vite.constants.cjs");const c=require("../../error-handling/logger.cjs"),f=require("../../API/simulate-transaction.cjs"),d=require("../../data-structures/token-price-fetcher/TokenChecker.cjs"),g=async(u,a,t,l)=>{try{const r=a.map((e,i)=>{const n=t[i];return e&&d.TokenChecker.isPotentiallyVolatile(e)?{tokenAddress:e.erc20TokenAddress,amount:n.toString(),...l!==void 0?{targetAddress:l}:{},originalIndex:i}:null}).filter(e=>e!==null);if(r.length===0)return t;const s=await f.simulateVolatileTokenTransfer(u,r);return t.map((e,i)=>{const n=r.findIndex(o=>o.originalIndex===i);if(n!==-1&&s[n].success){const o=s[n].balanceDifference;return o?BigInt(o):e}return e})}catch(r){return c.Logger.error("Volatile transfer simulation failed:",r),t}};exports.modifyVolatileTokenAmountChanges=g;
+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/functions/pre-transaction/getVolatileTransferAmount.d.ts

@@ -1,4 +1,4 @@
-import { type ERC20Token } from '../../types/token.types';
+import { ERC20Token } from '../../types/token.types';
 /**
  * Adjusts the token amount changes for volatile tokens based on actual transfer simulation results.
  *

package/functions/pre-transaction/getVolatileTransferAmount.mjs

@@ -1,38 +1,32 @@
-import "../../error-handling/error-codes.constants.mjs";
-import "ethers";
-import "../../types/circom-data.types.mjs";
-import "../../constants/chains.constants.mjs";
-import "../../types/activities.types.mjs";
-import "../../constants/vite.constants.mjs";
-import { Logger as c } from "../../error-handling/logger.mjs";
-import { simulateVolatileTokenTransfer as u } from "../../API/simulate-transaction.mjs";
-import { TokenChecker as f } from "../../data-structures/token-price-fetcher/TokenChecker.mjs";
-const V = async (m, a, t, l) => {
-  try {
-    const e = a.map((r, o) => {
-      const n = t[o];
-      return r && f.isPotentiallyVolatile(r) ? {
-        tokenAddress: r.erc20TokenAddress,
-        amount: n.toString(),
-        ...l !== void 0 ? { targetAddress: l } : {},
-        originalIndex: o
-      } : null;
-    }).filter((r) => r !== null);
-    if (e.length === 0)
-      return t;
-    const s = await u(m, e);
-    return t.map((r, o) => {
-      const n = e.findIndex((i) => i.originalIndex === o);
-      if (n !== -1 && s[n].success) {
-        const i = s[n].balanceDifference;
-        return i ? BigInt(i) : r;
-      }
-      return r;
-    });
-  } catch (e) {
-    return c.error("Volatile transfer simulation failed:", e), t;
-  }
-};
-export {
-  V as modifyVolatileTokenAmountChanges
+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 ../shared/common/src/functions/pre-transaction/getVolatileTransferAmount.ts
+var r = async (r, i, a, o) => {
+	try {
+		let t = i.map((e, t) => {
+			let r = a[t];
+			return e && n.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(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.error("Volatile transfer simulation failed:", e), a;
+	}
 };
+//#endregion
+export { r as modifyVolatileTokenAmountChanges };

package/functions/pre-transaction/index.cjs

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

package/functions/pre-transaction/index.mjs

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

package/functions/pre-transaction/initTokenLimitIfNeeded.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./solana.cjs"),a=require("../../constants/protocol.constants.cjs"),s=require("./sendV0Transaction.cjs"),d=async(t,n,i,e)=>{const o=await t.methods.initTokenLimit().accounts({mint:i.toBase58()===a.solanaNativeAddress?null:i,originalDeployer:n,tokenLimitStorage:c.getTokenLimitStorageAccountPublicKey(t.programId,n,i)}).instruction();await s.sendV0Transaction(t.provider.connection,[o],e,[e])},r=async(t,n,i,e)=>{const o=c.getTokenLimitStorageAccountPublicKey(t.programId,n,i);await t.provider.connection.getAccountInfo(o,"confirmed")||await d(t,n,i,e)};exports.initTokenLimitIfNeeded=r;
+require(`../../constants/protocol.constants.cjs`);const e=require(`./solana.cjs`),t=require(`./sendV0Transaction.cjs`);var n=async(n,r,i,a)=>{let o=await n.methods.initTokenLimit().accounts({mint:i.toBase58()===`11111111111111111111111111111111`?null:i,originalDeployer:r,tokenLimitStorage:e.getTokenLimitStorageAccountPublicKey(n.programId,r,i)}).instruction();await t.sendV0Transaction(n.provider.connection,[o],a,[a])},r=async(t,r,i,a)=>{let o=e.getTokenLimitStorageAccountPublicKey(t.programId,r,i);await t.provider.connection.getAccountInfo(o,`confirmed`)||await n(t,r,i,a)};exports.initTokenLimitIfNeeded=r;

package/functions/pre-transaction/initTokenLimitIfNeeded.mjs

@@ -1,20 +1,17 @@
-import { getTokenLimitStorageAccountPublicKey as c } from "./solana.mjs";
-import { solanaNativeAddress as a } from "../../constants/protocol.constants.mjs";
-import { sendV0Transaction as s } from "./sendV0Transaction.mjs";
-const d = async (t, o, i, n) => {
-  const e = await t.methods.initTokenLimit().accounts({
-    mint: i.toBase58() === a ? null : i,
-    originalDeployer: o,
-    tokenLimitStorage: c(t.programId, o, i)
-  }).instruction();
-  await s(t.provider.connection, [e], n, [n]);
-}, f = async (t, o, i, n) => {
-  const e = c(t.programId, o, i);
-  await t.provider.connection.getAccountInfo(
-    e,
-    "confirmed"
-  ) || await d(t, o, i, n);
-};
-export {
-  f as initTokenLimitIfNeeded
+import "../../constants/protocol.constants.mjs";
+import { getTokenLimitStorageAccountPublicKey as e } from "./solana.mjs";
+import { sendV0Transaction as t } from "./sendV0Transaction.mjs";
+//#region ../shared/common/src/functions/pre-transaction/initTokenLimitIfNeeded.ts
+var n = async (n, r, i, a) => {
+	let o = await n.methods.initTokenLimit().accounts({
+		mint: i.toBase58() === "11111111111111111111111111111111" ? null : i,
+		originalDeployer: r,
+		tokenLimitStorage: e(n.programId, r, i)
+	}).instruction();
+	await t(n.provider.connection, [o], a, [a]);
+}, r = async (t, r, i, a) => {
+	let o = e(t.programId, r, i);
+	await t.provider.connection.getAccountInfo(o, "confirmed") || await n(t, r, i, a);
 };
+//#endregion
+export { r as initTokenLimitIfNeeded };

package/functions/pre-transaction/interaction-to-action.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const e=require("../../types/external-action.types.cjs"),t=require("../../types/hinkal.types.cjs");require("../../types/activities.types.cjs");const n=r=>r===e.ExternalActionId.Transact?t.INTERACTION.WITHDRAW:[e.ExternalActionId.Uniswap,e.ExternalActionId.Odos,e.ExternalActionId.OneInch].includes(r)?t.INTERACTION.SWAP:r===e.ExternalActionId.Emporium?t.INTERACTION.EMPORIUM:t.INTERACTION.NONE;exports.getInteractionFromAction=n;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../types/hinkal.types.cjs`);require(`../../types/index.cjs`);var n=n=>n===e.ExternalActionId.Transact?t.INTERACTION.WITHDRAW:[e.ExternalActionId.Uniswap,e.ExternalActionId.Odos,e.ExternalActionId.OneInch].includes(n)?t.INTERACTION.SWAP:n===e.ExternalActionId.Emporium?t.INTERACTION.EMPORIUM:t.INTERACTION.NONE;exports.getInteractionFromAction=n;

package/functions/pre-transaction/interaction-to-action.mjs

@@ -1,10 +1,11 @@
-import "../../types/circom-data.types.mjs";
-import { ExternalActionId as r } from "../../types/external-action.types.mjs";
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
 import { INTERACTION as t } from "../../types/hinkal.types.mjs";
-import "../../types/activities.types.mjs";
-const p = (o) => o === r.Transact ? t.WITHDRAW : [r.Uniswap, r.Odos, r.OneInch].includes(
-  o
-) ? t.SWAP : o === r.Emporium ? t.EMPORIUM : t.NONE;
-export {
-  p as getInteractionFromAction
-};
+import "../../types/index.mjs";
+//#region ../shared/common/src/functions/pre-transaction/interaction-to-action.ts
+var n = (n) => n === e.Transact ? t.WITHDRAW : [
+	e.Uniswap,
+	e.Odos,
+	e.OneInch
+].includes(n) ? t.SWAP : n === e.Emporium ? t.EMPORIUM : t.NONE;
+//#endregion
+export { n as getInteractionFromAction };

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

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

package/functions/pre-transaction/merge-with-fee-structure-emporium.d.ts

@@ -1,3 +1,3 @@
 import { FeeStructure } from '../../types/hinkal.types';
-import { type IHinkal } from '../../data-structures/Hinkal/IHinkal';
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 export declare const mergeWithFeeStructureEmporium: (hinkal: IHinkal, chainId: number, walletAddress: string, emporiumOps: string[], erc20Addresses: string[], amountChanges: bigint[], feeStructure: FeeStructure, feeTokenChange: bigint) => Promise<void>;

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

@@ -1,24 +1,16 @@
-import { getPublicAddressBalance as T } from "../web3/getPublicAddressBalance.mjs";
-import { mergeWithFeeStructure as F } from "./merge-with-fee-structure.mjs";
-import { createTransferToEmporiumOp as c } from "../private-wallet/emporium.helpers.mjs";
-import { zeroAddress as g } from "../../constants/protocol.constants.mjs";
-import { ContractType as l } from "../../types/ethereum-network.types.mjs";
-import { maxBigInt as C } from "../utils/amounts.utils.mjs";
-const x = async (r, t, n, a, f, p, o, m) => {
-  let e = 0n;
-  const s = m < 0n ? m : 0n, i = await T(r, t, o.feeToken, n) + s;
-  i < 0 ? e = o.flatFee : e = C(o.flatFee - i, 0n), e !== 0n && (F(t, f, p, {
-    ...o,
-    flatFee: e
-  }), a.push(
-    c(
-      o.feeToken === g ? void 0 : r.getContractWithFetcher(t, l.ERC20Contract, o.feeToken),
-      n,
-      e,
-      !1
-    )
-  ));
-};
-export {
-  x as mergeWithFeeStructureEmporium
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
+import { maxBigInt as n } from "../utils/amounts.utils.mjs";
+import { createTransferToEmporiumOp as r } from "../private-wallet/emporium.helpers.mjs";
+import { mergeWithFeeStructure as i } from "./merge-with-fee-structure.mjs";
+import { getPublicAddressBalance as a } from "../web3/getPublicAddressBalance.mjs";
+//#region ../shared/common/src/functions/pre-transaction/merge-with-fee-structure-emporium.ts
+var o = async (o, s, c, l, u, d, f, p) => {
+	let m = 0n, h = p < 0n ? p : 0n, g = await a(o, s, f.feeToken, c) + h;
+	m = g < 0 ? f.flatFee : n(f.flatFee - g, 0n), m !== 0n && (i(s, u, d, {
+		...f,
+		flatFee: m
+	}), l.push(r(f.feeToken === t ? void 0 : o.getContractWithFetcher(s, e.ERC20Contract, f.feeToken), c, m, !1)));
 };
+//#endregion
+export { o as mergeWithFeeStructureEmporium };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../error-handling/logger.cjs"),l=require("../utils/caseInsensitive.utils.cjs"),s=require("../../error-handling/customErrors/FeeOverTransactionValueError.cjs"),a=require("../utils/erc20tokenFunctions.cjs"),c=(i,t,e,o)=>{n.Logger.log("amount changes before merge",{amountChanges:e});const r=t.findIndex(g=>l.caseInsensitiveEqual(g,o.feeToken));if(r===-1){t.push(o.feeToken),e.push(-1n*o.flatFee),n.Logger.log("amount changes after merge",{amountChanges:e});return}if(e[r]>0&&e[r]<o.flatFee)throw new s.FeeOverTransactionValueError({totalFeeWEI:o.flatFee,feeUnit:a.getERC20Token(o.feeToken,i)});e[r]-=o.flatFee,n.Logger.log("amount changes after merge",{amountChanges:e})};exports.mergeWithFeeStructure=c;
+const e=require(`../utils/caseInsensitive.utils.cjs`),t=require(`../utils/erc20tokenFunctions.cjs`),n=require(`../../error-handling/customErrors/FeeOverTransactionValueError.cjs`),r=require(`../../error-handling/logger.cjs`);var i=(i,a,o,s)=>{r.Logger.log(`amount changes before merge`,{amountChanges:o});let c=a.findIndex(t=>e.caseInsensitiveEqual(t,s.feeToken));if(c===-1){a.push(s.feeToken),o.push(-1n*s.flatFee),r.Logger.log(`amount changes after merge`,{amountChanges:o});return}if(o[c]>0&&o[c]<s.flatFee)throw new n.FeeOverTransactionValueError({totalFeeWEI:s.flatFee,feeUnit:t.getERC20Token(s.feeToken,i)});o[c]-=s.flatFee,r.Logger.log(`amount changes after merge`,{amountChanges:o})};exports.mergeWithFeeStructure=i;

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

@@ -1,23 +1,20 @@
+import { caseInsensitiveEqual as e } from "../utils/caseInsensitive.utils.mjs";
+import { getERC20Token as t } from "../utils/erc20tokenFunctions.mjs";
+import { FeeOverTransactionValueError as n } from "../../error-handling/customErrors/FeeOverTransactionValueError.mjs";
 import { Logger as r } from "../../error-handling/logger.mjs";
-import { caseInsensitiveEqual as m } from "../utils/caseInsensitive.utils.mjs";
-import { FeeOverTransactionValueError as t } from "../../error-handling/customErrors/FeeOverTransactionValueError.mjs";
-import { getERC20Token as g } from "../utils/erc20tokenFunctions.mjs";
-const k = (n, i, e, o) => {
-  r.log("amount changes before merge", { amountChanges: e });
-  const f = i.findIndex(
-    (l) => m(l, o.feeToken)
-  );
-  if (f === -1) {
-    i.push(o.feeToken), e.push(-1n * o.flatFee), r.log("amount changes after merge", { amountChanges: e });
-    return;
-  }
-  if (e[f] > 0 && e[f] < o.flatFee)
-    throw new t({
-      totalFeeWEI: o.flatFee,
-      feeUnit: g(o.feeToken, n)
-    });
-  e[f] -= o.flatFee, r.log("amount changes after merge", { amountChanges: e });
-};
-export {
-  k as mergeWithFeeStructure
+//#region ../shared/common/src/functions/pre-transaction/merge-with-fee-structure.ts
+var i = (i, a, o, s) => {
+	r.log("amount changes before merge", { amountChanges: o });
+	let c = a.findIndex((t) => e(t, s.feeToken));
+	if (c === -1) {
+		a.push(s.feeToken), o.push(-1n * s.flatFee), r.log("amount changes after merge", { amountChanges: o });
+		return;
+	}
+	if (o[c] > 0 && o[c] < s.flatFee) throw new n({
+		totalFeeWEI: s.flatFee,
+		feeUnit: t(s.feeToken, i)
+	});
+	o[c] -= s.flatFee, r.log("amount changes after merge", { amountChanges: o });
 };
+//#endregion
+export { i as mergeWithFeeStructure };

package/functions/pre-transaction/outputApprovalDataProcessing.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../error-handling/error-codes.constants.cjs"),u=require("../../constants/conversion.constants.cjs"),_=require("../../types/hinkal.types.cjs"),E=require("../utils/processUseApprovalUtxoData.cjs"),N=require("../utils/amounts.utils.cjs"),O=require("../utils/caseInsensitive.utils.cjs"),D=(d,A,n,s,v,a)=>{if(a&&a>0)throw new Error(l.transactionErrorCodes.INSUFFICIENT_FUNDS);const i=N.countTotalAmountInUtxos(n),{erc20TokenAddress:U}=n[0],c=d.getApprovedUtxosForToken(U,A).filter(t=>!O.caseInsensitiveEqual(t.interactionAddress,v)),o=_.defaultUseApprovalUTXOData(u.APPROVED_UTXO_CONVERSION_COUNT,0n);if(s<0n&&i+s<0n){let t=-(i+s);for(let e=0;e<Math.min(c.length,u.APPROVED_UTXO_CONVERSION_COUNT)&&t!==0n;e+=1){const r=c[e],p=r.amount>=t?-t:-r.amount;t+=p,o.approvalChanges[e]=p,o.externalApprovalAddresses[e]=r.interactionAddress,o.conversionInHinkalAddress[e]=r.inHinkalAddress}if(t!==0n)throw new Error(l.transactionErrorCodes.INSUFFICIENT_FUNDS)}return{useApprovalUtxoData:E.isUseApprovalDataEmpty(o)?void 0:o}};exports.outputApprovalDataProcessing=D;
+require(`../../constants/conversion.constants.cjs`);const e=require(`../../types/hinkal.types.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../utils/amounts.utils.cjs`),i=require(`../utils/processUseApprovalUtxoData.cjs`);var a=(a,o,s,c,l,u)=>{if(u&&u>0)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS);let d=r.countTotalAmountInUtxos(s),{erc20TokenAddress:f}=s[0],p=a.getApprovedUtxosForToken(f,o).filter(e=>!t.caseInsensitiveEqual(e.interactionAddress,l)),m=e.defaultUseApprovalUTXOData(3,0n);if(c<0n&&d+c<0n){let e=-(d+c);for(let t=0;t<Math.min(p.length,3)&&e!==0n;t+=1){let n=p[t],r=n.amount>=e?-e:-n.amount;e+=r,m.approvalChanges[t]=r,m.externalApprovalAddresses[t]=n.interactionAddress,m.conversionInHinkalAddress[t]=n.inHinkalAddress}if(e!==0n)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS)}return{useApprovalUtxoData:i.isUseApprovalDataEmpty(m)?void 0:m}};exports.outputApprovalDataProcessing=a;

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

@@ -1,6 +1,7 @@
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const outputApprovalDataProcessing: (hinkal: IHinkal, chainId: number, inputUtxos: Utxo[], amountChange: bigint, interactionToIgnore?: string, tokenId?: number) => {
+export declare const outputApprovalDataProcessing: (hinkal: IHinkal, chainId: number, inputUtxos: Utxo[], amountChange: bigint, interactionToIgnore?: string, // in case of inside transact, we do not want take approvals we already approved for this interaction
+tokenId?: number) => {
     useApprovalUtxoData: {
         approvalChanges: bigint[];
         externalApprovalAddresses: string[];

package/functions/pre-transaction/outputApprovalDataProcessing.mjs

@@ -1,24 +1,22 @@
-import { transactionErrorCodes as A } from "../../error-handling/error-codes.constants.mjs";
-import { APPROVED_UTXO_CONVERSION_COUNT as d } from "../../constants/conversion.constants.mjs";
-import { defaultUseApprovalUTXOData as f } from "../../types/hinkal.types.mjs";
-import { isUseApprovalDataEmpty as u } from "../utils/processUseApprovalUtxoData.mjs";
-import { countTotalAmountInUtxos as E } from "../utils/amounts.utils.mjs";
-import { caseInsensitiveEqual as I } from "../utils/caseInsensitive.utils.mjs";
-const w = (m, c, s, n, v, a) => {
-  if (a && a > 0)
-    throw new Error(A.INSUFFICIENT_FUNDS);
-  const p = E(s), { erc20TokenAddress: U } = s[0], i = m.getApprovedUtxosForToken(U, c).filter((o) => !I(o.interactionAddress, v)), t = f(d, 0n);
-  if (n < 0n && p + n < 0n) {
-    let o = -(p + n);
-    for (let r = 0; r < Math.min(i.length, d) && o !== 0n; r += 1) {
-      const e = i[r], l = e.amount >= o ? -o : -e.amount;
-      o += l, t.approvalChanges[r] = l, t.externalApprovalAddresses[r] = e.interactionAddress, t.conversionInHinkalAddress[r] = e.inHinkalAddress;
-    }
-    if (o !== 0n)
-      throw new Error(A.INSUFFICIENT_FUNDS);
-  }
-  return { useApprovalUtxoData: u(t) ? void 0 : t };
-};
-export {
-  w as outputApprovalDataProcessing
+import "../../constants/conversion.constants.mjs";
+import { defaultUseApprovalUTXOData as e } from "../../types/hinkal.types.mjs";
+import { caseInsensitiveEqual as t } from "../utils/caseInsensitive.utils.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
+import { countTotalAmountInUtxos as r } from "../utils/amounts.utils.mjs";
+import { isUseApprovalDataEmpty as i } from "../utils/processUseApprovalUtxoData.mjs";
+//#region ../shared/common/src/functions/pre-transaction/outputApprovalDataProcessing.ts
+var a = (a, o, s, c, l, u) => {
+	if (u && u > 0) throw Error(n.INSUFFICIENT_FUNDS);
+	let d = r(s), { erc20TokenAddress: f } = s[0], p = a.getApprovedUtxosForToken(f, o).filter((e) => !t(e.interactionAddress, l)), m = e(3, 0n);
+	if (c < 0n && d + c < 0n) {
+		let e = -(d + c);
+		for (let t = 0; t < Math.min(p.length, 3) && e !== 0n; t += 1) {
+			let n = p[t], r = n.amount >= e ? -e : -n.amount;
+			e += r, m.approvalChanges[t] = r, m.externalApprovalAddresses[t] = n.interactionAddress, m.conversionInHinkalAddress[t] = n.inHinkalAddress;
+		}
+		if (e !== 0n) throw Error(n.INSUFFICIENT_FUNDS);
+	}
+	return { useApprovalUtxoData: i(m) ? void 0 : m };
 };
+//#endregion
+export { a as outputApprovalDataProcessing };

package/functions/pre-transaction/outputUtxoProcessing.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("../../data-structures/utxo/Utxo.cjs"),c=require("../utils/amounts.utils.cjs"),A=require("../../error-handling/error-codes.constants.cjs"),I=(a,o,t,r,l,U=!0,e,n)=>{const s=c.countTotalAmountInUtxos(o),{erc20TokenAddress:i,mintAddress:x}=o[0];if(U&&t<0n&&s+t<0n)throw Error(A.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);const u=[new d.Utxo({amount:c.bigintMax(s+t,0n),erc20TokenAddress:i,mintAddress:x,shieldedPrivateKey:a.getShieldedPrivateKey(),timeStamp:r,tokenId:l})];if(e!==void 0&&n!==void 0){const[T,y,v]=e.split(",");u.push(new d.Utxo({amount:n,erc20TokenAddress:i,randomization:BigInt(T),stealthAddress:y,encryptionKey:v,timeStamp:r}))}return{outputUtxos:u}};exports.outputUtxoProcessing=I;
+const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../utils/amounts.utils.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);var r=(r,i,a,o,s,c=!0,l,u)=>{let d=t.countTotalAmountInUtxos(i),{erc20TokenAddress:f,mintAddress:p}=i[0];if(c&&a<0n&&d+a<0n)throw Error(e.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let m=[new n.Utxo({amount:t.bigintMax(d+a,0n),erc20TokenAddress:f,mintAddress:p,shieldedPrivateKey:r.getShieldedPrivateKey(),timeStamp:o,tokenId:s})];if(l!==void 0&&u!==void 0){let[e,t,r]=l.split(`,`);m.push(new n.Utxo({amount:u,erc20TokenAddress:f,randomization:BigInt(e),stealthAddress:t,encryptionKey:r,timeStamp:o}))}return{outputUtxos:m}};exports.outputUtxoProcessing=r;

package/functions/pre-transaction/outputUtxoProcessing.mjs

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

package/functions/pre-transaction/process-gas-estimates.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../API/getGasEstimates.cjs"),E=require("../../error-handling/logError.cjs"),d=require("../utils/amounts.utils.cjs"),f=require("../web3/etherFunctions.cjs"),I=async(i,e,n,a,o,c=[],u)=>{let s,t;try{({priceOfTransactionInUSD:s,priceOfTransactionInToken:t}=await T.getGasEstimates(i,e.erc20TokenAddress,n,a,c.map(({from:r,to:m,calldata:g,value:p})=>({from:r,to:m,calldata:g,value:`${p}`})),o,u))}catch(r){E.logError("processGasEstimates error:",r)}const l=t?f.getAmountInWei(e,d.getValueFirstNDigit(t,e.decimals)):void 0;return{priceOfTransactionInUSD:s,priceOfTransactionInToken:l}};exports.processGasEstimates=I;
+const e=require(`../../API/getGasEstimates.cjs`),t=require(`../web3/etherFunctions.cjs`),n=require(`../utils/amounts.utils.cjs`),r=require(`../../error-handling/logError.cjs`);var i=async(i,a,o,s,c,l=[],u)=>{let d,f;try{({priceOfTransactionInUSD:d,priceOfTransactionInToken:f}=await e.getGasEstimates(i,a.erc20TokenAddress,o,s,l.map(({from:e,to:t,calldata:n,value:r})=>({from:e,to:t,calldata:n,value:`${r}`})),c,u))}catch(e){r.logError(`processGasEstimates error:`,e)}let p=f?t.getAmountInWei(a,n.getValueFirstNDigit(f,a.decimals)):void 0;return{priceOfTransactionInUSD:d,priceOfTransactionInToken:p}};exports.processGasEstimates=i;

package/functions/pre-transaction/process-gas-estimates.mjs

@@ -1,25 +1,25 @@
-import { getGasEstimates as g } from "../../API/getGasEstimates.mjs";
-import { logError as E } from "../../error-handling/logError.mjs";
-import { getValueFirstNDigit as I } from "../utils/amounts.utils.mjs";
-import { getAmountInWei as d } from "../web3/etherFunctions.mjs";
-const y = async (o, r, s, a, n, c = [], m) => {
-  let i, t;
-  try {
-    ({ priceOfTransactionInUSD: i, priceOfTransactionInToken: t } = await g(
-      o,
-      r.erc20TokenAddress,
-      s,
-      a,
-      c.map(({ from: e, to: f, calldata: T, value: l }) => ({ from: e, to: f, calldata: T, value: `${l}` })),
-      n,
-      m
-    ));
-  } catch (e) {
-    E("processGasEstimates error:", e);
-  }
-  const p = t ? d(r, I(t, r.decimals)) : void 0;
-  return { priceOfTransactionInUSD: i, priceOfTransactionInToken: p };
-};
-export {
-  y as processGasEstimates
+import { getGasEstimates as e } from "../../API/getGasEstimates.mjs";
+import { getAmountInWei as t } from "../web3/etherFunctions.mjs";
+import { getValueFirstNDigit as n } from "../utils/amounts.utils.mjs";
+import { logError as r } from "../../error-handling/logError.mjs";
+//#region ../shared/common/src/functions/pre-transaction/process-gas-estimates.ts
+var i = async (i, a, o, s, c, l = [], u) => {
+	let d, f;
+	try {
+		({priceOfTransactionInUSD: d, priceOfTransactionInToken: f} = await e(i, a.erc20TokenAddress, o, s, l.map(({ from: e, to: t, calldata: n, value: r }) => ({
+			from: e,
+			to: t,
+			calldata: n,
+			value: `${r}`
+		})), c, u));
+	} catch (e) {
+		r("processGasEstimates error:", e);
+	}
+	let p = f ? t(a, n(f, a.decimals)) : void 0;
+	return {
+		priceOfTransactionInUSD: d,
+		priceOfTransactionInToken: p
+	};
 };
+//#endregion
+export { i as processGasEstimates };

package/functions/pre-transaction/recipientUtxoProcessing.cjs

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