NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve TransparentUpgradeableProxy's transparency (#3977)

Browse Source 
Co-authored-by: Francisco <fg@frang.io>
(cherry picked from commit 2a62fb4a2d)
This commit is contained in:
Hadrien Croubois
2023-01-19 22:34:15 +01:00
committed by Francisco Giordano
parent 9eee01c5a2
commit 8dfeb5d79e
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contracts/proxy/transparent/TransparentUpgradeableProxy.sol
View File

@ -59,7 +59,8 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
* https://eth.wiki/json-rpc/API#eth_getstorageat[`eth_getStorageAt`] RPC call.
* `0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103`
*/
function admin() external ifAdmin returns (address admin_) {
function admin() external payable ifAdmin returns (address admin_) {
_requireZeroValue();
admin_ = _getAdmin();
}
@ -72,7 +73,8 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
* https://eth.wiki/json-rpc/API#eth_getstorageat[`eth_getStorageAt`] RPC call.
* `0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc`
*/
function implementation() external ifAdmin returns (address implementation_) {
function implementation() external payable ifAdmin returns (address implementation_) {
_requireZeroValue();
implementation_ = _implementation();
}
@ -83,7 +85,8 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
*
* NOTE: Only the admin can call this function. See {ProxyAdmin-changeProxyAdmin}.
*/
function changeAdmin(address newAdmin) external virtual ifAdmin {
function changeAdmin(address newAdmin) external payable virtual ifAdmin {
_requireZeroValue();
_changeAdmin(newAdmin);
}
@ -92,7 +95,8 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
*
* NOTE: Only the admin can call this function. See {ProxyAdmin-upgrade}.
*/
function upgradeTo(address newImplementation) external ifAdmin {
function upgradeTo(address newImplementation) external payable ifAdmin {
_requireZeroValue();
_upgradeToAndCall(newImplementation, bytes(""), false);
}
@ -121,4 +125,12 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
require(msg.sender != _getAdmin(), "TransparentUpgradeableProxy: admin cannot fallback to proxy target");
super._beforeFallback();
}
/**
* @dev To keep this contract fully transparent, all `ifAdmin` functions must be payable. This helper is here to
* emulate some proxy functions being non-payable while still allowing value to pass through.
*/
function _requireZeroValue() private {
require(msg.value == 0);
}
}