Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

-bip148 option #10532

Closed
wants to merge 17 commits into from
Closed

-bip148 option #10532

wants to merge 17 commits into from

Conversation

earonesty
Copy link

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
Copy link
Member

luke-jr commented Jun 5, 2017

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

@laanwj
Copy link
Member

laanwj 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....

@jnewbery
Copy link
Contributor

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
Copy link
Member

luke-jr commented Jun 14, 2017

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

@luke-jr luke-jr force-pushed the bip148 branch 2 times, most recently from 03f2d8b to f8b9080 Compare June 15, 2017 03:23
@karelbilek
Copy link
Contributor

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
Copy link
Member

luke-jr commented Jul 3, 2017

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

@laanwj
Copy link
Member

laanwj commented Jul 3, 2017

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

@karelbilek
Copy link
Contributor

karelbilek commented Jul 3, 2017

@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
Copy link
Member

luke-jr commented Jul 3, 2017

Either should be fine.

luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Jul 4, 2017
Basic functional test for behaviour with -bip148 flag.

Github-Pull: bitcoin#10532
Rebased-From: a050dab870e5c2fc4ee801fa3a4d87bd8c6aa38e
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Jul 4, 2017
Github-Pull: bitcoin#10532
Rebased-From: a170d5f8bdae0f17b4b9c575b159015a538e1166
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 4, 2017
Github-Pull: bitcoin#10532
Rebased-From: 349f5e92961d057c06cca29538ef270a521995eb
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 4, 2017
…ny blocks

Github-Pull: bitcoin#10532
Rebased-From: 824d9e1f5c44a5f63bde870542ffd2e04dc0abca
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
Github-Pull: bitcoin#10532
Rebased-From: 8f8ee034f6265e34b467ba7d558636f4fcff9e76

Rebased-From: 7ab3e4b
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
Github-Pull: bitcoin#10532
Rebased-From: 54f292ba0bf3a6844c83ad3b5fbc720f68bda419

Rebased-From: 4fb5da5
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
Github-Pull: bitcoin#10532
Rebased-From: 8b997ed656713ab959ddca651395c3ac7703580d

Rebased-From: 04dca27
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
…pruned, error immediately, rather than silently fail to rewind

Github-Pull: bitcoin#10532
Rebased-From: b59c910

Rebased-From: 6048d3e
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
Github-Pull: bitcoin#10532
Rebased-From: cd74a23fcf9588199e196ab31bc64972400c2027

Rebased-From: 19d638e
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
… risk

Github-Pull: bitcoin#10532
Rebased-From: e42a2f6beb61df3e3a201804cf3bcce6b00c88ba

Rebased-From: 8c6816f
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
Basic functional test for behaviour with -bip148 flag.

Github-Pull: bitcoin#10532
Rebased-From: a050dab870e5c2fc4ee801fa3a4d87bd8c6aa38e

Rebased-From: 493f3ef
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
Github-Pull: bitcoin#10532
Rebased-From: a170d5f8bdae0f17b4b9c575b159015a538e1166

Rebased-From: 181a850
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
Github-Pull: bitcoin#10532
Rebased-From: 349f5e92961d057c06cca29538ef270a521995eb

Rebased-From: 94923d5
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jul 17, 2017
…ny blocks

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

Rebased-From: 08c5702
@btcdrak
Copy link
Contributor

btcdrak commented Aug 10, 2017

This can be closed now.

@maflcko maflcko closed this Aug 10, 2017
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet