Merge pull request #328 from Gearbox-protocol/quota-fix

fix: buy quota error

Author: essserrr

src/core/creditAccount.spec.ts

@@ -1575,12 +1575,12 @@ describe("CreditAccount calcQuotaUpdate test", () => {
         [tokenDataByNetwork.Mainnet.STETH]: {
           amountInTarget: 10_1345n,
           balance: 0n,
-          token: tokenDataByNetwork.Mainnet.DAI,
+          token: tokenDataByNetwork.Mainnet.STETH,
         },
         [tokenDataByNetwork.Mainnet.WETH]: {
           amountInTarget: 0n * PERCENTAGE_FACTOR,
           balance: 0n,
-          token: tokenDataByNetwork.Mainnet.DAI,
+          token: tokenDataByNetwork.Mainnet.WETH,
         },
       },
 
@@ -1637,12 +1637,12 @@ describe("CreditAccount calcQuotaUpdate test", () => {
         [tokenDataByNetwork.Mainnet.STETH]: {
           amountInTarget: 10_1345n,
           balance: 0n,
-          token: tokenDataByNetwork.Mainnet.DAI,
+          token: tokenDataByNetwork.Mainnet.STETH,
         },
         [tokenDataByNetwork.Mainnet.WETH]: {
           amountInTarget: 0n * PERCENTAGE_FACTOR,
           balance: 0n,
-          token: tokenDataByNetwork.Mainnet.DAI,
+          token: tokenDataByNetwork.Mainnet.WETH,
         },
       },
 
@@ -1681,6 +1681,82 @@ describe("CreditAccount calcQuotaUpdate test", () => {
       },
     });
   });
+  it("should buy quota correctly when all assets listed in both buy and spend", () => {
+    const result = CreditAccountData.calcQuotaUpdate({
+      maxDebt: HUGE_MAX_DEBT,
+      quotaReserve: QUOTA_RESERVE,
+      quotas: cmQuotas,
+      initialQuotas: {
+        ...caQuota,
+        [tokenDataByNetwork.Mainnet.DAI]: {
+          quota: 0n * PERCENTAGE_FACTOR,
+        },
+        [tokenDataByNetwork.Mainnet.STETH]: {
+          quota: 15n * PERCENTAGE_FACTOR,
+        },
+      },
+      assetsAfterUpdate: {
+        [tokenDataByNetwork.Mainnet.STETH]: {
+          amountInTarget: 0n * PERCENTAGE_FACTOR,
+          balance: 0n,
+          token: tokenDataByNetwork.Mainnet.STETH,
+        },
+        [tokenDataByNetwork.Mainnet.DAI]: {
+          amountInTarget: 10n * PERCENTAGE_FACTOR,
+          balance: 0n,
+          token: tokenDataByNetwork.Mainnet.DAI,
+        },
+        [tokenDataByNetwork.Mainnet.WETH]: {
+          amountInTarget: 5n * PERCENTAGE_FACTOR,
+          balance: 0n,
+          token: tokenDataByNetwork.Mainnet.WETH,
+        },
+      },
+
+      allowedToObtain: {
+        [tokenDataByNetwork.Mainnet.STETH]: {},
+        [tokenDataByNetwork.Mainnet.DAI]: {},
+        [tokenDataByNetwork.Mainnet.WETH]: {},
+      },
+      allowedToSpend: {
+        [tokenDataByNetwork.Mainnet.STETH]: {},
+        [tokenDataByNetwork.Mainnet.DAI]: {},
+        [tokenDataByNetwork.Mainnet.WETH]: {},
+      },
+      liquidationThresholds: DEFAULT_LT,
+    });
+
+    expect(result.quotaIncrease).to.be.deep.eq([
+      {
+        balance: 10n * PERCENTAGE_FACTOR,
+        token: tokenDataByNetwork.Mainnet.DAI,
+      },
+    ]);
+    expect(result.quotaDecrease).to.be.deep.eq([
+      {
+        balance: MIN_INT96,
+        token: tokenDataByNetwork.Mainnet.STETH,
+      },
+      {
+        balance: -5n * PERCENTAGE_FACTOR,
+        token: tokenDataByNetwork.Mainnet.WETH,
+      },
+    ]);
+    expect(result.desiredQuota).to.be.deep.eq({
+      [tokenDataByNetwork.Mainnet.DAI]: {
+        balance: 10n * PERCENTAGE_FACTOR,
+        token: tokenDataByNetwork.Mainnet.DAI,
+      },
+      [tokenDataByNetwork.Mainnet.WETH]: {
+        balance: 5n * PERCENTAGE_FACTOR,
+        token: tokenDataByNetwork.Mainnet.WETH,
+      },
+      [tokenDataByNetwork.Mainnet.STETH]: {
+        balance: 0n * PERCENTAGE_FACTOR,
+        token: tokenDataByNetwork.Mainnet.STETH,
+      },
+    });
+  });
 });
 
 describe("CreditAccount calcAvgQuotaBorrowRate test", () => {

src/core/creditAccount.ts

@@ -594,7 +594,7 @@ export class CreditAccountData {
       Record<Address, Asset>
     >((acc, token) => {
       const ch = this.getSingleQuotaChange(token as Address, 0n, props);
-      if (ch) acc[ch.token] = ch;
+      if (ch && ch.balance < 0) acc[ch.token] = ch;
       return acc;
     }, {});
 
@@ -626,7 +626,7 @@ export class CreditAccountData {
         maxQuotaIncrease,
         props,
       );
-      if (ch) acc[ch.token] = ch;
+      if (ch && ch.balance > 0) acc[ch.token] = ch;
       return acc;
     }, {});
 
@@ -704,7 +704,7 @@ export class CreditAccountData {
     const quotaChange =
       unsafeQuotaChange > 0
         ? BigIntMath.min(maxQuotaIncrease, unsafeQuotaChange)
-        : initialQuota !== 0n &&
+        : unsafeQuotaChange < 0 &&
           BigIntMath.abs(unsafeQuotaChange) >= initialQuota
         ? MIN_INT96
         : unsafeQuotaChange;