@gearbox-protocol/sdk 11.11.3 → 12.0.0-next.1

package/dist/esm/plugins/adapters/contracts/UniswapV3AdapterContract.js

@@ -7,8 +7,8 @@ import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = iUniswapV3AdapterAbi;
 class UniswapV3AdapterContract extends AbstractAdapterContract {
   supportedPools;
-  constructor(sdk, args) {
-    super(sdk, { ...args, abi });
+  constructor(options, args) {
+    super(options, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },
@@ -31,14 +31,14 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
       fee: pool.fee
     }));
   }
-  parseFunctionParams(params) {
+  stringifyFunctionParams(params) {
     switch (params.functionName) {
       case "exactInputSingle": {
         const [{ tokenIn, tokenOut, fee, amountIn, amountOutMinimum }] = params.args;
-        const tokenInSym = this.sdk.tokensMeta.symbol(tokenIn);
-        const tokenOutSym = this.sdk.tokensMeta.symbol(tokenOut);
-        const amountInStr = this.sdk.tokensMeta.formatBN(tokenIn, amountIn);
-        const amountOutMinimumStr = this.sdk.tokensMeta.formatBN(
+        const tokenInSym = this.tokensMeta.symbol(tokenIn);
+        const tokenOutSym = this.tokensMeta.symbol(tokenOut);
+        const amountInStr = this.tokensMeta.formatBN(tokenIn, amountIn);
+        const amountOutMinimumStr = this.tokensMeta.formatBN(
           tokenOut,
           amountOutMinimum
         );
@@ -48,9 +48,9 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
       }
       case "exactDiffInputSingle": {
         const [{ tokenIn, tokenOut, fee, leftoverAmount, rateMinRAY }] = params.args;
-        const tokenInSym = this.sdk.tokensMeta.symbol(tokenIn);
-        const tokenOutSym = this.sdk.tokensMeta.symbol(tokenOut);
-        const leftoverAmountStr = this.sdk.tokensMeta.formatBN(
+        const tokenInSym = this.tokensMeta.symbol(tokenIn);
+        const tokenOutSym = this.tokensMeta.symbol(tokenOut);
+        const leftoverAmountStr = this.tokensMeta.formatBN(
           tokenIn,
           leftoverAmount
         );
@@ -63,8 +63,8 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
         const [{ amountIn, amountOutMinimum, path }] = params.args;
         const pathStr = this.trackInputPath(path);
         const token = `0x${path.replace("0x", "").slice(0, 40)}`;
-        const amountInStr = this.sdk.tokensMeta.formatBN(token, amountIn);
-        const amountOutMinimumStr = this.sdk.tokensMeta.formatBN(
+        const amountInStr = this.tokensMeta.formatBN(token, amountIn);
+        const amountOutMinimumStr = this.tokensMeta.formatBN(
           `0x${path.slice(-40, path.length)}`,
           amountOutMinimum
         );
@@ -74,7 +74,7 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
       }
       case "exactDiffInput": {
         const [{ leftoverAmount, rateMinRAY, path }] = params.args;
-        const leftoverAmountStr = this.sdk.tokensMeta.formatBN(
+        const leftoverAmountStr = this.tokensMeta.formatBN(
           `0x${path.replace("0x", "").slice(0, 40)}`,
           leftoverAmount
         );
@@ -89,11 +89,11 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
       case "exactOutput": {
         const [{ amountInMaximum, amountOut, path }] = params.args;
         const pathStr = this.trackOutputPath(path);
-        const amountInMaximumStr = this.sdk.tokensMeta.formatBN(
+        const amountInMaximumStr = this.tokensMeta.formatBN(
           `0x${path.slice(-40, path.length)}`,
           amountInMaximum
         );
-        const amountOutStr = this.sdk.tokensMeta.formatBN(
+        const amountOutStr = this.tokensMeta.formatBN(
           `0x${path.replace("0x", "").slice(0, 40)}`,
           amountOut
         );
@@ -103,19 +103,19 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
       }
       case "exactOutputSingle": {
         const [{ tokenIn, tokenOut, fee, amountOut, amountInMaximum }] = params.args;
-        const tokenInSym = this.sdk.tokensMeta.symbol(tokenIn);
-        const tokenOutSym = this.sdk.tokensMeta.symbol(tokenOut);
-        const amountInMaximumStr = this.sdk.tokensMeta.formatBN(
+        const tokenInSym = this.tokensMeta.symbol(tokenIn);
+        const tokenOutSym = this.tokensMeta.symbol(tokenOut);
+        const amountInMaximumStr = this.tokensMeta.formatBN(
           tokenIn,
           amountInMaximum
         );
-        const amountOutStr = this.sdk.tokensMeta.formatBN(tokenOut, amountOut);
+        const amountOutStr = this.tokensMeta.formatBN(tokenOut, amountOut);
         return [
           `(amountInMaximum: ${amountInMaximumStr}, amountOut: ${amountOutStr},  path: ${tokenInSym} ==(fee: ${fee})==> ${tokenOutSym})`
         ];
       }
       default:
-        return void 0;
+        return super.stringifyFunctionParams(params);
     }
   }
   trackInputPath(path) {
@@ -126,7 +126,7 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
         pointer,
         pointer + 40
       )}`.toLowerCase();
-      result += this.sdk.tokensMeta.symbol(from) || from;
+      result += this.tokensMeta.symbol(from) || from;
       pointer += 40;
       if (pointer > path.length - 6) return result;
       const fee = parseInt(path.slice(pointer, pointer + 6), 16);
@@ -141,7 +141,7 @@ class UniswapV3AdapterContract extends AbstractAdapterContract {
     while (pointer >= 40) {
       pointer -= 40;
       const from = `0x${path.slice(pointer, pointer + 40)}`;
-      result += this.sdk.tokensMeta.symbol(from) || from;
+      result += this.tokensMeta.symbol(from) || from;
       if (pointer < 6) return result;
       pointer -= 6;
       const fee = parseInt(path.slice(pointer, pointer + 6), 16);

package/dist/esm/plugins/adapters/contracts/UniswapV4AdapterContract.js

@@ -4,8 +4,8 @@ import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = iUniswapV4AdapterAbi;
 class UniswapV4AdapterContract extends AbstractAdapterContract {
   supportedPoolKeys;
-  constructor(sdk, args) {
-    super(sdk, { ...args, abi });
+  constructor(options, args) {
+    super(options, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },

package/dist/esm/plugins/adapters/contracts/UpshiftVaultAdapterContract.js

@@ -6,8 +6,8 @@ class UpshiftVaultAdapterContract extends AbstractAdapterContract {
   vault;
   asset;
   stakedPhantomToken;
-  constructor(sdk, args) {
-    super(sdk, { ...args, abi });
+  constructor(options, args) {
+    super(options, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },

package/dist/esm/plugins/adapters/contracts/VelodromeV2AdapterContract.js

@@ -4,8 +4,8 @@ import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = iVelodromeV2RouterAdapterAbi;
 class VelodromeV2RouterAdapterContract extends AbstractAdapterContract {
   supportedPools;
-  constructor(sdk, args) {
-    super(sdk, { ...args, abi });
+  constructor(options, args) {
+    super(options, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },

package/dist/esm/plugins/adapters/contracts/WstETHV1AdapterContract.js

@@ -4,8 +4,8 @@ import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = iwstEthv1AdapterAbi;
 class WstETHV1AdapterContract extends AbstractAdapterContract {
   stETH;
-  constructor(sdk, args) {
-    super(sdk, { ...args, abi });
+  constructor(options, args) {
+    super(options, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },

package/dist/esm/plugins/adapters/contracts/YearnV2AdapterContract.js

@@ -4,8 +4,8 @@ import { AbstractAdapterContract } from "./AbstractAdapter.js";
 const abi = iYearnV2AdapterAbi;
 class YearnV2RouterAdapterContract extends AbstractAdapterContract {
   token;
-  constructor(sdk, args) {
-    super(sdk, { ...args, abi });
+  constructor(options, args) {
+    super(options, { ...args, abi });
     const decoded = decodeAbiParameters(
       [
         { type: "address", name: "creditManager" },

package/dist/esm/plugins/bots/BotsPlugin.js

@@ -1,22 +1,12 @@
-import {
-  decodeAbiParameters,
-  encodeAbiParameters,
-  stringToHex
-} from "viem";
+import { encodeAbiParameters, stringToHex } from "viem";
 import { iBytecodeRepositoryAbi } from "../../abi/310/iBytecodeRepository.js";
-import { peripheryCompressorAbi } from "../../abi/compressors/peripheryCompressor.js";
 import {
   AddressMap,
   AP_BYTECODE_REPOSITORY,
-  AP_PERIPHERY_COMPRESSOR,
   AP_TREASURY,
   BasePlugin,
   chains as CHAINS,
-  hexEq,
-  isV300,
-  isV310,
-  TypedObjectUtils,
-  VERSION_RANGE_310
+  hexEq
 } from "../../sdk/index.js";
 import { iPartialLiquidationBotV310Abi } from "./abi/iPartialLiquidationBotV310.js";
 import {
@@ -25,64 +15,29 @@ import {
   PARTIAL_LIQUIDATION_BOT_DEPLOYER,
   PARTIAL_LIQUIDATION_BOT_SALT
 } from "./config.js";
-import { PartialLiquidationBotV300Contract } from "./PartialLiquidationBotV300Contract.js";
 import { PartialLiquidationBotV310Contract } from "./PartialLiquidationBotV310Contract.js";
 import {
   BOT_PARAMS_ABI,
-  LIQUIDATION_BOT_TYPES
+  BOT_PARTIAL_LIQUIDATION
 } from "./types.js";
-class UnsupportedBotVersionError extends Error {
-  state;
-  constructor(state) {
-    super(
-      `unsupported bot version ${state.baseParams.version} for bot at ${state.baseParams.addr}`
-    );
-    this.state = state;
-  }
-}
 class BotsPlugin extends BasePlugin {
-  #botsByMarket;
+  #bots;
   get loaded() {
-    return !!this.#botsByMarket;
+    return !!this.#bots;
+  }
+  get bots() {
+    return this.#bots?.values() ?? [];
   }
   async load(force) {
     if (!force && this.loaded) {
       return this.state;
     }
-    const [pcAddr] = this.sdk.addressProvider.mustGetLatest(
-      AP_PERIPHERY_COMPRESSOR,
-      VERSION_RANGE_310
-    );
-    this.logger?.debug(`loading bots with periphery compressor ${pcAddr}`);
-    const mcs = this.sdk.marketRegister.marketConfigurators.map(
-      (mc) => mc.address
-    );
-    const botsData = await this.client.multicall({
-      contracts: mcs.map(
-        (mc) => ({
-          address: pcAddr,
-          abi: peripheryCompressorAbi,
-          functionName: "getBots",
-          args: [mc]
-        })
-      ),
-      allowFailure: false
-    });
-    this.#botsByMarket = new AddressMap();
-    for (let i = 0; i < mcs.length; i++) {
-      const mc = mcs[i];
-      const marketBotData = botsData[i];
-      this.#loadStateMarketState(mc, marketBotData);
-    }
-    return this.state;
-  }
-  async findDeployedPartialLiquidationBots() {
     const treasury = this.sdk.addressProvider.getAddress(AP_TREASURY);
     const bcr = this.sdk.addressProvider.getAddress(AP_BYTECODE_REPOSITORY);
     const configs = PARTIAL_LIQUIDATION_BOT_CONFIGS[this.sdk.networkType] ?? [];
-    const result = new AddressMap();
+    this.#bots = new AddressMap();
     if (!configs.length) {
-      return result;
+      return this.state;
     }
     const deployedBots = await this.client.multicall({
       contracts: configs.map(
@@ -91,7 +46,7 @@ class BotsPlugin extends BasePlugin {
           abi: iBytecodeRepositoryAbi,
           functionName: "computeAddress",
           args: [
-            stringToHex("BOT::PARTIAL_LIQUIDATION", { size: 32 }),
+            stringToHex(BOT_PARTIAL_LIQUIDATION, { size: 32 }),
             310,
             encodeAbiParameters(BOT_PARAMS_ABI, [
               treasury,
@@ -141,88 +96,41 @@ class BotsPlugin extends BasePlugin {
       const serialized = serializedBots[i];
       const expected = expectedBots.mustGet(botAddrs[i]);
       if (serialized.status === "success") {
-        const [
-          treasury2,
-          minHealthFactor,
-          maxHealthFactor,
-          premiumScaleFactor,
-          feeScaleFactor
-        ] = decodeAbiParameters(BOT_PARAMS_ABI, serialized.result);
-        if (!hexEq(treasury2, expected.treasury) || minHealthFactor !== expected.minHealthFactor || maxHealthFactor !== expected.maxHealthFactor || premiumScaleFactor !== expected.premiumScaleFactor || feeScaleFactor !== expected.feeScaleFactor) {
+        const bot = new PartialLiquidationBotV310Contract(this.sdk, {
+          addr: botAddrs[i],
+          version: BigInt(310),
+          contractType: BOT_PARTIAL_LIQUIDATION,
+          serializedParams: serialized.result
+        });
+        if (!hexEq(treasury, expected.treasury) || bot.minHealthFactor !== expected.minHealthFactor || bot.maxHealthFactor !== expected.maxHealthFactor || bot.premiumScaleFactor !== expected.premiumScaleFactor || bot.feeScaleFactor !== expected.feeScaleFactor) {
           this.logger?.error(
             `serialized bot ${botAddrs[i]} does not match expected bot`,
             serialized.error
           );
         } else {
-          result.upsert(botAddrs[i], expected);
+          this.#bots.upsert(botAddrs[i], bot);
         }
       }
     }
-    return result;
-  }
-  #loadStateMarketState(mc, state) {
-    const bots = state.map((state2) => this.#createBot(mc, state2)).sort((a, b) => a.minHealthFactor - b.minHealthFactor);
-    if (bots.length && isV300(Number(bots[0].version))) {
-      if (bots.length !== 4) {
-        throw new Error(`expected 4 bots v300 for market configurator ${mc}`);
-      }
-      for (let i = 0; i < bots.length; i++) {
-        bots[i].botType = LIQUIDATION_BOT_TYPES[i];
-      }
-    }
-    this.botsByMarket.upsert(mc, bots);
+    return this.state;
   }
   stateHuman(raw) {
     return {
-      bots: Object.fromEntries(
-        this.botsByMarket.entries().map(([mc, bots]) => [
-          this.labelAddress(mc),
-          bots.map((b) => b.stateHuman(raw))
-        ])
-      )
+      bots: this.#bots?.values().map((bot) => bot.stateHuman(raw)) ?? []
     };
   }
-  get botsByMarket() {
-    if (!this.#botsByMarket) {
-      throw new Error("bots plugin not loaded");
-    }
-    return this.#botsByMarket;
-  }
-  botsByMarketConfigurator(mc) {
-    return this.botsByMarket.get(mc) ?? [];
-  }
-  get allBots() {
-    return this.botsByMarket.values().flat();
-  }
   get state() {
     return {
-      bots: TypedObjectUtils.fromEntries(
-        this.botsByMarket.entries().map(([mc, bots]) => [mc, bots.map((b) => b.state)])
-      )
+      bots: this.#bots?.values().map((bot) => bot.state) ?? []
     };
   }
   hydrate(state) {
-    this.#botsByMarket = new AddressMap();
-    for (const [mc, botStates] of TypedObjectUtils.entries(state.bots)) {
-      this.#loadStateMarketState(mc, botStates);
-    }
-  }
-  #createBot(marketConfigurator, data) {
-    const v = Number(data.baseParams.version);
-    if (isV300(v)) {
-      return new PartialLiquidationBotV300Contract(
-        this.sdk,
-        data,
-        marketConfigurator
-      );
-    } else if (isV310(v)) {
-      return new PartialLiquidationBotV310Contract(
-        this.sdk,
-        data,
-        marketConfigurator
+    this.#bots = new AddressMap();
+    for (const botState of state.bots) {
+      this.#bots.upsert(
+        botState.addr,
+        new PartialLiquidationBotV310Contract(this.sdk, botState)
       );
-    } else {
-      throw new Error(`unsupported bot version: ${v}`);
     }
   }
   static getMigrationBotData(chainId) {
@@ -230,6 +138,5 @@ class BotsPlugin extends BasePlugin {
   }
 }
 export {
-  BotsPlugin,
-  UnsupportedBotVersionError
+  BotsPlugin
 };

package/dist/esm/plugins/bots/PartialLiquidationBotV310Contract.js

@@ -1,15 +1,50 @@
+import { decodeAbiParameters, stringToHex } from "viem";
+import {
+  BaseContract,
+  formatPercentage
+} from "../../sdk/index.js";
 import { iPartialLiquidationBotV310Abi } from "./abi/index.js";
-import { PartialLiquidationBotBaseContract } from "./PartialLiquidationBotBaseContract.js";
+import { BOT_PARAMS_ABI } from "./types.js";
 const abi = iPartialLiquidationBotV310Abi;
-class PartialLiquidationBotV310Contract extends PartialLiquidationBotBaseContract {
-  constructor(sdk, args, marketConfigurator) {
+class PartialLiquidationBotV310Contract extends BaseContract {
+  treasury;
+  minHealthFactor;
+  maxHealthFactor;
+  premiumScaleFactor;
+  feeScaleFactor;
+  #serializedParams;
+  constructor(sdk, args) {
     super(sdk, {
+      ...args,
       abi,
-      ...args.baseParams,
-      requiredPermissions: args.requiredPermissions,
-      marketConfigurator,
       name: "PartialLiquidationBotV310"
     });
+    [
+      this.treasury,
+      this.minHealthFactor,
+      this.maxHealthFactor,
+      this.premiumScaleFactor,
+      this.feeScaleFactor
+    ] = decodeAbiParameters(BOT_PARAMS_ABI, args.serializedParams);
+    this.#serializedParams = args.serializedParams;
+  }
+  stateHuman(raw) {
+    return {
+      ...super.stateHuman(raw),
+      treasury: this.treasury,
+      minHealthFactor: formatPercentage(this.minHealthFactor),
+      maxHealthFactor: formatPercentage(this.maxHealthFactor),
+      premiumScaleFactor: formatPercentage(this.premiumScaleFactor),
+      feeScaleFactor: formatPercentage(this.feeScaleFactor)
+    };
+  }
+  get state() {
+    return {
+      addr: this.address,
+      version: BigInt(this.version),
+      contractType: stringToHex(this.contractType, { size: 32 }),
+      serializedParams: this.#serializedParams
+    };
   }
 }
 export {

package/dist/esm/plugins/bots/deserializePartialLiquidationBotParams.js

@@ -0,0 +1,29 @@
+import { decodeAbiParameters } from "viem";
+function deserializePartialLiquidationBotParams(params) {
+  const [
+    treasury,
+    minHealthFactor,
+    maxHealthFactor,
+    premiumScaleFactor,
+    feeScaleFactor
+  ] = decodeAbiParameters(
+    [
+      { name: "treasury", type: "address" },
+      { name: "minHealthFactor", type: "uint16" },
+      { name: "maxHealthFactor", type: "uint16" },
+      { name: "premiumScaleFactor", type: "uint16" },
+      { name: "feeScaleFactor", type: "uint16" }
+    ],
+    params.serializedParams
+  );
+  return {
+    treasury,
+    minHealthFactor,
+    maxHealthFactor,
+    premiumScaleFactor,
+    feeScaleFactor
+  };
+}
+export {
+  deserializePartialLiquidationBotParams as default
+};

package/dist/esm/plugins/bots/index.js

@@ -1,6 +1,5 @@
 export * from "./abi/index.js";
 export * from "./BotsPlugin.js";
 export * from "./config.js";
-export * from "./PartialLiquidationBotV300Contract.js";
 export * from "./PartialLiquidationBotV310Contract.js";
 export * from "./types.js";

package/dist/esm/plugins/bots/types.js

@@ -1,3 +1,4 @@
+const BOT_PARTIAL_LIQUIDATION = "BOT::PARTIAL_LIQUIDATION";
 const BOT_PARAMS_ABI = [
   { type: "address", name: "treasury" },
   { type: "uint16", name: "minHealthFactor" },
@@ -5,15 +6,9 @@ const BOT_PARAMS_ABI = [
   { type: "uint16", name: "premiumScaleFactor" },
   { type: "uint16", name: "feeScaleFactor" }
 ];
-const LIQUIDATION_BOT_TYPES = [
-  "PARTIAL_LIQUIDATION_BOT",
-  "DELEVERAGE_BOT_PEGGED",
-  "DELEVERAGE_BOT_LV",
-  "DELEVERAGE_BOT_HV"
-];
 const MIGRATION_BOT_TYPES = ["MIGRATION_BOT"];
 export {
   BOT_PARAMS_ABI,
-  LIQUIDATION_BOT_TYPES,
+  BOT_PARTIAL_LIQUIDATION,
   MIGRATION_BOT_TYPES
 };

package/dist/esm/plugins/zappers/ZappersPlugin.js

@@ -115,7 +115,7 @@ class ZappersPlugin extends BasePlugin {
     const extraZappersTokens = this.extraZappers.values().flatMap((l) => l.flatMap((z) => [z.tokenIn, z.tokenOut]));
     for (const t of [...zappersTokens, ...extraZappersTokens]) {
       this.sdk.tokensMeta.upsert(t.addr, t);
-      this.sdk.addressLabels.set(t.addr, t.symbol);
+      this.sdk.setAddressLabel(t.addr, t.symbol);
     }
   }
 }