Update notebook 2.5 to use Bitcoin Core v0.21

alex-learn · Jul 21, 2021 · 6307e3e · 6307e3e
1 parent c6ce392
commit 6307e3e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/2.5-huffman.ipynb b/2.5-huffman.ipynb
@@ -7,7 +7,7 @@
    "outputs": [],
    "source": [
     "import util\n",
-    "from test_framework.key import ECKey, ECPubKey, generate_key_pair\n",
+    "from test_framework.key import ECKey, ECPubKey, generate_key_pair, generate_bip340_key_pair\n",
     "from test_framework.script import Tapbranch, TapLeaf, TapTree"
    ]
   },
@@ -79,14 +79,14 @@
    "outputs": [],
    "source": [
     "internal_pubkey = ECPubKey()\n",
-    "internal_pubkey.set(bytes.fromhex('03af455f4989d122e9185f8c351dbaecd13adca3eef8a9d38ef8ffed6867e342e3'))\n",
+    "internal_pubkey.set(bytes.fromhex('af455f4989d122e9185f8c351dbaecd13adca3eef8a9d38ef8ffed6867e342e3'))\n",
     "\n",
     "# Derive pay-to-pubkey tapleaves\n",
-    "privkeyA, pubkeyA = generate_key_pair()\n",
-    "privkeyB, pubkeyB = generate_key_pair()\n",
-    "privkeyC, pubkeyC = generate_key_pair()\n",
-    "privkeyD, pubkeyD = generate_key_pair()\n",
-    "privkeyE, pubkeyE = generate_key_pair()\n",
+    "privkeyA, pubkeyA = generate_bip340_key_pair()\n",
+    "privkeyB, pubkeyB = generate_bip340_key_pair()\n",
+    "privkeyC, pubkeyC = generate_bip340_key_pair()\n",
+    "privkeyD, pubkeyD = generate_bip340_key_pair()\n",
+    "privkeyE, pubkeyE = generate_bip340_key_pair()\n",
     "\n",
     "tapleafA = TapLeaf().construct_pk(pubkeyA)\n",
     "tapleafB = TapLeaf().construct_pk(pubkeyB)\n",
@@ -184,15 +184,15 @@
    "outputs": [],
    "source": [
     "internal_pubkey = ECPubKey()\n",
-    "internal_pubkey.set(bytes.fromhex('03af455f4989d122e9185f8c351dbaecd13adca3eef8a9d38ef8ffed6867e342e3'))\n",
+    "internal_pubkey.set(bytes.fromhex('af455f4989d122e9185f8c351dbaecd13adca3eef8a9d38ef8ffed6867e342e3'))\n",
     "\n",
     "# Derive pay-to-pubkey TapLeaves\n",
-    "privkeyA, pubkeyA = generate_key_pair()\n",
-    "privkeyB, pubkeyB = generate_key_pair()\n",
-    "privkeyC, pubkeyC = generate_key_pair()\n",
-    "privkeyD, pubkeyD = generate_key_pair()\n",
-    "privkeyE, pubkeyE = generate_key_pair()\n",
-    "privkeyF, pubkeyF = generate_key_pair()\n",
+    "privkeyA, pubkeyA = generate_bip340_key_pair()\n",
+    "privkeyB, pubkeyB = generate_bip340_key_pair()\n",
+    "privkeyC, pubkeyC = generate_bip340_key_pair()\n",
+    "privkeyD, pubkeyD = generate_bip340_key_pair()\n",
+    "privkeyE, pubkeyE = generate_bip340_key_pair()\n",
+    "privkeyF, pubkeyF = generate_bip340_key_pair()\n",
     "\n",
     "tapleafA = TapLeaf().construct_pk(pubkeyA)\n",
     "tapleafB = TapLeaf().construct_pk(pubkeyB)\n",
@@ -202,12 +202,12 @@
     "tapleafF = TapLeaf().construct_pk(pubkeyF)\n",
     "\n",
     "# Assign frequencies to the TapLeaves to generate the desired tree\n",
-    "# weightA = # TODO: Implement\n",
-    "# weightB = # TODO: Implement\n",
-    "# weightC = # TODO: Implement\n",
-    "# weightD = # TODO: Implement\n",
-    "# weightE = # TODO: Implement\n",
-    "# weightF = # TODO: Implement\n",
+    "weightA = # TODO: Implement\n",
+    "weightB = # TODO: Implement\n",
+    "weightC = # TODO: Implement\n",
+    "weightD = # TODO: Implement\n",
+    "weightE = # TODO: Implement\n",
+    "weightF = # TODO: Implement\n",
     "\n",
     "# Construct TapTree with Huffman constructor\n",
     "taptree = TapTree()\n",

diff --git a/solutions/2.5-huffman-solutions.ipynb b/solutions/2.5-huffman-solutions.ipynb
@@ -14,15 +14,15 @@
    "outputs": [],
    "source": [
     "internal_pubkey = ECPubKey()\n",
-    "internal_pubkey.set(bytes.fromhex('03af455f4989d122e9185f8c351dbaecd13adca3eef8a9d38ef8ffed6867e342e3'))\n",
+    "internal_pubkey.set(bytes.fromhex('af455f4989d122e9185f8c351dbaecd13adca3eef8a9d38ef8ffed6867e342e3'))\n",
     "\n",
     "# Derive pay-to-pubkey TapLeafs\n",
-    "privkeyA, pubkeyA = generate_key_pair()\n",
-    "privkeyB, pubkeyB = generate_key_pair()\n",
-    "privkeyC, pubkeyC = generate_key_pair()\n",
-    "privkeyD, pubkeyD = generate_key_pair()\n",
-    "privkeyE, pubkeyE = generate_key_pair()\n",
-    "privkeyF, pubkeyF = generate_key_pair()\n",
+    "privkeyA, pubkeyA = generate_bip340_key_pair()\n",
+    "privkeyB, pubkeyB = generate_bip340_key_pair()\n",
+    "privkeyC, pubkeyC = generate_bip340_key_pair()\n",
+    "privkeyD, pubkeyD = generate_bip340_key_pair()\n",
+    "privkeyE, pubkeyE = generate_bip340_key_pair()\n",
+    "privkeyF, pubkeyF = generate_bip340_key_pair()\n",
     "\n",
     "tapleafA = TapLeaf().construct_pk(pubkeyA)\n",
     "tapleafB = TapLeaf().construct_pk(pubkeyB)\n",