Skip to content

Commit 87f9d08

Browse files
committed
feat: upgrade proxies validation, natspec reformat for UUPSProxiable and UUPSProxy
1 parent b4d925a commit 87f9d08

20 files changed

+182
-201
lines changed

contracts/package.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"start-local": "hardhat node --tags Arbitration,HomeArbitrable --hostname 0.0.0.0",
2828
"deploy": "hardhat deploy",
2929
"deploy-local": "hardhat deploy --tags Arbitration,HomeArbitrable --network localhost",
30+
"validate-upgrades": "openzeppelin-upgrades-core validate --exclude 'src/proxy/mock/**/*.sol' --exclude 'src/test/**/*.sol' artifacts/build-info",
3031
"simulate": "hardhat simulate:all",
3132
"simulate-local": "hardhat simulate:all --network localhost",
3233
"viem:generate-devnet": "NODE_NO_WARNINGS=1 wagmi generate -c wagmi.config.devnet.ts",
@@ -69,6 +70,7 @@
6970
"@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
7071
"@nomicfoundation/hardhat-ethers": "^3.0.8",
7172
"@nomiclabs/hardhat-solhint": "^4.0.1",
73+
"@openzeppelin/upgrades-core": "^1.41.0",
7274
"@typechain/ethers-v6": "^0.5.1",
7375
"@typechain/hardhat": "^9.1.0",
7476
"@types/chai": "^4.3.20",
@@ -80,23 +82,23 @@
8082
"dotenv": "^16.4.5",
8183
"eslint": "^9.15.0",
8284
"ethereumjs-util": "^7.1.5",
83-
"ethers": "^6.13.4",
85+
"ethers": "^6.13.5",
8486
"graphql": "^16.9.0",
8587
"graphql-request": "^7.1.2",
86-
"hardhat": "2.22.16",
88+
"hardhat": "2.22.18",
8789
"hardhat-contract-sizer": "^2.10.0",
8890
"hardhat-deploy": "^0.14.0",
8991
"hardhat-deploy-ethers": "^0.4.2",
90-
"hardhat-deploy-tenderly": "^0.2.0",
92+
"hardhat-deploy-tenderly": "^0.2.1",
9193
"hardhat-docgen": "^1.3.0",
92-
"hardhat-gas-reporter": "^2.2.1",
94+
"hardhat-gas-reporter": "^2.2.2",
9395
"hardhat-tracer": "^3.1.0",
9496
"hardhat-watcher": "^2.5.0",
9597
"node-fetch": "^3.3.2",
9698
"pino": "^8.21.0",
9799
"pino-pretty": "^10.3.1",
98100
"prettier": "^3.3.3",
99-
"prettier-plugin-solidity": "^1.4.1",
101+
"prettier-plugin-solidity": "^1.4.2",
100102
"shelljs": "^0.8.5",
101103
"solhint-plugin-prettier": "^0.1.0",
102104
"solidity-coverage": "^0.8.13",
@@ -107,7 +109,7 @@
107109
"dependencies": {
108110
"@chainlink/contracts": "^1.3.0",
109111
"@kleros/vea-contracts": "^0.4.0",
110-
"@openzeppelin/contracts": "^5.1.0",
112+
"@openzeppelin/contracts": "^5.2.0",
111113
"viem": "^2.21.48"
112114
}
113115
}

contracts/src/arbitration/DisputeTemplateRegistry.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ contract DisputeTemplateRegistry is IDisputeTemplateRegistry, UUPSProxiable, Ini
3333
// * Constructor * //
3434
// ************************************* //
3535

36-
/// @dev Constructor, initializing the implementation to reduce attack surface.
36+
/// @custom:oz-upgrades-unsafe-allow constructor
3737
constructor() {
3838
_disableInitializers();
3939
}

contracts/src/arbitration/KlerosCore.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ contract KlerosCore is KlerosCoreBase {
2020
// * Constructor * //
2121
// ************************************* //
2222

23-
/// @dev Constructor, initializing the implementation to reduce attack surface.
23+
/// @custom:oz-upgrades-unsafe-allow constructor
2424
constructor() {
2525
_disableInitializers();
2626
}

contracts/src/arbitration/KlerosCoreNeo.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ contract KlerosCoreNeo is KlerosCoreBase {
2828
// * Constructor * //
2929
// ************************************* //
3030

31-
/// @dev Constructor, initializing the implementation to reduce attack surface.
31+
/// @custom:oz-upgrades-unsafe-allow constructor
3232
constructor() {
3333
_disableInitializers();
3434
}

contracts/src/arbitration/PolicyRegistry.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ contract PolicyRegistry is UUPSProxiable, Initializable {
4040
// * Constructor * //
4141
// ************************************* //
4242

43-
/// @dev Constructor, initializing the implementation to reduce attack surface.
43+
/// @custom:oz-upgrades-unsafe-allow constructor
4444
constructor() {
4545
_disableInitializers();
4646
}

contracts/src/arbitration/SortitionModule.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ contract SortitionModule is SortitionModuleBase {
2121
// * Constructor * //
2222
// ************************************* //
2323

24-
/// @dev Constructor, initializing the implementation to reduce attack surface.
24+
/// @custom:oz-upgrades-unsafe-allow constructor
2525
constructor() {
2626
_disableInitializers();
2727
}

contracts/src/arbitration/SortitionModuleNeo.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ contract SortitionModuleNeo is SortitionModuleBase {
2929
// * Constructor * //
3030
// ************************************* //
3131

32-
/// @dev Constructor, initializing the implementation to reduce attack surface.
32+
/// @custom:oz-upgrades-unsafe-allow constructor
3333
constructor() {
3434
_disableInitializers();
3535
}

contracts/src/arbitration/devtools/KlerosCoreRuler.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ contract KlerosCoreRuler is IArbitratorV2, UUPSProxiable, Initializable {
166166
// * Constructor * //
167167
// ************************************* //
168168

169-
/// @dev Constructor, initializing the implementation to reduce attack surface.
169+
/// @custom:oz-upgrades-unsafe-allow constructor
170170
constructor() {
171171
_disableInitializers();
172172
}

contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ contract DisputeKitClassic is DisputeKitClassicBase {
2323
// * Constructor * //
2424
// ************************************* //
2525

26-
/// @dev Constructor, initializing the implementation to reduce attack surface.
26+
/// @custom:oz-upgrades-unsafe-allow constructor
2727
constructor() {
2828
_disableInitializers();
2929
}

contracts/src/arbitration/dispute-kits/DisputeKitGated.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ contract DisputeKitGated is DisputeKitClassicBase {
4646
// * Constructor * //
4747
// ************************************* //
4848

49-
/// @dev Constructor, initializing the implementation to reduce attack surface.
49+
/// @custom:oz-upgrades-unsafe-allow constructor
5050
constructor() {
5151
_disableInitializers();
5252
}

0 commit comments

Comments
 (0)