Update cannon and regenerate storage

.circleci/config.yml

@@ -11,12 +11,12 @@ commands:
       - run: date +"%Y-%m" > /tmp/month.txt && cat /tmp/month.txt
       - restore_cache:
           keys:
-            - yarn-{{ .Environment.YARN_CACHE_VERSION }}-{{ checksum "/tmp/month.txt" }}-{{ checksum "yarn.lock" }}
-            - yarn-{{ .Environment.YARN_CACHE_VERSION }}-{{ checksum "/tmp/month.txt" }}-
+            - yarn-{{ .Environment.NODE_MODULES_CACHE_VERSION }}-{{ checksum "/tmp/month.txt" }}-{{ checksum "yarn.lock" }}
+            - yarn-{{ .Environment.NODE_MODULES_CACHE_VERSION }}-{{ checksum "/tmp/month.txt" }}-
       - run: yarn -v
       - run: yarn install --immutable
       - save_cache:
-          key: yarn-{{ .Environment.YARN_CACHE_VERSION }}-{{ checksum "/tmp/month.txt" }}-{{ checksum "yarn.lock" }}
+          key: yarn-{{ .Environment.NODE_MODULES_CACHE_VERSION }}-{{ checksum "/tmp/month.txt" }}-{{ checksum "yarn.lock" }}
           paths:
             - "~/.yarn/berry"
 

.gitignore

@@ -30,3 +30,5 @@ storage.new.dump.json
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+
+tsconfig.tsbuildinfo

.yarnrc.yml

@@ -19,4 +19,4 @@ supportedArchitectures:
     - darwin
     - linux
 
-yarnPath: .yarn/releases/yarn-4.4.1.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

auxiliary/BuybackSnx/test/integration/bootstrap.ts

@@ -2,7 +2,7 @@ import { coreBootstrap } from '@synthetixio/core-utils/utils/bootstrap/tests';
 import { wei } from '@synthetixio/wei';
 import { ethers } from 'ethers';
 
-import { BuybackSnx } from '../generated/typechain';
+import { type BuybackSnx } from '../../typechain-types';
 
 interface Contracts {
   buyback_snx: BuybackSnx;

auxiliary/ERC4626ToAssetsRatioOracle/package.json

@@ -38,7 +38,7 @@
     "@synthetixio/docgen": "workspace:*",
     "@synthetixio/main": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
-    "@usecannon/cli": "2.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36"

auxiliary/OwnedFeeCollector/test/integration/bootstrap.ts

@@ -2,7 +2,7 @@ import { coreBootstrap } from '@synthetixio/core-utils/utils/bootstrap/tests';
 import { wei } from '@synthetixio/wei';
 import { ethers } from 'ethers';
 
-import { OwnedFeeCollector } from '../generated/typechain';
+import { type OwnedFeeCollector } from '../../typechain-types';
 
 interface Contracts {
   owned_fee_collector: OwnedFeeCollector;

auxiliary/RewardsDistributor/package.json

@@ -21,7 +21,7 @@
     "forge-coverage": "forge coverage --report lcov"
   },
   "devDependencies": {
-    "@usecannon/cli": "2.20.1",
+    "@usecannon/cli": "2.21.0",
     "forge-std": "github:foundry-rs/forge-std#master"
   },
   "depcheck": {

auxiliary/RewardsDistributorExternal/package.json

@@ -21,7 +21,7 @@
     "forge-coverage": "forge coverage --report lcov"
   },
   "devDependencies": {
-    "@usecannon/cli": "2.20.1",
+    "@usecannon/cli": "2.21.0",
     "forge-std": "github:foundry-rs/forge-std#master"
   },
   "depcheck": {

auxiliary/WstEthToStEthRatioOracle/package.json

@@ -38,7 +38,7 @@
     "@synthetixio/docgen": "workspace:*",
     "@synthetixio/main": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
-    "@usecannon/cli": "2.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36"

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.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "lodash": "^4.17.21",

markets/legacy-market/test/integration/LegacyMarket.iosiroInfiniteMoney.ts

@@ -38,6 +38,7 @@ describe('LegacyMarket (iosiro)', function () {
   let susdToken: ethers.Contract;
 
   let v3System: ethers.Contract;
+  let v3Account: ethers.Contract;
   let v3Usd: ethers.Contract;
 
   let cannonProvider: ethers.providers.JsonRpcProvider;
@@ -82,6 +83,7 @@ describe('LegacyMarket (iosiro)', function () {
       outputs.imports.v3.contracts.CoreProxy.abi,
       provider
     );
+
     v3Account = new ethers.Contract(
       outputs.imports.v3.contracts.AccountProxy.address,
       outputs.imports.v3.contracts.AccountProxy.abi,

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.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36",

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.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "matchstick-as": "^0.6.0",
     "prettier": "^3.2.5"

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.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "node-fetch": "^2.7.0",

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.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "matchstick-as": "^0.6.0",
     "prettier": "^3.2.5"

package.json

@@ -66,11 +66,14 @@
     "@lerna-lite/publish": "^3.3.0",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@synthetixio/deps": "workspace:*",
+    "@types/debug": "^4.1.12",
+    "@types/fs-extra": "^11.0.4",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.11.17",
+    "@types/semver": "^7.5.8",
     "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^8.4.0",
-    "@usecannon/cli": "2.20.1",
+    "@usecannon/cli": "2.21.0",
     "eslint": "^9.9.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "globals": "^15.9.0",
@@ -122,5 +125,5 @@
   "engines": {
     "node": "^20.17.0"
   },
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.6.0"
 }

protocol/governance/package.json

@@ -38,7 +38,7 @@
     "@synthetixio/core-modules": "workspace:*",
     "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/docgen": "workspace:*",
-    "@usecannon/cli": "2.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "hardhat": "^2.19.5",
     "solidity-docgen": "^0.6.0-beta.36",

protocol/oracle-manager/test/common/oracleNode.ts

@@ -1,6 +1,6 @@
 import { BigNumberish, Contract, ethers } from 'ethers';
 import hre from 'hardhat';
-import { Proxy } from '../generated/typechain';
+import { type Proxy } from '../../typechain-types';
 import { findSingleEvent } from '@synthetixio/core-utils/utils/ethers/events';
 import NodeTypes from '../integration/mixins/Node.types';
 

protocol/oracle-manager/test/integration/bootstrap.ts

@@ -2,7 +2,7 @@ import { coreBootstrap } from '@synthetixio/core-utils/utils/bootstrap/tests';
 import { wei } from '@synthetixio/wei';
 import { ethers } from 'ethers';
 import hre from 'hardhat';
-import { NodeModule } from '../generated/typechain';
+import { type NodeModule } from '../../typechain-types';
 import NodeTypes from './mixins/Node.types';
 
 const abi = ethers.utils.defaultAbiCoder;

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.20.1",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "matchstick-as": "^0.6.0",
     "prettier": "^3.2.5"

tsconfig.eslint.json

@@ -9,9 +9,5 @@
     "./markets/**/*.js",
     "./auxiliary/**/*.js",
     "./auxiliary/**/*.ts"
-  ],
-  "exclude": [],
-  "compilerOptions": {
-    "noEmit": true
-  }
+  ]
 }

tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "noEmit": true,
     "target": "ESNext",
     "module": "Node16",
     "moduleResolution": "node16",
@@ -12,5 +13,8 @@
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true
-  }
+  },
+  "exclude": [
+    "**/subgraph/**/*"
+  ]
 }

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.20.1",
+    "hardhat-cannon": "2.21.0",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-gas-reporter": "^1.0.10",
     "hardhat-ignore-warnings": "^0.2.9",

