Transpile fd81a96f

OpenZeppelin · Jul 28, 2023 · 3d4c0d5 · 3d4c0d5
1 parent 54bd6e3
commit 3d4c0d5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 18 deletions.
diff --git a/.changeset/unlucky-beans-obey.md b/.changeset/unlucky-beans-obey.md
diff --git a/.changeset/warm-guests-rule.md b/.changeset/warm-guests-rule.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
 
+## 4.9.3 (2023-07-28)
+
+- `ERC2771Context`: Return the forwarder address whenever the `msg.data` of a call originating from a trusted forwarder is not long enough to contain the request signer address (i.e. `msg.data.length` is less than 20 bytes), as specified by ERC-2771. ([#4481](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4481))
+- `ERC2771Context`: Prevent revert in `_msgData()` when a call originating from a trusted forwarder is not long enough to contain the request signer address (i.e. `msg.data.length` is less than 20 bytes). Return the full calldata in that case. ([#4484](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4484))
+
 ## 4.9.2 (2023-06-16)
 
 - `MerkleProof`: Fix a bug in `processMultiProof` and `processMultiProofCalldata` that allows proving arbitrary leaves if the tree contains a node with value 0 at depth 1.

diff --git a/contracts/metatx/ERC2771ContextUpgradeable.sol b/contracts/metatx/ERC2771ContextUpgradeable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.7.0) (metatx/ERC2771Context.sol)
+// OpenZeppelin Contracts (last updated v4.9.3) (metatx/ERC2771Context.sol)
 
 pragma solidity ^0.8.9;
 

diff --git a/contracts/package.json b/contracts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openzeppelin/contracts-upgradeable",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "4.9.2",
+  "version": "4.9.3",
   "files": [
     "**/*.sol",
     "/build/contracts/*.json",

diff --git a/contracts/token/ERC20/utils/SafeERC20Upgradeable.sol b/contracts/token/ERC20/utils/SafeERC20Upgradeable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.9.0) (token/ERC20/utils/SafeERC20.sol)
+// OpenZeppelin Contracts (last updated v4.9.3) (token/ERC20/utils/SafeERC20.sol)
 
 pragma solidity ^0.8.0;
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "openzeppelin-solidity",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "4.9.2",
+  "version": "4.9.3",
   "files": [
     "/contracts/**/*.sol",
     "/build/contracts/*.json",