/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

-bip148 option #10532

Closed
wants to merge 17 commits into
from

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Consensus
Projects
None yet
Milestone
No milestone
@earonesty

earonesty commented Jun 5, 2017

This is based on luke-jr's "non-dos(100)" version of the code, it is mutually exclusive with #10442. More discussion is in #10428.
@luke-jr
Member

luke-jr commented Jun 5, 2017

For reference, just the DoS rework/fixes are in #10512

@fanquake fanquake added the Consensus label Jun 6, 2017

@laanwj
Owner

laanwj commented Jun 7, 2017 •
Edited 1 time

Travis failure is due to

WARNING! The following scripts are not being run: ['bip148-segwit-uasf.py']. Check the test lists in test_runner.py.

I think....
@jnewbery
Member

jnewbery commented Jun 7, 2017

Travis failure is due to WARNING! The following scripts are not being run: ['bip148-segwit-uasf.py']. Check the test lists in test_runner.py. I think....

Correct - on Travis it's a failure condition to have a functional test that isn't included in either BASE_SCRIPTS or EXTENDED_SCRIPTS in test_runner.py
@luke-jr
Member

luke-jr commented Jun 14, 2017

Rebased on top of #10593 and #10594, and fixed test issues.

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Define a service bit for BIP148 
Github-Pull: #10532
Rebased-From: cd74a23
99ac608

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@mkwia @luke-jr
Add BIP148 UASF logic 
Github-Pull: #10532
Rebased-From: 1e5bac3
2259392

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@earonesty @luke-jr
Add a -bip148 option 
Github-Pull: #10532
Rebased-From: 8f8ee03
1cbc2b4

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Add BIP148 indicator to user agent comments 
Github-Pull: #10532
Rebased-From: ed00846
b61c5c3

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@ajtowns @luke-jr
bip148: functional test 
Basic functional test for behaviour with -bip148 flag.

Github-Pull: #10532
Rebased-From: a050dab
a6628d2

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@ajtowns @luke-jr
bip148: ensure nodes are synced prior to bip148 date 
Github-Pull: #10532
Rebased-From: a170d5f
40824b8

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Test: Fix bip148-segwit-uasf.py 
Github-Pull: #10532
Rebased-From: 349f5e9
fb3af14

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Move BIP148 logic into dedicated CheckBIP148 function 
Github-Pull: #10532
Rebased-From: 54f292b
6ec6ec9

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed
72c782a

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6
c922d3e

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Define a service bit for BIP148 
Github-Pull: #10532
Rebased-From: cd74a23
f4935f8

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@mkwia @luke-jr
Add BIP148 UASF logic 
Github-Pull: #10532
Rebased-From: 1e5bac3
c1224e9

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@earonesty @luke-jr
Add a -bip148 option 
Github-Pull: #10532
Rebased-From: 8f8ee03
81b2530

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Add BIP148 indicator to user agent comments 
Github-Pull: #10532
Rebased-From: ed00846
9213b04

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@ajtowns @luke-jr
bip148: functional test 
Basic functional test for behaviour with -bip148 flag.

Github-Pull: #10532
Rebased-From: a050dab
005adab

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@ajtowns @luke-jr
bip148: ensure nodes are synced prior to bip148 date 
Github-Pull: #10532
Rebased-From: a170d5f
76e8e66

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Test: Fix bip148-segwit-uasf.py 
Github-Pull: #10532
Rebased-From: 349f5e9
858ec27

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Move BIP148 logic into dedicated CheckBIP148 function 
Github-Pull: #10532
Rebased-From: 54f292b
a741919

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed
ee7c551

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6
80051aa

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@luke-jr
doc/bips: Add BIP148 
Github-Pull: #10532
Rebased-From: 1115b02
90db770

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 18, 2017

@luke-jr
Test: Fix bip148-segwit-uasf.py 
Github-Pull: #10532
Rebased-From: 349f5e9
dd81bc4

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 18, 2017

@luke-jr
Move BIP148 logic into dedicated CheckBIP148 function 
Github-Pull: #10532
Rebased-From: 54f292b
61d9c50

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 18, 2017

