Skip to content
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

Jump to bottom

feat: add ERC1155Supply extension #418

Merged
merged 60 commits into from
Dec 10, 2024
Merged

feat: add ERC1155Supply extension #418

merged 60 commits into from
Dec 10, 2024

Conversation

0xNeshi
Copy link
Collaborator

@0xNeshi 0xNeshi commented Nov 22, 2024 •
edited
Loading

Resolves #350

Built off of erc1155-supply. Due to major merge conflicts when trying to update the branch with main, decided to create a new branch and manually copy/paste the specific changes.

For the additional updates to the original, check out the commit messages.

PR Checklist

  • Tests
  • Documentation
  • Changelog

@0xNeshi 0xNeshi requested a review from ggonzalez94 November 22, 2024 11:57
@netlify Netlify
Copy link

netlify bot commented Nov 22, 2024 •
edited
Loading

✅ Deploy Preview for contracts-stylus ready!

Name Link
🔨 Latest commit cb76b30
🔍 Latest deploy log https://app.netlify.com/sites/contracts-stylus/deploys/675818a395bc0f0008676e1d
😎 Deploy Preview https://deploy-preview-418--contracts-stylus.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

0xNeshi added 23 commits November 25, 2024 08:24
@0xNeshi
docs: add missing colon (:) in _do_mint errors
4f3cbf0
@0xNeshi
feat: add missing fns that use _update
07280d7
@0xNeshi
test: fix tests
593382f
@0xNeshi
ref: reorganize internal fns
f03095a
@0xNeshi
ref(test): rename tests to refer to mint/burn
84b22d2
@0xNeshi
test: add noop test case
8ab4013
@0xNeshi
fix: remove pub from internal fns
d73d028
@0xNeshi
ref(test): remove unused BOB
c6d528c
@0xNeshi
docs: fix comments
00cc395
@0xNeshi
docs: add ADOC
5e1f59b
@0xNeshi
docs: add CHANGELOG
7603acf
@0xNeshi
fix: return 'pub' keyword to all relevant fns
2c52a35
@0xNeshi
test: add panic unit tests
205fd09
@0xNeshi
test: check both balance_of and total_supply for mint in unit tests
4a22ec4
@0xNeshi
ref(test): use random_token_ids in mint_panics_on_total_supply_all_ov…
360afa2 
…erflow
@0xNeshi
test: fix mint_panics_on_total_supply_overflow unit text
f45fd5b
@0xNeshi
test: add integration tests
f8209fe
@0xNeshi
ref(test): rename variable in after_mint_batch unit test
6262b55
@0xNeshi
ref(test): add safe transfer (+ batch) tests
e584fe4
@0xNeshi
chore: add benches
b9b4041
@0xNeshi
docs: remove newline from changelog
bc01405
@0xNeshi
docs: add missing newline in adoc
5f4c666
@0xNeshi
test: revert change to e2e script
273e699
@0xNeshi 0xNeshi marked this pull request as ready for review November 25, 2024 11:40
qalisander
qalisander reviewed Nov 25, 2024
View reviewed changes
Copy link
Member

@qalisander qalisander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job! Looks good!
Left some comments, and will do the second review pass later.

contracts/src/token/erc1155/extensions/supply.rs Outdated Show resolved Hide resolved
contracts/src/token/erc1155/extensions/supply.rs Outdated Show resolved Hide resolved
contracts/src/token/erc1155/extensions/supply.rs Outdated Show resolved Hide resolved
contracts/src/token/erc1155/extensions/supply.rs Show resolved Hide resolved
contracts/src/token/erc1155/mod.rs Show resolved Hide resolved
@0xNeshi 0xNeshi requested a review from bidzyyys December 4, 2024 09:00
bidzyyys
bidzyyys reviewed Dec 4, 2024
View reviewed changes
scripts/e2e-tests.sh Outdated Show resolved Hide resolved
bidzyyys
bidzyyys approved these changes Dec 4, 2024
View reviewed changes
Copy link
Collaborator

@bidzyyys bidzyyys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left small comment! Ready to merge.

contracts/src/token/erc1155/extensions/supply.rs Show resolved Hide resolved
@bidzyyys bidzyyys changed the title feat: add erc1155 supply extension feat: add ERC1155Supply extension Dec 4, 2024
qalisander
qalisander reviewed Dec 4, 2024
View reviewed changes
Copy link
Member

@qalisander qalisander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job! I see that it looks good overall!
I see that this implementation strays away from existing ones in our library.
We should choose a single style and follow it

contracts/src/token/erc1155/extensions/supply.rs Show resolved Hide resolved
contracts/src/token/erc1155/extensions/supply.rs Show resolved Hide resolved
@0xNeshi 0xNeshi requested a review from qalisander December 5, 2024 07:29
@0xNeshi 0xNeshi self-assigned this Dec 5, 2024
@bidzyyys bidzyyys self-requested a review December 10, 2024 07:58
@0xNeshi 0xNeshi force-pushed the feat/erc1155-supply branch from 22f6316 to bf33f24 Compare December 10, 2024 08:23
@0xNeshi 0xNeshi requested a review from bidzyyys December 10, 2024 10:21
qalisander
qalisander approved these changes Dec 10, 2024
View reviewed changes
Copy link
Member

@qalisander qalisander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job!

contracts/src/token/erc1155/extensions/supply.rs Show resolved Hide resolved
bidzyyys
bidzyyys approved these changes Dec 10, 2024
View reviewed changes
Copy link
Collaborator

@bidzyyys bidzyyys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bidzyyys bidzyyys merged commit a19789a into main Dec 10, 2024
24 checks passed
@bidzyyys bidzyyys deleted the feat/erc1155-supply branch December 10, 2024 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qalisander qalisander qalisander approved these changes

@bidzyyys bidzyyys bidzyyys approved these changes

@ggonzalez94 ggonzalez94 Awaiting requested review from ggonzalez94

Assignees

@0xNeshi 0xNeshi

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Feature]: ERC1155 Supply Extension
3 participants
@0xNeshi @bidzyyys @qalisander