diff --git a/src/telliot_feeds/feeds/aave_usd_feed.py b/src/telliot_feeds/feeds/aave_usd_feed.py index bb734c8e..bc92face 100644 --- a/src/telliot_feeds/feeds/aave_usd_feed.py +++ b/src/telliot_feeds/feeds/aave_usd_feed.py @@ -1,7 +1,7 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource +from telliot_feeds.sources.price.spot.coinpaprika import CoinpaprikaSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,8 +13,8 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="aave", currency="usd"), - CoinbaseSpotPriceSource(asset="aave", currency="usd"), KrakenSpotPriceSource(asset="aave", currency="usd"), + CoinpaprikaSpotPriceSource(asset="aave-new", currency="usd"), ], ), ) diff --git a/src/telliot_feeds/feeds/avax_usd_feed.py b/src/telliot_feeds/feeds/avax_usd_feed.py index 17da3489..fba3316f 100644 --- a/src/telliot_feeds/feeds/avax_usd_feed.py +++ b/src/telliot_feeds/feeds/avax_usd_feed.py @@ -1,7 +1,7 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource +from telliot_feeds.sources.price.spot.coinpaprika import CoinpaprikaSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,8 +13,8 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="avax", currency="usd"), - CoinbaseSpotPriceSource(asset="avax", currency="usd"), KrakenSpotPriceSource(asset="avax", currency="usd"), + CoinpaprikaSpotPriceSource(asset="avax-avalanche", currency="usd"), ], ), ) diff --git a/src/telliot_feeds/feeds/badger_usd_feed.py b/src/telliot_feeds/feeds/badger_usd_feed.py index a50b2f89..6fa66648 100644 --- a/src/telliot_feeds/feeds/badger_usd_feed.py +++ b/src/telliot_feeds/feeds/badger_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="badger", currency="usd"), - CoinbaseSpotPriceSource(asset="badger", currency="usd"), KrakenSpotPriceSource(asset="badger", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/bch_usd_feed.py b/src/telliot_feeds/feeds/bch_usd_feed.py index 3e91ac64..d7b32515 100644 --- a/src/telliot_feeds/feeds/bch_usd_feed.py +++ b/src/telliot_feeds/feeds/bch_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="bch", currency="usd"), - CoinbaseSpotPriceSource(asset="bch", currency="usd"), KrakenSpotPriceSource(asset="bch", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/btc_usd_feed.py b/src/telliot_feeds/feeds/btc_usd_feed.py index 95a6791c..47d19198 100644 --- a/src/telliot_feeds/feeds/btc_usd_feed.py +++ b/src/telliot_feeds/feeds/btc_usd_feed.py @@ -1,7 +1,6 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice from telliot_feeds.sources.price.spot.binance import BinanceSpotPriceSource -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource @@ -16,7 +15,6 @@ sources=[ CoinGeckoSpotPriceSource(asset="btc", currency="usd"), BinanceSpotPriceSource(asset="btc", currency="usdt"), - CoinbaseSpotPriceSource(asset="btc", currency="usd"), GeminiSpotPriceSource(asset="btc", currency="usd"), KrakenSpotPriceSource(asset="xbt", currency="usd"), ], diff --git a/src/telliot_feeds/feeds/comp_usd_feed.py b/src/telliot_feeds/feeds/comp_usd_feed.py index 8f13a8c3..8c1c7d14 100644 --- a/src/telliot_feeds/feeds/comp_usd_feed.py +++ b/src/telliot_feeds/feeds/comp_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="comp", currency="usd"), - CoinbaseSpotPriceSource(asset="comp", currency="usd"), GeminiSpotPriceSource(asset="comp", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/crv_usd_feed.py b/src/telliot_feeds/feeds/crv_usd_feed.py index 4a81a3ae..6b1c98ae 100644 --- a/src/telliot_feeds/feeds/crv_usd_feed.py +++ b/src/telliot_feeds/feeds/crv_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="crv", currency="usd"), - CoinbaseSpotPriceSource(asset="crv", currency="usd"), KrakenSpotPriceSource(asset="crv", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/dai_usd_feed.py b/src/telliot_feeds/feeds/dai_usd_feed.py index b35e763b..de0bd341 100644 --- a/src/telliot_feeds/feeds/dai_usd_feed.py +++ b/src/telliot_feeds/feeds/dai_usd_feed.py @@ -1,7 +1,6 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice from telliot_feeds.sources.price.spot.binance import BinanceSpotPriceSource -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price.spot.uniswapV3 import UniswapV3PriceSource @@ -15,7 +14,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="dai", currency="usd"), - CoinbaseSpotPriceSource(asset="dai", currency="usd"), BinanceSpotPriceSource(asset="dai", currency="usdt"), GeminiSpotPriceSource(asset="dai", currency="usd"), UniswapV3PriceSource(asset="dai", currency="usd"), diff --git a/src/telliot_feeds/feeds/doge_usd_feed.py b/src/telliot_feeds/feeds/doge_usd_feed.py index 8c68b43c..f257b498 100644 --- a/src/telliot_feeds/feeds/doge_usd_feed.py +++ b/src/telliot_feeds/feeds/doge_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="doge", currency="usd"), - CoinbaseSpotPriceSource(asset="doge", currency="usd"), GeminiSpotPriceSource(asset="doge", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/dot_usd_feed.py b/src/telliot_feeds/feeds/dot_usd_feed.py index 0e0c6828..70cd6594 100644 --- a/src/telliot_feeds/feeds/dot_usd_feed.py +++ b/src/telliot_feeds/feeds/dot_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="dot", currency="usd"), - CoinbaseSpotPriceSource(asset="dot", currency="usd"), GeminiSpotPriceSource(asset="dot", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/eth_btc_feed.py b/src/telliot_feeds/feeds/eth_btc_feed.py index 64f3c7bf..82f4ab56 100644 --- a/src/telliot_feeds/feeds/eth_btc_feed.py +++ b/src/telliot_feeds/feeds/eth_btc_feed.py @@ -1,7 +1,6 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice from telliot_feeds.sources.price.spot.binance import BinanceSpotPriceSource -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -15,7 +14,6 @@ sources=[ CoinGeckoSpotPriceSource(asset="eth", currency="btc"), BinanceSpotPriceSource(asset="eth", currency="btc"), - CoinbaseSpotPriceSource(asset="eth", currency="btc"), GeminiSpotPriceSource(asset="eth", currency="btc"), ], ), diff --git a/src/telliot_feeds/feeds/eth_usd_feed.py b/src/telliot_feeds/feeds/eth_usd_feed.py index 8ed3622c..6a69161e 100644 --- a/src/telliot_feeds/feeds/eth_usd_feed.py +++ b/src/telliot_feeds/feeds/eth_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource @@ -14,7 +13,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="eth", currency="usd"), - CoinbaseSpotPriceSource(asset="eth", currency="usd"), GeminiSpotPriceSource(asset="eth", currency="usd"), KrakenSpotPriceSource(asset="eth", currency="usd"), ], diff --git a/src/telliot_feeds/feeds/fil_usd_feed.py b/src/telliot_feeds/feeds/fil_usd_feed.py index 38d1da30..3c4f4016 100644 --- a/src/telliot_feeds/feeds/fil_usd_feed.py +++ b/src/telliot_feeds/feeds/fil_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -12,7 +11,6 @@ currency="usd", algorithm="median", sources=[ - CoinbaseSpotPriceSource(asset="fil", currency="usd"), CoinGeckoSpotPriceSource(asset="fil", currency="usd"), KrakenSpotPriceSource(asset="fil", currency="usd"), ], diff --git a/src/telliot_feeds/feeds/gno_usd_feed.py b/src/telliot_feeds/feeds/gno_usd_feed.py index cb335f95..a3845ba5 100644 --- a/src/telliot_feeds/feeds/gno_usd_feed.py +++ b/src/telliot_feeds/feeds/gno_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="gno", currency="usd"), - CoinbaseSpotPriceSource(asset="gno", currency="usd"), KrakenSpotPriceSource(asset="gno", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/grt_usd_feed.py b/src/telliot_feeds/feeds/grt_usd_feed.py index a7217767..23b86668 100644 --- a/src/telliot_feeds/feeds/grt_usd_feed.py +++ b/src/telliot_feeds/feeds/grt_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="grt", currency="usd"), - CoinbaseSpotPriceSource(asset="grt", currency="usd"), GeminiSpotPriceSource(asset="grt", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/link_usd_feed.py b/src/telliot_feeds/feeds/link_usd_feed.py index 378df2cd..f80f6452 100644 --- a/src/telliot_feeds/feeds/link_usd_feed.py +++ b/src/telliot_feeds/feeds/link_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="link", currency="usd"), - CoinbaseSpotPriceSource(asset="link", currency="usd"), KrakenSpotPriceSource(asset="link", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/ltc_usd_feed.py b/src/telliot_feeds/feeds/ltc_usd_feed.py index 32d3ed31..6f45d016 100644 --- a/src/telliot_feeds/feeds/ltc_usd_feed.py +++ b/src/telliot_feeds/feeds/ltc_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="ltc", currency="usd"), - CoinbaseSpotPriceSource(asset="ltc", currency="usd"), GeminiSpotPriceSource(asset="ltc", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/matic_usd_feed.py b/src/telliot_feeds/feeds/matic_usd_feed.py index c70daefd..dbe2bcf9 100644 --- a/src/telliot_feeds/feeds/matic_usd_feed.py +++ b/src/telliot_feeds/feeds/matic_usd_feed.py @@ -1,7 +1,6 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice from telliot_feeds.sources.price.spot.binance import BinanceSpotPriceSource -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource @@ -16,7 +15,6 @@ sources=[ CoinGeckoSpotPriceSource(asset="matic", currency="usd"), BinanceSpotPriceSource(asset="matic", currency="usdt"), - CoinbaseSpotPriceSource(asset="matic", currency="usd"), GeminiSpotPriceSource(asset="matic", currency="usd"), KrakenSpotPriceSource(asset="matic", currency="usd"), ], diff --git a/src/telliot_feeds/feeds/mkr_usd_feed.py b/src/telliot_feeds/feeds/mkr_usd_feed.py index 22e80caf..b72566ff 100644 --- a/src/telliot_feeds/feeds/mkr_usd_feed.py +++ b/src/telliot_feeds/feeds/mkr_usd_feed.py @@ -1,7 +1,6 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice from telliot_feeds.sources.price.spot.binance import BinanceSpotPriceSource -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource @@ -16,7 +15,6 @@ sources=[ CoinGeckoSpotPriceSource(asset="mkr", currency="usd"), BinanceSpotPriceSource(asset="mkr", currency="usdt"), - CoinbaseSpotPriceSource(asset="mkr", currency="usd"), GeminiSpotPriceSource(asset="mkr", currency="usd"), KrakenSpotPriceSource(asset="mkr", currency="usd"), ], diff --git a/src/telliot_feeds/feeds/op_usd_feed.py b/src/telliot_feeds/feeds/op_usd_feed.py index 7b358660..c2934f5b 100644 --- a/src/telliot_feeds/feeds/op_usd_feed.py +++ b/src/telliot_feeds/feeds/op_usd_feed.py @@ -1,7 +1,7 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource +from telliot_feeds.sources.price.spot.coinpaprika import CoinpaprikaSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator op_usd_median_feed = DataFeed( @@ -12,7 +12,7 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="op", currency="usd"), - CoinbaseSpotPriceSource(asset="op", currency="usd"), + CoinpaprikaSpotPriceSource(asset="op-optimism", currency="usd"), ], ), ) diff --git a/src/telliot_feeds/feeds/rai_usd_feed.py b/src/telliot_feeds/feeds/rai_usd_feed.py index 87ff05d0..0f900dda 100644 --- a/src/telliot_feeds/feeds/rai_usd_feed.py +++ b/src/telliot_feeds/feeds/rai_usd_feed.py @@ -2,8 +2,8 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource +from telliot_feeds.sources.price.spot.coinpaprika import CoinpaprikaSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -15,7 +15,7 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="rai", currency="usd"), - CoinbaseSpotPriceSource(asset="rai", currency="usd"), + CoinpaprikaSpotPriceSource(asset="rai-rai-reflex-index", currency="usd"), ], ), ) diff --git a/src/telliot_feeds/feeds/shib_usd_feed.py b/src/telliot_feeds/feeds/shib_usd_feed.py index 03f09b62..4e0269eb 100644 --- a/src/telliot_feeds/feeds/shib_usd_feed.py +++ b/src/telliot_feeds/feeds/shib_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="shib", currency="usd"), - CoinbaseSpotPriceSource(asset="shib", currency="usd"), GeminiSpotPriceSource(asset="shib", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/sushi_usd_feed.py b/src/telliot_feeds/feeds/sushi_usd_feed.py index 37a5cf49..75ad34e7 100644 --- a/src/telliot_feeds/feeds/sushi_usd_feed.py +++ b/src/telliot_feeds/feeds/sushi_usd_feed.py @@ -1,7 +1,6 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice from telliot_feeds.sources.price.spot.binance import BinanceSpotPriceSource -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price.spot.kraken import KrakenSpotPriceSource @@ -16,7 +15,6 @@ sources=[ CoinGeckoSpotPriceSource(asset="sushi", currency="usd"), BinanceSpotPriceSource(asset="sushi", currency="usdt"), - CoinbaseSpotPriceSource(asset="sushi", currency="usd"), GeminiSpotPriceSource(asset="sushi", currency="usd"), KrakenSpotPriceSource(asset="sushi", currency="usd"), ], diff --git a/src/telliot_feeds/feeds/trb_usd_feed.py b/src/telliot_feeds/feeds/trb_usd_feed.py index 81aa8095..25771fb3 100644 --- a/src/telliot_feeds/feeds/trb_usd_feed.py +++ b/src/telliot_feeds/feeds/trb_usd_feed.py @@ -1,7 +1,6 @@ """Datafeed for current price of TRB in USD.""" from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.coinpaprika import CoinpaprikaSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -14,7 +13,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="trb", currency="usd"), - CoinbaseSpotPriceSource(asset="trb", currency="usd"), CoinpaprikaSpotPriceSource(asset="trb-tellor", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/uni_usd_feed.py b/src/telliot_feeds/feeds/uni_usd_feed.py index e95ca7eb..352826e1 100644 --- a/src/telliot_feeds/feeds/uni_usd_feed.py +++ b/src/telliot_feeds/feeds/uni_usd_feed.py @@ -1,6 +1,5 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +12,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="uni", currency="usd"), - CoinbaseSpotPriceSource(asset="uni", currency="usd"), GeminiSpotPriceSource(asset="uni", currency="usd"), ], ), diff --git a/src/telliot_feeds/feeds/usdt_usd_feed.py b/src/telliot_feeds/feeds/usdt_usd_feed.py index ac8887bf..dcd575e3 100644 --- a/src/telliot_feeds/feeds/usdt_usd_feed.py +++ b/src/telliot_feeds/feeds/usdt_usd_feed.py @@ -1,7 +1,6 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice from telliot_feeds.sources.price.spot.agni import agniFinancePriceSource -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -14,7 +13,6 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="usdt", currency="usd"), - CoinbaseSpotPriceSource(asset="usdt", currency="usd"), GeminiSpotPriceSource(asset="usdt", currency="usd"), agniFinancePriceSource(asset="usdt", currency="usd"), ], diff --git a/src/telliot_feeds/feeds/xdai_usd_feed.py b/src/telliot_feeds/feeds/xdai_usd_feed.py index d8666eb8..b83724e3 100644 --- a/src/telliot_feeds/feeds/xdai_usd_feed.py +++ b/src/telliot_feeds/feeds/xdai_usd_feed.py @@ -1,7 +1,7 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource +from telliot_feeds.sources.price.spot.coinpaprika import CoinpaprikaSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator xdai_usd_median_feed = DataFeed( @@ -12,7 +12,7 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="xdai", currency="usd"), - CoinbaseSpotPriceSource(asset="dai", currency="usd"), + CoinpaprikaSpotPriceSource(asset="xdai-xdai", currency="usd"), ], ), ) diff --git a/src/telliot_feeds/feeds/yfi_usd_feed.py b/src/telliot_feeds/feeds/yfi_usd_feed.py index 8660613a..f622ab08 100644 --- a/src/telliot_feeds/feeds/yfi_usd_feed.py +++ b/src/telliot_feeds/feeds/yfi_usd_feed.py @@ -1,7 +1,7 @@ from telliot_feeds.datafeed import DataFeed from telliot_feeds.queries.price.spot_price import SpotPrice -from telliot_feeds.sources.price.spot.coinbase import CoinbaseSpotPriceSource from telliot_feeds.sources.price.spot.coingecko import CoinGeckoSpotPriceSource +from telliot_feeds.sources.price.spot.coinpaprika import CoinpaprikaSpotPriceSource from telliot_feeds.sources.price.spot.gemini import GeminiSpotPriceSource from telliot_feeds.sources.price_aggregator import PriceAggregator @@ -13,7 +13,7 @@ algorithm="median", sources=[ CoinGeckoSpotPriceSource(asset="yfi", currency="usd"), - CoinbaseSpotPriceSource(asset="yfi", currency="usd"), + CoinpaprikaSpotPriceSource(asset="yfi-yearnfinance", currency="usd"), GeminiSpotPriceSource(asset="yfi", currency="usd"), ], ), diff --git a/tests/feeds/test_dai_usd_feed.py b/tests/feeds/test_dai_usd_feed.py index ae43a677..19287c72 100644 --- a/tests/feeds/test_dai_usd_feed.py +++ b/tests/feeds/test_dai_usd_feed.py @@ -12,7 +12,7 @@ async def test_dai_usd_median_feed(caplog): assert v is not None assert v > 0 - assert "sources used in aggregate: 4" in caplog.text.lower() + assert "sources used in aggregate: 3" in caplog.text.lower() print(f"DAI/USD Price: {v}") # Get list of data sources from sources dict diff --git a/tests/feeds/test_eth_btc_feed.py b/tests/feeds/test_eth_btc_feed.py index 29ac4cf2..74f48b03 100644 --- a/tests/feeds/test_eth_btc_feed.py +++ b/tests/feeds/test_eth_btc_feed.py @@ -13,7 +13,7 @@ async def test_eth_btc_median_feed(caplog): assert v is not None assert v > 0 assert ( # sometimes only 3 sources are used bc binance restricts locations - "sources used in aggregate: 4" in caplog.text.lower() or "sources used in aggregate: 3" in caplog.text.lower() + "sources used in aggregate: 2" in caplog.text.lower() or "sources used in aggregate: 3" in caplog.text.lower() ) print(f"ETH/BTC Price: {v}") diff --git a/tests/feeds/test_eth_usd_feed.py b/tests/feeds/test_eth_usd_feed.py index f01cfc9e..744177e6 100644 --- a/tests/feeds/test_eth_usd_feed.py +++ b/tests/feeds/test_eth_usd_feed.py @@ -13,7 +13,7 @@ async def test_eth_usd_median_feed(caplog): assert v is not None assert v > 0 assert ( - "sources used in aggregate: 4" in caplog.text.lower() or "sources used in aggregate: 5" in caplog.text.lower() + "sources used in aggregate: 3" in caplog.text.lower() or "sources used in aggregate: 5" in caplog.text.lower() ) print(f"ETH/USD Price: {v}")