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

setup pyth to use imported pyth package #71

Closed
wants to merge 6 commits into from
Closed

setup pyth to use imported pyth package #71

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4133f18
setup pyth to use imported pyth package
noisekit Nov 13, 2023
cfbd1b2
bump version
leomassazza Nov 13, 2023
e7b4e1e
update feed ids
Tburm Nov 13, 2023
e95d34f
add settlement reward
Tburm Nov 14, 2023
e580a3f
Merge branch 'main' into pyth-pack
noisekit Nov 17, 2023
c78c5a7
fixes for andromeda
dbeal-eth Nov 19, 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
8 changes: 4 additions & 4 deletions omnibus-base-goerli-andromeda.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = "synthetix-omnibus"
version = "3.3.3-dev.e141cd8c.cfg1"
version = "3.3.3-dev.ebbab360"
description = "Andromeda"
include = [
"tomls/settings-testnet.toml",
Expand Down Expand Up @@ -29,16 +29,16 @@ include = [
]

[setting.snx_package]
defaultValue = "synthetix:3.3.3-dev.e141cd8c"
defaultValue = "synthetix:3.3.3-dev.ebbab360"

[setting.target_preset]
defaultValue = "andromeda"

[setting.spot_market_package]
defaultValue = "synthetix-spot-market:3.3.3-dev.e141cd8c"
defaultValue = "synthetix-spot-market:3.3.3-dev.ebbab360"

[setting.perps_market_package]
defaultValue = "synthetix-perps-market:3.3.3-dev.e141cd8c"
defaultValue = "synthetix-perps-market:3.3.3-dev.ebbab360"

[setting.salt]
defaultValue = "andromeda"
Expand Down
2 changes: 1 addition & 1 deletion tomls/markets/common/settlement-settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[setting.pythFeedUrl]

[setting.settlementReward]
defaultValue = "0"
defaultValue = "0.1"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because settlement settings are not updatable but append only we cannot just change settings. May I suggest removing this file entirely and inline settings into the addSettlementStrategy invoke instead? Because once we add it we cannot update or remove it. Any change will require adding a new strategy and disabling the old one.


[setting.settlementMinimumUsdExchangeAmount]
defaultValue = "0.000001"
Expand Down
2 changes: 1 addition & 1 deletion tomls/omnibus-base-goerli-andromeda/perps/ltc.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[setting.pythLtcFeedId]
defaultValue = "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b"
defaultValue = "0x997e0bf451cb36b4aea096e6b5c254d700922211dd933d9d17c467f0d6f34321"

# Perps Configuration
[setting.ltcPerpsMarketId]
Expand Down
2 changes: 1 addition & 1 deletion tomls/omnibus-base-goerli-andromeda/perps/xrp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[setting.pythXrpFeedId]
defaultValue = "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b"
defaultValue = "0xbfaf7739cb6fe3e1c57a0ac08e1d931e9e6062d476fa57804e165ab572b5b621"

# Perps Configuration
[setting.xrpPerpsMarketId]
Expand Down
9 changes: 5 additions & 4 deletions tomls/oracles/pyth-btc.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
include = ["../core.toml"]

[setting.btc_aggregator_address]
[import.pyth]
source = "pyth:1.4.0"

[invoke.registerBtcOracleNode]
target = ["system.oracle_manager.Proxy"]
func = "registerNode"
args = [
# 2 = external aggregator type (later this will be PYTH)
2,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.btc_aggregator_address, settings.pythBtcFeedId, 30]) %>",
# 5 = pyth aggregator type
5,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'bool'], [imports.pyth.contracts.Pyth.address, settings.pythBtcFeedId, false]) %>",
[]
]
extra.btc_oracle_id.event = "NodeRegistered"
Expand Down
9 changes: 5 additions & 4 deletions tomls/oracles/pyth-eth.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
include = ["../core.toml"]

[setting.eth_aggregator_address]
[import.pyth]
source = "pyth:1.4.0"