utils/core-utils/package.json

@@ -14,7 +14,7 @@
   ],
   "scripts": {
     "build": "yarn build:ts",
-    "build:ts": "tsc --project src/tsconfig.json",
+    "build:ts": "tsc --noEmit false --project src/tsconfig.json",
     "watch": "yarn build --watch",
     "test": "mocha --require ts-node/register",
     "coverage": "nyc yarn test",
@@ -46,8 +46,8 @@
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/micromatch": "^4",
     "@types/prompts": "^2.4.9",
-    "@usecannon/builder": "2.20.1",
-    "@usecannon/cli": "2.20.1",
+    "@usecannon/builder": "2.21.0",
+    "@usecannon/cli": "2.21.0",
     "ethers": "^5.7.2",
     "get-port": "^7.0.0",
     "hardhat": "^2.19.5",
@@ -68,6 +68,6 @@
     "micromatch": "4.0.8",
     "prompts": "^2.4.2",
     "rfdc": "^1.3.1",
-    "viem": "^2.16.5"
+    "viem": "^2.22.17"
   }
 }

utils/core-utils/src/tsconfig.json

@@ -3,8 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "rootDir": ".",
-    "outDir": ".."
-  },
-  "include": ["./**/*.ts"],
-  "exclude": []
+    "outDir": "..",
+    "composite": true
+  }
 }

utils/core-utils/src/utils/bootstrap/cannon-inspect.ts

@@ -12,7 +12,7 @@ export async function cannonInspect(options: InspectOptions) {
     options.packageRef,
     cliSettings,
     options.chainId,
-    false,
+    'overview',
     options.writeDeployments,
     true
   );

utils/hardhat-storage/package.json

@@ -24,7 +24,7 @@
   "license": "MIT",
   "scripts": {
     "build": "yarn build:ts",
-    "build:ts": "tsc --project src/tsconfig.json",
+    "build:ts": "tsc --noEmit false --project src/tsconfig.json",
     "watch": "yarn build --watch",
     "test": "jest",
     "coverage": "yarn test --coverage",

utils/hardhat-storage/src/tsconfig.json

@@ -5,7 +5,5 @@
     "rootDir": ".",
     "outDir": "../dist",
     "composite": true
-  },
-  "include": ["./**/*.ts"],
-  "exclude": []
+  }
 }