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

README.md

@@ -12,7 +12,7 @@ If you know how to make a pull request to contribute a fix, please write the cor
 
 # Reading this book (Where is the PDF?)
 
-To read this book, see book.asciidoc. Click on each of the chapters to read in your browser. This is not as convenient as reading a PDF or an ebook on your e-reader. Convenience costs money (see below).
+To read this book, see [book.asciidoc](https://github.com/bitcoinbook/bitcoinbook/blob/develop/book.asciidoc). Click on each of the chapters to read in your browser. This is not as convenient as reading a PDF or an ebook on your e-reader. Convenience costs money (see below).
 
 The 2nd edition of "Mastering Bitcoin" is available under a CC-BY-NC-ND license, not a CC-BY-SA license.
 

code/get-utxo.py

@@ -8,7 +8,7 @@ address = '1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX'
 
 # The API URL is https://blockchain.info/unspent?active=<address>
 # It returns a JSON object with a list "unspent_outputs", containing UTXO, like this:
-#{	"unspent_outputs":[
+# {	"unspent_outputs":[
 #   {
 #     "tx_hash":"ebadfaa92f1fd29e2fe296eda702c48bd11ffd52313e986e99ddad9084062167",
 #     "tx_index":51919767,
@@ -19,7 +19,7 @@ address = '1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX'
 #     "confirmations":28691
 #   },
 # ...
-#]}
+# ]}
 
 resp = requests.get('https://blockchain.info/unspent?active=%s' % address)
 utxo_set = json.loads(resp.text)["unspent_outputs"]

code/hash_example.py

@@ -9,10 +9,10 @@ text = "I am Satoshi Nakamoto"
 for nonce in range(20):
 
     # add the nonce to the end of the text
-    input_data = text + str(nonce) 
-     
+    input_data = text + str(nonce)
+
     # calculate the SHA-256 hash of the input (text+nonce)
-    hash_data = hashlib.sha256(input_data).hexdigest() 
-    
+    hash_data = hashlib.sha256(input_data).hexdigest()
+
     # show the input and hash result
-    print(input_data, '=>',  hash_data)
+    print(input_data, '=>', hash_data)

code/pycoin_example.py

@@ -8,6 +8,7 @@ from pycoin.key.validate import is_address_valid, is_wif_valid
 from pycoin.services import spendables_for_address
 from pycoin.tx.tx_utils import create_signed_tx
 
+
 def get_address(which):
     while 1:
         print("enter the %s address=> " % which, end='')
@@ -17,6 +18,7 @@ def get_address(which):
             return address
         print("invalid address, please try again")
 
+
 src_address = get_address("source")
 spendables = spendables_for_address(src_address)
 print(spendables)

code/rpc_block.py

@@ -27,11 +27,8 @@ for txid in transactions:
     for output in decoded_tx['vout']:
         # Add up the value of each output
         tx_value = tx_value + output['value']
-        
-    # Add the value of this transaction to the total 
+
+    # Add the value of this transaction to the total
     block_value = block_value + tx_value
 
 print("Total value in block: ", block_value)
-    
-
-