From 08cee7da6e303f600bea30e19fdc666d18413360 Mon Sep 17 00:00:00 2001 From: JamesC Date: Fri, 1 Nov 2019 13:22:46 +0100 Subject: [PATCH] Fix typos in chapter 2.3 and 3.1 --- 2.3-tapscript.ipynb | 18 +++++++++--------- 3.1-degrading-multisig-case-study.ipynb | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/2.3-tapscript.ipynb b/2.3-tapscript.ipynb index 4c1729959..22214ba42 100644 --- a/2.3-tapscript.ipynb +++ b/2.3-tapscript.ipynb @@ -131,7 +131,7 @@ "\n", "Tapscript replaces the previous checkmultisig signature operation with OP_CHECKSIGADD. \n", "\n", - "This multisignature signature opcode requires the witness to provide a valid or invalid signature for each public key, thereby avoiding the need to waste signature verfication operations for each public key in k-of-n multisignature scripts.\n", + "This multisignature signature opcode requires the witness to provide a valid or invalid signature for each public key, thereby avoiding the need to waste signature verification operations for each public key in k-of-n multisignature scripts.\n", "\n", "* OP_CHECKSIGADD\n", " * Equivalent to: `[OP_ROT][OP_SWAP][OP_CHECKSIG][OP_ADD]`\n", @@ -322,7 +322,7 @@ "source": [ "#### 2.3.4 Example: Generating a `pkolder` tapscript\n", "\n", - "We construct a pkhasholder tapscript with the following locking conditions:\n", + "We construct a `pkolder` tapscript with the following locking conditions:\n", "\n", "* 2-of-2 MuSig public key\n", "* Delay of 20 blocks" @@ -340,16 +340,16 @@ "c_map, pk_musig = generate_musig_key([pubkey1, pubkey2])\n", "\n", "# Generate pkolder tapscript\n", - "pkhash_tapscript = TapLeaf()\n", - "pkhash_tapscript.construct_pkolder(pk_musig, 20)\n", - "print(\"Tapscript descriptor:\", pkhash_tapscript.desc, \"\\n\")\n", + "pkolder_tapscript = TapLeaf()\n", + "pkolder_tapscript.construct_pkolder(pk_musig, 20)\n", + "print(\"Tapscript descriptor:\", pkolder_tapscript.desc, \"\\n\")\n", "\n", "print(\"Tapscript operations:\")\n", - "for op in pkhash_tapscript.script:\n", + "for op in pkolder_tapscript.script:\n", " print(op.hex()) if isinstance(op, bytes) else print(op)\n", "\n", "print(\"\\nSatisfying witness elements:\")\n", - "for element, value in pkhash_tapscript.sat:\n", + "for element, value in pkolder_tapscript.sat:\n", " print(\"{}, {}\".format(element, value.hex()))" ] }, @@ -533,7 +533,7 @@ "source": [ "### Spending a single tapscript script commitment\n", "\n", - "The witness which can spend a single committed tapscript requires witness data which provides the satifying elements of the tapscript, and proof that the tapscript is committed to the witness program.\n", + "The witness which can spend a single committed tapscript requires witness data which provides the satisfying elements of the tapscript, and proof that the tapscript is committed to the witness program.\n", "\n", "* `[Stack element(s) satisfying tapscript]`\n", "* `[Tapscript]`\n", @@ -554,7 +554,7 @@ "source": [ "#### Example 2.3.8: Generate a single tapscript segwit v1 address\n", "\n", - "In this example, we construct segwit v1 output for spending along the single script path. We will reuse the previosuly generated segwit v1 witness program which has the `csahasholder` tapscript committed to it, and encode it to a bech32 address." + "In this example, we construct segwit v1 output for spending along the single script path. We will reuse the previously generated segwit v1 witness program which has the `csahasholder` tapscript committed to it, and encode it to a bech32 address." ] }, { diff --git a/3.1-degrading-multisig-case-study.ipynb b/3.1-degrading-multisig-case-study.ipynb index 42f21f532..d60841c4b 100644 --- a/3.1-degrading-multisig-case-study.ipynb +++ b/3.1-degrading-multisig-case-study.ipynb @@ -274,7 +274,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "#### Construct a spending transction" + "#### Construct a spending transaction" ] }, {