Fix workspace dependencies (#1808)

* Fix workspace dependencies * Include more files when calculating contracts cache key
Synthetixio · Sep 5, 2023 · 19fe6ea · 19fe6ea
1 parent 7a7843c
commit 19fe6ea
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 74 deletions.
diff --git a/.circleci/config.yml b/.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
 

diff --git a/.eslintignore b/.eslintignore
@@ -6,6 +6,6 @@ utils/*/utils
 **/contracts/generated
 **/test/generated
 **/artifacts
-**/subgraph/deployments
+**/subgraph/**/deployments
 **/subgraph/build
 **/subgraph/.bin
diff --git a/markets/perps-market/package.json b/markets/perps-market/package.json
@@ -23,15 +23,15 @@
   "author": "Synthetix",
   "license": "MIT",
   "devDependencies": {
-    "@synthetixio/common-config": "3.3.2",
-    "@synthetixio/core-contracts": "3.3.2",
-    "@synthetixio/core-modules": "3.3.2",
-    "@synthetixio/core-utils": "3.3.2",
-    "@synthetixio/docgen": "1.0.0",
-    "@synthetixio/main": "3.3.2",
-    "@synthetixio/oracle-manager": "3.3.2",
+    "@synthetixio/common-config": "workspace:*",
+    "@synthetixio/core-contracts": "workspace:*",
+    "@synthetixio/core-modules": "workspace:*",
+    "@synthetixio/core-utils": "workspace:*",
+    "@synthetixio/docgen": "workspace:*",
+    "@synthetixio/main": "workspace:*",
+    "@synthetixio/oracle-manager": "workspace:*",
     "@synthetixio/router": "^3.1.3",
-    "@synthetixio/spot-market": "3.3.2",
+    "@synthetixio/spot-market": "workspace:*",
     "@synthetixio/wei": "2.74.4",
     "@usecannon/cli": "^2.5.4",
     "ethers": "^5.7.2",

diff --git a/markets/spot-market/package.json b/markets/spot-market/package.json
@@ -24,13 +24,13 @@
   "author": "Synthetix",
   "license": "MIT",
   "devDependencies": {
-    "@synthetixio/common-config": "3.3.2",
-    "@synthetixio/core-contracts": "3.3.2",
-    "@synthetixio/core-modules": "3.3.2",
-    "@synthetixio/core-utils": "3.3.2",
-    "@synthetixio/docgen": "1.0.0",
-    "@synthetixio/main": "3.3.2",
-    "@synthetixio/oracle-manager": "3.3.2",
+    "@synthetixio/common-config": "workspace:*",
+    "@synthetixio/core-contracts": "workspace:*",
+    "@synthetixio/core-modules": "workspace:*",
+    "@synthetixio/core-utils": "workspace:*",
+    "@synthetixio/docgen": "workspace:*",
+    "@synthetixio/main": "workspace:*",
+    "@synthetixio/oracle-manager": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/wei": "2.74.4",
     "@types/node-fetch": "2.6.4",

diff --git a/protocol/oracle-manager/package.json b/protocol/oracle-manager/package.json
@@ -23,11 +23,11 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@synthetixio/common-config": "3.3.2",
-    "@synthetixio/core-contracts": "3.3.2",
-    "@synthetixio/core-modules": "3.3.2",
-    "@synthetixio/core-utils": "3.3.2",
-    "@synthetixio/docgen": "1.0.0",
+    "@synthetixio/common-config": "workspace:*",
+    "@synthetixio/core-contracts": "workspace:*",
+    "@synthetixio/core-modules": "workspace:*",
+    "@synthetixio/core-utils": "workspace:*",
+    "@synthetixio/docgen": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/wei": "2.74.4",
     "@types/node": "18.11.10",

diff --git a/protocol/synthetix/package.json b/protocol/synthetix/package.json
@@ -24,12 +24,12 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@synthetixio/common-config": "3.3.2",
-    "@synthetixio/core-contracts": "3.3.2",
-    "@synthetixio/core-modules": "3.3.2",
-    "@synthetixio/core-utils": "3.3.2",
-    "@synthetixio/docgen": "1.0.0",
-    "@synthetixio/oracle-manager": "3.3.2",
+    "@synthetixio/common-config": "workspace:*",
+    "@synthetixio/core-contracts": "workspace:*",
+    "@synthetixio/core-modules": "workspace:*",
+    "@synthetixio/core-utils": "workspace:*",
+    "@synthetixio/docgen": "workspace:*",
+    "@synthetixio/oracle-manager": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/wei": "2.74.4",
     "@usecannon/builder": "^2.5.4",

diff --git a/utils/common-config/package.json b/utils/common-config/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-etherscan": "3.1.7",
-    "@synthetixio/hardhat-storage": "3.3.2",
+    "@synthetixio/hardhat-storage": "workspace:*",
     "@typechain/ethers-v5": "10.1.0",
     "@typechain/hardhat": "6.1.3",
     "@usecannon/builder": "^2.5.4",

diff --git a/utils/core-contracts/package.json b/utils/core-contracts/package.json
@@ -27,8 +27,8 @@
   "devDependencies": {
     "@ethersproject/abstract-provider": "^5.7.0",
     "@ethersproject/bignumber": "^5.7.0",
-    "@synthetixio/common-config": "3.3.2",
-    "@synthetixio/core-utils": "3.3.2",
+    "@synthetixio/common-config": "workspace:*",
+    "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "ethers": "^5.7.2",
     "hardhat": "2.17.2"

diff --git a/utils/core-modules/package.json b/utils/core-modules/package.json
@@ -21,8 +21,8 @@
   "author": "Synthetix",
   "license": "MIT",
   "devDependencies": {
-    "@synthetixio/common-config": "3.3.2",
-    "@synthetixio/core-utils": "3.3.2",
+    "@synthetixio/common-config": "workspace:*",
+    "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "ethers": "^5.7.2",
     "hardhat": "2.17.2"

diff --git a/utils/hardhat-storage/package.json b/utils/hardhat-storage/package.json
@@ -31,7 +31,7 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@synthetixio/core-utils": "3.3.2",
+    "@synthetixio/core-utils": "workspace:*",
     "mustache": "4.2.0",
     "solidity-ast": "0.4.46"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -2623,13 +2623,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@synthetixio/common-config@3.3.2, @synthetixio/common-config@workspace:*, @synthetixio/common-config@workspace:utils/common-config":
+"@synthetixio/common-config@workspace:*, @synthetixio/common-config@workspace:utils/common-config":
   version: 0.0.0-use.local
   resolution: "@synthetixio/common-config@workspace:utils/common-config"
   dependencies:
     "@nomiclabs/hardhat-ethers": ^2.2.3
     "@nomiclabs/hardhat-etherscan": 3.1.7
-    "@synthetixio/hardhat-storage": 3.3.2
+    "@synthetixio/hardhat-storage": "workspace:*"
     "@typechain/ethers-v5": 10.1.0
     "@typechain/hardhat": 6.1.3
     "@usecannon/builder": ^2.5.4
@@ -2645,26 +2645,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@synthetixio/core-contracts@3.3.2, @synthetixio/core-contracts@workspace:*, @synthetixio/core-contracts@workspace:utils/core-contracts":
+"@synthetixio/core-contracts@workspace:*, @synthetixio/core-contracts@workspace:utils/core-contracts":
   version: 0.0.0-use.local
   resolution: "@synthetixio/core-contracts@workspace:utils/core-contracts"
   dependencies:
     "@ethersproject/abstract-provider": ^5.7.0
     "@ethersproject/bignumber": ^5.7.0
-    "@synthetixio/common-config": 3.3.2
-    "@synthetixio/core-utils": 3.3.2
+    "@synthetixio/common-config": "workspace:*"
+    "@synthetixio/core-utils": "workspace:*"
     "@synthetixio/router": ^3.1.3
     ethers: ^5.7.2
     hardhat: 2.17.2
   languageName: unknown
   linkType: soft
 
-"@synthetixio/core-modules@3.3.2, @synthetixio/core-modules@workspace:*, @synthetixio/core-modules@workspace:utils/core-modules":
+"@synthetixio/core-modules@workspace:*, @synthetixio/core-modules@workspace:utils/core-modules":
   version: 0.0.0-use.local
   resolution: "@synthetixio/core-modules@workspace:utils/core-modules"
   dependencies:
-    "@synthetixio/common-config": 3.3.2
-    "@synthetixio/core-utils": 3.3.2
+    "@synthetixio/common-config": "workspace:*"
+    "@synthetixio/core-utils": "workspace:*"
     "@synthetixio/router": ^3.1.3
     ethers: ^5.7.2
     hardhat: 2.17.2
@@ -2684,7 +2684,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@synthetixio/core-utils@3.3.2, @synthetixio/core-utils@workspace:*, @synthetixio/core-utils@workspace:utils/core-utils":
+"@synthetixio/core-utils@workspace:*, @synthetixio/core-utils@workspace:utils/core-utils":
   version: 0.0.0-use.local
   resolution: "@synthetixio/core-utils@workspace:utils/core-utils"
   dependencies:
@@ -2733,7 +2733,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@synthetixio/docgen@1.0.0, @synthetixio/docgen@workspace:*, @synthetixio/docgen@workspace:utils/docgen":
+"@synthetixio/docgen@workspace:*, @synthetixio/docgen@workspace:utils/docgen":
   version: 0.0.0-use.local
   resolution: "@synthetixio/docgen@workspace:utils/docgen"
   dependencies:
@@ -2760,11 +2760,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@synthetixio/hardhat-storage@3.3.2, @synthetixio/hardhat-storage@workspace:*, @synthetixio/hardhat-storage@workspace:utils/hardhat-storage":
+"@synthetixio/hardhat-storage@workspace:*, @synthetixio/hardhat-storage@workspace:utils/hardhat-storage":
   version: 0.0.0-use.local
   resolution: "@synthetixio/hardhat-storage@workspace:utils/hardhat-storage"
   dependencies:
-    "@synthetixio/core-utils": 3.3.2
+    "@synthetixio/core-utils": "workspace:*"
     "@types/jest": 29.2.3
     "@types/mustache": 4.2.2
     hardhat: 2.17.2
@@ -2791,16 +2791,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@synthetixio/main@3.3.2, @synthetixio/main@workspace:protocol/synthetix":
+"@synthetixio/main@workspace:*, @synthetixio/main@workspace:protocol/synthetix":
   version: 0.0.0-use.local
   resolution: "@synthetixio/main@workspace:protocol/synthetix"
   dependencies:
-    "@synthetixio/common-config": 3.3.2
-    "@synthetixio/core-contracts": 3.3.2
-    "@synthetixio/core-modules": 3.3.2
-    "@synthetixio/core-utils": 3.3.2
-    "@synthetixio/docgen": 1.0.0
-    "@synthetixio/oracle-manager": 3.3.2
+    "@synthetixio/common-config": "workspace:*"
+    "@synthetixio/core-contracts": "workspace:*"
+    "@synthetixio/core-modules": "workspace:*"
+    "@synthetixio/core-utils": "workspace:*"
+    "@synthetixio/docgen": "workspace:*"
+    "@synthetixio/oracle-manager": "workspace:*"
     "@synthetixio/router": ^3.1.3
     "@synthetixio/wei": 2.74.4
     "@usecannon/builder": ^2.5.4
@@ -2812,15 +2812,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@synthetixio/oracle-manager@3.3.2, @synthetixio/oracle-manager@workspace:protocol/oracle-manager":
+"@synthetixio/oracle-manager@workspace:*, @synthetixio/oracle-manager@workspace:protocol/oracle-manager":
   version: 0.0.0-use.local
   resolution: "@synthetixio/oracle-manager@workspace:protocol/oracle-manager"
   dependencies:
-    "@synthetixio/common-config": 3.3.2
-    "@synthetixio/core-contracts": 3.3.2
-    "@synthetixio/core-modules": 3.3.2
-    "@synthetixio/core-utils": 3.3.2
-    "@synthetixio/docgen": 1.0.0
+    "@synthetixio/common-config": "workspace:*"
+    "@synthetixio/core-contracts": "workspace:*"
+    "@synthetixio/core-modules": "workspace:*"
+    "@synthetixio/core-utils": "workspace:*"
+    "@synthetixio/docgen": "workspace:*"
     "@synthetixio/router": ^3.1.3
     "@synthetixio/wei": 2.74.4
     "@types/node": 18.11.10
@@ -2849,15 +2849,15 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@synthetixio/perps-market@workspace:markets/perps-market"
   dependencies:
-    "@synthetixio/common-config": 3.3.2
-    "@synthetixio/core-contracts": 3.3.2
-    "@synthetixio/core-modules": 3.3.2
-    "@synthetixio/core-utils": 3.3.2
-    "@synthetixio/docgen": 1.0.0
-    "@synthetixio/main": 3.3.2
-    "@synthetixio/oracle-manager": 3.3.2
+    "@synthetixio/common-config": "workspace:*"
+    "@synthetixio/core-contracts": "workspace:*"
+    "@synthetixio/core-modules": "workspace:*"
+    "@synthetixio/core-utils": "workspace:*"
+    "@synthetixio/docgen": "workspace:*"
+    "@synthetixio/main": "workspace:*"
+    "@synthetixio/oracle-manager": "workspace:*"
     "@synthetixio/router": ^3.1.3
-    "@synthetixio/spot-market": 3.3.2
+    "@synthetixio/spot-market": "workspace:*"
     "@synthetixio/wei": 2.74.4
     "@usecannon/cli": ^2.5.4
     ethers: ^5.7.2
@@ -2923,17 +2923,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@synthetixio/spot-market@3.3.2, @synthetixio/spot-market@workspace:markets/spot-market":
+"@synthetixio/spot-market@workspace:*, @synthetixio/spot-market@workspace:markets/spot-market":
   version: 0.0.0-use.local
   resolution: "@synthetixio/spot-market@workspace:markets/spot-market"
   dependencies:
-    "@synthetixio/common-config": 3.3.2
-    "@synthetixio/core-contracts": 3.3.2
-    "@synthetixio/core-modules": 3.3.2
-    "@synthetixio/core-utils": 3.3.2
-    "@synthetixio/docgen": 1.0.0
-    "@synthetixio/main": 3.3.2
-    "@synthetixio/oracle-manager": 3.3.2
+    "@synthetixio/common-config": "workspace:*"
+    "@synthetixio/core-contracts": "workspace:*"
+    "@synthetixio/core-modules": "workspace:*"
+    "@synthetixio/core-utils": "workspace:*"
+    "@synthetixio/docgen": "workspace:*"
+    "@synthetixio/main": "workspace:*"
+    "@synthetixio/oracle-manager": "workspace:*"
     "@synthetixio/router": ^3.1.3
     "@synthetixio/wei": 2.74.4
     "@types/node-fetch": 2.6.4