Add ERC6909 Implementation along with extensions #5394

arr00 · 2024-12-20T20:30:20Z

Fixes #????

PR Checklist

Tests
Documentation
Changeset entry (run npx changeset add)

changeset-bot · 2024-12-20T20:30:24Z

🦋 Changeset detected

Latest commit: edf94a4

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
openzeppelin-solidity	Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

contracts/token/ERC6909/draft-ERC6909.sol

contracts/token/ERC6909/extensions/draft-ERC6909ContentURI.sol

contracts/token/ERC6909/draft-IERC6909.sol

ernestognw

Almost there. Few nitpicks, otherwise LGTM

contracts/token/ERC6909/extensions/draft-ERC6909ContentURI.sol

contracts/token/ERC6909/extensions/draft-ERC6909TokenSupply.sol

Co-authored-by: Ernesto García <ernestognw@gmail.com>

ernestognw

LFG, thanks @arr00!

* Update ReentrancyGuardTransient documentation (OpenZeppelin#5417) * Optimize `MerkleTree` for loops by using `uint256` iterators (OpenZeppelin#5415) Co-authored-by: Ernesto García <ernestognw@gmail.com> * Update `_revokeRole` documentation in AccessControl (OpenZeppelin#5321) Co-authored-by: Ernesto García <ernestognw@gmail.com> * Merge release-v5.2 branch (OpenZeppelin#5424) Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> Co-authored-by: Sam Bugs <101145325+0xsambugs@users.noreply.github.com> Co-authored-by: Ernesto García <ernestognw@gmail.com> Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> Co-authored-by: wizard <112275929+famouswizard@users.noreply.github.com> Co-authored-by: leopardracer <136604165+leopardracer@users.noreply.github.com> Co-authored-by: cairo <cairoeth@protonmail.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Francisco Giordano <fg@frang.io> Co-authored-by: Simka <0xsimka@gmail.com> Co-authored-by: Voronor <129545215+voronor@users.noreply.github.com> * Add a Calldata library with `emptyBytes` and `emptyString` functions (OpenZeppelin#5422) Co-authored-by: Ernesto García <ernestognw@gmail.com> * Update governor docs (OpenZeppelin#5420) * Add missing `Calldata`, `Bytes`, `CAIP2` and `CAIP10` API references (OpenZeppelin#5428) * Expose `_isTrustedByTarget` internally in ERC2771Forwarder (OpenZeppelin#5416) * Update LICENSE (OpenZeppelin#5434) * Refactor EnumerableSet.behavior.js for reuse in the community repo (OpenZeppelin#5441) * Replace `overriden` with `overridden` in GovernorCountingOverridable.sol (OpenZeppelin#5446) Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> Co-authored-by: ernestognw <ernestognw@gmail.com> * Remove Unnecessary Initialisation of `_paused` (OpenZeppelin#5448) Co-authored-by: Ernesto García <ernestognw@gmail.com> * Fix Broken Docs References (OpenZeppelin#5436) * Update actions/upload-artifact action to v4 (OpenZeppelin#4826) * Remove unused `setBaseURI` tests (OpenZeppelin#5456) Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> * Group typographical errors (OpenZeppelin#5443) Co-authored-by: futreall <86553580+futreall@users.noreply.github.com> Co-authored-by: Marco <wudmytrotest200@gmail.com> Co-authored-by: Dmitry <98899785+mdqst@users.noreply.github.com> Co-authored-by: Dmytrol <46675332+Dimitrolito@users.noreply.github.com> Co-authored-by: Noisy <125606576+donatik27@users.noreply.github.com> Co-authored-by: Danil <37103154+Danyylka@users.noreply.github.com> Co-authored-by: CrazyFrog <anna.shuraeva13@gmail.com> Co-authored-by: Bryer <0xbryer@gmail.com> Co-authored-by: Viktor Pavlik <160131789+Vikt0rPavlik@users.noreply.github.com> Co-authored-by: Skylar Ray <137945430+sky-coderay@users.noreply.github.com> Co-authored-by: Brawn <nftdropped@gmail.com> Co-authored-by: fuder.eth <139509124+vtjl10@users.noreply.github.com> Co-authored-by: FT <140458077+zeevick10@users.noreply.github.com> Co-authored-by: Ann Wagner <chant_77_swirly@icloud.com> Co-authored-by: Hopium <135053852+Hopium21@users.noreply.github.com> Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> * Fix interface docs ordering and add missing interface (OpenZeppelin#5460) * Add a governor extension that implements a proposal guardian (OpenZeppelin#5303) Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> Co-authored-by: Ernesto García <ernestognw@gmail.com> * Fix the CLI output of formal verification runs (OpenZeppelin#5445) * Update dependency halmos to v0.2.4 (OpenZeppelin#5461) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Use stable foundry version in CI (OpenZeppelin#5465) * Add stake management function to ERC4337Utils (OpenZeppelin#5471) * Add forum badge correct link (OpenZeppelin#5481) * SafeERC20.trySafeTransfer{,from} (OpenZeppelin#5483) * Improve promise rejections handling in hardhat/async-test-sanity.js (OpenZeppelin#5429) Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> * Use slither v0.10.4 (OpenZeppelin#5488) * Add ERC6909 Implementation along with extensions (OpenZeppelin#5394) Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> Co-authored-by: Ernesto García <ernestognw@gmail.com> * Rename ERC4337Utils ENTRYPOINT to ENTRYPOINT_V07 (OpenZeppelin#5472) Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> * Add Bytes32x2Set (OpenZeppelin#5442) Co-authored-by: Ernesto García <ernestognw@gmail.com> * Add clear function to Enumerable{Set,Map} (OpenZeppelin#5486) Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> * Make set-max-old-space-size.sh compatible with sh (OpenZeppelin#5493) Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> * Update FUNDING.json (OpenZeppelin#5496) Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> * Update FUNDING.json hierarchy (OpenZeppelin#5500) Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> * Test behavior of SignatureChecker against the identity precompile (0x4) (OpenZeppelin#5501) * Treat code-size warnings as errors (OpenZeppelin#5101) Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> * Make `TimelockController` receive function virtual (OpenZeppelin#5506) Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> --------- Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com> Co-authored-by: Ernesto García <ernestognw@gmail.com> Co-authored-by: Michael <20623991+heueristik@users.noreply.github.com> Co-authored-by: Maks <soskapola96@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com> Co-authored-by: Sam Bugs <101145325+0xsambugs@users.noreply.github.com> Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> Co-authored-by: wizard <112275929+famouswizard@users.noreply.github.com> Co-authored-by: leopardracer <136604165+leopardracer@users.noreply.github.com> Co-authored-by: cairo <cairoeth@protonmail.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Francisco Giordano <fg@frang.io> Co-authored-by: Simka <0xsimka@gmail.com> Co-authored-by: Voronor <129545215+voronor@users.noreply.github.com> Co-authored-by: Eric Lau <ericglau@outlook.com> Co-authored-by: planetBoy <140164174+Guayaba221@users.noreply.github.com> Co-authored-by: sudo rm -rf --no-preserve-root / <pcaversaccio@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renan Souza <renan.rodrigues.souza1@gmail.com> Co-authored-by: futreall <86553580+futreall@users.noreply.github.com> Co-authored-by: Marco <wudmytrotest200@gmail.com> Co-authored-by: Dmitry <98899785+mdqst@users.noreply.github.com> Co-authored-by: Dmytrol <46675332+Dimitrolito@users.noreply.github.com> Co-authored-by: Noisy <125606576+donatik27@users.noreply.github.com> Co-authored-by: Danil <37103154+Danyylka@users.noreply.github.com> Co-authored-by: CrazyFrog <anna.shuraeva13@gmail.com> Co-authored-by: Bryer <0xbryer@gmail.com> Co-authored-by: Viktor Pavlik <160131789+Vikt0rPavlik@users.noreply.github.com> Co-authored-by: Skylar Ray <137945430+sky-coderay@users.noreply.github.com> Co-authored-by: Brawn <nftdropped@gmail.com> Co-authored-by: fuder.eth <139509124+vtjl10@users.noreply.github.com> Co-authored-by: FT <140458077+zeevick10@users.noreply.github.com> Co-authored-by: Ann Wagner <chant_77_swirly@icloud.com> Co-authored-by: Hopium <135053852+Hopium21@users.noreply.github.com> Co-authored-by: Yan Victor SN <98413246+YanVictorSN@users.noreply.github.com> Co-authored-by: Ursula <asp_woods_34@icloud.com> Co-authored-by: Michalis Kargakis <kargakis@protonmail.com> Co-authored-by: luca <80516439+xdaluca@users.noreply.github.com> Co-authored-by: Jonas <43515441+JSeiferth@users.noreply.github.com> Co-authored-by: Joseph Delong <joseph@delong.me>

arr00 added 8 commits December 20, 2024 10:36

draft

f16cff1

add extensions

9a3ea2f

nit

4dbeace

add more setters ERC6909Metadata

f038064

rename vars in impl and add tests

b0b0e3e

add more tests

1b76245

add more tests

9ae0429

additional testing

f69bdfd

await when checking logs

7d78b5a

arr00 force-pushed the feat/6909-impl branch from a863f2b to 7d78b5a Compare December 20, 2024 21:42

arr00 requested a review from ernestognw December 23, 2024 16:08

ernestognw reviewed Dec 30, 2024

View reviewed changes

arr00 added 11 commits December 30, 2024 11:30

address comments and fix tests

6abfd92

add test for total supply

15ece65

format

499f79b

add tests

d79198d

add internal function test

85196e7

add changesets

8969005

fix spelling

607c119

Add tests for ERC6909Metadata

5763111

test ERC6909ContentURI

673124c

Add docs

ff3ee75

add content uri docs

1f34734

arr00 marked this pull request as ready for review January 10, 2025 21:28

arr00 added 5 commits January 13, 2025 17:22

start on additional docs

2d9bc74

add reference contract

14a06a0

further documentation

7089ec5

Update docs and fix incorrectly named file

a6601c8

update docs

e711da6

Amxx reviewed Jan 21, 2025

View reviewed changes

contracts/token/ERC6909/draft-IERC6909.sol Outdated Show resolved Hide resolved

Amxx and others added 6 commits January 21, 2025 11:24

updates

af6769f

fix total supply tracking during updates from 0 to 0

d09f7fc

typo

3219c91

Update draft-ERC6909.sol

37515f3

up

2eff205

reorder _balances mapping

e864372

ernestognw reviewed Jan 22, 2025

View reviewed changes

arr00 and others added 9 commits January 22, 2025 17:08

Apply suggestions from code review

fa66666

Co-authored-by: Ernesto García <ernestognw@gmail.com>

update docs

78d9d92

add metadata events and use URI instead of MetadataUpdate

e81d333

formatting

b4eb0bc

add missing dev tag

a9bb063

add docs

267df51

add missing internal setters

de3d5dc

testing

8f239ea

fix apostrophe

d1297b0

ernestognw previously approved these changes Jan 28, 2025

View reviewed changes

arr00 requested a review from Amxx January 29, 2025 22:02

refactor tests

f0c0571

Amxx dismissed ernestognw’s stale review via f0c0571 February 4, 2025 10:33

Amxx previously approved these changes Feb 4, 2025

View reviewed changes

Amxx dismissed their stale review via 178fd0d February 4, 2025 10:45

Update erc6909.adoc

66cd8cc

Amxx force-pushed the feat/6909-impl branch from 178fd0d to 66cd8cc Compare February 4, 2025 10:55

Amxx enabled auto-merge (squash) February 4, 2025 12:28

Merge branch 'master' into feat/6909-impl

edf94a4

Amxx approved these changes Feb 4, 2025

View reviewed changes

Amxx merged commit 43b3319 into OpenZeppelin:master Feb 4, 2025
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ERC6909 Implementation along with extensions #5394

Add ERC6909 Implementation along with extensions #5394

arr00 commented Dec 20, 2024 •

edited

Loading

changeset-bot bot commented Dec 20, 2024 •

edited

Loading

ernestognw left a comment

ernestognw left a comment

Add ERC6909 Implementation along with extensions #5394

Add ERC6909 Implementation along with extensions #5394

Conversation

arr00 commented Dec 20, 2024 • edited Loading

PR Checklist

changeset-bot bot commented Dec 20, 2024 • edited Loading

🦋 Changeset detected

ernestognw left a comment

Choose a reason for hiding this comment

ernestognw left a comment

Choose a reason for hiding this comment

arr00 commented Dec 20, 2024 •

edited

Loading

changeset-bot bot commented Dec 20, 2024 •

edited

Loading