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

Add validation in Governor on ERC-721 or ERC-1155 received (#4314)

Browse Source 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
This commit is contained in:
Claudia Barcelo
2023-06-16 02:43:17 +02:00
committed by GitHub
parent 6724873895
commit cd48b3eab3
8 changed files with 306 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
test/governance/extensions/GovernorTimelockControl.test.js
View File

@ -10,6 +10,8 @@ const { shouldSupportInterfaces } = require('../../utils/introspection/SupportsI
const Timelock = artifacts.require('TimelockController');
const Governor = artifacts.require('$GovernorTimelockControlMock');
const CallReceiver = artifacts.require('CallReceiverMock');
const ERC721 = artifacts.require('$ERC721');
const ERC1155 = artifacts.require('$ERC1155');
const TOKENS = [
{ Token: artifacts.require('$ERC20Votes'), mode: 'blocknumber' },
@ -412,6 +414,70 @@ contract('GovernorTimelockControl', function (accounts) {
expect(await this.mock.timelock()).to.be.bignumber.equal(this.newTimelock.address);
});
});
describe('on safe receive', function () {
describe('ERC721', function () {
const name = 'Non Fungible Token';
const symbol = 'NFT';
const tokenId = web3.utils.toBN(1);
beforeEach(async function () {
this.token = await ERC721.new(name, symbol);
await this.token.$_mint(owner, tokenId);
});
it("can't receive an ERC721 safeTransfer", async function () {
await expectRevertCustomError(
this.token.safeTransferFrom(owner, this.mock.address, tokenId, { from: owner }),
'GovernorDisabledDeposit',
[],
);
});
});
describe('ERC1155', function () {
const uri = 'https://token-cdn-domain/{id}.json';
const tokenIds = {
1: web3.utils.toBN(1000),
2: web3.utils.toBN(2000),
3: web3.utils.toBN(3000),
};
beforeEach(async function () {
this.token = await ERC1155.new(uri);
await this.token.$_mintBatch(owner, Object.keys(tokenIds), Object.values(tokenIds), '0x');
});
it("can't receive ERC1155 safeTransfer", async function () {
await expectRevertCustomError(
this.token.safeTransferFrom(
owner,
this.mock.address,
...Object.entries(tokenIds)[0], // id + amount
'0x',
{ from: owner },
),
'GovernorDisabledDeposit',
[],
);
});
it("can't receive ERC1155 safeBatchTransfer", async function () {
await expectRevertCustomError(
this.token.safeBatchTransferFrom(
owner,
this.mock.address,
Object.keys(tokenIds),
Object.values(tokenIds),
'0x',
{ from: owner },
),
'GovernorDisabledDeposit',
[],
);
});
});
});
});
it('clear queue of pending governor calls', async function () {