Indent all things (#44)

* Indent all things * Add and configure prettier with toml plugin * Apply prettier * Add Lint action
Synthetixio · Sep 8, 2023 · d0f30ff · d0f30ff
1 parent 9bb191e
commit d0f30ff
Show file tree

Hide file tree

Showing 70 changed files with 3,275 additions and 700 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,26 @@
+name: Lint
+
+on:
+  pull_request: {}
+  push:
+    branches:
+      - "test"
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Foundry (Cannon)
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+      - run: anvil -V
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+          cache: "yarn"
+      - run: yarn --version
+      - run: yarn install --immutable
+      - run: yarn dedupe --check
+      - run: yarn pretty:check
diff --git a/.gitignore b/.gitignore
@@ -1 +1,13 @@
-.DS_Store
+.DS_Store
+.vscode
+.idea
+*.log
+
+# Yarn v3
+.yarn/*
+.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+.yarn/versions
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,2 @@
+.yarn/
+.idea/
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,26 @@
+{
+  "printWidth": 100,
+  "useTabs": false,
+  "overrides": [
+    {
+      "files": "*.toml",
+      "options": {
+        "plugins": ["prettier-plugin-toml"],
+        "tabWidth": 4,
+        "useTabs": false,
+        "singleQuote": false,
+        "bracketSpacing": false
+      }
+    },
+    {
+      "files": ["*.js", "*.ts", "*.md"],
+      "options": {
+        "tabWidth": 2,
+        "semi": true,
+        "singleQuote": true,
+        "bracketSpacing": true,
+        "trailingComma": "es5"
+      }
+    }
+  ]
+}
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/.yarn/releases/yarn-3.6.3.cjs b/.yarn/releases/yarn-3.6.3.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,20 @@
+nodeLinker: node-modules
+
+npmRegistryServer: "https://registry.npmjs.org"
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+supportedArchitectures:
+  cpu:
+    - x64
+    - arm64
+  libc:
+    - glibc
+    - musl
+  os:
+    - darwin
+    - linux
+
+yarnPath: .yarn/releases/yarn-3.6.3.cjs
diff --git 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
@@ -6,39 +6,36 @@ 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",
     "tomls/omnibus-base-goerli-competition/perps/eth.toml",
     "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",
@@ -119,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]
@@ -142,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-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-goerli.toml b/omnibus-goerli.toml
@@ -60,4 +60,4 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 
 [setting.ccip_token_pool]
-defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
diff --git a/omnibus-optimism-goerli.toml b/omnibus-optimism-goerli.toml
@@ -5,37 +5,29 @@ 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",
@@ -110,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}"
@@ -138,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
@@ -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",
@@ -69,7 +69,6 @@ defaultValue = "0x261c05167db67B2b619f9d312e0753f3721ad6E8"
 defaultValue = "0xe470A3068302CF045Eec3B800dDBFf42B42e18D8"
 
 # ETH Synth Configuration
-
 [setting.synthEthAsyncFixedFee]
 defaultValue = "0.001"
 
@@ -112,4 +111,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-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
@@ -53,4 +53,4 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 defaultValue = "0xd0daae2231e9cb96b94c8512223533293c3693bf"
 
 [setting.ccip_token_pool]
-defaultValue = "0x9b65749b38278060c5787cce0391ac7f1094c8e8"
+defaultValue = "0x9b65749b38278060c5787cce0391ac7f1094c8e8"
diff --git a/package.json b/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "synthetix-deployments",
+  "version": "0.0.0",
+  "main": "index.js",
+  "repository": "synthetixio/synthetix-deployments",
+  "author": "Synthetix",
+  "license": "MIT",
+  "private": true,
+  "scripts": {
+    "pretty": "prettier . '**/*.toml' --write",
+    "pretty:check": "prettier . '**/*.toml' --check"
+  },
+  "devDependencies": {
+    "@usecannon/cli": "^2.5.4",
+    "prettier": "^3.0.3",
+    "prettier-plugin-toml": "^1.0.0"
+  },
+  "packageManager": "[email protected]"
+}
diff --git 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]
 
@@ -9,9 +7,6 @@ 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 }
-]
-
-depends = [
-  "invoke.registerOpOracleNode"
+    { 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"]
diff --git 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]
 
@@ -11,9 +9,6 @@ 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"
-]
+depends = ["invoke.registerSnxOracleManager"]
diff --git 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]
 
@@ -9,9 +7,6 @@ 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 }
-]
-
-depends = [
-  "invoke.registerBtcOracleNode"
+    { 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"]