♻️ Tidy EIP7702Proxy (#1386)

Author: Vectorized

docs/accounts/libeip7702.md

@@ -72,7 +72,7 @@ and the delegation, so we shall just use bytes32 in case we want to standardize
 
 ```solidity
 bytes internal constant EIP7702_PROXY_CREATION_CODE =
-    hex"60c060408190523060805261031138819003908190833981016040819052610026916100a3565b6001600160a01b039182167f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc81905591167fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103819055811515110260a0526100d4565b80516001600160a01b038116811461009e575f5ffd5b919050565b5f5f604083850312156100b4575f5ffd5b6100bd83610088565b91506100cb60208401610088565b90509250929050565b60805160a05161021e6100f35f395f602601525f6005015261021e5ff3fe3d6040527f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc308318610119576001361161007e5780543652602036f35b5f3560e01c80635c60da1b0361009f5760205f5f36305afa1561009f573d5ff35b7fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610380548263f851a440036100d557805f5260205ff35b8033036101125760103560601c83638f283970036100f95780835560015f5260205ff35b83630900f010036101105780855560015f5260205ff35b505b5050505f3dfd5b805436600103610154578060601b61014657826101435760205f5f36875afa61013e57fe5b60205ff35b50815b8060601b60601c5f5260205ff35b365f5f378060601b6101cb57826101c8576020365f36875afa5f5f365f36515af416610182573d5f5f3e3d5ffd5b7f94e11c6e41e7fb92cb8bb65e13fdfbd4eba8b831292a1a220f7915c78c7c078f805c156101bf57365183546001600160a01b0319161783555f815d5b503d5f5f3e3d5ff35b50815b5f36365f845af46101de573d5f5f3e3d5ffd5b50503d5f5f3e3d5ff3fea2646970667358221220ad810cb1d8296ebd4649785ecb093c978531e8ae483468cdb56d4856d522f99464736f6c634300081c0033"
+    hex"60c06040819052306080526102f93881900390819083398101604081905261002691610096565b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc8290557fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103819055811515110260a0526100c7565b80516001600160a01b0381168114610091575f5ffd5b919050565b5f5f604083850312156100a7575f5ffd5b6100b08361007b565b91506100be6020840161007b565b90509250929050565b60805160a0516102136100e65f395f602601525f600501526102135ff3fe3d6040527f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc6001600160a01b0330841861011f576001361161008857815481165f5260205ff35b5f3560e01c80635c60da1b036100a95760205f5f36305afa156100a9573d5ff35b7fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610380548263f851a440036100df57805f5260205ff35b80330361011b57600435841683638f283970036101025780835560015f5260205ff35b83630900f010036101195780865560015f5260205ff35b505b5f5ffd5b8154811636600103610152578061014a57836101475760205f5f5f885afa1561011b5760205ff35b50825b805f5260205ff35b365f5f37806101bf57836101bc576020365f5f885afa5f5f365f36515af41661017d573d5f5f3e3d5ffd5b7f94e11c6e41e7fb92cb8bb65e13fdfbd4eba8b831292a1a220f7915c78c7c078f805c156101b357365184548419161784555f815d5b503d5f5f3e3d5ff35b50825b5f5f365f845af46101d2573d5f5f3e3d5ffd5b5050503d5f5f3e3d5ff3fea26469706673582212206f32ef601c4ecbe6bf6bd140c202d924909bf63b82b41534da1a01bd9620334064736f6c634300081c0033"
 ```
 
 The creation code for the EIP7702Proxy.   
@@ -82,7 +82,7 @@ This is generated from [`EIP7702Proxy.sol`](accounts/eip7702proxy.md) with exact
 
 ```solidity
 bytes32 internal constant EIP7702_PROXY_MINIMAL_CODE_HASH =
-    0x7386c2810632fa8ea702ec3b7b0ad8fe514f063d42915830c6dd30abd543082e
+    0xcabd060d42833a05e9887a2398c1b9c5886dbf4aaa134d91e86d7384bd6f3c93
 ```
 
 The keccak256 of runtime code for [`EIP7702Proxy.sol`](accounts/eip7702proxy.md) with exact compilation settings,   

src/accounts/EIP7702Proxy.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.24;
 // solc: 0.8.28, optimization runs: 200, evm version: cancun.
 
 /// @notice Relay proxy for EIP7702 delegations.
-/// @author Solady (https://github.com/vectorized/solady/blob/main/src/accounts/LibEIP7702.sol)
+/// @author Solady (https://github.com/vectorized/solady/blob/main/src/accounts/EIP7702Proxy.sol)
 ///
 /// @dev Note: This relay proxy is useful for upgradeable EIP7702 accounts
 /// without the need for redelegation.
@@ -17,7 +17,7 @@ contract EIP7702Proxy {
     /*                         IMMUTABLES                         */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    /// @dev For allowing the differentiation of the EOA and the proxy itself.
+    /// @dev For differentiating calls on the EOA and calls on the proxy itself.
     uint256 internal immutable __self = uint256(uint160(address(this)));
 
     /// @dev The default implementation. Provided for optimization.
@@ -53,13 +53,12 @@ contract EIP7702Proxy {
         uint256 defaultImplementation;
         /// @solidity memory-safe-assembly
         assembly {
-            let implementation := shr(96, shl(96, initialImplementation))
-            let admin := shr(96, shl(96, initialAdmin))
             // We will store the implementation in the storage regardless,
             // to aid proxy detection on block explorers.
-            sstore(_ERC1967_IMPLEMENTATION_SLOT, implementation)
-            sstore(_ERC1967_ADMIN_SLOT, admin)
-            defaultImplementation := mul(lt(admin, iszero(iszero(implementation))), implementation)
+            sstore(_ERC1967_IMPLEMENTATION_SLOT, initialImplementation)
+            sstore(_ERC1967_ADMIN_SLOT, initialAdmin)
+            defaultImplementation :=
+                mul(lt(initialAdmin, iszero(iszero(initialImplementation))), initialImplementation)
         }
         _defaultImplementation = defaultImplementation;
     }
@@ -75,13 +74,14 @@ contract EIP7702Proxy {
         assembly {
             mstore(0x40, returndatasize()) // Optimization trick to change `6040608052` into `3d604052`.
             let implementationSlot := _ERC1967_IMPLEMENTATION_SLOT
+            let addrMask := shr(96, not(0))
             // Workflow for calling on the proxy itself.
             // We cannot put these functions in the public ABI as this proxy must
             // fully forward all the calldata from EOAs pointing to this proxy.
             if iszero(xor(address(), s)) {
                 if iszero(gt(calldatasize(), 1)) {
-                    mstore(calldatasize(), sload(implementationSlot))
-                    return(calldatasize(), 0x20)
+                    mstore(0x00, and(addrMask, sload(implementationSlot)))
+                    return(0x00, 0x20)
                 }
                 let fnSel := shr(224, calldataload(0x00))
                 // `implementation()`.
@@ -99,7 +99,7 @@ contract EIP7702Proxy {
                 }
                 // Admin workflow.
                 if eq(caller(), admin) {
-                    let addr := shr(96, calldataload(0x10))
+                    let addr := and(addrMask, calldataload(0x04))
                     // `changeAdmin(address)`.
                     if eq(0x8f283970, fnSel) {
                         sstore(adminSlot, addr)
@@ -116,30 +116,28 @@ contract EIP7702Proxy {
                     // We don't need to forward any data to the new implementation.
                     // This "proxy" is actually close to an upgradeable beacon.
                 }
-                revert(returndatasize(), 0x00)
+                revert(0x00, 0x00)
             }
             // Workflow for the EIP7702 authority (i.e. the EOA).
-            let impl := sload(implementationSlot) // The preferred implementation on the EOA.
+            let implementation := and(addrMask, sload(implementationSlot)) // On EOA's storage.
             // Special workflow for retrieving the implementation directly.
             if eq(1, calldatasize()) {
                 // If the preferred implementation is `address(0)`.
-                if iszero(shl(96, impl)) {
+                if iszero(implementation) {
                     // If `defaultImplementation` is `address(0)`
                     if iszero(defaultImplementation) {
                         // Fetch the implementation from the proxy.
-                        if iszero(staticcall(gas(), s, calldatasize(), 0x00, 0x00, 0x20)) {
-                            invalid()
-                        }
-                        return(0x00, 0x20)
+                        if staticcall(gas(), s, 0x00, 0x00, 0x00, 0x20) { return(0x00, 0x20) }
+                        revert(0x00, 0x00)
                     }
-                    impl := defaultImplementation
+                    implementation := defaultImplementation
                 }
-                mstore(0x00, shr(96, shl(96, impl)))
+                mstore(0x00, implementation)
                 return(0x00, 0x20)
             }
             calldatacopy(0x00, 0x00, calldatasize()) // Copy the calldata for the delegatecall.
             // If the preferred implementation is `address(0)`.
-            if iszero(shl(96, impl)) {
+            if iszero(implementation) {
                 // If `defaultImplementation` is `address(0)`, perform the initialization workflow.
                 if iszero(defaultImplementation) {
                     if iszero(
@@ -148,7 +146,7 @@ contract EIP7702Proxy {
                                 gas(), mload(calldatasize()), 0x00, calldatasize(), 0x00, 0x00
                             ),
                             // Fetch the implementation from the proxy.
-                            staticcall(gas(), s, calldatasize(), 0x00, calldatasize(), 0x20)
+                            staticcall(gas(), s, 0x00, 0x00, calldatasize(), 0x20)
                         )
                     ) {
                         returndatacopy(0x00, 0x00, returndatasize())
@@ -163,21 +161,21 @@ contract EIP7702Proxy {
                     let initializationRequestSlot :=
                         _EIP7702_PROXY_DELEGATION_INITIALIZATION_REQUEST_SLOT
                     if tload(initializationRequestSlot) {
-                        let implSlot := implementationSlot
                         // The `implementation` is still at `calldatasize()` in memory.
                         // Preserve the upper 96 bits when updating in case they are used for some stuff.
                         sstore(
-                            implSlot, or(shl(160, shr(160, sload(implSlot))), mload(calldatasize()))
+                            implementationSlot,
+                            or(and(not(addrMask), sload(implementationSlot)), mload(calldatasize()))
                         )
                         tstore(initializationRequestSlot, 0) // Clear.
                     }
                     returndatacopy(0x00, 0x00, returndatasize())
                     return(0x00, returndatasize())
                 }
-                impl := defaultImplementation
+                implementation := defaultImplementation
             }
             // Otherwise, just delegatecall and bubble up the results without initialization.
-            if iszero(delegatecall(gas(), impl, 0x00, calldatasize(), calldatasize(), 0x00)) {
+            if iszero(delegatecall(gas(), implementation, 0x00, calldatasize(), 0x00, 0x00)) {
                 returndatacopy(0x00, 0x00, returndatasize())
                 revert(0x00, returndatasize())
             }

src/accounts/LibEIP7702.sol

@@ -39,12 +39,12 @@ library LibEIP7702 {
     /// @dev The creation code for the EIP7702Proxy.
     /// This is generated from `EIP7702Proxy.sol` with exact compilation settings.
     bytes internal constant EIP7702_PROXY_CREATION_CODE =
-        hex"60c060408190523060805261031138819003908190833981016040819052610026916100a3565b6001600160a01b039182167f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc81905591167fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103819055811515110260a0526100d4565b80516001600160a01b038116811461009e575f5ffd5b919050565b5f5f604083850312156100b4575f5ffd5b6100bd83610088565b91506100cb60208401610088565b90509250929050565b60805160a05161021e6100f35f395f602601525f6005015261021e5ff3fe3d6040527f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc308318610119576001361161007e5780543652602036f35b5f3560e01c80635c60da1b0361009f5760205f5f36305afa1561009f573d5ff35b7fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610380548263f851a440036100d557805f5260205ff35b8033036101125760103560601c83638f283970036100f95780835560015f5260205ff35b83630900f010036101105780855560015f5260205ff35b505b5050505f3dfd5b805436600103610154578060601b61014657826101435760205f5f36875afa61013e57fe5b60205ff35b50815b8060601b60601c5f5260205ff35b365f5f378060601b6101cb57826101c8576020365f36875afa5f5f365f36515af416610182573d5f5f3e3d5ffd5b7f94e11c6e41e7fb92cb8bb65e13fdfbd4eba8b831292a1a220f7915c78c7c078f805c156101bf57365183546001600160a01b0319161783555f815d5b503d5f5f3e3d5ff35b50815b5f36365f845af46101de573d5f5f3e3d5ffd5b50503d5f5f3e3d5ff3fea2646970667358221220ad810cb1d8296ebd4649785ecb093c978531e8ae483468cdb56d4856d522f99464736f6c634300081c0033";
+        hex"60c06040819052306080526102f93881900390819083398101604081905261002691610096565b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc8290557fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103819055811515110260a0526100c7565b80516001600160a01b0381168114610091575f5ffd5b919050565b5f5f604083850312156100a7575f5ffd5b6100b08361007b565b91506100be6020840161007b565b90509250929050565b60805160a0516102136100e65f395f602601525f600501526102135ff3fe3d6040527f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc6001600160a01b0330841861011f576001361161008857815481165f5260205ff35b5f3560e01c80635c60da1b036100a95760205f5f36305afa156100a9573d5ff35b7fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610380548263f851a440036100df57805f5260205ff35b80330361011b57600435841683638f283970036101025780835560015f5260205ff35b83630900f010036101195780865560015f5260205ff35b505b5f5ffd5b8154811636600103610152578061014a57836101475760205f5f5f885afa1561011b5760205ff35b50825b805f5260205ff35b365f5f37806101bf57836101bc576020365f5f885afa5f5f365f36515af41661017d573d5f5f3e3d5ffd5b7f94e11c6e41e7fb92cb8bb65e13fdfbd4eba8b831292a1a220f7915c78c7c078f805c156101b357365184548419161784555f815d5b503d5f5f3e3d5ff35b50825b5f5f365f845af46101d2573d5f5f3e3d5ffd5b5050503d5f5f3e3d5ff3fea264697066735822122094bb23ea8991ed3ef0f69ec672e5622d7e7167d81f37b21ee01d9fe33acb081964736f6c634300081c0033";
 
     /// @dev The keccak256 of runtime code for `EIP7702Proxy.sol` with exact compilation settings,
     /// with immutables zeroized and without the CBOR metadata.
     bytes32 internal constant EIP7702_PROXY_MINIMAL_CODE_HASH =
-        0x7386c2810632fa8ea702ec3b7b0ad8fe514f063d42915830c6dd30abd543082e;
+        0xcabd060d42833a05e9887a2398c1b9c5886dbf4aaa134d91e86d7384bd6f3c93;
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*               AUTHORITY AND PROXY OPERATIONS               */
@@ -98,11 +98,11 @@ library LibEIP7702 {
         assembly {
             let m := mload(0x40)
             // Copy the runtime bytecode without the CBOR metadata.
-            extcodecopy(target, m, 0x00, 0x1e8)
+            extcodecopy(target, m, 0x00, 0x1dd)
             // Zeroize the immutables.
             mstore(add(m, 0x05), 0)
             mstore(add(m, 0x26), 0)
-            result := eq(keccak256(m, 0x1e8), EIP7702_PROXY_MINIMAL_CODE_HASH)
+            result := eq(keccak256(m, 0x1dd), EIP7702_PROXY_MINIMAL_CODE_HASH)
         }
     }