Skip to content

merge develop into main #71

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
serega-k merged 7 commits into from
Oct 10, 2025
Merged

merge develop into main #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa663cd
fix(data-feeds): correct JSON path to `totalMarketCap.usd` in `total-…
serega-k Oct 10, 2025
23f2526
fix(data-feeds): remove unused `ds3` source from `ftt-usd.toml` template
serega-k Oct 10, 2025
590c4b2
fix(data-feeds): remove unused `coinbase_ftt_eth` sources from `ftt-e…
serega-k Oct 10, 2025
1ac4108
fix(data-feeds): update `binance_matic_usdt` source to use `POL/USDT`…
serega-k Oct 10, 2025
9050e96
fix(price-aggregator): remove `MATIC/USDT` and `FTT/USD` pairs from `…
serega-k Oct 10, 2025
33000e6
fix(data-feeds): correct JSON path to `totalMarketCap,usd` in `total-…
serega-k Oct 10, 2025
3a2d402
Merge pull request #70 from Super-Protocol/fix/jobs-part-3
serega-k Oct 10, 2025
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
13 changes: 0 additions & 13 deletions data-feed-generator/data-feeds-builder/templates/ftt-eth.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand All @@ -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;
"""
7 changes: 1 addition & 6 deletions data-feed-generator/data-feeds-builder/templates/ftt-usd.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
"""
2 changes: 1 addition & 1 deletion data-feed-generator/data-feeds-builder/templates/link-matic.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"]
Expand Down
2 changes: 1 addition & 1 deletion data-feed-generator/data-feeds-builder/templates/total-marketcap-usd.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down
2 changes: 0 additions & 2 deletions price-aggregator/pairs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"LTC/USDT",
"MANA/USDT",
"MASK/USDT",
"MATIC/USDT",
"MKR/USDT",
"NEAR/USDT",
"NEIRO/USDT",
Expand Down Expand Up @@ -141,7 +140,6 @@
"EURC/USD",
"FET/USD",
"FIL/USD",
"FTT/USD",
"GBP/USD",
"GHST/USD",
"GMT/USD",
Expand Down
Loading