Merge remote-tracking branch 'github/develop' into develop

.travis.yml

@@ -0,0 +1,21 @@
+language: python
+python:
+    - 2.7
+    - 3.6
+branches:
+  only:
+    - develop
+    - first_edition
+    - second_edition
+install:
+    - pip install flake8  # pytest  # add other testing frameworks later
+before_script:
+    # stop the build if there are Python syntax errors or undefined names
+    - time flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+    # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
+    - time flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+script:
+    - true  # add other tests here
+notifications:
+    on_success: change
+    on_failure: always

ch03.asciidoc

@@ -774,6 +774,9 @@ https://github.com/bitcoinjs/bitcoinjs-lib[BitcoinJS] :: A pure JavaScript Bitco
 https://bitcoinj.github.io[bitcoinj]:: A Java full-node client library
 https://bitsofproof.com[Bits of Proof (BOP)]:: A Java enterprise-class implementation of bitcoin
 
+==== PHP
+https://github.com/bit-wasp/bitcoin-php[bitwasp/bitcoin]:: A PHP bitcoin library, and related projects
+
 ==== Python
 https://github.com/petertodd/python-bitcoinlib[python-bitcoinlib]::  A Python bitcoin library, consensus library, and node by Peter Todd
 https://github.com/richardkiss/pycoin[pycoin]:: A Python bitcoin library by Richard Kiss

ch04.asciidoc

@@ -60,7 +60,7 @@ The bitcoin private key is just a number. You can pick your private keys randoml
 
 The first and most important step in generating keys is to find a secure source of entropy, or randomness. Creating a bitcoin key is essentially the same as "Pick a number between 1 and 2^256^." The exact method you use to pick that number does not matter as long as it is not predictable or repeatable. Bitcoin software uses the underlying operating system's random number generators to produce 256 bits of entropy (randomness). Usually, the OS random number generator is initialized by a human source of randomness, which is why you may be asked to wiggle your mouse around for a few seconds.
 
-More precisely, the private key can be any number between +1+ and +n - 1+, where n is a constant (n = 1.158 * 10^77^, slightly less than 2^256^) defined as the order of the elliptic curve used in bitcoin (see <<elliptic_curve>>). To create such a key, we randomly pick a 256-bit number and check that it is less than +n - 1+. In programming terms, this is usually achieved by feeding a larger string of random bits, collected from a cryptographically secure source of randomness, into the SHA256 hash algorithm, which will conveniently produce a 256-bit number. If the result is less than +n - 1+, we have a suitable private key. Otherwise, we simply try again with another random number. 
+More precisely, the private key can be any number between +0+ and +n - 1+ inclusive, where n is a constant (n = 1.158 * 10^77^, slightly less than 2^256^) defined as the order of the elliptic curve used in bitcoin (see <<elliptic_curve>>). To create such a key, we randomly pick a 256-bit number and check that it is less than +n+. In programming terms, this is usually achieved by feeding a larger string of random bits, collected from a cryptographically secure source of randomness, into the SHA256 hash algorithm, which will conveniently produce a 256-bit number. If the result is less than +n+, we have a suitable private key. Otherwise, we simply try again with another random number.
 	
 [WARNING]
 ====

ch05.asciidoc

@@ -65,7 +65,7 @@ image::images/mbc2_0503.png["HD wallet"]
 
 HD wallets offer two major advantages over random (nondeterministic) keys. First, the tree structure can be used to express additional organizational meaning, such as when a specific branch of subkeys is used to receive incoming payments and a different branch is used to receive change from outgoing payments. Branches of keys can also be used in corporate settings, allocating different branches to departments, subsidiaries, specific functions, or accounting categories.
 
-The second advantage of HD wallets is that users can create a sequence of public keys without having access to the corresponding private keys. This allows HD wallets to be used on an insecure server or in a receive-only capacity, issuing a different public key for each transaction. The public keys do not need to be preloaded or derived in advance, yet the server doesn't have the private keys that can spend the funds.
+The second advantage of HD wallets is that users can create a sequence of public keys without having access to the corresponding private keys. This allows HD wallets to be used on an insecure server or in a receive-only capacity, issuing a different public key for each transaction. The public keys need to be preloaded or derived in advance, yet the server doesn't have the private keys that can spend the funds.
 
 ==== Seeds and Mnemonic Codes (BIP-39)
 
@@ -453,10 +453,10 @@ The "ancestry" of a key is read from right to left, until you reach the master k
 |=======
 |HD path | Key described
 | m/0 | The first (0) child private key from the master private key (m)
