From 829c84f9a85a05075bbd4bfa48f1d5566f91e58a Mon Sep 17 00:00:00 2001 From: Noisekit Date: Fri, 8 Sep 2023 16:56:26 +0800 Subject: [PATCH] Apply prettier --- .prettierrc | 2 +- omnibus-arbitrum-goerli.toml | 1 - omnibus-base-goerli-competition.toml | 14 +++++--- omnibus-goerli.toml | 2 +- omnibus-optimism-goerli.toml | 14 ++++---- omnibus-optimism-mainnet.toml | 1 - omnibus-polygon-mumbai.toml | 1 - omnibus-sepolia.toml | 2 +- tomls/collaterals/op.toml | 9 ++--- tomls/collaterals/snx.toml | 9 ++--- tomls/collaterals/wbtc.toml | 9 ++--- tomls/collaterals/weth.toml | 9 ++--- tomls/markets/common/bigcap-settings.toml | 4 +-- tomls/markets/perps-factory.toml | 5 +-- tomls/markets/perps/btc.toml | 26 +++----------- tomls/markets/perps/eth.toml | 20 +++-------- tomls/markets/perps/link.toml | 20 +++-------- tomls/markets/perps/op.toml | 20 +++-------- tomls/markets/perps/snx.toml | 20 +++-------- tomls/markets/spot-factory.toml | 5 +-- tomls/markets/spot/btc.toml | 15 ++------ tomls/markets/spot/eth.toml | 34 ++----------------- tomls/markets/spot/link.toml | 15 ++------ tomls/markets/spot/op.toml | 15 ++------ tomls/markets/spot/snx.toml | 15 ++------ .../perps/btc.toml | 1 - .../perps/eth.toml | 2 -- .../perps/global.toml | 32 ++++++++++------- .../perps/link.toml | 1 - .../perps/op.toml | 1 - .../perps/snx.toml | 1 - .../synths/btc.toml | 5 +-- .../synths/eth.toml | 5 +-- .../synths/link.toml | 5 +-- .../synths/op.toml | 5 +-- .../synths/snx.toml | 5 +-- tomls/omnibus-optimism-goerli/perps/btc.toml | 1 - tomls/omnibus-optimism-goerli/perps/eth.toml | 2 -- .../omnibus-optimism-goerli/perps/global.toml | 12 ++----- tomls/omnibus-optimism-goerli/synths/btc.toml | 5 +-- tomls/omnibus-optimism-goerli/synths/eth.toml | 5 +-- .../omnibus-optimism-goerli/synths/link.toml | 4 +-- tomls/oracles/btc.toml | 10 ++---- tomls/oracles/eth.toml | 10 ++---- tomls/oracles/link.toml | 10 ++---- tomls/oracles/pyth-btc.toml | 10 ++---- tomls/oracles/pyth-eth.toml | 10 ++---- tomls/oracles/pyth-link.toml | 10 ++---- tomls/oracles/pyth-op.toml | 10 ++---- tomls/oracles/pyth-snx.toml | 10 ++---- tomls/oracles/snx.toml | 10 ++---- tomls/permissions.toml | 5 +-- tomls/permit-all-createPool.toml | 5 +-- tomls/permit-all-perps-createAccount.toml | 5 +-- tomls/permit-all-registerMarket.toml | 5 +-- tomls/permit-all-transferCrossChain.toml | 5 +-- tomls/pools/passive-snx.toml | 14 ++------ tomls/pools/spartan-council.toml | 14 ++------ tomls/settings-mainnet.toml | 9 ++--- tomls/settings-testnet.toml | 12 ++++--- tomls/settings.toml | 5 +-- 61 files changed, 132 insertions(+), 416 deletions(-) diff --git a/.prettierrc b/.prettierrc index 645f3a4d..a341f985 100644 --- a/.prettierrc +++ b/.prettierrc @@ -9,7 +9,7 @@ "tabWidth": 4, "useTabs": false, "singleQuote": false, - "bracketSpacing": true + "bracketSpacing": false } }, { diff --git a/omnibus-arbitrum-goerli.toml b/omnibus-arbitrum-goerli.toml index 42d17c57..19dcd9b0 100644 --- a/omnibus-arbitrum-goerli.toml +++ b/omnibus-arbitrum-goerli.toml @@ -53,7 +53,6 @@ defaultValue = "1" defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" # Chainlink Configuration - [setting.ccip_router] defaultValue = "0x88e492127709447a5abefdab8788a15b4567589e" diff --git a/omnibus-base-goerli-competition.toml b/omnibus-base-goerli-competition.toml index 4a903601..30cd8a87 100644 --- a/omnibus-base-goerli-competition.toml +++ b/omnibus-base-goerli-competition.toml @@ -116,11 +116,8 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" [invoke.addMulticallThroughToPyth] target = ["system.CoreProxy", "perpsFactory.PerpsMarketProxy", "spotFactory.SpotMarketProxy"] fromCall.func = "owner" - func = "setAllowlistedMulticallTarget" - args = ["<%= settings.eth_aggregator_address %>", true] - depends = ["provision.perpsFactory"] [invoke.setScPoolConfig] @@ -139,5 +136,12 @@ args = [ { marketId = "<%= imports.perpsFactory.extras.superMarketId %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" } ], ] - -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-goerli.toml b/omnibus-goerli.toml index 5463b1b0..5b7310dd 100644 --- a/omnibus-goerli.toml +++ b/omnibus-goerli.toml @@ -60,4 +60,4 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" [setting.ccip_token_pool] -defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" \ No newline at end of file +defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" diff --git a/omnibus-optimism-goerli.toml b/omnibus-optimism-goerli.toml index 69503a0d..3eaa6798 100644 --- a/omnibus-optimism-goerli.toml +++ b/omnibus-optimism-goerli.toml @@ -24,7 +24,6 @@ include = [ # "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", @@ -103,13 +102,9 @@ defaultValue = "0xd23c2ef3a533040b57cadaf33ccb111edbaca018" # Note: this is now added to the event but because the synth is already created # we need to manually set it here - - # ETH Synth Configuration - # Note: this is now added to the event but because the synth is already created # we need to manually set it here - # Pyth settlement strategy config [setting.pythFeedUrl] defaultValue = "https://api.synthetix.io/pyth-testnet/api/get_vaa_ccip?data={data}" @@ -131,5 +126,10 @@ args = [ { marketId = "<%= imports.perpsFactory.extras.superMarketId %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" } ], ] - -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 e3aa1f60..ace1bbc9 100644 --- a/omnibus-optimism-mainnet.toml +++ b/omnibus-optimism-mainnet.toml @@ -69,7 +69,6 @@ defaultValue = "0x261c05167db67B2b619f9d312e0753f3721ad6E8" defaultValue = "0xe470A3068302CF045Eec3B800dDBFf42B42e18D8" # ETH Synth Configuration - [setting.synthEthAsyncFixedFee] defaultValue = "0.001" diff --git a/omnibus-polygon-mumbai.toml b/omnibus-polygon-mumbai.toml index 37855ec6..b9bce73c 100644 --- a/omnibus-polygon-mumbai.toml +++ b/omnibus-polygon-mumbai.toml @@ -53,7 +53,6 @@ defaultValue = "1" defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" # Chainlink Configuration - [setting.ccip_router] defaultValue = "0x70499c328e1e2a3c41108bd3730f6670a44595d1" diff --git a/omnibus-sepolia.toml b/omnibus-sepolia.toml index 21767328..604bbdb6 100644 --- a/omnibus-sepolia.toml +++ b/omnibus-sepolia.toml @@ -53,4 +53,4 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" defaultValue = "0xd0daae2231e9cb96b94c8512223533293c3693bf" [setting.ccip_token_pool] -defaultValue = "0x9b65749b38278060c5787cce0391ac7f1094c8e8" \ No newline at end of file +defaultValue = "0x9b65749b38278060c5787cce0391ac7f1094c8e8" diff --git a/tomls/collaterals/op.toml b/tomls/collaterals/op.toml index c2233ace..722771b0 100644 --- a/tomls/collaterals/op.toml +++ b/tomls/collaterals/op.toml @@ -1,6 +1,4 @@ -include = [ - "../oracles/pyth-op.toml" -] +include = ["../oracles/pyth-op.toml"] [setting.op_address] @@ -11,7 +9,4 @@ 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 } ] - -depends = [ - "invoke.registerOpOracleNode" -] +depends = ["invoke.registerOpOracleNode"] diff --git a/tomls/collaterals/snx.toml b/tomls/collaterals/snx.toml index bdcde43f..adb80afd 100644 --- a/tomls/collaterals/snx.toml +++ b/tomls/collaterals/snx.toml @@ -1,6 +1,4 @@ -include = [ - "../oracles/snx.toml" -] +include = ["../oracles/snx.toml"] [setting.snx_address] @@ -13,7 +11,4 @@ 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 } ] - -depends = [ - "invoke.registerSnxOracleManager" -] +depends = ["invoke.registerSnxOracleManager"] diff --git a/tomls/collaterals/wbtc.toml b/tomls/collaterals/wbtc.toml index 7e1f67d1..ecd411ce 100644 --- a/tomls/collaterals/wbtc.toml +++ b/tomls/collaterals/wbtc.toml @@ -1,6 +1,4 @@ -include = [ - "../oracles/btc.toml" -] +include = ["../oracles/btc.toml"] [setting.wbtc_address] @@ -11,7 +9,4 @@ 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 } ] - -depends = [ - "invoke.registerBtcOracleNode" -] +depends = ["invoke.registerBtcOracleNode"] diff --git a/tomls/collaterals/weth.toml b/tomls/collaterals/weth.toml index 410ab37a..25c2280a 100644 --- a/tomls/collaterals/weth.toml +++ b/tomls/collaterals/weth.toml @@ -1,6 +1,4 @@ -include = [ - "../oracles/eth.toml" -] +include = ["../oracles/eth.toml"] [setting.weth_address] @@ -11,7 +9,4 @@ 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 } ] - -depends = [ - "invoke.registerEthOracleNode" -] +depends = ["invoke.registerEthOracleNode"] diff --git a/tomls/markets/common/bigcap-settings.toml b/tomls/markets/common/bigcap-settings.toml index 3b137a8f..de0894a6 100644 --- a/tomls/markets/common/bigcap-settings.toml +++ b/tomls/markets/common/bigcap-settings.toml @@ -1,6 +1,4 @@ -include = [ - "./settlement-settings.toml", -] +include = ["./settlement-settings.toml"] [setting.bigCapSettlementDelay] defaultValue = "15" diff --git a/tomls/markets/perps-factory.toml b/tomls/markets/perps-factory.toml index ac34276d..90904c49 100644 --- a/tomls/markets/perps-factory.toml +++ b/tomls/markets/perps-factory.toml @@ -1,6 +1,4 @@ -include = [ - "./spot-factory.toml" -] +include = ["./spot-factory.toml"] [setting.perps_market_package] @@ -12,5 +10,4 @@ options.owner = "<%= settings.owner %>" options.salt = "alpha" options.synthetixPackage = "<%= settings.snx_package %>" options.spotMarketPackage = "<%= settings.spot_market_package %>" - depends = ["provision.spotFactory"] diff --git a/tomls/markets/perps/btc.toml b/tomls/markets/perps/btc.toml index 8d7a1c6b..481cd941 100644 --- a/tomls/markets/perps/btc.toml +++ b/tomls/markets/perps/btc.toml @@ -1,8 +1,4 @@ -include = [ - "../perps-factory.toml", - "../../oracles/btc.toml", - "../common/bigcap-settings.toml", -] +include = ["../perps-factory.toml", "../../oracles/btc.toml", "../common/bigcap-settings.toml"] [setting.pythBtcFeedId] @@ -43,10 +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 %>"] depends = ["invoke.createBtcPerpsMarket", "invoke.registerBtcOracleNode"] [invoke.setPerpsBtcSettlementStrategy] @@ -86,10 +79,7 @@ depends = ["invoke.createBtcPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" -args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= parseEther(settings.perpsBtcMaxMarketSize) %>" -] +args = ["<%= settings.btcPerpsMarketId %>", "<%= parseEther(settings.perpsBtcMaxMarketSize) %>"] depends = ["invoke.createBtcPerpsMarket"] [invoke.setPerpsBtcMaxLiquidationParameters] @@ -123,18 +113,12 @@ depends = ["invoke.createBtcPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" -args = [ - "<%= settings.btcPerpsMarketId %>", - "<%= parseEther(settings.perpsBtcLockedOiRatio) %>" -] +args = ["<%= settings.btcPerpsMarketId %>", "<%= parseEther(settings.perpsBtcLockedOiRatio) %>"] depends = ["invoke.createBtcPerpsMarket"] [invoke.setMaxCollateralAmountBtc] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" -args = [ - "<%= extras.synth_btc_market_id %>", - "<%= settings.perpsBtcSynthMaxCollateralAmount %>", -] +args = ["<%= 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 c1582ddc..c32766f2 100644 --- a/tomls/markets/perps/eth.toml +++ b/tomls/markets/perps/eth.toml @@ -43,10 +43,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 %>"] depends = ["invoke.createEthPerpsMarket", "invoke.registerEthOracleNode"] [invoke.setPerpsEthSettlementStrategy] @@ -86,10 +83,7 @@ depends = ["invoke.createEthPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" -args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= parseEther(settings.perpsEthMaxMarketSize) %>" -] +args = ["<%= settings.ethPerpsMarketId %>", "<%= parseEther(settings.perpsEthMaxMarketSize) %>"] depends = ["invoke.createEthPerpsMarket"] [invoke.setPerpsEthMaxLiquidationParameters] @@ -123,18 +117,12 @@ depends = ["invoke.createEthPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" -args = [ - "<%= settings.ethPerpsMarketId %>", - "<%= parseEther(settings.perpsEthLockedOiRatio) %>" -] +args = ["<%= settings.ethPerpsMarketId %>", "<%= parseEther(settings.perpsEthLockedOiRatio) %>"] depends = ["invoke.createEthPerpsMarket"] [invoke.setMaxCollateralAmountEth] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" -args = [ - "<%= extras.synth_eth_market_id %>", - "<%= settings.perpsEthSynthMaxCollateralAmount %>", -] +args = ["<%= 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 14116e2d..01c5aedd 100644 --- a/tomls/markets/perps/link.toml +++ b/tomls/markets/perps/link.toml @@ -43,10 +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 %>"] depends = ["invoke.createLinkPerpsMarket", "invoke.registerLinkOracleNode"] [invoke.setPerpsLinkSettlementStrategy] @@ -86,10 +83,7 @@ depends = ["invoke.createLinkPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" -args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= parseEther(settings.perpsLinkMaxMarketSize) %>" -] +args = ["<%= settings.linkPerpsMarketId %>", "<%= parseEther(settings.perpsLinkMaxMarketSize) %>"] depends = ["invoke.createLinkPerpsMarket"] [invoke.setPerpsLinkMaxLiquidationParameters] @@ -123,18 +117,12 @@ depends = ["invoke.createLinkPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" -args = [ - "<%= settings.linkPerpsMarketId %>", - "<%= parseEther(settings.perpsLinkLockedOiRatio) %>" -] +args = ["<%= settings.linkPerpsMarketId %>", "<%= parseEther(settings.perpsLinkLockedOiRatio) %>"] depends = ["invoke.createLinkPerpsMarket"] [invoke.setMaxCollateralAmountLink] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" -args = [ - "<%= extras.synth_link_market_id %>", - "<%= settings.perpsLinkSynthMaxCollateralAmount %>", -] +args = ["<%= 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 4ddcaaac..ebae752d 100644 --- a/tomls/markets/perps/op.toml +++ b/tomls/markets/perps/op.toml @@ -49,10 +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 %>"] depends = ["invoke.createOpPerpsMarket", "invoke.registerOpOracleNode"] [invoke.setPerpsOpSettlementStrategy] @@ -91,10 +88,7 @@ depends = ["invoke.createOpPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" -args = [ - "<%= settings.opPerpsMarketId %>", - "<%= parseEther(settings.perpsOpMaxMarketSize) %>" -] +args = ["<%= settings.opPerpsMarketId %>", "<%= parseEther(settings.perpsOpMaxMarketSize) %>"] depends = ["invoke.createOpPerpsMarket"] [invoke.setPerpsOpMaxLiquidationParameters] @@ -128,18 +122,12 @@ depends = ["invoke.createOpPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" -args = [ - "<%= settings.opPerpsMarketId %>", - "<%= parseEther(settings.perpsOpLockedOiRatio) %>" -] +args = ["<%= settings.opPerpsMarketId %>", "<%= parseEther(settings.perpsOpLockedOiRatio) %>"] depends = ["invoke.createOpPerpsMarket"] [invoke.setMaxCollateralAmountOp] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" -args = [ - "<%= extras.synth_op_market_id %>", - "<%= settings.perpsOpSynthMaxCollateralAmount %>", -] +args = ["<%= 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 a942b6b3..6808d59b 100644 --- a/tomls/markets/perps/snx.toml +++ b/tomls/markets/perps/snx.toml @@ -49,10 +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 %>"] depends = ["invoke.createSnxPerpsMarket", "invoke.registerSnxOracleNode"] [invoke.setPerpsSnxSettlementStrategy] @@ -91,10 +88,7 @@ depends = ["invoke.createSnxPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxMarketSize" -args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= parseEther(settings.perpsSnxMaxMarketSize) %>" -] +args = ["<%= settings.snxPerpsMarketId %>", "<%= parseEther(settings.perpsSnxMaxMarketSize) %>"] depends = ["invoke.createSnxPerpsMarket"] [invoke.setPerpsSnxMaxLiquidationParameters] @@ -128,18 +122,12 @@ depends = ["invoke.createSnxPerpsMarket"] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLockedOiRatio" -args = [ - "<%= settings.snxPerpsMarketId %>", - "<%= parseEther(settings.perpsSnxLockedOiRatio) %>" -] +args = ["<%= settings.snxPerpsMarketId %>", "<%= parseEther(settings.perpsSnxLockedOiRatio) %>"] depends = ["invoke.createSnxPerpsMarket"] [invoke.setMaxCollateralAmountSnx] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" -args = [ - "<%= extras.synth_snx_market_id %>", - "<%= settings.perpsSnxSynthMaxCollateralAmount %>", -] +args = ["<%= 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 10c5a22e..90626e5e 100644 --- a/tomls/markets/spot-factory.toml +++ b/tomls/markets/spot-factory.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.spot_market_package] @@ -11,5 +9,4 @@ options.coreProxyOwner = "<%= settings.owner %>" options.owner = "<%= settings.owner %>" options.salt = "" options.synthetixPackage = "<%= settings.snx_package %>" - depends = ["provision.system"] diff --git a/tomls/markets/spot/btc.toml b/tomls/markets/spot/btc.toml index ac22576f..12a662a6 100644 --- a/tomls/markets/spot/btc.toml +++ b/tomls/markets/spot/btc.toml @@ -10,27 +10,22 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "owner" func = "createSynth" args = ["Synthetic Bitcoin", "snxBTC", "<%= settings.owner %>"] - extra.synth_btc_market_id.event = "SynthRegistered" extra.synth_btc_market_id.arg = 0 - extra.synth_btc_token_address.event = "SynthRegistered" extra.synth_btc_token_address.arg = 1 - depends = ["provision.spotFactory"] [invoke.setSynthPriceBtc] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_btc_market_id %>"] - func = "updatePriceData" args = [ "<%= extras.synth_btc_market_id %>", "<%= extras.btc_oracle_id %>", "<%= extras.btc_oracle_id %>" ] - depends = ["invoke.createBtcSynth", "invoke.registerBtcOracleNode"] [invoke.setSynthSettlementStrategyBtc] @@ -49,10 +44,7 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_btc_market_id %>"] func = "setAsyncFixedFee" -args = [ - "<%= extras.synth_btc_market_id %>", - "<%= parseEther(settings.synthBtcAsyncFixedFee) %>" -] +args = ["<%= extras.synth_btc_market_id %>", "<%= parseEther(settings.synthBtcAsyncFixedFee) %>"] depends = ["invoke.createBtcSynth"] [invoke.setSynthSkewScaleBtc] @@ -60,8 +52,5 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_btc_market_id %>"] func = "setMarketSkewScale" -args = [ - "<%= extras.synth_btc_market_id %>", - "<%= parseEther(settings.synthBtcSkewScale) %>" -] +args = ["<%= 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 deddf0bd..83746beb 100644 --- a/tomls/markets/spot/eth.toml +++ b/tomls/markets/spot/eth.toml @@ -24,120 +24,92 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "owner" func = "createSynth" args = ["Synthetic Ethereum", "snxETH", "<%= settings.owner %>"] - extra.synth_eth_market_id.event = "SynthRegistered" extra.synth_eth_market_id.arg = 0 - extra.synth_eth_token_address.event = "SynthRegistered" extra.synth_eth_token_address.arg = 1 - depends = ["provision.spotFactory"] [invoke.setSynthPriceEth] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_eth_market_id %>"] - func = "updatePriceData" args = [ "<%= extras.synth_eth_market_id %>", "<%= extras.eth_oracle_id %>", "<%= extras.eth_oracle_id %>" ] - depends = ["invoke.createEthSynth", "invoke.registerEthOracleNode"] [invoke.setSynthAtomicFixedFeeEth] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_eth_market_id %>"] - func = "setAtomicFixedFee" -args = [ - "<%= extras.synth_eth_market_id %>", - "<%= MaxUint256 %>" -] - +args = ["<%= extras.synth_eth_market_id %>", "<%= MaxUint256 %>"] depends = ["invoke.createEthSynth"] [invoke.setSynthSettlementStrategyEth] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" 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 } ] - depends = ["invoke.createEthSynth"] [invoke.setSynthAsyncFixedFeeEth] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_eth_market_id %>"] - func = "setAsyncFixedFee" -args = [ - "<%= extras.synth_eth_market_id %>", - "<%= parseEther(settings.synthEthAsyncFixedFee) %>" -] - +args = ["<%= extras.synth_eth_market_id %>", "<%= parseEther(settings.synthEthAsyncFixedFee) %>"] depends = ["invoke.createEthSynth"] [invoke.setSynthMaxMarketCollateralEth] target = ["system.CoreProxy"] fromCall.func = "owner" fromCall.args = [] - func = "configureMaximumMarketCollateral" args = [ "<%= extras.synth_eth_market_id %>", "<%= settings.weth_address %>", "<%= parseEther(settings.synthEthMaxMarketCollateral) %>" ] - depends = ["invoke.createEthSynth"] [invoke.configureSynthWrapperEth] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_eth_market_id %>"] - func = "setWrapper" args = [ "<%= extras.synth_eth_market_id %>", "<%= settings.weth_address %>", "<%= parseEther(settings.synthEthMaxMarketCollateral) %>" ] - depends = ["invoke.createEthSynth"] [invoke.setSynthSkewScaleEth] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_eth_market_id %>"] - func = "setMarketSkewScale" -args = [ - "<%= extras.synth_eth_market_id %>", - "<%= parseEther(settings.synthEthSkewScale) %>" -] - +args = ["<%= extras.synth_eth_market_id %>", "<%= parseEther(settings.synthEthSkewScale) %>"] depends = ["invoke.createEthSynth"] [invoke.setSynthWrapperFeesEth] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_eth_market_id %>"] - func = "setWrapperFees" args = [ "<%= extras.synth_eth_market_id %>", "<%= parseEther(settings.synthEthWrapFee) %>", "<%= parseEther(settings.synthEthUnwrapFee) %>" ] - depends = ["invoke.createEthSynth"] diff --git a/tomls/markets/spot/link.toml b/tomls/markets/spot/link.toml index f35323a9..9641b57b 100644 --- a/tomls/markets/spot/link.toml +++ b/tomls/markets/spot/link.toml @@ -10,27 +10,22 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "owner" func = "createSynth" args = ["Synthetic Chainlink Token", "snxLINK", "<%= settings.owner %>"] - extra.synth_link_market_id.event = "SynthRegistered" extra.synth_link_market_id.arg = 0 - extra.synth_link_token_address.event = "SynthRegistered" extra.synth_link_token_address.arg = 1 - depends = ["provision.spotFactory"] [invoke.setSynthPriceLink] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_link_market_id %>"] - func = "updatePriceData" args = [ "<%= extras.synth_link_market_id %>", "<%= extras.link_oracle_id %>", "<%= extras.link_oracle_id %>" ] - depends = ["invoke.createLinkSynth", "invoke.registerLinkOracleNode"] [invoke.setSynthSettlementStrategyLink] @@ -49,10 +44,7 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_link_market_id %>"] func = "setAsyncFixedFee" -args = [ - "<%= extras.synth_link_market_id %>", - "<%= parseEther(settings.synthLinkAsyncFixedFee) %>" -] +args = ["<%= extras.synth_link_market_id %>", "<%= parseEther(settings.synthLinkAsyncFixedFee) %>"] depends = ["invoke.createLinkSynth"] [invoke.setSynthSkewScaleLink] @@ -60,8 +52,5 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_link_market_id %>"] func = "setMarketSkewScale" -args = [ - "<%= extras.synth_link_market_id %>", - "<%= parseEther(settings.synthLinkSkewScale) %>" -] +args = ["<%= extras.synth_link_market_id %>", "<%= parseEther(settings.synthLinkSkewScale) %>"] depends = ["invoke.createLinkSynth"] diff --git a/tomls/markets/spot/op.toml b/tomls/markets/spot/op.toml index d074ed70..454af643 100644 --- a/tomls/markets/spot/op.toml +++ b/tomls/markets/spot/op.toml @@ -10,27 +10,22 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "owner" func = "createSynth" args = ["Synthetic Optimism Token", "snxOP", "<%= settings.owner %>"] - extra.synth_op_market_id.event = "SynthRegistered" extra.synth_op_market_id.arg = 0 - extra.synth_op_token_address.event = "SynthRegistered" extra.synth_op_token_address.arg = 1 - depends = ["provision.spotFactory"] [invoke.setSynthPriceOp] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_op_market_id %>"] - func = "updatePriceData" args = [ "<%= extras.synth_op_market_id %>", "<%= extras.op_oracle_id %>", "<%= extras.op_oracle_id %>" ] - depends = ["invoke.createOpSynth", "invoke.registerOpOracleNode"] [invoke.setSynthSettlementStrategyOp] @@ -49,10 +44,7 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_op_market_id %>"] func = "setAsyncFixedFee" -args = [ - "<%= extras.synth_op_market_id %>", - "<%= parseEther(settings.synthOpAsyncFixedFee) %>" -] +args = ["<%= extras.synth_op_market_id %>", "<%= parseEther(settings.synthOpAsyncFixedFee) %>"] depends = ["invoke.createOpSynth"] [invoke.setSynthSkewScaleOp] @@ -60,8 +52,5 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_op_market_id %>"] func = "setMarketSkewScale" -args = [ - "<%= extras.synth_op_market_id %>", - "<%= parseEther(settings.synthOpSkewScale) %>" -] +args = ["<%= 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 9731d00e..3badd1e9 100644 --- a/tomls/markets/spot/snx.toml +++ b/tomls/markets/spot/snx.toml @@ -10,27 +10,22 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "owner" func = "createSynth" args = ["Synthetic Synthetix Network Token", "snxSNX", "<%= settings.owner %>"] - extra.synth_snx_market_id.event = "SynthRegistered" extra.synth_snx_market_id.arg = 0 - extra.synth_snx_token_address.event = "SynthRegistered" extra.synth_snx_token_address.arg = 1 - depends = ["provision.spotFactory"] [invoke.setSynthPriceSnx] target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_snx_market_id %>"] - func = "updatePriceData" args = [ "<%= extras.synth_snx_market_id %>", "<%= extras.snx_oracle_id %>", "<%= extras.snx_oracle_id %>" ] - depends = ["invoke.createSnxSynth", "invoke.registerSnxOracleNode"] [invoke.setSynthSettlementStrategySnx] @@ -49,10 +44,7 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_snx_market_id %>"] func = "setAsyncFixedFee" -args = [ - "<%= extras.synth_snx_market_id %>", - "<%= parseEther(settings.synthSnxAsyncFixedFee) %>" -] +args = ["<%= extras.synth_snx_market_id %>", "<%= parseEther(settings.synthSnxAsyncFixedFee) %>"] depends = ["invoke.createSnxSynth"] [invoke.setSynthSkewScaleSnx] @@ -60,8 +52,5 @@ target = ["spotFactory.SpotMarketProxy"] fromCall.func = "getMarketOwner" fromCall.args = ["<%= extras.synth_snx_market_id %>"] func = "setMarketSkewScale" -args = [ - "<%= extras.synth_snx_market_id %>", - "<%= parseEther(settings.synthSnxSkewScale) %>" -] +args = ["<%= extras.synth_snx_market_id %>", "<%= parseEther(settings.synthSnxSkewScale) %>"] depends = ["invoke.createSnxSynth"] diff --git a/tomls/omnibus-base-goerli-competition/perps/btc.toml b/tomls/omnibus-base-goerli-competition/perps/btc.toml index 9d7dd67f..7c4833e0 100644 --- a/tomls/omnibus-base-goerli-competition/perps/btc.toml +++ b/tomls/omnibus-base-goerli-competition/perps/btc.toml @@ -2,7 +2,6 @@ defaultValue = "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b" # Perps Configuration - [setting.btcPerpsMarketId] defaultValue = "200" diff --git a/tomls/omnibus-base-goerli-competition/perps/eth.toml b/tomls/omnibus-base-goerli-competition/perps/eth.toml index 24192fc6..cb47e7ca 100644 --- a/tomls/omnibus-base-goerli-competition/perps/eth.toml +++ b/tomls/omnibus-base-goerli-competition/perps/eth.toml @@ -1,10 +1,8 @@ # Pyth settlement strategy config - [setting.pythEthFeedId] defaultValue = "0xca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a6" # Perps Configuration - [setting.ethPerpsMarketId] defaultValue = "100" diff --git a/tomls/omnibus-base-goerli-competition/perps/global.toml b/tomls/omnibus-base-goerli-competition/perps/global.toml index 69a00235..8b6dcd00 100644 --- a/tomls/omnibus-base-goerli-competition/perps/global.toml +++ b/tomls/omnibus-base-goerli-competition/perps/global.toml @@ -1,5 +1,4 @@ # GLOBAL PERPS SETTINGS - [setting.perpsMinLiquidationReward] defaultValue = "1" @@ -7,33 +6,42 @@ defaultValue = "1" defaultValue = "500" # ------------------------------ - [invoke.setPerpsLiquidationRewardLimits] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationRewardGuards" -args = [ - "<%= parseEther('1') %>", - "<%= parseEther('500') %>" -] +args = ["<%= parseEther('1') %>", "<%= parseEther('500') %>"] depends = ["provision.perpsFactory"] [invoke.setPerpsMaxCollateralForSnxUsd] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" -args = [ - "0", - "<%= MaxUint256 %>" -] +args = ["0", "<%= MaxUint256 %>"] depends = ["provision.perpsFactory"] [invoke.setPerpsSynthDeductionPriority] 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"] +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" +] [invoke.setPerAccountCapsPerps] target = ["perpsFactory.PerpsMarketProxy"] diff --git a/tomls/omnibus-base-goerli-competition/perps/link.toml b/tomls/omnibus-base-goerli-competition/perps/link.toml index a3b5da27..bcfb07e2 100644 --- a/tomls/omnibus-base-goerli-competition/perps/link.toml +++ b/tomls/omnibus-base-goerli-competition/perps/link.toml @@ -2,7 +2,6 @@ defaultValue = "0x83be4ed61dd8a3518d198098ce37240c494710a7b9d85e35d9fceac21df08994" # Perps Configuration - [setting.linkPerpsMarketId] defaultValue = "300" diff --git a/tomls/omnibus-base-goerli-competition/perps/op.toml b/tomls/omnibus-base-goerli-competition/perps/op.toml index 2ffbd6f0..3a128eb6 100644 --- a/tomls/omnibus-base-goerli-competition/perps/op.toml +++ b/tomls/omnibus-base-goerli-competition/perps/op.toml @@ -2,7 +2,6 @@ defaultValue = "0x71334dcd37620ce3c33e3bafef04cc80dec083042e49b734315b36d1aad7991f" # Perps Configuration - [setting.opPerpsMarketId] defaultValue = "400" diff --git a/tomls/omnibus-base-goerli-competition/perps/snx.toml b/tomls/omnibus-base-goerli-competition/perps/snx.toml index e8568213..5cc58ef5 100644 --- a/tomls/omnibus-base-goerli-competition/perps/snx.toml +++ b/tomls/omnibus-base-goerli-competition/perps/snx.toml @@ -2,7 +2,6 @@ defaultValue = "0xe956a4199936e913b402474cb29576066f15108121d434606a19b34036e6d5cc" # Perps Configuration - [setting.snxPerpsMarketId] defaultValue = "500" diff --git a/tomls/omnibus-base-goerli-competition/synths/btc.toml b/tomls/omnibus-base-goerli-competition/synths/btc.toml index 4d02d2ff..31f67466 100644 --- a/tomls/omnibus-base-goerli-competition/synths/btc.toml +++ b/tomls/omnibus-base-goerli-competition/synths/btc.toml @@ -1,5 +1,4 @@ # Synth Configuration - [setting.synthBtcAsyncFixedFee] defaultValue = "0.0005" @@ -25,6 +24,4 @@ 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 } ] -depends = [ - "invoke.setSynthPriceBtc" -] +depends = ["invoke.setSynthPriceBtc"] diff --git a/tomls/omnibus-base-goerli-competition/synths/eth.toml b/tomls/omnibus-base-goerli-competition/synths/eth.toml index a8bdb95e..900a8c7f 100644 --- a/tomls/omnibus-base-goerli-competition/synths/eth.toml +++ b/tomls/omnibus-base-goerli-competition/synths/eth.toml @@ -1,5 +1,4 @@ # Synth Configuration - [setting.synthEthAsyncFixedFee] defaultValue = "0.0005" @@ -35,6 +34,4 @@ 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 } ] -depends = [ - "invoke.setSynthPriceEth" -] +depends = ["invoke.setSynthPriceEth"] diff --git a/tomls/omnibus-base-goerli-competition/synths/link.toml b/tomls/omnibus-base-goerli-competition/synths/link.toml index 094930e1..cc07fe8c 100644 --- a/tomls/omnibus-base-goerli-competition/synths/link.toml +++ b/tomls/omnibus-base-goerli-competition/synths/link.toml @@ -1,5 +1,4 @@ # Synth Configuration - [setting.synthLinkAsyncFixedFee] defaultValue = "0.001" @@ -25,6 +24,4 @@ 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 } ] -depends = [ - "invoke.setSynthPriceLink" -] +depends = ["invoke.setSynthPriceLink"] diff --git a/tomls/omnibus-base-goerli-competition/synths/op.toml b/tomls/omnibus-base-goerli-competition/synths/op.toml index 962428ab..e852d248 100644 --- a/tomls/omnibus-base-goerli-competition/synths/op.toml +++ b/tomls/omnibus-base-goerli-competition/synths/op.toml @@ -1,5 +1,4 @@ # Synth Configuration - [setting.synthOpAsyncFixedFee] defaultValue = "0.001" @@ -25,6 +24,4 @@ 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 } ] -depends = [ - "invoke.setSynthPriceOp" -] +depends = ["invoke.setSynthPriceOp"] diff --git a/tomls/omnibus-base-goerli-competition/synths/snx.toml b/tomls/omnibus-base-goerli-competition/synths/snx.toml index 92e561ba..a55faeb4 100644 --- a/tomls/omnibus-base-goerli-competition/synths/snx.toml +++ b/tomls/omnibus-base-goerli-competition/synths/snx.toml @@ -1,5 +1,4 @@ # Synth Configuration - [setting.synthSnxAsyncFixedFee] defaultValue = "0.001" @@ -25,6 +24,4 @@ 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 } ] -depends = [ - "invoke.setSynthPriceSnx" -] +depends = ["invoke.setSynthPriceSnx"] diff --git a/tomls/omnibus-optimism-goerli/perps/btc.toml b/tomls/omnibus-optimism-goerli/perps/btc.toml index 66a6b033..e7e62333 100644 --- a/tomls/omnibus-optimism-goerli/perps/btc.toml +++ b/tomls/omnibus-optimism-goerli/perps/btc.toml @@ -2,7 +2,6 @@ defaultValue = "0xf9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b" # Perps Configuration - [setting.btcPerpsMarketId] defaultValue = "200" diff --git a/tomls/omnibus-optimism-goerli/perps/eth.toml b/tomls/omnibus-optimism-goerli/perps/eth.toml index 5aeecaf8..892b9bbf 100644 --- a/tomls/omnibus-optimism-goerli/perps/eth.toml +++ b/tomls/omnibus-optimism-goerli/perps/eth.toml @@ -1,10 +1,8 @@ # Pyth settlement strategy config - [setting.pythEthFeedId] defaultValue = "0xca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a6" # Perps Configuration - [setting.ethPerpsMarketId] defaultValue = "100" diff --git a/tomls/omnibus-optimism-goerli/perps/global.toml b/tomls/omnibus-optimism-goerli/perps/global.toml index 4688249b..e5079adb 100644 --- a/tomls/omnibus-optimism-goerli/perps/global.toml +++ b/tomls/omnibus-optimism-goerli/perps/global.toml @@ -1,5 +1,4 @@ # GLOBAL PERPS SETTINGS - [setting.perpsMinLiquidationReward] defaultValue = "1" @@ -7,25 +6,18 @@ defaultValue = "1" defaultValue = "500" # ------------------------------ - [invoke.setPerpsLiquidationRewardLimits] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setLiquidationRewardGuards" -args = [ - "<%= parseEther('1') %>", - "<%= parseEther('500') %>" -] +args = ["<%= parseEther('1') %>", "<%= parseEther('500') %>"] depends = ["provision.perpsFactory"] [invoke.setPerpsMaxCollateralForSnxUsd] target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setMaxCollateralAmount" -args = [ - "0", - "<%= MaxUint256 %>" -] +args = ["0", "<%= MaxUint256 %>"] depends = ["provision.perpsFactory"] # TODO: add the rest of the synths diff --git a/tomls/omnibus-optimism-goerli/synths/btc.toml b/tomls/omnibus-optimism-goerli/synths/btc.toml index ab1b0014..ede57709 100644 --- a/tomls/omnibus-optimism-goerli/synths/btc.toml +++ b/tomls/omnibus-optimism-goerli/synths/btc.toml @@ -1,5 +1,4 @@ # Synth Configuration - [setting.synthBtcAsyncFixedFee] defaultValue = "0.0005" @@ -25,6 +24,4 @@ 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 } ] -depends = [ - "invoke.setSynthPriceBtc" -] +depends = ["invoke.setSynthPriceBtc"] diff --git a/tomls/omnibus-optimism-goerli/synths/eth.toml b/tomls/omnibus-optimism-goerli/synths/eth.toml index b5318639..7966f517 100644 --- a/tomls/omnibus-optimism-goerli/synths/eth.toml +++ b/tomls/omnibus-optimism-goerli/synths/eth.toml @@ -1,5 +1,4 @@ # Synth Configuration - [setting.synthEthAsyncFixedFee] defaultValue = "0.0005" @@ -35,6 +34,4 @@ 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 } ] -depends = [ - "invoke.setSynthPriceEth" -] +depends = ["invoke.setSynthPriceEth"] diff --git a/tomls/omnibus-optimism-goerli/synths/link.toml b/tomls/omnibus-optimism-goerli/synths/link.toml index 6727ff71..3cd02d15 100644 --- a/tomls/omnibus-optimism-goerli/synths/link.toml +++ b/tomls/omnibus-optimism-goerli/synths/link.toml @@ -27,6 +27,4 @@ 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 } ] -depends = [ - "invoke.setSynthPriceLink" -] +depends = ["invoke.setSynthPriceLink"] diff --git a/tomls/oracles/btc.toml b/tomls/oracles/btc.toml index a2fadab7..5547267d 100644 --- a/tomls/oracles/btc.toml +++ b/tomls/oracles/btc.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.btc_aggregator_address] @@ -14,10 +12,6 @@ args = [ "<%= defaultAbiCoder.encode(['address', 'uint256', 'uint8'], [settings.btc_aggregator_address, 0, 8]) %>", [] ] - extra.btc_oracle_id.event = "NodeRegistered" extra.btc_oracle_id.arg = 0 - -depends = [ - "provision.system" -] +depends = ["provision.system"] diff --git a/tomls/oracles/eth.toml b/tomls/oracles/eth.toml index 7e318971..3b7b13ac 100644 --- a/tomls/oracles/eth.toml +++ b/tomls/oracles/eth.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.eth_aggregator_address] @@ -14,10 +12,6 @@ args = [ "<%= defaultAbiCoder.encode(['address', 'uint256', 'uint8'], [settings.eth_aggregator_address, 0, 8]) %>", [] ] - extra.eth_oracle_id.event = "NodeRegistered" extra.eth_oracle_id.arg = 0 - -depends = [ - "provision.system" -] +depends = ["provision.system"] diff --git a/tomls/oracles/link.toml b/tomls/oracles/link.toml index d1ecd045..573a6201 100644 --- a/tomls/oracles/link.toml +++ b/tomls/oracles/link.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.link_aggregator_address] @@ -14,10 +12,6 @@ args = [ "<%= 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" -] +depends = ["provision.system"] diff --git a/tomls/oracles/pyth-btc.toml b/tomls/oracles/pyth-btc.toml index 47f498f0..85a11cc4 100644 --- a/tomls/oracles/pyth-btc.toml +++ b/tomls/oracles/pyth-btc.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.btc_aggregator_address] @@ -13,10 +11,6 @@ args = [ "<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.btc_aggregator_address, settings.pythBtcFeedId, 30]) %>", [] ] - extra.btc_oracle_id.event = "NodeRegistered" extra.btc_oracle_id.arg = 0 - -depends = [ - "provision.system" -] +depends = ["provision.system"] diff --git a/tomls/oracles/pyth-eth.toml b/tomls/oracles/pyth-eth.toml index 8fe40ae0..053a6567 100644 --- a/tomls/oracles/pyth-eth.toml +++ b/tomls/oracles/pyth-eth.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.eth_aggregator_address] @@ -13,10 +11,6 @@ args = [ "<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.eth_aggregator_address, settings.pythEthFeedId, 30]) %>", [] ] - extra.eth_oracle_id.event = "NodeRegistered" extra.eth_oracle_id.arg = 0 - -depends = [ - "provision.system" -] +depends = ["provision.system"] diff --git a/tomls/oracles/pyth-link.toml b/tomls/oracles/pyth-link.toml index 1e070e07..8fc4bdde 100644 --- a/tomls/oracles/pyth-link.toml +++ b/tomls/oracles/pyth-link.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.link_aggregator_address] @@ -13,10 +11,6 @@ args = [ "<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.link_aggregator_address, settings.pythLinkFeedId, 30]) %>", [] ] - extra.link_oracle_id.event = "NodeRegistered" extra.link_oracle_id.arg = 0 - -depends = [ - "provision.system" -] +depends = ["provision.system"] diff --git a/tomls/oracles/pyth-op.toml b/tomls/oracles/pyth-op.toml index 82c9ff22..d9250b1d 100644 --- a/tomls/oracles/pyth-op.toml +++ b/tomls/oracles/pyth-op.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.op_aggregator_address] @@ -13,10 +11,6 @@ args = [ "<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.op_aggregator_address, settings.pythOpFeedId, 30]) %>", [] ] - extra.op_oracle_id.event = "NodeRegistered" extra.op_oracle_id.arg = 0 - -depends = [ - "provision.system" -] +depends = ["provision.system"] diff --git a/tomls/oracles/pyth-snx.toml b/tomls/oracles/pyth-snx.toml index cbcbb5f0..4b46d20f 100644 --- a/tomls/oracles/pyth-snx.toml +++ b/tomls/oracles/pyth-snx.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.snx_aggregator_address] @@ -13,10 +11,6 @@ args = [ "<%= defaultAbiCoder.encode(['address', 'bytes32', 'uint256'], [settings.snx_aggregator_address, settings.pythSnxFeedId, 30]) %>", [] ] - extra.snx_oracle_id.event = "NodeRegistered" extra.snx_oracle_id.arg = 0 - -depends = [ - "provision.system" -] +depends = ["provision.system"] diff --git a/tomls/oracles/snx.toml b/tomls/oracles/snx.toml index 1e452fa7..db8fb63d 100644 --- a/tomls/oracles/snx.toml +++ b/tomls/oracles/snx.toml @@ -1,6 +1,4 @@ -include = [ - "../core.toml" -] +include = ["../core.toml"] [setting.snx_aggregator_address] @@ -14,10 +12,6 @@ args = [ "<%= defaultAbiCoder.encode(['address', 'uint256', 'uint8'], [settings.snx_aggregator_address, 0, 8]) %>", [], ] - extra.snx_oracle_id.event = "NodeRegistered" extra.snx_oracle_id.arg = 0 - -depends = [ - "provision.system" -] +depends = ["provision.system"] diff --git a/tomls/permissions.toml b/tomls/permissions.toml index 45f9d212..ff74f90f 100644 --- a/tomls/permissions.toml +++ b/tomls/permissions.toml @@ -4,8 +4,5 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "addToFeatureFlagAllowlist" -args = [ - "<%= formatBytes32String('createPool') %>", - "<%= settings.deployer %>", -] +args = ["<%= formatBytes32String('createPool') %>", "<%= settings.deployer %>"] depends = ["provision.system"] diff --git a/tomls/permit-all-createPool.toml b/tomls/permit-all-createPool.toml index 4fffc8d9..c9f3166c 100644 --- a/tomls/permit-all-createPool.toml +++ b/tomls/permit-all-createPool.toml @@ -2,8 +2,5 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "setFeatureFlagAllowAll" -args = [ - "<%= formatBytes32String('createPool') %>", - true, -] +args = ["<%= formatBytes32String('createPool') %>", true] depends = ["provision.system"] diff --git a/tomls/permit-all-perps-createAccount.toml b/tomls/permit-all-perps-createAccount.toml index 91e56870..bdfe4243 100644 --- a/tomls/permit-all-perps-createAccount.toml +++ b/tomls/permit-all-perps-createAccount.toml @@ -2,8 +2,5 @@ target = ["perpsFactory.PerpsMarketProxy"] fromCall.func = "owner" func = "setFeatureFlagAllowAll" -args = [ - "<%= formatBytes32String('createAccount') %>", - true, -] +args = ["<%= formatBytes32String('createAccount') %>", true] depends = ["provision.perpsFactory"] diff --git a/tomls/permit-all-registerMarket.toml b/tomls/permit-all-registerMarket.toml index 24d4f39b..c1f68f3f 100644 --- a/tomls/permit-all-registerMarket.toml +++ b/tomls/permit-all-registerMarket.toml @@ -2,8 +2,5 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "setFeatureFlagAllowAll" -args = [ - "<%= formatBytes32String('registerMarket') %>", - true, -] +args = ["<%= formatBytes32String('registerMarket') %>", true] depends = ["provision.system"] diff --git a/tomls/permit-all-transferCrossChain.toml b/tomls/permit-all-transferCrossChain.toml index 0948bd9c..7de5a631 100644 --- a/tomls/permit-all-transferCrossChain.toml +++ b/tomls/permit-all-transferCrossChain.toml @@ -2,8 +2,5 @@ target = ["system.CoreProxy"] fromCall.func = "owner" func = "setFeatureFlagAllowAll" -args = [ - "<%= formatBytes32String('transferCrossChain') %>", - true, -] +args = ["<%= formatBytes32String('transferCrossChain') %>", true] depends = ["provision.system"] diff --git a/tomls/pools/passive-snx.toml b/tomls/pools/passive-snx.toml index f634edf5..4ba1cff1 100644 --- a/tomls/pools/passive-snx.toml +++ b/tomls/pools/passive-snx.toml @@ -9,10 +9,7 @@ defaultValue = "2" target = ["system.CoreProxy"] from = "<%= settings.deployer %>" func = "createPool" -args = [ - "<%= settings.snx_pool_id %>", - "<%= settings.pool_owner %>", -] +args = ["<%= settings.snx_pool_id %>", "<%= settings.pool_owner %>"] depends = ["invoke.permitCreatePool"] [invoke.set_snx_pool_name] @@ -20,17 +17,12 @@ target = ["system.CoreProxy"] fromCall.func = "getPoolOwner" fromCall.args = ["<%= settings.snx_pool_id %>"] func = "setPoolName" -args = [ - "<%= settings.snx_pool_id %>", - "Passive SNX Pool", -] +args = ["<%= settings.snx_pool_id %>", "Passive SNX Pool"] depends = ["invoke.create_snx_pool"] [invoke.approve_snx_pool] target = ["system.CoreProxy"] fromCall.func = "owner" func = "addApprovedPool" -args = [ - "<%= settings.snx_pool_id %>", -] +args = ["<%= settings.snx_pool_id %>"] depends = ["invoke.create_snx_pool"] diff --git a/tomls/pools/spartan-council.toml b/tomls/pools/spartan-council.toml index 6eae58e3..b387aa86 100644 --- a/tomls/pools/spartan-council.toml +++ b/tomls/pools/spartan-council.toml @@ -8,10 +8,7 @@ target = ["system.CoreProxy"] from = "<%= settings.deployer %>" func = "createPool" -args = [ - "<%= settings.sc_pool_id %>", - "<%= settings.pool_owner %>", -] +args = ["<%= settings.sc_pool_id %>", "<%= settings.pool_owner %>"] depends = ["invoke.permitCreatePool"] [invoke.setScPoolName] @@ -19,17 +16,12 @@ target = ["system.CoreProxy"] fromCall.func = "getPoolOwner" fromCall.args = ["<%= settings.sc_pool_id %>"] func = "setPoolName" -args = [ - "<%= settings.sc_pool_id %>", - "Spartan Council Pool", -] +args = ["<%= settings.sc_pool_id %>", "Spartan Council Pool"] depends = ["invoke.createScPool"] [invoke.setPreferredPool] target = ["system.CoreProxy"] fromCall.func = "owner" func = "setPreferredPool" -args = [ - "<%= settings.sc_pool_id %>", -] +args = ["<%= settings.sc_pool_id %>"] depends = ["invoke.createScPool"] diff --git a/tomls/settings-mainnet.toml b/tomls/settings-mainnet.toml index af4eb719..d74d1305 100644 --- a/tomls/settings-mainnet.toml +++ b/tomls/settings-mainnet.toml @@ -1,13 +1,8 @@ -include = [ - "settings.toml", -] +include = ["settings.toml"] [invoke.setSupportedCrossChainNetworks] target = ["system.CoreProxy"] fromCall.func = "owner" func = "setSupportedCrossChainNetworks" -args = [ - ["1", "10"], - ["5009297550715157269", "3734403246176062136"] -] +args = [["1", "10"], ["5009297550715157269", "3734403246176062136"]] depends = ["provision.system"] diff --git a/tomls/settings-testnet.toml b/tomls/settings-testnet.toml index fa1eafe0..925f500f 100644 --- a/tomls/settings-testnet.toml +++ b/tomls/settings-testnet.toml @@ -1,6 +1,4 @@ -include = [ - "settings.toml", -] +include = ["settings.toml"] [invoke.setSupportedCrossChainNetworks] target = ["system.CoreProxy"] @@ -9,6 +7,12 @@ func = "setSupportedCrossChainNetworks" # https://docs.chain.link/ccip/supported-networks args = [ ["11155111", "420", "421613", "80001", "84531"], - ["16015286601757825753", "2664363617261496610", "6101244977088475029", "12532609583862916517", "5790810961207155433"] + [ + "16015286601757825753", + "2664363617261496610", + "6101244977088475029", + "12532609583862916517", + "5790810961207155433" + ] ] depends = ["provision.system"] diff --git a/tomls/settings.toml b/tomls/settings.toml index 5d50858c..3e28f1ee 100644 --- a/tomls/settings.toml +++ b/tomls/settings.toml @@ -27,8 +27,5 @@ depends = ["provision.system"] target = ["system.CoreProxy"] fromCall.func = "owner" func = "configureChainlinkCrossChain" -args = [ - "<%= settings.ccip_router %>", - "<%= settings.ccip_token_pool %>" -] +args = ["<%= settings.ccip_router %>", "<%= settings.ccip_token_pool %>"] depends = ["provision.system"]