Add EntrypointOverrideable: opt-in override an extension for a function. #293
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+86
to
+97
| function overrideExtensionForFunction(bytes4 _selector, address _extension) external { | ||
| require(_canOverrideExtensions(), "Entrypoint: cannot override extensions."); | ||
|
|
||
| EntrypointOverrideableStorage.Data storage data = EntrypointOverrideableStorage.entrypointStorage(); | ||
| data.extensionOverride[_selector] = _extension; | ||
|
|
||
| if (_extension != address(0)) { | ||
| data.functions.add(bytes32(_selector)); | ||
| } else { | ||
| data.functions.remove(bytes32(_selector)); | ||
| } | ||
| } |
Check warning
Code scanning / Slither
Unused return
Comment on lines
+86
to
+97
| function overrideExtensionForFunction(bytes4 _selector, address _extension) external { | ||
| require(_canOverrideExtensions(), "Entrypoint: cannot override extensions."); | ||
|
|
||
| EntrypointOverrideableStorage.Data storage data = EntrypointOverrideableStorage.entrypointStorage(); | ||
| data.extensionOverride[_selector] = _extension; | ||
|
|
||
| if (_extension != address(0)) { | ||
| data.functions.add(bytes32(_selector)); | ||
| } else { | ||
| data.functions.remove(bytes32(_selector)); | ||
| } | ||
| } |
Check warning
Code scanning / Slither
Unused return
Comment on lines
+57
to
+80
| function _delegate(address implementation) internal virtual { | ||
| assembly { | ||
| // Copy msg.data. We take full control of memory in this inline assembly | ||
| // block because it will not return to Solidity code. We overwrite the | ||
| // Solidity scratch pad at memory position 0. | ||
| calldatacopy(0, 0, calldatasize()) | ||
|
|
||
| // Call the implementation. | ||
| // out and outsize are 0 because we don't know the size yet. | ||
| let result := delegatecall(gas(), implementation, 0, calldatasize(), 0, 0) | ||
|
|
||
| // Copy the returned data. | ||
| returndatacopy(0, 0, returndatasize()) | ||
|
|
||
| switch result | ||
| // delegatecall returns 0 on error. | ||
| case 0 { | ||
| revert(0, returndatasize()) | ||
| } | ||
| default { | ||
| return(0, returndatasize()) | ||
| } | ||
| } | ||
| } |
Check warning
Code scanning / Slither
Assembly usage
Comment on lines
+17
to
+22
| function entrypointStorage() internal pure returns (Data storage entrypointData) { | ||
| bytes32 position = ENTRYPOINT_OVERRIDEABLE_STORAGE_POSITION; | ||
| assembly { | ||
| entrypointData.slot := position | ||
| } | ||
| } |
Check warning
Code scanning / Slither
Assembly usage
Comment on lines
+25
to
+120
| abstract contract EntrypointOverrideable is Multicall, IEntrypointOverrideable { | ||
| using EnumerableSet for EnumerableSet.Bytes32Set; | ||
|
|
||
| /*/////////////////////////////////////////////////////////////// | ||
| State variables | ||
| //////////////////////////////////////////////////////////////*/ | ||
|
|
||
| address public immutable functionMap; | ||
|
|
||
| /*/////////////////////////////////////////////////////////////// | ||
| Constructor + initializer logic | ||
| //////////////////////////////////////////////////////////////*/ | ||
|
|
||
| constructor(address _functionMap) { | ||
| functionMap = _functionMap; | ||
| } | ||
|
|
||
| /*/////////////////////////////////////////////////////////////// | ||
| Generic contract logic | ||
| //////////////////////////////////////////////////////////////*/ | ||
|
|
||
| fallback() external payable virtual { | ||
| address extension = _getExtensionOverride(msg.sig); | ||
| if (extension == address(0)) { | ||
| extension = IMap(functionMap).getExtensionForFunction(msg.sig); | ||
| } | ||
|
|
||
| _delegate(extension); | ||
| } | ||
|
|
||
| receive() external payable {} | ||
|
|
||
| function _delegate(address implementation) internal virtual { | ||
| assembly { | ||
| // Copy msg.data. We take full control of memory in this inline assembly | ||
| // block because it will not return to Solidity code. We overwrite the | ||
| // Solidity scratch pad at memory position 0. | ||
| calldatacopy(0, 0, calldatasize()) | ||
|
|
||
| // Call the implementation. | ||
| // out and outsize are 0 because we don't know the size yet. | ||
| let result := delegatecall(gas(), implementation, 0, calldatasize(), 0, 0) | ||
|
|
||
| // Copy the returned data. | ||
| returndatacopy(0, 0, returndatasize()) | ||
|
|
||
| switch result | ||
| // delegatecall returns 0 on error. | ||
| case 0 { | ||
| revert(0, returndatasize()) | ||
| } | ||
| default { | ||
| return(0, returndatasize()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /*/////////////////////////////////////////////////////////////// | ||
| External functions | ||
| //////////////////////////////////////////////////////////////*/ | ||
|
|
||
| function overrideExtensionForFunction(bytes4 _selector, address _extension) external { | ||
| require(_canOverrideExtensions(), "Entrypoint: cannot override extensions."); | ||
|
|
||
| EntrypointOverrideableStorage.Data storage data = EntrypointOverrideableStorage.entrypointStorage(); | ||
| data.extensionOverride[_selector] = _extension; | ||
|
|
||
| if (_extension != address(0)) { | ||
| data.functions.add(bytes32(_selector)); | ||
| } else { | ||
| data.functions.remove(bytes32(_selector)); | ||
| } | ||
| } | ||
|
|
||
| function getAllOverriden() external view returns (ExtensionMap[] memory functionExtensionPairs) { | ||
| EntrypointOverrideableStorage.Data storage data = EntrypointOverrideableStorage.entrypointStorage(); | ||
| uint256 len = data.functions.length(); | ||
| functionExtensionPairs = new ExtensionMap[](len); | ||
|
|
||
| for (uint256 i = 0; i < len; i += 1) { | ||
| bytes4 selector = bytes4(data.functions.at(i)); | ||
| functionExtensionPairs[i] = ExtensionMap(selector, data.extensionOverride[selector]); | ||
| } | ||
| } | ||
|
|
||
| /*/////////////////////////////////////////////////////////////// | ||
| Internal functions | ||
| //////////////////////////////////////////////////////////////*/ | ||
|
|
||
| function _getExtensionOverride(bytes4 _selector) internal view returns (address) { | ||
| EntrypointOverrideableStorage.Data storage data = EntrypointOverrideableStorage.entrypointStorage(); | ||
| return data.extensionOverride[_selector]; | ||
| } | ||
|
|
||
| function _canOverrideExtensions() internal view virtual returns (bool); | ||
| } |
Check warning
Code scanning / Slither
Unimplemented functions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.