Cannon Update: latest (#2325)

* Cannon Update: latest * add bundle salt definition * fix storage dump * fix spot market missing var * add another missing var --------- Co-authored-by: noisekit <[email protected]> Co-authored-by: dbeal <[email protected]> Co-authored-by: Daniel Beal <[email protected]>
Synthetixio · Oct 11, 2024 · 90119c0 · 90119c0
1 parent 5255a1c
commit 90119c0
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 64 deletions.
diff --git a/auxiliary/ERC4626ToAssetsRatioOracle/package.json b/auxiliary/ERC4626ToAssetsRatioOracle/package.json
@@ -38,7 +38,7 @@
     "@synthetixio/docgen": "workspace:*",
     "@synthetixio/main": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36"

diff --git a/auxiliary/RewardsDistributor/package.json b/auxiliary/RewardsDistributor/package.json
@@ -21,7 +21,7 @@
     "forge-coverage": "forge coverage --report lcov"
   },
   "devDependencies": {
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "forge-std": "github:foundry-rs/forge-std#master"
   },
   "depcheck": {

diff --git a/auxiliary/RewardsDistributorExternal/package.json b/auxiliary/RewardsDistributorExternal/package.json
@@ -21,7 +21,7 @@
     "forge-coverage": "forge coverage --report lcov"
   },
   "devDependencies": {
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "forge-std": "github:foundry-rs/forge-std#master"
   },
   "depcheck": {

diff --git a/auxiliary/WstEthToStEthRatioOracle/package.json b/auxiliary/WstEthToStEthRatioOracle/package.json
@@ -38,7 +38,7 @@
     "@synthetixio/docgen": "workspace:*",
     "@synthetixio/main": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36"

diff --git a/markets/bfp-market/package.json b/markets/bfp-market/package.json
@@ -45,7 +45,7 @@
     "@synthetixio/wei": "^2.74.4",
     "@types/lodash": "^4.14.199",
     "@types/mocha-each": "^2.0.1",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "lodash": "^4.17.21",

diff --git a/markets/perps-market/cannonfile.test.toml b/markets/perps-market/cannonfile.test.toml
@@ -10,6 +10,9 @@ defaultValue = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 description = "perps market owner"
 defaultValue = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 
+[setting.salt]
+defaultValue = ""
+
 [setting.synthetixPackage]
 defaultValue = "synthetix:<%= package.version %>-testable"
 depends = []

diff --git a/markets/perps-market/package.json b/markets/perps-market/package.json
@@ -44,7 +44,7 @@
     "@synthetixio/oracle-manager": "workspace:*",
     "@synthetixio/spot-market": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36",

diff --git a/markets/perps-market/subgraph/package.json b/markets/perps-market/subgraph/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.81.0",
     "@graphprotocol/graph-ts": "^0.35.1",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "matchstick-as": "^0.6.0",
     "prettier": "^3.2.5"

diff --git a/markets/spot-market/cannonfile.test.toml b/markets/spot-market/cannonfile.test.toml
@@ -14,6 +14,9 @@ defaultValue = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 defaultValue = "synthetix:<%= package.version %>-testable"
 depends = []
 
+[setting.salt]
+defaultValue = ""
+
 [import.synthetix]
 source = "<%= settings.synthetixPackage %>"
 

diff --git a/markets/spot-market/package.json b/markets/spot-market/package.json
@@ -45,7 +45,7 @@
     "@synthetixio/oracle-manager": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
     "@types/node-fetch": "^2.6.11",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "node-fetch": "^2.7.0",

diff --git a/markets/spot-market/subgraph/package.json b/markets/spot-market/subgraph/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.81.0",
     "@graphprotocol/graph-ts": "^0.35.1",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "matchstick-as": "^0.6.0",
     "prettier": "^3.2.5"

diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "@types/node": "^20.11.17",
     "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^8.4.0",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "eslint": "^9.9.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "globals": "^15.9.0",

diff --git a/protocol/governance/package.json b/protocol/governance/package.json
@@ -38,7 +38,7 @@
     "@synthetixio/core-modules": "workspace:*",
     "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/docgen": "workspace:*",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36",

diff --git a/protocol/governance/tomls/proxy-base.toml b/protocol/governance/tomls/proxy-base.toml
@@ -1,6 +1,9 @@
 [setting.salt]
 defaultValue = "governance"
 
+[setting.bundleSalt]
+defaultValue = ""
+
 [setting.owner]
 
 [contract.InitialModuleBundle]

diff --git a/protocol/synthetix/subgraph/package.json b/protocol/synthetix/subgraph/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.81.0",
     "@graphprotocol/graph-ts": "^0.35.1",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "matchstick-as": "^0.6.0",
     "prettier": "^3.2.5"

diff --git a/utils/common-config/package.json b/utils/common-config/package.json
@@ -22,7 +22,7 @@
     "@typechain/hardhat": "^9.1.0",
     "dotenv": "^16.4.3",
     "hardhat": "^2.19.5",
-    "hardhat-cannon": "2.17.4",
+    "hardhat-cannon": "2.18.2",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-gas-reporter": "^1.0.10",
     "hardhat-ignore-warnings": "^0.2.9",

diff --git a/utils/core-utils/package.json b/utils/core-utils/package.json
@@ -46,8 +46,8 @@
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/micromatch": "^4",
     "@types/prompts": "^2.4.9",
-    "@usecannon/builder": "2.17.4",
-    "@usecannon/cli": "2.17.4",
+    "@usecannon/builder": "2.18.2",
+    "@usecannon/cli": "2.18.2",
     "ethers": "^5.7.2",
     "get-port": "^7.0.0",
     "hardhat": "^2.19.5",

diff --git a/utils/sample-project/package.json b/utils/sample-project/package.json
@@ -21,7 +21,7 @@
     "@synthetixio/hardhat-storage": "workspace:*",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
-    "hardhat-cannon": "2.17.4",
+    "hardhat-cannon": "2.18.2",
     "solidity-coverage": "^0.8.7"
   }
 }