This repository was archived by the owner on Apr 12, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 125
feat: Have ExecutionManager pass data up #342
Draft
smartcontracts
wants to merge
6
commits into
master
Choose a base branch
from
dev/em-return-data
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ec2ac96
Start working on ExecutionManager return data
smartcontracts 9ea55d1
Merge branch 'master' of github.com:ethereum-optimism/contracts-v2 in…
smartcontracts 7874d16
Add a quick comment
smartcontracts 7cd413b
Add another comment
smartcontracts ef8a4fe
Merge remote-tracking branch 'origin/master' into dev/em-return-data
smartcontracts 054b9c3
Merge branch 'master' into dev/em-return-data
maurelian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -269,6 +269,23 @@ library Lib_SafeExecutionManagerWrapper { | |
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Same as safeREVERT, but does *not* attach the sighash of Error(string). | ||
| * @param _revertdata Data to revert with. | ||
| */ | ||
| function safeREVERTbytes( | ||
| bytes memory _revertdata | ||
| ) | ||
| internal | ||
| { | ||
| _safeExecutionManagerInteraction( | ||
| abi.encodeWithSignature( | ||
| "ovmREVERT(bytes)", | ||
| _revertdata | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Performs a safe "require". | ||
| * @param _condition Boolean condition that must be true or will revert. | ||
|
|
@@ -355,10 +372,6 @@ library Lib_SafeExecutionManagerWrapper { | |
| assembly { | ||
| revert(add(returndata, 0x20), mload(returndata)) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I know it's outside of scope, but why does this need assembly? |
||
| } | ||
| } else if (returndata.length == 1) { | ||
| assembly { | ||
| return(0, 1) | ||
| } | ||
| } else { | ||
| return returndata; | ||
| } | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.