@gearbox-protocol/sdk 3.0.0-next.17 → 3.0.0-next.170

package/lib/core/creditAccount.spec.js

@@ -36,6 +36,7 @@ const caWithoutLP = {
     rates: {
         [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: {
             rate: 38434,
+            isActive: true,
         },
     },
 };
@@ -63,6 +64,7 @@ const caWithLP = {
     rates: {
         [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase()]: {
             rate: 38434,
+            isActive: true,
         },
     },
 };
@@ -72,38 +74,41 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithoutLP.assets,
             totalValue: caWithoutLP.totalValue,
             debt: caWithoutLP.debt,
-            baseBorrowRate: caWithoutLP.borrowRate,
+            baseRateWithFee: caWithoutLP.borrowRate,
             underlyingToken: caWithoutLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
-        (0, chai_1.expect)(result).to.be.eq(-6.94841);
+        (0, chai_1.expect)(result).to.be.eq(-69484n);
     });
     it("overall APY calculation for caWithLP is correct", () => {
         const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
-        (0, chai_1.expect)(result).to.be.eq(14.4919);
+        (0, chai_1.expect)(result).to.be.eq(144919n);
     });
     it("overall APY is undefined when !lpAPY", () => {
         const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY: undefined,
             prices,
         });
@@ -114,10 +119,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: undefined,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -128,10 +134,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: undefined,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -142,10 +149,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: 0n,
             debt: undefined,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: {},
             quotas: {},
+            feeInterest: 0,
             lpAPY,
             prices,
         });
@@ -156,21 +164,22 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: caWithLP.rates,
             quotas: caWithLP.quotas,
+            feeInterest: 0,
             lpAPY,
             prices,
         });
-        (0, chai_1.expect)(result).to.be.eq(-1.86801);
+        (0, chai_1.expect)(result).to.be.eq(-18680n);
     });
     it("overall APY calculation for caWithLP with insufficient quota is correct", () => {
         const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
-            baseBorrowRate: caWithLP.borrowRate,
+            baseRateWithFee: caWithLP.borrowRate,
             underlyingToken: caWithLP.underlyingToken,
             quotaRates: caWithLP.rates,
             quotas: {
@@ -179,10 +188,11 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase(),
                 },
             },
+            feeInterest: 0,
             lpAPY,
             prices,
         });
-        (0, chai_1.expect)(result).to.be.eq(14.4919);
+        (0, chai_1.expect)(result).to.be.eq(144919n);
     });
 });
 describe("CreditAccount calcMaxIncreaseBorrow test", () => {
@@ -225,29 +235,36 @@ const defaultCA = {
             token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
         },
     },
+    quotasInfo: {
+        [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: {
+            isActive: true,
+        },
+    },
 };
 describe("CreditAccount calcHealthFactor test", () => {
     it("health factor is calculated correctly", () => {
         const result = creditAccount_1.CreditAccountData.calcHealthFactor({
             quotas: {},
+            quotasInfo: {},
             assets: defaultCA.assets,
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(defaultCA.healthFactor);
     });
     it("health factor calculation has no division by zero error", () => {
         const result = creditAccount_1.CreditAccountData.calcHealthFactor({
             quotas: {},
+            quotasInfo: {},
             assets: [],
             prices: {},
             liquidationThresholds: {},
             underlyingToken: "",
-            borrowed: 0n,
+            debt: 0n,
         });
-        (0, chai_1.expect)(result).to.be.eq(0);
+        (0, chai_1.expect)(result).to.be.eq(65535);
     });
     it("health factor after add collateral is calculated  correctly", () => {
         const collateral = {
@@ -257,11 +274,12 @@ describe("CreditAccount calcHealthFactor test", () => {
         const afterAdd = assets_1.AssetUtils.sumAssets(defaultCA.assets, [collateral]);
         const result = creditAccount_1.CreditAccountData.calcHealthFactor({
             quotas: {},
+            quotasInfo: {},
             assets: afterAdd,
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(11188);
     });
@@ -276,11 +294,12 @@ describe("CreditAccount calcHealthFactor test", () => {
         ]);
         const result = creditAccount_1.CreditAccountData.calcHealthFactor({
             quotas: {},
+            quotasInfo: {},
             assets: afterDecrease,
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt - amountDecrease,
+            debt: defaultCA.debt - amountDecrease,
         });
         (0, chai_1.expect)(result).to.be.eq(10308);
     });
@@ -295,11 +314,12 @@ describe("CreditAccount calcHealthFactor test", () => {
         ]);
         const result = creditAccount_1.CreditAccountData.calcHealthFactor({
             quotas: {},
+            quotasInfo: {},
             assets: afterIncrease,
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt + amountIncrease,
+            debt: defaultCA.debt + amountIncrease,
         });
         (0, chai_1.expect)(result).to.be.eq(10137);
     });
@@ -319,22 +339,24 @@ describe("CreditAccount calcHealthFactor test", () => {
         const afterSwap = assets_1.AssetUtils.sumAssets(afterSub, [getAsset]);
         const result = creditAccount_1.CreditAccountData.calcHealthFactor({
             quotas: {},
+            quotasInfo: {},
             assets: afterSwap,
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(9444);
     });
     it("health factor with sufficient quotas is calculated correctly", () => {
         const result = creditAccount_1.CreditAccountData.calcHealthFactor({
             quotas: defaultCA.quotas,
+            quotasInfo: defaultCA.quotasInfo,
             assets: defaultCA.assets,
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(defaultCA.healthFactor);
     });
@@ -346,11 +368,28 @@ describe("CreditAccount calcHealthFactor test", () => {
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
                 },
             },
+            quotasInfo: defaultCA.quotasInfo,
+            assets: defaultCA.assets,
+            prices,
+            liquidationThresholds,
+            underlyingToken: defaultCA.underlyingToken,
+            debt: defaultCA.debt,
+        });
+        (0, chai_1.expect)(result).to.be.eq(9300);
+    });
+    it("health factor with disabled quota is calculated correctly", () => {
+        const result = creditAccount_1.CreditAccountData.calcHealthFactor({
+            quotas: defaultCA.quotas,
+            quotasInfo: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: {
+                    isActive: false,
+                },
+            },
             assets: defaultCA.assets,
             prices,
             liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
+            debt: defaultCA.debt,
         });
         (0, chai_1.expect)(result).to.be.eq(9300);
     });
@@ -371,25 +410,34 @@ const cmQuotas = {
 };
 const caQuota = {
     [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-        quota: 5n,
+        quota: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
     },
     [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-        quota: 10n,
+        quota: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
     },
 };
+const QUOTA_RESERVE = 100n;
+const DEFAULT_LT = {
+    [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: sdk_gov_1.PERCENTAGE_FACTOR,
+    [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: sdk_gov_1.PERCENTAGE_FACTOR,
+    [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: sdk_gov_1.PERCENTAGE_FACTOR,
+};
+const HUGE_MAX_DEBT = 20n * sdk_gov_1.PERCENTAGE_FACTOR;
 describe("CreditAccount calcQuotaUpdate test", () => {
     it("open account should buy quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: {},
             assetsAfterUpdate: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    amountInTarget: 10n,
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    amountInTarget: 20n,
+                    amountInTarget: 20n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
                 },
@@ -399,40 +447,43 @@ describe("CreditAccount calcQuotaUpdate test", () => {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
             },
             allowedToSpend: {},
+            liquidationThresholds: DEFAULT_LT,
         });
         (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
             {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             {
-                balance: 20n,
+                balance: 20n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
         ]);
         (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([]);
         (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                balance: 20n,
+                balance: 20n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         });
     });
     it("add collateral should buy quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
             assetsAfterUpdate: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                    amountInTarget: 10n,
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
                 },
@@ -441,36 +492,39 @@ describe("CreditAccount calcQuotaUpdate test", () => {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {},
             },
             allowedToSpend: {},
+            liquidationThresholds: DEFAULT_LT,
         });
         (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
             {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         ]);
         (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([]);
         (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                balance: 5n,
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         });
     });
     it("add collateral should add additional quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
             assetsAfterUpdate: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    amountInTarget: 10n,
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
                 },
@@ -479,36 +533,39 @@ describe("CreditAccount calcQuotaUpdate test", () => {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {},
             },
             allowedToSpend: {},
+            liquidationThresholds: DEFAULT_LT,
         });
         (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
             {
-                balance: 5n,
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
         ]);
         (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([]);
         (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         });
     });
     it("add collateral shouldn't add additional quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
             assetsAfterUpdate: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    amountInTarget: 10n,
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
                 },
@@ -517,36 +574,39 @@ describe("CreditAccount calcQuotaUpdate test", () => {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
             },
             allowedToSpend: {},
+            liquidationThresholds: DEFAULT_LT,
         });
         (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([]);
         (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([]);
         (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                balance: 5n,
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         });
     });
     it("swap should buy quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
             assetsAfterUpdate: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                    amountInTarget: 10n,
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    amountInTarget: 0n,
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
                 },
@@ -555,43 +615,49 @@ describe("CreditAccount calcQuotaUpdate test", () => {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {},
             },
             allowedToSpend: { [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {} },
+            liquidationThresholds: DEFAULT_LT,
         });
         (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
             {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         ]);
         (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
-            { balance: -10n, token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH },
+            {
+                balance: creditAccount_1.MIN_INT96,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
         ]);
         (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                balance: 5n,
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         });
     });
