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

[WIP] Segregated witness code #8

Closed
wants to merge 65 commits into from
Closed

[WIP] Segregated witness code #8

wants to merge 65 commits into from

Commits on Jan 18, 2016

  1. Configuration menu
    Copy the full SHA
    4b8d2bc View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2016

  1. Rename permitrbf to replacebyfee

    "permit" is currently used to configure transaction filtering, whereas replacement is more to do with the memory pool state than the transaction itself.
    luke-jr committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    1205f87 View commit details
    Browse the repository at this point in the history
  2. Accept replacebyfee=opt-in for turning on opt-in RBF

    Basic forward-compatibility with more flexible parameters like fss
    luke-jr committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    e8d19ab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5f456a6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b2287a7 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2016

  1. Configuration menu
    Copy the full SHA
    4ad418b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    af9f564 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. Merge bitcoin#7440: [0.12] Rename permitrbf to mempoolreplacement and…

    … provide minimal string-list forward compatibility
    
    af9f564 release-notes: Update for replacebyfee->mempoolreplacement rename (Luke Dashjr)
    4ad418b Rename replacebyfee=opt-in to mempoolreplacement=fee (Luke Dashjr)
    b2287a7 release-notes: Update for permitrbf->replacebyfee rename (Luke Dashjr)
    5f456a6 Simplify check for replacebyfee=opt-in (Luke Dashjr)
    e8d19ab Accept replacebyfee=opt-in for turning on opt-in RBF (Luke Dashjr)
    1205f87 Rename permitrbf to replacebyfee (Luke Dashjr)
    laanwj committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    c76bfff View commit details
    Browse the repository at this point in the history
  2. [qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH

    Github-Pull: bitcoin#7384
    Rebased-From: faa9011
    MarcoFalke authored and laanwj committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    294f432 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a7939f8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b1f031d View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. doc: add PR authors to release notes

    Take full names from github API if available, otherwise
    github username.
    laanwj committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    996c27d View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2016

  1. [doc] Update release-process.md

    Conflicts:
    	doc/release-process.md
    
    Github-Pull: bitcoin#7465
    Rebased-From: fa616c2
    MarcoFalke authored and laanwj committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    b9ed8c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. rpc: Add WWW-Authenticate header to 401 response

    A WWW-Authenticate header must be present in the 401
    response to make clients know that they can authenticate,
    and how.
    
        WWW-Authenticate: Basic realm="jsonrpc"
    
    Fixes bitcoin#7462.
    
    Github-Pull: bitcoin#7472
    Rebased-From: 7c06fbd
    laanwj committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    b2f2b85 View commit details
    Browse the repository at this point in the history
  2. Update nQueuedValidatedHeaders after peer disconnection

    Github-Pull: bitcoin#7482
    Rebased-From: 301bc7b
    sdaftuar authored and laanwj committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    e16f5b4 View commit details
    Browse the repository at this point in the history
  3. release-notes: Mention possibility of priority removal in 0.13, uncer…

    …tainty of priority calculation being changed back, and request community input
    luke-jr committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    73a0375 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    43484d7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    827a2b6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d0dbb6d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3450f4c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b460004 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. wallet: Ignore MarkConflict if block hash is not known

    If number of conflict confirms cannot be determined, this means
    that the block is still unknown or not yet part of the main chain,
    for example during a reindex. Do nothing in that case,
    instead of crash with an assertion.
    
    Fixes bitcoin#7234.
    
    Github-Pull: bitcoin#7491
    Rebased-From: 40e7b61
    laanwj committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    00ec73e View commit details
    Browse the repository at this point in the history
  2. Update the wallet best block marker when pruning

    Github-Pull: bitcoin#7502
    Rebased-From: e4eebb6
    sipa authored and laanwj committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    1329963 View commit details
    Browse the repository at this point in the history
  3. Correctly report high-S violations

    Github-Pull: bitcoin#7500
    Rebased-From: 9d95187
    sipa authored and laanwj committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    889e5b3 View commit details
    Browse the repository at this point in the history
  4. Fix spelling: misbeha{b,v}ing

    Github-Pull: bitcoin#7469
    Rebased-From: 0830552
    pastly authored and laanwj committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    9cb31e6 View commit details
    Browse the repository at this point in the history
  5. [rpc-tests] Change solve() to use rehash

    Github-Pull: bitcoin#7468
    Rebased-From: 7689041
    mrbandrews authored and laanwj committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    947c4ff View commit details
    Browse the repository at this point in the history
  6. Changed getnetworkhps value to double to avoid overflow.

    Github-Pull; bitcoin#7480
    Rebased-From: 993d089
    instagibbs authored and laanwj committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    c3faf78 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    10be44a View commit details
    Browse the repository at this point in the history
  8. qt: Translation update pre-rc5

    laanwj committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    6813426 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7728635 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2016

  1. Merge bitcoin#7346: 0.12 release notes: Mining Policy Changes

    b460004 release-notes: Minor corrections and clarifications re Priority (Luke Dashjr)
    3450f4c release-notes: Significantly rewrite priority transactions section (Gregory Maxwell)
    d0dbb6d release-notes: Remove suggestion to use 0.11 (Luke Dashjr)
    73a0375 release-notes: Mention possibility of priority removal in 0.13, uncertainty of priority calculation being changed back, and request community input (Luke Dashjr)
    4b8d2bc release-notes: Cover priority changes correctly, removing mentions of possible futures (Luke Dashjr)
    laanwj committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    04503f7 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Fix of semantic failure "meet pay"

    "do not meet pay the minimum relay fee" ? I can understand English language quite well, but that I do not understand. So, if it's not an semantic nonsense, I would suggest to write it in more simple English.
    wodry committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    e473c2d View commit details
    Browse the repository at this point in the history
  2. Merge bitcoin#7523: Fix of semantic failure "meet pay"

    e473c2d Fix of semantic failure "meet pay" (wodry)
    laanwj committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    02d707f View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2016

  1. doc: Remove another duplicate author name from release notes

    The list of contributors is automatically generated from git, so people
    that use multiple author names will end up on the list multiple times.
    laanwj committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    b466264 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. Configuration menu
    Copy the full SHA
    ea52530 View commit details
    Browse the repository at this point in the history
  2. Merge bitcoin#7548: Correct duplicate names in release notes

    ea52530 Fix duplicate names in release notes (fanquake)
    laanwj committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    188ca9c View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2016

  1. Testchains: Don't check the genesis block

    Rebased by Pieter Wuille.
    Cleanup by Matt Corallo.
    jtimon authored and sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    efa12a9 View commit details
    Browse the repository at this point in the history
  2. Create segnet

    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    b3f9afd View commit details
    Browse the repository at this point in the history
  3. Add segnet seed nodes

    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    0bee617 View commit details
    Browse the repository at this point in the history
  4. qt: Work (don't crash) with -segnet

    theuni authored and sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    0b6c2e4 View commit details
    Browse the repository at this point in the history
  5. Add segregated witness transaction serialization

    Contains refactorings by Eric Lombrozo.
    Contains fixup by Nicolas Dorier.
    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    1c5149b View commit details
    Browse the repository at this point in the history
  6. Removed ppszTypeName from protocol.cpp

    CodeShark authored and sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    af13f13 View commit details
    Browse the repository at this point in the history
  7. getdata enum issue fix

    CodeShark authored and sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    70b54b6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    33489d6 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9b180e7 View commit details
    Browse the repository at this point in the history
  10. Witness commitment validation

    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    0caed3f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    778d1e4 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    712da91 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    4013d1e View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    ce1766d View commit details
    Browse the repository at this point in the history
  15. Witness script signing

    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    f93a5ba View commit details
    Browse the repository at this point in the history
  16. Signing tests

    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    58625a7 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    ab9ef68 View commit details
    Browse the repository at this point in the history
  18. Add signature version 1 with updated sighash

    Includes simplifications by Eric Lombrozo.
    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    8e01adb View commit details
    Browse the repository at this point in the history
  19. Add witness address RPCs (using P2SH)

    Includes support for pushkeyhash wit v0 by Alex Morcos.
    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    38183e6 View commit details
    Browse the repository at this point in the history
  20. Return witness data

    jl2012 authored and sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    0724fef View commit details
    Browse the repository at this point in the history
  21. Implementing base+wit/4 block size limit rule

    Includes fixup by Suhas Daftuar.
    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    dca8111 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    616e69b View commit details
    Browse the repository at this point in the history
  23. Add rpc test for segwit

    morcos authored and sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    156c41a View commit details
    Browse the repository at this point in the history
  24. SigOp counting in witnesses

    Includes fixup by Thomas Kerin.
    sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    0b08ed9 View commit details
    Browse the repository at this point in the history
  25. bitcoinconsensus: add method that accepts amount, and return error wh…

    …en verify_script receives VERIFY_WITNESS flag
    
    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 authored and sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    2161d22 View commit details
    Browse the repository at this point in the history
  26. Increase MAX_PROTOCOL_MESSAGE_LENGTH

    Witness blocks can be greater than 2MiB, but cannot be validly greater
    than 4MB.
    sdaftuar authored and sipa committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    b002a8c View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    590d715 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    99c8d54 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2016

  1. Configuration menu
    Copy the full SHA
    8aaf8f1 View commit details
    Browse the repository at this point in the history