[invoke.registerEthOracleNode]
target = ["system.oracle_manager.Proxy"]
func = "registerNode"
args = [
# 2 = external aggregator type (later this will be PYTH)
2,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.eth_aggregator_address, settings.pythEthFeedId, 30]) %>",
# 5 = pyth aggregator type
5,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'bool'], [imports.pyth.contracts.Pyth.address, settings.pythEthFeedId, false]) %>",
[]
]
extra.eth_oracle_id.event = "NodeRegistered"
Expand Down
9 changes: 5 additions & 4 deletions tomls/oracles/pyth-link.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
include = ["../core.toml"]

[setting.link_aggregator_address]
[import.pyth]
source = "pyth:1.4.0"

[invoke.registerLinkOracleNode]
target = ["system.oracle_manager.Proxy"]
func = "registerNode"
args = [
# 2 = external aggregator type (later this will be PYTH)
2,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.link_aggregator_address, settings.pythLinkFeedId, 30]) %>",
# 5 = pyth aggregator type
5,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [imports.pyth.contracts.Pyth.address, settings.pythLinkFeedId, false]) %>",
[]
]
extra.link_oracle_id.event = "NodeRegistered"
Expand Down
9 changes: 5 additions & 4 deletions tomls/oracles/pyth-ltc.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
include = ["../core.toml"]

[setting.ltc_aggregator_address]
[import.pyth]
source = "pyth:1.4.0"

[invoke.registerLtcOracleNode]
target = ["system.oracle_manager.Proxy"]
func = "registerNode"
args = [
# 2 = external aggregator type (later this will be PYTH)
2,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.ltc_aggregator_address, settings.pythLtcFeedId, 30]) %>",
# 5 = pyth aggregator type
5,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'bool'], [imports.pyth.contracts.Pyth.address, settings.pythLtcFeedId, false]) %>",
[]
]
extra.ltc_oracle_id.event = "NodeRegistered"
Expand Down
9 changes: 5 additions & 4 deletions tomls/oracles/pyth-op.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
include = ["../core.toml"]

[setting.op_aggregator_address]
[import.pyth]
source = "pyth:1.4.0"

[invoke.registerOpOracleNode]
target = ["system.oracle_manager.Proxy"]
func = "registerNode"
args = [
# 2 = external aggregator type (later this will be PYTH)
2,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.op_aggregator_address, settings.pythOpFeedId, 30]) %>",
# 5 = pyth aggregator type
5,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'bool'], [imports.pyth.contracts.Pyth.address, settings.pythOpFeedId, false]) %>",
[]
]
extra.op_oracle_id.event = "NodeRegistered"
Expand Down
9 changes: 5 additions & 4 deletions tomls/oracles/pyth-snx.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
include = ["../core.toml"]

[setting.snx_aggregator_address]
[import.pyth]
source = "pyth:1.4.0"

[invoke.registerSnxOracleNode]
target = ["system.oracle_manager.Proxy"]
func = "registerNode"
args = [
# 2 = external aggregator type (later this will be PYTH)
2,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.snx_aggregator_address, settings.pythSnxFeedId, 30]) %>",
# 5 = pyth aggregator type
5,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'bool'], [imports.pyth.contracts.Pyth.address, settings.pythSnxFeedId, false]) %>",
[]
]
extra.snx_oracle_id.event = "NodeRegistered"
Expand Down
9 changes: 5 additions & 4 deletions tomls/oracles/pyth-xrp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
include = ["../core.toml"]

[setting.xrp_aggregator_address]
[import.pyth]
source = "pyth:1.4.0"

[invoke.registerXrpOracleNode]
target = ["system.oracle_manager.Proxy"]
func = "registerNode"
args = [
# 2 = external aggregator type (later this will be PYTH)
2,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.xrp_aggregator_address, settings.pythXrpFeedId, 30]) %>",
# 5 = pyth aggregator type
5,
"<%= defaultAbiCoder.encode(['address', 'bytes32', 'bool'], [imports.pyth.contracts.Pyth.address, settings.pythXrpFeedId, false]) %>",
[]
]
extra.xrp_oracle_id.event = "NodeRegistered"
Expand Down
Loading