-    it("swap should add additional quota", () => {
+    it("swap should buy additional quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
             assetsAfterUpdate: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    amountInTarget: 10n,
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    amountInTarget: 0n,
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
                 },
@@ -602,46 +668,49 @@ describe("CreditAccount calcQuotaUpdate test", () => {
             allowedToSpend: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
             },
+            liquidationThresholds: DEFAULT_LT,
         });
         (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
             {
-                balance: 5n,
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
         ]);
         (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
             {
-                balance: -10n,
+                balance: creditAccount_1.MIN_INT96,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
         ]);
         (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         });
     });
-    it("swap shouldn't add additional quota", () => {
+    it("swap shouldn't buy additional quota", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
             assetsAfterUpdate: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    amountInTarget: 10n,
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    amountInTarget: 0n,
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
                 },
@@ -650,67 +719,574 @@ describe("CreditAccount calcQuotaUpdate test", () => {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
             },
             allowedToSpend: { [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {} },
+            liquidationThresholds: DEFAULT_LT,
         });
         (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([]);
         (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
             {
-                balance: -5n,
+                balance: creditAccount_1.MIN_INT96,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
         ]);
         (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         });
     });
     it("shouldn't change quota if disallowed", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
             quotas: cmQuotas,
             initialQuotas: caQuota,
             assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    amountInTarget: 10n,
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
                 },
+            },
+            allowedToObtain: {},
+            allowedToSpend: {},
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("shouldn't change quota if it is disabled", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                    isActive: false,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+                    isActive: false,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+                    isActive: false,
+                },
+            },
+            initialQuotas: caQuota,
+            assetsAfterUpdate: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    amountInTarget: 0n,
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                     balance: 0n,
                     token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
                 },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+                },
             },
-            allowedToObtain: {},
-            allowedToSpend: {},
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {},
+            },
+            allowedToSpend: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
+            },
+            liquidationThresholds: DEFAULT_LT,
         });
         (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([]);
         (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([]);
         (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                balance: 5n,
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                balance: 10n,
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
             },
             [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                balance: 0n,
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap shouldn't buy quota if no lt", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                    quota: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {},
+            },
+            allowedToSpend: { [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {} },
+            liquidationThresholds: {},
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: creditAccount_1.MIN_INT96,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap should buy quota with respect to lt", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: { quota: 5n * sdk_gov_1.PERCENTAGE_FACTOR },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                    amountInTarget: 20n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {},
+            },
+            allowedToSpend: { [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {} },
+            liquidationThresholds: {
+                ...DEFAULT_LT,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: 5000n,
+            },
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
+            {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: -5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap shouldn't buy quota with respect to lt", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: { quota: 5n * sdk_gov_1.PERCENTAGE_FACTOR },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                    amountInTarget: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {},
+            },
+            allowedToSpend: { [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {} },
+            liquidationThresholds: {
+                ...DEFAULT_LT,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: 5000n,
+            },
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: -5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap should buy additional quota after limit was increased", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    quota: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    amountInTarget: 20n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {},
+            },
+            allowedToSpend: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
+            },
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
+            {
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+        ]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: creditAccount_1.MIN_INT96,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 20n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap should buy additional quota with respect to debt limit", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: 9n * sdk_gov_1.PERCENTAGE_FACTOR,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    quota: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    amountInTarget: 20n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {},
+            },
+            allowedToSpend: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
+            },
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
+            {
+                balance: 8n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+        ]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: creditAccount_1.MIN_INT96,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 18n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap shouldn't buy additional quota if debt limit more then current quota", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: 5n * sdk_gov_1.PERCENTAGE_FACTOR,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    quota: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    amountInTarget: 20n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {},
+            },
+            allowedToSpend: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {},
+            },
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: creditAccount_1.MIN_INT96,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap on old accounts should work correctly", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: HUGE_MAX_DEBT,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    quota: 52345n,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    quota: 107458n * sdk_gov_1.PERCENTAGE_FACTOR,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                    amountInTarget: 101345n,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {},
+            },
+            allowedToSpend: { [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {} },
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
+            {
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: creditAccount_1.MIN_INT96,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 52345n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 10n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        });
+    });
+    it("swap on old accounts should work correctly and respect maxQuotaIncrease", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaUpdate({
+            maxDebt: 6n * sdk_gov_1.PERCENTAGE_FACTOR,
+            quotaReserve: QUOTA_RESERVE,
+            quotas: cmQuotas,
+            initialQuotas: {
+                ...caQuota,
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    quota: 52345n,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    quota: 107458n * sdk_gov_1.PERCENTAGE_FACTOR,
+                },
+            },
+            assetsAfterUpdate: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                    amountInTarget: 101345n,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                    amountInTarget: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                    balance: 0n,
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                },
+            },
+            allowedToObtain: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {},
+            },
+            allowedToSpend: { [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {} },
+            liquidationThresholds: DEFAULT_LT,
+        });
+        (0, chai_1.expect)(result.quotaIncrease).to.be.deep.eq([
+            {
+                balance: 7n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.quotaDecrease).to.be.deep.eq([
+            {
+                balance: creditAccount_1.MIN_INT96,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+        ]);
+        (0, chai_1.expect)(result.desiredQuota).to.be.deep.eq({
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                balance: 52345n,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
+                balance: 0n * sdk_gov_1.PERCENTAGE_FACTOR,
+                token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
+            },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
+                balance: 7n * sdk_gov_1.PERCENTAGE_FACTOR,
                 token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
             },
         });
     });
 });
