Merge upstream openzeppelin-contracts into upstream-patched

CHANGELOG.md

 # Changelog
 
+## Unreleased
+
+ * `ERC2771Context`: use private variable from storage to store the forwarder address. Fixes issues where `_msgSender()` was not callable from constructors. ([#2754](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2754))
+
 ## 4.2.0 (2021-06-30)
 
  * `ERC20Votes`: add a new extension of the `ERC20` token with support for voting snapshots and delegation. ([#2632](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2632))

contracts/metatx/ERC2771Context.sol

@@ -8,7 +8,7 @@ import "../utils/Context.sol";
  * @dev Context variant with ERC2771 support.
  */
 abstract contract ERC2771Context is Context {
-    address immutable _trustedForwarder;
+    address private _trustedForwarder;
 
     constructor(address trustedForwarder) {
         _trustedForwarder = trustedForwarder;

test/token/ERC20/extensions/ERC20FlashMint.test.js

@@ -45,10 +45,10 @@ contract('ERC20FlashMint', function (accounts) {
       const receiver = await ERC3156FlashBorrowerMock.new(true, true);
       const { tx } = await this.token.flashLoan(receiver.address, this.token.address, loanAmount, '0x');
 
-      expectEvent.inTransaction(tx, this.token, 'Transfer', { from: ZERO_ADDRESS, to: receiver.address, value: loanAmount });
-      expectEvent.inTransaction(tx, this.token, 'Transfer', { from: receiver.address, to: ZERO_ADDRESS, value: loanAmount });
-      expectEvent.inTransaction(tx, receiver, 'BalanceOf', { token: this.token.address, account: receiver.address, value: loanAmount });
-      expectEvent.inTransaction(tx, receiver, 'TotalSupply', { token: this.token.address, value: initialSupply.add(loanAmount) });
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', { from: ZERO_ADDRESS, to: receiver.address, value: loanAmount });
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', { from: receiver.address, to: ZERO_ADDRESS, value: loanAmount });
+      await expectEvent.inTransaction(tx, receiver, 'BalanceOf', { token: this.token.address, account: receiver.address, value: loanAmount });
+      await expectEvent.inTransaction(tx, receiver, 'TotalSupply', { token: this.token.address, value: initialSupply.add(loanAmount) });
 
       expect(await this.token.totalSupply()).to.be.bignumber.equal(initialSupply);
       expect(await this.token.balanceOf(receiver.address)).to.be.bignumber.equal('0');

test/token/ERC20/extensions/ERC20VotesComp.test.js

@@ -52,7 +52,7 @@ async function batchInBlock (txs) {
   }
 }
 
-contract('ERC20Votes', function (accounts) {
+contract('ERC20VotesComp', function (accounts) {
   const [ holder, recipient, holderDelegatee, recipientDelegatee, other1, other2 ] = accounts;
 
   const name = 'My Token';

test/token/ERC20/extensions/ERC20Wrapper.test.js

@@ -44,12 +44,12 @@ contract('ERC20', function (accounts) {
     it('valid', async function () {
       await this.underlying.approve(this.token.address, initialSupply, { from: initialHolder });
       const { tx } = await this.token.depositFor(initialHolder, initialSupply, { from: initialHolder });
-      expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
         from: initialHolder,
         to: this.token.address,
         value: initialSupply,
       });
-      expectEvent.inTransaction(tx, this.token, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', {
         from: ZERO_ADDRESS,
         to: initialHolder,
         value: initialSupply,
@@ -74,12 +74,12 @@ contract('ERC20', function (accounts) {
     it('to other account', async function () {
       await this.underlying.approve(this.token.address, initialSupply, { from: initialHolder });
       const { tx } = await this.token.depositFor(anotherAccount, initialSupply, { from: initialHolder });
-      expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
         from: initialHolder,
         to: this.token.address,
         value: initialSupply,
       });
-      expectEvent.inTransaction(tx, this.token, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', {
         from: ZERO_ADDRESS,
         to: anotherAccount,
         value: initialSupply,
@@ -104,12 +104,12 @@ contract('ERC20', function (accounts) {
       const value = new BN(42);
 
       const { tx } = await this.token.withdrawTo(initialHolder, value, { from: initialHolder });
-      expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
         from: this.token.address,
         to: initialHolder,
         value: value,
       });
-      expectEvent.inTransaction(tx, this.token, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', {
         from: initialHolder,
         to: ZERO_ADDRESS,
         value: value,
@@ -118,12 +118,12 @@ contract('ERC20', function (accounts) {
 
     it('entire balance', async function () {
       const { tx } = await this.token.withdrawTo(initialHolder, initialSupply, { from: initialHolder });
-      expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
         from: this.token.address,
         to: initialHolder,
         value: initialSupply,
       });
-      expectEvent.inTransaction(tx, this.token, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', {
         from: initialHolder,
         to: ZERO_ADDRESS,
         value: initialSupply,
@@ -132,12 +132,12 @@ contract('ERC20', function (accounts) {
 
     it('to other account', async function () {
       const { tx } = await this.token.withdrawTo(anotherAccount, initialSupply, { from: initialHolder });
-      expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
         from: this.token.address,
         to: anotherAccount,
         value: initialSupply,
       });
-      expectEvent.inTransaction(tx, this.token, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', {
         from: initialHolder,
         to: ZERO_ADDRESS,
         value: initialSupply,
@@ -151,7 +151,7 @@ contract('ERC20', function (accounts) {
       await this.token.depositFor(initialHolder, initialSupply, { from: initialHolder });
 
       const { tx } = await this.token.recover(anotherAccount);
-      expectEvent.inTransaction(tx, this.token, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', {
         from: ZERO_ADDRESS,
         to: anotherAccount,
         value: '0',
@@ -162,7 +162,7 @@ contract('ERC20', function (accounts) {
       await this.underlying.transfer(this.token.address, initialSupply, { from: initialHolder });
 
       const { tx } = await this.token.recover(anotherAccount);
-      expectEvent.inTransaction(tx, this.token, 'Transfer', {
+      await expectEvent.inTransaction(tx, this.token, 'Transfer', {
         from: ZERO_ADDRESS,
         to: anotherAccount,
         value: initialSupply,