diff --git a/client/core/bond.go b/client/core/bond.go index e6950af7fa..291ee5b838 100644 --- a/client/core/bond.go +++ b/client/core/bond.go @@ -706,7 +706,7 @@ func (c *Core) rotateBonds(ctx context.Context) { bondCfg := c.dexBondConfig(dc, now) if len(bondCfg.bondAssets) == 0 { - if !dc.IsDown() { + if !dc.IsDown() && dc.config() != nil { dc.log.Meter("no-bond-assets", time.Minute*10).Warnf("Zero bond assets reported for apparently connected DCRDEX server") } continue diff --git a/client/mm/mm_basic.go b/client/mm/mm_basic.go index f259761a12..ae20c815da 100644 --- a/client/mm/mm_basic.go +++ b/client/mm/mm_basic.go @@ -10,6 +10,7 @@ import ( "math" "sync" "sync/atomic" + "time" "decred.org/dcrdex/client/core" "decred.org/dcrdex/dex" @@ -165,13 +166,30 @@ func (b *basicMMCalculatorImpl) basisPrice() uint64 { oracleRate := b.msgRate(b.oracle.getMarketPrice(b.baseID, b.quoteID)) b.log.Tracef("oracle rate = %s", b.fmtRate(oracleRate)) - if oracleRate == 0 { - oracleRate = b.core.ExchangeRateFromFiatSources() - if oracleRate == 0 { + rateFromFiat := b.core.ExchangeRateFromFiatSources() + if rateFromFiat == 0 { + b.log.Meter("basisPrice_nofiat_"+b.market.name, time.Hour).Warn( + "No fiat-based rate estimate(s) available for sanity check for %s", b.market.name, + ) + if oracleRate == 0 { // steppedRate(0, x) => x, so we have to handle this. return 0 } - - b.log.Tracef("using fiat rate = %s", b.fmtRate(oracleRate)) + return steppedRate(oracleRate, b.rateStep) + } + if oracleRate == 0 { + b.log.Meter("basisPrice_nooracle_"+b.market.name, time.Hour).Infof( + "No oracle rate available. Using fiat-derived basis rate = %s for %s", b.fmtRate(rateFromFiat), b.market.name, + ) + return steppedRate(rateFromFiat, b.rateStep) + } + mismatch := math.Abs((float64(oracleRate) - float64(rateFromFiat)) / float64(oracleRate)) + const maxOracleFiatMismatch = 0.05 + if mismatch > maxOracleFiatMismatch { + b.log.Meter("basisPrice_sanity_fail+"+b.market.name, time.Minute*20).Warnf( + "Oracle rate sanity check failed for %s. oracle rate = %s, rate from fiat = %s", + b.market.name, b.market.fmtRate(oracleRate), b.market.fmtRate(rateFromFiat), + ) + return 0 } return steppedRate(oracleRate, b.rateStep) diff --git a/client/mm/mm_basic_test.go b/client/mm/mm_basic_test.go index 1e7f9ceba1..624df55aaa 100644 --- a/client/mm/mm_basic_test.go +++ b/client/mm/mm_basic_test.go @@ -45,9 +45,15 @@ func TestBasisPrice(t *testing.T) { { name: "oracle price", oraclePrice: 2000, - fiatRate: 1000, + fiatRate: 1900, exp: 2000, }, + { + name: "failed sanity check", + oraclePrice: 2000, + fiatRate: 1850, // mismatch > 5% + exp: 0, + }, { name: "no oracle price", oraclePrice: 0, diff --git a/client/mm/mm_test.go b/client/mm/mm_test.go index 2c0d8ed74f..956db9679c 100644 --- a/client/mm/mm_test.go +++ b/client/mm/mm_test.go @@ -556,7 +556,7 @@ func newTBotCEXAdaptor() *tBotCexAdaptor { var _ botCexAdaptor = (*tBotCexAdaptor)(nil) -var tLogger = dex.StdOutLogger("mm_TEST", dex.LevelTrace) +var tLogger = dex.StdOutLogger("mm_TEST", dex.LevelInfo) func (c *tBotCexAdaptor) CEXBalance(assetID uint32) (*BotBalance, error) { return c.balances[assetID], c.balanceErr diff --git a/client/mm/price_oracle.go b/client/mm/price_oracle.go index 35194a70ea..5c54af4b2c 100644 --- a/client/mm/price_oracle.go +++ b/client/mm/price_oracle.go @@ -24,6 +24,11 @@ import ( const ( oraclePriceExpiration = time.Minute * 10 oracleRecheckInterval = time.Minute * 3 + + // If the total USD volume of all oracles is less than + // minimumUSDVolumeForOraclesAvg, the oracles will be ignored for + // pricing averages. + minimumUSDVolumeForOraclesAvg = 100_000 ) // MarketReport contains a market's rates on various exchanges and the fiat @@ -265,12 +270,22 @@ func fetchMarketPrice(ctx context.Context, baseID, quoteID uint32, log dex.Logge return 0, nil, err } - price, err := oracleAverage(oracles, log) + price, usdVolume, err := oracleAverage(oracles, log) + if err != nil { + return 0, nil, err + } + if usdVolume < minimumUSDVolumeForOraclesAvg { + log.Meter("oracle_low_volume_"+b.Symbol+"_"+q.Symbol, 12*time.Hour).Infof( + "Rejecting oracle average price for %s. not enough volume (%.2f USD < %.2f)", + b.Symbol+"_"+q.Symbol, usdVolume, float32(minimumUSDVolumeForOraclesAvg), + ) + return 0, oracles, nil + } return price, oracles, err } -func oracleAverage(mkts []*OracleReport, log dex.Logger) (float64, error) { - var weightedSum, usdVolume float64 +func oracleAverage(mkts []*OracleReport, log dex.Logger) (rate, usdVolume float64, _ error) { + var weightedSum float64 var n int for _, mkt := range mkts { n++ @@ -278,13 +293,13 @@ func oracleAverage(mkts []*OracleReport, log dex.Logger) (float64, error) { usdVolume += mkt.USDVol } if usdVolume == 0 { - return 0, nil // No markets have data. OK. + return 0, 0, nil // No markets have data. OK. } - rate := weightedSum / usdVolume + rate = weightedSum / usdVolume // TODO: Require a minimum USD volume? log.Tracef("marketAveragedPrice: price calculated from %d markets: rate = %f, USD volume = %f", n, rate, usdVolume) - return rate, nil + return rate, usdVolume, nil } func getRates(ctx context.Context, url string, thing any) (err error) { @@ -325,7 +340,7 @@ func spread(ctx context.Context, addr string, baseSymbol, quoteSymbol string, lo } sell, buy, err = s(ctx, baseSymbol, quoteSymbol, log) if err != nil { - log.Errorf("Error getting spread from %q: %v", addr, err) + log.Meter("spread_"+addr, time.Hour*12).Errorf("Error getting spread from %q: %v", addr, err) return 0, 0 } return sell, buy @@ -351,7 +366,8 @@ func oracleMarketReport(ctx context.Context, b, q *fiatrates.CoinpaprikaAsset, l QuoteCurrencyID string `json:"quote_currency_id"` MarketURL string `json:"market_url"` LastUpdated time.Time `json:"last_updated"` - TrustScore string `json:"trust_score"` + TrustScore string `json:"trust_score"` // TrustScore appears to be deprecated? + Outlier bool `json:"outlier"` Quotes map[string]*coinpapQuote `json:"quotes"` } @@ -375,7 +391,7 @@ func oracleMarketReport(ctx context.Context, b, q *fiatrates.CoinpaprikaAsset, l // Create filter for desirable matches. marketMatches := func(mkt *coinpapMarket) bool { - if mkt.TrustScore != "high" { + if mkt.TrustScore != "high" || mkt.Outlier { return false } @@ -441,23 +457,36 @@ func oracleMarketReport(ctx context.Context, b, q *fiatrates.CoinpaprikaAsset, l type Spreader func(ctx context.Context, baseSymbol, quoteSymbol string, log dex.Logger) (sell, buy float64, err error) var spreaders = map[string]Spreader{ - "binance.com": fetchBinanceSpread, + "binance.com": fetchBinanceGlobalSpread, + "binance.us": fetchBinanceUSSpread, "coinbase.com": fetchCoinbaseSpread, "bittrex.com": fetchBittrexSpread, "hitbtc.com": fetchHitBTCSpread, "exmo.com": fetchEXMOSpread, } -var binanceGlobalIs451 atomic.Bool +var binanceGlobalIs451, binanceUSIs451 atomic.Bool + +func fetchBinanceGlobalSpread(ctx context.Context, baseSymbol, quoteSymbol string, log dex.Logger) (sell, buy float64, err error) { + if binanceGlobalIs451.Load() { + return 0, 0, nil + } + return fetchBinanceSpread(ctx, baseSymbol, quoteSymbol, false, log) +} -func fetchBinanceSpread(ctx context.Context, baseSymbol, quoteSymbol string, log dex.Logger) (sell, buy float64, err error) { +func fetchBinanceUSSpread(ctx context.Context, baseSymbol, quoteSymbol string, log dex.Logger) (sell, buy float64, err error) { + if binanceUSIs451.Load() { + return 0, 0, nil + } + return fetchBinanceSpread(ctx, baseSymbol, quoteSymbol, true, log) +} + +func fetchBinanceSpread(ctx context.Context, baseSymbol, quoteSymbol string, isUS bool, log dex.Logger) (sell, buy float64, err error) { slug := fmt.Sprintf("%s%s", strings.ToUpper(baseSymbol), strings.ToUpper(quoteSymbol)) var url string - var isGlobal bool - if binanceGlobalIs451.Load() { + if isUS { url = fmt.Sprintf("https://api.binance.us/api/v3/ticker/bookTicker?symbol=%s", slug) } else { - isGlobal = true url = fmt.Sprintf("https://api.binance.com/api/v3/ticker/bookTicker?symbol=%s", slug) } @@ -465,11 +494,16 @@ func fetchBinanceSpread(ctx context.Context, baseSymbol, quoteSymbol string, log BidPrice float64 `json:"bidPrice,string"` AskPrice float64 `json:"askPrice,string"` } + code, err := getHTTPWithCode(ctx, url, &resp) if err != nil { - if isGlobal && code == http.StatusUnavailableForLegalReasons && binanceGlobalIs451.CompareAndSwap(false, true) { - log.Info("Binance Global responded with a 451. Oracle will use Binance U.S.") - return fetchBinanceSpread(ctx, baseSymbol, quoteSymbol, log) + if code == http.StatusUnavailableForLegalReasons { + if isUS && binanceUSIs451.CompareAndSwap(false, true) { + log.Debugf("Binance U.S. responded with a 451. Disabling") + } else if !isUS && binanceGlobalIs451.CompareAndSwap(false, true) { + log.Debugf("Binance Global responded with a 451. Disabling") + } + return 0, 0, nil } return 0, 0, err } @@ -554,7 +588,3 @@ func fetchEXMOSpread(ctx context.Context, baseSymbol, quoteSymbol string, _ dex. return mkt.AskTop, mkt.BidTop, nil } - -func shortSymbol(symbol string) string { - return strings.Split(symbol, ".")[0] -}