-| m/0/0 | The first grandchild private key of the first child (m/0)
-| m/0'/0 | The first normal grandchild of the first _hardened_ child (m/0')
-| m/1/0 | The first grandchild private key of the second child (m/1)
-| M/23/17/0/0 | The first great-great-grandchild public key of the first great-grandchild of the 18th grandchild of the 24th child
+| m/0/0 | The first grandchild private key from the first child (m/0)
+| m/0'/0 | The first normal grandchild from the first _hardened_ child (m/0')
+| m/1/0 | The first grandchild private key from the second child (m/1)
+| M/23/17/0/0 | The first great-great-grandchild public key from the first great-grandchild from the 18th grandchild from the 24th child
 |=======
 
 ===== Navigating the HD wallet tree structure

ch06.asciidoc

@@ -171,7 +171,7 @@ Here are some hints:
 
 To build a transaction, a wallet selects from the UTXO it controls, UTXO with enough value to make the requested payment. Sometimes one UTXO is enough, other times more than one is needed. For each UTXO that will be consumed to make this payment, the wallet creates one input pointing to the UTXO and unlocks it with an unlocking script.
 
-Let's look at the components of an input in greater detail. The first part of an input is a pointer to an UTXO by reference to the transaction hash and sequence number where the UTXO is recorded in the blockchain. The second part is an unlocking script, which the wallet constructs in order to satisfy the spending conditions set in the UTXO. Most often, the unlocking script is a digital signature and public key proving ownership of the bitcoin. However, not all unlocking scripts contain signatures. The third part is a sequence number, which will be discussed later.
+Let's look at the components of an input in greater detail. The first part of an input is a pointer to an UTXO by reference to the transaction hash and an output index, which identifies the specific UTXO in that transaction. The second part is an unlocking script, which the wallet constructs in order to satisfy the spending conditions set in the UTXO. Most often, the unlocking script is a digital signature and public key proving ownership of the bitcoin. However, not all unlocking scripts contain signatures. The third part is a sequence number, which will be discussed later.
 
 Consider our example in <<transactions_behind_the_scenes>>. The transaction inputs are an array (list) called +vin+:
 
@@ -610,8 +610,8 @@ In addition, there is a modifier flag +SIGHASH_ANYONECANPAY+, which can be combi
 [options="header"]
 |=======================
 |SIGHASH flag| Value | Description
-| ALL\|ANYONECANPAY | 0x81 | Signature applies to one inputs and all outputs
-| NONE\|ANYONECANPAY | 0x82 | Signature applies to one inputs, none of the outputs
+| ALL\|ANYONECANPAY | 0x81 | Signature applies to one input and all outputs
+| NONE\|ANYONECANPAY | 0x82 | Signature applies to one input, none of the outputs
 | SINGLE\|ANYONECANPAY | 0x83 | Signature applies to one input and the output with the same index number
 |=======================
 

ch07.asciidoc

@@ -172,7 +172,7 @@ P2SH addresses hide all of the complexity, so that the person making a payment d
 * Complex scripts are replaced by shorter fingerprints in the transaction output, making the transaction smaller.
 * Scripts can be coded as an address, so the sender and the sender's wallet don't need complex engineering to implement P2SH.
 * P2SH shifts the burden of constructing the script to the recipient, not the sender.
-* P2SH shifts the burden in data storage for the long script from the output (which is in the UTXO set) to the input (stored on the blockchain).
+* P2SH shifts the burden in data storage for the long script from the output (which additionally to being stored on the blockchain is in the UTXO set) to the input (only stored on the blockchain).
 * P2SH shifts the burden in data storage for the long script from the present time (payment) to a future time (when it is spent).
 * P2SH shifts the transaction fee cost of a long script from the sender to the recipient, who has to include the long redeem script to spend it.
 
@@ -251,7 +251,7 @@ It is important to understand the limitations of transaction +nLocktime+. The on
 
 ==== Check Lock Time Verify (CLTV)
 
-((("Check Lock Time Verify (CLTV)", id="cltv07")))((("timelocks", "Check Lock Time Verify (CLTV)")))((("scripting", "timelocks", "Check Lock Time Verify (CLTV)")))((("bitcoin improvement proposals", "CHECKLOCKTIMEVERIFY (BIP-65)")))In December 2015, a new form of timelock was introduced to bitcoin as a soft fork upgrade. Based on a specifications in BIP-65, a new script operator called _CHECKLOCKTIMEVERIFY_ (_CLTV_) was added to the scripting language. +CLTV+ is a per-output timelock, rather than a per-transaction timelock as is the case with +nLocktime+. This allows for much greater flexibility in the way timelocks are applied.
+((("Check Lock Time Verify (CLTV)", id="cltv07")))((("timelocks", "Check Lock Time Verify (CLTV)")))((("scripting", "timelocks", "Check Lock Time Verify (CLTV)")))((("bitcoin improvement proposals", "CHECKLOCKTIMEVERIFY (BIP-65)")))In December 2015, a new form of timelock was introduced to bitcoin as a soft fork upgrade. Based on a specification in BIP-65, a new script operator called _CHECKLOCKTIMEVERIFY_ (_CLTV_) was added to the scripting language. +CLTV+ is a per-output timelock, rather than a per-transaction timelock as is the case with +nLocktime+. This allows for much greater flexibility in the way timelocks are applied.
 
 In simple terms, by adding the +CLTV+ opcode in the redeem script of an output it restricts the output, so that it can only be spent after the specified time has elapsed.
 

