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

Refactored to upgradeable contracts (1/2) (Licensing, Modules) #7

Merged
merged 20 commits into from
Mar 24, 2024

Conversation

Ramarti
Copy link

@Ramarti Ramarti commented Mar 18, 2024

Note: This PR comes after #6

I'm splitting the bulk of upgradeables in 2 PRs to make review manageable.

Upgrades:

These contracts are now UUPSUpgradeable

  • ModuleRegistry
  • AccessController
  • LicensingModule
  • LicenseRegistry
  • PILPolicyFramework

These contracts are now Initializable.
(UUPS must be the last contract in the inheritance chain, but the rest must be made Initializable

  • BasePolicyFrameworkManager
  • GovernableUpgradeable (it's in the name because we need a non Upgradeable version)
  • LicensorApprovalChecker

These contracts are upgrade-safe without modification

  • AccessControlled

Other

  • Removed LicensingModuleAware to simplify
  • Simplified some Licensing tests to unify deployments

@Ramarti Ramarti force-pushed the all-upgradeable-contracts branch from 99c5b23 to 1c3fa58 Compare March 20, 2024 00:44
@Ramarti Ramarti marked this pull request as ready for review March 20, 2024 23:06
Copy link

@LeoHChen LeoHChen left a comment

Choose a reason for hiding this comment

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

This PR seems some redundancy with PR #6

Copy link

@LeoHChen LeoHChen left a comment

Choose a reason for hiding this comment

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

wondering how the upgrade was tested, please attach a test log.

@kingster-will
Copy link

The PR's diff is still displaying the code change that was checked in with PR #6. Please rebase it with the main branch to make it easier to review.

@Ramarti Ramarti force-pushed the all-upgradeable-contracts branch from 1c3fa58 to b9390aa Compare March 21, 2024 20:24
@Ramarti Ramarti force-pushed the all-upgradeable-contracts branch from b9390aa to 9676ea8 Compare March 22, 2024 18:43
@Ramarti Ramarti requested a review from AndyBoWu as a code owner March 22, 2024 18:43
@Ramarti Ramarti requested a review from LeoHChen March 22, 2024 18:57
@AndyBoWu AndyBoWu removed their request for review March 22, 2024 18:59
Copy link

@LeoHChen LeoHChen left a comment

Choose a reason for hiding this comment

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

Is it rebased on top of the tree?

@Ramarti
Copy link
Author

Ramarti commented Mar 22, 2024

The PR's diff is still displaying the code change that was checked in with PR #6. Please rebase it with the main branch to make it easier to review.

It's rebased now

@Ramarti
Copy link
Author

Ramarti commented Mar 22, 2024

Is it rebased on top of the tree?

It is

@Ramarti
Copy link
Author

Ramarti commented Mar 22, 2024

wondering how the upgrade was tested, please attach a test log.

This PR only deploys proxies, the upgrade is not tested because the storage layout script had issues. I'll do a separate PR

@Ramarti Ramarti merged commit 6d6a20e into storyprotocol:main Mar 24, 2024
2 checks passed
kingster-will pushed a commit to kingster-will/protocol-core-v1-dev that referenced this pull request Jan 18, 2025
Add dispute propagation restriction
kingster-will pushed a commit to kingster-will/protocol-core-v1-dev that referenced this pull request Jan 31, 2025
kingster-will pushed a commit that referenced this pull request Jan 31, 2025
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.

5 participants