feat: borrow rate -> base borrow rate

Gearbox-protocol · Dec 4, 2023 · c799463 · c799463
1 parent 967329b
commit c799463
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 32 deletions.
diff --git a/debts/engine.go b/debts/engine.go
@@ -71,7 +71,7 @@ func (eng *DebtEngine) updateLocalState(blockNum int64, block *schemas.Block) (p
 			BlockNum:             ps.BlockNum,
 			CumulativeIndexRAY:   ps.CumulativeIndexRAY,
 			AvailableLiquidityBI: ps.AvailableLiquidityBI,
-			BorrowAPYBI:          ps.BorrowAPYBI,
+			BaseBorrowAPYBI:      ps.BaseBorrowAPYBI,
 			Timestamp:            block.Timestamp,
 		})
 	}
@@ -265,7 +265,7 @@ func (eng *DebtEngine) GetCumulativeIndexAndDecimalForCMs(blockNum int64, ts uin
 		var cumIndexNormalized *big.Int
 		if poolInterestData != nil {
 			tsDiff := new(big.Int).SetInt64(int64(ts - poolInterestData.Timestamp))
-			newInterest := new(big.Int).Mul(poolInterestData.BorrowAPYBI.Convert(), tsDiff)
+			newInterest := new(big.Int).Mul(poolInterestData.BaseBorrowAPYBI.Convert(), tsDiff)
 			newInterestPerSec := new(big.Int).Quo(newInterest, big.NewInt(3600*365*24))
 			predicate := new(big.Int).Add(newInterestPerSec, utils.GetExpInt(27))
 			cumIndex := new(big.Int).Mul(poolInterestData.CumulativeIndexRAY.Convert(), predicate)

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/Gearbox-protocol/third-eye
 go 1.19
 
 require (
-	github.com/Gearbox-protocol/sdk-go v0.0.0-20231201034421-ac612148cb40
+	github.com/Gearbox-protocol/sdk-go v0.0.0-20231204101247-f288f66e61ff
 	github.com/ethereum/go-ethereum v1.10.17
 	github.com/go-playground/validator/v10 v10.4.1
 	github.com/google/go-cmp v0.5.8
@@ -73,4 +73,4 @@ require (
 
 replace github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
 
-// replace github.com/Gearbox-protocol/sdk-go v0.0.0-20231115094605-e0a52b57f9ff => ../sdk-go
+// replace github.com/Gearbox-protocol/sdk-go v0.0.0-20231204091904-7e5cefe36d05 => ../sdk-go
diff --git a/go.sum b/go.sum
@@ -43,8 +43,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
-github.com/Gearbox-protocol/sdk-go v0.0.0-20231201034421-ac612148cb40 h1:5Vc5waZ50VxpvacepRTxFS0NgBjH3gyuqmB0tToTEms=
-github.com/Gearbox-protocol/sdk-go v0.0.0-20231201034421-ac612148cb40/go.mod h1:GniLx/DU7tCT+QSlKt9REqUaF748X8rbDNR4vAd1m+Y=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20231204101247-f288f66e61ff h1:jhKfVC94ejJVrLEFOEu6BfOiYA744PimXIrEWmItRIY=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20231204101247-f288f66e61ff/go.mod h1:GniLx/DU7tCT+QSlKt9REqUaF748X8rbDNR4vAd1m+Y=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=

diff --git a/jsonnet/account_lifecycle/blocks.jsonnet b/jsonnet/account_lifecycle/blocks.jsonnet
@@ -108,6 +108,7 @@
         sessionId: '#Account_1_3_3',
         totalValue: 6000,
         totalValueBI: '6000000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     daoOperations: [
@@ -201,8 +202,8 @@
         availableLiquidity: 1000,
         availableLiquidityBI: '1000000000',
         blockNum: 3,
-        borrowAPY: 0,
-        borrowAPYBI: '0',
+        baseBorrowAPY: 0,
+        baseBorrowAPYBI: '0',
         cumulativeIndexRAY: '1000000000000000000000000000',
         depositAPY: 0,
         depositAPYBI: '0',
@@ -321,6 +322,7 @@
         sessionId: '#Account_1_3_3',
         totalValue: 8500,
         totalValueBI: '8500000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     daoOperations: [
@@ -427,6 +429,7 @@
         sessionId: '#Account_1_3_3',
         totalValue: 8500,
         totalValueBI: '8500000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     timestamp: 432000,
@@ -511,6 +514,7 @@
         sessionId: '#Account_1_3_3',
         totalValue: 9500,
         totalValueBI: '9500000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     daoOperations: [

diff --git a/jsonnet/account_lifecycle_v2/blocks.jsonnet b/jsonnet/account_lifecycle_v2/blocks.jsonnet
@@ -120,6 +120,7 @@
         sessionId: '#Account_1_4_0',
         totalValue: 6000,
         totalValueBI: '6000000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     poolLedgers: [
@@ -149,8 +150,8 @@
         availableLiquidity: 5000,
         availableLiquidityBI: '5000000000',
         blockNum: 4,
-        borrowAPY: 0,
-        borrowAPYBI: '0',
+        baseBorrowAPY: 0,
+        baseBorrowAPYBI: '0',
         cumulativeIndexRAY: '1000000000000000000000000000',
         depositAPY: 0,
         depositAPYBI: '0',
@@ -291,6 +292,7 @@
         sessionId: '#Account_1_4_0',
         totalValue: 8000,
         totalValueBI: '8000000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     daoOperations: [
@@ -337,8 +339,8 @@
         availableLiquidity: 5500,
         availableLiquidityBI: '5500000000',
         blockNum: 5,
-        borrowAPY: 0,
-        borrowAPYBI: '0',
+        baseBorrowAPY: 0,
+        baseBorrowAPYBI: '0',
         cumulativeIndexRAY: '1000000000000000000000000000',
         depositAPY: 0,
         depositAPYBI: '0',
@@ -498,6 +500,7 @@
         sessionId: '#Account_1_4_0',
         totalValue: 8000,
         totalValueBI: '8000000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     timestamp: 518400,
@@ -582,6 +585,7 @@
         sessionId: '#Account_1_4_0',
         totalValue: 9000,
         totalValueBI: '9000000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     daoOperations: [

diff --git a/jsonnet/close_credit_account/blocks.jsonnet b/jsonnet/close_credit_account/blocks.jsonnet
@@ -37,6 +37,7 @@
         sessionId: '#Account_1_3_3',
         totalValue: 9500,
         totalValueBI: '9500000000',
+        extraQuotaRAYBI: '0',
         quotaFees: '0',
       },
     ],
@@ -110,8 +111,8 @@
         availableLiquidity: 1000,
         availableLiquidityBI: '1000000000',
         blockNum: 8,
-        borrowAPY: 0,
-        borrowAPYBI: '0',
+        baseBorrowAPY: 0,
+        baseBorrowAPYBI: '0',
         cumulativeIndexRAY: '1000000000000000000000000000',
         depositAPY: 0,
         depositAPYBI: '0',

diff --git a/jsonnet/close_credit_account_v2/blocks.jsonnet b/jsonnet/close_credit_account_v2/blocks.jsonnet
@@ -37,6 +37,7 @@
         sessionId: '#Account_1_4_0',
         totalValue: 9000,
         totalValueBI: '9000000000',
+        extraQuotaRAYBI: '0',
         quotaFees: '0',
       },
     ],
