edits to ch07, ch08, ch09

jimmysong · jimmysong · commit 6860d7bd3271 · 2018-12-11T16:56:56.000-06:00
diff --git a/ch07.asciidoc b/ch07.asciidoc
diff --git a/ch08.asciidoc b/ch08.asciidoc
diff --git a/ch09.asciidoc b/ch09.asciidoc
diff --git a/code-ch01/Chapter1.ipynb b/code-ch01/Chapter1.ipynb
@@ -120,7 +120,7 @@
    "source": [
     "### Exercise 3\n",
     "\n",
-    "Write the corresponding `__sub__` method which defines the subtraction of two field elements.\n",
+    "Write the corresponding `__sub__` method which defines the subtraction of two `FieldElement`s.\n",
     "\n",
     "#### Make [this test](/edit/code-ch01/ecc.py) pass: `ecc.py:FieldElementTest:test_sub`"
    ]
@@ -213,7 +213,7 @@
    "source": [
     "### Exercise 6\n",
     "\n",
-    "Write the corresponding `__mul__` method which defines the multiplication of two field elements.\n",
+    "Write the corresponding `__mul__` method which defines the multiplication of two Finite Field elements.\n",
     "\n",
     "#### Make [this test](/edit/code-ch01/ecc.py) pass: `ecc.py:FieldElementTest:test_mul`"
    ]
@@ -248,7 +248,7 @@
    "source": [
     "### Exercise 7\n",
     "\n",
-    "For p = 7, 11, 17, 31, 43, what is this set in \\\\(F_{p}\\\\)?\n",
+    "For p = 7, 11, 17, 31, what is this set in \\\\(F_{p}\\\\)?\n",
     "\n",
     "{\\\\(1^{(p-1)}\\\\), \\\\(2^{(p-1)}\\\\), \\\\(3^{(p-1)}\\\\), \\\\(4^{(p-1)}\\\\), ... \\\\((p-1)^{(p-1)}\\\\)}"
    ]
@@ -328,25 +328,7 @@
    ]
   }
  ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.5.2"
-  }
- },
+ "metadata": {},
  "nbformat": 4,
  "nbformat_minor": 2
 }
diff --git a/code-ch02/Chapter2.ipynb b/code-ch02/Chapter2.ipynb
@@ -95,7 +95,7 @@
    "source": [
     "### Exercise 3\n",
     "\n",
-    "Handle the case where the two points are additive inverses. That is, they have the same x, but a different y, causing a vertical line. This should return the point at infinity.\n",
+    "Handle the case where the two points are additive inverses. That is, they have the same `x`, but a different `y`, causing a vertical line. This should return the point at infinity.\n",
     "\n",
     "#### Make [this test](/edit/code-ch02/ecc.py) pass: `ecc.py:PointTest:test_add0`"
    ]
diff --git a/code-ch05/tx.py b/code-ch05/tx.py
@@ -85,7 +85,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,
diff --git a/code-ch06/tx.py b/code-ch06/tx.py
@@ -83,7 +83,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,
diff --git a/code-ch07/Chapter7.ipynb b/code-ch07/Chapter7.ipynb
@@ -116,7 +116,7 @@
    "source": [
     "### Exercise 2\n",
     "\n",
-    "Write the `verify_input` method for the `Tx` class. You will want to use the `TxIn.script_pubkey()`, `Script.evaluate()` methods and the `SIGHASH_ALL` constant.\n",
+    "Write the `verify_input` method for the `Tx` class. You will want to use the `TxIn.script_pubkey()`, `Tx.sig_hash()` and `Script.evaluate()` methods.\n",
     "\n",
     "#### Make [this test](/edit/code-ch07/tx.py) pass: `tx.py:TxTest:test_verify_p2pkh`"
    ]
diff --git a/code-ch07/answers.py b/code-ch07/answers.py
@@ -51,7 +51,7 @@ def sig_hash(self, input_index):
 # tag::exercise2[]
 ==== Exercise 2
 
