Skip to content

Commit dd9747d

Browse files
authored
Fix/wallet import (#61)
* Change prompt for keyring passphrase * prompt changes for wallet import
1 parent 9fb7acb commit dd9747d

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

application/service/wallet_service.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@ def _import_wallet_with_mnemonic(self, mnemonic: str, key_id: str) -> None:
9494
log.info("Removed existing keyring folder")
9595

9696
bip39_mnemonic = Responder(
97-
pattern=f"> Enter your bip39 mnemonic", response=f"{mnemonic}\n"
97+
pattern=r"> Enter your bip39 mnemonic", response=f"{mnemonic}\n"
9898
)
9999
key_phrase_passphrase = Responder(
100-
pattern=f"Enter keyring passphrase (attempt 1/3):", response=f"{key_id}\n"
100+
pattern=r"Enter keyring passphrase \(attempt \d+/\d+\):", response=f"{key_id}\n"
101101
)
102102
re_key_phrase_passphrase = Responder(
103-
pattern=f"Re-enter keyring passphrase:", response=f"{key_id}\n"
103+
pattern=r"Re-enter keyring passphrase:", response=f"{key_id}\n"
104104
)
105105
override = Responder(
106-
pattern=f"override the existing name .*:", response=f"y\n"
106+
pattern=r"override the existing name.*:", response=f"y\n"
107107
)
108108

109109
command = f"~/bin/provider-services keys add provider --recover --keyring-backend {Config.KEYRING_BACKEND}"
@@ -136,7 +136,7 @@ def _import_wallet_with_mnemonic(self, mnemonic: str, key_id: str) -> None:
136136
def _verify_wallt_import(self, wallet: Wallet, wallet_address: str) -> None:
137137
try:
138138
key_phrase_passphrase = Responder(
139-
pattern=f"Enter keyring passphrase:", response=f"{wallet.key_id}\n"
139+
pattern=r"Enter keyring passphrase \(attempt \d+/\d+\):", response=f"{wallet.key_id}\n"
140140
)
141141
result, _ = run_ssh_command(
142142
self.ssh_client,
@@ -172,11 +172,10 @@ def _export_and_store_key(self, key_id: str) -> None:
172172
try:
173173

174174
export_passphrase_prompt = Responder(
175-
pattern=f"Enter passphrase to encrypt the exported key:",
176-
response=f"{key_id}\n",
175+
pattern=r"Enter passphrase to encrypt the exported key:", response=f"{key_id}\n"
177176
)
178177
passphrase_prompt = Responder(
179-
pattern=f"Enter keyring passphrase:", response=f"{key_id}\n"
178+
pattern=r"Enter keyring passphrase \(attempt \d+/\d+\):", response=f"{key_id}\n"
180179
)
181180

182181
export_command = f"~/bin/provider-services keys export provider --keyring-backend {Config.KEYRING_BACKEND}"

0 commit comments

Comments
 (0)