Code

Segregated witness rebased#8149

Code

Merged

laanwj merged 27 commits intobitcoin:masterbitcoin/bitcoin:masterfrom sipa:segwit-master2sipa/bitcoin:segwit-master2Copy head branch name to clipboardJun 24, 2016

+5,305-571

Commits

Commits on Jun 22, 2016

• --- [SEGWIT] begin: P2P/node/consensus ---

  sipa

  committed
  ecacfd9

• BIP144: Serialization, hashes, relay (sender side)

  Show description for 7030d9e
  sipa

  committed
  7030d9e

• BIP141: Witness program

  sipa

  committed
  449f9b8

• BIP141: Commitment structure and deployment

  Show description for 8b49040
  sipa

  committed
  8b49040

• BIP144: Handshake and relay (receiver side)

  Show description for b8a9749
  sipa

  committed
  b8a9749

• Refactor script validation to observe amounts

  Show description for 0ef1dd3
  sipa

  committed
  0ef1dd3

• BIP143: Verification logic

  Show description for 3dd4102
  sipa

  committed
  3dd4102

• [RPC] Return witness data in blockchain RPCs

  Show description for 7c4bf77
  

  jl2012

  authored and

  sipa

  committed
  7c4bf77

• BIP141: Other consensus critical limits, and BIP145

  Show description for 2b1f6f9
  sipa

  committed
  2b1f6f9

• [libconsensus] Script verification API with amounts

  Show description for b7dbeb2
  

  afk11

  authored and

  sipa

  committed
  b7dbeb2

• Add rewind logic to deal with post-fork software updates

  Show description for 6032f69
  sipa

  committed
  6032f69

• Do not use compact blocks when segwit is enabled

  sipa

  committed
  af87a67

• --- [SEGWIT] begin: wallet ---

  sipa

  committed
  9757b57

• BIP143: Signing logic

  sipa

  committed
  605e847

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

  Show description for f4691ab
  sipa

  committed
  f4691ab

• [RPC] signrawtransaction can sign P2WSH

  

  NicolasDorier

  authored and

  sipa

  committed
  745eb67

• --- [SEGWIT] begin: tests ---

  sipa

  committed
  978e200

• [qa] Witness version 0 signing unit tests

  sipa

  committed
  0aa9207

• [qa] Add transaction tests for segwit

  Show description for 00f46cb
  

  NicolasDorier

  authored and

  sipa

  committed
  00f46cb

• [qa] Add segwit support to script_tests

  Show description for 06d3805
  sipa

  committed
  06d3805

• [qa] Autogeneration support for witness in script_tests

  sipa

  committed
  66cca79

• [qa] Add rpc test for segwit

  Show description for 4f7ff00
  

  morcos

  authored and

  sipa

  committed
  4f7ff00

• [qa] p2p segwit tests

  Show description for 330b0f3
  

  sdaftuar

  authored and

  sipa

  committed
  330b0f3

• [qa] script_tests: witness tests can specify tx amount

  Show description for d846e02
  

  sdaftuar

  authored and

  sipa

  committed
  d846e02

• [qa] Add GetTransactionSigOpCost unit tests

  

  jonasnick

  authored and

  sipa

  committed
  fdb43df

• --- [SEGWIT] begin: deployment ---

  sipa

  committed
  070dbc4

• BIP9 parameters for testnet

  

  jl2012

  authored and

  sipa

  committed
  f852813