Merge release-v5.0 branch (OpenZeppelin#4787)

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Francisco Giordano <[email protected]> Co-authored-by: Ernesto García <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Eric Lau <[email protected]> Co-authored-by: Hadrien Croubois <[email protected]> Co-authored-by: Zack Reneau-Wedeen <[email protected]>
Amxx · Dec 8, 2023 · 6ba452d · 6ba452d
1 parent 3af6271
commit 6ba452d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/lib/forge-std b/lib/forge-std
diff --git 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",
+1 −1		foundry.toml
+1 −1		lib/ds-test
+1 −1		package.json
+2 −0		src/Base.sol
+187 −20		src/StdAssertions.sol
+77 −33		src/StdChains.sol
+87 −28		src/StdCheats.sol
+92 −0		src/StdInvariant.sol
+28 −28		src/StdJson.sol
+1 −1		src/StdStorage.sol
+333 −0		src/StdStyle.sol
+71 −5		src/StdUtils.sol
+5 −1		src/Test.sol
+26 −2		src/Vm.sol
+73 −0		src/interfaces/IMulticall3.sol
+367 −0		test/StdAssertions.t.sol
+52 −15		test/StdChains.t.sol
+97 −1		test/StdCheats.t.sol
+110 −0		test/StdStyle.t.sol
+119 −13		test/StdUtils.t.sol