Resolve merge conflict for zkevm-circuits/src/evm_circuit/witness.rs #2
Conversation
This file contains 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
Signed-off-by: smtmfft <[email protected]> Signed-off-by: smtmfft <[email protected]>
…ircuits into xiaodino/returndatasize
Signed-off-by: smtmfft <[email protected]> Signed-off-by: smtmfft <[email protected]>
) i.e., only if it is not root call. RETURN spec: The `RETURN` opcode terminates the call successfully with return data for the caller. It behaves differently in different scenarios: - `is_create` and `is_root` - A. Returns the specified memory chunk as deployment code. - B. End the execution - `is_create` and `not is_root` - A. Returns the specified memory chunk as deployment code. - C. Restores caller's context and switch to it. - `not is_create` and `is_root` - B. End the execution - `not is_create` and `not is_root` - D. Returns the specified memory chunk to the caller. - C. Restores caller's context and switch to it. Signed-off-by: smtmfft <[email protected]> Signed-off-by: smtmfft <[email protected]> Co-authored-by: smtmfft <[email protected]>
…ircuits into xiaodino/returndatasize
…ircuits into xiaodino/returndatasize
…ircuits into xiaodino/returndatasize
Add circuit for RETURNDATASIZE opcode
Signed-off-by: smtmfft <[email protected]>
Signed-off-by: smtmfft <[email protected]>
Signed-off-by: smtmfft <[email protected]>
Signed-off-by: smtmfft <[email protected]>
Signed-off-by: smtmfft <[email protected]>
Signed-off-by: smtmfft <[email protected]>
Signed-off-by: smtmfft <[email protected]>
Signed-off-by: smtmfft <[email protected]>
Signed-off-by: smtmfft <[email protected]>
smtmfft
added a commit
that referenced
this pull request
Nov 2, 2022
* Add circuit for RETURNDATASIZE opcode * Update tests * update last call info in return (#2) Signed-off-by: smtmfft <[email protected]> Signed-off-by: smtmfft <[email protected]> * Update tests * Update tests * Update format in zkevm-circuits/src/evm_circuit/execution.rs * Change unwrap to expect in returndatasize.rs * Add circuit for RETURNDATASIZE opcode * Update tests * update last call info in return (#2) Signed-off-by: smtmfft <[email protected]> Signed-off-by: smtmfft <[email protected]> * Update tests * Update tests * Update format in zkevm-circuits/src/evm_circuit/execution.rs * Change unwrap to expect in returndatasize.rs * according to RETURN spec, callee info update happens only in case C, (#3) i.e., only if it is not root call. RETURN spec: The `RETURN` opcode terminates the call successfully with return data for the caller. It behaves differently in different scenarios: - `is_create` and `is_root` - A. Returns the specified memory chunk as deployment code. - B. End the execution - `is_create` and `not is_root` - A. Returns the specified memory chunk as deployment code. - C. Restores caller's context and switch to it. - `not is_create` and `is_root` - B. End the execution - `not is_create` and `not is_root` - D. Returns the specified memory chunk to the caller. - C. Restores caller's context and switch to it. Signed-off-by: smtmfft <[email protected]> Signed-off-by: smtmfft <[email protected]> Co-authored-by: smtmfft <[email protected]> * Fix the issues with rustfmt * Fix merge conflicts * Update * Add tests * Resolve merge conflicts * Update bus-mapping return.rs, use N_BYTES_U64 for return_data_size and update tests * Revert change in bus-mapping return * Update bus-mapping returndatasize_tests Signed-off-by: smtmfft <[email protected]> Signed-off-by: smtmfft <[email protected]> Co-authored-by: smtmfft <[email protected]> Co-authored-by: smtmfft <[email protected]> Co-authored-by: Rohit Narurkar <[email protected]> Co-authored-by: Carlos Pérez <[email protected]> Co-authored-by: z2trillion <[email protected]> Co-authored-by: adria0.eth <[email protected]>
smtmfft
force-pushed
the
opcodes/returndatacopy
branch
from
45673e7 to
7a31ce4
Compare
smtmfft
pushed a commit
that referenced
this pull request
Sep 25, 2023
fix: anchor circuit in eip-1559
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.