Skip to content

Commit 26b3b6c

Browse files
AmxxAmxx
committed
Upgrade @OpenZeppelin/contracts to 5.5.0-rc.0
1 parent 450ab48 commit 26b3b6c

33 files changed

+2245
-2493
lines changed

‎packages/core/solidity/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"devDependencies": {
2525
"@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#269f9b5",
26-
"@openzeppelin/contracts": "^5.4.0",
27-
"@openzeppelin/contracts-upgradeable": "^5.4.0",
26+
"@openzeppelin/contracts": "^5.5.0.rc-0",
27+
"@openzeppelin/contracts-upgradeable": "^5.5.0-rc.0",
2828
"@types/node": "^20.0.0",
2929
"@types/semver": "^7.5.7",
3030
"ava": "^6.0.0",
@@ -36,4 +36,4 @@
3636
"ts-node": "^10.4.0",
3737
"typescript": "^5.0.0"
3838
}
39-
}
39+
}

‎packages/core/solidity/src/account.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ function format(upgradeable: false | 'uups' | 'transparent') {
6161
}
6262
}
6363

64-
for (const signer of [false, 'ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const) {
64+
for (const signer of [false, 'ECDSA', 'EIP7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const) {
6565
for (const upgradeable of [false, 'uups', 'transparent'] as const) {
66-
if (signer === 'ERC7702' && !!upgradeable) continue;
66+
if (signer === 'EIP7702' && !!upgradeable) continue;
6767

6868
let title = 'Account';
6969
if (signer) {

‎packages/core/solidity/src/account.test.ts.md‎

Lines changed: 795 additions & 882 deletions
Large diffs are not rendered by default.

‎packages/core/solidity/src/account.test.ts.snap‎

-119 Bytes
Binary file not shown.

‎packages/core/solidity/src/contract.test.ts.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
99
> Snapshot 1
1010
1111
`// SPDX-License-Identifier: MIT␊
12-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
12+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
1313
pragma solidity ^0.8.27;␊
1414
␊
1515
contract Foo {␊
@@ -21,7 +21,7 @@ Generated by [AVA](https://avajs.dev).
2121
> Snapshot 1
2222
2323
`// SPDX-License-Identifier: MIT␊
24-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
24+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
2525
pragma solidity ^0.8.27;␊
2626
␊
2727
contract Footec {␊
@@ -33,7 +33,7 @@ Generated by [AVA](https://avajs.dev).
3333
> Snapshot 1
3434
3535
`// SPDX-License-Identifier: MIT␊
36-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
36+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
3737
pragma solidity ^0.8.27;␊
3838
␊
3939
import {Bar} from "./Bar.sol";␊
@@ -47,7 +47,7 @@ Generated by [AVA](https://avajs.dev).
4747
> Snapshot 1
4848
4949
`// SPDX-License-Identifier: MIT␊
50-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
50+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
5151
pragma solidity ^0.8.27;␊
5252
␊
5353
import {Bar} from "./Bar.sol";␊
@@ -62,7 +62,7 @@ Generated by [AVA](https://avajs.dev).
6262
> Snapshot 1
6363
6464
`// SPDX-License-Identifier: MIT␊
65-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
65+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
6666
pragma solidity ^0.8.27;␊
6767
␊
6868
import {Bar} from "./Bar.sol";␊
@@ -77,7 +77,7 @@ Generated by [AVA](https://avajs.dev).
7777
> Snapshot 1
7878
7979
`// SPDX-License-Identifier: MIT␊
80-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
80+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
8181
pragma solidity ^0.8.27;␊
8282
␊
8383
import {Bar} from "./Bar.sol";␊
@@ -93,7 +93,7 @@ Generated by [AVA](https://avajs.dev).
9393
> Snapshot 1
9494
9595
`// SPDX-License-Identifier: MIT␊
96-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
96+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
9797
pragma solidity ^0.8.27;␊
9898
␊
9999
contract Foo {␊
@@ -105,7 +105,7 @@ Generated by [AVA](https://avajs.dev).
105105
> Snapshot 1
106106
107107
`// SPDX-License-Identifier: MIT␊
108-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
108+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
109109
pragma solidity ^0.8.27;␊
110110
␊
111111
contract Foo {␊
@@ -125,7 +125,7 @@ Generated by [AVA](https://avajs.dev).
125125
> Snapshot 1
126126
127127
`// SPDX-License-Identifier: MIT␊
128-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
128+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
129129
pragma solidity ^0.8.27;␊
130130
␊
131131
contract Foo {␊
@@ -149,7 +149,7 @@ Generated by [AVA](https://avajs.dev).
149149
> Snapshot 1
150150
151151
`// SPDX-License-Identifier: MIT␊
152-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
152+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
153153
pragma solidity ^0.8.27;␊
154154
␊
155155
contract Foo {␊
@@ -162,7 +162,7 @@ Generated by [AVA](https://avajs.dev).
162162
> Snapshot 1
163163
164164
`// SPDX-License-Identifier: MIT␊
165-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
165+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
166166
pragma solidity ^0.8.27;␊
167167
␊
168168
contract Foo {␊
@@ -177,7 +177,7 @@ Generated by [AVA](https://avajs.dev).
177177
> Snapshot 1
178178
179179
`// SPDX-License-Identifier: MIT␊
180-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
180+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
181181
pragma solidity ^0.8.27;␊
182182
␊
183183
contract Foo {␊
@@ -192,7 +192,7 @@ Generated by [AVA](https://avajs.dev).
192192
> Snapshot 1
193193
194194
`// SPDX-License-Identifier: MIT␊
195-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
195+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
196196
pragma solidity ^0.8.27;␊
197197
␊
198198
import {Bar} from "./Bar.sol";␊
@@ -209,7 +209,7 @@ Generated by [AVA](https://avajs.dev).
209209
> Snapshot 1
210210
211211
`// SPDX-License-Identifier: MIT␊
212-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
212+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
213213
pragma solidity ^0.8.27;␊
214214
␊
215215
contract Foo {␊
@@ -224,7 +224,7 @@ Generated by [AVA](https://avajs.dev).
224224
> Snapshot 1
225225
226226
`// SPDX-License-Identifier: MIT␊
227-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
227+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
228228
pragma solidity ^0.8.27;␊
229229
␊
230230
contract Foo {␊
@@ -240,7 +240,7 @@ Generated by [AVA](https://avajs.dev).
240240
> Snapshot 1
241241
242242
`// SPDX-License-Identifier: MIT␊
243-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
243+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
244244
pragma solidity ^0.8.27;␊
245245
␊
246246
contract Foo {␊
@@ -253,7 +253,7 @@ Generated by [AVA](https://avajs.dev).
253253
> Snapshot 1
254254
255255
`// SPDX-License-Identifier: MIT␊
256-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
256+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
257257
pragma solidity ^0.8.27;␊
258258
␊
259259
contract Foo {␊
@@ -267,7 +267,7 @@ Generated by [AVA](https://avajs.dev).
267267
> Snapshot 1
268268
269269
`// SPDX-License-Identifier: MIT␊
270-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
270+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
271271
pragma solidity ^0.8.27;␊
272272
␊
273273
contract FooBarBaz {␊
@@ -279,7 +279,7 @@ Generated by [AVA](https://avajs.dev).
279279
> Snapshot 1
280280
281281
`// SPDX-License-Identifier: MIT␊
282-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
282+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
283283
pragma solidity ^0.8.27;␊
284284
␊
285285
/// @custom:security-contact security@example.com␊

‎packages/core/solidity/src/contract.test.ts.snap‎

6 Bytes
Binary file not shown.

‎packages/core/solidity/src/custom.test.ts.md‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
99
> Snapshot 1
1010
1111
`// SPDX-License-Identifier: MIT␊
12-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
12+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
1313
pragma solidity ^0.8.27;␊
1414
␊
1515
contract MyContract {␊
@@ -21,7 +21,7 @@ Generated by [AVA](https://avajs.dev).
2121
> Snapshot 1
2222
2323
`// SPDX-License-Identifier: MIT␊
24-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
24+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
2525
pragma solidity ^0.8.27;␊
2626
␊
2727
contract Contract {␊
@@ -33,7 +33,7 @@ Generated by [AVA](https://avajs.dev).
3333
> Snapshot 1
3434
3535
`// SPDX-License-Identifier: MIT␊
36-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
36+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
3737
pragma solidity ^0.8.27;␊
3838
␊
3939
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -57,10 +57,10 @@ Generated by [AVA](https://avajs.dev).
5757
> Snapshot 1
5858
5959
`// SPDX-License-Identifier: MIT␊
60-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
60+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
6161
pragma solidity ^0.8.27;␊
6262
␊
63-
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
63+
import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
6464
␊
6565
contract MyContract is Initializable {␊
6666
/// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -75,22 +75,21 @@ Generated by [AVA](https://avajs.dev).
7575
> Snapshot 1
7676
7777
`// SPDX-License-Identifier: MIT␊
78-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
78+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
7979
pragma solidity ^0.8.27;␊
8080
␊
81-
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
81+
import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
8282
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
83-
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
83+
import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
8484
␊
8585
contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
86-
/// @custom:oz-upgrades-unsafe-allow constructor␊
86+
/// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
8787
constructor() {␊
8888
_disableInitializers();␊
8989
}␊
9090
␊
9191
function initialize(address initialOwner) public initializer {␊
9292
__Ownable_init(initialOwner);␊
93-
__UUPSUpgradeable_init();␊
9493
}␊
9594
␊
9695
function _authorizeUpgrade(address newImplementation)␊
@@ -106,7 +105,7 @@ Generated by [AVA](https://avajs.dev).
106105
> Snapshot 1
107106
108107
`// SPDX-License-Identifier: MIT␊
109-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
108+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
110109
pragma solidity ^0.8.27;␊
111110
␊
112111
contract MyContract {␊
@@ -118,7 +117,7 @@ Generated by [AVA](https://avajs.dev).
118117
> Snapshot 1
119118
120119
`// SPDX-License-Identifier: MIT␊
121-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
120+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
122121
pragma solidity ^0.8.27;␊
123122
␊
124123
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -133,7 +132,7 @@ Generated by [AVA](https://avajs.dev).
133132
> Snapshot 1
134133
135134
`// SPDX-License-Identifier: MIT␊
136-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
135+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
137136
pragma solidity ^0.8.27;␊
138137
␊
139138
import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -150,7 +149,7 @@ Generated by [AVA](https://avajs.dev).
150149
> Snapshot 1
151150
152151
`// SPDX-License-Identifier: MIT␊
153-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
152+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
154153
pragma solidity ^0.8.27;␊
155154
␊
156155
import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -165,22 +164,21 @@ Generated by [AVA](https://avajs.dev).
165164
> Snapshot 1
166165
167166
`// SPDX-License-Identifier: MIT␊
168-
// Compatible with OpenZeppelin Contracts ^5.4.0␊
167+
// Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
169168
pragma solidity ^0.8.27;␊
170169
␊
171-
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
170+
import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
172171
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
173-
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
172+
import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
174173
␊
175174
contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
176-
/// @custom:oz-upgrades-unsafe-allow constructor␊
175+
/// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
177176
constructor() {␊
178177
_disableInitializers();␊
179178
}␊
180179
␊
181180
function initialize(address initialOwner) public initializer {␊
182181
__Ownable_init(initialOwner);␊
183-
__UUPSUpgradeable_init();␊
184182
}␊
185183
␊
186184
function _authorizeUpgrade(address newImplementation)␊

‎packages/core/solidity/src/custom.test.ts.snap‎

7 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)