Skip to content

ERC1363 #3017

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
Amxx wants to merge 18 commits into from
Closed

ERC1363 #3017

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0616203
erc1363
Amxx Dec 12, 2021
786fa7c
fix lint
Amxx Dec 12, 2021
553002b
improve coverage
Amxx Dec 13, 2021
65ac716
skip mocks and preset
Amxx Dec 13, 2021
b88a69b
refactor test for readability
Amxx Dec 14, 2021
0208e27
fix lint
Amxx Dec 14, 2021
914a6d2
Merge branch 'master' into feature/ERC1363
Amxx Jun 13, 2022
1ec46cf
refactor preset skip
Amxx Jun 13, 2022
c24145f
allow transfer and call to EOA
Amxx Jun 16, 2022
a3ef6b4
revert allow transferAndCall to EOA
Amxx Jun 17, 2022
ee2b256
Merge branch 'master' into feature/ERC1363
Amxx Jul 6, 2022
eadcad5
fix test for compilers >= 0.8.10
Amxx Jul 6, 2022
08dd234
code consistency
Amxx Jul 6, 2022
abccc64
Merge branch 'master' into feature/ERC1363
Amxx Feb 23, 2023
7e2bbfd
add changeset and update to hardat-expose
Amxx Feb 23, 2023
b482786
fix lint
Amxx Feb 23, 2023
3c0df20
cleanup diff
Amxx Feb 23, 2023
561310c
we actaully need this until 4.9 :/
Amxx Feb 23, 2023
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
Prev Previous commit
Next Next commit
fix lint
  • Loading branch information
