@gearbox-protocol/sdk 8.3.2 → 8.4.0

package/dist/esm/abi/routerV310.js

@@ -34,6 +34,37 @@ const iGearboxRouterV310Abi = [
     outputs: [{ name: "", type: "bytes32[]", internalType: "bytes32[]" }],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "processClaims",
+    inputs: [
+      { name: "creditAccount", type: "address", internalType: "address" },
+      {
+        name: "tData",
+        type: "tuple[]",
+        internalType: "struct TokenData[]",
+        components: [
+          { name: "token", type: "address", internalType: "address" },
+          { name: "balance", type: "uint256", internalType: "uint256" },
+          { name: "leftoverBalance", type: "uint256", internalType: "uint256" },
+          { name: "numSplits", type: "uint256", internalType: "uint256" },
+          { name: "claimRewards", type: "bool", internalType: "bool" }
+        ]
+      }
+    ],
+    outputs: [
+      {
+        name: "calls",
+        type: "tuple[]",
+        internalType: "struct MultiCall[]",
+        components: [
+          { name: "target", type: "address", internalType: "address" },
+          { name: "callData", type: "bytes", internalType: "bytes" }
+        ]
+      }
+    ],
+    stateMutability: "nonpayable"
+  },
   {
     type: "function",
     name: "routeManyToOne",

package/dist/esm/sdk/accounts/{CreditAccountsService.js → AbstractCreditAccountsService.js}

@@ -1,4 +1,4 @@
-import { encodeFunctionData, getAddress, parseAbi } from "viem";
+import { encodeFunctionData, getAddress } from "viem";
 import {
   iCreditAccountCompressorAbi,
   iPeripheryCompressorAbi,
@@ -14,29 +14,15 @@ import {
   AP_REWARDS_COMPRESSOR,
   MAX_UINT256,
   MIN_INT96,
-  NOT_DEPLOYED,
   PERCENTAGE_FACTOR,
   RAY,
   VERSION_RANGE_310
 } from "../constants/index.js";
 import { assetsMap } from "../router/index.js";
-import {
-  auraStakedTokens,
-  auraTokens,
-  contractsByNetwork,
-  convexStakedPhantomTokens,
-  convexTokens,
-  isAuraStakedToken,
-  isConvexStakedPhantomToken,
-  isStakingRewardsPhantomToken,
-  stakingRewardsTokens,
-  tokenDataByNetwork,
-  tokenSymbolByAddress
-} from "../sdk-gov-legacy/index.js";
 import { AddressMap, childLogger } from "../utils/index.js";
 import { simulateWithPriceUpdates } from "../utils/viem/index.js";
 import { stringifyGetCreditAccountsArgs } from "./utils.js";
-class CreditAccountsService extends SDKConstruct {
+class AbstractCreditAccountService extends SDKConstruct {
   #compressor;
   #batchSize;
   #logger;
@@ -162,17 +148,17 @@ class CreditAccountsService extends SDKConstruct {
       functionName: "getRewards",
       args: [creditAccount]
     });
+    const callData = encodeFunctionData({
+      abi: iBaseRewardPoolAbi,
+      functionName: "getReward",
+      args: []
+    });
     const r = rewards.reduce((acc, r2) => {
       const adapter = r2.adapter.toLowerCase();
       const stakedPhantomToken = r2.stakedPhantomToken.toLowerCase();
       const rewardToken = r2.rewardToken.toLowerCase();
       const key = [adapter, stakedPhantomToken].join("-");
       if (!acc[key]) {
-        const callData = encodeFunctionData({
-          abi: iBaseRewardPoolAbi,
-          functionName: "getReward",
-          args: []
-        });
         acc[key] = {
           adapter,
           stakedPhantomToken,
@@ -283,120 +269,16 @@ class CreditAccountsService extends SDKConstruct {
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...routerCloseResult.calls,
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...this.#prepareDisableTokens(ca),
+      ...this.prepareDisableQuotas(ca),
+      ...this.prepareDecreaseDebt(ca),
+      ...this.prepareDisableTokens(ca),
       ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
+        (t) => this.prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
       )
     ];
     const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, routerCloseResult, creditFacade: cm.creditFacade };
   }
-  /**
-   * Fully repays credit account or repays credit account and keeps it open with zero debt
-     - Repays in the following order: price update -> add collateral to cover the debt -> 
-      -> disable quotas for all tokens -> decrease debt -> disable tokens all tokens -> withdraw all tokens
-   * @param {CloseOptions} operation - {@link CloseOptions}: close or zeroDebt
-   * @param {RouterCASlice} creditAccount - minimal credit account data {@link RouterCASlice} on which operation is performed on which operation is performed
-   * @param {Array<Address>} collateralAssets - tokens to repay dept. 
-      In the current implementation, this is the (debt+interest+fess) * buffer, 
-      where buffer refers to amount of tokens which will exceed current debt 
-      in order to cover possible debt increase over tx execution
-   * @param {Array<Asset>} assetsToWithdraw - tokens to withdraw from credit account. 
-      Typically all non zero ca assets (including unclaimed rewards) 
-      plus underlying token (to withdraw any exceeding underlying token after repay)
-   * @param {Record<Address, PermitResult>} permits - permits of tokens to withdraw (in any permittable token is present) {@link PermitResult}
-   * @param {Address} to - Wallet address to withdraw underlying to
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  async repayCreditAccount({
-    operation,
-    collateralAssets,
-    assetsToWithdraw: wrapped,
-    creditAccount: ca,
-    permits,
-    to
-  }) {
-    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const addCollateral = collateralAssets.filter((a) => a.balance > 0);
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
-    const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
-      wrapped,
-      true,
-      true,
-      ca.creditManager
-    );
-    const calls = [
-      ...operation === "close" ? [] : priceUpdates,
-      ...this.#prepareAddCollateral(ca.creditFacade, addCollateral, permits),
-      ...this.#prepareDisableQuotas(ca),
-      ...this.#prepareDecreaseDebt(ca),
-      ...unwrapCalls,
-      ...this.#prepareDisableTokens(ca),
-      // TODO: probably needs a better way to handle reward tokens
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca.creditFacade, t.token, MAX_UINT256, to)
-      )
-    ];
-    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
-    return { tx, calls, creditFacade: cm.creditFacade };
-  }
-  /**
-   * Fully repays liquidatable account
-     - Repay and liquidate is executed in the following order: price update -> add collateral to cover the debt -> 
-      withdraw all tokens from credit account
-   * @param {RouterCASlice} creditAccount - minimal credit account data {@link RouterCASlice} on which operation is performed
-   * @param {Array<Address>} collateralAssets - tokens to repay dept. 
-      In the current implementation, this is the (debt+interest+fess) * buffer, 
-      where buffer refers to amount of tokens which will exceed current debt 
-      in order to cover possible debt increase over tx execution
-   * @param {Array<Address>} assetsToWithdraw - tokens to withdraw from credit account. 
-      Typically all non zero ca assets (including unclaimed rewards) 
-      plus underlying token (to withdraw any exceeding underlying token after repay)
-   * @param {Record<Address, PermitResult>} permits - permits of tokens to withdraw (in any permittable token is present) {@link PermitResult}
-   * @param {Address} to - Wallet address to withdraw underlying to
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  async repayAndLiquidateCreditAccount({
-    collateralAssets,
-    assetsToWithdraw: wrapped,
-    creditAccount: ca,
-    permits,
-    to
-  }) {
-    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdates = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      void 0
-    );
-    const addCollateral = collateralAssets.filter((a) => a.balance > 0);
-    const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
-      wrapped,
-      true,
-      true,
-      ca.creditManager
-    );
-    const calls = [
-      ...priceUpdates,
-      ...this.#prepareAddCollateral(ca.creditFacade, addCollateral, permits),
-      ...unwrapCalls,
-      ...assetsToWithdraw.map(
-        (t) => this.#prepareWithdrawToken(ca.creditFacade, t.token, MAX_UINT256, to)
-      )
-    ];
-    const tx = cm.creditFacade.liquidateCreditAccount(
-      ca.creditAccount,
-      to,
-      calls
-    );
-    return { tx, calls, creditFacade: cm.creditFacade };
-  }
   /**
    * Updates quota of credit account.
      - CA quota updated in the following order: price update -> update quotas
@@ -420,7 +302,7 @@ class CreditAccountsService extends SDKConstruct {
     );
     const calls = [
       ...priceUpdates,
-      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, {
+      ...this.prepareUpdateQuotas(creditAccount.creditFacade, {
         minQuota,
         averageQuota
       })
@@ -457,12 +339,12 @@ class CreditAccountsService extends SDKConstruct {
     );
     const calls = [
       ...priceUpdatesCalls,
-      ...this.#prepareAddCollateral(
+      ...this.prepareAddCollateral(
         creditAccount.creditFacade,
         [asset],
         permit ? { [asset.token]: permit } : {}
       ),
-      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, {
+      ...this.prepareUpdateQuotas(creditAccount.creditFacade, {
         minQuota,
         averageQuota
       })
@@ -510,57 +392,6 @@ class CreditAccountsService extends SDKConstruct {
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
-  /**
-   * Withdraws a single collateral from credit account to wallet to and updates quotas; 
-      technically can withdraw several tokens at once
-     - Collateral is withdrawn in the following order: price update -> withdraw token -> update quotas for affected tokens
-   * @param {RouterCASlice} creditAccount - minimal credit account data {@link RouterCASlice} on which operation is performed
-   * @param {Array<Asset>} averageQuota - average quota for desired token {@link Asset}
-   * @param {Array<Asset>} minQuota - minimum quota for desired token {@link Asset}
-   * @param {Address} to - Wallet address to withdraw token to
-   * @param {Array<Asset>} assetsToWithdraw - permits for asset if it is permittable {@link PermitResult}
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  async withdrawCollateral({
-    creditAccount,
-    assetsToWithdraw: wrapped,
-    to,
-    minQuota,
-    averageQuota
-  }) {
-    const cm = this.sdk.marketRegister.findCreditManager(
-      creditAccount.creditManager
-    );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      creditAccount.creditManager,
-      creditAccount,
-      void 0
-    );
-    const { unwrapCalls, assetsToWithdraw } = this.#prepareUnwrapAndWithdrawCallsV3(
-      wrapped,
-      false,
-      false,
-      creditAccount.creditManager
-    );
-    const calls = [
-      ...priceUpdatesCalls,
-      ...unwrapCalls,
-      ...assetsToWithdraw.map(
-        (a) => this.#prepareWithdrawToken(
-          creditAccount.creditFacade,
-          a.token,
-          a.balance,
-          to
-        )
-      ),
-      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, {
-        minQuota,
-        averageQuota
-      })
-    ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
-    return { tx, calls, creditFacade: cm.creditFacade };
-  }
   /**
    * Executes swap specified by given calls, update quotas of affected tokens
      - Swap is executed in the following order: price update -> execute swap path -> update quotas
@@ -588,7 +419,7 @@ class CreditAccountsService extends SDKConstruct {
     const calls = [
       ...priceUpdatesCalls,
       ...swapCalls,
-      ...this.#prepareUpdateQuotas(creditAccount.creditFacade, {
+      ...this.prepareUpdateQuotas(creditAccount.creditFacade, {
         minQuota,
         averageQuota
       })
@@ -596,45 +427,6 @@ class CreditAccountsService extends SDKConstruct {
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
-  /**
-   * Executes swap specified by given calls, update quotas of affected tokens
-     - Claim rewards is executed in the following order: price update -> execute claim calls -> 
-      -> (optionally: disable reward tokens) -> (optionally: update quotas)
-   * @param {RouterCASlice} creditAccount - minimal credit account data {@link RouterCASlice} on which operation is performed
-   * @param {Array<Asset>} averageQuota - average quota for desired token; 
-      in this case can be omitted since rewards tokens do not require quotas {@link Asset}
-   * @param {Array<Asset>} minQuota - minimum quota for desired token;
-      in this case can be omitted since rewards tokens do not require quotas {@link Asset}
-   * @param {Array<MultiCall>} calls - array of MultiCall from getRewards {@link MultiCall}
-   * @param {Array<Asset>} tokensToDisable - tokens to disable after rewards claiming;
-      sometimes is needed since old credit facade used to enable tokens on claim {@link Asset}
-   * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  async claimFarmRewards({
-    tokensToDisable,
-    calls: claimCalls,
-    creditAccount: ca,
-    minQuota,
-    averageQuota
-  }) {
-    if (claimCalls.length === 0) throw new Error("No path to execute");
-    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
-      ca.creditManager,
-      ca,
-      averageQuota
-    );
-    const calls = [
-      ...priceUpdatesCalls,
-      ...claimCalls,
-      ...tokensToDisable.map(
-        (a) => this.#prepareDisableToken(ca.creditFacade, a.token)
-      ),
-      ...this.#prepareUpdateQuotas(ca.creditFacade, { minQuota, averageQuota })
-    ];
-    const tx = cm.creditFacade.multicall(ca.creditAccount, calls);
-    return { tx, calls, creditFacade: cm.creditFacade };
-  }
   /**
    * Executes enable/disable tokens specified by given tokens lists and token prices
    * @param {RouterCASlice} creditAccount - minimal credit account data {@link RouterCASlice} on which operation is performed
@@ -656,7 +448,7 @@ class CreditAccountsService extends SDKConstruct {
     const calls = [
       ...priceUpdatesCalls,
       ...disabledTokens.map(
-        (token) => this.#prepareDisableToken(ca.creditFacade, token)
+        (token) => this.prepareDisableToken(ca.creditFacade, token)
       ),
       ...this.#prepareEnableTokens(ca.creditFacade, enabledTokens)
     ];
@@ -710,10 +502,10 @@ class CreditAccountsService extends SDKConstruct {
     const calls = [
       ...priceUpdatesCalls,
       this.#prepareIncreaseDebt(cm.creditFacade, debt),
-      ...this.#prepareAddCollateral(cm.creditFacade, collateral, permits),
+      ...this.prepareAddCollateral(cm.creditFacade, collateral, permits),
       ...openPathCalls,
-      ...withdrawDebt ? [this.#prepareWithdrawToken(cm.creditFacade, cm.underlying, debt, to)] : [],
-      ...this.#prepareUpdateQuotas(cm.creditFacade, {
+      ...withdrawDebt ? [this.prepareWithdrawToken(cm.creditFacade, cm.underlying, debt, to)] : [],
+      ...this.prepareUpdateQuotas(cm.creditFacade, {
         minQuota,
         averageQuota
       })
@@ -902,9 +694,9 @@ class CreditAccountsService extends SDKConstruct {
   }
   /**
    * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...).
-   * If there are desiredQuotas and creditAccount update quotaBalance > 0 || (balance > 10n && isEnabled).
-   * If there is creditAccount update balance > 10n && isEnabled.
-   * If there is desiredQuotas update quotaBalance > 0.
+   * - If there are desiredQuotas and creditAccount update quotaBalance > 0 || (balance > 10n && isEnabled). Is used when account has both: balances and quota buys.
+   * - If there is creditAccount update balance > 10n && isEnabled. Is used in credit account actions when quota is not being bought.
+   * - If there is desiredQuotas update quotaBalance > 0. Is used on credit account opening, when quota is bought for the first time.
    * @param acc
    * @returns
    */
@@ -917,7 +709,7 @@ class CreditAccountsService extends SDKConstruct {
     );
     return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
-  #prepareDisableQuotas(ca) {
+  prepareDisableQuotas(ca) {
     const calls = [];
     for (const { token, quota } of ca.tokens) {
       if (quota > 0n) {
@@ -933,7 +725,7 @@ class CreditAccountsService extends SDKConstruct {
     }
     return calls;
   }
-  #prepareUpdateQuotas(creditFacade, { averageQuota, minQuota }) {
+  prepareUpdateQuotas(creditFacade, { averageQuota, minQuota }) {
     const minRecord = assetsMap(minQuota);
     const calls = averageQuota.map((q) => {
       const minAsset = minRecord.get(q.token);
@@ -949,7 +741,7 @@ class CreditAccountsService extends SDKConstruct {
     });
     return calls;
   }
-  #prepareDecreaseDebt(ca) {
+  prepareDecreaseDebt(ca) {
     if (ca.debt > 0n) {
       return [
         {
@@ -964,17 +756,17 @@ class CreditAccountsService extends SDKConstruct {
     }
     return [];
   }
-  #prepareDisableTokens(ca) {
+  prepareDisableTokens(ca) {
     const calls = [];
     for (const t of ca.tokens) {
       const isEnabled = (t.mask & ca.enabledTokensMask) !== 0n;
       if (t.token !== ca.underlying && isEnabled && t.quota === 0n) {
-        calls.push(this.#prepareDisableToken(ca.creditFacade, t.token));
+        calls.push(this.prepareDisableToken(ca.creditFacade, t.token));
       }
     }
     return calls;
   }
-  #prepareDisableToken(creditFacade, token) {
+  prepareDisableToken(creditFacade, token) {
     return {
       target: creditFacade,
       callData: encodeFunctionData({
@@ -994,7 +786,7 @@ class CreditAccountsService extends SDKConstruct {
       })
     }));
   }
-  #prepareWithdrawToken(creditFacade, token, amount, to) {
+  prepareWithdrawToken(creditFacade, token, amount, to) {
     return {
       target: creditFacade,
       callData: encodeFunctionData({
@@ -1024,7 +816,7 @@ class CreditAccountsService extends SDKConstruct {
       })
     };
   }
-  #prepareAddCollateral(creditFacade, assets, permits) {
+  prepareAddCollateral(creditFacade, assets, permits) {
     const calls = assets.map(({ token, balance }) => {
       const p = permits[token];
       if (p) {
@@ -1048,184 +840,6 @@ class CreditAccountsService extends SDKConstruct {
     });
     return calls;
   }
-  /**
-   * unwraps staked tokens and optionally claims associated rewards; Should be remove after transition to 3.1
-   * @param acc
-   * @returns
-   */
-  #prepareUnwrapAndWithdrawCallsV3(assets, claim, withdrawAll, creditManager) {
-    const network = this.sdk.provider.networkType;
-    const suite = this.sdk.marketRegister.findCreditManager(creditManager);
-    const cmAdapters = suite.creditManager.adapters.values().reduce((acc, a) => {
-      const contractLc = a.targetContract.toLowerCase();
-      const adapterLc = a.address.toLowerCase();
-      acc[contractLc] = adapterLc;
-      return acc;
-    }, {});
-    const currentContractsData = Object.entries(
-      contractsByNetwork[network]
-    ).reduce(
-      (acc, [symbol, address]) => {
-        if (!!address && address !== NOT_DEPLOYED) {
-          acc[symbol] = address.toLowerCase();
-        }
-        return acc;
-      },
-      {}
-    );
-    const currentTokenData = Object.entries(tokenDataByNetwork[network]).reduce(
-      (acc, [symbol, address]) => {
-        if (!!address && address !== NOT_DEPLOYED) {
-          acc[symbol] = address.toLowerCase();
-        }
-        return acc;
-      },
-      {}
-    );
-    const { aura, convex, sky } = assets.reduce(
-      (acc, a) => {
-        const symbol = tokenSymbolByAddress[a.token];
-        if (isConvexStakedPhantomToken(symbol)) {
-          acc.convex.push(a);
-        } else if (isAuraStakedToken(symbol)) {
-          acc.aura.push(a);
-        } else if (isStakingRewardsPhantomToken(symbol)) {
-          acc.sky.push(a);
-        }
-        return acc;
-      },
-      { convex: [], aura: [], sky: [] }
-    );
-    const getWithdrawCall = (pool, a) => {
-      return withdrawAll ? this.#withdrawAllAndUnwrap_Convex(pool, claim) : this.#withdrawAndUnwrap_Convex(pool, a.balance, claim);
-    };
-    const getWithdrawCall_Rewards = (pool, a) => {
-      const calls = [
-        withdrawAll ? this.#withdrawAll_Rewards(pool) : this.#withdraw_Rewards(pool, a.balance),
-        ...claim ? [this.#claim_Rewards(pool)] : []
-      ];
-      return calls;
-    };
-    const convexStkCalls = convex.map((a) => {
-      const symbol = tokenSymbolByAddress[a.token];
-      const { pool } = convexTokens[symbol];
-      const poolAddress = currentContractsData[pool];
-      if (!poolAddress) {
-        throw new Error("Can't withdrawAllAndUnwrap_Convex (convex)");
-      }
-      const poolAddressLc = poolAddress.toLowerCase();
-      return getWithdrawCall(cmAdapters[poolAddressLc], a);
-    });
-    const auraStkCalls = aura.map((a) => {
-      const symbol = tokenSymbolByAddress[a.token];
-      const { pool } = auraTokens[symbol];
-      const poolAddress = currentContractsData[pool];
-      if (!poolAddress) {
-        throw new Error("Can't withdrawAllAndUnwrap_Convex (aura)");
-      }
-      const poolAddressLc = poolAddress.toLowerCase();
-      return getWithdrawCall(cmAdapters[poolAddressLc], a);
-    });
-    const skyStkCalls = sky.flatMap((a) => {
-      const symbol = tokenSymbolByAddress[a.token];
-      const { pool } = stakingRewardsTokens[symbol];
-      const poolAddress = currentContractsData[pool];
-      if (!poolAddress) {
-        throw new Error("Can't withdrawAllAndUnwrap_Convex (sky)");
-      }
-      const poolAddressLc = poolAddress.toLowerCase();
-      return getWithdrawCall_Rewards(cmAdapters[poolAddressLc], a);
-    });
-    const unwrapCalls = [...convexStkCalls, ...auraStkCalls, ...skyStkCalls];
-    const withdraw = assets.map((a) => {
-      const symbol = tokenSymbolByAddress[a.token];
-      if (isConvexStakedPhantomToken(symbol)) {
-        return {
-          ...a,
-          token: currentTokenData[convexStakedPhantomTokens[symbol].underlying]
-        };
-      }
-      if (isAuraStakedToken(symbol)) {
-        return {
-          ...a,
-          token: currentTokenData[auraStakedTokens[symbol].underlying]
-        };
-      }
-      if (isStakingRewardsPhantomToken(symbol)) {
-        return {
-          ...a,
-          token: currentTokenData[stakingRewardsTokens[symbol].underlying]
-        };
-      }
-      return a;
-    });
-    return { unwrapCalls, assetsToWithdraw: withdraw };
-  }
-  // TODO: remove after transition to 3.1
-  #withdrawAndUnwrap_Convex(address, amount, claim) {
-    return {
-      target: address,
-      callData: encodeFunctionData({
-        abi: parseAbi([
-          "function withdrawAndUnwrap(uint256, bool claim) returns (uint256 tokensToEnable, uint256 tokensToDisable)"
-        ]),
-        functionName: "withdrawAndUnwrap",
-        args: [amount, claim]
-      })
-    };
-  }
-  // TODO: remove after transition to 3.1
-  #withdrawAllAndUnwrap_Convex(address, claim) {
-    return {
-      target: address,
-      callData: encodeFunctionData({
-        abi: parseAbi([
-          "function withdrawDiffAndUnwrap(uint256 leftoverAmount, bool claim) returns (uint256 tokensToEnable, uint256 tokensToDisable)"
-        ]),
-        functionName: "withdrawDiffAndUnwrap",
-        args: [1n, claim]
-      })
-    };
-  }
-  // TODO: remove after transition to 3.1
-  #withdrawAll_Rewards(address) {
-    return {
-      target: address,
-      callData: encodeFunctionData({
-        abi: parseAbi([
-          "function withdrawDiff(uint256 leftoverAmount) external returns (bool useSafePrices)"
-        ]),
-        functionName: "withdrawDiff",
-        args: [1n]
-      })
-    };
-  }
-  // TODO: remove after transition to 3.1
-  #withdraw_Rewards(address, amount) {
-    return {
-      target: address,
-      callData: encodeFunctionData({
-        abi: parseAbi([
-          "function withdraw(uint256 amount) external returns (bool useSafePrices)"
-        ]),
-        functionName: "withdraw",
-        args: [amount]
-      })
-    };
-  }
-  // TODO: remove after transition to 3.1
-  #claim_Rewards(address) {
-    return {
-      target: address,
-      callData: encodeFunctionData({
-        abi: parseAbi([
-          "function getReward() external returns (bool useSafePrices)"
-        ]),
-        functionName: "getReward",
-        args: []
-      })
-    };
-  }
   /**
    * Returns addresses of market configurators
    */
@@ -1246,5 +860,5 @@ class CreditAccountsService extends SDKConstruct {
   }
 }
 export {
-  CreditAccountsService
+  AbstractCreditAccountService
 };