@gearbox-protocol/sdk 3.0.0-next.124 → 3.0.0-next.126

package/lib/apy/index.d.ts

@@ -1,5 +1,5 @@
 import { LPTokens, PartialRecord, SupportedToken } from "@gearbox-protocol/sdk-gov";
-export type AdditionalTokenWithAPY = Extract<SupportedToken, "STETH" | "weETH" | "osETH" | "rETH" | "wstETH">;
+export type AdditionalTokenWithAPY = Extract<SupportedToken, "STETH" | "weETH" | "osETH" | "rETH" | "wstETH" | "ezETH">;
 export declare const additionalTokensWIthAPY: Record<AdditionalTokenWithAPY, true>;
 export type TokensWithAPY = LPTokens | AdditionalTokenWithAPY;
 export type LpTokensAPY = PartialRecord<TokensWithAPY, number>;

package/lib/apy/index.js

@@ -22,6 +22,7 @@ exports.additionalTokensWIthAPY = {
     osETH: true,
     rETH: true,
     wstETH: true,
+    ezETH: true,
 };
 const isTokenWithAPY = (t) => typeof t === "string" &&
     (!!sdk_gov_1.lpTokens[t] ||

package/lib/core/creditManager.d.ts

@@ -2,10 +2,10 @@ import { MultiCall } from "../pathfinder/core";
 import { ChartsCreditManagerPayload, CreditManagerDataPayload, QuotaInfo } from "../payload/creditManager";
 import { LinearModel } from "../payload/pool";
 import { Asset } from "./assets";
-import { PoolType } from "./pool";
+export type CreditManagerType = "universal" | "trade" | "farm" | "restaking";
 export declare class CreditManagerData {
     readonly address: string;
-    readonly type: PoolType;
+    readonly type: CreditManagerType;
     readonly underlyingToken: string;
     readonly pool: string;
     readonly creditFacade: string;
@@ -55,7 +55,8 @@ export declare class CreditManagerData {
     encodeWithdrawCollateralV3(token: string, amount: bigint, to: string): MultiCall;
     static withdrawAllAndUnwrap_Convex(address: string, claim: boolean): MultiCall;
     encodeOnDemandPriceUpdateV3(token: string, reserve: boolean, data: string): MultiCall;
-    static getPoolTier(name: string): number;
+    static getTier(name: string): number;
+    static getType(name: string): CreditManagerType;
 }
 export declare class ChartsCreditManagerData {
     readonly address: string;

package/lib/core/creditManager.js

@@ -4,7 +4,6 @@ exports.ChartsCreditManagerData = exports.CreditManagerData = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const txParser_1 = require("../parsers/txParser");
 const types_1 = require("../types");
-const pool_1 = require("./pool");
 class CreditManagerData {
     address;
     type;
@@ -41,10 +40,10 @@ class CreditManagerData {
     constructor(payload) {
         this.address = payload.addr.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
-        this.type = pool_1.PoolData.getPoolType(payload.name || "");
+        this.type = CreditManagerData.getType(payload.name || "");
         this.name = payload.name;
         this.pool = payload.pool.toLowerCase();
-        this.tier = CreditManagerData.getPoolTier(payload.name);
+        this.tier = CreditManagerData.getTier(payload.name);
         this.creditFacade = payload.creditFacade.toLowerCase();
         this.creditConfigurator = payload.creditConfigurator.toLowerCase();
         this.degenNFT = payload.degenNFT.toLowerCase();
@@ -219,7 +218,7 @@ class CreditManagerData {
             callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("onDemandPriceUpdate", [token, reserve, data]),
         };
     }
-    static getPoolTier(name) {
+    static getTier(name) {
         const DEFAULT_TIER = 99;
         const l = name.split(" ") || [];
         const [word, number] = l.slice(-2);
@@ -229,6 +228,17 @@ class CreditManagerData {
         }
         return DEFAULT_TIER;
     }
+    static getType(name) {
+        const [identity = ""] = name.split(" ") || [];
+        const lc = identity.toLowerCase();
+        if (lc === "farm")
+            return "farm";
+        if (lc === "trade")
+            return "trade";
+        if (lc === "restaking")
+            return "restaking";
+        return "universal";
+    }
 }
 exports.CreditManagerData = CreditManagerData;
 class ChartsCreditManagerData {

package/lib/pathfinder/balancerVault.d.ts

@@ -0,0 +1,33 @@
+export declare enum PoolSpecialization {
+    GeneralPool = 0,
+    MinimalSwapInfoPool = 1,
+    TwoTokenPool = 2
+}
+/**
+ * Splits a poolId into its components, i.e. pool address, pool specialization and its nonce
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns an object with the decomposed poolId
+ */
+export declare const splitPoolId: (poolId: string) => {
+    address: string;
+    specialization: PoolSpecialization;
+    nonce: bigint;
+};
+/**
+ * Extracts a pool's address from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's address
+ */
+export declare const getPoolAddress: (poolId: string) => string;
+/**
+ * Extracts a pool's specialization from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's specialization
+ */
+export declare const getPoolSpecialization: (poolId: string) => PoolSpecialization;
+/**
+ * Extracts a pool's nonce from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's nonce
+ */
+export declare const getPoolNonce: (poolId: string) => bigint;

package/lib/pathfinder/balancerVault.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPoolNonce = exports.getPoolSpecialization = exports.getPoolAddress = exports.splitPoolId = exports.PoolSpecialization = void 0;
+var PoolSpecialization;
+(function (PoolSpecialization) {
+    PoolSpecialization[PoolSpecialization["GeneralPool"] = 0] = "GeneralPool";
+    PoolSpecialization[PoolSpecialization["MinimalSwapInfoPool"] = 1] = "MinimalSwapInfoPool";
+    PoolSpecialization[PoolSpecialization["TwoTokenPool"] = 2] = "TwoTokenPool";
+})(PoolSpecialization = exports.PoolSpecialization || (exports.PoolSpecialization = {}));
+/**
+ * Splits a poolId into its components, i.e. pool address, pool specialization and its nonce
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns an object with the decomposed poolId
+ */
+const splitPoolId = (poolId) => {
+    return {
+        address: (0, exports.getPoolAddress)(poolId),
+        specialization: (0, exports.getPoolSpecialization)(poolId),
+        nonce: (0, exports.getPoolNonce)(poolId),
+    };
+};
+exports.splitPoolId = splitPoolId;
+/**
+ * Extracts a pool's address from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's address
+ */
+const getPoolAddress = (poolId) => {
+    if (poolId.length !== 66)
+        throw new Error("Invalid poolId length");
+    return poolId.slice(0, 42);
+};
+exports.getPoolAddress = getPoolAddress;
+/**
+ * Extracts a pool's specialization from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's specialization
+ */
+const getPoolSpecialization = (poolId) => {
+    if (poolId.length !== 66)
+        throw new Error("Invalid poolId length");
+    // Only have 3 pool specializations so we can just pull the relevant character
+    const specializationCode = parseInt(poolId[45], 10);
+    if (specializationCode >= 3)
+        throw new Error("Invalid pool specialization");
+    return specializationCode;
+};
+exports.getPoolSpecialization = getPoolSpecialization;
+/**
+ * Extracts a pool's nonce from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's nonce
+ */
+const getPoolNonce = (poolId) => {
+    if (poolId.length !== 66)
+        throw new Error("Invalid poolId length");
+    return BigInt(`0x${poolId.slice(46)}`);
+};
+exports.getPoolNonce = getPoolNonce;

package/lib/pathfinder/utils.d.ts

@@ -1,4 +1,5 @@
-import { providers, utils } from "ethers";
+import { providers } from "ethers";
+import { Interface } from "ethers/lib/utils";
 import { MultiCall } from "./core";
 export interface FeeInfo {
     type: KnownFeeTypes;
@@ -16,7 +17,7 @@ export declare const BALANCER_VAULT_ABI: {
     stateMutability: string;
     type: string;
 }[];
-export declare const BALANCER_VAULT_INTERFACE: utils.Interface;
+export declare const BALANCER_VAULT_INTERFACE: Interface;
 interface FindPathFeesProps {
     calls: Array<MultiCall>;
     provider: providers.Provider;

package/lib/pathfinder/utils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathFinderUtils = exports.BALANCER_VAULT_INTERFACE = exports.BALANCER_VAULT_ABI = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const ethers_1 = require("ethers");
 const utils_1 = require("ethers/lib/utils");
 const balancerV2VaultParser_1 = require("../parsers/balancerV2VaultParser");
 const curveAdapterParser_1 = require("../parsers/curveAdapterParser");
@@ -11,6 +10,7 @@ const txParser_1 = require("../parsers/txParser");
 const uniV2AdapterParser_1 = require("../parsers/uniV2AdapterParser");
 const uniV3AdapterParser_1 = require("../parsers/uniV3AdapterParser");
 const types_1 = require("../types");
+const balancerVault_1 = require("./balancerVault");
 const CURVE_FEE_DECIMALS = 100000000n;
 const BALANCER_FEE_DECIMALS = 10000000000000000n;
 exports.BALANCER_VAULT_ABI = [
@@ -151,11 +151,10 @@ class PathFinderUtils {
             case "swapDiff":
             case "swap": {
                 const { poolId = "" } = callObject.args?.[0] || {};
-                // !& implement address getting
-                const [contract] = ethers_1.utils.defaultAbiCoder.decode(["address", "unit16"], poolId);
-                return contract
+                const { address } = (0, balancerVault_1.splitPoolId)(poolId);
+                return address
                     ? {
-                        address: contract,
+                        address,
                         interface: exports.BALANCER_VAULT_INTERFACE,
                         method: "getSwapFeePercentage()",
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.124",
+  "version": "3.0.0-next.126",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",