/bitcoin

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Bugfix: RPC/Mining: GBT should return 1 MB sizelimit before segwit activates #9619

Merged
merged 2 commits into from Feb 20, 2017
+14 −2

Conversation

Reviewers

@jonasschnelli jonasschnelli

Assignees
No one assigned
Labels
Mining RPC/REST/ZMQ
Projects
None yet
Milestone
  0.14.0
7 participants
@luke-jr @jtimon @TheBlueMatt @laanwj @sipa @MarcoFalke @jonasschnelli
@luke-jr
Member

luke-jr commented Jan 23, 2017

Not sure how I missed this when fixing the sigoplimit... Better late than never - maybe.

@jonasschnelli jonasschnelli added Mining RPC/REST/ZMQ labels Jan 24, 2017

@jtimon
Member

jtimon commented Jan 24, 2017

utACK 8b19cc8
@TheBlueMatt
Contributor

TheBlueMatt commented Jan 26, 2017

Can you add this to the existing test-cases? Looks like it should be easy.
@laanwj
Owner

laanwj commented Jan 26, 2017

utACK 8b19cc8, agree that a testcase would be superb.
@sipa
Owner

sipa commented Jan 26, 2017

utACK
@luke-jr
Member

luke-jr commented Feb 2, 2017

Rebased and added tests.
@MarcoFalke
Member

MarcoFalke commented Feb 2, 2017 

	Testing detection of non-standard P2WSH witness
Assertion failed: not(b'bad-txns-vout-negative' == b'bad-witness-nonstandard')

  File "/home/travis/build/bitcoin/bitcoin/build/bitcoin-x86_64-unknown-linux-gnu/qa/rpc-tests/test_framework/test_framework.py", line 145, in main
    self.run_test()
  File "/home/travis/build/bitcoin/bitcoin/build/bitcoin-x86_64-unknown-linux-gnu/qa/rpc-tests/p2p-segwit.py", line 2028, in run_test
    self.test_non_standard_witness()
  File "/home/travis/build/bitcoin/bitcoin/build/bitcoin-x86_64-unknown-linux-gnu/qa/rpc-tests/p2p-segwit.py", line 1905, in test_non_standard_witness
    self.std_node.test_transaction_acceptance(p2wsh_txs[0], True, False, b'bad-witness-nonstandard')
  File "/home/travis/build/bitcoin/bitcoin/build/bitcoin-x86_64-unknown-linux-gnu/qa/rpc-tests/p2p-segwit.py", line 160, in test_transaction_acceptance
    assert_equal(self.last_reject.reason, reason)
  File "/home/travis/build/bitcoin/bitcoin/build/bitcoin-x86_64-unknown-linux-gnu/qa/rpc-tests/test_framework/util.py", line 529, in assert_equal
    raise AssertionError("not(%s)" % " == ".join(str(arg) for arg in (thing1, thing2) + args))
@luke-jr
Member

luke-jr commented Feb 2, 2017

I don't see how that's possible...
@jtimon
Member

jtimon commented Feb 16, 2017 •
Edited 1 time

re-utACK 279f944
@sipa
Owner

sipa commented Feb 16, 2017

utACK for 0.14
@luke-jr
Member

luke-jr commented Feb 16, 2017

( @MarcoFalke Re-run of Travis didn't have the same issue, so I guess p2p-segwit was/is flakey, and that failure was unrelated to this PR.)

@MarcoFalke MarcoFalke added this to the 0.14.0 milestone Feb 18, 2017

@laanwj laanwj merged commit 279f944 into bitcoin:master Feb 20, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Feb 20, 2017

@laanwj
Merge #9619: Bugfix: RPC/Mining: GBT should return 1 MB sizelimit bef… 
…ore segwit activates


279f944 QA: Test GBT size/weight limit values (Luke Dashjr)
9fc7f0b Bugfix: RPC/Mining: GBT should return 1 MB sizelimit before segwit activates (Luke Dashjr)
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
aa791e2

laanwj added a commit that referenced this pull request Feb 20, 2017

@luke-jr @laanwj
Bugfix: RPC/Mining: GBT should return 1 MB sizelimit before segwit ac… 
…tivates

Github-Pull: #9619
Rebased-From: 9fc7f0b
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
6552729

laanwj added a commit that referenced this pull request Feb 20, 2017

@luke-jr @laanwj
QA: Test GBT size/weight limit values 
Github-Pull: #9619
Rebased-From: 279f944
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
861cb0c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment