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.

Sign up for GitHub

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

Jump to bottom

Segregated witness rebased #8149

Merged
merged 27 commits into from
Jun 24, 2016
Merged

Segregated witness rebased #8149

merged 27 commits into from
Jun 24, 2016

Commits on Jun 22, 2016

  1. --- [SEGWIT] begin: P2P/node/consensus ---

    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    ecacfd9 View commit details
    Browse the repository at this point in the history

  2. BIP144: Serialization, hashes, relay (sender side) 

    Contains refactorings by Eric Lombrozo.
Contains fixup by Nicolas Dorier.
Contains cleanup of CInv::GetCommand by Alex Morcos
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    7030d9e View commit details
    Browse the repository at this point in the history

  3. BIP141: Witness program

    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    449f9b8 View commit details
    Browse the repository at this point in the history

  4. BIP141: Commitment structure and deployment 

    Includes a fix by Suhas Daftuar and LongShao007
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    8b49040 View commit details
    Browse the repository at this point in the history

  5. BIP144: Handshake and relay (receiver side) 

    Service bit logic by Nicolas Dorier.

Only download blocks from witness peers after fork.
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    b8a9749 View commit details
    Browse the repository at this point in the history

  6. Refactor script validation to observe amounts 

    This is a preparation for BIP143 support.
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    0ef1dd3 View commit details
    Browse the repository at this point in the history

  7. BIP143: Verification logic 

    Includes simplifications by Eric Lombrozo.
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    3dd4102 View commit details
    Browse the repository at this point in the history

  8. [RPC] Return witness data in blockchain RPCs 

    Includes RPC field name changes by Luke-jr.
    @jl2012 @sipa
    jl2012 authored and sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    7c4bf77 View commit details
    Browse the repository at this point in the history

  9. BIP141: Other consensus critical limits, and BIP145 

    Includes changes by Suhas Daftuar, Luke-jr, and mruddy.
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    2b1f6f9 View commit details
    Browse the repository at this point in the history

  10. [libconsensus] Script verification API with amounts 

    script_tests: always test bitcoinconsensus_verify_script_with_amount if VERIFY_WITNESS isn't set

Rename internal method + make it static

trim bitcoinconsensus_ prefix

Add SERIALIZE_TRANSACTION_WITNESS flag
    @afk11 @sipa
    afk11 authored and sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    b7dbeb2 View commit details
    Browse the repository at this point in the history

  11. Add rewind logic to deal with post-fork software updates 

    Includes logic for dealing with pruning by Suhas Daftuar.
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    6032f69 View commit details
    Browse the repository at this point in the history

  12. Do not use compact blocks when segwit is enabled

    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    af87a67 View commit details
    Browse the repository at this point in the history

  13. --- [SEGWIT] begin: wallet ---

    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    9757b57 View commit details
    Browse the repository at this point in the history

  14. BIP143: Signing logic

    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    605e847 View commit details
    Browse the repository at this point in the history

  15. [RPC] Add wallet support for witness transactions (using P2SH) 

    Includes support for pushkeyhash wit v0 by Alex Morcos.
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    f4691ab View commit details
    Browse the repository at this point in the history

  16. [RPC] signrawtransaction can sign P2WSH

    @NicolasDorier @sipa
    NicolasDorier authored and sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    745eb67 View commit details
    Browse the repository at this point in the history

  17. --- [SEGWIT] begin: tests ---

    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    978e200 View commit details
    Browse the repository at this point in the history

  18. [qa] Witness version 0 signing unit tests

    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    0aa9207 View commit details
    Browse the repository at this point in the history

  19. [qa] Add transaction tests for segwit 

    Including BIP143 P2WSH examples by jl2012.
    @NicolasDorier @sipa
    NicolasDorier authored and sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    00f46cb View commit details
    Browse the repository at this point in the history

  20. [qa] Add segwit support to script_tests 

    Contains fix by Johnson Lau.
    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    06d3805 View commit details
    Browse the repository at this point in the history

  21. [qa] Autogeneration support for witness in script_tests

    @sipa
    sipa committed Jun 22, 2016
    1 Configuration menu
    Copy the full SHA
    66cca79 View commit details
    Browse the repository at this point in the history

  22. [qa] Add rpc test for segwit 

    Amended by Pieter Wuille to use multisig 1-of-1 for P2WSH tests, and BIP9
based switchover logic.

Fixes and py3 conversion by Marco Falke.
    @morcos @sipa
    morcos authored and sipa committed Jun 22, 2016
    1 Configuration menu
    Copy the full SHA
    4f7ff00 View commit details
    Browse the repository at this point in the history

  23. [qa] p2p segwit tests 

    mininode now supports witness transactions/blocks, blocktools
has a helper for adding witness commitments to blocks, and script
has a function to calculate hashes for signature under sigversion
1, used by segwit.

Py3 conversion by Marco Falke

Test to make sure upgraded nodes don't ask for non-wit blocks by
Gregory Sanders.
    @sdaftuar @sipa
    sdaftuar authored and sipa committed Jun 22, 2016
    1 Configuration menu
    Copy the full SHA
    330b0f3 View commit details
    Browse the repository at this point in the history

  24. [qa] script_tests: witness tests can specify tx amount 

    Add tests that witness signatures cover value
    @sdaftuar @sipa
    sdaftuar authored and sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    d846e02 View commit details
    Browse the repository at this point in the history

  25. [qa] Add GetTransactionSigOpCost unit tests

    @jonasnick @sipa
    jonasnick authored and sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    fdb43df View commit details
    Browse the repository at this point in the history

  26. --- [SEGWIT] begin: deployment ---

    @sipa
    sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    070dbc4 View commit details
    Browse the repository at this point in the history

  27. BIP9 parameters for testnet

    @jl2012 @sipa
    jl2012 authored and sipa committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    f852813 View commit details
    Browse the repository at this point in the history