@hinkal/common 0.2.15 → 0.2.16

package/functions/pre-transaction/getFlatFees.mjs

@@ -1,188 +1,65 @@
-import { isBeefyDeposit as O } from "../../types/beefy.types.mjs";
 import "../../types/circom-data.types.mjs";
-import { INTERACTION as a } from "../../types/hinkal.types.mjs";
+import { INTERACTION as e } from "../../types/hinkal.types.mjs";
 import "../../types/transactions.types.mjs";
-import "../../types/curve.types.mjs";
 import "../../types/activities.types.mjs";
-import { getERC20Token as T } from "../utils/erc20tokenFunctions.mjs";
-import { processGasEstimates as A } from "./process-gas-estimates.mjs";
-import { getInteractionFromAction as i } from "./interaction-to-action.mjs";
-const Y = async (_, t, S, P, D, W, R = []) => {
-  let k;
-  const N = i(S, D);
-  if (N === a.NONE)
+import { getERC20Token as s } from "../utils/erc20tokenFunctions.mjs";
+import { processGasEstimates as N } from "./process-gas-estimates.mjs";
+import { getInteractionFromAction as b } from "./interaction-to-action.mjs";
+const R = async (a, n, f, k, l, T = []) => {
+  let t;
+  const c = b(f);
+  if (c === e.NONE)
     throw Error("No interaction was choosen");
-  let n, r, b, o;
-  switch (N) {
-    case a.WITHDRAW:
-      k = T(t[0], _);
+  let i;
+  switch (c) {
+    case e.WITHDRAW:
+      t = s(n[0], a);
       break;
-    case a.SWAP:
-      k = T(t[1], _);
+    case e.SWAP:
+      t = s(n[1], a);
       break;
-    case a.CURVE_DEPOSIT:
-      k = T(t[t.length - 1], _);
+    case e.STAKING:
+    case e.UNSTAKING:
+      t = s(n[1], a);
       break;
-    case a.CURVE_WITHDRAW: {
-      if (o = t.findIndex(
-        (L) => L.toLowerCase() === W?.toLowerCase()
-      ), o === -1)
-        throw Error("Curve Withdraw Token Index not found");
-      k = T(t[o], _);
+    case e.CLAIMING:
+      t = s(n[1], a);
       break;
-    }
-    case a.STAKING:
-    case a.UNSTAKING:
-      k = T(t[1], _);
-      break;
-    case a.CLAIMING:
-      k = T(t[1], _);
-      break;
-    case a.BEEFY:
-      n = O(D) ? 1 : 0, k = T(t[n], _);
-      break;
-    case a.BEEFY_STAKE:
-    case a.BEEFY_UNSTAKE:
-      k = T(t[1], _);
-      break;
-    case a.BEEFY_GET_REWARDS:
-      k = T(t[1], _);
-      break;
-    case a.LIDO_STAKE:
-      k = T(t[0], _);
-      break;
-    case a.LIDO_REQUEST:
-      k = T(t[1], _);
-      break;
-    case a.LIDO_CLAIM:
-      k = T(t[1], _);
-      break;
-    case a.PENDLE_TRANSACT:
-      k = T(t[0], _);
-      break;
-    case a.PENDLE_YT_IN_SWAP:
-      k = T(t[1], _);
-      break;
-    case a.PENDLE_YT_OUT_SWAP:
-      k = T(t[0], _);
-      break;
-    case a.PENDLE_PT_SWAP:
-      k = T(t[1], _);
-      break;
-    case a.PENDLE_MINT:
-      k = T(t[1], _);
-      break;
-    case a.PENDLE_REDEEM:
-      k = T(t[2], _);
-      break;
-    case a.PENDLE_CLAIM:
-      k = T(t[1], _);
-      break;
-    case a.VOLATILE_WITHDRAW:
-      k = T(t[0], _);
-      break;
-    case a.VOLATILE_SWAP:
-      k = T(t[1], _);
-      break;
-    case a.PENDLE_LP:
-      r = P.findIndex((L) => L > 0), k = T(t[r], _);
-      break;
-    case a.PENDLE_LP_CLAIM:
-      k = T(t[1], _);
-      break;
-    case a.EMPORIUM:
-      b = P.findIndex((L) => L > 0n), k = T(t[b], _);
+    case e.EMPORIUM:
+      i = k.findIndex((p) => p > 0n), t = s(n[i], a);
       break;
   }
-  let E, f;
-  const I = P.length;
-  k && ({ priceOfTransactionInToken: E, priceOfTransactionInUSD: f } = await A(
-    _,
-    k,
-    S,
-    D,
+  let o, m;
+  const I = k.length;
+  t && ({ priceOfTransactionInToken: o, priceOfTransactionInUSD: m } = await N(
+    a,
+    t,
+    f,
     I,
     void 0,
-    R
+    T
   ));
-  const e = new Array(I).fill(0n);
-  switch (N) {
-    case a.WITHDRAW:
-      e[0] = E || 0n;
-      break;
-    case a.SWAP:
-      e[1] = E || 0n;
-      break;
-    case a.CURVE_DEPOSIT:
-      e[e.length - 1] = E || 0n;
-      break;
-    case a.CURVE_WITHDRAW:
-      o !== void 0 && (e[o] = E || 0n);
-      break;
-    case a.STAKING:
-    case a.UNSTAKING:
-      e[1] = E || 0n, e[0] = E || 0n;
-      break;
-    case a.CLAIMING:
-      e[1] = E || 0n;
-      break;
-    case a.BEEFY:
-      n && (e[n] = E || 0n);
-      break;
-    case a.BEEFY_STAKE:
-      e[1] = E || 0n, e[0] = E || 0n;
-      break;
-    case a.BEEFY_GET_REWARDS:
-      e[1] = E || 0n;
-      break;
-    case a.LIDO_STAKE:
-      e[0] = E || 0n;
-      break;
-    case a.LIDO_REQUEST:
-      e[1] = E || 0n;
-      break;
-    case a.LIDO_CLAIM:
-      e[1] = E || 0n;
-      break;
-    case a.PENDLE_TRANSACT:
-      e[0] = E || 0n;
-      break;
-    case a.PENDLE_YT_IN_SWAP:
-      e[1] = E || 0n;
-      break;
-    case a.PENDLE_YT_OUT_SWAP:
-      e[0] = E || 0n;
-      break;
-    case a.PENDLE_PT_SWAP:
-      e[1] = E || 0n;
-      break;
-    case a.PENDLE_MINT:
-      e[1] = E || 0n;
-      break;
-    case a.PENDLE_REDEEM:
-      e[2] = E || 0n;
-      break;
-    case a.PENDLE_CLAIM:
-      e[1] = E || 0n;
-      break;
-    case a.VOLATILE_WITHDRAW:
-      e[0] = E || 0n;
+  const r = new Array(I).fill(0n);
+  switch (c) {
+    case e.WITHDRAW:
+      r[0] = o || 0n;
       break;
-    case a.VOLATILE_SWAP:
-      e[1] = E || 0n;
+    case e.SWAP:
+      r[1] = o || 0n;
       break;
-    case a.PENDLE_LP:
-      r !== void 0 && (e[r] = E || 0n);
+    case e.STAKING:
+    case e.UNSTAKING:
+      r[1] = o || 0n, r[0] = o || 0n;
       break;
-    case a.PENDLE_LP_CLAIM:
-      e[1] = E || 0n;
+    case e.CLAIMING:
+      r[1] = o || 0n;
       break;
-    case a.EMPORIUM:
-      b !== void 0 && b !== -1 && (e[b] = E || 0n);
+    case e.EMPORIUM:
+      i !== void 0 && i !== -1 && (r[i] = o || 0n);
       break;
   }
-  return { flatFees: e, priceOfTransactionInToken: E, feeUnit: k, priceOfTransactionInUSD: f };
+  return { flatFees: r, priceOfTransactionInToken: o, feeUnit: t, priceOfTransactionInUSD: m };
 };
 export {
-  Y as getFlatFees
+  R as getFlatFees
 };

package/functions/pre-transaction/getSolanaCalldataHash.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("@coral-xyz/anchor"),N=require("ethers"),p=require("../../constants/protocol.constants.cjs"),I=(o,r,a,s,c,u,d,l)=>{const B=new t.BN(c.toString()),f=new t.BN(u.toString()),i=s.reduce((n,e)=>[...n,...new t.BN(e.length).toBuffer("be",8),...e],[]),b=d.reduce((n,e)=>{const y=[...new t.BN(e.programIndex).toBuffer("be",1),...new t.BN(e.accountIndexes.length).toBuffer("be",8),...e.accountIndexes,...new t.BN(e.data.length).toBuffer("be",8),...e.data];return[...n,...y]},[]),g=l.reduce((n,e)=>[...n,e.isWritable?1:0,...e.pubkey.toBytes()],[]),h=[o.tokenNumber,o.nullifierAmount,o.outputAmount,...r.toBytes(),...a.toBytes(),...i,...B.toBuffer("be",8),...f.toBuffer("be",8),...b,...g];return BigInt(N.ethers.utils.sha256(h))%p.CIRCOM_P};exports.getSolanaCalldataHash=I;

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

@@ -0,0 +1,4 @@
+import { DimDataType } from '../../types/circom-data.types';
+import { AccountMeta, PublicKey } from '@solana/web3.js';
+import { HinkalInstruction } from './convert-okx-instructions';
+export declare const getSolanaCalldataHash: (dimensions: DimDataType, recipient: PublicKey, signer: PublicKey, encryptedOutputs: number[][], relayerFee: bigint, variableRate: bigint, instructions: HinkalInstruction[], remainingAccounts: AccountMeta[]) => bigint;

package/functions/pre-transaction/getSolanaCalldataHash.mjs

@@ -0,0 +1,36 @@
+import { BN as t } from "@coral-xyz/anchor";
+import { ethers as y } from "ethers";
+import { CIRCOM_P as I } from "../../constants/protocol.constants.mjs";
+const N = (o, r, a, s, u, c, d, f) => {
+  const B = new t(u.toString()), l = new t(c.toString()), b = s.reduce(
+    (n, e) => [...n, ...new t(e.length).toBuffer("be", 8), ...e],
+    []
+  ), i = d.reduce((n, e) => {
+    const p = [
+      ...new t(e.programIndex).toBuffer("be", 1),
+      ...new t(e.accountIndexes.length).toBuffer("be", 8),
+      ...e.accountIndexes,
+      ...new t(e.data.length).toBuffer("be", 8),
+      ...e.data
+    ];
+    return [...n, ...p];
+  }, []), m = f.reduce(
+    (n, e) => [...n, e.isWritable ? 1 : 0, ...e.pubkey.toBytes()],
+    []
+  ), g = [
+    o.tokenNumber,
+    o.nullifierAmount,
+    o.outputAmount,
+    ...r.toBytes(),
+    ...a.toBytes(),
+    ...b,
+    ...B.toBuffer("be", 8),
+    ...l.toBuffer("be", 8),
+    ...i,
+    ...m
+  ];
+  return BigInt(y.utils.sha256(g)) % I;
+};
+export {
+  N as getSolanaCalldataHash
+};

package/functions/pre-transaction/getVolatileTransferAmount.cjs

@@ -0,0 +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("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/chains.constants.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const a=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("../../data-structures/crypto-keys/keys.cjs");const c=require("../../API/is-tx-stateless.cjs"),f=require("../../data-structures/token-price-fetcher/TokenChecker.cjs"),d=async(s,q,n,o)=>{try{const r=q.map((e,t)=>{const i=n[t];return e&&f.TokenChecker.isPotentiallyVolatile(e)?{tokenAddress:e.erc20TokenAddress,amount:i.toString(),...o!==void 0?{targetAddress:o}:{},originalIndex:t}:null}).filter(e=>e!==null);if(r.length===0)return n;const l=await c.simulateVolatileTokenTransfer(s,r);return n.map((e,t)=>{const i=r.findIndex(u=>u.originalIndex===t);if(i!==-1&&l[i].success){const u=l[i].balanceDifference;return u?BigInt(u):e}return e})}catch(r){return a.Logger.error("Volatile transfer simulation failed:",r),n}};exports.modifyVolatileTokenAmountChanges=d;

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

@@ -0,0 +1,9 @@
+import { type ERC20Token } from '../../types/token.types';
+/**
+ * Adjusts the token amount changes for volatile tokens based on actual transfer simulation results.
+ *
+ * This function identifies potentially volatile tokens with negative amount changes,
+ * simulates their transfers to estimate the real balance impact, and then updates
+ * the original `amountChanges` array accordingly with the simulated balance differences.
+ */
+export declare const modifyVolatileTokenAmountChanges: (chainId: number, tokens: ERC20Token[], amountChanges: bigint[], targetAddress?: string) => Promise<bigint[]>;

package/functions/pre-transaction/getVolatileTransferAmount.mjs

@@ -0,0 +1,53 @@
+import "../../error-handling/error-codes.constants.mjs";
+import "ethers";
+import "../../types/circom-data.types.mjs";
+import "../../types/transactions.types.mjs";
+import "../../types/activities.types.mjs";
+import "../../constants/server.constants.mjs";
+import "../../API/getServerURL.mjs";
+import "../../data-structures/http/HttpClient.mjs";
+import "axios";
+import "../../constants/chains.constants.mjs";
+import "circomlibjs-hinkal-fork";
+import "libsodium-wrappers";
+import "process";
+import "buffer";
+import "../../constants/vite.constants.mjs";
+import "../../constants/save-depths.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import "../utils/mutexes.utils.mjs";
+import "@coral-xyz/anchor";
+import { Logger as a } from "../../error-handling/logger.mjs";
+import "@solana/web3.js";
+import "../../data-structures/crypto-keys/keys.mjs";
+import { simulateVolatileTokenTransfer as c } from "../../API/is-tx-stateless.mjs";
+import { TokenChecker as u } from "../../data-structures/token-price-fetcher/TokenChecker.mjs";
+const E = async (l, s, i, m) => {
+  try {
+    const t = s.map((r, e) => {
+      const o = i[e];
+      return r && u.isPotentiallyVolatile(r) ? {
+        tokenAddress: r.erc20TokenAddress,
+        amount: o.toString(),
+        ...m !== void 0 ? { targetAddress: m } : {},
+        originalIndex: e
+      } : null;
+    }).filter((r) => r !== null);
+    if (t.length === 0)
+      return i;
+    const p = await c(l, t);
+    return i.map((r, e) => {
+      const o = t.findIndex((n) => n.originalIndex === e);
+      if (o !== -1 && p[o].success) {
+        const n = p[o].balanceDifference;
+        return n ? BigInt(n) : r;
+      }
+      return r;
+    });
+  } catch (t) {
+    return a.error("Volatile transfer simulation failed:", t), i;
+  }
+};
+export {
+  E as modifyVolatileTokenAmountChanges
+};

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

@@ -1,6 +1,17 @@
 export * from './interaction-to-action';
 export * from './outputUtxoProcessing';
 export * from './process-gas-estimates';
-export * from './processAmountChanges';
 export * from './getFlatFees';
 export * from './outputApprovalDataProcessing';
+export * from './getVolatileTransferAmount';
+export * from './constructAdminData';
+export * from './solana';
+export * from './addressTableLookup';
+export * from './solana-public-signals';
+export * from './convert-okx-instructions';
+export * from './sendV0Transaction';
+export * from './store-proof';
+export * from './sendInitNullifiersTransaction';
+export * from './initTokenLimitIfNeeded';
+export * from './recipientUtxoProcessing';
+export * from './store-instructions';

package/functions/pre-transaction/initTokenLimitIfNeeded.cjs

@@ -0,0 +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;

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

@@ -0,0 +1,3 @@
+import { Program } from '@coral-xyz/anchor';
+import { Keypair, PublicKey } from '@solana/web3.js';
+export declare const initTokenLimitIfNeeded: (program: Program, originalDeployer: PublicKey, mint: PublicKey, signer: Keypair) => Promise<void>;

package/functions/pre-transaction/initTokenLimitIfNeeded.mjs

@@ -0,0 +1,20 @@
+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
+};

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 r=require("../../types/external-action.types.cjs"),e=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("../../types/activities.types.cjs");const A=(E,t)=>{if(E===r.ExternalActionId.Transact)return e.INTERACTION.WITHDRAW;if([r.ExternalActionId.Uniswap,r.ExternalActionId.Odos,r.ExternalActionId.OneInch].includes(E))return e.INTERACTION.SWAP;if((E===r.ExternalActionId.Curve||E===r.ExternalActionId.CurveDynamic)&&t===e.CurveAction.Deposit)return e.INTERACTION.CURVE_DEPOSIT;if((E===r.ExternalActionId.Curve||E===r.ExternalActionId.CurveDynamic)&&[e.CurveAction.WithdrawInt,e.CurveAction.WithdrawUint].includes(t))return e.INTERACTION.CURVE_WITHDRAW;if((E===r.ExternalActionId.Curve||E===r.ExternalActionId.CurveDynamic)&&t===e.CurveAction.WithdrawImbalance)return e.INTERACTION.CURVE_WITHDRAW_INBALANCED;if((E===r.ExternalActionId.CurveCRV||E===r.ExternalActionId.CurveCRVRewards)&&t===e.CurveAction.Stake||E===r.ExternalActionId.Convex&&t===e.ConvexAction.StakeLP)return e.INTERACTION.STAKING;if((E===r.ExternalActionId.CurveCRV||E===r.ExternalActionId.CurveCRVRewards)&&t===e.CurveAction.Unstake||E===r.ExternalActionId.Convex&&t===e.ConvexAction.UnStakeLP)return e.INTERACTION.UNSTAKING;if((E===r.ExternalActionId.CurveCRV||E===r.ExternalActionId.CurveCRVRewards)&&t===e.CurveAction.GetCRV||E===r.ExternalActionId.Convex&&t===e.ConvexAction.ClaimRewardsLP)return e.INTERACTION.CLAIMING;if(E===r.ExternalActionId.Beefy)return e.INTERACTION.BEEFY;if(E===r.ExternalActionId.BeefyStake&&t===e.BeefyAction.Stake)return e.INTERACTION.BEEFY_STAKE;if(E===r.ExternalActionId.BeefyStake&&t===e.BeefyAction.Unstake)return e.INTERACTION.BEEFY_UNSTAKE;if(E===r.ExternalActionId.BeefyStake&&t===e.BeefyAction.GetRewards)return e.INTERACTION.BEEFY_GET_REWARDS;if((E===r.ExternalActionId.LidoETH||E===r.ExternalActionId.LidoMATIC)&&t===e.LidoAction.Stake)return e.INTERACTION.LIDO_STAKE;if((E===r.ExternalActionId.LidoETHNFT||E===r.ExternalActionId.LidoMATICNFT)&&t===e.LidoAction.Request)return e.INTERACTION.LIDO_REQUEST;if((E===r.ExternalActionId.LidoETHNFT||E===r.ExternalActionId.LidoMATICNFT)&&t===e.LidoAction.Claim)return e.INTERACTION.LIDO_CLAIM;if(E===r.ExternalActionId.Pendle)return t===e.PendleAction.SwapFromYt?e.INTERACTION.PENDLE_YT_IN_SWAP:t===e.PendleAction.SwapToYt?e.INTERACTION.PENDLE_YT_OUT_SWAP:t===e.PendleAction.SwapPt?e.INTERACTION.PENDLE_PT_SWAP:t===e.PendleAction.Checkpoint?e.INTERACTION.PENDLE_CLAIM:e.INTERACTION.PENDLE_TRANSACT;if(E===r.ExternalActionId.Volatile){if(t===e.VolatileAction.Withdraw)return e.INTERACTION.VOLATILE_WITHDRAW;if(t===e.VolatileAction.Swap)return e.INTERACTION.VOLATILE_SWAP}else if(E===r.ExternalActionId.PendleLP){if(t===e.PendleLPAction.AddOrRemoveLiquidity)return e.INTERACTION.PENDLE_LP;if(t===e.PendleLPAction.Checkpoint)return e.INTERACTION.PENDLE_LP_CLAIM}else if(E===r.ExternalActionId.Emporium)return e.INTERACTION.EMPORIUM;return e.INTERACTION.NONE};exports.getInteractionFromAction=A;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const e=require("../../types/external-action.types.cjs"),r=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const n=t=>t===e.ExternalActionId.Transact?r.INTERACTION.WITHDRAW:[e.ExternalActionId.Uniswap,e.ExternalActionId.Odos,e.ExternalActionId.OneInch].includes(t)?r.INTERACTION.SWAP:t===e.ExternalActionId.Emporium?r.INTERACTION.EMPORIUM:r.INTERACTION.NONE;exports.getInteractionFromAction=n;

package/functions/pre-transaction/interaction-to-action.d.ts

@@ -1,2 +1,2 @@
-import { ExternalActionId, INTERACTION, ValidExternalAction } from '../../types';
-export declare const getInteractionFromAction: (externalActionId: ExternalActionId, action?: ValidExternalAction) => INTERACTION;
+import { ExternalActionId, INTERACTION } from '../../types';
+export declare const getInteractionFromAction: (externalActionId: ExternalActionId) => INTERACTION;

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

@@ -1,58 +1,11 @@
 import "../../types/circom-data.types.mjs";
-import { ExternalActionId as e } from "../../types/external-action.types.mjs";
-import { INTERACTION as u, CurveAction as C, ConvexAction as L, BeefyAction as T, LidoAction as s, PendleAction as f, VolatileAction as P, PendleLPAction as R } from "../../types/hinkal.types.mjs";
+import { ExternalActionId as r } from "../../types/external-action.types.mjs";
+import { INTERACTION as t } from "../../types/hinkal.types.mjs";
 import "../../types/transactions.types.mjs";
-import "../../types/curve.types.mjs";
 import "../../types/activities.types.mjs";
-const v = (r, E) => {
-  if (r === e.Transact)
-    return u.WITHDRAW;
-  if ([e.Uniswap, e.Odos, e.OneInch].includes(
-    r
-  ))
-    return u.SWAP;
-  if ((r === e.Curve || r === e.CurveDynamic) && E === C.Deposit)
-    return u.CURVE_DEPOSIT;
-  if ((r === e.Curve || r === e.CurveDynamic) && [C.WithdrawInt, C.WithdrawUint].includes(E))
-    return u.CURVE_WITHDRAW;
-  if ((r === e.Curve || r === e.CurveDynamic) && E === C.WithdrawImbalance)
-    return u.CURVE_WITHDRAW_INBALANCED;
-  if ((r === e.CurveCRV || r === e.CurveCRVRewards) && E === C.Stake || r === e.Convex && E === L.StakeLP)
-    return u.STAKING;
-  if ((r === e.CurveCRV || r === e.CurveCRVRewards) && E === C.Unstake || r === e.Convex && E === L.UnStakeLP)
-    return u.UNSTAKING;
-  if ((r === e.CurveCRV || r === e.CurveCRVRewards) && E === C.GetCRV || r === e.Convex && E === L.ClaimRewardsLP)
-    return u.CLAIMING;
-  if (r === e.Beefy)
-    return u.BEEFY;
-  if (r === e.BeefyStake && E === T.Stake)
-    return u.BEEFY_STAKE;
-  if (r === e.BeefyStake && E === T.Unstake)
-    return u.BEEFY_UNSTAKE;
-  if (r === e.BeefyStake && E === T.GetRewards)
-    return u.BEEFY_GET_REWARDS;
-  if ((r === e.LidoETH || r === e.LidoMATIC) && E === s.Stake)
-    return u.LIDO_STAKE;
-  if ((r === e.LidoETHNFT || r === e.LidoMATICNFT) && E === s.Request)
-    return u.LIDO_REQUEST;
-  if ((r === e.LidoETHNFT || r === e.LidoMATICNFT) && E === s.Claim)
-    return u.LIDO_CLAIM;
-  if (r === e.Pendle)
-    return E === f.SwapFromYt ? u.PENDLE_YT_IN_SWAP : E === f.SwapToYt ? u.PENDLE_YT_OUT_SWAP : E === f.SwapPt ? u.PENDLE_PT_SWAP : E === f.Checkpoint ? u.PENDLE_CLAIM : u.PENDLE_TRANSACT;
-  if (r === e.Volatile) {
-    if (E === P.Withdraw)
-      return u.VOLATILE_WITHDRAW;
-    if (E === P.Swap)
-      return u.VOLATILE_SWAP;
-  } else if (r === e.PendleLP) {
-    if (E === R.AddOrRemoveLiquidity)
-      return u.PENDLE_LP;
-    if (E === R.Checkpoint)
-      return u.PENDLE_LP_CLAIM;
-  } else if (r === e.Emporium)
-    return u.EMPORIUM;
-  return u.NONE;
-};
+const s = (o) => o === r.Transact ? t.WITHDRAW : [r.Uniswap, r.Odos, r.OneInch].includes(
+  o
+) ? t.SWAP : o === r.Emporium ? t.EMPORIUM : t.NONE;
 export {
-  v as getInteractionFromAction
+  s as getInteractionFromAction
 };

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

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

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

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

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

@@ -0,0 +1,24 @@
+import { getPublicAddressBalance as s } from "../web3/getPublicAddressBalance.mjs";
+import { mergeWithFeeStructure as c } from "./merge-with-fee-structure.mjs";
+import { createTransferToEmporiumOp as T } from "../private-wallet/emporium.helpers.mjs";
+import { zeroAddress as F } from "../../constants/protocol.constants.mjs";
+import { ContractType as g } from "../../types/ethereum-network.types.mjs";
+import { maxBigInt as C } from "../utils/amounts.utils.mjs";
+const u = async (t, r, i, a, f, e, n) => {
+  let o = 0n;
+  const p = n < 0n ? n : 0n, m = await s(t, e.feeToken, r) + p;
+  m < 0 ? o = e.flatFee : o = C(e.flatFee - m, 0n), o !== 0n && (c(t.getCurrentChainId(), a, f, {
+    ...e,
+    flatFee: o
+  }), i.push(
+    T(
+      e.feeToken === F ? void 0 : t.getContractWithFetcher(g.ERC20Contract, e.feeToken),
+      r,
+      o,
+      !1
+    )
+  ));
+};
+export {
+  u 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"),g=require("../../error-handling/customErrors/FeeOverTransactionValueError.cjs"),a=require("../utils/caseInsensitive.utils.cjs"),s=require("../utils/erc20tokenFunctions.cjs"),c=(i,t,o,e)=>{if(e.variableRate!==0n)throw new Error("Not Implemented");n.Logger.log("amount changes before merge",{amountChanges:o});const r=t.findIndex(l=>a.caseInsensitiveEqual(l,e.feeToken));if(r===-1){t.push(e.feeToken),o.push(-1n*e.flatFee),n.Logger.log("amount changes after merge",{amountChanges:o});return}if(o[r]>0&&o[r]<e.flatFee)throw new g.FeeOverTransactionValueError({totalFeeWEI:e.flatFee,feeUnit:s.getERC20Token(e.feeToken,i)});o[r]-=e.flatFee,n.Logger.log("amount changes after merge",{amountChanges:o})};exports.mergeWithFeeStructure=c;
+"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;

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

@@ -1,24 +1,22 @@
-import { Logger as n } from "../../error-handling/logger.mjs";
-import { FeeOverTransactionValueError as m } from "../../error-handling/customErrors/FeeOverTransactionValueError.mjs";
-import { caseInsensitiveEqual as t } from "../utils/caseInsensitive.utils.mjs";
-import { getERC20Token as a } from "../utils/erc20tokenFunctions.mjs";
-const k = (f, i, o, e) => {
-  if (e.variableRate !== 0n)
-    throw new Error("Not Implemented");
-  n.log("amount changes before merge", { amountChanges: o });
-  const r = i.findIndex(
-    (l) => t(l, e.feeToken)
+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 (r === -1) {
-    i.push(e.feeToken), o.push(-1n * e.flatFee), n.log("amount changes after merge", { amountChanges: o });
+  if (f === -1) {
+    i.push(o.feeToken), e.push(-1n * o.flatFee), r.log("amount changes after merge", { amountChanges: e });
     return;
   }
-  if (o[r] > 0 && o[r] < e.flatFee)
-    throw new m({
-      totalFeeWEI: e.flatFee,
-      feeUnit: a(e.feeToken, f)
+  if (e[f] > 0 && e[f] < o.flatFee)
+    throw new t({
+      totalFeeWEI: o.flatFee,
+      feeUnit: g(o.feeToken, n)
     });
-  o[r] -= e.flatFee, n.log("amount changes after merge", { amountChanges: o });
+  e[f] -= o.flatFee, r.log("amount changes after merge", { amountChanges: e });
 };
 export {
   k as mergeWithFeeStructure

package/functions/pre-transaction/outputApprovalDataProcessing.cjs

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

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

@@ -13,4 +13,5 @@ export declare const outputApprovalDataProcessingForHinkalApprove: (hinkal: IHin
         externalApprovalAddresses: string[];
         conversionInHinkalAddress: bigint[];
     };
+    deltaAmountOverride: bigint;
 };