Skip to content

Commit d0bef83

Browse files
authored
Merge pull request #19 from chainxlab/axiom90/cli-test
Axiom90/cli test
2 parents 12b01a6 + afc03fc commit d0bef83

23 files changed

+1546
-363
lines changed

hdwallet/cli/__main__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,9 @@ def cli_seed(**kwargs) -> None:
254254
@click.option(
255255
"-se", "--semantic", type=str, default=None, help="Set Semantic for BIP141", show_default=True
256256
)
257+
@click.option(
258+
"-pi", "--payment-id", type=str, default=None, help="Set Payment ID for Monero", show_default=True
259+
)
257260
@click.option(
258261
"-ex", "--exclude", type=str, default="", help="Set Exclude keys from dumped", show_default=True
259262
)
@@ -378,6 +381,9 @@ def cli_dump(**kwargs) -> None: # cli_dumps(max_content_width=120)
378381
@click.option(
379382
"-se", "--semantic", type=str, default=None, help="Set Semantic for BIP141", show_default=True
380383
)
384+
@click.option(
385+
"-pi", "--payment-id", type=str, default=None, help="Set Payment ID for Monero", show_default=True
386+
)
381387
@click.option(
382388
"-ex", "--exclude", type=str, default="", help="Set Exclude keys from dumped", show_default=True
383389
)

hdwallet/cli/dump.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,15 @@ def dump(**kwargs) -> None:
5959
hd=HDS.hd(name=kwargs.get("hd")),
6060
network=kwargs.get("network"),
6161
public_key_type=kwargs.get("public_key_type"),
62+
language=kwargs.get("language"),
6263
passphrase=kwargs.get("passphrase"),
6364
cardano_type=kwargs.get("cardano_type"),
6465
address_type=kwargs.get("address_type"),
6566
staking_public_key=kwargs.get("staking_public_key"),
6667
mode=kwargs.get("mode"),
6768
mnemonic_type=kwargs.get("mnemonic_type"),
6869
checksum=kwargs.get("checksum"),
70+
payment_id=kwargs.get("payment_id"),
6971
semantic=semantic
7072
)
7173

@@ -86,11 +88,19 @@ def dump(**kwargs) -> None:
8688
f"Wrong mnemonic name, (expected={MNEMONICS.names()}, got='{kwargs.get('mnemonic_name')}')"
8789
), err=True)
8890
sys.exit()
89-
hdwallet.from_mnemonic(
90-
mnemonic=MNEMONICS.mnemonic(name=kwargs.get("mnemonic_name")).__call__(
91-
mnemonic=kwargs.get("mnemonic")
91+
if kwargs.get("mnemonic_name") == "Electrum-V2":
92+
hdwallet.from_mnemonic(
93+
mnemonic=MNEMONICS.mnemonic(name=kwargs.get("mnemonic_name")).__call__(
94+
mnemonic=kwargs.get("mnemonic"),
95+
mnemonic_type=kwargs.get("mnemonic_type")
96+
)
97+
)
98+
else:
99+
hdwallet.from_mnemonic(
100+
mnemonic=MNEMONICS.mnemonic(name=kwargs.get("mnemonic_name")).__call__(
101+
mnemonic=kwargs.get("mnemonic")
102+
)
92103
)
93-
)
94104
elif kwargs.get("seed"):
95105
if not SEEDS.is_seed(name=kwargs.get("seed_name")):
96106
click.echo(click.style(

hdwallet/cli/dumps.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,15 @@ def dumps(**kwargs) -> None:
6666
hd=HDS.hd(name=kwargs.get("hd")),
6767
network=kwargs.get("network"),
6868
public_key_type=kwargs.get("public_key_type"),
69+
language=kwargs.get("language"),
6970
passphrase=kwargs.get("passphrase"),
7071
cardano_type=kwargs.get("cardano_type"),
7172
address_type=kwargs.get("address_type"),
7273
staking_public_key=kwargs.get("staking_public_key"),
7374
mode=kwargs.get("mode"),
7475
mnemonic_type=kwargs.get("mnemonic_type"),
7576
checksum=kwargs.get("checksum"),
77+
payment_id=kwargs.get("payment_id"),
7678
semantic=semantic
7779
)
7880

@@ -93,11 +95,19 @@ def dumps(**kwargs) -> None:
9395
f"Wrong mnemonic name, (expected={MNEMONICS.names()}, got='{kwargs.get('mnemonic_name')}')"
9496
), err=True)
9597
sys.exit()
96-
hdwallet.from_mnemonic(
97-
mnemonic=MNEMONICS.mnemonic(name=kwargs.get("mnemonic_name")).__call__(
98-
mnemonic=kwargs.get("mnemonic")
98+
if kwargs.get("mnemonic_name") == "Electrum-V2":
99+
hdwallet.from_mnemonic(
100+
mnemonic=MNEMONICS.mnemonic(name=kwargs.get("mnemonic_name")).__call__(
101+
mnemonic=kwargs.get("mnemonic"),
102+
mnemonic_type=kwargs.get("mnemonic_type")
103+
)
104+
)
105+
else:
106+
hdwallet.from_mnemonic(
107+
mnemonic=MNEMONICS.mnemonic(name=kwargs.get("mnemonic_name")).__call__(
108+
mnemonic=kwargs.get("mnemonic")
109+
)
99110
)
100-
)
101111
elif kwargs.get("seed"):
102112
if not SEEDS.is_seed(name=kwargs.get("seed_name")):
103113
click.echo(click.style(

0 commit comments

Comments
 (0)