Skip to content

Commit 4373d5e

Browse files
committed
feat: gear for mainnet
1 parent 775d516 commit 4373d5e

File tree

6 files changed

+34
-9
lines changed

6 files changed

+34
-9
lines changed

debts/engine.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ func (eng *DebtEngine) CalculateDebt() {
153153
}
154154
// #C3
155155
sessionSnapshot := eng.lastCSS[session.ID]
156+
if sessionSnapshot == nil {
157+
if session.ID != "0x430789365519A006B110727C1c95032475e26Dbf_21786407_69" {
158+
log.Warnf("Session(%s) not found in last css", session.ID, blockNum)
159+
}
160+
continue
161+
}
156162
caValue := utils.GetFloat64Decimal(
157163
eng.GetAmountInUSD(
158164
session.CreditManager,
@@ -191,6 +197,9 @@ func (eng *DebtEngine) CalculateDebt() {
191197
if (session.ClosedAt != 0 && session.ClosedAt <= blockNum) || session.Since > blockNum {
192198
continue
193199
}
200+
if eng.lastCSS[sessionId] == nil {
201+
continue
202+
}
194203
cmAddr := session.CreditManager
195204
// pool cum index is when the pool is not registered
196205
if cmToPoolDetails[cmAddr] != nil {

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-20250515050146-74e6c8e5dfad
8+
github.com/Gearbox-protocol/sdk-go v0.0.0-20250517181031-ee1eaae730e0
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-20250515050146-74e6c8e5dfad h1:wRcGkN6RVzmxWD8lew22b4mjsddrWCCpmGGsy0xDZKQ=
10-
github.com/Gearbox-protocol/sdk-go v0.0.0-20250515050146-74e6c8e5dfad/go.mod h1:MZsiiSAwDdnHY6GEILYtHEqhb9wmbUUE34UBQgNlUyM=
9+
github.com/Gearbox-protocol/sdk-go v0.0.0-20250517181031-ee1eaae730e0 h1:6jcCjdLuwxgv4MQDu1Dg2TvuFuEiophpR3g/h8zCnQ4=
10+
github.com/Gearbox-protocol/sdk-go v0.0.0-20250517181031-ee1eaae730e0/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/aggregated_block_feed/composite_redstone_price_feed/model.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ func (mdl *CompositeRedStonePriceFeed) ProcessResult(blockNum int64, results []m
105105
// log.Info(mdl.Repo.SetAndGetBlock(blockNum).Timestamp, validTokens, utils.ToJson(mdl.DetailsDS))
106106
targetPrice := mdl.Repo.GetRedStonemgr().GetPrice(int64(mdl.Repo.SetAndGetBlock(blockNum).Timestamp), *mdl.DetailsDS.Info[mdl.GetAddress()])
107107
if targetPrice.Cmp(new(big.Int)) == 0 {
108-
log.Warnf("RedStone composite targetprice for %s at %d is %f", mdl.Repo.GetToken(validTokens[0].Token).Symbol, blockNum, targetPrice)
108+
var sym string
109+
if len(validTokens) > 0 {
110+
sym = mdl.Repo.GetToken(validTokens[0].Token).Symbol
111+
}
112+
log.Warnf("RedStone composite targetprice for %s at %d is %f", sym, blockNum, targetPrice)
109113
return nil
110114
}
111115
//

models/aggregated_block_feed/dependency.go

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,13 @@ func (q *QueryPFDependencies) getChainlinkBasedQueryUpdates(clearExtraBefore int
8484
}
8585

8686
var base = []string{"WETH", "WBTC", "DAI", "USDC", "USDT", "USDC", "OHM"}
87-
var combo = map[string][]string{
88-
"3crv": {"DAI", "USDC", "USDT"},
87+
var combo = map[string]struct {
88+
data []string
89+
onlymainnet bool
90+
}{
91+
"3crv": {data: []string{"DAI", "USDC", "USDT"}},
92+
"wstETH": {data: []string{"stETH"}, onlymainnet: true},
93+
"rstETH": {data: []string{"stETH"}, onlymainnet: true},
8994
}
9095

9196
// {"USDT": {"3crv:address"}, "USDC": {"3crv:address"}, "DAI": {"3crv:address"}, "FRAX": {"crvFRAX"}}
@@ -103,9 +108,13 @@ func (q *QueryPFDependencies) GetChainlinkTokenToUpdateToken() map[string][]stri
103108
if strings.Contains(token.Symbol, sym) && token.Symbol != sym {
104109
ans[token.Symbol] = append(ans[token.Symbol], token.Address)
105110
}
106-
if strings.Contains(strings.ToLower(token.Symbol), "3crv") {
107-
for _, underlyingsym := range combo["3crv"] {
108-
ans[underlyingsym] = append(ans[underlyingsym], token.Address)
111+
}
112+
for collection, underlyingSyms := range combo {
113+
if strings.Contains(strings.ToLower(token.Symbol), strings.ToLower(collection)) { // 3crv
114+
if (core.GetBaseChainId(q.client) == 1 && underlyingSyms.onlymainnet) || !underlyingSyms.onlymainnet {
115+
for _, underlyingsym := range underlyingSyms.data {
116+
ans[underlyingsym] = append(ans[underlyingsym], token.Address)
117+
}
109118
}
110119
}
111120
}

repository/handlers/token_oracle.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ type inner struct {
3535
}
3636

3737
func (repo *inner) TokensValidAtBlock(feed string, blockNum int64) (valid []*schemas.TokenOracle) {
38+
if blockNum == 21893773 {
39+
log.Info("blockNum ", blockNum, utils.ToJson(repo.feedToTokens[feed]), feed)
40+
}
3841
for _, entry := range repo.feedToTokens[feed] {
3942
if entry.BlockNumber <= blockNum && (entry.DisabledAt == 0 || entry.DisabledAt > blockNum) {
4043
valid = append(valid, entry)

0 commit comments

Comments
 (0)