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

Add ERC6909 #1040

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open

Add ERC6909 #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
f973569
erc6909 cairo contracts and tests
swan-of-bodom Jun 21, 2024
7712199
add docs and changelog
swan-of-bodom Jun 21, 2024
bd82b63
edit `/docs/`
swan-of-bodom Jun 27, 2024
0a3b145
docs
swan-of-bodom Jun 28, 2024
b0135f2
Merge remote-tracking branch 'upstream/main' into erc6909
swan-of-bodom Jun 28, 2024
cea45a9
refactor `erc6909` to use metadata, supply and uri extensions instead
swan-of-bodom Jul 1, 2024
49d4369
update docs
swan-of-bodom Jul 1, 2024
79363c7
update token
swan-of-bodom Jul 2, 2024
7047486
update token tests
swan-of-bodom Jul 2, 2024
3b8b627
add `token_supply` mocoks
swan-of-bodom Jul 2, 2024
2d7a385
Merge branch 'main' of https://github.com/OpenZeppelin/cairo-contract…
swan-of-bodom Jul 2, 2024
f5fa462
refactor dual mocks and tests
swan-of-bodom Jul 5, 2024
641f33f
add token supply tests
swan-of-bodom Jul 5, 2024
fa621c0
add token supply and content uri tests
swan-of-bodom Jul 5, 2024
3c7738a
Merge remote-tracking branch 'upstream/main' into erc6909
swan-of-bodom Jul 5, 2024
7802429
simplify mock
swan-of-bodom Jul 5, 2024
b2fecad
update docs
swan-of-bodom Jul 6, 2024
e30797a
add metadata hook
swan-of-bodom Jul 7, 2024
5094c66
refactor `metadata` and add comments and docs
swan-of-bodom Jul 7, 2024
b3a9b62
update documentation
swan-of-bodom Jul 7, 2024
d653416
erc6909 api
swan-of-bodom Jul 7, 2024
d265875
make internalimpl mocks consistent
swan-of-bodom Jul 8, 2024
ca6c739
update erc6909 docs
swan-of-bodom Jul 8, 2024
21a28c6
resolve docs `supports_interface`
swan-of-bodom Jul 8, 2024
fbae8e2
comments on docs
swan-of-bodom Jul 8, 2024
c9ccaa7
remove trailing space
swan-of-bodom Jul 8, 2024
3a5e4c0
lint and typos
swan-of-bodom Jul 8, 2024
6918d90
make imports consistent
swan-of-bodom Jul 9, 2024
a27fe02
remove dual dispatchers and update comments
swan-of-bodom Aug 9, 2024
03e577e
update comments
swan-of-bodom Aug 9, 2024
ba9ff8a
bump to v0.15.0
swan-of-bodom Aug 13, 2024
543e1a6
remove tests
swan-of-bodom Aug 13, 2024
aa8e8c6
add new `Map` and paths
swan-of-bodom Aug 13, 2024
40538f6
use `is_non_zero` and `is_zero` and simplify update
swan-of-bodom Aug 13, 2024
56570aa
comments and join imports
swan-of-bodom Aug 13, 2024
54d6f05
update comments
swan-of-bodom Aug 14, 2024
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@

## Unreleased

<<<<<<< HEAD
### Added (2024-06-21)

Check failure on line 12 in CHANGELOG.md

View workflow job for this annotation

GitHub Actions / Lint and test

Headings should be surrounded by blank lines 

CHANGELOG.md:12 MD022/blanks-around-headings Headings should be surrounded by blank lines [Expected: 1; Actual: 0; Above] [Context: "### Added (2024-06-21)"] https://github.com/DavidAnson/markdownlint/blob/v0.34.0/doc/md022.md

- ERC6909 token standard (2024-06-21) in `/src/token/`
- ERC6909 mocks in `/src/tests/mocks/`
- ERC6909 tests in `/src/tests/token/erc6909/`
- New selectors for the ERC6909 standard on `src/utils/selectors.cairo`
- Docs page for ERC6909 in `/docs/`
Comment on lines +14 to +18
Copy link
Collaborator

Choose a reason for hiding this comment

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

We can boil this down to just one ERC6909 entry

=======

Check failure on line 19 in CHANGELOG.md

View workflow job for this annotation

GitHub Actions / Lint and test

Lists should be surrounded by blank lines 

CHANGELOG.md:19 MD032/blanks-around-lists Lists should be surrounded by blank lines [Context: "======="] https://github.com/DavidAnson/markdownlint/blob/v0.34.0/doc/md032.md
## 0.15.0 (2024-08-08)

Check failure on line 20 in CHANGELOG.md

View workflow job for this annotation

GitHub Actions / Lint and test

Headings should be surrounded by blank lines 

CHANGELOG.md:20 MD022/blanks-around-headings Headings should be surrounded by blank lines [Expected: 1; Actual: 0; Above] [Context: "## 0.15.0 (2024-08-08)"] https://github.com/DavidAnson/markdownlint/blob/v0.34.0/doc/md022.md

### Added

Expand Down Expand Up @@ -48,7 +57,8 @@

### Changed (Breaking)

- Removed `num_checkpoints` and `checkpoints` from `ERC20VotesABI`.

Check failure on line 60 in CHANGELOG.md

View workflow job for this annotation

GitHub Actions / Lint and test

Lists should be surrounded by blank lines 

CHANGELOG.md:60 MD032/blanks-around-lists Lists should be surrounded by blank lines [Context: "- Removed `num_checkpoints` an..."] https://github.com/DavidAnson/markdownlint/blob/v0.34.0/doc/md032.md
>>>>>>> 0638a4a640a19c0d93570dc4ab7324bcfe1ef1c3

## 0.14.0 (2024-06-14)

Expand Down
3 changes: 3 additions & 0 deletions docs/modules/ROOT/nav.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
**** xref:/api/erc721.adoc[API Reference]
*** xref:erc1155.adoc[ERC1155]
**** xref:/api/erc1155.adoc[API Reference]
*** xref:erc6909.adoc[ERC6909]
**** xref:/guides/erc6909-extensions.adoc[Extensions]
**** xref:/api/erc6909.adoc[API Reference]

** xref:udc.adoc[Universal Deployer Contract]
*** xref:/api/udc.adoc[API Reference]
Expand Down
Loading
Loading