@Amxx
Amxx committed Dec 14, 2021
commit 0208e2728a4e0c8fd9430ff588f8e695cd61fbdb
102 changes: 59 additions & 43 deletions test/token/ERC20/extensions/ERC1363.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,40 @@ contract('ERC1363', function (accounts) {

it('with data', async function () {
this.function = 'transferAndCall(address,uint256,bytes)';
this.data = '0x123456';
this.data = '0x123456';
this.operator = holder;
});

it('invalid return value', async function () {
this.function = 'transferAndCall(address,uint256,bytes)';
this.data = '0x00';
this.data = '0x00';
this.operator = holder;
this.revert = 'ERC1363: onTransferReceived invalid result';
this.revert = 'ERC1363: onTransferReceived invalid result';
});

it('hook reverts with message', async function () {
this.function = 'transferAndCall(address,uint256,bytes)';
this.data = '0x01';
this.data = '0x01';
this.operator = holder;
this.revert = 'onTransferReceived revert';
this.revert = 'onTransferReceived revert';
});

it('hook reverts with error', async function () {
this.function = 'transferAndCall(address,uint256,bytes)';
this.data = '0x02';
this.data = '0x02';
this.operator = holder;
this.revert = 'ERC1363: onTransferReceived reverted without reason';
this.revert = 'ERC1363: onTransferReceived reverted without reason';
});

afterEach(async function () {
const txPromise = this.token.methods[this.function](...[ this.receiver.address, value, this.data ].filter(Boolean), { from: this.operator });

if (this.revert == undefined) {
const txPromise = this.token.methods[this.function](...[
this.receiver.address,
value,
this.data,
{ from: this.operator },
].filter(Boolean));

if (this.revert === undefined) {
const { tx } = await txPromise;
await expectEvent.inTransaction(tx, this.token, 'Transfer', {
from: this.from || this.operator,
Expand All @@ -70,7 +75,7 @@ contract('ERC1363', function (accounts) {
operator: this.operator,
from: this.from || this.operator,
value,
data: this.data ?? null,
data: this.data || null,
});
} else {
await expectRevert(txPromise, this.revert);
Expand All @@ -85,45 +90,51 @@ contract('ERC1363', function (accounts) {

it('without data', async function () {
this.function = 'transferFromAndCall(address,address,uint256)';
this.from = holder;
this.from = holder;
this.operator = operator;
});

it('with data', async function () {
this.function = 'transferFromAndCall(address,address,uint256,bytes)';
this.data = '0x123456';
this.from = holder;
this.data = '0x123456';
this.from = holder;
this.operator = operator;
});

it('invalid return value', async function () {
this.function = 'transferFromAndCall(address,address,uint256,bytes)';
this.data = '0x00';
this.from = holder;
this.data = '0x00';
this.from = holder;
this.operator = operator;
this.revert = 'ERC1363: onTransferReceived invalid result';
this.revert = 'ERC1363: onTransferReceived invalid result';
});

it('hook reverts with message', async function () {
this.function = 'transferFromAndCall(address,address,uint256,bytes)';
this.data = '0x01';
this.from = holder;
this.data = '0x01';
this.from = holder;
this.operator = operator;
this.revert = 'onTransferReceived revert';
this.revert = 'onTransferReceived revert';
});

it('hook reverts with error', async function () {
this.function = 'transferFromAndCall(address,address,uint256,bytes)';
this.data = '0x02';
this.from = holder;
this.data = '0x02';
this.from = holder;
this.operator = operator;
this.revert = 'ERC1363: onTransferReceived reverted without reason';
this.revert = 'ERC1363: onTransferReceived reverted without reason';
});

afterEach(async function () {
const txPromise = this.token.methods[this.function](...[ this.from, this.receiver.address, value, this.data ].filter(Boolean), { from: this.operator });

if (this.revert == undefined) {
const txPromise = this.token.methods[this.function](...[
this.from,
this.receiver.address,
value,
this.data,
{ from: this.operator },
].filter(Boolean));

if (this.revert === undefined) {
const { tx } = await txPromise;
await expectEvent.inTransaction(tx, this.token, 'Transfer', {
from: this.from || this.operator,
Expand All @@ -134,7 +145,7 @@ contract('ERC1363', function (accounts) {
operator: this.operator,
from: this.from || this.operator,
value,
data: this.data ?? null,
data: this.data || null,
});
} else {
await expectRevert(txPromise, this.revert);
Expand All @@ -145,40 +156,45 @@ contract('ERC1363', function (accounts) {
describe('approveAndCall', function () {
it('without data', async function () {
this.function = 'approveAndCall(address,uint256)';
this.owner = holder;
this.owner = holder;
});

it('with data', async function () {
this.function = 'approveAndCall(address,uint256,bytes)';
this.data = '0x123456';
this.owner = holder;
this.data = '0x123456';
this.owner = holder;
});

it('invalid return value', async function () {
this.function = 'approveAndCall(address,uint256,bytes)';
this.data = '0x00';
this.owner = holder;
this.revert = 'ERC1363: onApprovalReceived invalid result';
this.data = '0x00';
this.owner = holder;
this.revert = 'ERC1363: onApprovalReceived invalid result';
});

it('hook reverts with message', async function () {
this.function = 'approveAndCall(address,uint256,bytes)';
this.data = '0x01';
this.owner = holder;
this.revert = 'onApprovalReceived revert';
this.data = '0x01';
this.owner = holder;
this.revert = 'onApprovalReceived revert';
});

it('hook reverts with error', async function () {
this.function = 'approveAndCall(address,uint256,bytes)';
this.data = '0x02';
this.owner = holder;
this.revert = 'ERC1363: onApprovalReceived reverted without reason';
this.data = '0x02';
this.owner = holder;
this.revert = 'ERC1363: onApprovalReceived reverted without reason';
});

afterEach(async function () {
const txPromise = this.token.methods[this.function](...[ this.receiver.address, value, this.data ].filter(Boolean), { from: this.owner })

if (this.revert == undefined) {
const txPromise = this.token.methods[this.function](...[
this.receiver.address,
value,
this.data,
{ from: this.owner },
].filter(Boolean));

if (this.revert === undefined) {
const { tx } = await txPromise;

await expectEvent.inTransaction(tx, this.token, 'Approval', {
Expand All @@ -189,7 +205,7 @@ contract('ERC1363', function (accounts) {
await expectEvent.inTransaction(tx, this.receiver, 'ApprovalReceived', {
owner: this.owner,
value,
data: this.data ?? null,
data: this.data || null,
});
} else {
await expectRevert(txPromise, this.revert);
Expand Down