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.

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

Add ERC721ABatchTransferable and ERC721ABatchBurnable #486

Merged
merged 13 commits into from
Sep 9, 2024

Conversation

Vectorized
Copy link
Collaborator

@Vectorized Vectorized commented Aug 21, 2024

Continued from #458 and #444.

Notes:

  • Refactored some stuff to return uint256 instead of address.
  • Did some minor optimizations. Changing == 0 to == uint256(0) helps the compiler produce more efficient bytecode.
  • Doing an array access will incur a bounds check. Thus we use assembly to directly read the memory array values.
  • Even though the assembly helper methods are private, we'll give them a uncommon name to prevent collision. Private methods can collide in namespace.

jjranalli and others added 2 commits August 21, 2024 02:40
* added comments on transfer hooks

* added sort

* added clearApprovalsAndEmitTransferEvent

* added tokenBatchTransfer hooks

* added _batchTransferFrom and safe variants

* added ERC721ABatchTransferable extension and interface

* formatting

* added interface and ERC721ABatchTransferableMock

* added ERC721ABatchTransferable tests (wip)

* added approvalCheck

* fixed duplicate call

* comment

* fixed next initialized

* refactored lastInitPackedOwnership to use prevPackedOwnership

* comments

* ensured correctness of nextInitialized in slots of transferred token Ids

* renamed variables

* reverted to leave nextInitialized unchanged

* comment

* replace sort -> insertion sort

* bump: prettier-plugin-solidity

* prettier

* added prettier-ignore

* fixed nextTokenId in last array element

* tests wip

* refactor

* updated BatchTransferable mock and extension

* updated tests

* add approval tests

* lint

* lint fix

* restore original .prettierrc

* fix

* comments and refactor

* added _batchBurn

* added ERC721ABatchBurnable extension, interfaces and mock

* fixed _batchBurn

* fixed update of last tokenId + 1

* batchBurnable tests wip

* refactor

* fix

* add auto-clearing of consecutive ids and set `nextInitialized` to false

* batchTransfer tests refactor

* tests wip

* tests wip

* comments

* added extraData logic to batch mocks

* updated batch tests

* refactored ERC721A to use _updateTokenId

* wip

* comment

* Add ERC721ABatchBurnableMock (#450)

* change tokenIds in ascending order in test

* removal of unneeded internal functions

* prettier

* removed batch transfer logic

* changed _updateTokenId

* fixed mock

* fixed extension and mock

* fixed tests and cleaned unused functions in mock

* removed _updateTokenId

* minor gas optimizations

* comment

* optimize: avoid potential double read from storage

* removed bulkBurn from mock

* optimization: reset _packedOwnerships for initialized sequential IDs

* added tests for sequential ID clearing

* added test for tokenIds in strictly ascending order

* comment

* optimize: keep track of prevTokenOwner to bypass duplicated logic

* revert: resetting _packedOwnerships in initialized sequential IDs

* cleanup

* optimize: avoid potential double read from storage

* refactor _batchTransfer logic

* optimized and stacked not too deep

* optimize: removed unneeded exists() via getApproved

* removed unneeded functions and batchBurn
@Vectorized Vectorized changed the title Add batchTransferFrom and ERC721ABatchTransferable extension Add ERC721ABatchTransferable and ERC721ABatchBurnable Aug 21, 2024
@Vectorized Vectorized requested a review from cygaar August 21, 2024 04:52
@Vectorized Vectorized merged commit 338e327 into main Sep 9, 2024
3 checks passed
@Nlferu
Copy link

Nlferu commented Sep 28, 2024

This is huuuge!!! Thanks a lot @jjranalli @Vectorized @chiru-labs @cygaar amazing job 🔥🔥🔥

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants