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

Include EIP-5267 discovery in EIP-712 (#3969)

Browse Source 
Co-authored-by: Francisco <frangio.1@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
This commit is contained in:
Hadrien Croubois
2023-02-08 15:53:57 +01:00
committed by GitHub
parent 8177c4620e
commit d625cb45ea
16 changed files with 358 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test/token/ERC20/extensions/draft-ERC20Permit.test.js
View File

@ -10,7 +10,7 @@ const Wallet = require('ethereumjs-wallet').default;
const ERC20Permit = artifacts.require('$ERC20Permit');
const { EIP712Domain, Permit, domainSeparator } = require('../../../helpers/eip712');
const { Permit, getDomain, domainType, domainSeparator } = require('../../../helpers/eip712');
const { getChainId } = require('../../../helpers/chainid');
contract('ERC20Permit', function (accounts) {
@ -34,9 +34,7 @@ contract('ERC20Permit', function (accounts) {
});
it('domain separator', async function () {
expect(await this.token.DOMAIN_SEPARATOR()).to.equal(
await domainSeparator({ name, version, chainId: this.chainId, verifyingContract: this.token.address }),
);
expect(await this.token.DOMAIN_SEPARATOR()).to.equal(await getDomain(this.token).then(domainSeparator));
});
describe('permit', function () {
@ -47,17 +45,18 @@ contract('ERC20Permit', function (accounts) {
const nonce = 0;
const maxDeadline = MAX_UINT256;
const buildData = (chainId, verifyingContract, deadline = maxDeadline) => ({
primaryType: 'Permit',
types: { EIP712Domain, Permit },
domain: { name, version, chainId, verifyingContract },
message: { owner, spender, value, nonce, deadline },
});
const buildData = (contract, deadline = maxDeadline) =>
getDomain(contract).then(domain => ({
primaryType: 'Permit',
types: { EIP712Domain: domainType(domain), Permit },
domain,
message: { owner, spender, value, nonce, deadline },
}));
it('accepts owner signature', async function () {
const data = buildData(this.chainId, this.token.address);
const signature = ethSigUtil.signTypedMessage(wallet.getPrivateKey(), { data });
const { v, r, s } = fromRpcSig(signature);
const { v, r, s } = await buildData(this.token)
.then(data => ethSigUtil.signTypedMessage(wallet.getPrivateKey(), { data }))
.then(fromRpcSig);
await this.token.permit(owner, spender, value, maxDeadline, v, r, s);
@ -66,9 +65,9 @@ contract('ERC20Permit', function (accounts) {
});
it('rejects reused signature', async function () {
const data = buildData(this.chainId, this.token.address);
const signature = ethSigUtil.signTypedMessage(wallet.getPrivateKey(), { data });
const { v, r, s } = fromRpcSig(signature);
const { v, r, s } = await buildData(this.token)
.then(data => ethSigUtil.signTypedMessage(wallet.getPrivateKey(), { data }))
.then(fromRpcSig);
await this.token.permit(owner, spender, value, maxDeadline, v, r, s);
@ -80,9 +79,10 @@ contract('ERC20Permit', function (accounts) {
it('rejects other signature', async function () {
const otherWallet = Wallet.generate();
const data = buildData(this.chainId, this.token.address);
const signature = ethSigUtil.signTypedMessage(otherWallet.getPrivateKey(), { data });
const { v, r, s } = fromRpcSig(signature);
const { v, r, s } = await buildData(this.token)
.then(data => ethSigUtil.signTypedMessage(otherWallet.getPrivateKey(), { data }))
.then(fromRpcSig);
await expectRevert(
this.token.permit(owner, spender, value, maxDeadline, v, r, s),
@ -93,9 +93,9 @@ contract('ERC20Permit', function (accounts) {
it('rejects expired permit', async function () {
const deadline = (await time.latest()) - time.duration.weeks(1);
const data = buildData(this.chainId, this.token.address, deadline);
const signature = ethSigUtil.signTypedMessage(wallet.getPrivateKey(), { data });
const { v, r, s } = fromRpcSig(signature);
const { v, r, s } = await buildData(this.token, deadline)
.then(data => ethSigUtil.signTypedMessage(wallet.getPrivateKey(), { data }))
.then(fromRpcSig);
await expectRevert(this.token.permit(owner, spender, value, deadline, v, r, s), 'ERC20Permit: expired deadline');
});