Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add view modifier to proxyAdmin in TransparentUpgradeableProxy #4688

Merged
merged 6 commits into from
Oct 17, 2023
Merged

Add view modifier to proxyAdmin in TransparentUpgradeableProxy #4688

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4bf12da
Add `view` modifier to `proxyAdmin` in TransparentUpgradeableProxy
ernestognw Oct 16, 2023
d7a7409
Add changeset
ernestognw Oct 16, 2023
b5c7e18
Format
ernestognw Oct 16, 2023
c899579
Merge branch 'master' into chore/add-view-to-upgradeable-proxy
ernestognw Oct 16, 2023
c6ffb77
Fix typo
ernestognw Oct 16, 2023
45fa1a5
Update .changeset/eleven-planets-relax.md
ernestognw Oct 16, 2023
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
5 changes: 5 additions & 0 deletions .changeset/eleven-planets-relax.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'openzeppelin-solidity': patch
---

`TransparentUpgradeableProxy`: Make internal `_proxyAdmin()` getter to have `view` visibility.
ernestognw marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions contracts/proxy/transparent/TransparentUpgradeableProxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ interface ITransparentUpgradeableProxy is IERC1967 {
* IMPORTANT: This contract avoids unnecessary storage reads by setting the admin only during construction as an
* immutable variable, preventing any changes thereafter. However, the admin slot defined in ERC-1967 can still be
* overwritten by the implementation logic pointed to by this proxy. In such cases, the contract may end up in an
* undesirable state where the admin slot is different from the actual admin. Relying in the value of the admin slot
* undesirable state where the admin slot is different from the actual admin. Relying on the value of the admin slot
* is generally fine if the implementation is trusted.
*
* WARNING: It is not recommended to extend this contract to add additional external functions. If you do so, the
Expand Down Expand Up @@ -84,7 +84,7 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
/**
* @dev Returns the admin of this proxy.
*/
function _proxyAdmin() internal virtual returns (address) {
function _proxyAdmin() internal view virtual returns (address) {
return _admin;
}

Expand Down