commands: increment address index if current value used for new spend #963
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
darosior
reviewed
Feb 7, 2024
| @@ -261,7 +261,7 @@ impl DaemonControl { | |||
| addr_info: &Option<AddrInfo>, | |||
| ) { | |||
| if let Some(AddrInfo { index, is_change }) = addr_info { | |||
| if *is_change && db_conn.change_index() < *index { | |||
| if *is_change && db_conn.change_index() <= *index { | |||
There was a problem hiding this comment.
Should also fix the check against receive index right below?
There was a problem hiding this comment.
Ah yes, I'll take a look.
There was a problem hiding this comment.
I've now made this fix for the receive index and updated the functional tests.
I didn't test for this in the rust tests as derivation_index_by_address returns None in the dummy DB and so we don't enter the affected function in relation to receive addresses (we do enter the affected function for change addresses that have been generated within create_spend).
jp1ac4
changed the title
jp1ac4
force-pushed
the
commands-increment-index-if-values-equal
branch
from
d562c4e to
323470d
Compare
|
Rebased on master. |
|
ACK 323470d -- great catch, thanks. |
darosior
force-pushed
the
commands-increment-index-if-values-equal
branch
from
323470d to
3a12ea0
Compare
|
Rebased on master. |
|
re-ACK bfd6ca5 |
This is a fix to ensure the change index in the database is incremented if a new spend is created with a change address derived from the current index, regardless of whether this new spend is broadcast or not.
This is a similar fix as for the change index.
darosior
force-pushed
the
commands-increment-index-if-values-equal
branch
from
3a12ea0 to
bfd6ca5
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.
This is a fix to ensure the change index in the database is incremented if a new spend is created with a change address derived from the current index, regardless of whether this new spend is broadcast or not.
EDIT: The same fix has been applied to the receive index.