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 upgrades to presets #964

Merged
merged 58 commits into from
Apr 16, 2024
Merged

Add upgrades to presets #964

merged 58 commits into from
Apr 16, 2024

Conversation

andrew-fleming
Copy link
Collaborator

@andrew-fleming andrew-fleming commented Apr 9, 2024 •
edited

Fixes #921.

PR Checklist

@andrew-fleming
make account upgradeable
3d6dbad
@andrew-fleming
add upgradeable to preset name
f864fb1
@andrew-fleming
add contract param to event assertion, add assert_only_event fn
c4ba7e8
@andrew-fleming
add contract param in event assertions
8b00641
@andrew-fleming
switch param order for consistency in event assertion
e506c0f
@andrew-fleming
update event assertion
ee97f04
@andrew-fleming
make erc20 preset upgradeable and ownable
371ed34
@andrew-fleming
update erc20 preset contract name
fe5fdb3
@andrew-fleming
add interfaces dir, add ierc20upgradeable
c421a39
@andrew-fleming
add new preset tests
2223414
@andrew-fleming
fix mod name
37873a3
@andrew-fleming
add account preset interface
ab26630
@andrew-fleming
add interface for eth account preset
5cdc1d6
@andrew-fleming
fix formatting
612a3d7
@andrew-fleming
add erc721 upgradeable interface
bc670d4
@andrew-fleming
make erc721 upgradeable
e1feb1e
@andrew-fleming
add tests for preset
592d8a2
@andrew-fleming
fix formatting
c4c9412
@andrew-fleming
add erc1155 preset interface
812995d
@andrew-fleming
make erc1155 preset upgradeable
f2389a7
@andrew-fleming
use case-specific interface for checking state after upgrade
c64de8f
@andrew-fleming
add ownable and upgradeable tests
1caad67
@andrew-fleming
fix formatting
5ec1ea7
@andrew-fleming
start changelog entries
fff5f38
@andrew-fleming
update attributes
298f1bb
@andrew-fleming
update account preset api
e114563
@andrew-fleming
update erc20 preset api
f5699ca
@andrew-fleming
fix typo
7a27ebe
@andrew-fleming
update erc721 preset api
8dce05f
@andrew-fleming
add line in description
16fa54f
ericnordelo
ericnordelo reviewed Apr 12, 2024
View reviewed changes
Copy link
Member

@ericnordelo ericnordelo left a comment

Choose a reason for hiding this comment

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

Looking good! I like the interfaces file inside the presets folder. I Left two small suggestions.

Any reason why this is still a draft?

src/presets/erc721.cairo Show resolved Hide resolved
src/presets/erc721.cairo Outdated Show resolved Hide resolved
src/tests/upgrades/test_upgradeable.cairo Show resolved Hide resolved
andrew-fleming and others added 3 commits April 12, 2024 13:01
@andrew-fleming @ericnordelo
Apply suggestions from code review
3c72f04 
Co-authored-by: Eric Nordelo <eric.nordelo39@gmail.com>
@andrew-fleming
fix comments
5425e21
@andrew-fleming
fix conflicts
9b44a88
@andrew-fleming
Copy link
Collaborator Author

Any reason why this is still a draft?

@ericnordelo yeah, I'm deploying them all to sepolia to double check that they function as they should

@andrew-fleming andrew-fleming marked this pull request as ready for review April 15, 2024 20:49
@ericglau ericglau mentioned this pull request Apr 15, 2024
Merged
ericnordelo
ericnordelo reviewed Apr 16, 2024
View reviewed changes
Copy link
Member

@ericnordelo ericnordelo left a comment

Choose a reason for hiding this comment

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

Looking good, left some small suggestions.

Let's not forget to update the KNOWN_ORDER names in the script that updates the class hashes

docs/modules/ROOT/pages/utils/_class_hashes.adoc Show resolved Hide resolved
docs/modules/ROOT/pages/api/erc20.adoc Show resolved Hide resolved
docs/modules/ROOT/pages/api/erc721.adoc Show resolved Hide resolved
docs/modules/ROOT/pages/api/erc1155.adoc Outdated Show resolved Hide resolved
docs/modules/ROOT/pages/api/account.adoc Show resolved Hide resolved
src/presets/interfaces/account.cairo Outdated Show resolved Hide resolved
ericnordelo
ericnordelo approved these changes Apr 16, 2024
View reviewed changes
Copy link
Member

@ericnordelo ericnordelo left a comment

Choose a reason for hiding this comment

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

LGTM!

@andrew-fleming andrew-fleming merged commit 061cab2 into OpenZeppelin:main Apr 16, 2024
6 checks passed
@andrew-fleming andrew-fleming deleted the add-upgrades-to-presets branch April 16, 2024 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ericnordelo ericnordelo ericnordelo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make presets upgradeable
2 participants
@andrew-fleming @ericnordelo