@gearbox-protocol/sdk 11.10.1 → 11.11.0-next.2

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

@@ -8,6 +8,7 @@ import {
   TypedObjectUtils,
   VERSION_RANGE_310
 } from "../../sdk/index.js";
+import deserializePartialLiquidationBotParams from "./deserializePartialLiquidationBotParams.js";
 import { PartialLiquidationBotV300Contract } from "./PartialLiquidationBotV300Contract.js";
 import { PartialLiquidationBotV310Contract } from "./PartialLiquidationBotV310Contract.js";
 import {
@@ -59,15 +60,15 @@ class BotsPlugin extends BasePlugin {
     return this.state;
   }
   #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) {
+    const states = [...state].sort(
+      (a, b) => deserializePartialLiquidationBotParams(a.baseParams).minHealthFactor - deserializePartialLiquidationBotParams(b.baseParams).minHealthFactor
+    );
+    if (states.length && isV300(states[0].baseParams.version)) {
+      if (states.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];
-      }
     }
+    const bots = states.map((s, i) => this.#createBot(mc, s, i));
     this.botsByMarket.upsert(mc, bots);
   }
   stateHuman(raw) {
@@ -105,13 +106,15 @@ class BotsPlugin extends BasePlugin {
       this.#loadStateMarketState(mc, botStates);
     }
   }
-  #createBot(marketConfigurator, data) {
+  #createBot(marketConfigurator, data, index) {
     const v = Number(data.baseParams.version);
     if (isV300(v)) {
+      const botType = LIQUIDATION_BOT_TYPES[index];
       return new PartialLiquidationBotV300Contract(
         this.sdk,
         data,
-        marketConfigurator
+        marketConfigurator,
+        botType
       );
     } else if (isV310(v)) {
       return new PartialLiquidationBotV310Contract(

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

@@ -1,5 +1,5 @@
-import { decodeAbiParameters } from "viem";
 import { BaseContract, formatPercentage } from "../../sdk/index.js";
+import deserializePartialLiquidationBotParams from "./deserializePartialLiquidationBotParams.js";
 class PartialLiquidationBotBaseContract extends BaseContract {
   requiredPermissions;
   marketConfigurator;
@@ -7,27 +7,12 @@ class PartialLiquidationBotBaseContract extends BaseContract {
   constructor(sdk, args) {
     super(sdk, args);
     this.#serializedParams = args.serializedParams;
-    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" }
-      ],
-      args.serializedParams
-    );
-    this.treasury = treasury;
-    this.minHealthFactor = minHealthFactor;
-    this.maxHealthFactor = maxHealthFactor;
-    this.premiumScaleFactor = premiumScaleFactor;
-    this.feeScaleFactor = feeScaleFactor;
+    const bp = deserializePartialLiquidationBotParams(args);
+    this.treasury = bp.treasury;
+    this.minHealthFactor = bp.minHealthFactor;
+    this.maxHealthFactor = bp.maxHealthFactor;
+    this.premiumScaleFactor = bp.premiumScaleFactor;
+    this.feeScaleFactor = bp.feeScaleFactor;
     this.marketConfigurator = args.marketConfigurator;
     this.requiredPermissions = args.requiredPermissions;
   }

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

@@ -2,15 +2,16 @@ import { iPartialLiquidationBotV300Abi } from "./abi/index.js";
 import { PartialLiquidationBotBaseContract } from "./PartialLiquidationBotBaseContract.js";
 const abi = iPartialLiquidationBotV300Abi;
 class PartialLiquidationBotV300Contract extends PartialLiquidationBotBaseContract {
-  #botType;
-  constructor(sdk, args, marketConfigurator) {
+  botType;
+  constructor(sdk, args, marketConfigurator, botType) {
     super(sdk, {
       abi,
       ...args.baseParams,
       requiredPermissions: args.requiredPermissions,
       marketConfigurator,
-      name: "PartialLiquidationBotV300"
+      name: `PartialLiquidationBotV300 (${botType})`
     });
+    this.botType = botType;
   }
   stateHuman(raw) {
     return {
@@ -18,23 +19,6 @@ class PartialLiquidationBotV300Contract extends PartialLiquidationBotBaseContrac
       botType: this.botType
     };
   }
-  /**
-   * Set the bot type
-   * This method should only be called once from BotsPlugin
-   */
-  set botType(type) {
-    if (this.#botType) {
-      throw new Error("bot type already set");
-    }
-    this.#botType = type;
-    this.name = `PartialLiquidationBotV300 (${type})`;
-  }
-  get botType() {
-    if (!this.#botType) {
-      throw new Error("bot type not set");
-    }
-    return this.#botType;
-  }
 }
 export {
   PartialLiquidationBotV300Contract

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,5 +1,4 @@
 export * from "./abi/index.js";
 export * from "./BotsPlugin.js";
 export * from "./PartialLiquidationBotV300Contract.js";
-export * from "./PartialLiquidationBotV310Contract.js";
 export * from "./types.js";

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);
     }
   }
 }

