Skip to content

test: fix async signature handling and explicit address retrieval in ERC2771 Context tests #5494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

test: fix async signature handling and explicit address retrieval in ERC2771 Context tests #5494

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
154325e
test: fix async signature handling and explicit address retrieval in …
techvoyagerX Feb 10, 2025
daee720
test: revert unnecessary formatting changes in ERC2771Context tests
techvoyagerX Feb 11, 2025
122c7e7
Update ERC2771Context.test.js
Amxx Feb 12, 2025
6827e46
Apply suggestions from code review
Amxx Feb 12, 2025
5cc91c5
Update ERC2771Context.test.js
Amxx Feb 12, 2025
6258958
Update ERC2771Context.test.js
Amxx Feb 12, 2025
84b7372
style: run prettier on ERC2771Context.test.js
techvoyagerX Feb 14, 2025
83a7d86
style: run prettier on ERC2771Context.test.js
techvoyagerX Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions test/metatx/ERC2771Context.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async function fixture() {
const context = await ethers.deployContract('ERC2771ContextMock', [forwarder]);
const domain = await getDomain(forwarder);
const types = { ForwardRequest };

return { sender, other, forwarder, forwarderAsSigner, context, domain, types };
}

Expand All @@ -42,7 +42,6 @@ describe('ERC2771Context', function () {
it('returns the relayed transaction original sender', async function () {
const nonce = await this.forwarder.nonces(this.sender);
const data = this.context.interface.encodeFunctionData('msgSender');

const req = {
from: await this.sender.getAddress(),
to: await this.context.getAddress(),
Expand All @@ -52,11 +51,9 @@ describe('ERC2771Context', function () {
nonce,
deadline: MAX_UINT48,
};

req.signature = await this.sender.signTypedData(this.domain, this.types, req);

expect(await this.forwarder.verify(req)).to.be.true;


await expect(this.forwarder.verify(req)).to.eventually.be.true;
await expect(this.forwarder.execute(req)).to.emit(this.context, 'Sender').withArgs(this.sender);
});

Expand All @@ -71,10 +68,8 @@ describe('ERC2771Context', function () {
describe('msgData', function () {
it('returns the relayed transaction original data', async function () {
const args = [42n, 'OpenZeppelin'];

const nonce = await this.forwarder.nonces(this.sender);
const data = this.context.interface.encodeFunctionData('msgData', args);

const req = {
from: await this.sender.getAddress(),
to: await this.context.getAddress(),
Expand All @@ -84,11 +79,9 @@ describe('ERC2771Context', function () {
nonce,
deadline: MAX_UINT48,
};

req.signature = this.sender.signTypedData(this.domain, this.types, req);

expect(await this.forwarder.verify(req)).to.be.true;

req.signature = await this.sender.signTypedData(this.domain, this.types, req);

await expect(this.forwarder.verify(req)).to.eventually.be.true;
await expect(this.forwarder.execute(req))
.to.emit(this.context, 'Data')
.withArgs(data, ...args);
Expand All @@ -99,7 +92,7 @@ describe('ERC2771Context', function () {
const data = this.context.interface.encodeFunctionData('msgDataShort');

// The forwarder doesn't produce calls with calldata length less than 20 bytes so `this.forwarderAsSigner` is used instead.
await expect(await this.context.connect(this.forwarderAsSigner).msgDataShort())
await expect(this.context.connect(this.forwarderAsSigner).msgDataShort())
.to.emit(this.context, 'DataShort')
.withArgs(data);
});
Expand All @@ -109,11 +102,10 @@ describe('ERC2771Context', function () {
const nonce = await this.forwarder.nonces(this.sender);
const data = this.context.interface.encodeFunctionData('multicall', [
[
// poisonned call to 'msgSender()'
// poisoned call to 'msgSender()'
ethers.concat([this.context.interface.encodeFunctionData('msgSender'), this.other.address]),
],
]);

const req = {
from: await this.sender.getAddress(),
to: await this.context.getAddress(),
Expand All @@ -123,11 +115,9 @@ describe('ERC2771Context', function () {
nonce,
deadline: MAX_UINT48,
};

req.signature = await this.sender.signTypedData(this.domain, this.types, req);

expect(await this.forwarder.verify(req)).to.be.true;

await expect(this.forwarder.verify(req)).to.eventually.be.true;
await expect(this.forwarder.execute(req)).to.emit(this.context, 'Sender').withArgs(this.sender);
});
});
Loading