@@ -144,8 +145,8 @@
         availableLiquidity: 10000,
         availableLiquidityBI: '10000000000',
         blockNum: 9,
-        borrowAPY: 0,
-        borrowAPYBI: '0',
+        baseBorrowAPY: 0,
+        baseBorrowAPYBI: '0',
         cumulativeIndexRAY: '1000000000000000000000000000',
         depositAPY: 0,
         depositAPYBI: '0',

diff --git a/jsonnet/liquidate_credit_account/blocks.jsonnet b/jsonnet/liquidate_credit_account/blocks.jsonnet
@@ -37,6 +37,7 @@
         sessionId: '#Account_1_3_3',
         totalValue: 5750,
         totalValueBI: '5750000000',
+        extraQuotaRAYBI: '0',
         quotaFees: '0',
       },
     ],
@@ -121,8 +122,8 @@
         availableLiquidity: 6000,
         availableLiquidityBI: '6000000000',
         blockNum: 8,
-        borrowAPY: 0,
-        borrowAPYBI: '0',
+        baseBorrowAPY: 0,
+        baseBorrowAPYBI: '0',
         cumulativeIndexRAY: '1000000000000000000000000000',
         depositAPY: 0,
         depositAPYBI: '0',

diff --git a/jsonnet/multiple_facade_interaction_single_tx/blocks.jsonnet b/jsonnet/multiple_facade_interaction_single_tx/blocks.jsonnet
@@ -134,6 +134,7 @@
         sessionId: '#Account_1_4_0',
         totalValue: 6000,
         totalValueBI: '6000000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     poolLedgers: [
