Merge pull request #382 from Gearbox-protocol/repay

fix: repay

Author: essserrr

src/sdk/accounts/AbstractCreditAccountsService.ts

@@ -201,7 +201,9 @@ export abstract class AbstractCreditAccountService extends SDKConstruct {
       } while (offset !== 0n);
     }
     this.#logger?.debug(
-      `loaded ${allCAs.length} credit accounts (${allCAs.length - revertingOffset} reverting)`,
+      `loaded ${allCAs.length} credit accounts (${
+        allCAs.length - revertingOffset
+      } reverting)`,
     );
 
     // sort by health factor ascending
@@ -409,6 +411,8 @@ export abstract class AbstractCreditAccountService extends SDKConstruct {
       creditAccount: ca,
     });
 
+    console.log("CLOSE", this.sdk.parseMultiCall(routerCloseResult.calls));
+
     const calls: Array<MultiCall> = [
       ...(operation === "close" ? [] : priceUpdates),
       ...routerCloseResult.calls,

src/sdk/accounts/CreditAccountsServiceV310.ts

@@ -102,16 +102,21 @@ export class CreditAccountServiceV310
     creditAccount: ca,
     permits,
     to,
+    tokensToClaim,
   }: RepayCreditAccountProps): Promise<CreditAccountOperationResult> {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
 
     const addCollateral = collateralAssets.filter(a => a.balance > 0);
 
     const router = this.sdk.routerFor(ca);
+    // HERE
+
     const claimPath = await router.findClaimAllRewards({
       calls: [],
+      tokensToClaim,
       creditAccount: ca,
     });
+    console.log("claimPath", this.sdk.parseMultiCall(claimPath.calls));
 
     const priceUpdates = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
@@ -146,15 +151,20 @@ export class CreditAccountServiceV310
     creditAccount: ca,
     permits,
     to,
+    tokensToClaim,
   }: RepayAndLiquidateCreditAccountProps): Promise<CreditAccountOperationResult> {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
 
     const router = this.sdk.routerFor(ca);
+    // HERE
     const claimPath = await router.findClaimAllRewards({
       calls: [],
+      tokensToClaim,
       creditAccount: ca,
     });
 
+    console.log("claimPath", this.sdk.parseMultiCall(claimPath.calls));
+
     const priceUpdates = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
       creditAccount: ca,
@@ -188,12 +198,14 @@ export class CreditAccountServiceV310
 
     minQuota,
     averageQuota,
+    tokensToClaim,
   }: ClaimFarmRewardsProps): Promise<CreditAccountOperationResult> {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
 
     const router = this.sdk.routerFor(ca);
     const claimPath = await router.findClaimAllRewards({
       calls: legacyCalls,
+      tokensToClaim,
       creditAccount: ca,
     });
     if (claimPath.calls.length === 0) throw new Error("No path to execute");

src/sdk/accounts/types.ts

@@ -135,6 +135,7 @@ export interface RepayAndLiquidateCreditAccountProps {
    * permits of tokens to withdraw (in any permittable token is present)
    */
   permits: Record<string, PermitResult>;
+  tokensToClaim: Asset[];
 }
 
 export interface PrepareUpdateQuotasProps {
@@ -257,6 +258,7 @@ export interface ClaimFarmRewardsProps extends PrepareUpdateQuotasProps {
    * minimal credit account data on which operation is performed
    */
   creditAccount: RouterCASlice;
+  tokensToClaim: Asset[];
 }
 
 export interface EnableTokensProps {

src/sdk/router/RouterV310Contract.ts

@@ -168,7 +168,7 @@ export class RouterV310Contract
   public async findClaimAllRewards(
     props: FindClaimAllRewardsProps,
   ): Promise<RouterRewardsResult> {
-    const tData: Array<TokenData> = props.creditAccount.tokens.map(a => ({
+    const tData: Array<TokenData> = props.tokensToClaim.map(a => ({
       balance: 0n,
       claimRewards: true,
       leftoverBalance: 0n,

src/sdk/router/types.ts

@@ -209,6 +209,10 @@ export interface FindClaimAllRewardsProps {
    * Minimal credit account data on which operation is performed
    */
   creditAccount: RouterCASlice;
+  /**
+   * List of token rewards of which we want to claim and swap to underlying token during closing ca process
+   */
+  tokensToClaim: Array<Asset>;
   /**
    * Legacy property - array of MultiCall from getRewards
    */