Skip to content
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

Jump to bottom

#162 - Update publish script for tesnet #163

Merged
merged 6 commits into from
Sep 13, 2023
Merged

#162 - Update publish script for tesnet #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c9de32
Set trueval timeout to 3 days
trizin Sep 11, 2023
178c5c6
Add publish configuration for testnet
trizin Sep 11, 2023
6b76fc2
Fix hardcoded test
trizin Sep 11, 2023
b4b29e0
Merge branch 'main' into issue162-update-publish-script-for-tesnet
trizin Sep 12, 2023
5c7b848
Get address from address file
trizin Sep 13, 2023
91f5a61
Merge branch 'main' into issue162-update-publish-script-for-tesnet
trizin Sep 13, 2023
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
2 changes: 1 addition & 1 deletion pdr_backend/models/test/test_predictoor_contract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def test_soonest_timestamp_to_predict(predictoor_contract):
@enforce_types
def test_get_trueValSubmitTimeout(predictoor_contract):
trueValSubmitTimeout = predictoor_contract.get_trueValSubmitTimeout()
assert trueValSubmitTimeout == 4 * 12 * SECONDS_PER_EPOCH
assert trueValSubmitTimeout == 3 * 24 * 60 * 60


@enforce_types
Expand Down
100 changes: 61 additions & 39 deletions pdr_backend/publisher/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,45 +25,67 @@

if web3_config.w3.eth.chain_id == 8996:
fund_dev_accounts(accounts_to_fund, web3_config.owner, OCEAN)
publish(
s_per_epoch=300,
s_per_subscription=60 * 60 * 24,
base="ETH",
quote="USDT",
source="binance",
timeframe="5m",
trueval_submitter_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260", # on arge
feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
rate=3,
cut=0.2,
web3_config=web3_config,
)

publish(
s_per_epoch=300,
s_per_subscription=60 * 60 * 24,
base="ETH",
quote="USDT",
source="kraken",
timeframe="5m",
trueval_submitter_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260", # on arge
feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
rate=3,
cut=0.2,
web3_config=web3_config,
)
publish(
s_per_epoch=300,
s_per_subscription=60 * 60 * 24,
base="BTC",
quote="TUSD",
source="binance",
timeframe="5m",
trueval_submitter_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
rate=3,
cut=0.2,
web3_config=web3_config,
)

publish(
s_per_epoch=300,
s_per_subscription=60 * 60 * 24,
base="BTC",
quote="TUSD",
source="binance",
timeframe="5m",
trueval_submitter_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
rate=3,
cut=0.2,
web3_config=web3_config,
)
publish(
s_per_epoch=300,
s_per_subscription=60 * 60 * 24,
base="XRP",
quote="USDT",
source="binance",
timeframe="5m",
trueval_submitter_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
rate=3,
cut=0.2,
web3_config=web3_config,
)

publish(
s_per_epoch=300,
s_per_subscription=60 * 60 * 24,
base="XRP",
quote="USDT",
source="binance",
timeframe="5m",
trueval_submitter_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
rate=3,
cut=0.2,
web3_config=web3_config,
)
if web3_config.w3.eth.chain_id == 23295:
rate = 3 / (1 + 0.2 + 0.001)
pair_list = ["BTC", "ETH", "BNB", "XRP", "ADA", "DOGE", "SOL", "LTC", "TRX", "DOT"]
helper_contract = get_address(web3_config.w3.eth.chain_id, "PredictoorHelper")

for pair in pair_list:
publish(
s_per_epoch=300,
s_per_subscription=60 * 60 * 24,
base=pair,
quote="USDT",
source="binance",
timeframe="5m",
trueval_submitter_addr=helper_contract,
feeCollector_addr="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260",
rate=rate,
cut=0.2,
web3_config=web3_config,
)

if web3_config.w3.eth.chain_id == 23294:
raise NotImplementedError("Mainnet deployment configuration is missing")
2 changes: 1 addition & 1 deletion pdr_backend/publisher/publish.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def publish(
web3_config,
):
pair = base + "/" + quote
trueval_timeout = 4 * 12 * s_per_epoch
trueval_timeout = 60 * 60 * 24 * 3
owner = web3_config.owner
ocean_address = get_address(web3_config.w3.eth.chain_id, "Ocean")
fre_address = get_address(web3_config.w3.eth.chain_id, "FixedPrice")
Expand Down
Loading