Skip to content

Commit 5f1933a

Browse files
axiom90axiom90
committed
fix: hdwallet tests and cli dumps
1 parent c366554 commit 5f1933a

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

‎hdwallet/cli/dump.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ def dump(**kwargs) -> None:
5151
if kwargs.get("hd") in [
5252
"BIP32", "BIP44", "BIP86", "Cardano"
5353
]:
54-
semantic = "P2PKH"
54+
semantic = cryptocurrency.DEFAULT_SEMANTIC
5555
elif kwargs.get("hd") == "BIP49":
56-
semantic = "P2WPKH_IN_P2SH"
56+
semantic = "p2wpkh-in-p2sh"
5757
elif kwargs.get("hd") in ["BIP84", "BIP141"]:
58-
semantic = "P2WPKH"
59-
58+
semantic = "p2wpkh"
59+
6060
hdwallet: HDWallet = HDWallet(
6161
cryptocurrency=cryptocurrency,
6262
hd=HDS.hd(name=kwargs.get("hd")),

‎hdwallet/cli/dumps.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ def dumps(**kwargs) -> None:
5757
if kwargs.get("hd") in [
5858
"BIP32", "BIP44", "BIP86", "Cardano"
5959
]:
60-
semantic = "P2PKH"
60+
semantic = cryptocurrency.DEFAULT_SEMANTIC
6161
elif kwargs.get("hd") == "BIP49":
62-
semantic = "P2WPKH_IN_P2SH"
62+
semantic = "p2wpkh-in-p2sh"
6363
elif kwargs.get("hd") in ["BIP84", "BIP141"]:
64-
semantic = "P2WPKH"
64+
semantic = "p2wpkh"
6565

6666
hdwallet: HDWallet = HDWallet(
6767
cryptocurrency=cryptocurrency,

‎tests/data/json/hdwallet.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
2020
"ecc": "SLIP10-Secp256k1",
2121
"hd": "BIP32",
22+
"semantic": "p2pkh",
2223
"root_xprivate_key": "xprv9s21ZrQH143K2vrrQFKzDyDJ6KR678AXpFLTLp34sTfFgDZcZ368TQJ6ZEem3EukEUteS8CXJ5Cds7Py5cXsPtppsPMGDLf4vfz1Af5GczB",
2324
"root_xpublic_key": "xpub661MyMwAqRbcFQwKWGrzb7A2eMFaWatPBUG49CSgRoCEZ1tm6aQP1CcaQWBSLvpb4rgie2v2WH7ETBnenbNvt9yDLc6Yscy9NDY1R35o34y",
2425
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -104,6 +105,7 @@
104105
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
105106
"ecc": "SLIP10-Secp256k1",
106107
"hd": "BIP32",
108+
"semantic": "p2pkh",
107109
"root_xprivate_key": "xprv9s21ZrQH143K2vrrQFKzDyDJ6KR678AXpFLTLp34sTfFgDZcZ368TQJ6ZEem3EukEUteS8CXJ5Cds7Py5cXsPtppsPMGDLf4vfz1Af5GczB",
108110
"root_xpublic_key": "xpub661MyMwAqRbcFQwKWGrzb7A2eMFaWatPBUG49CSgRoCEZ1tm6aQP1CcaQWBSLvpb4rgie2v2WH7ETBnenbNvt9yDLc6Yscy9NDY1R35o34y",
109111
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -197,6 +199,7 @@
197199
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
198200
"ecc": "SLIP10-Secp256k1",
199201
"hd": "BIP44",
202+
"semantic": "p2pkh",
200203
"root_xprivate_key": "xprv9s21ZrQH143K2vrrQFKzDyDJ6KR678AXpFLTLp34sTfFgDZcZ368TQJ6ZEem3EukEUteS8CXJ5Cds7Py5cXsPtppsPMGDLf4vfz1Af5GczB",
201204
"root_xpublic_key": "xpub661MyMwAqRbcFQwKWGrzb7A2eMFaWatPBUG49CSgRoCEZ1tm6aQP1CcaQWBSLvpb4rgie2v2WH7ETBnenbNvt9yDLc6Yscy9NDY1R35o34y",
202205
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -282,6 +285,7 @@
282285
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
283286
"ecc": "SLIP10-Secp256k1",
284287
"hd": "BIP44",
288+
"semantic": "p2pkh",
285289
"root_xprivate_key": "xprv9s21ZrQH143K2vrrQFKzDyDJ6KR678AXpFLTLp34sTfFgDZcZ368TQJ6ZEem3EukEUteS8CXJ5Cds7Py5cXsPtppsPMGDLf4vfz1Af5GczB",
286290
"root_xpublic_key": "xpub661MyMwAqRbcFQwKWGrzb7A2eMFaWatPBUG49CSgRoCEZ1tm6aQP1CcaQWBSLvpb4rgie2v2WH7ETBnenbNvt9yDLc6Yscy9NDY1R35o34y",
287291
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -375,6 +379,7 @@
375379
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
376380
"ecc": "SLIP10-Secp256k1",
377381
"hd": "BIP49",
382+
"semantic": "p2wpkh-in-p2sh",
378383
"root_xprivate_key": "yprvABrGsX5C9jantE3yEc7cS4JoGHZY3kA2jMrg8CvxFU38jKNqohFh5TxEaScM39Zfe81TBbo5kjZBkQ1XoJwtC8WRjj3goFUZCQ3eZDHdDXD",
379384
"root_xpublic_key": "ypub6QqdH2c5z7966i8SLdecoCFXpKQ2TCst6anGvbLZooa7c7hzMEZwdGGiRi92LqUWUVoXPWWaxwTnLUQDWHnwgPepCwnyTXnddwbeoceMDn7",
380385
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -460,6 +465,7 @@
460465
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
461466
"ecc": "SLIP10-Secp256k1",
462467
"hd": "BIP49",
468+
"semantic": "p2wpkh-in-p2sh",
463469
"root_xprivate_key": "yprvABrGsX5C9jantE3yEc7cS4JoGHZY3kA2jMrg8CvxFU38jKNqohFh5TxEaScM39Zfe81TBbo5kjZBkQ1XoJwtC8WRjj3goFUZCQ3eZDHdDXD",
464470
"root_xpublic_key": "ypub6QqdH2c5z7966i8SLdecoCFXpKQ2TCst6anGvbLZooa7c7hzMEZwdGGiRi92LqUWUVoXPWWaxwTnLUQDWHnwgPepCwnyTXnddwbeoceMDn7",
465471
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -553,6 +559,7 @@
553559
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
554560
"ecc": "SLIP10-Secp256k1",
555561
"hd": "BIP84",
562+
"semantic": "p2wpkh",
556563
"root_xprivate_key": "zprvAWgYBBk7JR8GjXF64xuEe9QJSFhyzN9XeUNtubpqdUR1nRC54MRFhXcNbeZw34Db3m8Fw5PeDPujdgd6X1MtzNC2c4k7PAJ3U87HwkVoEKc",
557564
"root_xpublic_key": "zpub6jftahH18ngZx1KZAzSF1HM2zHYUPpsP1hJVhzETBowzfDXDbtjWFKvrSv6cLk8Rt8vL8z79RbpLDm1nDzCxUdLR5HVQ3Sc7uffJCBw5df2",
558565
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -638,6 +645,7 @@
638645
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
639646
"ecc": "SLIP10-Secp256k1",
640647
"hd": "BIP84",
648+
"semantic": "p2wpkh",
641649
"root_xprivate_key": "zprvAWgYBBk7JR8GjXF64xuEe9QJSFhyzN9XeUNtubpqdUR1nRC54MRFhXcNbeZw34Db3m8Fw5PeDPujdgd6X1MtzNC2c4k7PAJ3U87HwkVoEKc",
642650
"root_xpublic_key": "zpub6jftahH18ngZx1KZAzSF1HM2zHYUPpsP1hJVhzETBowzfDXDbtjWFKvrSv6cLk8Rt8vL8z79RbpLDm1nDzCxUdLR5HVQ3Sc7uffJCBw5df2",
643651
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -731,6 +739,7 @@
731739
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
732740
"ecc": "SLIP10-Secp256k1",
733741
"hd": "BIP86",
742+
"semantic": "p2pkh",
734743
"root_xprivate_key": "xprv9s21ZrQH143K2vrrQFKzDyDJ6KR678AXpFLTLp34sTfFgDZcZ368TQJ6ZEem3EukEUteS8CXJ5Cds7Py5cXsPtppsPMGDLf4vfz1Af5GczB",
735744
"root_xpublic_key": "xpub661MyMwAqRbcFQwKWGrzb7A2eMFaWatPBUG49CSgRoCEZ1tm6aQP1CcaQWBSLvpb4rgie2v2WH7ETBnenbNvt9yDLc6Yscy9NDY1R35o34y",
736745
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -816,6 +825,7 @@
816825
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
817826
"ecc": "SLIP10-Secp256k1",
818827
"hd": "BIP86",
828+
"semantic": "p2pkh",
819829
"root_xprivate_key": "xprv9s21ZrQH143K2vrrQFKzDyDJ6KR678AXpFLTLp34sTfFgDZcZ368TQJ6ZEem3EukEUteS8CXJ5Cds7Py5cXsPtppsPMGDLf4vfz1Af5GczB",
820830
"root_xpublic_key": "xpub661MyMwAqRbcFQwKWGrzb7A2eMFaWatPBUG49CSgRoCEZ1tm6aQP1CcaQWBSLvpb4rgie2v2WH7ETBnenbNvt9yDLc6Yscy9NDY1R35o34y",
821831
"root_private_key": "71d5fdac4b53dd572e2ee1ce68a44c188f23d52d9da2d1eb68be1aec64dbd895",
@@ -1058,6 +1068,7 @@
10581068
"ecc": "Kholaw-Ed25519",
10591069
"hd": "Cardano",
10601070
"cardano_type": "byron-icarus",
1071+
"semantic": "p2pkh",
10611072
"root_xprivate_key": "xprv3QESAWYc9vDdZM9Bdjesu5kg7y96U53wy8U5NCuCxCu59ABX79xHenzyQR5VRnUkSjcVLrWhzG5t72tmWEKnWTd4z9RsRbxFSUfxRda8S2gcaS6jvU3Pvu4NwafqTT4LVko7GByLMjktccqC7BeVSGB",
10621073
"root_xpublic_key": "xpub661MyMwAqRbcEpLLkU4DJZnF85evKTzsTsZSD7yfGVKsqd7axPZwv1JsMHtX8RZgR4qLsfD7cotehYBdL3HFEzSZiXTsTqKQ5EADGK6CsiZ",
10631074
"root_private_key": "f0534df6179ab919521676c5a7fded650a1479a9bac5d200bcededa083f83c48292d592161a0f52d96412aa7cdeafd66803eef0e2e9de8f595e8aeaf0f4fad31",
@@ -1136,6 +1147,7 @@
11361147
"ecc": "Kholaw-Ed25519",
11371148
"hd": "Cardano",
11381149
"cardano_type": "byron-ledger",
1150+
"semantic": "p2pkh",
11391151
"root_xprivate_key": "xprv3QESAWYc9vDdZwJJo2ifc3reQ4o8bdWE42JgQMeYwLRQDUjzPrC6d7pJmZtSpNS5D3J6canMUaEJQYyDY95CE1UBid88ZvxyKZTJ3gMVQu9WkWqKXz1Ft1mnXTRu6KVfghLgmoDKKRwtpMwXvoqZQEi",
11401152
"root_xpublic_key": "xpub661MyMwAqRbcGoKPzwdHUnwLK5Rc9rdJwMaV3jxH2NAK48qsr945aeVm6L2H7kzv98MbSgeda2PRKZbY5bLow4r7R3N7YHbeKzPkdoM3T6A",
11411153
"root_private_key": "689308a99f89083e4b1d9f59e8aa386ccdcbaf6446a4e1ff755780191cb2eb503126caf83627a9abede5a5f87e77449f30f523a280217729b8c85bc7e6d69144",
@@ -1214,6 +1226,7 @@
12141226
"ecc": "Kholaw-Ed25519",
12151227
"hd": "Cardano",
12161228
"cardano_type": "byron-legacy",
1229+
"semantic": "p2pkh",
12171230
"root_xprivate_key": "xprv3QESAWYc9vDdZYxy9Ry7sfpow1v5c3MuvPju4bvk2ivjayGW1YaYarf57rvRCFbrUuxdmeRLvbtEWA5RbF6ccGJ9R7Vzra4WFotMAd5taAeZN5XbNgBbFuKnNHWrf4CuQnJKBcx3tK45wsBW6bYP93a",
12181231
"root_xpublic_key": "xpub661MyMwAqRbcFW8u4PUZ8nbdemp8BgccjykSrnSMFFHEYhVpca7SsXZtaWCBsxmv1tW6jwS9go9yhGzradA1F13QkgAzKa8uHpjRAkrEwdZ",
12191232
"root_private_key": "1850d3bdca31799bb2b43814227f921c04eb92c0ed39d9f0c31067bb4014904e141bd05618158045ecbe7fbd25e2954c60fa86c366b28e859ffc875f31b599a2",
@@ -1293,6 +1306,7 @@
12931306
"ecc": "Kholaw-Ed25519",
12941307
"hd": "Cardano",
12951308
"cardano_type": "shelley-icarus",
1309+
"semantic": "p2pkh",
12961310
"root_xprivate_key": "xprv3QESAWYc9vDdZM9Bdjesu5kg7y96U53wy8U5NCuCxCu59ABX79xHenzyQR5VRnUkSjcVLrWhzG5t72tmWEKnWTd4z9RsRbxFSUfxRda8S2gcaS6jvU3Pvu4NwafqTT4LVko7GByLMjktccqC7BeVSGB",
12971311
"root_xpublic_key": "xpub661MyMwAqRbcEpLLkU4DJZnF85evKTzsTsZSD7yfGVKsqd7axPZwv1JsMHtX8RZgR4qLsfD7cotehYBdL3HFEzSZiXTsTqKQ5EADGK6CsiZ",
12981312
"root_private_key": "f0534df6179ab919521676c5a7fded650a1479a9bac5d200bcededa083f83c48292d592161a0f52d96412aa7cdeafd66803eef0e2e9de8f595e8aeaf0f4fad31",
@@ -1371,6 +1385,7 @@
13711385
"ecc": "Kholaw-Ed25519",
13721386
"hd": "Cardano",
13731387
"cardano_type": "shelley-ledger",
1388+
"semantic": "p2pkh",
13741389
"root_xprivate_key": "xprv3QESAWYc9vDdZwJJo2ifc3reQ4o8bdWE42JgQMeYwLRQDUjzPrC6d7pJmZtSpNS5D3J6canMUaEJQYyDY95CE1UBid88ZvxyKZTJ3gMVQu9WkWqKXz1Ft1mnXTRu6KVfghLgmoDKKRwtpMwXvoqZQEi",
13751390
"root_xpublic_key": "xpub661MyMwAqRbcGoKPzwdHUnwLK5Rc9rdJwMaV3jxH2NAK48qsr945aeVm6L2H7kzv98MbSgeda2PRKZbY5bLow4r7R3N7YHbeKzPkdoM3T6A",
13761391
"root_private_key": "689308a99f89083e4b1d9f59e8aa386ccdcbaf6446a4e1ff755780191cb2eb503126caf83627a9abede5a5f87e77449f30f523a280217729b8c85bc7e6d69144",

0 commit comments

Comments
 (0)