s/bech32/bech32m/ in text, when appropriate

Author: harding

2.0-taproot-introduction.ipynb

@@ -23,8 +23,8 @@
     "\n",
     "In each chapter, we first introduce the case study scenario and give an overview of the technology. We then demonstrate its use as follows:\n",
     "\n",
-    "1. We first construct a segwit v1 witness program that implements the desired spending policy and derive the bech32 address for that witness program;\n",
-    "2. Then we start a Bitcoin Core full node, generate 101 blocks on the node (so that the node has a mature balance to spend), and spend coins from the Bitcoin Core wallet to the bech32 address from step (1);\n",
+    "1. We first construct a segwit v1 witness program that implements the desired spending policy and derive the bech32m address for that witness program;\n",
+    "2. Then we start a Bitcoin Core full node, generate 101 blocks on the node (so that the node has a mature balance to spend), and spend coins from the Bitcoin Core wallet to the bech32m address from step (1);\n",
     "3. Finally, we construct a transaction spending from the output created in step (2) back to the Bitcoin Core wallet. We sign the transaction and verify that the transaction is valid using the full node's `testmempoolaccept` RPC method.\n",
     "\n",
     "This sequence of steps is illustrated below:"

2.1-segwit-version-1.ipynb

@@ -69,7 +69,7 @@
    "source": [
     "#### 2.1.1 Example: Constructing a segwit v1 output\n",
     "\n",
-    "In this example, we construct segwit v1 output for spending along the key path. We generate a key pair, encode the public key using the BIP340 and BIP341 pubkey encoding rules, and then encode the witness version and witness program to a bech32 address."
+    "In this example, we construct segwit v1 output for spending along the key path. We generate a key pair, encode the public key using the BIP340 and BIP341 pubkey encoding rules, and then encode the witness version and witness program to a bech32m address."
    ]
   },
   {
@@ -86,10 +86,10 @@
     "program = pubkey.get_bytes()\n",
     "print(\"Witness program is {}\\n\".format(program.hex()))\n",
     "\n",
-    "# Create (regtest) bech32 address\n",
+    "# Create (regtest) bech32m address\n",
     "version = 0x01\n",
     "address = program_to_witness(version, program)\n",
-    "print(\"bech32 address is {}\".format(address))"
+    "print(\"bech32m address is {}\".format(address))"
    ]
   },
   {
@@ -290,7 +290,7 @@
     "# Generate the address\n",
     "version = 0\n",
     "address = program_to_witness(version, script_hash)\n",
-    "print(\"bech32 address is {}\".format(address))"
+    "print(\"bech32m address is {}\".format(address))"
    ]
   },
   {
@@ -545,7 +545,7 @@
    "source": [
     "**Congratulations!** In this chapter, you have:\n",
     "\n",
-    "- Learned how to create a segwit v1 output and derive its bech32 address.\n",
+    "- Learned how to create a segwit v1 output and derive its bech32m address.\n",
     "- Sent bitcoin to a segwit v1 address, and then constructed a transaction that spends the segwit v1 output back to the wallet using the key path.\n",
     "- Shown how using a segwit v1 MuSig output saves fees and improves privacy over using P2WSH multisig."
    ]

2.3-tapscript.ipynb

@@ -576,7 +576,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 previously generated segwit v1 witness program which has the `csa_hashlock_delay` 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 `csa_hashlock_delay` tapscript committed to it, and encode it to a bech32m address."
    ]
   },
   {
@@ -592,10 +592,10 @@
     "program = taproot_pubkey_b\n",
     "print(\"Witness program is {}\\n\".format(program.hex()))\n",
     "\n",
-    "# Create (regtest) bech32 address\n",
+    "# Create (regtest) bech32m address\n",
     "version = 0x01\n",
     "address = program_to_witness(1, program)\n",
-    "print(\"bech32 address is {}\".format(address))"
+    "print(\"bech32m address is {}\".format(address))"
    ]
   },
   {

2.4-taptree.ipynb

@@ -71,7 +71,7 @@
     "1. Compute TapLeaves A, B and C.\n",
     "2. Compute Internal TapBranch AB.\n",
     "3. Compute TapTweak\n",
-    "4. Derive the segwit output address."
+    "4. Derive the bech32m address."
    ]
   },
   {
@@ -116,10 +116,10 @@
     "taptweak =  # TODO: implement\n",
     "print(\"TapTweak:\", taptweak.hex())\n",
     "\n",
-    "# 4) Derive the segwit output address.\n",
+    "# 4) Derive the bech32m address.\n",
     "taproot_pubkey_b = internal_pubkey.tweak_add(taptweak).get_bytes()\n",
-    "segwit_address = program_to_witness(1, taproot_pubkey_b)\n",
-    "print('Segwit address:', segwit_address)"
+    "bech32m_address = program_to_witness(1, taproot_pubkey_b)\n",
+    "print('Bech32m address:', bech32m_address)"
    ]
   },
   {
@@ -343,7 +343,7 @@
    "source": [
     "#### _Programming Exercise 2.4.5_ - Constructing a taproot output from a taptree\n",
     "\n",
-    "In the following exercise, please construct the output and segwit address for a taptree with 4 leaves using with the huffman taptree constructor, so that it results in a balanced tree. Please generate new keys for the internal key and pay-to-pubkey tapscripts."
+    "In the following exercise, please construct the output and bech32m address for a taptree with 4 leaves using with the huffman taptree constructor, so that it results in a balanced tree. Please generate new keys for the internal key and pay-to-pubkey tapscripts."
    ]
   },
   {
@@ -371,7 +371,7 @@
     "taptree =  # TODO: implement\n",
     "taptree.huffman_constructor(  # TODO: implement\n",
     "\n",
-    "# Generate taproot tree with the `construct()` method, then use the taproot bytes to create a segwit address\n",
+    "# Generate taproot tree with the `construct()` method, then use the taproot bytes to create a bech32m address\n",
     "taproot_script, tweak, control_map = taptree.construct()\n",
     "taproot_pubkey = pubkey_internal.tweak_add(tweak) \n",
     "program = taproot_pubkey.get_bytes()\n",