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

Oz upgrade #160

Merged
merged 3 commits into from
Oct 30, 2023
Merged

Oz upgrade #160

merged 3 commits into from
Oct 30, 2023

Conversation

vzotova
Copy link
Member

@vzotova vzotova commented Oct 20, 2023

Type of PR:

  • Bugfix
  • Feature
  • Documentation
  • Other

Required reviews:

  • 1
  • 2
  • 3

What this does:
Upgrades OpenZeppelin library to 5.0.0

Issues fixed/closed:
Fixes #159

Why it's needed:
It will be hard to upgrade to 5.x.x version after mainnet

Notes for reviewers:
Based on #145

Copy link
Member

@KPrasch KPrasch 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 may have additional implications on proxy contract handling during deployment script execution. Need some time to take a closer look 🧐

@KPrasch
Copy link
Member

KPrasch commented Oct 26, 2023

This PR may have additional implications on proxy contract handling during deployment script execution. Need some time to take a closer look 🧐

Tracking here: #164

_minimumAuthorization: 40000000000000000000000
- TransparentUpgradeableProxy:
_logic: $TapirTACoChildApplication
admin_: $ProxyAdmin
Copy link
Member

Choose a reason for hiding this comment

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

it looks like the function signature of TransparentUpgradeableProxy changed in v5.0.0.

constructor(address _logic, address initialOwner, bytes memory _data) payable ERC1967Proxy(_logic, _data) {


reward_token = deployer.deploy(project.TapirStakingToken)

mock_threshold_staking = deployer.deploy(project.TestnetThresholdStaking)

proxy_admin = deployer.deploy(OZ_DEPENDENCY.ProxyAdmin)
proxy_admin = deployer.deploy(OZ_DEPENDENCY.ProxyAdmin, deployer)
Copy link
Member

@KPrasch KPrasch Oct 27, 2023

Choose a reason for hiding this comment

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

The new version of TransparentUpgradeableProxy deploys a default ProxyAdmin so this line will need to be removed. I can address this in vzotova#2

Copy link
Member Author

Choose a reason for hiding this comment

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

I suppose we would want to reuse proxy admin between taco child and coordinator, is this possible with the new changes?

Copy link
Member

Choose a reason for hiding this comment

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

@derekpierre
Copy link
Member

This PR will affect nucypher acceptance tests once merged.

ape-config settings, use of proxy admin, will need to be updated there.

@KPrasch KPrasch merged commit e1cec76 into nucypher:main Oct 30, 2023
2 checks passed
@KPrasch KPrasch mentioned this pull request Oct 30, 2023
7 tasks
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.

Consider using OpenZeppelin v5.0
3 participants