@luke-jr
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed
0b27414

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 18, 2017

@luke-jr
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6
6194aab

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 18, 2017

@luke-jr
doc/bips: Add BIP148 
Github-Pull: #10532
Rebased-From: 1115b02
f4f00ad

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 18, 2017

@luke-jr
Test/bip148-segwit-uasf.py: Check UA comments 
Github-Pull: #10532
Rebased-From: 57ce035
b657cab

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Define a service bit for BIP148 
Github-Pull: #10532
Rebased-From: cd74a23
925b3f0

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6
b5b5fb3

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Move BIP148 logic into dedicated CheckBIP148 function 
Github-Pull: #10532
Rebased-From: 54f292b
178299d

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed
011415b

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Move BIP148 logic into dedicated CheckBIP148 function 
Github-Pull: #10532
Rebased-From: 54f292b
1a9af91

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed
fe2095e

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Define a service bit for BIP148 
Github-Pull: #10532
Rebased-From: cd74a23
c510b99

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6
50ef0dc

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6
3edeff8

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 19, 2017

@luke-jr
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed
c68f772

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 20, 2017

@earonesty @luke-jr
Add a -bip148 option 
Github-Pull: #10532
Rebased-From: 8f8ee03
7ab3e4b

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 20, 2017

@luke-jr
Move BIP148 logic into dedicated CheckBIP148 function 
Github-Pull: #10532
Rebased-From: 54f292b
4fb5da5

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 20, 2017

@luke-jr
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed
04dca27

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 20, 2017

@luke-jr
Define a service bit for BIP148 
Github-Pull: #10532
Rebased-From: cd74a23
19d638e

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 20, 2017

@luke-jr
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6
8c6816f
@luke-jr
When we find an invalid block violating BIP148 that has already been … 
…pruned, error immediately, rather than silently fail to rewind
b59c910

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 22, 2017

@luke-jr
When we find an invalid block violating BIP148 that has already been … 
…pruned, error immediately, rather than silently fail to rewind

Github-Pull: #10532
Rebased-From: b59c910
6048d3e
@ABISprotocol

ABISprotocol commented Jul 3, 2017

Concurrence on something that would allow user to opt-in would be grand. Cheers
@runn1ng
Contributor

runn1ng commented Jul 3, 2017

Is this branch actively maintained / usable / recommended?

Is there a reason why it's not in the upstream? (I don't follow bitcoin-dev mailing list)
@luke-jr
Member

luke-jr commented Jul 3, 2017

@runn1ng For now, I would recommend users upgrade to https://github.com/UASF/bitcoin/
@laanwj
Owner

laanwj commented Jul 3, 2017 •
Edited 1 time

Yes, the UASF branch is there, this one doesn't seem to be maintained actively (not even the travis issue has been fixed).
@runn1ng
Contributor

runn1ng commented Jul 3, 2017 •
Edited 1 time

@luke-jr Thanks! Would you recommend to use 0.14-BIP148 branch directly, or the v0.14.2-uasfsegwit0.3 tag (which is a little behind, but is the last "release")?
@luke-jr
Member

luke-jr commented Jul 3, 2017

Either should be fine.

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 4, 2017

@ajtowns @luke-jr
bip148: functional test 
Basic functional test for behaviour with -bip148 flag.

Github-Pull: #10532
Rebased-From: a050dab
493f3ef

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 4, 2017

@ajtowns @luke-jr
bip148: ensure nodes are synced prior to bip148 date 
Github-Pull: #10532
Rebased-From: a170d5f
181a850

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 4, 2017

@luke-jr
Test: Fix bip148-segwit-uasf.py 
Github-Pull: #10532
Rebased-From: 349f5e9
94923d5

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 4, 2017

@luke-jr
Bugfix: tests/bip148-segwit-uasf: Initialise mocktime before mining a… 
…ny blocks

Github-Pull: #10532
Rebased-From: 824d9e1f5c44a5f63bde870542ffd2e04dc0abca
08c5702

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@earonesty @luke-jr
Add a -bip148 option 
Github-Pull: #10532
Rebased-From: 8f8ee03

