Set correct options when signing with Ledger #461
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
danielailie
approved these changes
Jan 13, 2025
andreibancioiu
approved these changes
Jan 13, 2025
| @@ -96,6 +96,8 @@ def __init__(self, account_index: int = 0, address_index: int = 0) -> None: | |||
| def sign_transaction(self, transaction: ITransaction) -> str: | |||
| ledger_version = do_get_ledger_version() | |||
| should_use_hash_signing = compare_versions(ledger_version, SIGN_USING_HASH_VERSION) >= 0 | |||
|
|
|||
There was a problem hiding this comment.
Can we do something (in the next PR) about the mypy / reviewdog warnings shown in PRs?
| tx.signature = bytes.fromhex(account.sign_transaction(tx)) | ||
| tx = sign_tx_by_guardian(args, tx) | ||
| tx = sign_tx_by_guardian(args, tx, guardian_account) |
There was a problem hiding this comment.
In another PR, maybe we can follow the same pattern as above (as for signature) i.e. tx.guardianSignature =
| tx.relayer_signature = bytes.fromhex(relayer_account.sign_transaction(tx)) | ||
| except NoWalletProvided: | ||
| logger.warning("Relayer wallet not provided. Transaction will not be signed by relayer.") | ||
| except IncorrectWalletError: | ||
| raise IncorrectWalletError("Relayer wallet does not match the relayer's address set in the transaction.") | ||
|
|
||
| try: | ||
| guardian_account = get_guardian_account_from_args(args) | ||
| if isinstance(guardian_account, LedgerAccount): |
There was a problem hiding this comment.
Can also extract it to a function such as _apply_options_for_hash_signing_if_appropriate(account, tx), since this logic is applied in three places (a bit of duplication).
There was a problem hiding this comment.
will do in a future PR.
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.