From 758f8e5a470fbde296b80bf53d4bab6831cfcc1f Mon Sep 17 00:00:00 2001 From: newtonick Date: Mon, 26 Jul 2021 14:22:07 -0400 Subject: [PATCH 1/3] bw fix for invalid psbt check --- src/seedsigner/models/blue_wallet.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/seedsigner/models/blue_wallet.py b/src/seedsigner/models/blue_wallet.py index 2f3feea3..dad039b2 100644 --- a/src/seedsigner/models/blue_wallet.py +++ b/src/seedsigner/models/blue_wallet.py @@ -85,6 +85,8 @@ class BlueWallet(Wallet): self.controller.to_camera_queue.put(["stop"]) if self.qr_data[0] == "invalid": return "invalid" + elif self.qr_data[0] == "invalidpsbt": + return "invalid" return b2a_base64(cbor_decode(self.ur_decoder.result.cbor)) def process_camera_data(self): From 0295b1a61f3e3ff7d25d6018dba18e0c0ba2187e Mon Sep 17 00:00:00 2001 From: Nick Klockenga Date: Tue, 27 Jul 2021 17:29:50 +0100 Subject: [PATCH 2/3] exclude src/seedsigner.egg-info/ from repo --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9f2e8485..e5df4958 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store __pycache__/ +src/seedsigner.egg-info/ From 9daaaec242c8e86b1c9581fa68d9715fb24cea74 Mon Sep 17 00:00:00 2001 From: Nick Klockenga Date: Tue, 27 Jul 2021 17:45:58 +0100 Subject: [PATCH 3/3] disable ur2 decode checksum until ur2 lib is fixed --- src/seedsigner/helpers/ur2/bytewords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/seedsigner/helpers/ur2/bytewords.py b/src/seedsigner/helpers/ur2/bytewords.py index 8c917898..b7e8432a 100644 --- a/src/seedsigner/helpers/ur2/bytewords.py +++ b/src/seedsigner/helpers/ur2/bytewords.py @@ -107,8 +107,8 @@ def decode(s, separator, word_len): body = buf[0:-4] body_checksum = buf[-4:] checksum = crc32_bytes(body) - if checksum != body_checksum: - raise ValueError('Invalid Bytewords.') + # if checksum != body_checksum: + # raise ValueError('Invalid Bytewords.') return body