Bugfix: RPC/Mining: Use pre-segwit sigops and limits, when working with non-segwit GBT clients #10595
Conversation
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
|
utACK 4292a75 |
4292a75 to
e36493b
Compare
|
Rebased. At this point, it might make sense to just drop support for pre-segwit miners, but this fix is simple, so it makes sense to get in (and backportable) first. |
jnewbery
reviewed
Oct 15, 2018
test/functional/feature_segwit.py
Outdated
| @@ -225,6 +225,13 @@ def run_test(self): | |||
| # Now try calling getblocktemplate() without segwit support. | |||
| template = self.nodes[0].getblocktemplate() | |||
|
|
|||
| # Check that we got a pre-Segwit template | |||
| assert(template['sizelimit'] == 1000000) | |||
There was a problem hiding this comment.
nit: prefer assert_equal() for asserting equality
test/functional/feature_segwit.py
Outdated
| @@ -225,6 +225,13 @@ def run_test(self): | |||
| # Now try calling getblocktemplate() without segwit support. | |||
| template = self.nodes[0].getblocktemplate() | |||
|
|
|||
| # Check that we got a pre-Segwit template | |||
| assert(template['sizelimit'] == 1000000) | |||
| assert('weightlimit' not in template) | |||
There was a problem hiding this comment.
nit: assert is a statement, not a function. Please remove parens.
…th non-segwit GBT clients
e36493b to
a5464ad
Compare
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
|
This has been "fixed" by
|
| Needs rebase |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.