ch09.asciidoc

@@ -320,7 +320,7 @@ $ bitcoin-cli -testnet getblockchaininfo
 
 You can also run on testnet3 with other full-node implementations, such as +btcd+ (written in Go) and +bcoin+ (written in JavaScript), to experiment and learn in other programming languages and frameworks.
 
-In early 2017, testnet3 supports all the features of mainnet, in addition to Segregated Witness (see <<segwit>>), which has yet to activate on mainnet. Therefore, testnet3 can also be used to test Segregated Witness features.((("", startref="testnet09")))
+In early 2017, testnet3 supports all the features of mainnet, including Segregated Witness (see <<segwit>>). Therefore, testnet3 can also be used to test Segregated Witness features.((("", startref="testnet09")))
 
 ==== Segnet&#x2014;The Segregated Witness Testnet
 

ch12.asciidoc

@@ -263,7 +263,7 @@ The funding transaction consumes one or more inputs from Emma's wallet, sourcing
 
 Once the funding transaction is confirmed, Emma can start streaming video. Emma's software creates and signs a commitment transaction that changes the channel balance to credit 0.01 millibit to Fabian's address and refund 35.99 millibits back to Emma. The transaction signed by Emma consumes the 36 millibits output created by the funding transaction and creates two outputs: one for her refund, the other for Fabian's payment. The transaction is only partially signed—it requires two signatures (2-of-2), but only has Emma's signature. When Fabian's server receives this transaction, it adds the second signature (for the 2-of-2 input) and returns it to Emma together with 1 second worth of video. Now both parties have a fully signed commitment transaction that either can redeem, representing the correct up-to-date balance of the channel. Neither party broadcasts this transaction to the network.
 
-In the next round, Emma's software creates and signs another commitment transaction (commitment #2) that consumes the _same_ 2-of-2 output from the funding transaction. The second commitment transaction allocates one output of 0.2 millibits to Fabian's address and one output of 35.98 millibits back to Emma's address. This new transaction is payment for two cumulative seconds of video. Fabian's software signs and returns the second commitment transaction, together with the another second of video.
+In the next round, Emma's software creates and signs another commitment transaction (commitment #2) that consumes the _same_ 2-of-2 output from the funding transaction. The second commitment transaction allocates one output of 0.02 millibits to Fabian's address and one output of 35.98 millibits back to Emma's address. This new transaction is payment for two cumulative seconds of video. Fabian's software signs and returns the second commitment transaction, together with another second of video.
 
 In this way, Emma's software continues to send commitment transactions to Fabian's server in exchange for streaming video. The balance of the channel gradually accumulates in favor of Fabian, as Emma consumes more seconds of video. Let's say Emma watches 600 seconds (10 minutes) of video, creating and signing 600 commitment transactions. The last commitment transaction (#600) will have two outputs, splitting the balance of the channel, 6 millibits to Fabian and 30 millibits to Emma.
 
@@ -426,13 +426,13 @@ IF
 ELSE
     # Refund after timeout.
     <locktime> CHECKLOCKTIMEVERIFY DROP
-    <Payee Pubic Key> CHECKSIG
+    <Payer Pubic Key> CHECKSIG
 ENDIF
 ----
 
 Anyone who knows the secret +R+, which when hashed equals to +H+, can redeem this output by exercising the first clause of the +IF+ flow.
 
-If the secret is not revealed and the HTLC claimed, after a certain number of blocks the payee can claim a refund using the second clause in the +IF+ flow.
+If the secret is not revealed and the HTLC claimed, after a certain number of blocks the payer can claim a refund using the second clause in the +IF+ flow.
 
 This is a basic implementation of an HTLC. This type of HTLC can be redeemed by _anyone_ who has the secret +R+. An HTLC can take many different forms with slight variations to the script. For example, adding a +CHECKSIG+ operator and a public key in the first clause restricts redemption of the hash to a named recipient, who must also know the secret +R+.((("", startref="BCApayment12")))
 

code/key-to-address-ecc-example.py

@@ -35,7 +35,7 @@ print("Public Key (hex) is:", hex_encoded_public_key)
 # Compress public key, adjust prefix depending on whether y is even or odd
 (public_key_x, public_key_y) = public_key
 compressed_prefix = '02' if (public_key_y % 2) == 0 else '03'
