Fix transaction re-signing #554
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| import logging | ||
| import sys | ||
| from argparse import FileType | ||
| from copy import deepcopy | ||
| from functools import cache | ||
| from getpass import getpass | ||
| from pathlib import Path | ||
|
|
@@ -862,6 +863,8 @@ def alter_transaction_and_sign_again_if_needed( | |
| sender: IAccount, | ||
| guardian_and_relayer_data: GuardianRelayerData, | ||
| ): | ||
| initial_tx = deepcopy(tx) | ||
|
|
||
| set_options_for_hash_signing_if_needed( | ||
| transaction=tx, | ||
| guardian=guardian_and_relayer_data.guardian, | ||
|
|
@@ -870,6 +873,7 @@ def alter_transaction_and_sign_again_if_needed( | |
|
|
||
| altered = _alter_version_and_options_if_provided( | ||
| args=args, | ||
| initial_tx=initial_tx, | ||
| transaction=tx, | ||
| ) | ||
|
|
||
|
|
@@ -883,13 +887,20 @@ def alter_transaction_and_sign_again_if_needed( | |
|
|
||
| def _alter_version_and_options_if_provided( | ||
| args: Any, | ||
| initial_tx: Transaction, | ||
|
Contributor
There was a problem hiding this comment. Naming inconsistency. |
||
| transaction: Transaction, | ||
| ) -> bool: | ||
| """Alters the transaction version and options if they are provided in args. | ||
| Returns True if any alteration was made, False otherwise. | ||
| """ | ||
| altered = False | ||
|
|
||
| if initial_tx.version != transaction.version: | ||
| altered = True | ||
|
|
||
| if initial_tx.options != transaction.options: | ||
| altered = True | ||
|
Comment on lines
+898
to
+902
There was a problem hiding this comment. The logic checks for changes between initial_tx and transaction before any explicit alterations are made. This creates a redundant check since at this point in the function, transaction should be identical to initial_tx. Consider moving these checks after the explicit alteration logic (lines 904-910) to properly detect all changes. |
||
|
|
||
| if args.version != DEFAULT_TX_VERSION and transaction.version != args.version: | ||
| transaction.version = args.version | ||
| altered = True | ||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Naming inconsistency,
txvs.transaction.