-describe("CreditAccount calcQuotaBorrowRate test", () => {
+describe("CreditAccount calcAvgQuotaBorrowRate test", () => {
     it("should calculate quota rate (same amounts, different rates)", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
             quotas: {
@@ -730,17 +1306,19 @@ describe("CreditAccount calcQuotaBorrowRate test", () => {
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
                     rate: 5,
+                    isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
                     rate: 10,
+                    isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
                     rate: 15,
+                    isActive: true,
                 },
             },
-            borrowAmount: 30n,
         });
-        (0, chai_1.expect)(result).to.be.eq(10);
+        (0, chai_1.expect)(result).to.be.eq(300n);
     });
     it("should calculate quota rate (same rates, different amounts)", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
@@ -761,19 +1339,21 @@ describe("CreditAccount calcQuotaBorrowRate test", () => {
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
                     rate: 10,
+                    isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
                     rate: 10,
+                    isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
                     rate: 10,
+                    isActive: true,
                 },
             },
-            borrowAmount: 30n,
         });
-        (0, chai_1.expect)(result).to.be.eq(10);
+        (0, chai_1.expect)(result).to.be.eq(300n);
     });
-    it("should calculate quota rate (borrow amount)", () => {
+    it("should calculate quota rate (disabled quota)", () => {
         const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
             quotas: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
@@ -792,16 +1372,83 @@ describe("CreditAccount calcQuotaBorrowRate test", () => {
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
                     rate: 10,
+                    isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
                     rate: 10,
+                    isActive: false,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
                     rate: 10,
+                    isActive: true,
+                },
+            },
+        });
+        (0, chai_1.expect)(result).to.be.eq(200n);
+    });
+});
+describe("CreditAccount calcQuotaBorrowRate test", () => {
+    it("should calculate quota borrow rate", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
+            quotas: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                    balance: 10n,
+                },
+            },
+            quotaRates: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    rate: 5,
+                    isActive: true,
                 },
             },
-            borrowAmount: 60n,
         });
-        (0, chai_1.expect)(result).to.be.eq(5);
+        (0, chai_1.expect)(result).to.be.eq(50n);
+    });
+    it("should calculate quota borrow rate when no balance", () => {
+        const result = creditAccount_1.CreditAccountData.calcQuotaBorrowRate({
+            quotas: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
+                    balance: 1n,
+                },
+            },
+            quotaRates: {
+                [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
+                    rate: 5,
+                    isActive: true,
+                },
+            },
+        });
+        (0, chai_1.expect)(result).to.be.eq(5n);
+    });
+});
+describe("CreditAccount calcRelativeBaseBorrowRate test", () => {
+    it("should calculate relative borrow rate", () => {
+        const result = creditAccount_1.CreditAccountData.calcRelativeBaseBorrowRate({
+            debt: 200n,
+            baseRateWithFee: 250,
+            assetAmountInUnderlying: 200n,
+            totalValue: 400n,
+        });
+        (0, chai_1.expect)(result).to.be.eq(25000n);
+    });
+    it("should calculate relative borrow rate if position asset === 0", () => {
+        const result = creditAccount_1.CreditAccountData.calcRelativeBaseBorrowRate({
+            debt: 200n,
+            baseRateWithFee: 250,
+            assetAmountInUnderlying: 1n,
+            totalValue: 400n,
+        });
+        (0, chai_1.expect)(result).to.be.eq(125n);
+    });
+    it("should calculate relative borrow rate if position === 0", () => {
+        const result = creditAccount_1.CreditAccountData.calcRelativeBaseBorrowRate({
+            debt: 1n,
+            baseRateWithFee: 250,
+            assetAmountInUnderlying: 1n,
+            totalValue: 1n,
+        });
+        (0, chai_1.expect)(result).to.be.eq(250n);
     });
 });