Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cannon Update: latest #2334

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Cannon Update: latest #2334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e0cec3
Cannon Update: latest
noisekit Oct 28, 2024
c1fc25b
Breaking changes
noisekit Nov 13, 2024
a617fb1
--preset deprecated
noisekit Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,6 @@ jobs:
set -eo pipefail
yarn workspace "<< parameters.workspace >>" exec \
hardhat cannon:build \
--preset << parameters.cannonPreset >> \
--dry-run \
--network "<< parameters.hardhatNetwork >>" \
--upgrade-from << parameters.cannonPackage >>@<< parameters.cannonPreset >> \
Expand Down
2 changes: 1 addition & 1 deletion auxiliary/ERC4626ToAssetsRatioOracle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auxiliary/RewardsDistributor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion auxiliary/RewardsDistributorExternal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion auxiliary/WstEthToStEthRatioOracle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion markets/bfp-market/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion markets/perps-market/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
23 changes: 15 additions & 8 deletions markets/perps-market/storage.dump.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,46 +228,53 @@
"slot": "6",
"offset": 0
},
{
"type": "uint256",
"name": "currentLiquidationReward",
"size": 32,
"slot": "7",
"offset": 0
},
{
"type": "int128",
"name": "newPositionSize",
"size": 16,
"slot": "7",
"slot": "8",
"offset": 0
},
{
"type": "uint256",
"name": "newNotionalValue",
"size": 32,
"slot": "8",
"slot": "9",
"offset": 0
},
{
"type": "int256",
"name": "currentAvailableMargin",
"size": 32,
"slot": "9",
"slot": "10",
"offset": 0
},
{
"type": "uint256",
"name": "requiredInitialMargin",
"size": 32,
"slot": "10",
"slot": "11",
"offset": 0
},
{
"type": "uint256",
"name": "initialRequiredMargin",
"size": 32,
"slot": "11",
"slot": "12",
"offset": 0
},
{
"type": "uint256",
"name": "totalRequiredMargin",
"size": 32,
"slot": "12",
"slot": "13",
"offset": 0
},
{
Expand Down Expand Up @@ -296,14 +303,14 @@
}
],
"size": 96,
"slot": "13",
"slot": "14",
"offset": 0
},
{
"type": "bytes32",
"name": "trackingCode",
"size": 32,
"slot": "16",
"slot": "17",
"offset": 0
}
],
Expand Down
2 changes: 1 addition & 1 deletion markets/perps-market/subgraph/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion markets/spot-market/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion markets/spot-market/subgraph/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion protocol/governance/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions protocol/governance/storage.dump.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,7 @@
"members": [
"Sqrt",
"Linear",
"ScaledSqrt",
"ScaledLinear"
"Scaled"
],
"size": 1,
"slot": "0",
Expand Down
2 changes: 1 addition & 1 deletion protocol/synthetix/subgraph/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion utils/common-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions utils/core-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion utils/core-utils/src/utils/bootstrap/cannon-build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export async function cannonBuild(options: BuildOptions) {
projectDirectory: options.projectDirectory,
wipe: options.wipe,
registryPriority: 'local',
publicSourceCode: false,
privateSourceCode: true,
});

// Include provider error parsing
Expand Down
1 change: 0 additions & 1 deletion utils/core-utils/src/utils/bootstrap/cannon-inspect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export async function cannonInspect(options: InspectOptions) {
options.packageRef,
cliSettings,
options.chainId,
'',
false,
options.writeDeployments,
true
Expand Down
2 changes: 1 addition & 1 deletion utils/sample-project/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Loading