From f2f3f7f0632f23bf45f603136894d64054a1974e Mon Sep 17 00:00:00 2001 From: noisekit <28145325+noisekit@users.noreply.github.com> Date: Mon, 28 Oct 2024 04:29:04 +0000 Subject: [PATCH] Cannon Update: latest --- .../ERC4626ToAssetsRatioOracle/package.json | 2 +- auxiliary/RewardsDistributor/package.json | 2 +- .../RewardsDistributorExternal/package.json | 2 +- .../WstEthToStEthRatioOracle/package.json | 2 +- markets/bfp-market/package.json | 2 +- markets/perps-market/package.json | 2 +- markets/perps-market/subgraph/package.json | 2 +- markets/spot-market/package.json | 2 +- markets/spot-market/subgraph/package.json | 2 +- package.json | 2 +- protocol/governance/package.json | 2 +- protocol/synthetix/subgraph/package.json | 2 +- utils/common-config/package.json | 2 +- utils/core-utils/package.json | 4 +- utils/sample-project/package.json | 2 +- yarn.lock | 108 +++++++++--------- 16 files changed, 73 insertions(+), 67 deletions(-) diff --git a/auxiliary/ERC4626ToAssetsRatioOracle/package.json b/auxiliary/ERC4626ToAssetsRatioOracle/package.json index ba661e2c58..9c9ffa82f1 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "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 index 09bea3f8ec..5cfc3cab67 100644 --- a/auxiliary/RewardsDistributor/package.json +++ b/auxiliary/RewardsDistributor/package.json @@ -21,7 +21,7 @@ "forge-coverage": "forge coverage --report lcov" }, "devDependencies": { - "@usecannon/cli": "2.18.2", + "@usecannon/cli": "2.18.4", "forge-std": "github:foundry-rs/forge-std#master" }, "depcheck": { diff --git a/auxiliary/RewardsDistributorExternal/package.json b/auxiliary/RewardsDistributorExternal/package.json index d02b06b91e..35bcbdb32a 100644 --- a/auxiliary/RewardsDistributorExternal/package.json +++ b/auxiliary/RewardsDistributorExternal/package.json @@ -21,7 +21,7 @@ "forge-coverage": "forge coverage --report lcov" }, "devDependencies": { - "@usecannon/cli": "2.18.2", + "@usecannon/cli": "2.18.4", "forge-std": "github:foundry-rs/forge-std#master" }, "depcheck": { diff --git a/auxiliary/WstEthToStEthRatioOracle/package.json b/auxiliary/WstEthToStEthRatioOracle/package.json index 8e5114b358..a1dd230ebd 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "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 index dbbf51289f..3d7969c793 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "ethers": "^5.7.2", "hardhat": "^2.19.5", "lodash": "^4.17.21", diff --git a/markets/perps-market/package.json b/markets/perps-market/package.json index fa2c142137..45893645cb 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "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 index f339838eaa..9f6984127b 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "ethers": "^5.7.2", "matchstick-as": "^0.6.0", "prettier": "^3.2.5" diff --git a/markets/spot-market/package.json b/markets/spot-market/package.json index 953be907cb..6656d66b1e 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "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 index 6570ae915b..0335e25f1c 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "ethers": "^5.7.2", "matchstick-as": "^0.6.0", "prettier": "^3.2.5" diff --git a/package.json b/package.json index a1219642c1..1724a0da97 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "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 index 62916e68dd..d8627eb836 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "ethers": "^5.7.2", "hardhat": "^2.19.5", "solidity-docgen": "^0.6.0-beta.36", diff --git a/protocol/synthetix/subgraph/package.json b/protocol/synthetix/subgraph/package.json index 885203e13b..d4bf9e9b37 100644 --- 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.18.2", + "@usecannon/cli": "2.18.4", "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 index 123c8c0547..e48cb36d54 100644 --- 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.18.2", + "hardhat-cannon": "2.18.4", "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 index e18394545a..30380f8a37 100644 --- 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.18.2", - "@usecannon/cli": "2.18.2", + "@usecannon/builder": "2.18.4", + "@usecannon/cli": "2.18.4", "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 index 80f6f8973c..6439c13ef3 100644 --- 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.18.2", + "hardhat-cannon": "2.18.4", "solidity-coverage": "^0.8.7" } } diff --git a/yarn.lock b/yarn.lock index b68432cabb..0e1a91c3b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3125,7 +3125,7 @@ __metadata: "@synthetixio/wei": "npm:^2.74.4" "@types/lodash": "npm:^4.14.199" "@types/mocha-each": "npm:^2.0.1" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" hardhat: "npm:^2.19.5" lodash: "npm:^4.17.21" @@ -3163,7 +3163,7 @@ __metadata: "@typechain/hardhat": "npm:^9.1.0" dotenv: "npm:^16.4.3" hardhat: "npm:^2.19.5" - hardhat-cannon: "npm:2.18.2" + hardhat-cannon: "npm:2.18.4" hardhat-contract-sizer: "npm:^2.10.0" hardhat-gas-reporter: "npm:^1.0.10" hardhat-ignore-warnings: "npm:^0.2.9" @@ -3206,7 +3206,7 @@ __metadata: dependencies: "@graphprotocol/graph-cli": "npm:^0.81.0" "@graphprotocol/graph-ts": "npm:^0.35.1" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" matchstick-as: "npm:^0.6.0" prettier: "npm:^3.2.5" @@ -3222,8 +3222,8 @@ __metadata: "@istanbuljs/nyc-config-typescript": "npm:^1.0.2" "@types/micromatch": "npm:^4" "@types/prompts": "npm:^2.4.9" - "@usecannon/builder": "npm:2.18.2" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/builder": "npm:2.18.4" + "@usecannon/cli": "npm:2.18.4" chalk: "npm:^4.1.2" ethereumjs-util: "npm:^7.1.5" ethers: "npm:^5.7.2" @@ -3293,7 +3293,7 @@ __metadata: "@synthetixio/docgen": "workspace:*" "@synthetixio/main": "workspace:*" "@synthetixio/wei": "npm:^2.74.4" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" hardhat: "npm:^2.19.5" solidity-docgen: "npm:^0.6.0-beta.36" @@ -3309,7 +3309,7 @@ __metadata: "@synthetixio/core-modules": "workspace:*" "@synthetixio/core-utils": "workspace:*" "@synthetixio/docgen": "workspace:*" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" hardhat: "npm:^2.19.5" solidity-docgen: "npm:^0.6.0-beta.36" @@ -3426,7 +3426,7 @@ __metadata: dependencies: "@graphprotocol/graph-cli": "npm:^0.81.0" "@graphprotocol/graph-ts": "npm:^0.35.1" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" matchstick-as: "npm:^0.6.0" prettier: "npm:^3.2.5" @@ -3446,7 +3446,7 @@ __metadata: "@synthetixio/oracle-manager": "workspace:*" "@synthetixio/spot-market": "workspace:*" "@synthetixio/wei": "npm:^2.74.4" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" hardhat: "npm:^2.19.5" solidity-docgen: "npm:^0.6.0-beta.36" @@ -3472,7 +3472,7 @@ __metadata: version: 0.0.0-use.local resolution: "@synthetixio/rewards-dist-ext@workspace:auxiliary/RewardsDistributorExternal" dependencies: - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" forge-std: "github:foundry-rs/forge-std#master" languageName: unknown linkType: soft @@ -3481,25 +3481,11 @@ __metadata: version: 0.0.0-use.local resolution: "@synthetixio/rewards-distributor@workspace:auxiliary/RewardsDistributor" dependencies: - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" forge-std: "github:foundry-rs/forge-std#master" languageName: unknown linkType: soft -"@synthetixio/router@npm:^3.4.0": - version: 3.4.0 - resolution: "@synthetixio/router@npm:3.4.0" - dependencies: - "@ethersproject/keccak256": "npm:^5.7.0" - debug: "npm:^4.3.4" - mustache: "npm:^4.2.0" - peerDependencies: - hardhat: ^2.0.0 - solc: ^0.8.17 - checksum: 10/da0db66e85b5dbd684563df4160cc0e74809c1a69fd455407efde994a37c8509ebf6c298f5708175e79cb62f89d7fa397646304e00b3fa948bb738dc7d664cdd - languageName: node - linkType: hard - "@synthetixio/sample-project@workspace:utils/sample-project": version: 0.0.0-use.local resolution: "@synthetixio/sample-project@workspace:utils/sample-project" @@ -3511,7 +3497,7 @@ __metadata: "@synthetixio/hardhat-storage": "workspace:*" ethers: "npm:^5.7.2" hardhat: "npm:^2.19.5" - hardhat-cannon: "npm:2.18.2" + hardhat-cannon: "npm:2.18.4" solidity-coverage: "npm:^0.8.7" languageName: unknown linkType: soft @@ -3536,7 +3522,7 @@ __metadata: dependencies: "@graphprotocol/graph-cli": "npm:^0.81.0" "@graphprotocol/graph-ts": "npm:^0.35.1" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" matchstick-as: "npm:^0.6.0" prettier: "npm:^3.2.5" @@ -3556,7 +3542,7 @@ __metadata: "@synthetixio/oracle-manager": "workspace:*" "@synthetixio/wei": "npm:^2.74.4" "@types/node-fetch": "npm:^2.6.11" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" hardhat: "npm:^2.19.5" node-fetch: "npm:^2.7.0" @@ -3586,7 +3572,7 @@ __metadata: "@synthetixio/docgen": "workspace:*" "@synthetixio/main": "workspace:*" "@synthetixio/wei": "npm:^2.74.4" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" ethers: "npm:^5.7.2" hardhat: "npm:^2.19.5" solidity-docgen: "npm:^0.6.0-beta.36" @@ -4275,11 +4261,12 @@ __metadata: languageName: node linkType: hard -"@usecannon/builder@npm:2.18.2": - version: 2.18.2 - resolution: "@usecannon/builder@npm:2.18.2" +"@usecannon/builder@npm:2.18.4": + version: 2.18.4 + resolution: "@usecannon/builder@npm:2.18.4" dependencies: - "@synthetixio/router": "npm:^3.4.0" + "@usecannon/router": "npm:^4.0.1" + "@usecannon/web-solc": "npm:0.5.1" axios: "npm:^1.7.2" axios-retry: "npm:^4.4.2" buffer: "npm:^6.0.3" @@ -4293,16 +4280,16 @@ __metadata: typestub-ipfs-only-hash: "npm:^4.0.0" viem: "npm:^2.21.15" zod: "npm:^3.23.6" - checksum: 10/c69d931e4ce7400e1d0a74cdcd210b2197d06d59639f3cd07ea5bd9ef8a90eda7abbba484098b0fa8cfffe7c2457da787d3c1c796beed1f45ca96beada6e9763 + checksum: 10/f7eaace14cd6dfd9908e748570defc217d58fbfe9caf4b021a3ec50e496694a9ae38d22e3bcf4a225aca5569d0ba1d00f165e1750832c594323c7e60e76efe64 languageName: node linkType: hard -"@usecannon/cli@npm:2.18.2": - version: 2.18.2 - resolution: "@usecannon/cli@npm:2.18.2" +"@usecannon/cli@npm:2.18.4": + version: 2.18.4 + resolution: "@usecannon/cli@npm:2.18.4" dependencies: "@iarna/toml": "npm:^3.0.0" - "@usecannon/builder": "npm:2.18.2" + "@usecannon/builder": "npm:2.18.4" abitype: "npm:^1.0.5" chalk: "npm:^4.1.2" commander: "npm:^12.1.0" @@ -4321,7 +4308,26 @@ __metadata: zod: "npm:^3.23.8" bin: cannon: bin/cannon.js - checksum: 10/4bd1f92b930db90c082079948b8396423a28d0851e139d54a9d1b6dd64fd9e1a041f6363b1f5ddeb5ebb58ed971495d5adc9336d2b3225f7ebcdb8e9364f3be5 + checksum: 10/24c2d5850cccba371d455723ee521d02d1eb322bce9745612bce7e28bcdb08e69a6565fa66b06821e96272c9b0e08b555c1356c70b34e9a2761bc134375702c8 + languageName: node + linkType: hard + +"@usecannon/router@npm:^4.0.1": + version: 4.0.1 + resolution: "@usecannon/router@npm:4.0.1" + dependencies: + "@ethersproject/abi": "npm:^5.7.0" + "@ethersproject/keccak256": "npm:^5.7.0" + debug: "npm:^4.3.7" + mustache: "npm:^4.2.0" + checksum: 10/ef4c177938da77b72ffb8dcf93ea19423b156acf86490415590b2e9e31aa96ea29e011d8a64714f58dfc56157509e71d6152d7b3d2d2676c6d0c620fa85fbcc9 + languageName: node + linkType: hard + +"@usecannon/web-solc@npm:0.5.1": + version: 0.5.1 + resolution: "@usecannon/web-solc@npm:0.5.1" + checksum: 10/598f1d5729d7674ec9bbf003b06224e0163c44914a852297cca5ae4eaff23e40f653ba215daec7270da4cd014eeda0e660446172d4efdd7156ffe6b250795074 languageName: node linkType: hard @@ -6759,15 +6765,15 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:~4.3.6": - version: 4.3.6 - resolution: "debug@npm:4.3.6" +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:^4.3.7, debug@npm:~4.3.6": + version: 4.3.7 + resolution: "debug@npm:4.3.7" dependencies: - ms: "npm:2.1.2" + ms: "npm:^2.1.3" peerDependenciesMeta: supports-color: optional: true - checksum: 10/d3adb9af7d57a9e809a68f404490cf776122acca16e6359a2702c0f462e510e91f9765c07f707b8ab0d91e03bad57328f3256f5082631cefb5393d0394d50fb7 + checksum: 10/71168908b9a78227ab29d5d25fe03c5867750e31ce24bf2c44a86efc5af041758bb56569b0a3d48a9b5344c00a24a777e6f4100ed6dfd9534a42c1dde285125a languageName: node linkType: hard @@ -9171,20 +9177,20 @@ __metadata: languageName: node linkType: hard -"hardhat-cannon@npm:2.18.2": - version: 2.18.2 - resolution: "hardhat-cannon@npm:2.18.2" +"hardhat-cannon@npm:2.18.4": + version: 2.18.4 + resolution: "hardhat-cannon@npm:2.18.4" dependencies: "@iarna/toml": "npm:^3.0.0" - "@usecannon/builder": "npm:2.18.2" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/builder": "npm:2.18.4" + "@usecannon/cli": "npm:2.18.4" chalk: "npm:^4.1.2" debug: "npm:^4.3.6" fs-extra: "npm:^11.2.0" viem: "npm:^2.21.15" peerDependencies: hardhat: ">=2.0.0" - checksum: 10/e339320a84d153d2a5a5e4fabb21dae5f3036e79646ead2e3850a9623a6b534cc9995efea63f4996ca3fc19352a0ccc4e2d43cf12e56efee84327f0e3e25cfae + checksum: 10/86a54e880a6bbbf79e205c84fe9ab06ce72bf47a25695baf726ee2e86c8e7eee9c592c3e1414b30e72c5488a8b8fdc1f63d5b5e884f9eff88d3e9e157ee85be8 languageName: node linkType: hard @@ -16116,7 +16122,7 @@ __metadata: "@types/node": "npm:^20.11.17" "@typescript-eslint/eslint-plugin": "npm:^8.4.0" "@typescript-eslint/parser": "npm:^8.4.0" - "@usecannon/cli": "npm:2.18.2" + "@usecannon/cli": "npm:2.18.4" eslint: "npm:^9.9.1" eslint-plugin-no-only-tests: "npm:^3.1.0" globals: "npm:^15.9.0"