-Write the `verify_input` method for the `Tx` class. You will want to use the `TxIn.script_pubkey()`, `Script.evaluate()` methods and the `SIGHASH_ALL` constant.
+Write the `verify_input` method for the `Tx` class. You will want to use the `TxIn.script_pubkey()`, `Tx.sig_hash()` and `Script.evaluate()` methods.
 # end::exercise2[]
 """
 
diff --git a/code-ch07/examples.py b/code-ch07/examples.py
@@ -75,13 +75,10 @@
 version: 1
 tx_ins:
 0d6fe5213c0b3291f208cba8bfb59b7476dffacc4e5cb66f6eb20a080843a299:13
-<BLANKLINE>
 tx_outs:
 33000000:OP_DUP OP_HASH160 d52ad7ca9b3d096a38e752c2018e6fbc40cdf26f OP_EQUALVERIFY OP_CHECKSIG 
 10000000:OP_DUP OP_HASH160 507b27411ccf7f16f10297de6cef3f291623eddf OP_EQUALVERIFY OP_CHECKSIG 
-<BLANKLINE>
 locktime: 0
-<BLANKLINE>
 
 # end::example5[]
 # tag::example6[]
diff --git a/code-ch07/tx.py b/code-ch07/tx.py
@@ -85,7 +85,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,
diff --git a/code-ch08/tx.py b/code-ch08/tx.py
@@ -85,7 +85,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,
diff --git a/code-ch09/Chapter9.ipynb b/code-ch09/Chapter9.ipynb
@@ -98,8 +98,9 @@
    "outputs": [],
    "source": [
     "from helper import hash256\n",
-    "block_id = hash256(bytes.fromhex('020000208ec39428b17323fa0ddec8e887b4a7c53b8c0a0a220cfd0000000000000000005b0750fce0a889502d40508d39576821155e9c9e3f5c3157f961db38fd8b25be1e77a759e93c0118a4ffd71d'))\n",
-    "print(block_id.hex())"
+    "block_hash = hash256(bytes.fromhex('020000208ec39428b17323fa0ddec8e887b4a7c53b8c0a0a220cfd0000000000000000005b0750fce0a889502d40508d39576821155e9c9e3f5c3157f961db38fd8b25be1e77a759e93c0118a4ffd71d'))[::-1]\n",
+    "block_id = block_hash.hex()\n",
+    "print(block_id)"
    ]
   },
   {
diff --git a/code-ch09/examples.py b/code-ch09/examples.py
@@ -20,9 +20,10 @@
 # end::example2[]
 # tag::example3[]
 >>> from helper import hash256
->>> block_id = hash256(bytes.fromhex('020000208ec39428b17323fa0ddec8e887b4a7c53b8c0a0a220cfd0000000000000000005b0750fce0a889502d40508d39576821155e9c9e3f5c3157f961db38fd8b25be1e77a759e93c0118a4ffd71d'))
->>> print(block_id.hex())
-2375044d646ad73594dd0b37b113becdb03964584c9e7e000000000000000000
+>>> block_hash = hash256(bytes.fromhex('020000208ec39428b17323fa0ddec8e887b4a7c53b8c0a0a220cfd0000000000000000005b0750fce0a889502d40508d39576821155e9c9e3f5c3157f961db38fd8b25be1e77a759e93c0118a4ffd71d'))[::-1]
+>>> block_id = block_hash.hex()
+>>> print(block_id)
+0000000000000000007e9e4c586439b0cdbe13b1370bdd9435d76a644d047523
 
 # end::example3[]
 # tag::example4[]
diff --git a/code-ch09/helper.py b/code-ch09/helper.py
@@ -143,8 +143,8 @@ def target_to_bits(target):
     else:
         exponent = len(raw_bytes)  # <3>
         coefficient = raw_bytes[:3]  # <4>
-    new_bits_big_endian = bytes([exponent]) + coefficient
-    return new_bits_big_endian[::-1]  # <5>
+    new_bits = coefficient[::-1] + bytes([exponent])  # <5>
+    return new_bits
 # end::source1[]
 
 def calculate_new_bits(previous_bits, time_differential):
diff --git a/code-ch09/tx.py b/code-ch09/tx.py
@@ -85,7 +85,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,
diff --git a/code-ch10/Chapter10.ipynb b/code-ch10/Chapter10.ipynb
@@ -196,9 +196,7 @@
     "        if count % 2016 == 0 or not first_epoch_block:\n",
     "            first_epoch_block = b\n",
     "        count += 1\n",
-    "        last_block_hash = b.hash()\n",
-    "    if len(headers_message.blocks) < 2000:\n",
-    "        break"
+    "        last_block_hash = b.hash()"
    ]
   }
  ],
diff --git a/code-ch10/examples.py b/code-ch10/examples.py
@@ -30,9 +30,6 @@
 ...             first_epoch_block = b
 ...         count += 1
 ...         last_block_hash = b.hash()
-...     if len(headers_message.blocks) < 2000:
-...         break
-ffff001d
 ffff001d
 ffff001d
 ffff001d
@@ -50,6 +47,7 @@
 ffff001d
 6ad8001d
 28c4001d
+71be001d
 
 # end::example1[]
 """
diff --git a/code-ch10/helper.py b/code-ch10/helper.py
@@ -150,9 +150,9 @@ def target_to_bits(target):
         exponent = len(raw_bytes)
         # coefficient is the first 3 digits of the base-256 number
         coefficient = raw_bytes[:3]
-    new_bits_big_endian = bytes([exponent]) + coefficient
     # we've truncated the number after the first 3 digits of base-256
-    return new_bits_big_endian[::-1]
+    new_bits = coefficient[::-1] + bytes([exponent])
+    return new_bits
 
 
 def calculate_new_bits(previous_bits, time_differential):
diff --git a/code-ch10/tx.py b/code-ch10/tx.py
@@ -85,7 +85,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,
diff --git a/code-ch11/helper.py b/code-ch11/helper.py
@@ -150,9 +150,9 @@ def target_to_bits(target):
         exponent = len(raw_bytes)
         # coefficient is the first 3 digits of the base-256 number
         coefficient = raw_bytes[:3]
-    new_bits_big_endian = bytes([exponent]) + coefficient
     # we've truncated the number after the first 3 digits of base-256
-    return new_bits_big_endian[::-1]
+    new_bits = coefficient[::-1] + bytes([exponent])
+    return new_bits
 
 
 def calculate_new_bits(previous_bits, time_differential):
diff --git a/code-ch11/tx.py b/code-ch11/tx.py
@@ -85,7 +85,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,
diff --git a/code-ch12/answers.py b/code-ch12/answers.py
@@ -214,11 +214,6 @@ def serialize(self):
 """
 
 
-        
-
-
-
-
 class Chapter12Test(TestCase):
 
     def test_apply(self):
diff --git a/code-ch12/helper.py b/code-ch12/helper.py
@@ -150,9 +150,9 @@ def target_to_bits(target):
         exponent = len(raw_bytes)
         # coefficient is the first 3 digits of the base-256 number
         coefficient = raw_bytes[:3]
-    new_bits_big_endian = bytes([exponent]) + coefficient
     # we've truncated the number after the first 3 digits of base-256
-    return new_bits_big_endian[::-1]
+    new_bits = coefficient[::-1] + bytes([exponent])
+    return new_bits
 
 
 def calculate_new_bits(previous_bits, time_differential):
diff --git a/code-ch12/tx.py b/code-ch12/tx.py
@@ -86,7 +86,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,
diff --git a/code-ch13/helper.py b/code-ch13/helper.py
@@ -154,9 +154,9 @@ def target_to_bits(target):
         exponent = len(raw_bytes)
         # coefficient is the first 3 digits of the base-256 number
         coefficient = raw_bytes[:3]
-    new_bits_big_endian = bytes([exponent]) + coefficient
     # we've truncated the number after the first 3 digits of base-256
-    return new_bits_big_endian[::-1]
+    new_bits = coefficient[::-1] + bytes([exponent])
+    return new_bits
 
 
 def calculate_new_bits(previous_bits, time_differential):
diff --git a/code-ch13/tx.py b/code-ch13/tx.py
@@ -85,7 +85,7 @@ def __repr__(self):
         tx_outs = ''
         for tx_out in self.tx_outs:
             tx_outs += tx_out.__repr__() + '\n'
-        return 'tx: {}\nversion: {}\ntx_ins:\n{}\ntx_outs:\n{}\nlocktime: {}\n'.format(
+        return 'tx: {}\nversion: {}\ntx_ins:\n{}tx_outs:\n{}locktime: {}'.format(
             self.id(),
             self.version,
             tx_ins,

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@`
`95`	`95`	`"source": [`
`96`	`96`	`"### Exercise 3\n",`
`97`	`97`	`"\n",`
`98`		`- "Handle the case where the two points are additive inverses. That is, they have the same x, but a different y, causing a vertical line. This should return the point at infinity.\n",`
	`98`	+ "Handle the case where the two points are additive inverses. That is, they have the same `x`, but a different `y`, causing a vertical line. This should return the point at infinity.\n",
`99`	`99`	`"\n",`
`100`	`100`	"#### Make [this test](/edit/code-ch02/ecc.py) pass: `ecc.py:PointTest:test_add0`"
`101`	`101`	`]`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@`
`116`	`116`	`"source": [`
`117`	`117`	`"### Exercise 2\n",`
`118`	`118`	`"\n",`
`119`		- "Write the `verify_input` method for the `Tx` class. You will want to use the `TxIn.script_pubkey()`, `Script.evaluate()` methods and the `SIGHASH_ALL` constant.\n",
	`119`	+ "Write the `verify_input` method for the `Tx` class. You will want to use the `TxIn.script_pubkey()`, `Tx.sig_hash()` and `Script.evaluate()` methods.\n",
`120`	`120`	`"\n",`
`121`	`121`	"#### Make [this test](/edit/code-ch07/tx.py) pass: `tx.py:TxTest:test_verify_p2pkh`"
`122`	`122`	`]`