diff --git a/README.md b/README.md index 276295e1f..5643d55bf 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,8 @@ This is a GitOps repo for deployment of the [Synthetix](https://www.github.com/s ### Specify Upgrade -- After [publishing any new versions of the provisioned packages](https://github.com/synthetixio/synthetix-v3#deployment-guide) (`oracle-manager`, `synthetix` and `spot-market`), bump the versions throughout the cannonfiles to match. +- After [publishing any new versions of the provisioned packages](https://github.com/synthetixio/synthetix-v3#deployment-guide) (`oracle-manager`, `synthetix` + and `spot-market`), bump the versions throughout the cannonfiles to match. - Add new settings and invoke actions as necessary. - Increment the version number and update the values in the network-specific omnibus cannonfiles as desired. @@ -35,7 +36,11 @@ _The --provider-url and --private-key parameters are unnecessary if using [Frame ### Finalize Release -- If you've updated the provisioned packages, verify your new contracts on Etherscan: `cannon verify synthetix-omnibus: --api-key --chain-id ` -- Publish your new packages on the Cannon registry: `cannon publish synthetix-omnibus: --private-key --tags latest,3` (_The --private-key parameter is unnecessary if using [Frame](https://frame.sh/)_) +- If you've updated the provisioned packages, verify your new contracts on + Etherscan: `cannon verify synthetix-omnibus: --api-key --chain-id ` +- Publish your new packages on the Cannon + registry: `cannon publish synthetix-omnibus: --private-key --tags latest,3` ( + _The --private-key parameter is unnecessary if using [Frame](https://frame.sh/)_) - Commit and merge the change to this repository. -- Run the [**Export ABIs** action](https://github.com/Synthetixio/v3-abi-exporter/actions/workflows/main.yml) in the `v3-abi-exporter` repository. +- Run the [**Export ABIs** action](https://github.com/Synthetixio/v3-abi-exporter/actions/workflows/main.yml) in + the `v3-abi-exporter` repository. diff --git a/omnibus-base-goerli-competition.toml b/omnibus-base-goerli-competition.toml index 6f4ef37e4..4a903601d 100644 --- a/omnibus-base-goerli-competition.toml +++ b/omnibus-base-goerli-competition.toml @@ -6,31 +6,29 @@ include = [ "tomls/core.toml", "tomls/permissions.toml", "tomls/collaterals/weth.toml", - "tomls/collaterals/wbtc.toml", - "tomls/collaterals/op.toml", + "tomls/collaterals/wbtc.toml", + "tomls/collaterals/op.toml", "tomls/pools/spartan-council.toml", "tomls/pools/passive-snx.toml", "tomls/permit-all-createPool.toml", "tomls/permit-all-registerMarket.toml", "tomls/permit-all-transferCrossChain.toml", - "tomls/markets/spot/eth.toml", - "tomls/markets/spot/btc.toml", - "tomls/markets/spot/snx.toml", - "tomls/markets/spot/link.toml", - "tomls/markets/spot/op.toml", - "tomls/markets/perps/eth.toml", - "tomls/markets/perps/btc.toml", - "tomls/markets/perps/snx.toml", - "tomls/markets/perps/link.toml", - "tomls/markets/perps/op.toml", - - # overrides for the oracles (will replace imports from above modules to use pyth instead of chainlink) - "tomls/oracles/pyth-eth.toml", - "tomls/oracles/pyth-btc.toml", - "tomls/oracles/pyth-snx.toml", - "tomls/oracles/pyth-link.toml", - "tomls/oracles/pyth-op.toml", - + "tomls/markets/spot/eth.toml", + "tomls/markets/spot/btc.toml", + "tomls/markets/spot/snx.toml", + "tomls/markets/spot/link.toml", + "tomls/markets/spot/op.toml", + "tomls/markets/perps/eth.toml", + "tomls/markets/perps/btc.toml", + "tomls/markets/perps/snx.toml", + "tomls/markets/perps/link.toml", + "tomls/markets/perps/op.toml", + # overrides for the oracles (will replace imports from above modules to use pyth instead of chainlink) + "tomls/oracles/pyth-eth.toml", + "tomls/oracles/pyth-btc.toml", + "tomls/oracles/pyth-snx.toml", + "tomls/oracles/pyth-link.toml", + "tomls/oracles/pyth-op.toml", # overrides for perp markets "tomls/omnibus-base-goerli-competition/perps/global.toml", "tomls/omnibus-base-goerli-competition/perps/btc.toml", @@ -38,7 +36,6 @@ include = [ "tomls/omnibus-base-goerli-competition/perps/op.toml", "tomls/omnibus-base-goerli-competition/perps/link.toml", "tomls/omnibus-base-goerli-competition/perps/snx.toml", - # overrides for synth markets "tomls/omnibus-base-goerli-competition/synths/btc.toml", "tomls/omnibus-base-goerli-competition/synths/eth.toml", @@ -143,4 +140,4 @@ args = [ ], ] -depends=["invoke.createScPool", "invoke.createEthSynth", "invoke.createBtcSynth", "invoke.createSnxSynth", "invoke.createLinkSynth", "invoke.createOpSynth", "provision.perpsFactory"] +depends = ["invoke.createScPool", "invoke.createEthSynth", "invoke.createBtcSynth", "invoke.createSnxSynth", "invoke.createLinkSynth", "invoke.createOpSynth", "provision.perpsFactory"] diff --git a/omnibus-base-goerli.toml b/omnibus-base-goerli.toml index 86301068b..f6191e116 100644 --- a/omnibus-base-goerli.toml +++ b/omnibus-base-goerli.toml @@ -101,4 +101,4 @@ args = [ { marketId = "<%= extras.synth_eth_market_id %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" } ], ] -depends=["invoke.createScPool", "invoke.createEthSynth"] +depends = ["invoke.createScPool", "invoke.createEthSynth"] diff --git a/omnibus-optimism-goerli.toml b/omnibus-optimism-goerli.toml index 2b84d9698..69503a0dd 100644 --- a/omnibus-optimism-goerli.toml +++ b/omnibus-optimism-goerli.toml @@ -5,37 +5,30 @@ include = [ "tomls/settings-testnet.toml", "tomls/core.toml", "tomls/permissions.toml", - "tomls/collaterals/snx.toml", "tomls/collaterals/weth.toml", - "tomls/pools/spartan-council.toml", "tomls/pools/passive-snx.toml", - "tomls/permit-all-createPool.toml", "tomls/permit-all-registerMarket.toml", "tomls/permit-all-perps-createAccount.toml", "tomls/permit-all-transferCrossChain.toml", - "tomls/markets/spot/eth.toml", "tomls/markets/spot/btc.toml", "tomls/markets/spot/link.toml", - "tomls/markets/perps/eth.toml", "tomls/markets/perps/btc.toml", - - # overrides for the oracles (will replace imports from above modules to use pyth instead of chainlink) - # "tomls/oracles/pyth-eth.toml", - # "tomls/oracles/pyth-btc.toml", - # "tomls/oracles/pyth-snx.toml", - # "tomls/oracles/pyth-link.toml", - # "tomls/oracles/pyth-op.toml", + # overrides for the oracles (will replace imports from above modules to use pyth instead of chainlink) + # "tomls/oracles/pyth-eth.toml", + # "tomls/oracles/pyth-btc.toml", + # "tomls/oracles/pyth-snx.toml", + # "tomls/oracles/pyth-link.toml", + # "tomls/oracles/pyth-op.toml", # overrides for perp markets "tomls/omnibus-optimism-goerli/perps/global.toml", "tomls/omnibus-optimism-goerli/perps/btc.toml", "tomls/omnibus-optimism-goerli/perps/eth.toml", - # overrides for synth markets "tomls/omnibus-optimism-goerli/synths/btc.toml", "tomls/omnibus-optimism-goerli/synths/eth.toml", @@ -139,4 +132,4 @@ args = [ ], ] -depends=["invoke.createScPool", "invoke.createEthSynth", "invoke.createBtcSynth", "invoke.createLinkSynth", "provision.perpsFactory"] +depends = ["invoke.createScPool", "invoke.createEthSynth", "invoke.createBtcSynth", "invoke.createLinkSynth", "provision.perpsFactory"] diff --git a/omnibus-optimism-mainnet.toml b/omnibus-optimism-mainnet.toml index c16f059cc..e3aa1f608 100644 --- a/omnibus-optimism-mainnet.toml +++ b/omnibus-optimism-mainnet.toml @@ -6,7 +6,7 @@ include = [ "tomls/core.toml", "tomls/permissions.toml", "tomls/collaterals/snx.toml", - # eth collateral is not enabled/set up on v3 + # eth collateral is not enabled/set up on v3 #"tomls/collaterals/weth.toml", "tomls/pools/spartan-council.toml", "tomls/pools/passive-snx.toml", @@ -112,4 +112,4 @@ args = [ { marketId = "<%= extras.synth_eth_market_id %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" } ], ] -depends=["invoke.createScPool", "invoke.createEthSynth"] +depends = ["invoke.createScPool", "invoke.createEthSynth"] diff --git a/tomls/collaterals/op.toml b/tomls/collaterals/op.toml index 150d5f515..c2233acef 100644 --- a/tomls/collaterals/op.toml +++ b/tomls/collaterals/op.toml @@ -1,5 +1,5 @@ include = [ - "../oracles/pyth-op.toml" + "../oracles/pyth-op.toml" ] [setting.op_address] @@ -9,9 +9,9 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= settings.op_address %>", oracleNodeId = "<%= extras.op_oracle_id %>", issuanceRatioD18 = "<%= parseEther('3') %>", liquidationRatioD18 = "<%= parseEther('1.5') %>", liquidationRewardD18 = "<%= parseEther('0.01') %>", minDelegationD18 = "<%= parseEther('0.01') %>", depositingEnabled = true } + { tokenAddress = "<%= settings.op_address %>", oracleNodeId = "<%= extras.op_oracle_id %>", issuanceRatioD18 = "<%= parseEther('3') %>", liquidationRatioD18 = "<%= parseEther('1.5') %>", liquidationRewardD18 = "<%= parseEther('0.01') %>", minDelegationD18 = "<%= parseEther('0.01') %>", depositingEnabled = true } ] depends = [ - "invoke.registerOpOracleNode" + "invoke.registerOpOracleNode" ] diff --git a/tomls/collaterals/snx.toml b/tomls/collaterals/snx.toml index a2ab5ad99..bdcde43f9 100644 --- a/tomls/collaterals/snx.toml +++ b/tomls/collaterals/snx.toml @@ -1,5 +1,5 @@ include = [ - "../oracles/snx.toml" + "../oracles/snx.toml" ] [setting.snx_address] @@ -11,9 +11,9 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= settings.snx_address %>", oracleNodeId = "<%= extras.snx_oracle_id %>", issuanceRatioD18 = "<%= parseEther('4') %>", liquidationRatioD18 = "<%= parseEther('1.5') %>", liquidationRewardD18 = "<%= settings.snx_liquidation_reward %>", minDelegationD18 = "<%= settings.snx_liquidation_reward %>", depositingEnabled = true } + { tokenAddress = "<%= settings.snx_address %>", oracleNodeId = "<%= extras.snx_oracle_id %>", issuanceRatioD18 = "<%= parseEther('4') %>", liquidationRatioD18 = "<%= parseEther('1.5') %>", liquidationRewardD18 = "<%= settings.snx_liquidation_reward %>", minDelegationD18 = "<%= settings.snx_liquidation_reward %>", depositingEnabled = true } ] depends = [ - "invoke.registerSnxOracleManager" -] \ No newline at end of file + "invoke.registerSnxOracleManager" +] diff --git a/tomls/collaterals/wbtc.toml b/tomls/collaterals/wbtc.toml index fc50e4d7d..7e1f67d1d 100644 --- a/tomls/collaterals/wbtc.toml +++ b/tomls/collaterals/wbtc.toml @@ -1,5 +1,5 @@ include = [ - "../oracles/btc.toml" + "../oracles/btc.toml" ] [setting.wbtc_address] @@ -9,9 +9,9 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= settings.wbtc_address %>", oracleNodeId = "<%= extras.btc_oracle_id %>", issuanceRatioD18 = "<%= parseEther('3') %>", liquidationRatioD18 = "<%= parseEther('1.5') %>", liquidationRewardD18 = "<%= parseEther('0.01') %>", minDelegationD18 = "<%= parseEther('0.01') %>", depositingEnabled = true } + { tokenAddress = "<%= settings.wbtc_address %>", oracleNodeId = "<%= extras.btc_oracle_id %>", issuanceRatioD18 = "<%= parseEther('3') %>", liquidationRatioD18 = "<%= parseEther('1.5') %>", liquidationRewardD18 = "<%= parseEther('0.01') %>", minDelegationD18 = "<%= parseEther('0.01') %>", depositingEnabled = true } ] depends = [ - "invoke.registerBtcOracleNode" + "invoke.registerBtcOracleNode" ] diff --git a/tomls/collaterals/weth.toml b/tomls/collaterals/weth.toml index 400dba447..410ab37a5 100644 --- a/tomls/collaterals/weth.toml +++ b/tomls/collaterals/weth.toml @@ -1,5 +1,5 @@ include = [ - "../oracles/eth.toml" + "../oracles/eth.toml" ] [setting.weth_address] @@ -9,9 +9,9 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= settings.weth_address %>", oracleNodeId = "<%= extras.eth_oracle_id %>", issuanceRatioD18 = "<%= parseEther('3') %>", liquidationRatioD18 = "<%= parseEther('1.5') %>", liquidationRewardD18 = "<%= parseEther('0.01') %>", minDelegationD18 = "<%= parseEther('0.01') %>", depositingEnabled = true } + { tokenAddress = "<%= settings.weth_address %>", oracleNodeId = "<%= extras.eth_oracle_id %>", issuanceRatioD18 = "<%= parseEther('3') %>", liquidationRatioD18 = "<%= parseEther('1.5') %>", liquidationRewardD18 = "<%= parseEther('0.01') %>", minDelegationD18 = "<%= parseEther('0.01') %>", depositingEnabled = true } ] depends = [ - "invoke.registerEthOracleNode" + "invoke.registerEthOracleNode" ] diff --git a/tomls/markets/common/bigcap-settings.toml b/tomls/markets/common/bigcap-settings.toml index 1dd134df2..3b137a8f3 100644 --- a/tomls/markets/common/bigcap-settings.toml +++ b/tomls/markets/common/bigcap-settings.toml @@ -1,5 +1,5 @@ include = [ - "./settlement-settings.toml", + "./settlement-settings.toml", ] [setting.bigCapSettlementDelay] @@ -13,4 +13,3 @@ defaultValue = "600" [setting.bigCapSettlementDeviationTolerance] defaultValue = "0.05" - diff --git a/tomls/markets/perps-factory.toml b/tomls/markets/perps-factory.toml index 64228f036..ac34276dc 100644 --- a/tomls/markets/perps-factory.toml +++ b/tomls/markets/perps-factory.toml @@ -1,5 +1,5 @@ include = [ - "./spot-factory.toml" + "./spot-factory.toml" ] [setting.perps_market_package] diff --git a/tomls/markets/perps/btc.toml b/tomls/markets/perps/btc.toml index 4ba25b904..8d7a1c6be 100644 --- a/tomls/markets/perps/btc.toml +++ b/tomls/markets/perps/btc.toml @@ -1,7 +1,7 @@ include = [ - "../perps-factory.toml", - "../../oracles/btc.toml", - "../common/bigcap-settings.toml", + "../perps-factory.toml", + "../../oracles/btc.toml", + "../common/bigcap-settings.toml", ] [setting.pythBtcFeedId] @@ -44,8 +44,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= extras.btc_oracle_id %>" + "<%= settings.btcPerpsMarketId %>", + "<%= extras.btc_oracle_id %>" ] depends = ["invoke.createBtcPerpsMarket", "invoke.registerBtcOracleNode"] @@ -54,9 +54,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } + "<%= 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } ] depends = ["invoke.createBtcPerpsMarket"] @@ -65,9 +65,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setFundingParameters" args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= parseEther(settings.perpsBtcSkewScale) %>", - "<%= parseEther(settings.perpsBtcMaxFundingVelocity) %>" + "<%= settings.btcPerpsMarketId %>", + "<%= parseEther(settings.perpsBtcSkewScale) %>", + "<%= parseEther(settings.perpsBtcMaxFundingVelocity) %>" ] depends = ["invoke.createBtcPerpsMarket"] @@ -76,9 +76,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setOrderFees" args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= parseEther(settings.perpsBtcMakerFeeRatio) %>", - "<%= parseEther(settings.perpsBtcTakerFeeRatio) %>" + "<%= settings.btcPerpsMarketId %>", + "<%= parseEther(settings.perpsBtcMakerFeeRatio) %>", + "<%= parseEther(settings.perpsBtcTakerFeeRatio) %>" ] depends = ["invoke.createBtcPerpsMarket"] @@ -87,8 +87,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= parseEther(settings.perpsBtcMaxMarketSize) %>" + "<%= settings.btcPerpsMarketId %>", + "<%= parseEther(settings.perpsBtcMaxMarketSize) %>" ] depends = ["invoke.createBtcPerpsMarket"] @@ -97,11 +97,11 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxLiquidationParameters" args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= parseEther(settings.perpsBtcMaxLiquidationLimitAccumulationMultiplier) %>", - "<%= parseEther(settings.perpsBtcMaxSecondsInLiquidationWindow) %>", - "<%= parseEther(settings.perpsBtcMaxLiquidationPd) %>", - "<%= settings.perpsBtcEndorsedLiquidator %>" + "<%= settings.btcPerpsMarketId %>", + "<%= parseEther(settings.perpsBtcMaxLiquidationLimitAccumulationMultiplier) %>", + "<%= parseEther(settings.perpsBtcMaxSecondsInLiquidationWindow) %>", + "<%= parseEther(settings.perpsBtcMaxLiquidationPd) %>", + "<%= settings.perpsBtcEndorsedLiquidator %>" ] depends = ["invoke.createBtcPerpsMarket"] @@ -110,12 +110,12 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationParameters" args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= parseEther(settings.perpsBtcInitialMarginRatio) %>", - "<%= parseEther(settings.perpsBtcMinimumInitialMarginRatio) %>", - "<%= parseEther(settings.perpsBtcMaintenanceMarginScalar) %>", - "<%= parseEther(settings.perpsBtcLiquidationRewardRatioD18) %>", - "<%= parseEther(settings.perpsBtcMinimumPositionMargin) %>" + "<%= settings.btcPerpsMarketId %>", + "<%= parseEther(settings.perpsBtcInitialMarginRatio) %>", + "<%= parseEther(settings.perpsBtcMinimumInitialMarginRatio) %>", + "<%= parseEther(settings.perpsBtcMaintenanceMarginScalar) %>", + "<%= parseEther(settings.perpsBtcLiquidationRewardRatioD18) %>", + "<%= parseEther(settings.perpsBtcMinimumPositionMargin) %>" ] depends = ["invoke.createBtcPerpsMarket"] @@ -124,8 +124,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= parseEther(settings.perpsBtcLockedOiRatio) %>" + "<%= settings.btcPerpsMarketId %>", + "<%= parseEther(settings.perpsBtcLockedOiRatio) %>" ] depends = ["invoke.createBtcPerpsMarket"] @@ -134,7 +134,7 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" args = [ - "<%= extras.synth_btc_market_id %>", - "<%= settings.perpsBtcSynthMaxCollateralAmount %>", + "<%= extras.synth_btc_market_id %>", + "<%= settings.perpsBtcSynthMaxCollateralAmount %>", ] depends = ["invoke.createBtcSynth", "provision.perpsFactory"] diff --git a/tomls/markets/perps/eth.toml b/tomls/markets/perps/eth.toml index 70ebcf8c8..c1582ddcd 100644 --- a/tomls/markets/perps/eth.toml +++ b/tomls/markets/perps/eth.toml @@ -1,10 +1,9 @@ include = [ - "../perps-factory.toml", - - # TODO: this is a funny necessary dependency because the oracle manager is registering the same node twice - # however, it will not emit "NodeRegistered" the second time because its an unnecessary call - "../../oracles/eth.toml", - "../common/bigcap-settings.toml", + "../perps-factory.toml", + # TODO: this is a funny necessary dependency because the oracle manager is registering the same node twice + # however, it will not emit "NodeRegistered" the second time because its an unnecessary call + "../../oracles/eth.toml", + "../common/bigcap-settings.toml", ] [setting.ethPerpsMarketId] @@ -45,8 +44,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= extras.eth_oracle_id %>" + "<%= settings.ethPerpsMarketId %>", + "<%= extras.eth_oracle_id %>" ] depends = ["invoke.createEthPerpsMarket", "invoke.registerEthOracleNode"] @@ -55,9 +54,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } + "<%= 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } ] depends = ["invoke.createEthPerpsMarket"] @@ -66,9 +65,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setFundingParameters" args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= parseEther(settings.perpsEthSkewScale) %>", - "<%= parseEther(settings.perpsEthMaxFundingVelocity) %>" + "<%= settings.ethPerpsMarketId %>", + "<%= parseEther(settings.perpsEthSkewScale) %>", + "<%= parseEther(settings.perpsEthMaxFundingVelocity) %>" ] depends = ["invoke.createEthPerpsMarket"] @@ -77,9 +76,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setOrderFees" args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= parseEther(settings.perpsEthMakerFeeRatio) %>", - "<%= parseEther(settings.perpsEthTakerFeeRatio) %>" + "<%= settings.ethPerpsMarketId %>", + "<%= parseEther(settings.perpsEthMakerFeeRatio) %>", + "<%= parseEther(settings.perpsEthTakerFeeRatio) %>" ] depends = ["invoke.createEthPerpsMarket"] @@ -88,8 +87,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= parseEther(settings.perpsEthMaxMarketSize) %>" + "<%= settings.ethPerpsMarketId %>", + "<%= parseEther(settings.perpsEthMaxMarketSize) %>" ] depends = ["invoke.createEthPerpsMarket"] @@ -98,11 +97,11 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxLiquidationParameters" args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= parseEther(settings.perpsEthMaxLiquidationLimitAccumulationMultiplier) %>", - "<%= parseEther(settings.perpsEthMaxSecondsInLiquidationWindow) %>", - "<%= parseEther(settings.perpsEthMaxLiquidationPd) %>", - "<%= settings.perpsBtcEndorsedLiquidator %>" + "<%= settings.ethPerpsMarketId %>", + "<%= parseEther(settings.perpsEthMaxLiquidationLimitAccumulationMultiplier) %>", + "<%= parseEther(settings.perpsEthMaxSecondsInLiquidationWindow) %>", + "<%= parseEther(settings.perpsEthMaxLiquidationPd) %>", + "<%= settings.perpsBtcEndorsedLiquidator %>" ] depends = ["invoke.createEthPerpsMarket"] @@ -111,12 +110,12 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationParameters" args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= parseEther(settings.perpsEthInitialMarginRatio) %>", - "<%= parseEther(settings.perpsEthMinimumInitialMarginRatio) %>", - "<%= parseEther(settings.perpsEthMaintenanceMarginScalar) %>", - "<%= parseEther(settings.perpsEthLiquidationRewardRatioD18) %>", - "<%= parseEther(settings.perpsEthMinimumPositionMargin) %>" + "<%= settings.ethPerpsMarketId %>", + "<%= parseEther(settings.perpsEthInitialMarginRatio) %>", + "<%= parseEther(settings.perpsEthMinimumInitialMarginRatio) %>", + "<%= parseEther(settings.perpsEthMaintenanceMarginScalar) %>", + "<%= parseEther(settings.perpsEthLiquidationRewardRatioD18) %>", + "<%= parseEther(settings.perpsEthMinimumPositionMargin) %>" ] depends = ["invoke.createEthPerpsMarket"] @@ -125,8 +124,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= parseEther(settings.perpsEthLockedOiRatio) %>" + "<%= settings.ethPerpsMarketId %>", + "<%= parseEther(settings.perpsEthLockedOiRatio) %>" ] depends = ["invoke.createEthPerpsMarket"] @@ -135,7 +134,7 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= settings.perpsEthSynthMaxCollateralAmount %>", + "<%= extras.synth_eth_market_id %>", + "<%= settings.perpsEthSynthMaxCollateralAmount %>", ] depends = ["invoke.createEthSynth", "provision.perpsFactory"] diff --git a/tomls/markets/perps/link.toml b/tomls/markets/perps/link.toml index e3abcfea5..14116e2d3 100644 --- a/tomls/markets/perps/link.toml +++ b/tomls/markets/perps/link.toml @@ -1,7 +1,7 @@ include = [ - "../perps-factory.toml", - "../../oracles/pyth-link.toml", - "../common/bigcap-settings.toml", + "../perps-factory.toml", + "../../oracles/pyth-link.toml", + "../common/bigcap-settings.toml", ] [setting.linkPerpsMarketId] @@ -44,8 +44,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= extras.link_oracle_id %>" + "<%= settings.linkPerpsMarketId %>", + "<%= extras.link_oracle_id %>" ] depends = ["invoke.createLinkPerpsMarket", "invoke.registerLinkOracleNode"] @@ -54,9 +54,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } + "<%= 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } ] depends = ["invoke.createLinkPerpsMarket"] @@ -65,9 +65,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setFundingParameters" args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= parseEther(settings.perpsLinkSkewScale) %>", - "<%= parseEther(settings.perpsLinkMaxFundingVelocity) %>" + "<%= settings.linkPerpsMarketId %>", + "<%= parseEther(settings.perpsLinkSkewScale) %>", + "<%= parseEther(settings.perpsLinkMaxFundingVelocity) %>" ] depends = ["invoke.createLinkPerpsMarket"] @@ -76,9 +76,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setOrderFees" args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= parseEther(settings.perpsLinkMakerFeeRatio) %>", - "<%= parseEther(settings.perpsLinkTakerFeeRatio) %>" + "<%= settings.linkPerpsMarketId %>", + "<%= parseEther(settings.perpsLinkMakerFeeRatio) %>", + "<%= parseEther(settings.perpsLinkTakerFeeRatio) %>" ] depends = ["invoke.createLinkPerpsMarket"] @@ -87,8 +87,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= parseEther(settings.perpsLinkMaxMarketSize) %>" + "<%= settings.linkPerpsMarketId %>", + "<%= parseEther(settings.perpsLinkMaxMarketSize) %>" ] depends = ["invoke.createLinkPerpsMarket"] @@ -97,11 +97,11 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxLiquidationParameters" args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= parseEther(settings.perpsLinkMaxLiquidationLimitAccumulationMultiplier) %>", - "<%= parseEther(settings.perpsLinkMaxSecondsInLiquidationWindow) %>", - "<%= parseEther(settings.perpsLinkMaxLiquidationPd) %>", - "<%= settings.perpsBtcEndorsedLiquidator %>" + "<%= settings.linkPerpsMarketId %>", + "<%= parseEther(settings.perpsLinkMaxLiquidationLimitAccumulationMultiplier) %>", + "<%= parseEther(settings.perpsLinkMaxSecondsInLiquidationWindow) %>", + "<%= parseEther(settings.perpsLinkMaxLiquidationPd) %>", + "<%= settings.perpsBtcEndorsedLiquidator %>" ] depends = ["invoke.createLinkPerpsMarket"] @@ -110,12 +110,12 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationParameters" args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= parseEther(settings.perpsLinkInitialMarginRatio) %>", - "<%= parseEther(settings.perpsLinkMinimumInitialMarginRatio) %>", - "<%= parseEther(settings.perpsLinkMaintenanceMarginScalar) %>", - "<%= parseEther(settings.perpsLinkLiquidationRewardRatioD18) %>", - "<%= parseEther(settings.perpsLinkMinimumPositionMargin) %>" + "<%= settings.linkPerpsMarketId %>", + "<%= parseEther(settings.perpsLinkInitialMarginRatio) %>", + "<%= parseEther(settings.perpsLinkMinimumInitialMarginRatio) %>", + "<%= parseEther(settings.perpsLinkMaintenanceMarginScalar) %>", + "<%= parseEther(settings.perpsLinkLiquidationRewardRatioD18) %>", + "<%= parseEther(settings.perpsLinkMinimumPositionMargin) %>" ] depends = ["invoke.createLinkPerpsMarket"] @@ -124,8 +124,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= parseEther(settings.perpsLinkLockedOiRatio) %>" + "<%= settings.linkPerpsMarketId %>", + "<%= parseEther(settings.perpsLinkLockedOiRatio) %>" ] depends = ["invoke.createLinkPerpsMarket"] @@ -134,7 +134,7 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" args = [ - "<%= extras.synth_link_market_id %>", - "<%= settings.perpsLinkSynthMaxCollateralAmount %>", + "<%= extras.synth_link_market_id %>", + "<%= settings.perpsLinkSynthMaxCollateralAmount %>", ] depends = ["invoke.createLinkSynth", "provision.perpsFactory"] diff --git a/tomls/markets/perps/op.toml b/tomls/markets/perps/op.toml index 10d0f407e..4ddcaaac9 100644 --- a/tomls/markets/perps/op.toml +++ b/tomls/markets/perps/op.toml @@ -1,10 +1,9 @@ include = [ - "../perps-factory.toml", - - # TODO: this is a funny necessary dependency because the oracle manager is registering the same node twice - # however, it will not emit "NodeRegistered" the second time because its an unnecessary call - "../../oracles/pyth-op.toml", - "../common/bigcap-settings.toml", + "../perps-factory.toml", + # TODO: this is a funny necessary dependency because the oracle manager is registering the same node twice + # however, it will not emit "NodeRegistered" the second time because its an unnecessary call + "../../oracles/pyth-op.toml", + "../common/bigcap-settings.toml", ] [setting.opPerpsMarketId] @@ -51,8 +50,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" args = [ - "<%= settings.opPerpsMarketId %>", - "<%= extras.op_oracle_id %>" + "<%= settings.opPerpsMarketId %>", + "<%= extras.op_oracle_id %>" ] depends = ["invoke.createOpPerpsMarket", "invoke.registerOpOracleNode"] @@ -61,8 +60,8 @@ target = ["perpsFactory.PerpsMarketProxy"] 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } + "<%= 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } ] depends = ["invoke.createOpPerpsMarket"] @@ -71,9 +70,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setFundingParameters" args = [ - "<%= settings.opPerpsMarketId %>", - "<%= parseEther(settings.perpsOpSkewScale) %>", - "<%= parseEther(settings.perpsOpMaxFundingVelocity) %>" + "<%= settings.opPerpsMarketId %>", + "<%= parseEther(settings.perpsOpSkewScale) %>", + "<%= parseEther(settings.perpsOpMaxFundingVelocity) %>" ] depends = ["invoke.createOpPerpsMarket"] @@ -82,9 +81,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setOrderFees" args = [ - "<%= settings.opPerpsMarketId %>", - "<%= parseEther(settings.perpsOpMakerFeeRatio) %>", - "<%= parseEther(settings.perpsOpTakerFeeRatio) %>" + "<%= settings.opPerpsMarketId %>", + "<%= parseEther(settings.perpsOpMakerFeeRatio) %>", + "<%= parseEther(settings.perpsOpTakerFeeRatio) %>" ] depends = ["invoke.createOpPerpsMarket"] @@ -93,8 +92,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" args = [ - "<%= settings.opPerpsMarketId %>", - "<%= parseEther(settings.perpsOpMaxMarketSize) %>" + "<%= settings.opPerpsMarketId %>", + "<%= parseEther(settings.perpsOpMaxMarketSize) %>" ] depends = ["invoke.createOpPerpsMarket"] @@ -103,11 +102,11 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxLiquidationParameters" args = [ - "<%= settings.opPerpsMarketId %>", - "<%= parseEther(settings.perpsOpMaxLiquidationLimitAccumulationMultiplier) %>", - "<%= parseEther(settings.perpsOpMaxSecondsInLiquidationWindow) %>", - "<%= parseEther(settings.perpsOpMaxLiquidationPd) %>", - "<%= settings.perpsBtcEndorsedLiquidator %>" + "<%= settings.opPerpsMarketId %>", + "<%= parseEther(settings.perpsOpMaxLiquidationLimitAccumulationMultiplier) %>", + "<%= parseEther(settings.perpsOpMaxSecondsInLiquidationWindow) %>", + "<%= parseEther(settings.perpsOpMaxLiquidationPd) %>", + "<%= settings.perpsBtcEndorsedLiquidator %>" ] depends = ["invoke.createOpPerpsMarket"] @@ -116,12 +115,12 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationParameters" args = [ - "<%= settings.opPerpsMarketId %>", - "<%= parseEther(settings.perpsOpInitialMarginRatio) %>", - "<%= parseEther(settings.perpsOpMinimumInitialMarginRatio) %>", - "<%= parseEther(settings.perpsOpMaintenanceMarginScalar) %>", - "<%= parseEther(settings.perpsOpLiquidationRewardRatioD18) %>", - "<%= parseEther(settings.perpsOpMinimumPositionMargin) %>" + "<%= settings.opPerpsMarketId %>", + "<%= parseEther(settings.perpsOpInitialMarginRatio) %>", + "<%= parseEther(settings.perpsOpMinimumInitialMarginRatio) %>", + "<%= parseEther(settings.perpsOpMaintenanceMarginScalar) %>", + "<%= parseEther(settings.perpsOpLiquidationRewardRatioD18) %>", + "<%= parseEther(settings.perpsOpMinimumPositionMargin) %>" ] depends = ["invoke.createOpPerpsMarket"] @@ -130,8 +129,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" args = [ - "<%= settings.opPerpsMarketId %>", - "<%= parseEther(settings.perpsOpLockedOiRatio) %>" + "<%= settings.opPerpsMarketId %>", + "<%= parseEther(settings.perpsOpLockedOiRatio) %>" ] depends = ["invoke.createOpPerpsMarket"] @@ -140,7 +139,7 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" args = [ - "<%= extras.synth_op_market_id %>", - "<%= settings.perpsOpSynthMaxCollateralAmount %>", + "<%= extras.synth_op_market_id %>", + "<%= settings.perpsOpSynthMaxCollateralAmount %>", ] depends = ["invoke.createOpSynth", "provision.perpsFactory"] diff --git a/tomls/markets/perps/snx.toml b/tomls/markets/perps/snx.toml index 884da90d6..a942b6b3d 100644 --- a/tomls/markets/perps/snx.toml +++ b/tomls/markets/perps/snx.toml @@ -1,10 +1,9 @@ include = [ - "../perps-factory.toml", - - # TODO: this is a funny necessary dependency because the oracle manager is registering the same node twice - # however, it will not emit "NodeRegistered" the second time because its an unnecessary call - "../../oracles/pyth-snx.toml", - "../common/bigcap-settings.toml", + "../perps-factory.toml", + # TODO: this is a funny necessary dependency because the oracle manager is registering the same node twice + # however, it will not emit "NodeRegistered" the second time because its an unnecessary call + "../../oracles/pyth-snx.toml", + "../common/bigcap-settings.toml", ] [setting.snxPerpsMarketId] @@ -51,8 +50,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "updatePriceData" args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= extras.snx_oracle_id %>" + "<%= settings.snxPerpsMarketId %>", + "<%= extras.snx_oracle_id %>" ] depends = ["invoke.createSnxPerpsMarket", "invoke.registerSnxOracleNode"] @@ -61,8 +60,8 @@ target = ["perpsFactory.PerpsMarketProxy"] 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } + "<%= 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(settings.bigCapSettlementDeviationTolerance) %>", disabled = false } ] depends = ["invoke.createSnxPerpsMarket"] @@ -71,9 +70,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setFundingParameters" args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= parseEther(settings.perpsSnxSkewScale) %>", - "<%= parseEther(settings.perpsSnxMaxFundingVelocity) %>" + "<%= settings.snxPerpsMarketId %>", + "<%= parseEther(settings.perpsSnxSkewScale) %>", + "<%= parseEther(settings.perpsSnxMaxFundingVelocity) %>" ] depends = ["invoke.createSnxPerpsMarket"] @@ -82,9 +81,9 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setOrderFees" args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= parseEther(settings.perpsSnxMakerFeeRatio) %>", - "<%= parseEther(settings.perpsSnxTakerFeeRatio) %>" + "<%= settings.snxPerpsMarketId %>", + "<%= parseEther(settings.perpsSnxMakerFeeRatio) %>", + "<%= parseEther(settings.perpsSnxTakerFeeRatio) %>" ] depends = ["invoke.createSnxPerpsMarket"] @@ -93,8 +92,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= parseEther(settings.perpsSnxMaxMarketSize) %>" + "<%= settings.snxPerpsMarketId %>", + "<%= parseEther(settings.perpsSnxMaxMarketSize) %>" ] depends = ["invoke.createSnxPerpsMarket"] @@ -103,11 +102,11 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxLiquidationParameters" args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= parseEther(settings.perpsSnxMaxLiquidationLimitAccumulationMultiplier) %>", - "<%= parseEther(settings.perpsSnxMaxSecondsInLiquidationWindow) %>", - "<%= parseEther(settings.perpsSnxMaxLiquidationPd) %>", - "<%= settings.perpsBtcEndorsedLiquidator %>" + "<%= settings.snxPerpsMarketId %>", + "<%= parseEther(settings.perpsSnxMaxLiquidationLimitAccumulationMultiplier) %>", + "<%= parseEther(settings.perpsSnxMaxSecondsInLiquidationWindow) %>", + "<%= parseEther(settings.perpsSnxMaxLiquidationPd) %>", + "<%= settings.perpsBtcEndorsedLiquidator %>" ] depends = ["invoke.createSnxPerpsMarket"] @@ -116,12 +115,12 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationParameters" args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= parseEther(settings.perpsSnxInitialMarginRatio) %>", - "<%= parseEther(settings.perpsSnxMinimumInitialMarginRatio) %>", - "<%= parseEther(settings.perpsSnxMaintenanceMarginScalar) %>", - "<%= parseEther(settings.perpsSnxLiquidationRewardRatioD18) %>", - "<%= parseEther(settings.perpsSnxMinimumPositionMargin) %>" + "<%= settings.snxPerpsMarketId %>", + "<%= parseEther(settings.perpsSnxInitialMarginRatio) %>", + "<%= parseEther(settings.perpsSnxMinimumInitialMarginRatio) %>", + "<%= parseEther(settings.perpsSnxMaintenanceMarginScalar) %>", + "<%= parseEther(settings.perpsSnxLiquidationRewardRatioD18) %>", + "<%= parseEther(settings.perpsSnxMinimumPositionMargin) %>" ] depends = ["invoke.createSnxPerpsMarket"] @@ -130,8 +129,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= parseEther(settings.perpsSnxLockedOiRatio) %>" + "<%= settings.snxPerpsMarketId %>", + "<%= parseEther(settings.perpsSnxLockedOiRatio) %>" ] depends = ["invoke.createSnxPerpsMarket"] @@ -140,7 +139,7 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" args = [ - "<%= extras.synth_snx_market_id %>", - "<%= settings.perpsSnxSynthMaxCollateralAmount %>", + "<%= extras.synth_snx_market_id %>", + "<%= settings.perpsSnxSynthMaxCollateralAmount %>", ] depends = ["invoke.createSnxSynth", "provision.perpsFactory"] diff --git a/tomls/markets/spot-factory.toml b/tomls/markets/spot-factory.toml index a2f8a880f..10c5a22ed 100644 --- a/tomls/markets/spot-factory.toml +++ b/tomls/markets/spot-factory.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.spot_market_package] @@ -12,4 +12,4 @@ options.owner = "<%= settings.owner %>" options.salt = "" options.synthetixPackage = "<%= settings.snx_package %>" -depends = ["provision.system"] \ No newline at end of file +depends = ["provision.system"] diff --git a/tomls/markets/spot/btc.toml b/tomls/markets/spot/btc.toml index a5e7e4faa..ac22576fb 100644 --- a/tomls/markets/spot/btc.toml +++ b/tomls/markets/spot/btc.toml @@ -1,8 +1,8 @@ include = [ - "../spot-factory.toml", - "../../oracles/btc.toml", # TODO: use pyth-btc? - "../common/bigcap-settings.toml", - "../common/settlement-settings.toml" + "../spot-factory.toml", + "../../oracles/btc.toml", # TODO: use pyth-btc? + "../common/bigcap-settings.toml", + "../common/settlement-settings.toml" ] [invoke.createBtcSynth] @@ -26,9 +26,9 @@ fromCall.args = ["<%= extras.synth_btc_market_id %>"] func = "updatePriceData" args = [ - "<%= extras.synth_btc_market_id %>", - "<%= extras.btc_oracle_id %>", - "<%= extras.btc_oracle_id %>" + "<%= extras.synth_btc_market_id %>", + "<%= extras.btc_oracle_id %>", + "<%= extras.btc_oracle_id %>" ] depends = ["invoke.createBtcSynth", "invoke.registerBtcOracleNode"] @@ -39,8 +39,8 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_btc_market_id %>"] func = "addSettlementStrategy" args = [ - "<%= extras.synth_btc_market_id %>", - { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythBtcFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } + "<%= extras.synth_btc_market_id %>", + { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythBtcFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } ] depends = ["invoke.createBtcSynth"] @@ -50,8 +50,8 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_btc_market_id %>"] func = "setAsyncFixedFee" args = [ - "<%= extras.synth_btc_market_id %>", - "<%= parseEther(settings.synthBtcAsyncFixedFee) %>" + "<%= extras.synth_btc_market_id %>", + "<%= parseEther(settings.synthBtcAsyncFixedFee) %>" ] depends = ["invoke.createBtcSynth"] @@ -61,7 +61,7 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_btc_market_id %>"] func = "setMarketSkewScale" args = [ - "<%= extras.synth_btc_market_id %>", - "<%= parseEther(settings.synthBtcSkewScale) %>" + "<%= extras.synth_btc_market_id %>", + "<%= parseEther(settings.synthBtcSkewScale) %>" ] depends = ["invoke.createBtcSynth"] diff --git a/tomls/markets/spot/eth.toml b/tomls/markets/spot/eth.toml index 8a19c1ce8..deddf0bd0 100644 --- a/tomls/markets/spot/eth.toml +++ b/tomls/markets/spot/eth.toml @@ -1,11 +1,10 @@ include = [ - "../spot-factory.toml", - - # TODO: this is a funny necessary dependency because the oracle manager is registering the same node twice - # however, it will not emit "NodeRegistered" the second time because its an unnecessary call - "../../oracles/eth.toml", # TODO: use pyth-eth? - "../common/bigcap-settings.toml", - "../common/settlement-settings.toml" + "../spot-factory.toml", + # TODO: this is a funny necessary dependency because the oracle manager is registering the same node twice + # however, it will not emit "NodeRegistered" the second time because its an unnecessary call + "../../oracles/eth.toml", # TODO: use pyth-eth? + "../common/bigcap-settings.toml", + "../common/settlement-settings.toml" ] [setting.weth_address] @@ -41,9 +40,9 @@ fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "updatePriceData" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= extras.eth_oracle_id %>", - "<%= extras.eth_oracle_id %>" + "<%= extras.synth_eth_market_id %>", + "<%= extras.eth_oracle_id %>", + "<%= extras.eth_oracle_id %>" ] depends = ["invoke.createEthSynth", "invoke.registerEthOracleNode"] @@ -55,8 +54,8 @@ fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "setAtomicFixedFee" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= MaxUint256 %>" + "<%= extras.synth_eth_market_id %>", + "<%= MaxUint256 %>" ] depends = ["invoke.createEthSynth"] @@ -68,9 +67,9 @@ fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "addSettlementStrategy" args = [ - "<%= extras.synth_eth_market_id %>", - # strategyType = 1 (pyth) - { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythEthFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } + "<%= extras.synth_eth_market_id %>", + # strategyType = 1 (pyth) + { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythEthFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } ] depends = ["invoke.createEthSynth"] @@ -82,8 +81,8 @@ fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "setAsyncFixedFee" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= parseEther(settings.synthEthAsyncFixedFee) %>" + "<%= extras.synth_eth_market_id %>", + "<%= parseEther(settings.synthEthAsyncFixedFee) %>" ] depends = ["invoke.createEthSynth"] @@ -95,9 +94,9 @@ fromCall.args = [] func = "configureMaximumMarketCollateral" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= settings.weth_address %>", - "<%= parseEther(settings.synthEthMaxMarketCollateral) %>" + "<%= extras.synth_eth_market_id %>", + "<%= settings.weth_address %>", + "<%= parseEther(settings.synthEthMaxMarketCollateral) %>" ] depends = ["invoke.createEthSynth"] @@ -109,9 +108,9 @@ fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "setWrapper" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= settings.weth_address %>", - "<%= parseEther(settings.synthEthMaxMarketCollateral) %>" + "<%= extras.synth_eth_market_id %>", + "<%= settings.weth_address %>", + "<%= parseEther(settings.synthEthMaxMarketCollateral) %>" ] depends = ["invoke.createEthSynth"] @@ -123,8 +122,8 @@ fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "setMarketSkewScale" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= parseEther(settings.synthEthSkewScale) %>" + "<%= extras.synth_eth_market_id %>", + "<%= parseEther(settings.synthEthSkewScale) %>" ] depends = ["invoke.createEthSynth"] @@ -136,9 +135,9 @@ fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "setWrapperFees" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= parseEther(settings.synthEthWrapFee) %>", - "<%= parseEther(settings.synthEthUnwrapFee) %>" + "<%= extras.synth_eth_market_id %>", + "<%= parseEther(settings.synthEthWrapFee) %>", + "<%= parseEther(settings.synthEthUnwrapFee) %>" ] -depends = ["invoke.createEthSynth"] \ No newline at end of file +depends = ["invoke.createEthSynth"] diff --git a/tomls/markets/spot/link.toml b/tomls/markets/spot/link.toml index 44cba663d..f35323a90 100644 --- a/tomls/markets/spot/link.toml +++ b/tomls/markets/spot/link.toml @@ -1,8 +1,8 @@ include = [ - "../spot-factory.toml", - "../../oracles/link.toml", - "../common/bigcap-settings.toml", - "../common/settlement-settings.toml" + "../spot-factory.toml", + "../../oracles/link.toml", + "../common/bigcap-settings.toml", + "../common/settlement-settings.toml" ] [invoke.createLinkSynth] @@ -26,9 +26,9 @@ fromCall.args = ["<%= extras.synth_link_market_id %>"] func = "updatePriceData" args = [ - "<%= extras.synth_link_market_id %>", - "<%= extras.link_oracle_id %>", - "<%= extras.link_oracle_id %>" + "<%= extras.synth_link_market_id %>", + "<%= extras.link_oracle_id %>", + "<%= extras.link_oracle_id %>" ] depends = ["invoke.createLinkSynth", "invoke.registerLinkOracleNode"] @@ -39,8 +39,8 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_link_market_id %>"] func = "addSettlementStrategy" args = [ - "<%= extras.synth_link_market_id %>", - { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythLinkFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } + "<%= extras.synth_link_market_id %>", + { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythLinkFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } ] depends = ["invoke.createLinkSynth"] @@ -50,8 +50,8 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_link_market_id %>"] func = "setAsyncFixedFee" args = [ - "<%= extras.synth_link_market_id %>", - "<%= parseEther(settings.synthLinkAsyncFixedFee) %>" + "<%= extras.synth_link_market_id %>", + "<%= parseEther(settings.synthLinkAsyncFixedFee) %>" ] depends = ["invoke.createLinkSynth"] @@ -61,7 +61,7 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_link_market_id %>"] func = "setMarketSkewScale" args = [ - "<%= extras.synth_link_market_id %>", - "<%= parseEther(settings.synthLinkSkewScale) %>" + "<%= extras.synth_link_market_id %>", + "<%= parseEther(settings.synthLinkSkewScale) %>" ] -depends = ["invoke.createLinkSynth"] \ No newline at end of file +depends = ["invoke.createLinkSynth"] diff --git a/tomls/markets/spot/op.toml b/tomls/markets/spot/op.toml index 0197e09b3..d074ed708 100644 --- a/tomls/markets/spot/op.toml +++ b/tomls/markets/spot/op.toml @@ -1,8 +1,8 @@ include = [ - "../spot-factory.toml", - "../../oracles/pyth-op.toml", - "../common/bigcap-settings.toml", - "../common/settlement-settings.toml" + "../spot-factory.toml", + "../../oracles/pyth-op.toml", + "../common/bigcap-settings.toml", + "../common/settlement-settings.toml" ] [invoke.createOpSynth] @@ -26,9 +26,9 @@ fromCall.args = ["<%= extras.synth_op_market_id %>"] func = "updatePriceData" args = [ - "<%= extras.synth_op_market_id %>", - "<%= extras.op_oracle_id %>", - "<%= extras.op_oracle_id %>" + "<%= extras.synth_op_market_id %>", + "<%= extras.op_oracle_id %>", + "<%= extras.op_oracle_id %>" ] depends = ["invoke.createOpSynth", "invoke.registerOpOracleNode"] @@ -39,8 +39,8 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_op_market_id %>"] func = "addSettlementStrategy" args = [ - "<%= extras.synth_op_market_id %>", - { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythOpFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } + "<%= extras.synth_op_market_id %>", + { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythOpFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } ] depends = ["invoke.createOpSynth"] @@ -50,8 +50,8 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_op_market_id %>"] func = "setAsyncFixedFee" args = [ - "<%= extras.synth_op_market_id %>", - "<%= parseEther(settings.synthOpAsyncFixedFee) %>" + "<%= extras.synth_op_market_id %>", + "<%= parseEther(settings.synthOpAsyncFixedFee) %>" ] depends = ["invoke.createOpSynth"] @@ -61,8 +61,7 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_op_market_id %>"] func = "setMarketSkewScale" args = [ - "<%= extras.synth_op_market_id %>", - "<%= parseEther(settings.synthOpSkewScale) %>" + "<%= extras.synth_op_market_id %>", + "<%= parseEther(settings.synthOpSkewScale) %>" ] depends = ["invoke.createOpSynth"] - diff --git a/tomls/markets/spot/snx.toml b/tomls/markets/spot/snx.toml index 04a5d05e6..9731d00ed 100644 --- a/tomls/markets/spot/snx.toml +++ b/tomls/markets/spot/snx.toml @@ -1,8 +1,8 @@ include = [ - "../spot-factory.toml", - "../../oracles/pyth-snx.toml", - "../common/bigcap-settings.toml", - "../common/settlement-settings.toml" + "../spot-factory.toml", + "../../oracles/pyth-snx.toml", + "../common/bigcap-settings.toml", + "../common/settlement-settings.toml" ] [invoke.createSnxSynth] @@ -26,9 +26,9 @@ fromCall.args = ["<%= extras.synth_snx_market_id %>"] func = "updatePriceData" args = [ - "<%= extras.synth_snx_market_id %>", - "<%= extras.snx_oracle_id %>", - "<%= extras.snx_oracle_id %>" + "<%= extras.synth_snx_market_id %>", + "<%= extras.snx_oracle_id %>", + "<%= extras.snx_oracle_id %>" ] depends = ["invoke.createSnxSynth", "invoke.registerSnxOracleNode"] @@ -39,8 +39,8 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_snx_market_id %>"] func = "addSettlementStrategy" args = [ - "<%= extras.synth_snx_market_id %>", - { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythSnxFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } + "<%= extras.synth_snx_market_id %>", + { strategyType = "1", settlementDelay = "<%= settings.bigCapSettlementDelay %>", settlementWindowDuration = "<%= settings.bigCapSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythSnxFeedId %>", url = "<%= settings.pythFeedUrl %>", settlementReward = 0, priceDeviationTolerance = "<%= parseEther(settings.bigCapSettlementDeviationTolerance) %>", minimumUsdExchangeAmount = "<%= parseEther(settings.settlementMinimumUsdExchangeAmount) %>", maxRoundingLoss = "<%= parseEther(settings.settlementMaxRoundingLoss) %>", disabled = false } ] depends = ["invoke.createSnxSynth"] @@ -50,8 +50,8 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_snx_market_id %>"] func = "setAsyncFixedFee" args = [ - "<%= extras.synth_snx_market_id %>", - "<%= parseEther(settings.synthSnxAsyncFixedFee) %>" + "<%= extras.synth_snx_market_id %>", + "<%= parseEther(settings.synthSnxAsyncFixedFee) %>" ] depends = ["invoke.createSnxSynth"] @@ -61,8 +61,7 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_snx_market_id %>"] func = "setMarketSkewScale" args = [ - "<%= extras.synth_snx_market_id %>", - "<%= parseEther(settings.synthSnxSkewScale) %>" + "<%= extras.synth_snx_market_id %>", + "<%= parseEther(settings.synthSnxSkewScale) %>" ] depends = ["invoke.createSnxSynth"] - diff --git a/tomls/omnibus-base-goerli-competition/perps/global.toml b/tomls/omnibus-base-goerli-competition/perps/global.toml index 3a58d5226..69a002350 100644 --- a/tomls/omnibus-base-goerli-competition/perps/global.toml +++ b/tomls/omnibus-base-goerli-competition/perps/global.toml @@ -13,8 +13,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationRewardGuards" args = [ - "<%= parseEther('1') %>", - "<%= parseEther('500') %>" + "<%= parseEther('1') %>", + "<%= parseEther('500') %>" ] depends = ["provision.perpsFactory"] @@ -23,8 +23,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" args = [ - "0", - "<%= MaxUint256 %>" + "0", + "<%= MaxUint256 %>" ] depends = ["provision.perpsFactory"] @@ -33,7 +33,7 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setSynthDeductionPriority" args = [["<%= extras.synth_snx_market_id %>", "<%= extras.synth_op_market_id %>", "<%= extras.synth_link_market_id %>", "<%= extras.synth_eth_market_id %>", "<%= extras.synth_btc_market_id %>", "0"]] -depends = ["invoke.createOpSynth", "invoke.createLinkSynth", "invoke.createEthSynth", "invoke.createSnxSynth", "invoke.createBtcSynth", "provision.perpsFactory"] +depends = ["invoke.createOpSynth", "invoke.createLinkSynth", "invoke.createEthSynth", "invoke.createSnxSynth", "invoke.createBtcSynth", "provision.perpsFactory"] [invoke.setPerAccountCapsPerps] target = ["perpsFactory.PerpsMarketProxy"] diff --git a/tomls/omnibus-base-goerli-competition/synths/btc.toml b/tomls/omnibus-base-goerli-competition/synths/btc.toml index 860fd455d..4d02d2ffd 100644 --- a/tomls/omnibus-base-goerli-competition/synths/btc.toml +++ b/tomls/omnibus-base-goerli-competition/synths/btc.toml @@ -12,19 +12,19 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_btc_market_id %>"] func = "setCustomTransactorFees" args = [ - "<%= extras.synth_btc_market_id %>", - "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", - "<%= parseEther('0.0001') %>" + "<%= extras.synth_btc_market_id %>", + "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", + "<%= parseEther('0.0001') %>" ] -depends=["provision.perpsFactory", "invoke.createBtcSynth"] +depends = ["provision.perpsFactory", "invoke.createBtcSynth"] [invoke.configuresBTCCollateral] target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= extras.synth_btc_token_address %>", oracleNodeId = "<%= extras.btc_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } + { tokenAddress = "<%= extras.synth_btc_token_address %>", oracleNodeId = "<%= extras.btc_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } ] depends = [ - "invoke.setSynthPriceBtc" + "invoke.setSynthPriceBtc" ] diff --git a/tomls/omnibus-base-goerli-competition/synths/eth.toml b/tomls/omnibus-base-goerli-competition/synths/eth.toml index 518f95a82..a8bdb95ea 100644 --- a/tomls/omnibus-base-goerli-competition/synths/eth.toml +++ b/tomls/omnibus-base-goerli-competition/synths/eth.toml @@ -21,11 +21,11 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "setCustomTransactorFees" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", - "<%= parseEther('0.0001') %>" + "<%= extras.synth_eth_market_id %>", + "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", + "<%= parseEther('0.0001') %>" ] -depends=["provision.perpsFactory", "invoke.createEthSynth"] +depends = ["provision.perpsFactory", "invoke.createEthSynth"] # ETH Synth configuration on Core system [invoke.configuresETHCollateral] @@ -33,8 +33,8 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= extras.synth_eth_token_address %>", oracleNodeId = "<%= extras.eth_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('1') %>", minDelegationD18 = "<%= parseEther('1') %>", depositingEnabled = false } + { tokenAddress = "<%= extras.synth_eth_token_address %>", oracleNodeId = "<%= extras.eth_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('1') %>", minDelegationD18 = "<%= parseEther('1') %>", depositingEnabled = false } ] depends = [ - "invoke.setSynthPriceEth" + "invoke.setSynthPriceEth" ] diff --git a/tomls/omnibus-base-goerli-competition/synths/link.toml b/tomls/omnibus-base-goerli-competition/synths/link.toml index 8ed350360..094930e1c 100644 --- a/tomls/omnibus-base-goerli-competition/synths/link.toml +++ b/tomls/omnibus-base-goerli-competition/synths/link.toml @@ -12,19 +12,19 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_link_market_id %>"] func = "setCustomTransactorFees" args = [ - "<%= extras.synth_link_market_id %>", - "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", - "<%= parseEther('0.0001') %>" + "<%= extras.synth_link_market_id %>", + "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", + "<%= parseEther('0.0001') %>" ] -depends=["provision.perpsFactory", "invoke.createLinkSynth"] +depends = ["provision.perpsFactory", "invoke.createLinkSynth"] [invoke.configuresLINKCollateral] target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= extras.synth_link_token_address %>", oracleNodeId = "<%= extras.link_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } + { tokenAddress = "<%= extras.synth_link_token_address %>", oracleNodeId = "<%= extras.link_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } ] depends = [ - "invoke.setSynthPriceLink" + "invoke.setSynthPriceLink" ] diff --git a/tomls/omnibus-base-goerli-competition/synths/op.toml b/tomls/omnibus-base-goerli-competition/synths/op.toml index ef97e35a0..962428ab0 100644 --- a/tomls/omnibus-base-goerli-competition/synths/op.toml +++ b/tomls/omnibus-base-goerli-competition/synths/op.toml @@ -12,19 +12,19 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_op_market_id %>"] func = "setCustomTransactorFees" args = [ - "<%= extras.synth_op_market_id %>", - "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", - "<%= parseEther('0.0001') %>" + "<%= extras.synth_op_market_id %>", + "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", + "<%= parseEther('0.0001') %>" ] -depends=["provision.perpsFactory", "invoke.createOpSynth"] +depends = ["provision.perpsFactory", "invoke.createOpSynth"] [invoke.configuresOPCollateral] target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= extras.synth_op_token_address %>", oracleNodeId = "<%= extras.op_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } + { tokenAddress = "<%= extras.synth_op_token_address %>", oracleNodeId = "<%= extras.op_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } ] depends = [ - "invoke.setSynthPriceOp" + "invoke.setSynthPriceOp" ] diff --git a/tomls/omnibus-base-goerli-competition/synths/snx.toml b/tomls/omnibus-base-goerli-competition/synths/snx.toml index ccf33458d..92e561ba3 100644 --- a/tomls/omnibus-base-goerli-competition/synths/snx.toml +++ b/tomls/omnibus-base-goerli-competition/synths/snx.toml @@ -12,19 +12,19 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_snx_market_id %>"] func = "setCustomTransactorFees" args = [ - "<%= extras.synth_snx_market_id %>", - "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", - "<%= parseEther('0.0001') %>" + "<%= extras.synth_snx_market_id %>", + "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", + "<%= parseEther('0.0001') %>" ] -depends=["provision.perpsFactory", "invoke.createSnxSynth"] +depends = ["provision.perpsFactory", "invoke.createSnxSynth"] [invoke.configuresSNXCollateral] target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= extras.synth_snx_token_address %>", oracleNodeId = "<%= extras.snx_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } + { tokenAddress = "<%= extras.synth_snx_token_address %>", oracleNodeId = "<%= extras.snx_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } ] depends = [ - "invoke.setSynthPriceSnx" + "invoke.setSynthPriceSnx" ] diff --git a/tomls/omnibus-optimism-goerli/perps/global.toml b/tomls/omnibus-optimism-goerli/perps/global.toml index adf7db862..4688249b2 100644 --- a/tomls/omnibus-optimism-goerli/perps/global.toml +++ b/tomls/omnibus-optimism-goerli/perps/global.toml @@ -13,8 +13,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationRewardGuards" args = [ - "<%= parseEther('1') %>", - "<%= parseEther('500') %>" + "<%= parseEther('1') %>", + "<%= parseEther('500') %>" ] depends = ["provision.perpsFactory"] @@ -23,8 +23,8 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" args = [ - "0", - "<%= MaxUint256 %>" + "0", + "<%= MaxUint256 %>" ] depends = ["provision.perpsFactory"] diff --git a/tomls/omnibus-optimism-goerli/synths/btc.toml b/tomls/omnibus-optimism-goerli/synths/btc.toml index 316eeaa51..ab1b0014e 100644 --- a/tomls/omnibus-optimism-goerli/synths/btc.toml +++ b/tomls/omnibus-optimism-goerli/synths/btc.toml @@ -12,19 +12,19 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_btc_market_id %>"] func = "setCustomTransactorFees" args = [ - "<%= extras.synth_btc_market_id %>", - "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", - "<%= parseEther('0.0001') %>" + "<%= extras.synth_btc_market_id %>", + "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", + "<%= parseEther('0.0001') %>" ] -depends=["provision.perpsFactory", "invoke.createBtcSynth"] +depends = ["provision.perpsFactory", "invoke.createBtcSynth"] [invoke.configuresBTCCollateral] target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= settings.btcSynthAddress %>", oracleNodeId = "<%= extras.btc_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } + { tokenAddress = "<%= settings.btcSynthAddress %>", oracleNodeId = "<%= extras.btc_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } ] depends = [ - "invoke.setSynthPriceBtc" + "invoke.setSynthPriceBtc" ] diff --git a/tomls/omnibus-optimism-goerli/synths/eth.toml b/tomls/omnibus-optimism-goerli/synths/eth.toml index 4673fc814..b53186394 100644 --- a/tomls/omnibus-optimism-goerli/synths/eth.toml +++ b/tomls/omnibus-optimism-goerli/synths/eth.toml @@ -21,11 +21,11 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_eth_market_id %>"] func = "setCustomTransactorFees" args = [ - "<%= extras.synth_eth_market_id %>", - "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", - "<%= parseEther('0.0001') %>" + "<%= extras.synth_eth_market_id %>", + "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", + "<%= parseEther('0.0001') %>" ] -depends=["provision.perpsFactory", "invoke.createEthSynth"] +depends = ["provision.perpsFactory", "invoke.createEthSynth"] # ETH Synth configuration on Core system [invoke.configuresETHCollateral] @@ -33,8 +33,8 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= settings.ethSynthAddress %>", oracleNodeId = "<%= extras.eth_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('1') %>", minDelegationD18 = "<%= parseEther('1') %>", depositingEnabled = false } + { tokenAddress = "<%= settings.ethSynthAddress %>", oracleNodeId = "<%= extras.eth_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('1') %>", minDelegationD18 = "<%= parseEther('1') %>", depositingEnabled = false } ] depends = [ - "invoke.setSynthPriceEth" + "invoke.setSynthPriceEth" ] diff --git a/tomls/omnibus-optimism-goerli/synths/link.toml b/tomls/omnibus-optimism-goerli/synths/link.toml index f02c03b10..6727ff716 100644 --- a/tomls/omnibus-optimism-goerli/synths/link.toml +++ b/tomls/omnibus-optimism-goerli/synths/link.toml @@ -14,19 +14,19 @@ fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_link_market_id %>"] func = "setCustomTransactorFees" args = [ - "<%= extras.synth_link_market_id %>", - "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", - "<%= parseEther('0.0001') %>" + "<%= extras.synth_link_market_id %>", + "<%= imports.perpsFactory.contracts.PerpsMarketProxy.address %>", + "<%= parseEther('0.0001') %>" ] -depends=["provision.perpsFactory", "invoke.createLinkSynth"] +depends = ["provision.perpsFactory", "invoke.createLinkSynth"] [invoke.configuresLINKCollateral] target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureCollateral" args = [ - { tokenAddress = "<%= settings.linkTokenAddress %>", oracleNodeId = "<%= extras.link_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } + { tokenAddress = "<%= settings.linkTokenAddress %>", oracleNodeId = "<%= extras.link_oracle_id %>", issuanceRatioD18 = "<%= parseEther('2') %>", liquidationRatioD18 = "<%= parseEther('1.1') %>", liquidationRewardD18 = "<%= parseEther('0.5') %>", minDelegationD18 = "<%= parseEther('0.5') %>", depositingEnabled = false } ] depends = [ - "invoke.setSynthPriceLink" + "invoke.setSynthPriceLink" ] diff --git a/tomls/oracles/btc.toml b/tomls/oracles/btc.toml index 3d17e5961..a2fadab70 100644 --- a/tomls/oracles/btc.toml +++ b/tomls/oracles/btc.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.btc_aggregator_address] @@ -19,5 +19,5 @@ extra.btc_oracle_id.event = "NodeRegistered" extra.btc_oracle_id.arg = 0 depends = [ - "provision.system" -] \ No newline at end of file + "provision.system" +] diff --git a/tomls/oracles/eth.toml b/tomls/oracles/eth.toml index 59cb5dc2f..7e3189712 100644 --- a/tomls/oracles/eth.toml +++ b/tomls/oracles/eth.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.eth_aggregator_address] @@ -19,5 +19,5 @@ extra.eth_oracle_id.event = "NodeRegistered" extra.eth_oracle_id.arg = 0 depends = [ - "provision.system" -] \ No newline at end of file + "provision.system" +] diff --git a/tomls/oracles/link.toml b/tomls/oracles/link.toml index 7d4289e8d..d1ecd045b 100644 --- a/tomls/oracles/link.toml +++ b/tomls/oracles/link.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.link_aggregator_address] @@ -8,16 +8,16 @@ include = [ target = ["system.oracle_manager.Proxy"] func = "registerNode" args = [ - # 3 = chainlink aggregator type - 3, - # 3 parameters are: address of the chainlink oracle - "<%= defaultAbiCoder.encode(['address', 'uint256', 'uint8'], [settings.link_aggregator_address, 0, 8]) %>", - [] + # 3 = chainlink aggregator type + 3, + # 3 parameters are: address of the chainlink oracle + "<%= defaultAbiCoder.encode(['address', 'uint256', 'uint8'], [settings.link_aggregator_address, 0, 8]) %>", + [] ] extra.link_oracle_id.event = "NodeRegistered" extra.link_oracle_id.arg = 0 depends = [ - "provision.system" + "provision.system" ] diff --git a/tomls/oracles/pyth-btc.toml b/tomls/oracles/pyth-btc.toml index ef63539d9..47f498f0a 100644 --- a/tomls/oracles/pyth-btc.toml +++ b/tomls/oracles/pyth-btc.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.btc_aggregator_address] @@ -18,5 +18,5 @@ extra.btc_oracle_id.event = "NodeRegistered" extra.btc_oracle_id.arg = 0 depends = [ - "provision.system" + "provision.system" ] diff --git a/tomls/oracles/pyth-eth.toml b/tomls/oracles/pyth-eth.toml index 6cd9ae825..8fe40ae0f 100644 --- a/tomls/oracles/pyth-eth.toml +++ b/tomls/oracles/pyth-eth.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.eth_aggregator_address] @@ -18,5 +18,5 @@ extra.eth_oracle_id.event = "NodeRegistered" extra.eth_oracle_id.arg = 0 depends = [ - "provision.system" + "provision.system" ] diff --git a/tomls/oracles/pyth-link.toml b/tomls/oracles/pyth-link.toml index 456fa5bf5..1e070e07b 100644 --- a/tomls/oracles/pyth-link.toml +++ b/tomls/oracles/pyth-link.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.link_aggregator_address] @@ -18,5 +18,5 @@ extra.link_oracle_id.event = "NodeRegistered" extra.link_oracle_id.arg = 0 depends = [ - "provision.system" + "provision.system" ] diff --git a/tomls/oracles/pyth-op.toml b/tomls/oracles/pyth-op.toml index 6a7a4d071..82c9ff229 100644 --- a/tomls/oracles/pyth-op.toml +++ b/tomls/oracles/pyth-op.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.op_aggregator_address] @@ -18,5 +18,5 @@ extra.op_oracle_id.event = "NodeRegistered" extra.op_oracle_id.arg = 0 depends = [ - "provision.system" + "provision.system" ] diff --git a/tomls/oracles/pyth-snx.toml b/tomls/oracles/pyth-snx.toml index b74fa8975..cbcbb5f08 100644 --- a/tomls/oracles/pyth-snx.toml +++ b/tomls/oracles/pyth-snx.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.snx_aggregator_address] @@ -18,5 +18,5 @@ extra.snx_oracle_id.event = "NodeRegistered" extra.snx_oracle_id.arg = 0 depends = [ - "provision.system" + "provision.system" ] diff --git a/tomls/oracles/snx.toml b/tomls/oracles/snx.toml index 8f4720eed..1e452fa71 100644 --- a/tomls/oracles/snx.toml +++ b/tomls/oracles/snx.toml @@ -1,5 +1,5 @@ include = [ - "../core.toml" + "../core.toml" ] [setting.snx_aggregator_address] @@ -19,5 +19,5 @@ extra.snx_oracle_id.event = "NodeRegistered" extra.snx_oracle_id.arg = 0 depends = [ - "provision.system" -] \ No newline at end of file + "provision.system" +] diff --git a/tomls/permissions.toml b/tomls/permissions.toml index a1cc8f7bb..45f9d2128 100644 --- a/tomls/permissions.toml +++ b/tomls/permissions.toml @@ -8,4 +8,4 @@ args = [ "<%= formatBytes32String('createPool') %>", "<%= settings.deployer %>", ] -depends=["provision.system"] \ No newline at end of file +depends = ["provision.system"] diff --git a/tomls/permit-all-createPool.toml b/tomls/permit-all-createPool.toml index 637b41f6f..4fffc8d99 100644 --- a/tomls/permit-all-createPool.toml +++ b/tomls/permit-all-createPool.toml @@ -6,4 +6,4 @@ args = [ "<%= formatBytes32String('createPool') %>", true, ] -depends=["provision.system"] \ No newline at end of file +depends = ["provision.system"] diff --git a/tomls/permit-all-perps-createAccount.toml b/tomls/permit-all-perps-createAccount.toml index 4c8f1d926..91e56870a 100644 --- a/tomls/permit-all-perps-createAccount.toml +++ b/tomls/permit-all-perps-createAccount.toml @@ -6,4 +6,4 @@ args = [ "<%= formatBytes32String('createAccount') %>", true, ] -depends=["provision.perpsFactory"] +depends = ["provision.perpsFactory"] diff --git a/tomls/permit-all-registerMarket.toml b/tomls/permit-all-registerMarket.toml index 11064b86b..24d4f39bb 100644 --- a/tomls/permit-all-registerMarket.toml +++ b/tomls/permit-all-registerMarket.toml @@ -6,4 +6,4 @@ args = [ "<%= formatBytes32String('registerMarket') %>", true, ] -depends=["provision.system"] \ No newline at end of file +depends = ["provision.system"] diff --git a/tomls/permit-all-transferCrossChain.toml b/tomls/permit-all-transferCrossChain.toml index 6e5076c18..0948bd9c7 100644 --- a/tomls/permit-all-transferCrossChain.toml +++ b/tomls/permit-all-transferCrossChain.toml @@ -6,4 +6,4 @@ args = [ "<%= formatBytes32String('transferCrossChain') %>", true, ] -depends=["provision.system"] +depends = ["provision.system"] diff --git a/tomls/pools/passive-snx.toml b/tomls/pools/passive-snx.toml index d89fc0dc6..f634edf55 100644 --- a/tomls/pools/passive-snx.toml +++ b/tomls/pools/passive-snx.toml @@ -13,7 +13,7 @@ args = [ "<%= settings.snx_pool_id %>", "<%= settings.pool_owner %>", ] -depends=["invoke.permitCreatePool"] +depends = ["invoke.permitCreatePool"] [invoke.set_snx_pool_name] target = ["system.CoreProxy"] @@ -24,7 +24,7 @@ args = [ "<%= settings.snx_pool_id %>", "Passive SNX Pool", ] -depends=["invoke.create_snx_pool"] +depends = ["invoke.create_snx_pool"] [invoke.approve_snx_pool] target = ["system.CoreProxy"] @@ -33,4 +33,4 @@ func = "addApprovedPool" args = [ "<%= settings.snx_pool_id %>", ] -depends=["invoke.create_snx_pool"] +depends = ["invoke.create_snx_pool"] diff --git a/tomls/pools/spartan-council.toml b/tomls/pools/spartan-council.toml index 8660bd23d..6eae58e31 100644 --- a/tomls/pools/spartan-council.toml +++ b/tomls/pools/spartan-council.toml @@ -12,7 +12,7 @@ args = [ "<%= settings.sc_pool_id %>", "<%= settings.pool_owner %>", ] -depends=["invoke.permitCreatePool"] +depends = ["invoke.permitCreatePool"] [invoke.setScPoolName] target = ["system.CoreProxy"] @@ -23,7 +23,7 @@ args = [ "<%= settings.sc_pool_id %>", "Spartan Council Pool", ] -depends=["invoke.createScPool"] +depends = ["invoke.createScPool"] [invoke.setPreferredPool] target = ["system.CoreProxy"] @@ -32,4 +32,4 @@ func = "setPreferredPool" args = [ "<%= settings.sc_pool_id %>", ] -depends=["invoke.createScPool"] \ No newline at end of file +depends = ["invoke.createScPool"] diff --git a/tomls/settings-mainnet.toml b/tomls/settings-mainnet.toml index d0457e224..af4eb7194 100644 --- a/tomls/settings-mainnet.toml +++ b/tomls/settings-mainnet.toml @@ -7,7 +7,7 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "setSupportedCrossChainNetworks" args = [ - ["1", "10"], - ["5009297550715157269", "3734403246176062136"] + ["1", "10"], + ["5009297550715157269", "3734403246176062136"] ] -depends = ["provision.system"] \ No newline at end of file +depends = ["provision.system"] diff --git a/tomls/settings-testnet.toml b/tomls/settings-testnet.toml index f1d6b0599..fa1eafe0e 100644 --- a/tomls/settings-testnet.toml +++ b/tomls/settings-testnet.toml @@ -8,7 +8,7 @@ fromCall.func = "owner" func = "setSupportedCrossChainNetworks" # https://docs.chain.link/ccip/supported-networks args = [ - ["11155111", "420", "421613", "80001", "84531"], - ["16015286601757825753", "2664363617261496610", "6101244977088475029", "12532609583862916517", "5790810961207155433"] + ["11155111", "420", "421613", "80001", "84531"], + ["16015286601757825753", "2664363617261496610", "6101244977088475029", "12532609583862916517", "5790810961207155433"] ] depends = ["provision.system"] diff --git a/tomls/settings.toml b/tomls/settings.toml index 842a661e5..5d50858c5 100644 --- a/tomls/settings.toml +++ b/tomls/settings.toml @@ -18,8 +18,8 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "setConfig" args = [ - "<%= formatBytes32String('accountTimeoutWithdraw') %>", - "<%= hexZeroPad(hexlify(parseInt(settings.account_timeout_withdraw)), 32) %>" + "<%= formatBytes32String('accountTimeoutWithdraw') %>", + "<%= hexZeroPad(hexlify(parseInt(settings.account_timeout_withdraw)), 32) %>" ] depends = ["provision.system"] @@ -28,7 +28,7 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureChainlinkCrossChain" args = [ - "<%= settings.ccip_router %>", - "<%= settings.ccip_token_pool %>" + "<%= settings.ccip_router %>", + "<%= settings.ccip_token_pool %>" ] depends = ["provision.system"]