package/dist/esm/sdk/GearboxSDK.js

@@ -5,7 +5,7 @@ import {
   http,
   parseEventLogs
 } from "viem";
-import { AddressLabeller, TokensMeta } from "./base/index.js";
+import { ChainContractsRegister } from "./base/index.js";
 import { detectNetwork, getChain } from "./chain/index.js";
 import {
   ADDRESS_PROVIDER_V310,
@@ -30,7 +30,7 @@ import {
   PluginStateVersionError
 } from "./plugins/index.js";
 import { createRouter } from "./router/index.js";
-import { AddressMap, TypedObjectUtils, toAddress } from "./utils/index.js";
+import { TypedObjectUtils, toAddress } from "./utils/index.js";
 import { Hooks } from "./utils/internal/index.js";
 import { getLogsSafe } from "./utils/viem/index.js";
 const ERR_NOT_ATTACHED = new Error("Gearbox SDK not attached");
@@ -69,10 +69,9 @@ async function attachClient(options, network) {
   }
   return createClient(options, { networkType, chainId });
 }
-class GearboxSDK {
+class GearboxSDK extends ChainContractsRegister {
   #hooks = new Hooks();
   plugins;
-  #client;
   // Block which was use for data query
   #currentBlock;
   #timestamp;
@@ -83,29 +82,11 @@ class GearboxSDK {
   // Collection of markets
   #marketRegister;
   #priceFeeds;
-  logger;
   gasLimit;
-  addressLabels = new AddressLabeller();
-  /**
-   * Interest rate models can be reused across chain (and SDK operates on chain level)
-   * TODO: use whatever interface is necessary for InterestRateModels
-   */
-  interestRateModels = new AddressMap();
   /**
    * Will throw an error if contract type is not supported, otherwise will try to use generic contract first, if possible
    */
   strictContractTypes;
-  /**
-   * All contracts known to sdk
-   */
-  contracts = new AddressMap(
-    void 0,
-    "contracts"
-  );
-  /**
-   * Token metadata such as symbol and decimals
-   */
-  tokensMeta;
   addHook = this.#hooks.addHook.bind(this.#hooks);
   removeHook = this.#hooks.removeHook.bind(this.#hooks);
   static async attach(options) {
@@ -158,17 +139,16 @@ class GearboxSDK {
     }).#hydrate(rest, state);
   }
   constructor(options) {
-    this.logger = options.logger;
+    super(options.client, options.logger);
     this.strictContractTypes = options.strictContractTypes ?? false;
     this.plugins = options.plugins ?? {};
-    this.#client = options.client;
     for (const plugin of Object.values(this.plugins)) {
       plugin.sdk = this;
     }
     if (options.gasLimit !== null) {
       this.gasLimit = options.gasLimit || 550000000n;
     }
-    this.tokensMeta = new TokensMeta(this);
+    Object.assign(this, ChainContractsRegister.for(this.client, this.logger));
   }
   async #attach(opts) {
     const {
@@ -324,74 +304,9 @@ class GearboxSDK {
       timestamp: state.timestamp
     });
   }
-  get client() {
-    return this.#client;
-  }
-  /**
-   * Replaces client inflight
-   * You're responsible for all inconsistencies between new and old client
-   * @param options
-   */
-  replaceClient(options, network) {
-    this.#client = createClient(options, network);
-  }
   get networkType() {
     return this.client.chain.network;
   }
-  get chain() {
-    return this.client.chain;
-  }
-  get chainId() {
-    return this.client.chain.id;
-  }
-  /**
-   * Converts contract call into some human-friendly string
-   * This method is safe and should not throw
-   * @param address
-   * @param calldata
-   * @returns
-   */
-  parseFunctionData(address, calldata) {
-    const contract = this.contracts.get(address);
-    return contract ? contract.parseFunctionData(calldata) : `unknown: ${address}.${calldata.slice(0, 10)}`;
-  }
-  /**
-   * Converts multicalls into some human-friendly strings
-   * This method is safe and should not throw
-   * @param address
-   * @param calldata
-   * @returns
-   */
-  parseMultiCall(calls) {
-    return calls.map(
-      (call) => this.parseFunctionData(call.target, call.callData)
-    );
-  }
-  /**
-   * Return args, function, type and address name from contract call
-   * @param address
-   * @param calldata
-   * @returns
-   */
-  parseFunctionDataToObject(address, calldata) {
-    const contract = this.contracts.get(address);
-    return contract ? {
-      ...contract.parseFunctionDataToObject(calldata),
-      address,
-      type: contract.contractType
-    } : null;
-  }
-  /**
-   * Converts multicalls into call info
-   * @param address
-   * @param calldata
-   * @returns
-   */
-  parseMultiCallToObject(calls) {
-    return calls.map(
-      (call) => this.parseFunctionDataToObject(call.target, call.callData)
-    );
-  }
   stateHuman(raw = true) {
     return {
       block: Number(this.currentBlock),
@@ -483,7 +398,7 @@ class GearboxSDK {
         address: watchAddresses
       });
       for (const log of logs) {
-        const contract = this.contracts.get(log.address);
+        const contract = this.getContract(log.address);
         if (contract) {
           const event = parseEventLogs({
             abi: contract.abi,
@@ -572,17 +487,11 @@ class GearboxSDK {
   }
   get botListContract() {
     const addr = this.addressProvider.getAddress(AP_BOT_LIST, NO_VERSION);
-    if (!this.contracts.has(addr)) {
-      return new BotListContract(this, addr);
-    }
-    return this.contracts.get(addr);
+    return this.getContract(addr) ?? new BotListContract(this, addr);
   }
   get gearStakingContract() {
     const addr = this.addressProvider.getAddress(AP_GEAR_STAKING, NO_VERSION);
-    if (!this.contracts.has(addr)) {
-      return new GearStakingContract(this, addr);
-    }
-    return this.contracts.get(addr);
+    return this.getContract(addr) ?? new GearStakingContract(this, addr);
   }
   get marketRegister() {
     if (this.#marketRegister === void 0) {
@@ -609,7 +518,7 @@ class GearboxSDK {
         );
         facadeAddr = cm.creditFacade.address;
       }
-      const facadeV = this.contracts.mustGet(facadeAddr).version;
+      const facadeV = this.mustGetContract(facadeAddr).version;
       routerRange = isV310(facadeV) ? VERSION_RANGE_310 : VERSION_RANGE_300;
     }
     const routerEntry = this.addressProvider.getLatest(AP_ROUTER, routerRange);
@@ -617,18 +526,7 @@ class GearboxSDK {
       throw new Error(`router not found in version range ${routerRange}`);
     }
     const [routerAddr, routerV] = routerEntry;
-    if (!this.contracts.has(routerAddr)) {
-      return createRouter(this, routerAddr, routerV);
-    }
-    return this.contracts.get(routerAddr);
-  }
-  /**
-   * Helper to get human-friendly label for address
-   * @param address
-   * @returns
-   */
-  labelAddress(address) {
-    return this.addressLabels.get(address);
+    return createRouter(this, routerAddr, routerV);
   }
 }
 export {

package/dist/esm/sdk/accountMigration/AbstractMigrateCreditAccountsService.js

@@ -7,9 +7,7 @@ import { createCreditAccountService } from "../accounts/createCreditAccountServi
 import { SDKConstruct } from "../base/index.js";
 import { chains as CHAINS } from "../chain/chains.js";
 import { isV310 } from "../constants/versions.js";
-import { childLogger } from "../utils/index.js";
 class AbstractMigrateCreditAccountsService extends SDKConstruct {
-  #logger;
   #version;
   #service;
   // TODO: HARDCODED
@@ -31,8 +29,7 @@ class AbstractMigrateCreditAccountsService extends SDKConstruct {
     super(sdk);
     this.#version = version;
     this.#service = createCreditAccountService(this.sdk, version);
-    this.#logger = childLogger("MigrateCreditAccountsService", sdk.logger);
-    this.#logger?.debug(
+    this.logger?.debug(
       `Created MigrateCreditAccountsService with version: ${this.#version}`
     );
   }

package/dist/esm/sdk/accounts/AbstractCreditAccountsService.js

@@ -25,7 +25,7 @@ import {
 } from "../constants/index.js";
 import { assetsMap } from "../router/index.js";
 import { BigIntMath } from "../sdk-legacy/index.js";
-import { AddressMap, childLogger } from "../utils/index.js";
+import { AddressMap } from "../utils/index.js";
 import { simulateWithPriceUpdates } from "../utils/viem/index.js";
 function getWithdrawalCompressorAddress(chainId) {
   const compressor = chainId === 1 ? "0xfB79b6713fe214B8748ED7b0db1f93E4f1aC9d29" : void 0;
@@ -34,7 +34,6 @@ function getWithdrawalCompressorAddress(chainId) {
 class AbstractCreditAccountService extends SDKConstruct {
   #compressor;
   #batchSize;
-  #logger;
   constructor(sdk, options) {
     super(sdk);
     [this.#compressor] = sdk.addressProvider.mustGetLatest(
@@ -42,8 +41,7 @@ class AbstractCreditAccountService extends SDKConstruct {
       VERSION_RANGE_310
     );
     this.#batchSize = options?.batchSize;
-    this.#logger = childLogger("CreditAccountsService", sdk.logger);
-    this.#logger?.debug(
+    this.logger?.debug(
       `credit account compressor address: ${this.#compressor}`
     );
   }
@@ -145,7 +143,7 @@ class AbstractCreditAccountService extends SDKConstruct {
         offset = newOffset;
       } while (offset !== 0n);
     }
-    this.#logger?.debug(
+    this.logger?.debug(
       `loaded ${allCAs.length} credit accounts (${allCAs.length - revertingOffset} reverting)`
     );
     return allCAs.sort((a, b) => Number(a.healthFactor - b.healthFactor));
@@ -282,7 +280,7 @@ class AbstractCreditAccountService extends SDKConstruct {
       lossPolicyData = await market.lossPolicy.getLiquidationData(
         account.creditAccount
       );
-      this.#logger?.debug({ lossPolicyData }, "loss policy data");
+      this.logger?.debug({ lossPolicyData }, "loss policy data");
     }
     const tx = cm.creditFacade.liquidateCreditAccount(
       account.creditAccount,
@@ -840,7 +838,7 @@ class AbstractCreditAccountService extends SDKConstruct {
         gas: this.sdk.gasLimit
       });
     }
-    this.#logger?.debug(
+    this.logger?.debug(
       {
         accounts: resp[0]?.length ?? 0,
         nextOffset: Number(resp[1])
@@ -920,7 +918,7 @@ class AbstractCreditAccountService extends SDKConstruct {
     });
     const tStr = Array.from(tokens).map((t) => this.labelAddress(t)).join(", ");
     const remark = ignoreReservePrices ? " main" : "";
-    this.#logger?.debug(
+    this.logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
       `generating price feed updates for ${tStr} from ${priceFeeds.length}${remark} price feeds`
     );
@@ -936,7 +934,7 @@ class AbstractCreditAccountService extends SDKConstruct {
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
     const update = await this.getUpdateForAccount(options);
-    this.#logger?.debug(
+    this.logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
       `getting on demand price updates from ${update.txs.length} txs`
     );