diff --git a/omnibus-base-goerli-andromeda.toml b/omnibus-base-goerli-andromeda.toml index b9a1479af..b7eccb294 100644 --- a/omnibus-base-goerli-andromeda.toml +++ b/omnibus-base-goerli-andromeda.toml @@ -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", @@ -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" diff --git a/tomls/markets/common/bigcap-settings.toml b/tomls/markets/common/bigcap-settings.toml index 4afc41ecb..071f12a6e 100644 --- a/tomls/markets/common/bigcap-settings.toml +++ b/tomls/markets/common/bigcap-settings.toml @@ -8,3 +8,6 @@ defaultValue = "60" [setting.bigCapPriceWindowDuration] defaultValue = "600" + +[setting.bigCapStrictStalenessTolerance] +defaultValue = "120" diff --git a/tomls/markets/common/settlement-settings.toml b/tomls/markets/common/settlement-settings.toml index 6e3c831e2..2414315ac 100644 --- a/tomls/markets/common/settlement-settings.toml +++ b/tomls/markets/common/settlement-settings.toml @@ -3,7 +3,7 @@ [setting.pythFeedUrl] [setting.settlementReward] -defaultValue = "0" +defaultValue = "0.1" [setting.settlementMinimumUsdExchangeAmount] defaultValue = "0.000001" diff --git a/tomls/markets/perps/btc.toml b/tomls/markets/perps/btc.toml index 9e388f948..ca481de96 100644 --- a/tomls/markets/perps/btc.toml +++ b/tomls/markets/perps/btc.toml @@ -39,7 +39,7 @@ depends = ["provision.perpsFactory"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" -args = ["<%= settings.btcPerpsMarketId %>", "<%= extras.btc_oracle_id %>"] +args = ["<%= settings.btcPerpsMarketId %>", "<%= extras.btc_oracle_id %>", "<%= settings.bigCapStrictStalenessTolerance %>"] depends = ["invoke.createBtcPerpsMarket", "invoke.registerBtcOracleNode"] [invoke.setPerpsBtcSettlementStrategy] @@ -49,7 +49,7 @@ func = "addSettlementStrategy" args = [ "<%= settings.btcPerpsMarketId %>", # strategyType = 0 (pyth) - { strategyType = "0", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythBtcFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } + { strategyType = "0", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythBtcFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= parseEther(settings.settlementReward) %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } ] depends = ["invoke.createBtcPerpsMarket"] diff --git a/tomls/markets/perps/eth.toml b/tomls/markets/perps/eth.toml index ec8e00a1f..a0512634d 100644 --- a/tomls/markets/perps/eth.toml +++ b/tomls/markets/perps/eth.toml @@ -47,7 +47,7 @@ depends = ["provision.perpsFactory"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" -args = ["<%= settings.ethPerpsMarketId %>", "<%= extras.eth_oracle_id %>"] +args = ["<%= settings.ethPerpsMarketId %>", "<%= extras.eth_oracle_id %>", "<%= settings.bigCapStrictStalenessTolerance %>"] depends = ["invoke.createEthPerpsMarket", "invoke.registerEthOracleNode"] [invoke.setPerpsEthSettlementStrategy] @@ -57,7 +57,7 @@ func = "addSettlementStrategy" args = [ "<%= settings.ethPerpsMarketId %>", # strategyType = 0 (pyth) - { strategyType = "0", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythEthFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } + { strategyType = "0", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythEthFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= parseEther(settings.settlementReward) %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } ] depends = ["invoke.createEthPerpsMarket"] diff --git a/tomls/markets/perps/link.toml b/tomls/markets/perps/link.toml index b374a37e6..8bee4bb5d 100644 --- a/tomls/markets/perps/link.toml +++ b/tomls/markets/perps/link.toml @@ -43,7 +43,7 @@ depends = ["provision.perpsFactory"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" -args = ["<%= settings.linkPerpsMarketId %>", "<%= extras.link_oracle_id %>"] +args = ["<%= settings.linkPerpsMarketId %>", "<%= extras.link_oracle_id %>", "<%= settings.bigCapStrictStalenessTolerance %>"] depends = ["invoke.createLinkPerpsMarket", "invoke.registerLinkOracleNode"] [invoke.setPerpsLinkSettlementStrategy] @@ -53,7 +53,7 @@ func = "addSettlementStrategy" args = [ "<%= settings.linkPerpsMarketId %>", # strategyType = 0 (pyth) - { strategyType = "0", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythLinkFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } + { strategyType = "0", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythLinkFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= parseEther(settings.settlementReward) %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } ] depends = ["invoke.createLinkPerpsMarket"] diff --git a/tomls/markets/perps/ltc.toml b/tomls/markets/perps/ltc.toml index 48f46bb1f..438e93865 100644 --- a/tomls/markets/perps/ltc.toml +++ b/tomls/markets/perps/ltc.toml @@ -49,7 +49,7 @@ depends = ["provision.perpsFactory"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" -args = ["<%= settings.ltcPerpsMarketId %>", "<%= extras.ltc_oracle_id %>"] +args = ["<%= settings.ltcPerpsMarketId %>", "<%= extras.ltc_oracle_id %>", "<%= settings.bigCapStrictStalenessTolerance %>"] depends = ["invoke.createLtcPerpsMarket", "invoke.registerLtcOracleNode"] [invoke.setPerpsLtcSettlementStrategy] @@ -58,7 +58,7 @@ fromCall.func = "owner" func = "addSettlementStrategy" args = [ "<%= settings.ltcPerpsMarketId %>", - { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythLtcFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } + { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythLtcFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= parseEther(settings.settlementReward) %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } ] depends = ["invoke.createLtcPerpsMarket"] diff --git a/tomls/markets/perps/op.toml b/tomls/markets/perps/op.toml index 1b1d4acc8..fa8c1f328 100644 --- a/tomls/markets/perps/op.toml +++ b/tomls/markets/perps/op.toml @@ -49,7 +49,7 @@ depends = ["provision.perpsFactory"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" -args = ["<%= settings.opPerpsMarketId %>", "<%= extras.op_oracle_id %>"] +args = ["<%= settings.opPerpsMarketId %>", "<%= extras.op_oracle_id %>", "<%= settings.bigCapStrictStalenessTolerance %>"] depends = ["invoke.createOpPerpsMarket", "invoke.registerOpOracleNode"] [invoke.setPerpsOpSettlementStrategy] @@ -58,7 +58,7 @@ fromCall.func = "owner" func = "addSettlementStrategy" args = [ "<%= settings.opPerpsMarketId %>", - { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythOpFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } + { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythOpFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= parseEther(settings.settlementReward) %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } ] depends = ["invoke.createOpPerpsMarket"] diff --git a/tomls/markets/perps/snx.toml b/tomls/markets/perps/snx.toml index 4961eb675..5ab1edddc 100644 --- a/tomls/markets/perps/snx.toml +++ b/tomls/markets/perps/snx.toml @@ -49,7 +49,7 @@ depends = ["provision.perpsFactory"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" -args = ["<%= settings.snxPerpsMarketId %>", "<%= extras.snx_oracle_id %>"] +args = ["<%= settings.snxPerpsMarketId %>", "<%= extras.snx_oracle_id %>", "<%= settings.bigCapStrictStalenessTolerance %>"] depends = ["invoke.createSnxPerpsMarket", "invoke.registerSnxOracleNode"] [invoke.setPerpsSnxSettlementStrategy] @@ -58,7 +58,7 @@ fromCall.func = "owner" func = "addSettlementStrategy" args = [ "<%= settings.snxPerpsMarketId %>", - { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythSnxFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } + { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythSnxFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= parseEther(settings.settlementReward) %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } ] depends = ["invoke.createSnxPerpsMarket"] diff --git a/tomls/markets/perps/xrp.toml b/tomls/markets/perps/xrp.toml index 78a7ff709..0540d1b4d 100644 --- a/tomls/markets/perps/xrp.toml +++ b/tomls/markets/perps/xrp.toml @@ -49,7 +49,7 @@ depends = ["provision.perpsFactory"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" -args = ["<%= settings.xrpPerpsMarketId %>", "<%= extras.xrp_oracle_id %>"] +args = ["<%= settings.xrpPerpsMarketId %>", "<%= extras.xrp_oracle_id %>", "<%= settings.bigCapStrictStalenessTolerance %>"] depends = ["invoke.createXrpPerpsMarket", "invoke.registerXrpOracleNode"] [invoke.setPerpsXrpSettlementStrategy] @@ -58,7 +58,7 @@ fromCall.func = "owner" func = "addSettlementStrategy" args = [ "<%= settings.xrpPerpsMarketId %>", - { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythXrpFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } + { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceWindowDuration = "<%= settings.bigCapPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythXrpFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= parseEther(settings.settlementReward) %>", priceDeviationTolerance = "<%= parseEther('1') %>", disabled = false } ] depends = ["invoke.createXrpPerpsMarket"] diff --git a/tomls/omnibus-base-goerli-andromeda/perps/ltc.toml b/tomls/omnibus-base-goerli-andromeda/perps/ltc.toml index 057e3804c..20c5c2706 100644 --- a/tomls/omnibus-base-goerli-andromeda/perps/ltc.toml +++ b/tomls/omnibus-base-goerli-andromeda/perps/ltc.toml @@ -1,5 +1,5 @@ [setting.pythLtcFeedId] -defaultValue = "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b" +defaultValue = "0x997e0bf451cb36b4aea096e6b5c254d700922211dd933d9d17c467f0d6f34321" # Perps Configuration [setting.ltcPerpsMarketId] diff --git a/tomls/omnibus-base-goerli-andromeda/perps/xrp.toml b/tomls/omnibus-base-goerli-andromeda/perps/xrp.toml index 4cd342516..c452b4386 100644 --- a/tomls/omnibus-base-goerli-andromeda/perps/xrp.toml +++ b/tomls/omnibus-base-goerli-andromeda/perps/xrp.toml @@ -1,5 +1,5 @@ [setting.pythXrpFeedId] -defaultValue = "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b" +defaultValue = "0xbfaf7739cb6fe3e1c57a0ac08e1d931e9e6062d476fa57804e165ab572b5b621" # Perps Configuration [setting.xrpPerpsMarketId] diff --git a/tomls/oracles/pyth-btc.toml b/tomls/oracles/pyth-btc.toml index 85a11cc4f..3690308d8 100644 --- a/tomls/oracles/pyth-btc.toml +++ b/tomls/oracles/pyth-btc.toml @@ -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" diff --git a/tomls/oracles/pyth-eth.toml b/tomls/oracles/pyth-eth.toml index 053a65670..c032a0917 100644 --- a/tomls/oracles/pyth-eth.toml +++ b/tomls/oracles/pyth-eth.toml @@ -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" diff --git a/tomls/oracles/pyth-link.toml b/tomls/oracles/pyth-link.toml index 8fc4bdded..4a1f4145f 100644 --- a/tomls/oracles/pyth-link.toml +++ b/tomls/oracles/pyth-link.toml @@ -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" diff --git a/tomls/oracles/pyth-ltc.toml b/tomls/oracles/pyth-ltc.toml index 410675bfa..c1fa1c81e 100644 --- a/tomls/oracles/pyth-ltc.toml +++ b/tomls/oracles/pyth-ltc.toml @@ -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" diff --git a/tomls/oracles/pyth-op.toml b/tomls/oracles/pyth-op.toml index d9250b1d7..c92dfbb83 100644 --- a/tomls/oracles/pyth-op.toml +++ b/tomls/oracles/pyth-op.toml @@ -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" diff --git a/tomls/oracles/pyth-snx.toml b/tomls/oracles/pyth-snx.toml index 4b46d20f3..a602a1a3f 100644 --- a/tomls/oracles/pyth-snx.toml +++ b/tomls/oracles/pyth-snx.toml @@ -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" diff --git a/tomls/oracles/pyth-xrp.toml b/tomls/oracles/pyth-xrp.toml index 7812ce95d..8dacf565f 100644 --- a/tomls/oracles/pyth-xrp.toml +++ b/tomls/oracles/pyth-xrp.toml @@ -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"