@@ -153,8 +154,8 @@
         availableLiquidity: 5000,
         availableLiquidityBI: '5000000000',
         blockNum: 4,
-        borrowAPY: 0,
-        borrowAPYBI: '0',
+        baseBorrowAPY: 0,
+        baseBorrowAPYBI: '0',
         cumulativeIndexRAY: '1000000000000000000000000000',
         depositAPY: 0,
         depositAPYBI: '0',
@@ -198,6 +199,7 @@
         sessionId: '#Account_1_4_0',
         totalValue: 7000,
         totalValueBI: '7000000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     timestamp: 432000,
@@ -372,6 +374,7 @@
         sessionId: '#Account_2_6_4',
         totalValue: 6000,
         totalValueBI: '6000000000',
+        extraQuotaRAYBI: '0',
       },
     ],
     poolLedgers: [
@@ -401,8 +404,8 @@
         availableLiquidity: 5000,
         availableLiquidityBI: '5000000000',
         blockNum: 6,
-        borrowAPY: 0,
-        borrowAPYBI: '0',
+        baseBorrowAPY: 0,
+        baseBorrowAPYBI: '0',
         cumulativeIndexRAY: '1000000000000000000000000000',
         depositAPY: 0,
         depositAPYBI: '0',

diff --git a/jsonnet/open_credit_account/blocks.jsonnet b/jsonnet/open_credit_account/blocks.jsonnet
@@ -86,6 +86,7 @@
       sessionId: '#Account_1_3_0',
       totalValue: 5000,
       totalValueBI: '5000000000',
+      extraQuotaRAYBI: '0',
     },
   ],
   daoOperations: [
@@ -169,8 +170,8 @@
       availableLiquidity: 1000,
       availableLiquidityBI: '1000000000',
       blockNum: 3,
-      borrowAPY: 0,
-      borrowAPYBI: '0',
+      baseBorrowAPY: 0,
+      baseBorrowAPYBI: '0',
       cumulativeIndexRAY: '1000000000000000000000000000',
       depositAPY: 0,
       depositAPYBI: '0',

diff --git a/jsonnet/repay_credit_account/blocks.jsonnet b/jsonnet/repay_credit_account/blocks.jsonnet
@@ -62,8 +62,8 @@
       availableLiquidity: 6000,
       availableLiquidityBI: '6000000000',
       blockNum: 7,
-      borrowAPY: 0,
-      borrowAPYBI: '0',
+      baseBorrowAPY: 0,
+      baseBorrowAPYBI: '0',
       cumulativeIndexRAY: '1000000000000000000000000000',
       depositAPY: 0,
       depositAPYBI: '0',

diff --git a/migrations/000033_base_borrow_rate.up.sql b/migrations/000033_base_borrow_rate.up.sql
@@ -0,0 +1,11 @@
+alter table pool_stats add base_borrow_apy double precision, add base_borrow_apy_bi varchar(80);
+update pool_stats set base_borrow_apy=borrow_apy, base_borrow_apy_bi=borrow_apy_bi;
+alter table pool_stats drop column borrow_apy , drop column borrow_apy_bi;
+
+--
+alter table pools add base_borrow_apy_bi double precision;
+update pools set base_borrow_apy_bi=borrow_apy_bi;
+alter table pools drop column borrow_apy_bi;
+
+--
+alter table credit_session_snapshots add extra_quota_ray_bi varchar(80);
diff --git a/models/credit_manager/cm_common/credit_session_state.go b/models/credit_manager/cm_common/credit_session_state.go
@@ -191,6 +191,7 @@ func (mdl *CommonCMAdapter) createCSSnapshot(blockNum int64, session *schemas.Cr
 	//
 	// set balances
 	css.Balances = mdl.addFloatValue(session.Account, blockNum, data.Balances)
+	css.ExtraQuotaRAYBI = (*core.BigInt)(schemas.QuotaBorrowRate(*css.Balances, css.TotalValueBI))
 	// for close credit account operation on gearbox v2
 	// https://github.com/Gearbox-protocol/contracts-v2/blob/main/contracts/credit/CreditFacade.sol#L235
 	// there is a skipTokenMask which can be used to skip certain tokens from getting transferred to borrower

diff --git a/models/pool/pool_v2/operation.go b/models/pool/pool_v2/operation.go
@@ -72,7 +72,7 @@ func (p *Poolv2) createSnapshot(blockNum int64, state dc.PoolCallData) {
 	token := p.Repo.GetToken(p.State.UnderlyingToken)
 	p.State.IsWETH = dc.IsWETH(p.Client, state.Underlying)
 	// TODO: change borrow apy
-	p.State.BorrowAPYBI = (*core.BigInt)(state.BaseInterestRate)
+	p.State.BaseBorrowAPYBI = (*core.BigInt)(state.BaseInterestRate)
 	p.State.DepositAPYBI = (*core.BigInt)(state.SupplyRate)
 	p.Repo.AddPoolStat(&schemas.PoolStat{
 		BlockNum:        blockNum,
@@ -92,9 +92,9 @@ func (p *Poolv2) createSnapshot(blockNum int64, state dc.PoolCallData) {
 		// for 4% is depositAPY is 4 that is why apy is divided by decimal 25 not 27
 		DepositAPY: utils.GetFloat64Decimal(state.SupplyRate, 25),
 
-		BorrowAPYBI: (*core.BigInt)(state.BaseInterestRate),
+		BaseBorrowAPYBI: (*core.BigInt)(state.BaseInterestRate),
 		// TODO change to base borrow rate
-		BorrowAPY: utils.GetFloat64Decimal(state.BaseInterestRate, 25),
+		BaseBorrowAPY: utils.GetFloat64Decimal(state.BaseInterestRate, 25),
 
 		// dieselrate is how much each diesel rate is worth in terms of underlying token
 		// that's why it is divide by 27 not 25. it is not a percentage.

diff --git a/models/pool/pool_v3/state_snapshot_and_gateway_fix.go b/models/pool/pool_v3/state_snapshot_and_gateway_fix.go
@@ -64,7 +64,7 @@ func (mdl *Poolv3) onBlockChangeInternally(inputB int64) {
 func (p *Poolv3) createSnapshot(blockNum int64, state dc.PoolCallData) {
 	token := p.Repo.GetToken(p.State.UnderlyingToken)
 	p.State.IsWETH = dc.IsWETH(p.Client, state.Underlying)
-	p.State.BorrowAPYBI = (*core.BigInt)(state.BaseInterestRate)
+	p.State.BaseBorrowAPYBI = (*core.BigInt)(state.BaseInterestRate)
 	p.State.DepositAPYBI = (*core.BigInt)(state.SupplyRate)
 	p.Repo.AddPoolStat(&schemas.PoolStat{
 		BlockNum:        blockNum,
@@ -84,8 +84,8 @@ func (p *Poolv3) createSnapshot(blockNum int64, state dc.PoolCallData) {
 		// for 4% is depositAPY is 4 that is why apy is divided by decimal 25 not 27
 		DepositAPY: utils.GetFloat64Decimal(state.SupplyRate, 25),
 
-		BorrowAPYBI: (*core.BigInt)(state.BaseInterestRate),
-		BorrowAPY:   utils.GetFloat64Decimal(state.BaseInterestRate, 25),
+		BaseBorrowAPYBI: (*core.BigInt)(state.BaseInterestRate),
+		BaseBorrowAPY:   utils.GetFloat64Decimal(state.BaseInterestRate, 25),
 
 		// dieselrate is how much each diesel rate is worth in terms of underlying token
 		// that's why it is divide by 27 not 25. it is not a percentage.