-bip148 option #10532

pull earonesty wants to merge 17 commits into bitcoin:master from luke-jr:bip148 changing 13 files +409 −24
  1. earonesty commented at 4:24 PM on June 5, 2017: none

    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.

  2. luke-jr commented at 6:07 PM on June 5, 2017: member

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

  3. fanquake added the label Consensus on Jun 6, 2017
  4. laanwj commented at 2:40 PM on June 7, 2017: member

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

  5. jnewbery commented at 3:01 PM on June 7, 2017: member

    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

  6. luke-jr force-pushed on Jun 13, 2017
  7. Bugfix: Don't ban peers just because they have header chains we consider invalid 6fda801559
  8. Instead of DoS banning for invalid blocks, merely disconnect nodes if we're relying on them as a primary node 35433a2cd2
  9. luke-jr force-pushed on Jun 14, 2017
  10. luke-jr commented at 9:54 PM on June 14, 2017: member

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

  11. Bugfix: net: Apply whitelisting criteria to outgoing connections a511b894f3
  12. Merge branch 'whitelist_outgoing' into bip148 c5daa0df1a
  13. luke-jr force-pushed on Jun 15, 2017
  14. luke-jr force-pushed on Jun 15, 2017
  15. Define a service bit for BIP148 fd5ff21212
  16. Add BIP148 UASF logic 3a7f7fecbd
  17. Add a -bip148 option 7afb67d7c0
  18. Add BIP148 indicator to user agent comments 517bb42ebb
  19. bip148: functional test
    Basic functional test for behaviour with -bip148 flag.
    2fbfd1281f
  20. bip148: ensure nodes are synced prior to bip148 date b894fb368a
  21. luke-jr force-pushed on Jun 15, 2017
  22. luke-jr referenced this in commit 99ac6087a1 on Jun 15, 2017
  23. luke-jr referenced this in commit 22593924f4 on Jun 15, 2017
  24. luke-jr referenced this in commit 1cbc2b49a0 on Jun 15, 2017
  25. luke-jr referenced this in commit b61c5c33a8 on Jun 15, 2017
  26. luke-jr referenced this in commit a6628d2663 on Jun 15, 2017
  27. luke-jr referenced this in commit 40824b880f on Jun 15, 2017
  28. luke-jr referenced this in commit fb3af14221 on Jun 15, 2017
  29. luke-jr referenced this in commit 6ec6ec9353 on Jun 15, 2017
  30. luke-jr referenced this in commit 72c782acf1 on Jun 15, 2017
  31. luke-jr referenced this in commit c922d3e1f3 on Jun 15, 2017
  32. luke-jr referenced this in commit f4935f88f1 on Jun 15, 2017
  33. luke-jr referenced this in commit c1224e9592 on Jun 15, 2017
  34. luke-jr referenced this in commit 81b2530bae on Jun 15, 2017
  35. luke-jr referenced this in commit 9213b0423a on Jun 15, 2017
  36. luke-jr referenced this in commit 005adab272 on Jun 15, 2017
  37. luke-jr referenced this in commit 76e8e66de3 on Jun 15, 2017
  38. luke-jr referenced this in commit 858ec27db2 on Jun 15, 2017
  39. luke-jr referenced this in commit a741919757 on Jun 15, 2017
  40. luke-jr referenced this in commit ee7c5514c3 on Jun 15, 2017
  41. luke-jr referenced this in commit 80051aae52 on Jun 15, 2017
  42. luke-jr referenced this in commit 90db7704fe on Jun 15, 2017
  43. Test: Fix bip148-segwit-uasf.py 6bf37b3762
  44. Move BIP148 logic into dedicated CheckBIP148 function 649314e643
  45. Check BIP148 on historical blocks and rewind if necessary a2762bf3bc
  46. Preferentially peer with nodes enforcing BIP148 to avoid partitioning risk 0ee869709b
  47. doc/bips: Add BIP148 64706f2eea
  48. Test/bip148-segwit-uasf.py: Check UA comments 57ce0351d8
  49. luke-jr referenced this in commit dd81bc4457 on Jun 18, 2017
  50. luke-jr referenced this in commit 61d9c508cd on Jun 18, 2017
  51. luke-jr referenced this in commit 0b274145af on Jun 18, 2017
  52. luke-jr referenced this in commit 6194aab982 on Jun 18, 2017
  53. luke-jr referenced this in commit f4f00ad3df on Jun 18, 2017
  54. luke-jr referenced this in commit b657cab9d0 on Jun 18, 2017
  55. luke-jr referenced this in commit 925b3f0f38 on Jun 19, 2017
  56. luke-jr referenced this in commit b5b5fb375b on Jun 19, 2017
  57. luke-jr referenced this in commit 178299d0e3 on Jun 19, 2017
  58. luke-jr referenced this in commit 011415b16e on Jun 19, 2017
  59. luke-jr referenced this in commit 1a9af914ff on Jun 19, 2017
  60. luke-jr referenced this in commit fe2095edbd on Jun 19, 2017
  61. luke-jr referenced this in commit c510b9934e on Jun 19, 2017
  62. luke-jr referenced this in commit 50ef0dc976 on Jun 19, 2017
  63. luke-jr referenced this in commit 3edeff84a1 on Jun 19, 2017
  64. luke-jr referenced this in commit c68f7724c4 on Jun 19, 2017
  65. luke-jr referenced this in commit 7ab3e4baa9 on Jun 20, 2017
  66. luke-jr referenced this in commit 4fb5da5a9e on Jun 20, 2017
  67. luke-jr referenced this in commit 04dca27a9b on Jun 20, 2017
  68. luke-jr referenced this in commit 19d638e817 on Jun 20, 2017
  69. luke-jr referenced this in commit 8c6816fc82 on Jun 20, 2017
  70. When we find an invalid block violating BIP148 that has already been pruned, error immediately, rather than silently fail to rewind b59c910ff5
  71. luke-jr force-pushed on Jun 22, 2017
  72. luke-jr referenced this in commit 6048d3efb3 on Jun 22, 2017
  73. ABISprotocol commented at 2:49 AM on July 3, 2017: none

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

  74. karelbilek commented at 11:54 AM on July 3, 2017: 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)

  75. luke-jr commented at 12:45 PM on July 3, 2017: member

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

  76. laanwj commented at 12:46 PM on July 3, 2017: member

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

  77. karelbilek commented at 1:09 PM on July 3, 2017: contributor

    @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")?

  78. luke-jr commented at 7:08 PM on July 3, 2017: member

    Either should be fine.

  79. luke-jr referenced this in commit 493f3ef678 on Jul 4, 2017
  80. luke-jr referenced this in commit 181a850d3b on Jul 4, 2017
  81. luke-jr referenced this in commit 94923d5236 on Jul 4, 2017
  82. luke-jr referenced this in commit 08c570280a on Jul 4, 2017
  83. luke-jr referenced this in commit f55b7a395b on Jul 17, 2017
  84. luke-jr referenced this in commit 6d4857bbe5 on Jul 17, 2017
  85. luke-jr referenced this in commit 36831c7484 on Jul 17, 2017
  86. luke-jr referenced this in commit 5916e3c59b on Jul 17, 2017
  87. luke-jr referenced this in commit ab8307a510 on Jul 17, 2017
  88. luke-jr referenced this in commit c3d1ee13a5 on Jul 17, 2017
  89. luke-jr referenced this in commit f4d7c81bef on Jul 17, 2017
  90. luke-jr referenced this in commit e760e78938 on Jul 17, 2017
  91. luke-jr referenced this in commit 0edf74cd7d on Jul 17, 2017
  92. luke-jr referenced this in commit ddb4393cf5 on Jul 17, 2017
  93. btcdrak commented at 8:25 AM on August 10, 2017: contributor

    This can be closed now.

  94. MarcoFalke closed this on Aug 10, 2017
  95. karelbilek referenced this in commit 64570c18e6 on Sep 15, 2017
  96. karelbilek referenced this in commit 7e3d4fe9c0 on Sep 15, 2017
  97. karelbilek referenced this in commit a04fd09dab on Sep 15, 2017
  98. karelbilek referenced this in commit 5540de0cda on Sep 15, 2017
  99. karelbilek referenced this in commit 5fa4ff990c on Sep 15, 2017
  100. karelbilek referenced this in commit 9629aff15d on Sep 15, 2017
  101. karelbilek referenced this in commit 9b475656ee on Sep 15, 2017
  102. karelbilek referenced this in commit 2b94c5958a on Sep 15, 2017
  103. DrahtBot locked this on Sep 8, 2021
Contributors
earonestyluke-jrlaanwjjnewberyABISprotocolkarelbilekbtcdrak
Labels
Consensus
Linked (view graph)
#10428 -bip148 option#10442 add a -bip148 option
github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-19 03:15 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me