From 6915c8635d4a276f550ae87ee88aa0f08d02e84b Mon Sep 17 00:00:00 2001 From: YashK Date: Thu, 21 Dec 2023 11:56:49 +0530 Subject: [PATCH 1/3] refactor: added all the current staging jobs/collections to testnet datafeeds --- testnet/collections.json | 64 +++++++- testnet/jobs.json | 344 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 404 insertions(+), 4 deletions(-) diff --git a/testnet/collections.json b/testnet/collections.json index 6ecb856..3f393c4 100644 --- a/testnet/collections.json +++ b/testnet/collections.json @@ -1,23 +1,79 @@ [ { - "jobIDs": [1, 2, 3, 6, 7, 8, 9], + "jobIDs": [1, 2, 3, 5, 6, 7, 8, 9, 17, 24], "aggregationMethod": 2, "power": 2, "name": "ethCollectionMedian", "tolerance": 500000 }, { - "jobIDs": [10, 11, 12], + "jobIDs": [10, 11, 58, 59], "aggregationMethod": 2, - "power": 2, + "power": 8, "name": "RAZORUSD", "tolerance": 500000 }, { - "jobIDs": [13, 14, 15, 16], + "jobIDs": [13, 15, 16], "aggregationMethod": 2, "power": 2, "name": "UFTUSD", "tolerance": 500000 + }, + { + "jobIDs": [18, 19, 20, 21, 22, 23], + "aggregationMethod": 2, + "power": 2, + "name": "BTCUSD", + "tolerance": 500000 + }, + { + "jobIDs": [25, 26, 27], + "aggregationMethod": 2, + "power": 5, + "name": "USDCUSD", + "tolerance": 500000 + }, + { + "jobIDs": [28, 29, 30], + "aggregationMethod": 2, + "power": 5, + "name": "USDTUSD", + "tolerance": 500000 + }, + { + "jobIDs": [31, 32, 33, 34, 35, 36], + "aggregationMethod": 2, + "power": 4, + "name": "MATICUSD", + "tolerance": 500000 + }, + { + "jobIDs": [38, 39, 40, 41, 42], + "aggregationMethod": 2, + "power": 4, + "name": "GRTUSD", + "tolerance": 500000 + }, + { + "jobIDs": [44, 45, 46], + "aggregationMethod": 2, + "power": 4, + "name": "ARBUSD", + "tolerance": 500000 + }, + { + "jobIDs": [48, 49, 50, 51], + "aggregationMethod": 2, + "power": 4, + "name": "SOLUSD", + "tolerance": 500000 + }, + { + "jobIDs": [52, 53, 54, 56, 57], + "aggregationMethod": 2, + "power": 6, + "name": "SKALEUSD", + "tolerance": 500000 } ] \ No newline at end of file diff --git a/testnet/jobs.json b/testnet/jobs.json index af43066..55560f4 100644 --- a/testnet/jobs.json +++ b/testnet/jobs.json @@ -126,5 +126,349 @@ "name": "uftusd_binance", "selector": "price", "url": "https://api.binance.com/api/v3/avgPrice?symbol=UFTBUSD" + }, + { + "weight": 1, + "power": -4, + "selectorType": 0, + "name": "ethusd_postJob", + "selector": "result", + "url": "{\"type\": \"POST\",\"url\": \"https://rpc.ankr.com/eth\",\"body\": {\"jsonrpc\":\"2.0\",\"method\":\"eth_call\",\"params\":[{\"to\":\"0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6\",\"data\":\"0xf7729d43000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000bb80000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000000\"}],\"id\":5},\"header\": {\"content-type\": \"application/json\"}, \"returnType\": \"hex\"}" + }, + { + "weight": 1, + "power": 2, + "selectorType": 0, + "name": "btcusd_gemini", + "selector": "last", + "url": "https://api.gemini.com/v1/pubticker/btcusd" + }, + { + "weight": 1, + "power": 2, + "selectorType": 0, + "name": "btcusd_kucoin", + "selector": "data.BTC", + "url": "https://api.kucoin.com/api/v1/prices?base=USD¤cies=BTC" + }, + { + "weight": 1, + "power": 2, + "selectorType": 0, + "name": "btcusd_kraken", + "selector": "result.XXBTZUSD.c[0]", + "url": "https://api.kraken.com/0/public/Ticker?pair=BTCUSD" + }, + { + "weight": 1, + "power": 2, + "selectorType": 0, + "name": "btcusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/BTC-USD/spot" + }, + { + "weight": 1, + "power": 2, + "selectorType": 0, + "name": "btcusd_coingecko_api", + "selector": "bitcoin.usd", + "url": "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=usd" + }, + { + "weight": 1, + "power": 2, + "selectorType": 0, + "name": "btc_kucoin_common_api", + "selector": "data.BTC", + "url": "https://api.kucoin.com/api/v1/prices?base=USD¤cies=ETH,BTC" + }, + { + "weight": 1, + "power": 2, + "selectorType": 0, + "name": "eth_kucoin_common_api", + "selector": "data.ETH", + "url": "https://api.kucoin.com/api/v1/prices?base=USD¤cies=ETH,BTC" + }, + { + "weight": 1, + "power": 5, + "selectorType": 0, + "name": "usdcusd_gemini", + "selector": "last", + "url": "https://api.gemini.com/v1/pubticker/usdcusd" + }, + { + "weight": 1, + "power": 5, + "selectorType": 0, + "name": "usdcusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/USDC-USD/spot" + }, + { + "weight": 1, + "power": 5, + "selectorType": 0, + "name": "usdcusd_kraken", + "selector": "result.USDCUSD.c[0]", + "url": "https://api.kraken.com/0/public/Ticker?pair=USDCUSD" + }, + { + "weight": 1, + "power": 5, + "selectorType": 0, + "name": "usdtusd_gemini", + "selector": "last", + "url": "https://api.gemini.com/v1/pubticker/usdtusd" + }, + { + "weight": 1, + "power": 5, + "selectorType": 0, + "name": "usdtusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/USDT-USD/spot" + }, + { + "weight": 1, + "power": 5, + "selectorType": 0, + "name": "usdtusd_kraken", + "selector": "result.USDTZUSD.c[0]", + "url": "https://api.kraken.com/0/public/Ticker?pair=USDTZUSD" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "maticusd_gemini", + "selector": "last", + "url": "https://api.gemini.com/v1/pubticker/maticusd" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "maticusd_kucoin", + "selector": "data.MATIC", + "url": "https://api.kucoin.com/api/v1/prices?base=USD¤cies=MATIC" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "maticusd_kraken", + "selector": "result.MATICUSD.c[0]", + "url": "https://api.kraken.com/0/public/Ticker?pair=MATICUSD" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "maticusd_binance", + "selector": "price", + "url": "https://api.binance.com/api/v3/avgPrice?symbol=MATICBUSD" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "maticusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/MATIC-USD/spot" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "maticusd_cryptocompare", + "selector": "USD", + "url": "https://min-api.cryptocompare.com/data/price?fsym=MATIC&tsyms=USD" + }, + { + "weight": 1, + "power": 4, + "selectorType": 1, + "name": "maticusd_coinmarjetcap_xhtml", + "selector": "/html/body/div[1]/div[2]/div/div[2]/div/div/div[2]/div[1]/div[2]/span", + "url": "https://coinmarketcap.com/currencies/polygon/" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "grtusd_gemini", + "selector": "last", + "url": "https://api.gemini.com/v1/pubticker/grtusd" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "grtusd_kucoin", + "selector": "data.GRT", + "url": "https://api.kucoin.com/api/v1/prices?base=USD¤cies=GRT" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "grtusd_kraken", + "selector": "result.GRTUSD.c[0]", + "url": "https://api.kraken.com/0/public/Ticker?pair=GRTUSD" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "grtusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/GRT-USD/spot" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "grtusd_cryptocompare", + "selector": "USD", + "url": "https://min-api.cryptocompare.com/data/price?fsym=GRT&tsyms=USD" + }, + { + "weight": 1, + "power": 4, + "selectorType": 1, + "name": "grtusd_blockworks_xhtml", + "selector": "/html/body/div[1]/div/main/div[2]/div[1]/section[2]/div[1]/div/div[1]/div[1]/p", + "url": "https://blockworks.co/price/grt" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "arbusd_kucoin", + "selector": "data.ARB", + "url": "https://api.kucoin.com/api/v1/prices?base=USD¤cies=ARB" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "arbusd_kraken", + "selector": "result.ARBUSD.c[0]", + "url": "https://api.kraken.com/0/public/Ticker?pair=ARBUSD" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "arbusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/ARB-USD/spot" + }, + { + "weight": 1, + "power": 4, + "selectorType": 1, + "name": "arb_binance_xhtml", + "selector": "/html/body/div[3]/section/div/div[2]/div[4]/div[1]/div[1]", + "url": "https://www.binance.com/en-IN/price/arbitrum" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "solusd_kucoin", + "selector": "data.SOL", + "url": "https://api.kucoin.com/api/v1/prices?base=USD¤cies=SOL" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "solusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/SOL-USD/spot" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "solusd_kraken", + "selector": "result.SOLUSD.c[0]", + "url": "https://api.kraken.com/0/public/Ticker?pair=SOLUSD" + }, + { + "weight": 1, + "power": 4, + "selectorType": 0, + "name": "solusd_gemini", + "selector": "last", + "url": "https://api.gemini.com/v1/pubticker/solusd" + }, + { + "weight": 1, + "power": 6, + "selectorType": 0, + "name": "sklusd_gemini", + "selector": "last", + "url": "https://api.gemini.com/v1/pubticker/sklusd" + }, + { + "weight": 1, + "power": 6, + "selectorType": 0, + "name": "sklusd_kucoin", + "selector": "data.SKL", + "url": "https://api.kucoin.com/api/v1/prices?base=USD¤cies=SKL" + }, + { + "weight": 1, + "power": 6, + "selectorType": 0, + "name": "sklusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/SKL-USD/spot" + }, + { + "weight": 1, + "power": 6, + "selectorType": 1, + "name": "sklusd_binance_xhtml", + "selector": "/html/body/div[3]/section/div/div[2]/div[4]/div[1]/div[1]", + "url": "https://www.binance.com/en-IN/price/skale-network" + }, + { + "weight": 1, + "power": 6, + "selectorType": 0, + "name": "sklusd_coingecko_api", + "selector": "skale.usd", + "url": "https://api.coingecko.com/api/v3/simple/price?ids=skale&vs_currencies=usd" + }, + { + "weight": 1, + "power": 6, + "selectorType": 0, + "name": "sklusd_cryptocompare", + "selector": "USD", + "url": "https://min-api.cryptocompare.com/data/price?fsym=SKL&tsyms=USD" + }, + { + "weight": 1, + "power": 8, + "selectorType": 0, + "name": "razorusd_coinbase", + "selector": "data.amount", + "url": "https://api.coinbase.com/v2/prices/RAZOR-USD/spot" + }, + { + "weight": 1, + "power": 8, + "selectorType": 0, + "name": "razorusdp_uniswap_v2", + "selector": "result", + "url": "{\"type\": \"POST\",\"url\": \"https://rpc.ankr.com/eth\",\"body\": {\"jsonrpc\":\"2.0\",\"id\":7269270904970082,\"method\":\"eth_call\",\"params\":[{\"from\":\"0x0000000000000000000000000000000000000000\",\"data\":\"0xd06ca61f0000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000050de6856358cc35f3a9a57eaaa34bd4cb707d2cd0000000000000000000000008e870d67f660d95d5be530380d0ec0bd388289e1\",\"to\":\"0x7a250d5630b4cf539739df2c5dacb4c659f2488d\"},\"latest\"]},\"header\": {\"content-type\": \"application/json\"}, \"returnType\": \"hexArray[1]\"}" } ] \ No newline at end of file From a1d8b1810d06dc207909e8c578352e4598a382cc Mon Sep 17 00:00:00 2001 From: YashK Date: Thu, 21 Dec 2023 15:35:24 +0530 Subject: [PATCH 2/3] refactor: removed post jobs from collections --- testnet/collections.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testnet/collections.json b/testnet/collections.json index 3f393c4..2265990 100644 --- a/testnet/collections.json +++ b/testnet/collections.json @@ -1,13 +1,13 @@ [ { - "jobIDs": [1, 2, 3, 5, 6, 7, 8, 9, 17, 24], + "jobIDs": [1, 2, 3, 5, 6, 7, 8, 9, 24], "aggregationMethod": 2, "power": 2, "name": "ethCollectionMedian", "tolerance": 500000 }, { - "jobIDs": [10, 11, 58, 59], + "jobIDs": [10, 11, 58], "aggregationMethod": 2, "power": 8, "name": "RAZORUSD", From a34e53d8b3226e3e956c6f8e3d2f279b626b6165 Mon Sep 17 00:00:00 2001 From: YashK Date: Fri, 22 Dec 2023 14:43:23 +0530 Subject: [PATCH 3/3] refactor: removed coingecko jobs from collections --- testnet/collections.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testnet/collections.json b/testnet/collections.json index 2265990..66a4564 100644 --- a/testnet/collections.json +++ b/testnet/collections.json @@ -1,6 +1,6 @@ [ { - "jobIDs": [1, 2, 3, 5, 6, 7, 8, 9, 24], + "jobIDs": [1, 2, 3, 5, 6, 8, 9, 24], "aggregationMethod": 2, "power": 2, "name": "ethCollectionMedian", @@ -21,7 +21,7 @@ "tolerance": 500000 }, { - "jobIDs": [18, 19, 20, 21, 22, 23], + "jobIDs": [18, 19, 20, 21, 23], "aggregationMethod": 2, "power": 2, "name": "BTCUSD", @@ -70,7 +70,7 @@ "tolerance": 500000 }, { - "jobIDs": [52, 53, 54, 56, 57], + "jobIDs": [52, 53, 54, 57], "aggregationMethod": 2, "power": 6, "name": "SKALEUSD",