NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ERC2771Context return original sender address if msg.data.length <= 20 (#4481)

Browse Source
This commit is contained in:
Ernesto García
2023-07-25 15:48:23 -06:00
committed by GitHub
parent 19293f3ecd
commit 28d9ac2bdb
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/metatx/ERC2771Context.test.js
View File

@ -12,6 +12,8 @@ const ContextMockCaller = artifacts.require('ContextMockCaller');
const { shouldBehaveLikeRegularContext } = require('../utils/Context.behavior');
contract('ERC2771Context', function (accounts) {
const [, anotherAccount] = accounts;
const MAX_UINT48 = web3.utils.toBN(1).shln(48).subn(1).toString();
beforeEach(async function () {
@ -79,6 +81,15 @@ contract('ERC2771Context', function (accounts) {
const { tx } = await this.forwarder.execute(req);
await expectEvent.inTransaction(tx, ERC2771ContextMock, 'Sender', { sender: this.sender });
});
it('returns the original sender when calldata length is less than 20 bytes (address length)', async function () {
// The forwarder doesn't produce calls with calldata length less than 20 bytes
const recipient = await ERC2771ContextMock.new(anotherAccount);
const { receipt } = await recipient.msgSender({ from: anotherAccount });
await expectEvent(receipt, 'Sender', { sender: anotherAccount });
});
});
describe('msgData', function () {