Merge remote-tracking branch 'origin/main' into xchain-pools

.circleci/config.yml

@@ -91,14 +91,39 @@ commands:
       # Find the last update of any contract
       - run: |
           git log -1 -- \
+            utils/common-config/hardhat.config.ts \
             utils/core-modules/contracts \
+            utils/core-modules/cannonfile.test.toml \
+            utils/core-modules/hardhat.config.ts \
+            utils/core-modules/storage.dump.sol \
             utils/core-contracts/contracts \
+            utils/core-contracts/hardhat.config.ts \
             protocol/synthetix/contracts \
+            protocol/synthetix/cannonfile.test.toml \
+            protocol/synthetix/cannonfile.toml \
+            protocol/synthetix/hardhat.config.ts \
+            protocol/synthetix/storage.dump.sol \
             protocol/governance/contracts \
+            protocol/governance/cannonfile.toml \
+            protocol/governance/hardhat.config.ts \
             protocol/oracle-manager/contracts \
+            protocol/oracle-manager/cannonfile.test.toml \
+            protocol/oracle-manager/cannonfile.toml \
+            protocol/oracle-manager/hardhat.config.ts \
+            protocol/oracle-manager/storage.dump.sol \
             markets/spot-market/contracts \
+            markets/spot-market/cannonfile.test.toml \
+            markets/spot-market/cannonfile.toml \
+            markets/spot-market/hardhat.config.ts \
+            markets/spot-market/storage.dump.sol \
             markets/perps-market/contracts \
+            markets/perps-market/cannonfile.test.toml \
+            markets/perps-market/cannonfile.toml \
+            markets/perps-market/hardhat.config.ts \
+            markets/perps-market/storage.dump.sol \
             markets/legacy-market/contracts \
+            markets/legacy-market/hardhat.config.ts \
+            markets/legacy-market/cannonfile.toml \
             > /tmp/version--contracts.txt
       - run: cat /tmp/version--contracts.txt
 
@@ -151,7 +176,7 @@ jobs:
       - restore_cache:
           keys:
             - testable-hardhat-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "/tmp/version--contracts.txt" }}
-      - run: yarn workspaces foreach --topological-dev --verbose run build-testable
+      - run: CANNON_REGISTRY_PRIORITY=local yarn workspaces foreach --topological-dev --verbose run build-testable
       - save_cache:
           key: testable-hardhat-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "/tmp/version--contracts.txt" }}
           paths:

.env.sample

@@ -3,4 +3,5 @@ INFURA_API_KEY=
 INFURA_IPFS_ID=
 INFURA_IPFS_SECRET=
 ETHERSCAN_API_KEY=
-OVM_ETHERSCAN_API_KEY=
+OVM_ETHERSCAN_API_KEY=
+CANNON_REGISTRY_PRIORITY=

.eslintignore

@@ -6,6 +6,6 @@ utils/*/utils
 **/contracts/generated
 **/test/generated
 **/artifacts
-**/subgraph/deployments
+**/subgraph/**/deployments
 **/subgraph/build
 **/subgraph/.bin

.github/workflows/simulate-release.yml

@@ -54,7 +54,7 @@ jobs:
             cannonPackage: "synthetix-spot-market"
             impersonate: "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
             proxy: "InitialProxy"
-            chains: "mainnet optimistic-mainnet goerli optimistic-goerli"
+            chains: "optimistic-mainnet optimistic-goerli"
 
           #          - workspace: "@synthetixio/perps-market"
           #            cannonPackage: "synthetix-perps-market"

.prettierignore

@@ -1,3 +1,5 @@
+.yarn/
+node_mudules/
 *.dump.sol
 **/coverage*
 build/
@@ -6,7 +8,7 @@ node_modules/
 **/contracts/routers
 **/dist/
 **/node_modules/
-**/typechain-types
+**/typechain-types/
 utils/*/utils
 utils/*/test/generated
 protocol/*/test/generated
@@ -21,3 +23,4 @@ lerna.json
 **/artifacts/
 **/cache/
 **/docs/
+**/tests/.latest.json

.prettierrc

@@ -1,8 +1,19 @@
 {
   "overrides": [
+    {
+      "files": "*.toml",
+      "options": {
+        "plugins": ["prettier-plugin-toml"],
+        "tabWidth": 4,
+        "useTabs": false,
+        "singleQuote": false,
+        "bracketSpacing": false
+      }
+    },
     {
       "files": "*.sol",
       "options": {
+        "plugins": ["prettier-plugin-solidity"],
         "printWidth": 100,
         "tabWidth": 4,
         "useTabs": false,
@@ -11,11 +22,7 @@
       }
     },
     {
-      "files": [
-        "*.js",
-        "*.ts",
-        "*.md"
-      ],
+      "files": ["*.js", "*.ts", "*.md"],
       "options": {
         "printWidth": 100,
         "semi": true,
@@ -25,11 +32,7 @@
       }
     },
     {
-      "files": [
-        "*.js",
-        "*.ts",
-        "*.json"
-      ],
+      "files": ["*.js", "*.ts", "*.json"],
       "options": {
         "useTabs": false
       }

.solhint.json

@@ -21,7 +21,6 @@
         "maxLength": 32
       }
     ],
-    "numcast/safe-cast": "error",
-    "no-global-import": "off"
+    "numcast/safe-cast": "error"
   }
 }

.yarnrc.yml

@@ -1,7 +1,5 @@
 checksumBehavior: ignore
 
-defaultSemverRangePrefix: ""
-
 nodeLinker: node-modules
 
 npmRegistryServer: "https://registry.npmjs.org"

README.md

@@ -75,4 +75,4 @@ To prepare for system upgrades, this repository is used to release new versions
 - Publish the release with `yarn publish:dev` for the pre-release (no git tag, version looks like `1.2.3-<GIT_SHA>.0`)> and `yarn publish:release` for the proper semver release.
   - If you aren't using [Frame](https://frame.sh/), prepend `CANNON_REGISTRY_PROVIDER_URL=<MAINNET_RPC> CANNON_PRIVATE_KEY=<PRIVATE_KEY>` to the commands above.
   - In case Cannon publish fails you can run `yarn publish-contracts` in the root to retry publishing all Cannon packages. Or run `yarn publish-contracts` in each failed package separately.
-- In all of the package.json files, revert dependencies' version changes back to "workspaces:*"` (leaving the change to `gitHead`, if applicable), commit, and push.
+- In all the package.json files, revert dependencies' version changes back to `"workspaces:*"` (leaving the change to `gitHead`, if applicable), commit, and push.