Rebased-From: 7ab3e4b
f55b7a3

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@luke-jr
Move BIP148 logic into dedicated CheckBIP148 function 
Github-Pull: #10532
Rebased-From: 54f292b

Rebased-From: 4fb5da5
6d4857b

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@luke-jr
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed

Rebased-From: 04dca27
36831c7

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@luke-jr
When we find an invalid block violating BIP148 that has already been … 
…pruned, error immediately, rather than silently fail to rewind

Github-Pull: #10532
Rebased-From: b59c910

Rebased-From: 6048d3e
5916e3c

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@luke-jr
Define a service bit for BIP148 
Github-Pull: #10532
Rebased-From: cd74a23

Rebased-From: 19d638e
ab8307a

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@luke-jr
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6

Rebased-From: 8c6816f
c3d1ee1

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@ajtowns @luke-jr
bip148: functional test 
Basic functional test for behaviour with -bip148 flag.

Github-Pull: #10532
Rebased-From: a050dab

Rebased-From: 493f3ef
f4d7c81

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@ajtowns @luke-jr
bip148: ensure nodes are synced prior to bip148 date 
Github-Pull: #10532
Rebased-From: a170d5f

Rebased-From: 181a850
e760e78

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@luke-jr
Test: Fix bip148-segwit-uasf.py 
Github-Pull: #10532
Rebased-From: 349f5e9

Rebased-From: 94923d5
0edf74c

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017

@luke-jr
Bugfix: tests/bip148-segwit-uasf: Initialise mocktime before mining a… 
…ny blocks

Github-Pull: #10532
Rebased-From: 824d9e1f5c44a5f63bde870542ffd2e04dc0abca

Rebased-From: 08c5702
ddb4393
@btcdrak
Member

btcdrak commented Aug 10, 2017

This can be closed now.

@MarcoFalke MarcoFalke closed this Aug 10, 2017

runn1ng added a commit to satoshilabs/bitcoin that referenced this pull request Sep 15, 2017

@earonesty @runn1ng
Add a -bip148 option 
Github-Pull: #10532
Rebased-From: 8f8ee03
64570c1

runn1ng added a commit to satoshilabs/bitcoin that referenced this pull request Sep 15, 2017

@luke-jr @runn1ng
Move BIP148 logic into dedicated CheckBIP148 function 
Github-Pull: #10532
Rebased-From: 54f292b
7e3d4fe

runn1ng added a commit to satoshilabs/bitcoin that referenced this pull request Sep 15, 2017

@luke-jr @runn1ng
Check BIP148 on historical blocks and rewind if necessary 
Github-Pull: #10532
Rebased-From: 8b997ed
a04fd09

runn1ng added a commit to satoshilabs/bitcoin that referenced this pull request Sep 15, 2017

@luke-jr @runn1ng
Define a service bit for BIP148 
Github-Pull: #10532
Rebased-From: cd74a23
5540de0

runn1ng added a commit to satoshilabs/bitcoin that referenced this pull request Sep 15, 2017

@luke-jr @runn1ng
Preferentially peer with nodes enforcing BIP148 to avoid partitioning… 
… risk

Github-Pull: #10532
Rebased-From: e42a2f6
5fa4ff9

runn1ng added a commit to satoshilabs/bitcoin that referenced this pull request Sep 15, 2017

@luke-jr @runn1ng
When we find an invalid block violating BIP148 that has already been … 
…pruned, error immediately, rather than silently fail to rewind

Github-Pull: #10532
Rebased-From: b59c910
9629aff

runn1ng added a commit to satoshilabs/bitcoin that referenced this pull request Sep 15, 2017

@ajtowns @runn1ng
bip148: functional test 
Basic functional test for behaviour with -bip148 flag.

Github-Pull: #10532
Rebased-From: a050dab
9b47565

runn1ng added a commit to satoshilabs/bitcoin that referenced this pull request Sep 15, 2017

@ajtowns @runn1ng
bip148: ensure nodes are synced prior to bip148 date 
Github-Pull: #10532
Rebased-From: a170d5f
2b94c59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment