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

opti: ERC1967Upgrade, remove double iszero before jumpi #122

Merged
merged 1 commit into from
Apr 15, 2023
Merged

opti: ERC1967Upgrade, remove double iszero before jumpi #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/proxies/ERC1967Upgrade.huff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
// Input Stack: [address]

// Check that the address is a contract
dup1 extcodesize iszero iszero // [isContract(address), address]
dup1 extcodesize // [isContract(address), address]
__Is_Contract_JUMP jumpi // [address]
NON_CONTRACT(0x00)

Expand Down Expand Up @@ -105,7 +105,7 @@
swap4 // [address, argOffset, argSize, retOffset, retSize]
gas // [gas, address, argOffset, argSize, retOffset, retSize]
delegatecall // [success]
iszero iszero __DelegateCall_Success jumpi // []
__DelegateCall_Success jumpi // []
0x00 dup1 revert

__IgnoreCall_And_Clean_Stack:
Expand Down Expand Up @@ -188,13 +188,13 @@
// Input Stack: [address]

// Check that the address != address(0)
dup1 iszero iszero // [address != address(0), address]
dup1 // [address != address(0), address]
__Is_Not_Zero_addr_JUMP jumpi // [address]
ZERO_ADDRESS(0x00)

// Set the admin slot
__Is_Not_Zero_addr_JUMP:
[_ADMIN_SLOT] sstore // []
[_ADMIN_SLOT] sstore // []
}

/// @notice Change the admin
Expand Down Expand Up @@ -223,7 +223,7 @@
// Input Stack: [address]

// Check that the address is a contract
dup1 extcodesize iszero iszero // [isContract(address), address]
dup1 extcodesize // [isContract(address), address]
__Is_Contract_JUMP jumpi // [address]
NON_CONTRACT(0x00)

Expand All @@ -239,13 +239,13 @@
dup5 // [address, argOffset, argSize, retOffset, retSize, address]
gas // [gas, address, argOffset, argSize, retOffset, retSize, address]
staticcall // [success, address]
iszero iszero __StaticCall_Success jumpi // [address]
__StaticCall_Success jumpi // [address]
0x00 dup1 revert
__StaticCall_Success:

// Load the implementation address from the staticcal
0x00 mload // [implementation, address]
extcodesize iszero iszero // [isContract(address), address]
extcodesize // [isContract(address), address]
__Is_Contract_JUMP jumpi // [address]
NON_CONTRACT(0x00)

Expand Down Expand Up @@ -279,7 +279,7 @@
dup5 // [newBeacon, argOffset, argSize, retOffset, retSize, newBeacon, data, dataSize]
gas // [gas, newBeacon, argOffset, argSize, retOffset, retSize, newBeacon, data, dataSize]
staticcall // [success, newBeacon, data, dataSize]
iszero iszero __ImplCall_Success jumpi // [newBeacon, data, dataSize]
__ImplCall_Success jumpi // [newBeacon, data, dataSize]
0x00 dup1 revert
__ImplCall_Success:

Expand All @@ -299,7 +299,7 @@
dup7 // [newBeacon, argOffset, argSize, retOffset, retSize, data, newBeacon, implementation]
gas // [gas, address, argOffset, argSize, retOffset, retSize, data, newBeacon, implementation]
delegatecall // [success, data, newBeacon, implementation]
iszero iszero __DelegateCall_Success jumpi // [data, newBeacon, implementation]
__DelegateCall_Success jumpi // [data, newBeacon, implementation]
0x00 dup1 revert

__IgnoreCall_And_Clean_Stack:
Expand Down