Skip to content

Commit

Permalink
Apply prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
noisekit committed Sep 8, 2023
1 parent f07896d commit 829c84f
Show file tree
Hide file tree
Showing 61 changed files with 132 additions and 416 deletions.
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"tabWidth": 4,
"useTabs": false,
"singleQuote": false,
"bracketSpacing": true
"bracketSpacing": false
}
},
{
Expand Down
1 change: 0 additions & 1 deletion omnibus-arbitrum-goerli.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ defaultValue = "1"
defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"

# Chainlink Configuration

[setting.ccip_router]
defaultValue = "0x88e492127709447a5abefdab8788a15b4567589e"

Expand Down
14 changes: 9 additions & 5 deletions omnibus-base-goerli-competition.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"
]
2 changes: 1 addition & 1 deletion omnibus-goerli.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"

[setting.ccip_token_pool]
defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
14 changes: 7 additions & 7 deletions omnibus-optimism-goerli.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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}"
Expand All @@ -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"
]
1 change: 0 additions & 1 deletion omnibus-optimism-mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ defaultValue = "0x261c05167db67B2b619f9d312e0753f3721ad6E8"
defaultValue = "0xe470A3068302CF045Eec3B800dDBFf42B42e18D8"

# ETH Synth Configuration

[setting.synthEthAsyncFixedFee]
defaultValue = "0.001"

Expand Down
1 change: 0 additions & 1 deletion omnibus-polygon-mumbai.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ defaultValue = "1"
defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"

# Chainlink Configuration

[setting.ccip_router]
defaultValue = "0x70499c328e1e2a3c41108bd3730f6670a44595d1"

Expand Down
2 changes: 1 addition & 1 deletion omnibus-sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
defaultValue = "0xd0daae2231e9cb96b94c8512223533293c3693bf"

[setting.ccip_token_pool]
defaultValue = "0x9b65749b38278060c5787cce0391ac7f1094c8e8"
defaultValue = "0x9b65749b38278060c5787cce0391ac7f1094c8e8"
9 changes: 2 additions & 7 deletions tomls/collaterals/op.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
include = [
"../oracles/pyth-op.toml"
]
include = ["../oracles/pyth-op.toml"]

[setting.op_address]

Expand All @@ -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"]
9 changes: 2 additions & 7 deletions tomls/collaterals/snx.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
include = [
"../oracles/snx.toml"
]
include = ["../oracles/snx.toml"]

[setting.snx_address]

Expand All @@ -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"]
9 changes: 2 additions & 7 deletions tomls/collaterals/wbtc.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
include = [
"../oracles/btc.toml"
]
include = ["../oracles/btc.toml"]

[setting.wbtc_address]

Expand All @@ -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"]
9 changes: 2 additions & 7 deletions tomls/collaterals/weth.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
include = [
"../oracles/eth.toml"
]
include = ["../oracles/eth.toml"]

[setting.weth_address]

Expand All @@ -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"]
4 changes: 1 addition & 3 deletions tomls/markets/common/bigcap-settings.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
include = [
"./settlement-settings.toml",
]
include = ["./settlement-settings.toml"]

[setting.bigCapSettlementDelay]
defaultValue = "15"
Expand Down
5 changes: 1 addition & 4 deletions tomls/markets/perps-factory.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
include = [
"./spot-factory.toml"
]
include = ["./spot-factory.toml"]

[setting.perps_market_package]

Expand All @@ -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"]
26 changes: 5 additions & 21 deletions tomls/markets/perps/btc.toml
Original file line number Diff line number Diff line change
@@ -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]

Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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"]
20 changes: 4 additions & 16 deletions tomls/markets/perps/eth.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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"]
20 changes: 4 additions & 16 deletions tomls/markets/perps/link.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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"]
20 changes: 4 additions & 16 deletions tomls/markets/perps/op.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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"]
Loading

0 comments on commit 829c84f

Please sign in to comment.