fix: emulator.get_debug_state response #271
Merged
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
grdddj
reviewed
Oct 14, 2024
src/emulator.py
Outdated
| @@ -917,8 +917,7 @@ def get_debug_state() -> Dict[str, Any]: | |||
| val = val.decode("utf-8") | |||
| except UnicodeDecodeError: | |||
| val = val.hex() | |||
|
|
|||
| debug_state_dict[key] = val | |||
| debug_state_dict[key] = val | |||
There was a problem hiding this comment.
This does not seem right, it means we will only save byte values
There was a problem hiding this comment.
yes, as i mentioned in the description and also discussed on slack, im aware that this isnt right but user-env crasches without it (tries to serialize complex field)
There was a problem hiding this comment.
I pushed a fixup commit into this branch/PR, can you please confirm it works fine for you? I can merge it in a positive case
There was a problem hiding this comment.
works for me, thanks
grdddj
force-pushed
the
fix/get_debug_state
branch
from
76c6add
to
dce4122
Compare
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.
fixing problem 1:
get_debug_statetries to serialize non buffer fields/keys (1 indent missing)edit: after further testing this change can be tricky.
DebugLinkState may contain some other filed types not only bytes (like int for example) but in the same time they might be complex and not serializable.
see thp state:
<DebugLinkState: {'mnemonic_secret': b'all all all all all all all all all all all all', 'passphrase_protection': False, 'reset_entropy': b'', 'mnemonic_type': <BackupType.Bip39: 0>, 'tokens': ['{', '"component"', ': ', '"SimplePage"', ', ', '"active_page"', ': ', '0', ', ', '"page_count"', ': ', '2', ', ', '"content"', ': ', '{', '"component"', ': ', '"AddressDetails"', ', ', '"qr_code"', ': ', '{', '"component"', ': ', '"Frame"', ', ', '"title"', ': ', '{', '"component"', ': ', '"Label"', ', ', '"text"', ': ', '"Scan QR code to pair"', '}', ', ', '"content"', ': ', '{', '"component"', ': ', '"Qr"', ', ', '"text"', ': ', '""', '}', ', ', '"button"', ': ', '{', '"component"', ': ', '"Button"', ', ', '"icon"', ': ', 'true', '}', '}', '}', '}'], 'thp_pairing_code_entry_code': 417041}>
fixing problem 2:
UI client assumes that
dataObject.responseis a string but in case of debug state it is an objectexample: send JSON to server