Skip to content

Update to OZ Contracts 4.8 #199

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

Merged
merged 2 commits into from
Nov 8, 2022
Merged

Update to OZ Contracts 4.8 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
294ded5
Update to OZ Contracts 4.8
frangio Nov 8, 2022
6f633fb
update and fix tests
frangio Nov 8, 2022
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
2 changes: 1 addition & 1 deletion packages/core/hardhat.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ task(TASK_COMPILE_SOLIDITY_MERGE_COMPILATION_JOBS, async ({ compilationJobs }, _
* @type import('hardhat/config').HardhatUserConfig
*/
module.exports = {
solidity: '0.8.4',
solidity: '0.8.9',
};
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"version": "node ../../scripts/bump-changelog.js"
},
"devDependencies": {
"@openzeppelin/contracts": "4.7.3",
"@openzeppelin/contracts-upgradeable": "4.7.3",
"@openzeppelin/contracts": "4.8.0",
"@openzeppelin/contracts-upgradeable": "4.8.0",
"@types/node": "^10.17.51",
"@types/rimraf": "^3.0.0",
"array.prototype.flat": "^1.2.4",
Expand Down
38 changes: 19 additions & 19 deletions packages/core/src/contract.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
}␊
Expand All @@ -20,7 +20,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "./Bar.sol";␊
␊
Expand All @@ -33,7 +33,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "./Bar.sol";␊
import "./Quux.sol";␊
Expand All @@ -47,7 +47,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "./Bar.sol";␊
␊
Expand All @@ -61,7 +61,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "./Bar.sol";␊
import "./Quux.sol";␊
Expand All @@ -76,7 +76,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
}␊
Expand All @@ -87,7 +87,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
// The following functions are overrides required by Solidity.␊
Expand All @@ -106,7 +106,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
// The following functions are overrides required by Solidity.␊
Expand All @@ -129,7 +129,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
function _otherFunction() internal whenNotPaused {}␊
Expand All @@ -141,7 +141,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
function _otherFunction() internal whenNotPaused override(ERC20, OtherParent) {␊
Expand All @@ -155,7 +155,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
constructor() {␊
Expand All @@ -169,7 +169,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "./Bar.sol";␊
␊
Expand All @@ -185,7 +185,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
function _otherFunction() internal {␊
Expand All @@ -199,7 +199,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
function _otherFunction() internal override {␊
Expand All @@ -214,7 +214,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
uint value = 42;␊
Expand All @@ -226,7 +226,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract Foo {␊
uint value = 42;␊
Expand All @@ -239,7 +239,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract FooBarBaz {␊
}␊
Expand All @@ -250,7 +250,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "./Counters.sol";␊
␊
Expand All @@ -264,7 +264,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
/// @custom:security-contact [email protected]␊
contract Foo {␊
Expand Down
Binary file modified packages/core/src/contract.test.ts.snap
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions packages/core/src/custom.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract MyContract {␊
}␊
Expand All @@ -20,7 +20,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/security/Pausable.sol";␊
import "@openzeppelin/contracts/access/Ownable.sol";␊
Expand All @@ -41,7 +41,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
␊
Expand All @@ -58,7 +58,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
Expand Down Expand Up @@ -88,7 +88,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
contract MyContract {␊
}␊
Expand All @@ -99,7 +99,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/access/Ownable.sol";␊
␊
Expand All @@ -112,7 +112,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/access/AccessControl.sol";␊
␊
Expand All @@ -128,7 +128,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
Expand Down
Binary file modified packages/core/src/custom.test.ts.snap
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions packages/core/src/erc1155.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
import "@openzeppelin/contracts/access/Ownable.sol";␊
Expand All @@ -30,7 +30,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
import "@openzeppelin/contracts/access/AccessControl.sol";␊
Expand Down Expand Up @@ -67,7 +67,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
␊
Expand All @@ -83,7 +83,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
import "@openzeppelin/contracts/access/Ownable.sol";␊
Expand All @@ -105,7 +105,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
import "@openzeppelin/contracts/access/Ownable.sol";␊
Expand Down Expand Up @@ -143,7 +143,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
import "@openzeppelin/contracts/access/Ownable.sol";␊
Expand Down Expand Up @@ -178,7 +178,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
import "@openzeppelin/contracts/access/AccessControl.sol";␊
Expand Down Expand Up @@ -231,7 +231,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
import "@openzeppelin/contracts/access/Ownable.sol";␊
Expand Down Expand Up @@ -262,7 +262,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
Expand Down Expand Up @@ -344,7 +344,7 @@ Generated by [AVA](https://avajs.dev).
> Snapshot 1

`// SPDX-License-Identifier: MIT␊
pragma solidity ^0.8.4;␊
pragma solidity ^0.8.9;␊
␊
import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
Expand Down
Binary file modified packages/core/src/erc1155.test.ts.snap
View file
Open in desktop
Binary file not shown.
Loading