From 01ef448981be9d20ca85f2faf6ebdf591ce409f3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 15:54:32 -0600 Subject: [PATCH] Release v5.0.1 (#4785) Co-authored-by: github-actions[bot] --- .changeset/rude-weeks-beg.md | 5 ----- .changeset/strong-points-invent.md | 5 ----- CHANGELOG.md | 6 ++++++ contracts/metatx/ERC2771Context.sol | 2 +- contracts/package.json | 2 +- contracts/token/ERC1155/IERC1155.sol | 2 +- contracts/utils/Context.sol | 2 +- contracts/utils/Multicall.sol | 2 +- package.json | 2 +- 9 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 .changeset/rude-weeks-beg.md delete mode 100644 .changeset/strong-points-invent.md diff --git a/.changeset/rude-weeks-beg.md b/.changeset/rude-weeks-beg.md deleted file mode 100644 index 77fe423c64f..00000000000 --- a/.changeset/rude-weeks-beg.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'openzeppelin-solidity': patch ---- - -`ERC2771Context` and `Context`: Introduce a `_contextPrefixLength()` getter, used to trim extra information appended to `msg.data`. diff --git a/.changeset/strong-points-invent.md b/.changeset/strong-points-invent.md deleted file mode 100644 index 980000c4245..00000000000 --- a/.changeset/strong-points-invent.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'openzeppelin-solidity': patch ---- - -`Multicall`: Make aware of non-canonical context (i.e. `msg.sender` is not `_msgSender()`), allowing compatibility with `ERC2771Context`. diff --git a/CHANGELOG.md b/CHANGELOG.md index 249eb76a478..2dee31242a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog + +## 5.0.1 (2023-12-07) + +- `ERC2771Context` and `Context`: Introduce a `_contextPrefixLength()` getter, used to trim extra information appended to `msg.data`. +- `Multicall`: Make aware of non-canonical context (i.e. `msg.sender` is not `_msgSender()`), allowing compatibility with `ERC2771Context`. + ## 5.0.0 (2023-10-05) ### Additions Summary diff --git a/contracts/metatx/ERC2771Context.sol b/contracts/metatx/ERC2771Context.sol index e9af6029c92..66b012202ea 100644 --- a/contracts/metatx/ERC2771Context.sol +++ b/contracts/metatx/ERC2771Context.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (metatx/ERC2771Context.sol) +// OpenZeppelin Contracts (last updated v5.0.1) (metatx/ERC2771Context.sol) pragma solidity ^0.8.20; diff --git a/contracts/package.json b/contracts/package.json index be3e741e339..6ab89138a25 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,7 +1,7 @@ { "name": "@openzeppelin/contracts", "description": "Secure Smart Contract library for Solidity", - "version": "5.0.0", + "version": "5.0.1", "files": [ "**/*.sol", "/build/contracts/*.json", diff --git a/contracts/token/ERC1155/IERC1155.sol b/contracts/token/ERC1155/IERC1155.sol index 461e48b986e..1c99a417f2e 100644 --- a/contracts/token/ERC1155/IERC1155.sol +++ b/contracts/token/ERC1155/IERC1155.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (token/ERC1155/IERC1155.sol) +// OpenZeppelin Contracts (last updated v5.0.1) (token/ERC1155/IERC1155.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/Context.sol b/contracts/utils/Context.sol index f881fb6f781..4e535fe03c2 100644 --- a/contracts/utils/Context.sol +++ b/contracts/utils/Context.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (utils/Context.sol) +// OpenZeppelin Contracts (last updated v5.0.1) (utils/Context.sol) pragma solidity ^0.8.20; diff --git a/contracts/utils/Multicall.sol b/contracts/utils/Multicall.sol index 91c2323ca50..0dd5b4adc37 100644 --- a/contracts/utils/Multicall.sol +++ b/contracts/utils/Multicall.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v5.0.0) (utils/Multicall.sol) +// OpenZeppelin Contracts (last updated v5.0.1) (utils/Multicall.sol) pragma solidity ^0.8.20; diff --git a/package.json b/package.json index c7e92efa0fc..1afd5b15fd2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "openzeppelin-solidity", "description": "Secure Smart Contract library for Solidity", - "version": "5.0.0", + "version": "5.0.1", "private": true, "files": [ "/contracts/**/*.sol",