feat: add pool quota changes

Gearbox-protocol · Aug 21, 2023 · 4d1a588 · 4d1a588
1 parent 99e156f
commit 4d1a588
Show file tree

Hide file tree

Showing 15 changed files with 9,879 additions and 22 deletions.
diff --git a/artifacts/creditConfiguratorv3/creditConfiguratorv3.go b/artifacts/creditConfiguratorv3/creditConfiguratorv3.go
diff --git a/artifacts/poolQuotaKeeperv3/poolQuotaKeeper.go b/artifacts/poolQuotaKeeperv3/poolQuotaKeeper.go
diff --git a/artifacts/poolv3/poolv3.go b/artifacts/poolv3/poolv3.go
diff --git a/calc/account_fields.go b/calc/account_fields.go
@@ -11,7 +11,7 @@ import (
 type TokenDetailsForCalcI interface {
 	GetToken(token string) *schemas.Token
 	GetPrices(underlyingToken string, version core.VersionType, blockNums ...int64) *big.Int
-	GetLiqThreshold(cm, token string) *big.Int
+	GetLiqThreshold(ts int64, cm, token string) *big.Int
 }
 
 type AccountForCalcI interface {
@@ -25,7 +25,7 @@ type Calculator struct {
 	Store TokenDetailsForCalcI
 }
 
-func (c Calculator) CalcAccountFields(version core.VersionType, blockNum int64,
+func (c Calculator) CalcAccountFields(ts int64, version core.VersionType, blockNum int64,
 	account AccountForCalcI, curCumIndex *big.Int, underlyingToken string, feeInterest uint16,
 ) (calHF, calBorrowWithInterestAndFees, calTotalValue, calThresholdValue, calBorrowWithInterest *big.Int) {
 
@@ -36,7 +36,7 @@ func (c Calculator) CalcAccountFields(version core.VersionType, blockNum int64,
 		if balance.IsEnabled && balance.HasBalanceMoreThanOne() {
 			//
 			tokenValueInUSD := c.convertToUSD(balance.BI.Convert(), token, version, blockNum)
-			tokenThresholdValueInUSD := new(big.Int).Mul(tokenValueInUSD, c.Store.GetLiqThreshold(account.GetCM(), token))
+			tokenThresholdValueInUSD := new(big.Int).Mul(tokenValueInUSD, c.Store.GetLiqThreshold(ts, account.GetCM(), token))
 			//
 			calThresholdValueInUSD = new(big.Int).Add(calThresholdValueInUSD, tokenThresholdValueInUSD)
 			calTotalValueInUSD = new(big.Int).Add(calTotalValueInUSD, tokenValueInUSD)

diff --git a/calc/account_fields_test.go b/calc/account_fields_test.go
@@ -46,7 +46,7 @@ func (s store) GetPrices(token string, version core.VersionType, blockNums ...in
 func (s store) GetToken(token string) *schemas.Token {
 	return s.Tokens[token]
 }
-func (s store) GetLiqThreshold(cm, token string) *big.Int {
+func (s store) GetLiqThreshold(_ int64, cm, token string) *big.Int {
 	return s.LiqThresholds[cm][token]
 }
 
@@ -70,6 +70,7 @@ func TestCalcFields(t *testing.T) {
 	// //
 
 	calHF, calDebt, calTotalValue, calThresholdValue, _ := Calculator{Store: input.store}.CalcAccountFields(
+		0,
 		input.Version,
 		0,
 		input.Account,
@@ -100,6 +101,7 @@ func TestCalcFieldsWithFeeInterest(t *testing.T) {
 	// //
 
 	calHF, calDebt, calTotalValue, calThresholdValue, _ := Calculator{Store: input.store}.CalcAccountFields(
+		0,
 		input.Version,
 		0,
 		input.Account,

diff --git a/calc/close_amount.go b/calc/close_amount.go
@@ -11,7 +11,7 @@ import (
 func CalCloseAmount(params *schemas.Parameters, version core.VersionType, totalValue *big.Int, closureStatus int, borrowedAmountWithInterest, borrowedAmount *big.Int) (amountToPool, remainingFunds, profit, loss *big.Int) {
 	if version.IsGBv1() {
 		return calCloseAmountV1(params, totalValue, schemas.IsStatusLiquidated(closureStatus), borrowedAmountWithInterest, borrowedAmount)
-	} else if version.IsGBv2orAbove() {
+	} else if version.IsGBv2() {
 		amountToPool, remainingFunds, profit, loss = calCloseAmountV2(params, totalValue, closureStatus, borrowedAmountWithInterest, borrowedAmount)
 	}
 	return