@hinkal/common 0.2.15 → 0.2.17

package/externalABIs/{BeefyZapAbi.json.mjs → swapAbi.mjs}

@@ -2,93 +2,114 @@ const e = [
   {
     inputs: [
       {
-        internalType: "address",
-        name: "_router",
-        type: "address"
+        internalType: "string",
+        name: "name_",
+        type: "string"
       },
       {
-        internalType: "address",
-        name: "_WETH",
-        type: "address"
+        internalType: "string",
+        name: "symbol_",
+        type: "string"
       }
     ],
     stateMutability: "nonpayable",
     type: "constructor"
   },
   {
-    inputs: [],
-    name: "WETH",
-    outputs: [
+    anonymous: !1,
+    inputs: [
       {
+        indexed: !0,
         internalType: "address",
-        name: "",
+        name: "owner",
+        type: "address"
+      },
+      {
+        indexed: !0,
+        internalType: "address",
+        name: "spender",
         type: "address"
+      },
+      {
+        indexed: !1,
+        internalType: "uint256",
+        name: "value",
+        type: "uint256"
       }
     ],
-    stateMutability: "view",
-    type: "function"
+    name: "Approval",
+    type: "event"
   },
   {
+    anonymous: !1,
     inputs: [
       {
+        indexed: !0,
         internalType: "address",
-        name: "beefyVault",
+        name: "from",
         type: "address"
       },
       {
-        internalType: "uint256",
-        name: "tokenAmountOutMin",
-        type: "uint256"
-      },
-      {
+        indexed: !0,
         internalType: "address",
-        name: "tokenIn",
+        name: "to",
         type: "address"
       },
       {
+        indexed: !1,
         internalType: "uint256",
-        name: "tokenInAmount",
+        name: "value",
         type: "uint256"
       }
     ],
-    name: "beefIn",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
+    name: "Transfer",
+    type: "event"
   },
   {
     inputs: [
       {
         internalType: "address",
-        name: "beefyVault",
+        name: "owner",
         type: "address"
       },
+      {
+        internalType: "address",
+        name: "spender",
+        type: "address"
+      }
+    ],
+    name: "allowance",
+    outputs: [
       {
         internalType: "uint256",
-        name: "tokenAmountOutMin",
+        name: "",
         type: "uint256"
       }
     ],
-    name: "beefInETH",
-    outputs: [],
-    stateMutability: "payable",
+    stateMutability: "view",
     type: "function"
   },
   {
     inputs: [
       {
         internalType: "address",
-        name: "beefyVault",
+        name: "spender",
         type: "address"
       },
       {
         internalType: "uint256",
-        name: "withdrawAmount",
+        name: "amount",
         type: "uint256"
       }
     ],
-    name: "beefOut",
-    outputs: [],
+    name: "approve",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
     stateMutability: "nonpayable",
     type: "function"
   },
@@ -96,77 +117,103 @@ const e = [
     inputs: [
       {
         internalType: "address",
-        name: "beefyVault",
+        name: "account",
         type: "address"
-      },
+      }
+    ],
+    name: "balanceOf",
+    outputs: [
       {
         internalType: "uint256",
-        name: "withdrawAmount",
+        name: "",
         type: "uint256"
-      },
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "decimals",
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
       {
         internalType: "address",
-        name: "desiredToken",
+        name: "spender",
         type: "address"
       },
       {
         internalType: "uint256",
-        name: "desiredTokenOutMin",
+        name: "subtractedValue",
         type: "uint256"
       }
     ],
-    name: "beefOutAndSwap",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "checkWETH",
+    name: "decreaseAllowance",
     outputs: [
       {
         internalType: "bool",
-        name: "isValid",
+        name: "",
         type: "bool"
       }
     ],
-    stateMutability: "pure",
+    stateMutability: "nonpayable",
     type: "function"
   },
   {
     inputs: [
       {
         internalType: "address",
-        name: "beefyVault",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "tokenIn",
+        name: "spender",
         type: "address"
       },
       {
         internalType: "uint256",
-        name: "fullInvestmentIn",
+        name: "addedValue",
         type: "uint256"
       }
     ],
-    name: "estimateSwap",
+    name: "increaseAllowance",
     outputs: [
       {
-        internalType: "uint256",
-        name: "swapAmountIn",
-        type: "uint256"
-      },
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "name",
+    outputs: [
       {
-        internalType: "uint256",
-        name: "swapAmountOut",
-        type: "uint256"
-      },
+        internalType: "string",
+        name: "",
+        type: "string"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "symbol",
+    outputs: [
       {
-        internalType: "address",
-        name: "swapTokenOut",
-        type: "address"
+        internalType: "string",
+        name: "",
+        type: "string"
       }
     ],
     stateMutability: "view",
@@ -174,7 +221,7 @@ const e = [
   },
   {
     inputs: [],
-    name: "minimumAmount",
+    name: "totalSupply",
     outputs: [
       {
         internalType: "uint256",
@@ -186,26 +233,59 @@ const e = [
     type: "function"
   },
   {
-    inputs: [],
-    name: "router",
+    inputs: [
+      {
+        internalType: "address",
+        name: "to",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      }
+    ],
+    name: "transfer",
     outputs: [
       {
-        internalType: "contract IUniswapRouterSolidly",
+        internalType: "bool",
         name: "",
-        type: "address"
+        type: "bool"
       }
     ],
-    stateMutability: "view",
+    stateMutability: "nonpayable",
     type: "function"
   },
   {
-    stateMutability: "payable",
-    type: "receive"
+    inputs: [
+      {
+        internalType: "address",
+        name: "from",
+        type: "address"
+      },
+      {
+        internalType: "address",
+        name: "to",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      }
+    ],
+    name: "transferFrom",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
+    stateMutability: "nonpayable",
+    type: "function"
   }
-], t = {
-  abi: e
-};
+];
 export {
-  e as abi,
-  t as default
+  e as ERC20ABI
 };

package/functions/connectors.types.d.ts

@@ -0,0 +1,14 @@
+import { Connector } from 'wagmi';
+import { SolanaWallet } from '../types/solana.types';
+export type EvmConnector = Connector;
+export type SolanaConnectInput = {
+    getChainId: () => number;
+    wallet: SolanaWallet;
+};
+export type ConnectInput = EvmConnector | SolanaConnectInput;
+export interface WalletGroup {
+    name: string;
+    icon?: string;
+    evmConnector?: Connector;
+    solanaConnector?: Connector;
+}

package/functions/index.d.ts

@@ -3,9 +3,9 @@ export * from './utils';
 export * from './web3';
 export * from './snarkjs';
 export * from './pre-transaction';
-export * from './protocols';
 export * from './staking';
 export * from './private-wallet';
+export * from './connectors.types';
 export * from './pre-transaction/getFlatFees';
 export * from './pre-transaction/outputUtxoProcessing';
 export * from './utils/requireEnv';

package/functions/pre-transaction/addressTableLookup.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("@solana/web3.js"),u=require("../../constants/protocol.constants.cjs"),h=async(o,n)=>{if(!n)return;const e=[...new Set(n)];return Promise.all(e.map(async c=>{const s=(await o.connection.getAddressLookupTable(new t.PublicKey(c))).value;if(!s)throw new Error(`failed to fetch lookup table ${c}`);return s}))},p=async(o,n,e)=>{const[c,{blockhash:s}]=await Promise.all([o.connection.getSlot("finalized"),o.connection.getLatestBlockhash("finalized")]),l=c,[d,r]=t.AddressLookupTableProgram.createLookupTable({authority:e.publicKey,payer:e.publicKey,recentSlot:l}),m=t.ComputeBudgetProgram.setComputeUnitPrice({microLamports:u.MICRO_LAMPORTS_PER_CU}),a=new t.Transaction().add(m).add(d);a.recentBlockhash=s,a.feePayer=e.publicKey,a.sign(e),await t.sendAndConfirmTransaction(o.connection,a,[e],{commitment:"confirmed"});const b=t.AddressLookupTableProgram.extendLookupTable({payer:e.publicKey,authority:e.publicKey,lookupTable:r,addresses:n}),k=t.ComputeBudgetProgram.setComputeUnitPrice({microLamports:u.MICRO_LAMPORTS_PER_CU}),{blockhash:T}=await o.connection.getLatestBlockhash(),i=new t.Transaction().add(k).add(b);return i.recentBlockhash=T,i.feePayer=e.publicKey,i.sign(e),await t.sendAndConfirmTransaction(o.connection,i,[e],{commitment:"confirmed"}),r};exports.createAndExtendAddressLookupTable=p;exports.getAddressLookupTableAccounts=h;

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

@@ -0,0 +1,4 @@
+import { AnchorProvider, Provider } from '@coral-xyz/anchor';
+import { Keypair, PublicKey } from '@solana/web3.js';
+export declare const getAddressLookupTableAccounts: (provider: AnchorProvider, addressLookupTableAccounts: string[] | undefined) => Promise<import("@solana/web3.js").AddressLookupTableAccount[] | undefined>;
+export declare const createAndExtendAddressLookupTable: (provider: Provider, accounts: PublicKey[], payer: Keypair) => Promise<PublicKey>;

package/functions/pre-transaction/addressTableLookup.mjs

@@ -0,0 +1,44 @@
+import { PublicKey as P, AddressLookupTableProgram as r, ComputeBudgetProgram as l, Transaction as u, sendAndConfirmTransaction as d } from "@solana/web3.js";
+import { MICRO_LAMPORTS_PER_CU as m } from "../../constants/protocol.constants.mjs";
+const g = async (e, o) => {
+  if (!o)
+    return;
+  const t = [...new Set(o)];
+  return Promise.all(
+    t.map(async (n) => {
+      const c = (await e.connection.getAddressLookupTable(new P(n))).value;
+      if (!c)
+        throw new Error(`failed to fetch lookup table ${n}`);
+      return c;
+    })
+  );
+}, A = async (e, o, t) => {
+  const [n, { blockhash: c }] = await Promise.all([
+    e.connection.getSlot("finalized"),
+    e.connection.getLatestBlockhash("finalized")
+  ]), h = n, [b, i] = r.createLookupTable({
+    authority: t.publicKey,
+    payer: t.publicKey,
+    recentSlot: h
+  }), k = l.setComputeUnitPrice({
+    microLamports: m
+  }), a = new u().add(k).add(b);
+  a.recentBlockhash = c, a.feePayer = t.publicKey, a.sign(t), await d(e.connection, a, [t], {
+    commitment: "confirmed"
+  });
+  const p = r.extendLookupTable({
+    payer: t.publicKey,
+    authority: t.publicKey,
+    lookupTable: i,
+    addresses: o
+  }), T = l.setComputeUnitPrice({
+    microLamports: m
+  }), { blockhash: f } = await e.connection.getLatestBlockhash(), s = new u().add(T).add(p);
+  return s.recentBlockhash = f, s.feePayer = t.publicKey, s.sign(t), await d(e.connection, s, [t], {
+    commitment: "confirmed"
+  }), i;
+};
+export {
+  A as createAndExtendAddressLookupTable,
+  g as getAddressLookupTableAccounts
+};

package/functions/pre-transaction/constructAdminData.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("../utils/addresses.cjs"),i=(t,o,s,d,m,e,u,a,c)=>{if(!t)return;let r;return e&&(r={tokenIn:{symbol:e[0].symbol,address:e[0].erc20TokenAddress.toLowerCase()},tokenOut:{symbol:e[1].symbol,address:e[1].erc20TokenAddress.toLowerCase()}}),{hashedOwner:A.hashEthereumAddress(m),chainId:o,timestamp:Date.now(),action:t,erc20TokenAddresses:s,erc20TokenAmount:d.map(String),fundApproveAndTransactFundAmounts:u?.map(String),fundApproveAndTransactFundAddresses:a,fundApproveAndTransactEmporiumChanges:c?.map(n=>({token:n.token,amount:String(n.amount)})),swapPair:r}};exports.constructAdminData=i;

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

@@ -0,0 +1,3 @@
+import { AdminDataType, AdminTransactionType } from '../../types/admin.types';
+import { ERC20Token, TokenChanges } from '../../types';
+export declare const constructAdminData: (action: AdminTransactionType | undefined, chainId: number, erc20TokenAddresses: string[], amountChanges: bigint[], ethereumAddress: string, swapPairTokens?: ERC20Token[], fundApproveAndTransactFundAmounts?: bigint[], fundApproveAndTransactFundAddresses?: string[], fundApproveAndTransactEmporiumChanges?: TokenChanges<bigint>[]) => AdminDataType | undefined;

package/functions/pre-transaction/constructAdminData.mjs

@@ -0,0 +1,33 @@
+import { hashEthereumAddress as p } from "../utils/addresses.mjs";
+const i = (e, o, m, d, s, t, u, a, A) => {
+  if (!e)
+    return;
+  let r;
+  return t && (r = {
+    tokenIn: {
+      symbol: t[0].symbol,
+      address: t[0].erc20TokenAddress.toLowerCase()
+    },
+    tokenOut: {
+      symbol: t[1].symbol,
+      address: t[1].erc20TokenAddress.toLowerCase()
+    }
+  }), {
+    hashedOwner: p(s),
+    chainId: o,
+    timestamp: Date.now(),
+    action: e,
+    erc20TokenAddresses: m,
+    erc20TokenAmount: d.map(String),
+    fundApproveAndTransactFundAmounts: u?.map(String),
+    fundApproveAndTransactFundAddresses: a,
+    fundApproveAndTransactEmporiumChanges: A?.map((n) => ({
+      token: n.token,
+      amount: String(n.amount)
+    })),
+    swapPair: r
+  };
+};
+export {
+  i as constructAdminData
+};

package/functions/pre-transaction/convert-okx-instructions.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("@solana/web3.js"),p=255,d=(b,f)=>{const e=[],t=[];return b.forEach(s=>{const n=Buffer.from(s.accounts.map(r=>{if(r.pubkey.toString()===f.toString())return p;const a=e.findIndex(u=>u.pubkey.toBase58()===r.pubkey);return a!==-1?(e[a].isWritable!==r.isWritable&&(e[a].isWritable=!0),a):(e.push({pubkey:new o.PublicKey(r.pubkey),isSigner:!1,isWritable:r.isWritable}),e.length-1)})),i=Buffer.from(s.data,"base64"),l=e.findIndex(r=>r.pubkey.toBase58()===s.programId&&r.isSigner===!1&&r.isWritable===!1);l===-1?(e.push({pubkey:new o.PublicKey(s.programId),isSigner:!1,isWritable:!1}),t.push({data:i,programIndex:e.length-1,accountIndexes:n})):t.push({data:i,programIndex:l,accountIndexes:n})}),{hinkalInstructions:t,remainingAccounts:e}};exports.convertOKXToHinkalInstructions=d;

package/functions/pre-transaction/convert-okx-instructions.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node" />
+import { AccountMeta, PublicKey } from '@solana/web3.js';
+import { OKXSwapResponseInstruction } from '../../types/okx.types';
+export interface HinkalInstruction {
+    accountIndexes: Buffer;
+    data: Buffer;
+    programIndex: number;
+}
+export declare const convertOKXToHinkalInstructions: (okxInstructions: OKXSwapResponseInstruction[], cpiSignerAccount: PublicKey) => {
+    hinkalInstructions: HinkalInstruction[];
+    remainingAccounts: AccountMeta[];
+};

package/functions/pre-transaction/convert-okx-instructions.mjs

@@ -0,0 +1,30 @@
+import { PublicKey as l } from "@solana/web3.js";
+const I = 255, u = (o, p) => {
+  const e = [], f = [];
+  return o.forEach((s) => {
+    const t = Buffer.from(
+      s.accounts.map((r) => {
+        if (r.pubkey.toString() === p.toString())
+          return I;
+        const a = e.findIndex(
+          (b) => b.pubkey.toBase58() === r.pubkey
+        );
+        return a !== -1 ? (e[a].isWritable !== r.isWritable && (e[a].isWritable = !0), a) : (e.push({
+          pubkey: new l(r.pubkey),
+          isSigner: !1,
+          isWritable: r.isWritable
+        }), e.length - 1);
+      })
+    ), i = Buffer.from(s.data, "base64"), n = e.findIndex(
+      (r) => r.pubkey.toBase58() === s.programId && r.isSigner === !1 && r.isWritable === !1
+    );
+    n === -1 ? (e.push({
+      pubkey: new l(s.programId),
+      isSigner: !1,
+      isWritable: !1
+    }), f.push({ data: i, programIndex: e.length - 1, accountIndexes: t })) : f.push({ data: i, programIndex: n, accountIndexes: t });
+  }), { hinkalInstructions: f, remainingAccounts: e };
+};
+export {
+  u as convertOKXToHinkalInstructions
+};

package/functions/pre-transaction/getExternalSwapAddress.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../constants/chains.constants.cjs"),n=require("../../types/external-action.types.cjs"),c=(r,s)=>{const{contractData:t}=a.networkRegistry[r.getCurrentChainId()];let e;switch(s){case n.ExternalActionId.Uniswap:e=t?.uniswapExternalActionAddress;break;case n.ExternalActionId.Odos:e=t?.odosExternalActionInstanceAddress;break;case n.ExternalActionId.OneInch:e=t?.oneInchExternalActionInstanceAddress;break;default:e=t?.uniswapExternalActionAddress;break}if(!e)throw new Error("No external Address set during swap");return e};exports.getExternalSwapAddress=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../constants/chains.constants.cjs"),n=require("../../types/external-action.types.cjs"),d=(r,s)=>{const{contractData:t}=a.networkRegistry[r.getCurrentChainId()];let e;switch(s){case n.ExternalActionId.Uniswap:e=t?.uniswapExternalActionAddress;break;case n.ExternalActionId.Odos:e=t?.odosExternalActionInstanceAddress;break;case n.ExternalActionId.OneInch:e=t?.oneInchExternalActionInstanceAddress;break;case n.ExternalActionId.Lifi:e=t?.hinkalAddress;break;default:e=t?.uniswapExternalActionAddress;break}if(!e)throw new Error("No external Address set during swap");return e};exports.getExternalSwapAddress=d;

package/functions/pre-transaction/getExternalSwapAddress.mjs

@@ -1,18 +1,21 @@
 import { networkRegistry as a } from "../../constants/chains.constants.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-const c = (n, s) => {
-  const { contractData: r } = a[n.getCurrentChainId()];
+import { ExternalActionId as n } from "../../types/external-action.types.mjs";
+const c = (t, s) => {
+  const { contractData: r } = a[t.getCurrentChainId()];
   let e;
   switch (s) {
-    case t.Uniswap:
+    case n.Uniswap:
       e = r?.uniswapExternalActionAddress;
       break;
-    case t.Odos:
+    case n.Odos:
       e = r?.odosExternalActionInstanceAddress;
       break;
-    case t.OneInch:
+    case n.OneInch:
       e = r?.oneInchExternalActionInstanceAddress;
       break;
+    case n.Lifi:
+      e = r?.hinkalAddress;
+      break;
     default:
       e = r?.uniswapExternalActionAddress;
       break;

package/functions/pre-transaction/getFeeStructure.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("./process-gas-estimates.cjs"),g=require("../utils/erc20tokenFunctions.cjs"),T=require("../utils/caseInsensitive.utils.cjs"),k=require("../../error-handling/logger.cjs"),m=require("../../constants/fees.constants.cjs"),p=async(n,o,e,i,c,a=[])=>{const t=g.getERC20Token(o??m.defaultFeeToken,n);if(!t)throw new Error("failed to find feeToken");const u=e.some(f=>T.caseInsensitiveEqual(f,o))?e.length+1:e.length,{priceOfTransactionInToken:r}=await l.processGasEstimates(n,t,i,c,u,void 0,a);if(r===void 0)throw new Error("failed to process gas estimates");const s={feeToken:t.erc20TokenAddress,flatFee:r,variableRate:0n};return k.Logger.log(s),s};exports.getFeeStructure=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("./process-gas-estimates.cjs"),l=require("../utils/erc20tokenFunctions.cjs"),T=require("../utils/caseInsensitive.utils.cjs"),k=require("../../error-handling/logger.cjs"),m=require("../../constants/fees.constants.cjs"),p=async(n,o,e,i,c=[],u=0n)=>{const t=l.getERC20Token(o??m.defaultFeeToken,n);if(!t)throw new Error("failed to find feeToken");const a=e.some(f=>T.caseInsensitiveEqual(f,o))?e.length+1:e.length,{priceOfTransactionInToken:r}=await g.processGasEstimates(n,t,i,a,void 0,c);if(r===void 0)throw new Error("failed to process gas estimates");const s={feeToken:t.erc20TokenAddress,flatFee:r,variableRate:u};return k.Logger.log(s),s};exports.getFeeStructure=p;

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

@@ -1,4 +1,4 @@
-import { FeeStructure, ValidExternalAction } from '../../types/hinkal.types';
+import { FeeStructure } from '../../types/hinkal.types';
 import { ExternalActionId } from '../../types/external-action.types';
 import { CallInfo } from '../../types/API.types';
-export declare const getFeeStructure: (chainId: number, feeTokenAddress: string | undefined, erc20Addresses: string[], externalActionId: ExternalActionId, action?: ValidExternalAction, calls?: CallInfo[]) => Promise<FeeStructure>;
+export declare const getFeeStructure: (chainId: number, feeTokenAddress: string | undefined, erc20Addresses: string[], externalActionId: ExternalActionId, calls?: CallInfo[], variableRate?: bigint) => Promise<FeeStructure>;

package/functions/pre-transaction/getFeeStructure.mjs

@@ -1,16 +1,15 @@
 import { processGasEstimates as p } from "./process-gas-estimates.mjs";
-import { getERC20Token as l } from "../utils/erc20tokenFunctions.mjs";
-import { caseInsensitiveEqual as u } from "../utils/caseInsensitive.utils.mjs";
-import { Logger as g } from "../../error-handling/logger.mjs";
+import { getERC20Token as u } from "../utils/erc20tokenFunctions.mjs";
+import { caseInsensitiveEqual as g } from "../utils/caseInsensitive.utils.mjs";
+import { Logger as l } from "../../error-handling/logger.mjs";
 import { defaultFeeToken as T } from "../../constants/fees.constants.mjs";
-const F = async (t, r, e, a, f, s = []) => {
-  const o = l(r ?? T, t);
+const F = async (t, r, e, f, s = [], a = 0n) => {
+  const o = u(r ?? T, t);
   if (!o)
     throw new Error("failed to find feeToken");
-  const m = e.some((c) => u(c, r)) ? e.length + 1 : e.length, { priceOfTransactionInToken: n } = await p(
+  const m = e.some((c) => g(c, r)) ? e.length + 1 : e.length, { priceOfTransactionInToken: n } = await p(
     t,
     o,
-    a,
     f,
     m,
     void 0,
@@ -21,9 +20,9 @@ const F = async (t, r, e, a, f, s = []) => {
   const i = {
     feeToken: o.erc20TokenAddress,
     flatFee: n,
-    variableRate: 0n
+    variableRate: a
   };
-  return g.log(i), i;
+  return l.log(i), i;
 };
 export {
   F as getFeeStructure

package/functions/pre-transaction/getFlatFees.cjs

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

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

@@ -1,8 +1,8 @@
-import { CallInfo, ExternalActionId, ValidExternalAction } from '../../types';
+import { CallInfo, ExternalActionId } from '../../types';
 import { FeeInfo } from '../../types/fee.types';
 /**
  * Infer INTERACTION type from given @param externalActionId and @param action
  * and return `flatFee` along with `feeUnit` - the token corespond with the fee,
  * `priceOfTransactionInToken`, and `priceOfTransactionInUSD`
  */
-export declare const getFlatFees: (chainId: number, erc20Addresses: string[], externalActionId: ExternalActionId, amountChanges: bigint[], action?: ValidExternalAction, gasTokenAddress?: string, calls?: CallInfo[]) => Promise<FeeInfo>;
+export declare const getFlatFees: (chainId: number, erc20Addresses: string[], externalActionId: ExternalActionId, amountChanges: bigint[], gasTokenAddress?: string, calls?: CallInfo[]) => Promise<FeeInfo>;