fix bug in enforcing nil-termination of new AGG_SIG_* conditions #270
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
arvidn
commented
Sep 22, 2023
| @@ -186,7 +186,7 @@ pub fn parse_args( | |||
| // AGG_SIG_* take two parameters | |||
|
|
|||
| if (flags & STRICT_ARGS_COUNT) != 0 { | |||
| check_nil(a, c)?; | |||
| check_nil(a, rest(a, c)?)?; | |||
There was a problem hiding this comment.
this is the bugfix. the nil-terminator is expected to be the next item in the list, not the last cons-cell.
The rest are extended tests to cover this and possible other differences in mempool-mode and consensus-mode
arvidn
force-pushed
the
fix-new-agg-sig-parse-bug
branch
from
1929b0c
to
d7426a5
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 fixes a bug when parsing the new
AGG_SIG_*conditions in mempool mode.The affected conditions are:
AGG_SIG_PARENTAGG_SIG_PUZZLEAGG_SIG_AMOUNTAGG_SIG_PUZZLE_AMOUNTAGG_SIG_PARENT_PUZZLEAGG_SIG_PARENT_AMOUNTIn mempool mode, we require the exact correct number of arguments to be passed to conditions. Whereas in consensus mode we're more forgiving, to allow for soft-forks. The test for an NIL-terminator was incorrect and always looked at the last cons cell, not the last item in the list. This made this test fail unconditionally.
The bulk of this change is to extend the tests to cover this case.
The original feature landed here: #213
This PR is targeting a new branch called
release-0.2.11which was cut off of the most recent0.2.10release, to avoid pulling in any other changes for this release.