Skip to content

optimized log level #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lazyluis merged 1 commit into from
Jun 11, 2025
Merged

optimized log level #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions x/oracle/abci/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func NewPriceOracleVoteExtHandler(logger log.Logger, valStore baseapp.ValidatorS
}

return PriceOracleVoteExtHandler{
logger: logger,
logger: logger.With("module", types.ModuleName),
currentBlock: 0,
valStore: valStore,
Keeper: oracleKeeper,
Expand Down Expand Up @@ -94,7 +94,6 @@ func (h *PriceOracleVoteExtHandler) VerifyVoteExtensionHandler() sdk.VerifyVoteE
}

validator := hex.EncodeToString(req.ValidatorAddress)
h.logger.Info("VerifyVoteExtensionHandler", "height", req.Height, "validator", validator)
var voteExt types.OracleVoteExtension
err := voteExt.Unmarshal(req.VoteExtension)
if err != nil {
Expand All @@ -105,16 +104,7 @@ func (h *PriceOracleVoteExtHandler) VerifyVoteExtensionHandler() sdk.VerifyVoteE
return nil, fmt.Errorf("vote extension height does not match request height; expected: %d, got: %d", req.Height, voteExt.Height)
}

// if len(voteExt.Prices) > 0 {
// // check if a fack price is existing.
// if _, ok := voteExt.Prices[types.NULL_SYMBOL]; !ok {
// return &abci.ResponseVerifyVoteExtension{Status: abci.ResponseVerifyVoteExtension_REJECT}, nil
// }
// }

// if voteExt.HasError {
// return &abci.ResponseVerifyVoteExtension{Status: abci.ResponseVerifyVoteExtension_REJECT}, nil
// }
h.logger.Debug("verify", "height", req.Height, "validator", validator, "prices", voteExt.Prices, "blocks", voteExt.Blocks)

for _, blk := range voteExt.Blocks {
if err = blk.Validate(); err != nil {
Expand Down Expand Up @@ -222,7 +212,7 @@ func (h *PriceOracleVoteExtHandler) getAllVolumeWeightedPrices() map[string]stri
}
}

h.logger.Info("AvgPrice", "prices", avgPrices)
h.logger.Debug("avg exchange prices", "prices", avgPrices)

textPrices := make(map[string]string)
for symbol, price := range avgPrices {
Expand Down Expand Up @@ -321,7 +311,7 @@ func (h *PriceOracleVoteExtHandler) PreBlocker(ctx sdk.Context, req *abci.Reques
return nil, err
}

h.logger.Warn("Oracle Final States", "price", prices)
h.logger.Info("Oracle Final States", "price", prices, "headers", headers)

return res, nil
}
Expand All @@ -345,7 +335,7 @@ func (h *PriceOracleVoteExtHandler) extractPricesAndBlockHeaders(_ sdk.Context,
return nil, nil, err
}

h.logger.Warn("extension", "validator", hex.EncodeToString(v.Validator.Address), "extension", voteExt)
h.logger.Debug("received", "validator", hex.EncodeToString(v.Validator.Address), "extension", voteExt)

totalStake += v.Validator.Power

Expand Down Expand Up @@ -390,10 +380,11 @@ func (h *PriceOracleVoteExtHandler) extractPricesAndBlockHeaders(_ sdk.Context,
}

// finalize average by dividing by total stake, i.e. total weights
finalPrices := make(map[string]math.LegacyDec, len(types.PRICE_CACHE))
for base, price := range stakeWeightedPrices {
if price.GT(math.LegacyZeroDec()) {
if vp, ok := stakeWeightedVotingPower[base]; ok && vp.RoundInt64()*3 > totalStake*2 {
stakeWeightedPrices[base] = price.Quo(vp)
finalPrices[base] = price.Quo(vp)
}
} else {
h.logger.Error("Got invalid price.", "symbal", base, "price", price)
Expand All @@ -407,7 +398,7 @@ func (h *PriceOracleVoteExtHandler) extractPricesAndBlockHeaders(_ sdk.Context,
break
}
}
return stakeWeightedPrices, headers, nil
return finalPrices, headers, nil
}

func voteExtensionEnabled(ctx sdk.Context, height int64) bool {
Expand Down
4 changes: 2 additions & 2 deletions x/oracle/module/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func Start(svrCtx *server.Context, clientCtx client.Context, ctx context.Context

if types.StartProviders {

svrCtx.Logger.Info("price service", "module", "oracle", "msg", "Start Oracle Price Subscriber")
svrCtx.Logger.With("module", types.ModuleName).Info("price service", "module", "oracle", "msg", "Start Oracle Price Subscriber")

go binance.Subscribe(svrCtx, ctx)
go okex.Subscribe(svrCtx, ctx)
Expand All @@ -33,7 +33,7 @@ func Start(svrCtx *server.Context, clientCtx client.Context, ctx context.Context
// g.Go(func() error { return bybit.Subscribe(svrCtx, ctx) })
// g.Go(func() error { return bitget.Subscribe(svrCtx, ctx) })
} else {
svrCtx.Logger.Warn("Price service is disabled. It is required if your node is a validator. ")
svrCtx.Logger.With("module", types.ModuleName).Warn("Price service is disabled. It is required if your node is a validator. ")
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion x/oracle/providers/binance/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var (
SymbolMap = map[string]string{
"BTCUSDT": types.BTCUSD,
}
URL = "wss://stream.binance.com:443/stream?streams=btcusdt@miniTicker/atomusdt@miniTicker"
URL = "wss://stream.binance.com:443/stream?streams=btcusdt@miniTicker/ethbtc@miniTicker"
SubscribeMsg = ""
)

Expand Down
2 changes: 1 addition & 1 deletion x/oracle/providers/bybit/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var (
"op": "subscribe",
"args": [
"tickers.BTCUSDT",
"tickers.ATOMUSDT"
"tickers.ETHBTC"
]
}`
SymbolMap = map[string]string{
Expand Down
31 changes: 0 additions & 31 deletions x/oracle/types/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,6 @@ func CachePrice(exchange string, price Price) {
v[exchange] = price
PRICE_CACHE[price.Symbol] = v
}

// a null price is used to identify whether price provider is working
nullPrice := nullPrice(price.Time)
if v, ok := PRICE_CACHE[nullPrice.Symbol]; ok {
v[exchange] = nullPrice
PRICE_CACHE[nullPrice.Symbol] = v
} else {
v = make(map[string]Price)
v[exchange] = nullPrice
PRICE_CACHE[nullPrice.Symbol] = v
}
}

func nullPrice(pTime int64) Price {
return Price{
Symbol: NULL_SYMBOL,
Price: "0",
Time: pTime,
}
}

func GetPrices(lastBlockTime int64) map[string][]math.LegacyDec {
Expand All @@ -65,15 +46,3 @@ func GetPrices(lastBlockTime int64) map[string][]math.LegacyDec {
}
return symbolPrices
}

// func setMapValue(target map[string][]Price, ex string, p Price) {
// if list, ok := target[ex]; ok {
// if len(list) > 100 {
// list = list[100:]
// }
// list = append(list, p)
// target[ex] = list
// } else {
// target[ex] = []Price{p}
// }
// }
6 changes: 3 additions & 3 deletions x/oracle/types/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ func Subscribe(provider string, svrCtx *server.Context, ctx context.Context, url
if c, _, err = websocket.DefaultDialer.Dial(url, nil); err == nil {
reconnect = false
sendMessage(c, msg)
svrCtx.Logger.Info("connected price provider", "url", url)
svrCtx.Logger.With("module", ModuleName).Info("connected price provider", "url", url)
break
} else {
svrCtx.Logger.Error("re-connecting...", "error", err, "provider", provider)
svrCtx.Logger.With("module", ModuleName).Error("re-connecting...", "error", err, "provider", provider)
}
}
}
Expand All @@ -48,7 +48,7 @@ func Subscribe(provider string, svrCtx *server.Context, ctx context.Context, url
CachePrice(provider, p)
}
} else {
svrCtx.Logger.Error("provider disconnected", "error", err, "provider", provider)
svrCtx.Logger.With("module", ModuleName).Error("provider disconnected", "error", err, "provider", provider)
c.Close()
reconnect = true
}
Expand Down