Skip to content

Optimize array allocation in ERC1155 #4196

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

Merged
frangio merged 10 commits into from
Jun 2, 2023
Merged

Optimize array allocation in ERC1155 #4196

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d43ff2d
first version
RenanSouza2 Apr 18, 2023
1b3190b
assembly version
RenanSouza2 Apr 18, 2023
a3598e4
Benchmark commit
RenanSouza2 Apr 26, 2023
87c5868
Enable tests
RenanSouza2 Apr 26, 2023
45d08a9
Merge branch 'master' into array-optimization-tests
frangio Jun 1, 2023
bfa1323
add memory safety comment
RenanSouza2 Jun 2, 2023
98ac862
fix linter issues
RenanSouza2 Jun 2, 2023
ba81ae9
add changeset
frangio Jun 2, 2023
7849191
change variable declaration
RenanSouza2 Jun 2, 2023
6f9b86a
use declared return variables instead of return
RenanSouza2 Jun 2, 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
Next Next commit
first version
  • Loading branch information
@RenanSouza2
RenanSouza2 committed Apr 18, 2023
commit d43ff2d932294b8e20fdd2a4d07aa7705cb77f22
2 changes: 1 addition & 1 deletion test/governance/Governor.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ contract('Governor', function (accounts) {
});
});

describe('ERC1155', function () {
describe.only('ERC1155', function () {
const uri = 'https://token-cdn-domain/{id}.json';
const tokenIds = {
1: new BN(1000),
Expand Down
2 changes: 1 addition & 1 deletion test/governance/TimelockController.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ contract('TimelockController', function (accounts) {
});
});

describe('ERC1155', function () {
describe.only('ERC1155', function () {
const uri = 'https://token-cdn-domain/{id}.json';
const tokenIds = {
1: new BN(1000),
Expand Down
2 changes: 1 addition & 1 deletion test/token/ERC1155/ERC1155.behavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function shouldBehaveLikeERC1155([minter, firstTokenHolder, secondTokenHolder, m
const RECEIVER_SINGLE_MAGIC_VALUE = '0xf23a6e61';
const RECEIVER_BATCH_MAGIC_VALUE = '0xbc197c81';

describe('like an ERC1155', function () {
describe.only('like an ERC1155', function () {
describe('balanceOf', function () {
it('reverts when queried about the zero address', async function () {
await expectRevert(
Expand Down
4 changes: 2 additions & 2 deletions test/token/ERC1155/ERC1155.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ contract('ERC1155', function (accounts) {

shouldBehaveLikeERC1155(otherAccounts);

describe('internal functions', function () {
describe.only('internal functions', function () {
const tokenId = new BN(1990);
const mintAmount = new BN(9001);
const burnAmount = new BN(3000);
Expand Down Expand Up @@ -205,7 +205,7 @@ contract('ERC1155', function (accounts) {
});
});

describe('ERC1155MetadataURI', function () {
describe.only('ERC1155MetadataURI', function () {
const firstTokenID = new BN('42');
const secondTokenID = new BN('1337');

Expand Down
4 changes: 2 additions & 2 deletions test/token/ERC1155/extensions/ERC1155Burnable.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ contract('ERC1155Burnable', function (accounts) {
await this.token.$_mint(holder, tokenIds[1], amounts[1], '0x');
});

describe('burn', function () {
describe.only('burn', function () {
it('holder can burn their tokens', async function () {
await this.token.burn(holder, tokenIds[0], amounts[0].subn(1), { from: holder });

Expand All @@ -41,7 +41,7 @@ contract('ERC1155Burnable', function (accounts) {
});
});

describe('burnBatch', function () {
describe.only('burnBatch', function () {
it('holder can burn their tokens', async function () {
await this.token.burnBatch(holder, tokenIds, [amounts[0].subn(1), amounts[1].subn(2)], { from: holder });

Expand Down
2 changes: 1 addition & 1 deletion test/token/ERC1155/extensions/ERC1155Pausable.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ contract('ERC1155Pausable', function (accounts) {
this.token = await ERC1155Pausable.new(uri);
});

context('when token is paused', function () {
context.only('when token is paused', function () {
const firstTokenId = new BN('37');
const firstTokenAmount = new BN('42');

Expand Down
8 changes: 4 additions & 4 deletions test/token/ERC1155/extensions/ERC1155Supply.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contract('ERC1155Supply', function (accounts) {
this.token = await ERC1155Supply.new(uri);
});

context('before mint', function () {
context.only('before mint', function () {
it('exist', async function () {
expect(await this.token.exists(firstTokenId)).to.be.equal(false);
});
Expand All @@ -32,7 +32,7 @@ contract('ERC1155Supply', function (accounts) {
});
});

context('after mint', function () {
context.only('after mint', function () {
context('single', function () {
beforeEach(async function () {
await this.token.$_mint(holder, firstTokenId, firstTokenAmount, '0x');
Expand Down Expand Up @@ -75,7 +75,7 @@ contract('ERC1155Supply', function (accounts) {
});
});

context('after burn', function () {
context.only('after burn', function () {
context('single', function () {
beforeEach(async function () {
await this.token.$_mint(holder, firstTokenId, firstTokenAmount, '0x');
Expand Down Expand Up @@ -116,7 +116,7 @@ contract('ERC1155Supply', function (accounts) {
});
});

context('other', function () {
context.only('other', function () {
it('supply unaffected by no-op', async function () {
this.token.safeTransferFrom(ZERO_ADDRESS, ZERO_ADDRESS, firstTokenId, firstTokenAmount, '0x', {
from: ZERO_ADDRESS,
Expand Down