diff --git a/data-feed-generator/data-feeds-builder/templates/ftt-eth.toml b/data-feed-generator/data-feeds-builder/templates/ftt-eth.toml index f607711..a068da8 100644 --- a/data-feed-generator/data-feeds-builder/templates/ftt-eth.toml +++ b/data-feed-generator/data-feeds-builder/templates/ftt-eth.toml @@ -17,15 +17,6 @@ keyBundleID = "$OCR_KEY_BUNDLE_ID" observationTimeout = "10s" transmitterAddress = "$TRANSMITTER_ADDRESS" observationSource = """ - coinbase_ftt_usd [type="http" method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/quote/coinbase/FTT/USD" allowUnrestrictedNetworkAccess=true retries=3] - coinbase_ftt_usd_parse [type="jsonparse" path="price"] - - coinbase_eth_usd [type="http" method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/quote/coinbase/ETH/USD" allowUnrestrictedNetworkAccess=true retries=3] - coinbase_eth_usd_parse [type="jsonparse" path="price"] - - coinbase_ftt_eth_divide [type="divide" input="$(coinbase_ftt_usd_parse)" divisor="$(coinbase_eth_usd_parse)"] - coinbase_ftt_eth_divide_multiply [type="multiply" times=1000000000000000000] - coingecko_ftt_usd [type="http" method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/quote/coingecko/ftx-token/USD" allowUnrestrictedNetworkAccess=true retries=3] coingecko_ftt_usd_parse [type="jsonparse" path="price"] @@ -46,16 +37,12 @@ observationSource = """ median [type=median]; - coinbase_ftt_usd -> coinbase_ftt_usd_parse -> coinbase_ftt_eth_divide - coinbase_eth_usd -> coinbase_eth_usd_parse -> coinbase_ftt_eth_divide - coinbase_ftt_eth_divide -> coinbase_ftt_eth_divide_multiply coingecko_ftt_usd -> coingecko_ftt_usd_parse -> coingecko_ftt_eth_divide coingecko_eth_usd -> coingecko_eth_usd_parse -> coingecko_ftt_eth_divide coingecko_ftt_eth_divide -> coingecko_ftt_eth_divide_multiply cryptocompare_ftt_usd -> cryptocompare_ftt_usd_parse -> cryptocompare_ftt_eth_divide cryptocompare_eth_usd -> cryptocompare_eth_usd_parse -> cryptocompare_ftt_eth_divide cryptocompare_ftt_eth_divide -> cryptocompare_ftt_eth_divide_multiply - coinbase_ftt_eth_divide_multiply -> median; coingecko_ftt_eth_divide_multiply -> median; cryptocompare_ftt_eth_divide_multiply -> median; """ diff --git a/data-feed-generator/data-feeds-builder/templates/ftt-usd.toml b/data-feed-generator/data-feeds-builder/templates/ftt-usd.toml index 1f9e813..4790b16 100644 --- a/data-feed-generator/data-feeds-builder/templates/ftt-usd.toml +++ b/data-feed-generator/data-feeds-builder/templates/ftt-usd.toml @@ -23,15 +23,10 @@ observationSource = """ ds2 [type=http method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/quote/coingecko/ftx-token/USD"]; ds2_parse [type=jsonparse path="price"]; ds2_multiply [type=multiply times=100000000]; - ds3 [type=http method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/quote/coinbase/FTT/USD"]; - ds3_parse [type=jsonparse path="price"]; - ds3_multiply [type=multiply times=100000000]; median [type=median]; - + ds1 -> ds1_parse -> ds1_multiply; ds2 -> ds2_parse -> ds2_multiply; - ds3 -> ds3_parse -> ds3_multiply; ds1_multiply -> median; ds2_multiply -> median; - ds3_multiply -> median; """ diff --git a/data-feed-generator/data-feeds-builder/templates/link-matic.toml b/data-feed-generator/data-feeds-builder/templates/link-matic.toml index de43f29..8583308 100644 --- a/data-feed-generator/data-feeds-builder/templates/link-matic.toml +++ b/data-feed-generator/data-feeds-builder/templates/link-matic.toml @@ -20,7 +20,7 @@ observationSource = """ binance_link_usdt [type="http" method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/quote/binance/LINK/USDT" allowUnrestrictedNetworkAccess=true retries=3] binance_link_usdt_parse [type="jsonparse" path="price"] - binance_matic_usdt [type="http" method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/quote/binance/MATIC/USDT" allowUnrestrictedNetworkAccess=true retries=3] + binance_matic_usdt [type="http" method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/quote/binance/POL/USDT" allowUnrestrictedNetworkAccess=true retries=3] binance_matic_usdt_parse [type="jsonparse" path="price"] binance_link_matic_divide [type="divide" input="$(binance_link_usdt_parse)" divisor="$(binance_matic_usdt_parse)"] diff --git a/data-feed-generator/data-feeds-builder/templates/total-marketcap-usd.toml b/data-feed-generator/data-feeds-builder/templates/total-marketcap-usd.toml index 97b40b7..9a837c8 100644 --- a/data-feed-generator/data-feeds-builder/templates/total-marketcap-usd.toml +++ b/data-feed-generator/data-feeds-builder/templates/total-marketcap-usd.toml @@ -18,7 +18,7 @@ observationTimeout = "10s" transmitterAddress = "$TRANSMITTER_ADDRESS" observationSource = """ ds1 [type=http method=GET url="http://127.0.0.1:$PRICE_AGGREGATOR_PORT/market-data/global"]; - ds1_parse [type=jsonparse path="price"]; + ds1_parse [type=jsonparse path="totalMarketCap,usd"]; ds1_multiply [type=multiply times=100000000]; median [type=median]; diff --git a/price-aggregator/pairs.json b/price-aggregator/pairs.json index 3cbd3f0..594b35c 100644 --- a/price-aggregator/pairs.json +++ b/price-aggregator/pairs.json @@ -54,7 +54,6 @@ "LTC/USDT", "MANA/USDT", "MASK/USDT", - "MATIC/USDT", "MKR/USDT", "NEAR/USDT", "NEIRO/USDT", @@ -141,7 +140,6 @@ "EURC/USD", "FET/USD", "FIL/USD", - "FTT/USD", "GBP/USD", "GHST/USD", "GMT/USD",