refactor: pnlOnRepay logic

Author: harsh-98

ds/repo.go

@@ -79,8 +79,7 @@ type RepositoryI interface {
 	AddCreditManagerStats(cms *schemas.CreditManagerStat)
 	GetCMState(cmAddr string) *schemas.CreditManagerState
 	GetUnderlyingDecimal(cmAddr string) int8
-	AddRepayOnCM(blockNum int64, cm string, pnl schemas.PnlOnRepay)
-	GetRepayOnCM(blockNum int64, cm string) *schemas.PnlOnRepay
+	AddRepayOnCM(cm string, pnl schemas.PnlOnRepay)
 	AddParameters(logID uint, txHash string, params *schemas.Parameters, token string)
 	AddFastCheckParams(logID uint, txHash, cm, creditFilter string, fcParams *schemas.FastCheckParams)
 	AfterSync(blockNum int64)

go.mod

@@ -3,7 +3,7 @@ module github.com/Gearbox-protocol/third-eye
 go 1.17
 
 require (
-	github.com/Gearbox-protocol/sdk-go v0.0.0-20220709200223-50668e53dcce
+	github.com/Gearbox-protocol/sdk-go v0.0.0-20220710120008-e282780fcdb2
 	github.com/ethereum/go-ethereum v1.10.17
 	github.com/go-playground/validator/v10 v10.4.1
 	github.com/heroku/x v0.0.42
@@ -59,4 +59,4 @@ require (
 	sigs.k8s.io/yaml v1.1.0 // indirect
 )
 
-// replace github.com/Gearbox-protocol/sdk-go v0.0.0-20220709094715-f5ee0223e270 => ../sdk-go
+// replace github.com/Gearbox-protocol/sdk-go v0.0.0-20220709200223-50668e53dcce => ../sdk-go

go.sum

@@ -34,6 +34,8 @@ github.com/Gearbox-protocol/sdk-go v0.0.0-20220709094715-f5ee0223e270 h1:ZjCKV8A
 github.com/Gearbox-protocol/sdk-go v0.0.0-20220709094715-f5ee0223e270/go.mod h1:2jMzjWk66SUUXF5WG4SzMzfZ961B1nmKLJKeiIUCuXg=
 github.com/Gearbox-protocol/sdk-go v0.0.0-20220709200223-50668e53dcce h1:/dV+sNiPa7cNzRBW5OXxFPItE3ZsTcsARPwC94OsvcU=
 github.com/Gearbox-protocol/sdk-go v0.0.0-20220709200223-50668e53dcce/go.mod h1:2jMzjWk66SUUXF5WG4SzMzfZ961B1nmKLJKeiIUCuXg=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20220710120008-e282780fcdb2 h1:7i4W1cmbIIZ0gujIHRP4qNE0sP/NZfdK8/6GWDrz4d0=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20220710120008-e282780fcdb2/go.mod h1:2jMzjWk66SUUXF5WG4SzMzfZ961B1nmKLJKeiIUCuXg=
 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=

jsonnet/close_credit_account_v2/blocks.jsonnet

@@ -128,7 +128,7 @@
         amount: 4500,
         blockNum: 9,
         event: 'Repay',
-        logId: 0,
+        logId: 3,
         pool: '#Pool_1',
         sessionId: '#Account_1_4_0',
         txHash: '#Hash_12',

models/credit_manager/model.go

@@ -36,6 +36,7 @@ type CreditManager struct {
 	LastTxHash       string
 	executeParams    []ds.ExecuteParams
 	State            *schemas.CreditManagerState
+	pnlOnCM          *PnlCM
 	lastEventBlock   int64
 	UpdatedSessions  map[string]int
 	ClosedSessions   map[string]*SessionCloseDetails
@@ -80,6 +81,7 @@ func NewCreditManagerFromAdapter(adapter *ds.SyncAdapter) *CreditManager {
 		UpdatedSessions: make(map[string]int),
 		ClosedSessions:  make(map[string]*SessionCloseDetails),
 		multicall:       MultiCallProcessor{},
+		pnlOnCM:         NewPnlCM(),
 	}
 	obj.GetAbi()
 	switch obj.GetVersion() {

models/credit_manager/pnl_cm.go

@@ -0,0 +1,35 @@
+package credit_manager
+
+import (
+	"math/big"
+
+	"github.com/Gearbox-protocol/sdk-go/core/schemas"
+	"github.com/Gearbox-protocol/sdk-go/log"
+)
+
+type PnlCM struct {
+	curPnl map[int64]*schemas.PnlOnRepay
+}
+
+func NewPnlCM() *PnlCM {
+	return &PnlCM{curPnl: map[int64]*schemas.PnlOnRepay{}}
+}
+func (mdl *PnlCM) Get(blockNum int64) *schemas.PnlOnRepay {
+	pnlOnRepay := mdl.curPnl[blockNum]
+	delete(mdl.curPnl, blockNum)
+	return pnlOnRepay
+}
+
+func (mdl *PnlCM) Set(pnl *schemas.PnlOnRepay) {
+	oldPnl := mdl.curPnl[pnl.BlockNum]
+	if oldPnl != nil {
+		if oldPnl.BlockNum != pnl.BlockNum {
+			log.Fatalf("Pool repay event has different oldPnl:%v pnl:%v for same block",
+				oldPnl, pnl)
+		}
+		pnl.Profit = new(big.Int).Add(oldPnl.Profit, pnl.Profit)
+		pnl.Loss = new(big.Int).Add(oldPnl.Loss, pnl.Loss)
+		pnl.BorrowedAmount = new(big.Int).Add(oldPnl.BorrowedAmount, pnl.BorrowedAmount)
+	}
+	mdl.curPnl[pnl.BlockNum] = pnl
+}

models/credit_manager/state.go

@@ -21,6 +21,9 @@ func (mdl *CreditManager) SetUnderlyingState(obj interface{}) {
 	case (map[string]string):
 		sessions := obj.(map[string]string)
 		mdl.State.Sessions = sessions
+	case *schemas.PnlOnRepay:
+		pnl := obj.(*schemas.PnlOnRepay)
+		mdl.pnlOnCM.Set(pnl)
 	default:
 		log.Fatal("Type assertion for credit manager state failed")
 	}
@@ -67,13 +70,13 @@ func (mdl *CreditManager) calculateCMStat(blockNum int64) {
 	}
 	mdl.State.IsWETH = state.IsWETH
 	// pnl on repay
-	pnlOnRepay := mdl.Repo.GetRepayOnCM(blockNum, mdl.GetAddress())
-	if pnlOnRepay != nil {
-		mdl.State.TotalBorrowedBI = core.SubCoreAndInt(mdl.State.TotalBorrowedBI, pnlOnRepay.BorrowedAmount)
+	pnl := mdl.pnlOnCM.Get(blockNum)
+	if pnl != nil {
+		mdl.State.TotalBorrowedBI = core.SubCoreAndInt(mdl.State.TotalBorrowedBI, pnl.BorrowedAmount)
 		mdl.State.TotalBorrowed = utils.GetFloat64Decimal(mdl.State.TotalBorrowedBI.Convert(), mdl.GetUnderlyingDecimal())
-		mdl.State.TotalLossesBI = core.AddCoreAndInt(mdl.State.TotalLossesBI, pnlOnRepay.Loss)
+		mdl.State.TotalLossesBI = core.AddCoreAndInt(mdl.State.TotalLossesBI, pnl.Loss)
 		mdl.State.TotalLosses = utils.GetFloat64Decimal(mdl.State.TotalLossesBI.Convert(), mdl.GetUnderlyingDecimal())
-		mdl.State.TotalProfitBI = core.AddCoreAndInt(mdl.State.TotalProfitBI, pnlOnRepay.Profit)
+		mdl.State.TotalProfitBI = core.AddCoreAndInt(mdl.State.TotalProfitBI, pnl.Profit)
 		mdl.State.TotalProfit = utils.GetFloat64Decimal(mdl.State.TotalProfitBI.Convert(), mdl.GetUnderlyingDecimal())
 	}
 	mdl.State.MinAmount = (*core.BigInt)(state.MinAmount)

models/pool/on_log.go

@@ -1,12 +1,13 @@
 package pool
 
 import (
+	"math/big"
+
 	"github.com/Gearbox-protocol/sdk-go/core"
 	"github.com/Gearbox-protocol/sdk-go/core/schemas"
 	"github.com/Gearbox-protocol/sdk-go/log"
 	"github.com/Gearbox-protocol/sdk-go/utils"
 	"github.com/ethereum/go-ethereum/core/types"
-	"math/big"
 )
 
 func (mdl *Pool) createPoolStat() {
@@ -63,7 +64,8 @@ func (mdl *Pool) OnLog(txLog types.Log) {
 		if err != nil {
 			log.Fatal("[PoolServiceModel]: Cant unpack RemoveLiquidity event", err)
 		}
-		mdl.Repo.AddRepayOnCM(blockNum, repayEvent.CreditManager.Hex(), schemas.PnlOnRepay{
+		mdl.Repo.AddRepayOnCM(repayEvent.CreditManager.Hex(), schemas.PnlOnRepay{
+			BlockNum:       blockNum,
 			BorrowedAmount: repayEvent.BorrowedAmount,
 			Profit:         repayEvent.Profit,
 			Loss:           repayEvent.Loss,

repository/credit_manager.go

@@ -74,3 +74,8 @@ func (repo *Repository) AddAccountTokenTransfer(tt *schemas.TokenTransfer) {
 	repo.SetBlock(tt.BlockNum)
 	repo.accountManager.AddTokenTransfer(tt)
 }
+
+func (repo *Repository) AddRepayOnCM(cmAddr string, pnlOnRepay schemas.PnlOnRepay) {
+	adapter := repo.GetAdapter(cmAddr)
+	adapter.SetUnderlyingState(&pnlOnRepay)
+}

repository/handlers/blocks.go

@@ -157,10 +157,6 @@ func (repo *BlocksRepo) AddCreditManagerStats(cms *schemas.CreditManagerStat) {
 	repo.SetAndGetBlock(cms.BlockNum).AddCreditManagerStats(cms)
 }
 
-func (repo *BlocksRepo) AddRepayOnCM(blockNum int64, cmAddr string, pnlOnRepay schemas.PnlOnRepay) {
-	repo.SetAndGetBlock(blockNum).AddRepayOnCM(cmAddr, &pnlOnRepay)
-}
-
 func (repo *BlocksRepo) AddPriceFeed(pf *schemas.PriceFeed) {
 	repo.SetAndGetBlock(pf.BlockNumber).AddPriceFeed(pf)
 }
@@ -176,10 +172,3 @@ func (repo *BlocksRepo) AddPoolStat(ps *schemas.PoolStat) {
 func (repo *BlocksRepo) TransferAccountAllowed(obj *schemas.TransferAccountAllowed) {
 	repo.SetAndGetBlock(obj.BlockNumber).AddTransferAccountAllowed(obj)
 }
-
-// getter
-func (repo *BlocksRepo) GetRepayOnCM(blockNum int64, cmAddr string) *schemas.PnlOnRepay {
-	repo.mu.Lock()
-	defer repo.mu.Unlock()
-	return repo.blocks[blockNum].GetRepayOnCM(cmAddr)
-}