-hex_compressed_public_key = compressed_prefix + bitcoin.encode(public_key_x, 16)
+hex_compressed_public_key = compressed_prefix + (bitcoin.encode(public_key_x, 16).zfill(64))
 print("Compressed Public Key (hex) is:", hex_compressed_public_key)
 
 # Generate bitcoin address from public key

glossary.asciidoc

@@ -173,8 +173,8 @@ P2WSH::
 paper wallet::
     In the most specific sense, a paper wallet is a document containing all of the data necessary to generate any number of Bitcoin private keys, forming a wallet of keys. However, people often use the term to mean any way of storing bitcoin offline as a physical document. This second definition also includes paper keys and redeemable codes.
 
-payment channels::
-    A micropayment channel or payment channel is class of techniques designed to allow users to make multiple bitcoin transactions without committing all of the transactions to the bitcoin blockchain. In a typical payment channel, only two transactions are added to the block chain but an unlimited or nearly unlimited number of payments can be made between the participants.
+Payment channels::
+    A Micropayment Channel or Payment Channel is a class of techniques designed to allow users to make multiple Bitcoin transactions without committing all of the transactions to the Bitcoin block chain. In a typical payment channel, only two transactions are added to the block chain but an unlimited or nearly unlimited number of payments can be made between the participants.
 
 pooled mining::
     Pooled mining is a mining approach where multiple generating clients contribute to the generation of a block, and then split the block reward according the contributed processing power.

preface.asciidoc

@@ -63,7 +63,7 @@ All the code snippets use real values and calculations where possible, so that y
 
 This book is here to help you get your job done. In general, if example code is offered with this book, you may use it in your programs and documentation. You do not need to contact us for permission unless you’re reproducing a significant portion of the code. For example, writing a program that uses several chunks of code from this book does not require permission. Selling or distributing a CD-ROM of examples from O’Reilly books does require permission. Answering a question by citing this book and quoting example code does not require permission. Incorporating a significant amount of example code from this book into your product’s documentation does require permission.
 
-((("attribution")))We appreciate, but do not require, attribution. An attribution usually includes the title, author, publisher, and ISBN. For example: “_Mastering Bitcoin_ by Andreas M. Antonopoulos (O’Reilly). Copyright 2017 Andreas M. Antonopoulos, 978-1-491-95438-6.”
+((("attribution")))We appreciate, but do not require, attribution. An attribution usually includes the title, author, publisher, and ISBN. For example: “_Mastering Bitcoin_ by Andreas M. Antonopoulos (O’Reilly). Copyright 2018 Andreas M. Antonopoulos, 978-1-491-95438-6.”
 
 ((("open source licenses")))Some editions of this book are offered under an open source license, such as https://creativecommons.org/licenses/by-nc/4.0/[CC-BY-NC], in which case the terms of that license apply.
 
@@ -183,6 +183,7 @@ Following is a list of notable GitHub contributors, including their GitHub ID in
 * Cragin Godley (cgodley)
 * Craig Dodd (cdodd)
 * dallyshalla
+* Darius Kramer (dkrmr)
 * Diego Viola (diegoviola)
 * Dirk Jäckel (biafra23)
 * Dimitris Tsapakidis (dimitris-t)
@@ -206,6 +207,7 @@ Following is a list of notable GitHub contributors, including their GitHub ID in
 * Holger Schinzel (schinzelh)
 * Ioannis Cherouvim (cherouvim)
 * Ish Ot Jr. (ishotjr)
+* ivangreene
 * James Addison (jayaddison)
 * Jameson Lopp (jlopp)
 * Jason Bisterfeldt (jbisterfeldt)
@@ -218,6 +220,7 @@ Following is a list of notable GitHub contributors, including their GitHub ID in
 * Jonathan Cross (jonathancross)
 * Jorgeminator
 * Kai Bakker (kaibakker)
+* Magomed Aliev (30mb1)
 * Mai-Hsuan Chia (mhchia)
 * marcofalke
 * Marzig (marzig76)
@@ -229,6 +232,7 @@ Following is a list of notable GitHub contributors, including their GitHub ID in
 * Minh T. Nguyen (enderminh)
 * Nagaraj Hubli (nagarajhubli)
 * Nekomata (nekomata-3)
+* Philipp Gille (philippgille)
 * Robert Furse (Rfurse)
 * Richard Kiss (richardkiss)
 * Ruben Alexander (hizzvizz)
@@ -239,6 +243,7 @@ Following is a list of notable GitHub contributors, including their GitHub ID in
 * Stephan Oeste (Emzy)
 * takaya-imai
 * Thiago Arrais (thiagoarrais)
+* Thomas Kerin (afk11)
 * venzen
 * Will Binns (wbnns)
 * wintercooled