Skip to content

Commit 771627a

Browse files
committed
fix: lmrewards add pool with blocknumber
1 parent c83a4c4 commit 771627a

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

debts/engine.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,19 +246,19 @@ func (eng *DebtEngine) createTvlSnapshots(blockNum int64, marketToTvl MarketToTv
246246
//
247247
underlyingToken := state.(*schemas.PoolState).UnderlyingToken
248248
//
249-
latestOracle, version, err := eng.repo.GetActivePriceOracleByBlockNum(blockNum)
250-
log.CheckFatal(err)
249+
// latestOracle, version, err := eng.repo.GetActivePriceOracleByBlockNum(blockNum)
250+
// log.CheckFatal(err)
251251
//
252252
fn := func(amount *core.BigInt) float64 {
253253
if amount.String() == "0" {
254254
return 0
255255
}
256256
return utils.GetFloat64Decimal(
257257
eng.GetPriceForTvl(
258-
latestOracle,
258+
schemas.PriceOracleT(""),
259259
state.(*schemas.PoolState).PriceOracle,
260260
underlyingToken,
261-
amount.Convert(), version), 8)
261+
amount.Convert(), state.(*schemas.PoolState).Version), 8)
262262
}
263263
availLiq := fn(entry.AvailableLiquidityBI)
264264
expectedLiqInUSD := fn(entry.ExpectedLiqBI)
@@ -546,7 +546,7 @@ func (eng *DebtEngine) CalculateSessionDebt(blockNum int64, session *schemas.Cre
546546
}
547547

548548
// helper methods
549-
func (eng *DebtEngine) GetPriceForTvl(_po schemas.PriceOracleT, poolPriceOracleT schemas.PriceOracleT, tokenAddr string, amount *big.Int, version core.VersionType) *big.Int {
549+
func (eng *DebtEngine) GetPriceForTvl(_ schemas.PriceOracleT, poolPriceOracleT schemas.PriceOracleT, tokenAddr string, amount *big.Int, version core.VersionType) *big.Int {
550550
priceOracle := poolPriceOracleT
551551
tokenPrice := eng.priceHandler.GetTokenLastPF(priceOracle, tokenAddr, version)
552552
tokenDecimals := eng.repo.GetToken(tokenAddr).Decimals

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23
55
// toolchain go1.23.2
66

77
require (
8-
github.com/Gearbox-protocol/sdk-go v0.0.0-20251015045219-c81f0f13b7a8
8+
github.com/Gearbox-protocol/sdk-go v0.0.0-20251015055252-92dd2d7b6903
99
github.com/ethereum/go-ethereum v1.13.14
1010
github.com/go-playground/validator/v10 v10.4.1
1111
github.com/google/go-cmp v0.6.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
66
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
77
github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
88
github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
9-
github.com/Gearbox-protocol/sdk-go v0.0.0-20251015045219-c81f0f13b7a8 h1:1ZLK0TzLxLPpYCNeuaWCZrG09AkbMDYumpmv7G2oI9g=
10-
github.com/Gearbox-protocol/sdk-go v0.0.0-20251015045219-c81f0f13b7a8/go.mod h1:MZsiiSAwDdnHY6GEILYtHEqhb9wmbUUE34UBQgNlUyM=
9+
github.com/Gearbox-protocol/sdk-go v0.0.0-20251015055252-92dd2d7b6903 h1:TO4Acste+rQEX0Nynfr6RVxNqwWjlpGM7aoV1bcDrxc=
10+
github.com/Gearbox-protocol/sdk-go v0.0.0-20251015055252-92dd2d7b6903/go.mod h1:MZsiiSAwDdnHY6GEILYtHEqhb9wmbUUE34UBQgNlUyM=
1111
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
1212
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
1313
github.com/OffchainLabs/go-ethereum v1.13.4-0.20240313010929-e5d8587e7227 h1:+/3TrD+q+BP36jGj2Bycdmrc/joKLNbc5ImePQzKRLM=

models/credit_manager/cm_common/direct_transfer.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ func (mdl *CommonCMAdapter) processDirectTransfersOnBlock(blockNum int64, sessio
5454
txsList := schemas.TokenTransferList(txs)
5555
sort.Sort(txsList)
5656
for _, tx := range txsList {
57+
if tx.Token == "0x9D65fF81a3c488d585bBfb0Bfe3c7707c7917f54" {
58+
continue
59+
}
5760
if session.Account == tx.From {
5861
// USDT in transferFrom emits event even if the amount is zero
5962
if tx.Amount.Convert().Cmp(big.NewInt(0)) == 0 {

models/pool_lmrewards/v3/state.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ func (mdl *LMRewardsv3) getFarmsAndPoolsv3(blockNum int64) {
2020
pools := mdl.Repo.GetDCWrapper().GetZapperInfo(blockNum)
2121
mdl.SetFarm(pools)
2222
for _, pool := range mdl.Repo.GetAdapterAddressByName(ds.Pool) {
23-
mdl.setPoolSyncedTill(common.HexToAddress(pool))
23+
discoveredAt := mdl.Repo.GetAdapter(pool).GetDiscoveredAt()
24+
mdl.setPoolSyncedTill(common.HexToAddress(pool), discoveredAt)
2425
mdl.LastSync = utils.Min(mdl.LastSync, mdl.poolsToSyncedTill[common.HexToAddress(pool)])
2526
}
2627
}
@@ -78,13 +79,13 @@ func (mdl *LMRewardsv3) SetFarm(pools []dc_wrapper.PoolZapperInfo) {
7879
}
7980

8081
// from contractRegister, Is that opposed to saying "Tell will be sad to discover that"?
81-
func (mdl *LMRewardsv3) AddPoolv3(blockNum int64, pool string) {
82-
data := mdl.Repo.GetDCWrapper().GetZapperInfo(blockNum, common.HexToAddress(pool))
82+
// so use that blocknumber
83+
func (mdl *LMRewardsv3) AddPoolv3(discoveredAt int64, pool string) {
84+
data := mdl.Repo.GetDCWrapper().GetZapperInfo(discoveredAt, common.HexToAddress(pool))
8385
mdl.SetFarm(data)
84-
mdl.setPoolSyncedTill(common.HexToAddress(pool))
86+
mdl.setPoolSyncedTill(common.HexToAddress(pool), discoveredAt)
8587
}
86-
func (mdl *LMRewardsv3) setPoolSyncedTill(pool common.Address) {
87-
discoveredAt := mdl.Repo.GetAdapter(pool.Hex()).GetDiscoveredAt()
88+
func (mdl *LMRewardsv3) setPoolSyncedTill(pool common.Address, discoveredAt int64) {
8889
if mdl.poolsToSyncedTill[pool] < discoveredAt {
8990
mdl.poolsToSyncedTill[pool] = discoveredAt
9091
}

0 commit comments

Comments
 (0)