Skip to content

Commit 9cbe8b3

Browse files
committed
Merge branch 'master' into next-v5.0
2 parents 3c80a42 + 3d7a938 commit 9cbe8b3

File tree

76 files changed

+513
-16452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+513
-16452
lines changed

.github/workflows/checks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ jobs:
7777
- uses: actions/checkout@v3
7878
- name: Set up environment
7979
uses: ./.github/actions/setup
80+
- run: rm foundry.toml # https://github.com/foundry-rs/foundry/issues/3827
8081
- uses: crytic/slither-action@v0.2.0
8182

8283
codespell:

CHANGELOG.md

Lines changed: 14 additions & 2 deletions

contracts/access/AccessControl.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v4.7.0) (access/AccessControl.sol)
2+
// OpenZeppelin Contracts (last updated v4.8.0) (access/AccessControl.sol)
33

44
pragma solidity ^0.8.0;
55

contracts/access/Ownable2Step.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v4.7.0) (access/Ownable.sol)
2+
// OpenZeppelin Contracts (last updated v4.8.0) (access/Ownable2Step.sol)
33

44
pragma solidity ^0.8.0;
55

contracts/access/README.adoc

Lines changed: 2 additions & 0 deletions

contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v4.7.0) (crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol)
2+
// OpenZeppelin Contracts (last updated v4.8.0) (crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol)
33

44
pragma solidity ^0.8.4;
55

contracts/crosschain/arbitrum/LibArbitrumL1.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v4.7.0) (crosschain/arbitrum/LibArbitrumL1.sol)
2+
// OpenZeppelin Contracts (last updated v4.8.0) (crosschain/arbitrum/LibArbitrumL1.sol)
33

44
pragma solidity ^0.8.4;
55

contracts/crosschain/arbitrum/LibArbitrumL2.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v4.7.0) (crosschain/arbitrum/LibArbitrumL2.sol)
2+
// OpenZeppelin Contracts (last updated v4.8.0) (crosschain/arbitrum/LibArbitrumL2.sol)
33

44
pragma solidity ^0.8.4;
55

contracts/finance/PaymentSplitter.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v4.7.0) (finance/PaymentSplitter.sol)
2+
// OpenZeppelin Contracts (last updated v4.8.0) (finance/PaymentSplitter.sol)
33

44
pragma solidity ^0.8.0;
55

contracts/finance/VestingWallet.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
// OpenZeppelin Contracts (last updated v4.7.0) (finance/VestingWallet.sol)
2+
// OpenZeppelin Contracts (last updated v4.8.0) (finance/VestingWallet.sol)
33
pragma solidity ^0.8.0;
44

55
import "../token/ERC20/utils/SafeERC20.sol";

0 commit comments

Comments
 (0)