From fdb99a192b30d01bd28a645a7b018aed6f8aa094 Mon Sep 17 00:00:00 2001 From: newtonick Date: Sat, 16 Apr 2022 21:35:42 -0400 Subject: [PATCH 1/2] add missing derivation path required for single sig verification --- src/seedsigner/views/seed_views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/seedsigner/views/seed_views.py b/src/seedsigner/views/seed_views.py index bfac0043..9fb12d43 100644 --- a/src/seedsigner/views/seed_views.py +++ b/src/seedsigner/views/seed_views.py @@ -1413,6 +1413,7 @@ class SeedAddressVerificationView(View): descriptor=self.controller.multisig_wallet_descriptor, script_type=self.script_type, network=embit_network, + derivation_path=self.derivation_path, threadsafe_counter=self.threadsafe_counter, verified_index=self.verified_index, verified_index_is_change=self.verified_index_is_change, @@ -1482,7 +1483,7 @@ class SeedAddressVerificationView(View): class BruteForceAddressVerificationThread(BaseThread): - def __init__(self, address: str, seed: Seed, descriptor: Descriptor, script_type: str, network: str, threadsafe_counter: ThreadsafeCounter, verified_index: ThreadsafeCounter, verified_index_is_change: ThreadsafeCounter): + def __init__(self, address: str, seed: Seed, descriptor: Descriptor, script_type: str, network: str, derivation_path: str, threadsafe_counter: ThreadsafeCounter, verified_index: ThreadsafeCounter, verified_index_is_change: ThreadsafeCounter): """ Either seed or descriptor will be None """ @@ -1492,6 +1493,7 @@ class SeedAddressVerificationView(View): self.descriptor = descriptor self.script_type = script_type self.network = network + self.derivation_path = derivation_path self.threadsafe_counter = threadsafe_counter self.verified_index = verified_index self.verified_index_is_change = verified_index_is_change From 7a17935ce1c6997a8d4e4202db11826d877b3a2f Mon Sep 17 00:00:00 2001 From: newtonick Date: Sat, 16 Apr 2022 21:36:25 -0400 Subject: [PATCH 2/2] add bcr prefix to bitcoin address detection regex --- src/seedsigner/models/decode_qr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/seedsigner/models/decode_qr.py b/src/seedsigner/models/decode_qr.py index b0c034b2..3928ff8e 100644 --- a/src/seedsigner/models/decode_qr.py +++ b/src/seedsigner/models/decode_qr.py @@ -477,7 +477,7 @@ class DecodeQR: def is_bitcoin_address(s): if re.search(r'^bitcoin\:.*', s, re.IGNORECASE): return True - elif re.search(r'^((bc1|tb1|[123]|[mn])[a-zA-HJ-NP-Z0-9]{25,62})$', s): + elif re.search(r'^((bc1|tb1|bcr|[123]|[mn])[a-zA-HJ-NP-Z0-9]{25,62})$', s): # TODO: Handle regtest bcrt? return True else: