feat: nicer output #209
Merged
feat: nicer output #209
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
daejunpark
reviewed
Oct 19, 2023
| else: | ||
| return f"prank({str(addr)})" | ||
| return f"prank({str(self.addr)})" |
| return handler(ex, arg) | ||
|
|
||
| error_msg = f"Unknown halmos cheat code: function selector = 0x{funsig:0>8x}, calldata = {hexify(arg)}" | ||
| raise HalmosException(error_msg) |
src/halmos/cheatcodes.py
Outdated
| info( | ||
| f"Unsupported console function: selector = 0x{funsig:0>8x}, " | ||
| f"calldata = {hexify(arg)}" | ||
| ) |
| @@ -1883,282 +1641,20 @@ def call_unknown() -> None: | |||
| ex.solver.add(exit_code_var != con(0)) | |||
| ret = arg | |||
|
|
|||
| # TODO: factor out cheatcode semantics | |||
| raise ValueError(x) | ||
| if bitsize == 256: | ||
| return x | ||
| return simplify(SignExt(256 - bitsize, x)) |
src/halmos/utils.py
Outdated
| """ | ||
| if not is_bv_value(val): | ||
| warn(f"{val} is not a bitvector value") | ||
| return str(val) |
There was a problem hiding this comment.
Suggested change
| return str(val) | |
| return hexify(val) |
| else: # bytes32, bytes4, structs, etc. | ||
| return hexify(val) | ||
|
|
||
|
|
There was a problem hiding this comment.
i think we need to catch potential exceptions raised by the render functions here. even if is_bv_value(val) is true, the render functions could still raise an exception, when the type of val somehow differs from expected, e.g., .decode("utf-8") may fail in render_string(), or b.hex() may fail if b is not of type bytes.
daejunpark
reviewed
Oct 19, 2023
src/halmos/cheatcodes.py
Outdated
| funsig: int = int_of(extract_funsig(arg), "symbolic console function selector") | ||
|
|
||
| if handler := console.handlers.get(funsig): | ||
| return handler(arg) |
There was a problem hiding this comment.
similar to stringify, i think we need to catch potential exceptions from the renter functions here, so that the execution can continue regardless of any logging errors.
There was a problem hiding this comment.
you're right, added a test for it in 8b5b151:
Running 1 tests for test/Console.t.sol:ConsoleTest
console.handle: UnicodeDecodeError('utf-8', b'\xff', 0, 1, 'invalid start byte') with arg=0x4b5c4277000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000002c74686973206973206120737472696e67207468617420776f6e2774206465636f646520746f207574662d383a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ff00000000000000000000000000000000000000000000000000000000000000
[PASS] check_log_undecodable_string() (paths: 1/1, time: 0.05s, bounds: [])
Symbolic test result: 1 passed; 0 failed; time: 0.05s
+ factor our console.py out of cheatcodes.py + catch and log exceptions in stringify and console.log
daejunpark
approved these changes
Oct 20, 2023
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.
Includes a bunch of things:
Plus some internal reorganizing: