From 7ea3f95eff1eafa5c159f951425ee537df2a08c2 Mon Sep 17 00:00:00 2001
From: joaozinhom
Date: Wed, 8 Jul 2026 18:02:40 -0300
Subject: [PATCH 01/28] docs(parts): mark Maix Amigo as discontinued, drop sale
links
---
docs/parts.en.md | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/docs/parts.en.md b/docs/parts.en.md
index f94e0ba34..9bf5beefe 100644
--- a/docs/parts.en.md
+++ b/docs/parts.en.md
@@ -63,14 +63,7 @@ Krux was first ported to this device in March 2022. Featuring the smallest scree
### Maix Amigo
-Krux has supported this device since its second version in August 2022. It offers the largest screen size and resolution, a touchscreen, and a built-in battery. Below is a list of distributors where it is available:
-
-- [AliExpress](https://www.aliexpress.com/w/wholesale-sipeed-amigo.html)
-- [Seeed Studio](https://www.seeedstudio.com/Sipeed-Maix-Amigo-p-4689.html)
-- [Digi-Key](https://www.digikey.com/en/products/detail/seeed-technology-co-ltd/102110463/13168813)
-- [Mouser](https://www.mouser.com/c/?q=sipeed)
-- [Electromaker](https://www.electromaker.io/shop/search/sipeed)
-- [スイッチサイエンス](https://www.switch-science.com/search?q=maix+amigo)
+Krux has supported this device since its second version in August 2022. It offers the largest screen size and resolution, a touchscreen, and a built-in battery. This device has been discontinued and is no longer available for sale, but Krux continues to support it.
From 2fe2f5f5332d08f385480a76a91814e2e7477558 Mon Sep 17 00:00:00 2001
From: odudex
Date: Wed, 29 Jul 2026 14:50:53 -0300
Subject: [PATCH 02/28] refactor: use native uUR on tests and simulator
Replace the pure-Python ur/urtypes vendor packages with the uUR CPython
extension built from the bc-ur submodule, so host and device run identical
UR code. Drops the simulator shim that mapped one API onto the other.
Tests now need a C compiler and Python headers.
---
.gitmodules | 6 --
.pylintrc | 19 ++++-
CHANGELOG.md | 4 +-
LICENSE.md | 3 +-
README.md | 4 +-
firmware/MaixPy | 2 +-
pyproject.toml | 9 +-
simulator/kruxsim/mocks/uUR.py | 145 ---------------------------------
simulator/simulator.py | 1 -
tests/conftest.py | 12 +--
tests/pages/test_datum_tool.py | 15 ++--
tests/pages/test_login.py | 2 +-
tests/pages/test_qr_capture.py | 9 +-
tests/test_psbt.py | 57 ++++++-------
tests/test_qr.py | 32 +++++---
tests/test_wallet.py | 20 +++--
uv.lock | 15 +---
vendor/foundation-ur-py | 1 -
vendor/urtypes | 1 -
19 files changed, 108 insertions(+), 249 deletions(-)
delete mode 100644 simulator/kruxsim/mocks/uUR.py
delete mode 160000 vendor/foundation-ur-py
delete mode 160000 vendor/urtypes
diff --git a/.gitmodules b/.gitmodules
index 9ff0259ee..5d362fa22 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,6 @@
[submodule "embit"]
path = vendor/embit
url = ../../diybitcoinhardware/embit
-[submodule "urtypes"]
- path = vendor/urtypes
- url = ../../selfcustody/urtypes
-[submodule "foundation-ur-py"]
- path = vendor/foundation-ur-py
- url = ../../selfcustody/foundation-ur-py
[submodule "firmware/Kboot"]
path = firmware/Kboot
url = ../../selfcustody/Kboot
diff --git a/.pylintrc b/.pylintrc
index 3217e9f91..75e686361 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -3,7 +3,9 @@
# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
# run arbitrary code.
-extension-pkg-whitelist=
+# uUR is the native BC-UR module: pylint has to import it to see UR, URDecoder,
+# UREncoder and Types, which it cannot deduce from a compiled extension.
+extension-pkg-whitelist=uUR
# Specify a score threshold to be exceeded before program exits with error.
fail-under=10.0
@@ -14,9 +16,7 @@ ignore=CVS,
.vagrant,
build,
embit,
- foundation-ur-py,
MaixPy,
- urtypes,
translations.py
# Add files or directories matching the regex patterns to the blacklist. The
@@ -183,9 +183,20 @@ contextmanager-decorators=contextlib.contextmanager
# List of members which are set dynamically and missed by pylint inference
# system, and so shouldn't trigger E1101 when accessed. Python regular
# expressions are accepted.
+# uUR.Types is a submodule the C extension builds at import time, so pylint
+# infers it as a bare module and cannot enumerate its codecs. Listing them keeps
+# the rest of uUR checked instead of silencing the whole module.
generated-members=sleep_ms,
ticks_ms,
- print_exception
+ print_exception,
+ CRYPTO_PSBT_TYPE,
+ bip39_words_from_cbor,
+ bytes_from_cbor,
+ bytes_to_cbor,
+ output_from_cbor,
+ output_from_cbor_account,
+ psbt_from_cbor,
+ psbt_to_cbor
# Tells whether missing members accessed in mixin class should be ignored. A
# mixin class is detected if its name ends with "mixin" (case insensitive).
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4816207de..d3727da95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,8 @@
### Stackbit 1248 Vertical Layout
Added vertical layout option for Stackbit 1248 backup display, allowing users to choose between Standard (horizontal) and Vertical (transposed) grid orientations.
-### Migrate UR encoding to uUR MicroPython C module
-Switch from the pure-Python urtypes and foundation-ur-py packages to the new uUR C module, allowing faster UR QR codes decoding with a smaller RAM footprint.
+### Migrate UR encoding to uUR C module
+Switch from the pure-Python urtypes and foundation-ur-py packages to the new uUR C module, allowing faster UR QR codes decoding with a smaller RAM footprint. Tests and the simulator now build the same module for CPython instead of shimming the pure-Python packages, so host and device run identical UR code.
### Other Bug Fixes and Improvements
- Improve scan TinySeed and other binary visibility by drawing punches only
diff --git a/LICENSE.md b/LICENSE.md
index acdd5f37d..199103afa 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -7,8 +7,7 @@ All the source code in this repository is either MIT or Apache v2.0 licensed. Mo
The source code for the `MaixPy` firmware (which has been modified by the repository owner) is under the Apache v2.0 license. The source code within it related to `MicroPython` and `OpenMV` is released separately under the MIT license.
The source code for the `embit` library is under the MIT license.
-The source code for the `urtypes` library is under the MIT license.
-The source code for the `foundation-ur-py` library is under the BSD-2-Clause Plus Patent license.
+The source code for the `cUR` library, which provides the `uUR` UR encoder/decoder module, is under the BSD-2-Clause Plus Patent license.
The source code for the `Adafruit Thermal Printer` library is under the MIT license.
The source code for the `Kboot` bootloader is under the Apache v2.0 license.
diff --git a/README.md b/README.md
index 0dbd20cfa..da06a7faf 100644
--- a/README.md
+++ b/README.md
@@ -66,11 +66,13 @@ To build and flash the firmware:
The first time, the build can take around an hour or so to complete. Subsequent builds should take only a few minutes. If all goes well, you should see a new `build` folder containing `firmware.bin` and `kboot.kfpkg` files when the build completes.
## Install Krux and dev tools
-Krux uses [uv](https://docs.astral.sh/uv/) for Python packaging and environment management. Install uv by following its [installation guide](https://docs.astral.sh/uv/getting-started/installation/), then sync the project to install runtime deps ([embit](https://github.com/diybitcoinhardware/embit), [ur](https://github.com/selfcustody/foundation-ur-py), [urtypes](https://github.com/selfcustody/urtypes)) along with the `dev` group ([pytest](https://docs.pytest.org), [pylint](https://pypi.org/project/pylint/), [black](https://github.com/psf/black) and i18n helpers):
+Krux uses [uv](https://docs.astral.sh/uv/) for Python packaging and environment management. Install uv by following its [installation guide](https://docs.astral.sh/uv/getting-started/installation/), then sync the project to install runtime deps ([embit](https://github.com/diybitcoinhardware/embit) and [uUR](https://github.com/selfcustody/cUR), the native UR module compiled from the same sources the devices run) along with the `dev` group ([pytest](https://docs.pytest.org), [pylint](https://pypi.org/project/pylint/), [black](https://github.com/psf/black) and i18n helpers):
```bash
uv sync
```
+> **`uUR` is a C extension** It is built from the `bc-ur` submodule nested under `firmware/MaixPy`, so clone with `--recursive` (or run `git submodule update --init --recursive`) and make sure a C compiler and the Python development headers are installed (`python3-dev` on Debian/Ubuntu). After changing the submodule, rebuild it with `uv sync --reinstall-package uUR`.
+
`uv sync` creates a `.venv` in the project root, resolves `uv.lock` if needed, and installs everything — this is the day-to-day command. When dependencies in `pyproject.toml` change but you only want to refresh `uv.lock` without touching the venv, run `uv lock` instead; `uv sync` will then pick the new pins on its next run.
> **CI uses `uv sync --frozen`** The workflows refuse to silently re-resolve when `uv.lock` drifts (we value a lot reproducible builds). Whenever you edit `pyproject.toml` (add, remove, or bump a dependency), run `uv lock` (or `uv sync`) and commit `uv.lock` (in same change). Otherwise CI will fail.
diff --git a/firmware/MaixPy b/firmware/MaixPy
index b334e262b..edb0cc97f 160000
--- a/firmware/MaixPy
+++ b/firmware/MaixPy
@@ -1 +1 @@
-Subproject commit b334e262be92658a8b4fd95aa752ee0401e03e71
+Subproject commit edb0cc97f7529f0735c93b206abee1e266938535
diff --git a/pyproject.toml b/pyproject.toml
index 6adcf7107..8293440ab 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,8 +30,7 @@ license = { text = "MIT" }
requires-python = ">=3.11.5, <3.13"
dependencies = [
"embit",
- "ur",
- "urtypes",
+ "uUR",
]
[project.optional-dependencies]
@@ -76,8 +75,10 @@ package = false
[tool.uv.sources]
embit = { path = "vendor/embit", editable = true }
-ur = { path = "vendor/foundation-ur-py", editable = true }
-urtypes = { path = "vendor/urtypes", editable = true }
+# Native BC-UR module, the same cUR sources the devices run. Not editable: it is
+# a C extension, so it has to be rebuilt (uv sync --reinstall-package uUR) after
+# changing the submodule anyway.
+uUR = { path = "firmware/MaixPy/components/micropython/port/src/bc-ur" }
[tool.pytest.ini_options]
pythonpath = ["src"]
diff --git a/simulator/kruxsim/mocks/uUR.py b/simulator/kruxsim/mocks/uUR.py
deleted file mode 100644
index e125b4321..000000000
--- a/simulator/kruxsim/mocks/uUR.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# The MIT License (MIT)
-
-# Copyright (c) 2021-2025 Krux contributors
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-"""CPython shim that mirrors the firmware's uUR C module by re-exporting
-the pure-Python `urtypes` and `foundation-ur-py` packages under the same
-public surface (UR, URDecoder, UREncoder, Types).
-"""
-
-import sys
-
-from ur.ur import UR
-from ur.ur_decoder import URDecoder as _URDecoder
-from ur.ur_encoder import UREncoder as _UREncoder
-
-from urtypes.bytes import Bytes as _Bytes
-from urtypes.crypto.account import Account as _Account
-from urtypes.crypto.bip39 import BIP39 as _BIP39
-from urtypes.crypto.output import Output as _Output
-from urtypes.crypto.psbt import PSBT as _PSBT
-
-
-class UREncoder(_UREncoder):
- """uUR's encoder emits uppercase Bytewords; the Python encoder emits
- lowercase. Match firmware behaviour by uppercasing here."""
-
- def next_part(self):
- return super().next_part().upper()
-
-
-# Decoder states, mirroring uUR's DECODER_* constants (ur_decoder_state_t)
-DECODER_OK = 0
-DECODER_PROCESSING = 1
-DECODER_NO_RESULT = 2
-DECODER_ERR_INVALID_SCHEME = 16
-DECODER_ERR_INVALID_TYPE = 17
-DECODER_ERR_INVALID_PATH_LENGTH = 18
-DECODER_ERR_INVALID_SEQUENCE_COMPONENT = 19
-DECODER_ERR_INVALID_FRAGMENT = 20
-DECODER_ERR_INVALID_PART = 21
-DECODER_ERR_INVALID_CHECKSUM = 22
-DECODER_ERR_MEMORY = 23
-DECODER_ERR_NULL_POINTER = 24
-
-_TERMINAL_STATES = (DECODER_OK, DECODER_NO_RESULT, DECODER_ERR_INVALID_CHECKSUM)
-
-
-class URDecoder(_URDecoder):
- """uUR exposes expected_part_count and processed_parts_count as plain
- int attributes (zero for single-part URs), and reports progress through a
- state machine instead of is_complete()/is_success(). Mirror that here so
- the same qr.py logic works against both decoders.
-
- The Python decoder swallows the reason a part was rejected, so transient
- errors are all reported as DECODER_ERR_INVALID_PART."""
-
- def __init__(self):
- super().__init__()
- self._state = DECODER_PROCESSING
-
- @property
- def state(self):
- return self._state
-
- def receive_part(self, part):
- # Terminal states are permanent: the part is not processed
- if self._state in _TERMINAL_STATES:
- return self._state
- received = super().receive_part(part)
- if isinstance(self.result, Exception):
- self._state = DECODER_ERR_INVALID_CHECKSUM
- elif self.result is not None:
- self._state = DECODER_OK
- elif not received:
- self._state = DECODER_ERR_INVALID_PART
- else:
- self._state = DECODER_PROCESSING
- return self._state
-
- @property
- def expected_part_count(self):
- if self.fountain_decoder.expected_part_indexes is None:
- return 0
- return len(self.fountain_decoder.expected_part_indexes)
-
- @property
- def processed_parts_count(self):
- return self.fountain_decoder.processed_parts_count
-
-
-class Types:
- CRYPTO_PSBT_TYPE = "crypto-psbt"
- CRYPTO_BIP39_TYPE = "crypto-bip39"
- CRYPTO_OUTPUT_TYPE = "crypto-output"
- CRYPTO_ACCOUNT_TYPE = "crypto-account"
-
- @staticmethod
- def psbt_from_cbor(cbor):
- return _PSBT.from_cbor(cbor).data
-
- @staticmethod
- def psbt_to_cbor(data):
- return _PSBT(data).to_cbor()
-
- @staticmethod
- def bytes_from_cbor(cbor):
- return _Bytes.from_cbor(cbor).data
-
- @staticmethod
- def bytes_to_cbor(data):
- return _Bytes(data).to_cbor()
-
- @staticmethod
- def bip39_words_from_cbor(cbor):
- return _BIP39.from_cbor(cbor).words
-
- @staticmethod
- def output_from_cbor(cbor):
- return _Output.from_cbor(cbor).descriptor()
-
- @staticmethod
- def output_from_cbor_account(cbor):
- return _Account.from_cbor(cbor).output_descriptors[0].descriptor()
-
-
-if "uUR" not in sys.modules:
- sys.modules["uUR"] = sys.modules[__name__]
diff --git a/simulator/simulator.py b/simulator/simulator.py
index 16e58384b..c0c093247 100644
--- a/simulator/simulator.py
+++ b/simulator/simulator.py
@@ -108,7 +108,6 @@
from kruxsim.mocks import secp256k1
from kruxsim.mocks import qrcode
-from kruxsim.mocks import uUR # noqa: F401
from kruxsim.mocks import sensor
from kruxsim.mocks import shannon
from kruxsim.mocks import ft6x36
diff --git a/tests/conftest.py b/tests/conftest.py
index 729b639a8..15c2f2a29 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,11 +1,3 @@
-import os
-import sys
-
-# Make the simulator's mock packages importable so tests can reuse the uUR shim.
-_SIMULATOR_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "simulator")
-if _SIMULATOR_DIR not in sys.path:
- sys.path.insert(0, _SIMULATOR_DIR)
-
from Crypto.Cipher import AES
import pytest
from .shared_mocks import (
@@ -57,9 +49,9 @@ def mp_modules(mocker, monkeypatch):
import time
import sys
import hashlib
- from kruxsim.mocks import uUR as uur_shim
- monkeypatch.setitem(sys.modules, "uUR", uur_shim)
+ # uUR is the native BC-UR extension, installed as a real dependency, so it
+ # needs no mock: tests exercise the same module the firmware does.
monkeypatch.setitem(
sys.modules,
"qrcode",
diff --git a/tests/pages/test_datum_tool.py b/tests/pages/test_datum_tool.py
index 6b24c2c2e..24757a190 100644
--- a/tests/pages/test_datum_tool.py
+++ b/tests/pages/test_datum_tool.py
@@ -25,9 +25,7 @@ def mock_file_operations(mocker):
def test_urobj_to_data(m5stickv, mocker):
"""Test that urobj_to_data returns flattened data from UR objects."""
from krux.pages.datum_tool import urobj_to_data
- from ur.ur import UR
- from urtypes.crypto.psbt import PSBT
- from urtypes.bytes import Bytes
+ from uUR import UR, Types
UR_BIP39_WORDS_BYTES = b"\xa2\x01\x8cfshieldegroupeerodeeawakedlockgsausagedcasheglaredwavedcreweflameeglove\x02ben"
MNEMONIC = "shield group erode awake lock sausage cash glare wave crew flame glove"
@@ -42,15 +40,15 @@ def test_urobj_to_data(m5stickv, mocker):
"expected": MULTISIG_DESCR,
},
{
- "control": UR("crypto-psbt", PSBT(P2PKH_PSBT_BYTES).to_cbor()),
+ "control": UR("crypto-psbt", Types.psbt_to_cbor(P2PKH_PSBT_BYTES)),
"expected": P2PKH_PSBT_BYTES,
},
{
- "control": UR("bytes", Bytes(MULTISIG_DESCR.encode()).to_cbor()),
+ "control": UR("bytes", Types.bytes_to_cbor(MULTISIG_DESCR.encode())),
"expected": MULTISIG_DESCR.encode(),
},
{
- "control": UR("bytes", Bytes(P2PKH_PSBT_BYTES).to_cbor()),
+ "control": UR("bytes", Types.bytes_to_cbor(P2PKH_PSBT_BYTES)),
"expected": P2PKH_PSBT_BYTES,
},
]
@@ -316,12 +314,11 @@ def test_datumtoolmenu_scan_qr_abort(m5stickv, mocker):
page = DatumToolMenu(ctx).run()
assert ctx.input.wait_for_button.call_count == len(BTN_SEQUENCE)
- from ur.ur import UR
- from urtypes.bytes import Bytes
+ from uUR import UR, Types
# scan UR-QR (for coverage), then back out of datum tool
MULTISIG_DESCR = "wsh(multi(1,xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/1/0/*,xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH/0/0/*))#t2zpj2eu"
- ur_obj = UR("bytes", Bytes(MULTISIG_DESCR.encode()).to_cbor())
+ ur_obj = UR("bytes", Types.bytes_to_cbor(MULTISIG_DESCR.encode()))
mocker.patch.object(QRCodeCapture, "qr_capture_loop", new=lambda self: (ur_obj, 2))
BTN_SEQUENCE = (
BUTTON_ENTER, # go Scan QR
diff --git a/tests/pages/test_login.py b/tests/pages/test_login.py
index 33d189b56..434badc48 100644
--- a/tests/pages/test_login.py
+++ b/tests/pages/test_login.py
@@ -513,7 +513,7 @@ def test_load_12w_camera_qrcode_format_ur(m5stickv, mocker, mocker_printer):
from krux.qr import FORMAT_UR
from krux.pages.qr_capture import QRCodeCapture
import binascii
- from ur.ur import UR
+ from uUR import UR
BTN_SEQUENCE = (
# 1 press to proceed with the 12 words
diff --git a/tests/pages/test_qr_capture.py b/tests/pages/test_qr_capture.py
index 49ec8446e..c1c3c26f9 100644
--- a/tests/pages/test_qr_capture.py
+++ b/tests/pages/test_qr_capture.py
@@ -15,8 +15,7 @@
def test_capture_qr_code(mocker, multiple_devices, tdata):
from krux.pages.qr_capture import QRCodeCapture
from krux.qr import FORMAT_PMOFN, FORMAT_UR
- from ur.ur import UR
- from urtypes.crypto.psbt import PSBT
+ from uUR import UR, Types
from krux.wdt import wdt
cases = [
@@ -54,7 +53,7 @@ def test_capture_qr_code(mocker, multiple_devices, tdata):
assert qr_code == case[1]
assert qr_format == FORMAT_PMOFN
elif isinstance(qr_code, UR):
- qr_data = PSBT.from_cbor(qr_code.cbor).data
+ qr_data = Types.psbt_from_cbor(qr_code.cbor)
assert qr_data == case[1]
assert qr_format == FORMAT_UR
@@ -263,10 +262,10 @@ def test_capture_qr_code_loop_duplicated_frames(mocker, m5stickv, tdata):
def test_qr_str_to_bytes(mocker, m5stickv):
from krux.pages.qr_capture import qr_str_to_bytes
- from ur.ur import UR
+ from uUR import UR
# return any non-string input as is
- for input_data in [b"already bytes", UR("a_ur_type", b"cbor bytes")]:
+ for input_data in [b"already bytes", UR("a-ur-type", b"cbor bytes")]:
assert qr_str_to_bytes(input_data) == input_data
# return ascii string as a str
diff --git a/tests/test_psbt.py b/tests/test_psbt.py
index 8ed167fac..7c653bbdc 100644
--- a/tests/test_psbt.py
+++ b/tests/test_psbt.py
@@ -10,8 +10,7 @@
@pytest.fixture
def tdata(mocker):
from collections import namedtuple
- from ur.ur import UR
- from urtypes.crypto.psbt import PSBT
+ from uUR import UR, Types
from krux.bbqr import encode_bbqr
TEST_MNEMONIC = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
@@ -21,13 +20,13 @@ def tdata(mocker):
P2PKH_PSBT_B43 = "GG*F8Q17IWZRLD2-18VY*1TXTGM*I+$R6ZULQ0*57H0JP/$S*/1MU2DNKKAF2TQ9DRXY:RGZ78NURNB7C8TK6LY29E7BIE9G7.99+L1U.2/PW68CG$AUH-2.S2YIFN9UQT4XMR5M1$TT5W+YR3U+XG:5RG/F+V5+4J9AFUW.ZE:YFX+/SE8T0MVUG5GR--W:9:7.ZRXCXM+$0JI:VPIF5GRR4K.LYVYRHR6C532UV++/AXRKCDNXT8CO-UZ+C4:XA/5SWA/Q.1G*.QAINY88NQ4JI-/7V+AW/Y9DFHU/L8FHLI0NRJI2C5$R1P2NS37$-K9-C-2-*5JJP.0:GD:B4D9.336TSMF*09EV4H+N-ZZXFV57+Z*GO-QTKZZ4R$9LCG+N97G-VOG:UCSKQTH.Y7O/RHS3LBM*/I+CFV2QODT7SJA*9N47MGX*Z/X4ZY2OY2-0TH7JKSU$ZTTB32Y4L0BKQCF*41$KFA1PEO2*/4+3$YV9/$DN*OZIO9Q:/HI7$94Q::8C9AG9U-/3UFQVJ94BZY*8DMT5QDBY4207KE12IKKWWYHN7+1.T*QVQYHQ2.Y-+VSM21FIB9CG4.63.I-OLBT-/M28*O-6+*DQV9HB-J/HEXIE.7$0H.UPJPRNIE.8TEYQCDYDPE9Q0E0D+HYP8YMJF2ODHGAT/E15-X:J.4J9P3Z-2R4:L2-S6CX7LF+I3A35M.BYF/XQLAJX92G1A-R0FF036U4Y2BKSI*/LAXWO9Q4KQBGJRLF:WZOE-:L76F2LJ5/-25TK7H$PMZON1AK735JQ0U9YZTLE$WMT.APZ65T8FR$NC9ZBXI46$B5-IG0$D8I-LF:TZCBJ81/0:V4$4*QX84ZP$Q/4120FZS:98YODBIL5W+EZ-+AXSPEW9/L+8Q0SGV*AX:8PSOAX+17:O+4V*7RA8YHD3OO-$57XMH7QH5TGCVBJHLZWQDI0*2VP6-5XNSK187-Y1C747124EI4B/XO3Z+-126R.5RA1.74WBV2DF:ECPVXEOXHPPAMP3ARKRH.IZQ.CQP9IKZN6+Z70WY+X:QSFHQFQJ-OZTM5F**E+KL4W:RE7OCI4ZC8SOEF89T5AA1O8XZGYZ*Q5AJSF2NQHE3H8DF-1S$GWHKFQX5JX0YWUV$"
P2PKH_PSBT_B58 = "23c6ymBTk6EPbwvP3j8ozTBrkZ8TSBgW19wbakNqZTW8m7ac1XmyY8j9F7PezXGAa28kf8hdq2wF75LZhJWUNaCEwKMomEaRqcQwAfVXkTF9CzhGFtTv8XdhY7Xe8j1Phj9zJFCQ8MJ2d9Eb8kmRGmA6BcPHArVe9c5UrxQrUoXw3nJeLyGELYm6sd2bcu3gotYTejiJW2r3YcYxwnpKN32G9PsAeZ6oULLWG4rH7tKCUMWZkrPiQKdviZkpXJj3KybK21RsZCyvJnqWtCMKZBjE55TXkfWM3EC9TAStk2n85o72v2chGwJojXDdET4ZWpZgX9Qzfh9C24nsbedTGq1zNECwpbdvz43VUjz7LUtzNcfHhYipk6hD69he4dwFM4ACE2prm7b7wwmqonN7JMt59v1oZpDRphXbRxxPNvdao2kryGfrzhrk4H1UJWPouoUA7QaNW3wYENFHafw6cLyuQAETZ8RCYN2gujxw5QNZLSGB4HiKvPY1aQK6rvnE9DsiTzhEs5Rbrsd3H9BfRxoerAbUN4zxYPmgosrTNwnpDUtHvr2n6c1qGBJTu4o3wLHfm6VpyWiLrK9eissxhqAAuB2CnmdKhQq5t1RLDykYVbhJPCKzwchWr75jmAPKJRzAfZ7GUXx49YqdKcDtkJiRxHRUChh5ww2zYo8TpjHMAbHELosS7GsLhnzzPsyDnVPFaxWYwV6R7pFfZHXgMjp8zE6yEnHXoFvfNVegGFC9hnJgHm3VWw6k1cGKnh78kpW9pXih4GhV2KN6DueSonRtY6gVqVMp8jbtoXohr1vHuBag1VMvntfnFJDorjb1dtwRfbZ6bVNmY1C1efiwmF433hyEEbXPS477F2teZ2Guhj7EuEF785WxENndw27Knh4Z5DjStX9i7busoyFnE2vtZgEhrioa5cipTvaMins89yxSVNMJXf1aq6HCkqhE6p3seBPodq26KoJZNAB9qx4KhQpobGiM2y1bdpxourumW8cWJAWEJS1bFfJUSAH8b7u4y3DvxMYMpK3AjE1CqGtLECiyuikMwekuHtXTJX"
P2PKH_PSBT_B64 = "cHNidP8BAKQCAAAAA67iNa8omsnuwjPKIhW/P/TBynhBUNYPW5RrQYeLFQQsAAAAAAD9////VMmRacRaSWcgWiHWKb8rehYxxHVvUyDwnZbPI9zbY6AAAAAAAP3///8EHlZ0jYBIH4lrB1Qoyq+RHiIaMu+lX1xz+YvCSqDIEQAAAAAA/f///wHoAwAAAAAAABYAFK7NHtw+/2WqIJ0CFec9cJBdwWhsWg8rAE8BBDWHzwMGsDf2gAAAAGsixRI7oQrer0v8u0XRoC2CjyW/hkaVepjQYofE4rhQAotCzUd2N2yCeRtJQVUVH1bC17Rx4MelJqfOYN2HLjhnEHPF2gosAACAAQAAgAAAAIAAAQB+AgAAAAKam+HKKRBcl3Q8D9HuecDmDSKKYcjsv3T558/6ARkMewIAAAAA/f///5qb4copEFyXdDwP0e55wOYNIophyOy/dPnnz/oBGQx7AQAAAAD9////AUAHAAAAAAAAGXapFDotQUWk8JhSOz6BJ/Hah8/FW455iKxaDysAAQMEAQAAACIGAqdFE5VzU2ny7N/IKcD3dOiO8TA9/lsvBNuqswpTXf3WGHPF2gosAACAAQAAgAAAAIAAAAAAAAAAAAABAFUCAAAAAYczIGnXEafNKmDVhBw4CixV6KIK3dpWopwAhGXv9luiAQAAAAD/////AQAAAAAAAAAAGXapFDotQUWk8JhSOz6BJ/Hah8/FW455iKwAAAAAAQMEAQAAACIGAqdFE5VzU2ny7N/IKcD3dOiO8TA9/lsvBNuqswpTXf3WGHPF2gosAACAAQAAgAAAAIAAAAAAAAAAAAABAFUCAAAAAQVqwKciH+WCeMmnaNAaIea2R0oBmvbnPwjIUuaGfK2lAAAAAAD/////AQAAAAAAAAAAGXapFDotQUWk8JhSOz6BJ/Hah8/FW455iKwAAAAAAQMEAQAAACIGAqdFE5VzU2ny7N/IKcD3dOiO8TA9/lsvBNuqswpTXf3WGHPF2gosAACAAQAAgAAAAIAAAAAAAAAAAAAA"
- P2PKH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(P2PKH_PSBT).to_cbor())
+ P2PKH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(P2PKH_PSBT))
SIGNED_P2PKH_PSBT = b'psbt\xff\x01\x00\xa4\x02\x00\x00\x00\x03\xae\xe25\xaf(\x9a\xc9\xee\xc23\xca"\x15\xbf?\xf4\xc1\xcaxAP\xd6\x0f[\x94kA\x87\x8b\x15\x04,\x00\x00\x00\x00\x00\xfd\xff\xff\xffT\xc9\x91i\xc4ZIg Z!\xd6)\xbf+z\x161\xc4uoS \xf0\x9d\x96\xcf#\xdc\xdbc\xa0\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x04\x1eVt\x8d\x80H\x1f\x89k\x07T(\xca\xaf\x91\x1e"\x1a2\xef\xa5_\\s\xf9\x8b\xc2J\xa0\xc8\x11\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x01\xe8\x03\x00\x00\x00\x00\x00\x00\x16\x00\x14\xae\xcd\x1e\xdc>\xffe\xaa \x9d\x02\x15\xe7=p\x90]\xc1hlZ\x0f+\x00\x00\x01\x00~\x02\x00\x00\x00\x02\x9a\x9b\xe1\xca)\x10\\\x97t<\x0f\xd1\xeey\xc0\xe6\r"\x8aa\xc8\xec\xbft\xf9\xe7\xcf\xfa\x01\x19\x0c{\x02\x00\x00\x00\x00\xfd\xff\xff\xff\x9a\x9b\xe1\xca)\x10\\\x97t<\x0f\xd1\xeey\xc0\xe6\r"\x8aa\xc8\xec\xbft\xf9\xe7\xcf\xfa\x01\x19\x0c{\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x01@\x07\x00\x00\x00\x00\x00\x00\x19v\xa9\x14:-AE\xa4\xf0\x98R;>\x81\'\xf1\xda\x87\xcf\xc5[\x8ey\x88\xacZ\x0f+\x00"\x02\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6G0D\x02 \x14\x1e\xa4X\xff>l\x9d\xd8Dg\xda\xaf\x1b\xba9B\x94@eb\xbc\xb3\\\xe4\xa5O:N\xc8\x9c\xeb\x02 /\xa3%\xb6Qw\x8e\x1c\xda\xca\r\xa0\xb1,,ZCL\xa320u\xd5\xc7gT\'+\x82\x80\x00\xe5\x01\x00\x01\x00U\x02\x00\x00\x00\x01\x873 i\xd7\x11\xa7\xcd*`\xd5\x84\x1c8\n,U\xe8\xa2\n\xdd\xdaV\xa2\x9c\x00\x84e\xef\xf6[\xa2\x01\x00\x00\x00\x00\xff\xff\xff\xff\x01\x00\x00\x00\x00\x00\x00\x00\x00\x19v\xa9\x14:-AE\xa4\xf0\x98R;>\x81\'\xf1\xda\x87\xcf\xc5[\x8ey\x88\xac\x00\x00\x00\x00"\x02\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6G0D\x02 a\xf4`\xa5W\xbd\xc5+\xa4\xaej\xfd\xf5,\x16\x98l\xd2\xd3X\x1aB\xee\xed\x13\xee\xd5\r\xf0J\xc9\x8d\x02 R\xa8\xfe\xa2]\xe6Y \xf3Q\xb1\xd5^G\xeaEpr\xcf,-\x90\xe5,\x18\xd4\x92\x84\xe5y\x8c\x02\x01\x00\x01\x00U\x02\x00\x00\x00\x01\x05j\xc0\xa7"\x1f\xe5\x82x\xc9\xa7h\xd0\x1a!\xe6\xb6GJ\x01\x9a\xf6\xe7?\x08\xc8R\xe6\x86|\xad\xa5\x00\x00\x00\x00\x00\xff\xff\xff\xff\x01\x00\x00\x00\x00\x00\x00\x00\x00\x19v\xa9\x14:-AE\xa4\xf0\x98R;>\x81\'\xf1\xda\x87\xcf\xc5[\x8ey\x88\xac\x00\x00\x00\x00"\x02\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6G0D\x02 /\xf9wQJ\x85J\xd6\xc0\xa7fY9S\x1ae\x7f\xedq\xc0\xc0\x98\x89\x80\x9a~\xe2\xf04\x90n\xb5\x02 (\x9bx\x99\xe0\xef\xc2\x0b\x01\r\xe1J\x93\xfc]Q\xed&Q\xce}\xb5\x91a\xc06\xdd\x1a\xaf\xd4\xb8\xaf\x01\x00\x00'
SIGNED_P2PKH_PSBT_B43 = "BR$75LAJ*NO3F5WJXNJ1A:EL:+BDHMS4-Z5WYFOJ1854D.:B/CIMW*I35ZX6X:M:H:D-2RC51JGDI7G12DA4SLF$WS3/07UG8I7RNOKDFSE43J0+7R0J6..CAI5-OY-ATI:*L055QSOAOY9XZ2WQNNK9+55T9N-EX0/UV1WJ+32C5D1LRF9$MX:9B3RCO5NYRSGC..28STID/8F188UUUD2A:3$IP:UQBYV5-UU:4N8P1*YF2AU+H2YRH9W2OA5OS1YO6Z.DY/AFOWMN*IBZ6:7T1ZTT2/Z6ZE3BMDQ5QTPKZ76BBR0.YL$53WG*WT+742I0DEXIFSU8UCJJ4XOI25$N*THS4B.7J$B4YM:XWK$-DMI0-31FI9N.KS0$J2R4+597*/GTCHD*CUM.O102D7UC7MH7QI86NHAYPSO*UV-E4JL7CNKGLGLK4ZRJ-KYVDA$VBER.AV*ZKEG7/VUC8P2V5G7HG64+3YOCSU/K049/OFRB$$.2:Z77OHECAUSM99TXT1S/KAR-V8FBX4UHYU-7MWCSL68K61FLU1-TIUUNM616M/7HNN8J..06V63EQI*ACVR*Q2HQL:8LW3E/ID:EU$PUEG/E09FVJQ2IVI0WH:Q$Q$.X8OSH58YNUB3Y5DIJQ-IKW*69VT5/TQ6L20ZLDIEP4UBUQW8FJBD/+O9J:T/80HNI9KUC18JM59.WZQ8*DAT46-2*--08GZV8ZQC8$-QZHKUQ.+T.Y1A65VRK6I1YJDFULKFV4GW+/+0CC..ELCA3GGBP4XXZ7L1GJH7-25QWSF95F8W3A$39BJ7LCZGM/0:NO983:KGUBBQ:C5F:V7MA4QKOZYKFD4WH**YMMCQ2Y4GURTQ3+-6KBM1X6$/POH75K9LG:IKCS+E/.QF2R*D6:I.$E7VJN2:02DMP9$QL.PK5NCRBM*JL/J-+TY5ZU6OO07*X-6TO/K.5IQR+.5V7Z-INJ93SMRDR0FS+$6UV-E4N5TZEV38EREOX9C3:35VNHB722-$D2X-TP9ZA7T+K9$M0+/X*Q0.C-NCBAFLW+FWUSUU*B9V*TJRHF$U5YA3YNH*LP176A8EY-O5U.E-MMJK5X*4XP*RLXIKQG-/I3G7R+QET:FD8HJYRS:54LW5MPNLCPJBP3JVUAK+BEP7W8T-8CBS50U$R44-91.KZ0PEE"
SIGNED_P2PKH_PSBT_B58 = "6XT9mnsYS6MLhfs4uWirQJGRNWXt7Qrs2f94yDPQ3y9c7ZmRhzpuGCvKnZLfFgDepYGRtqF4sDyfwykXMjppJZy4zxgkatKvZaoB8M9cp4jEYeWjTeqxTNXKVjDCHVRhswofDYqtEowhUsg76HhHzL1sZ4RitQJ1oQoqojkphmX1jjHL4AzJzkgoSCpMLvKh2TAVmqfhuv4Vid9gLiVBu5X1jHVdwUqQ8qnmcoP6ypGaVVoYWWaDhf9vrWi2tUhP4fNPWTVfj4txdC4a6yui28fdPW8UWu9f4h85tekokRpUWCHzJUhuXpahtiTbFsLhaw1PhpAbN5M3PEbs53poHiNFbG6rjLveyiDnyeW6vTGEecGcAgktvVzv2f5cBc9VwcfLUDqYN4bwdUpbzeuuHC3JeNwx2Q1pEspqZDhm94R3a6jw3g35CzaHZ5cMDfMKp7LFsbh4AgKD2HhvWMLk2EpSRc31Avet6j8ARCUXHRNRE9eay3NKy9AhE2zdQnEg42PVK5Sjs7PpT6QcvifdfaNAZ852eBQSTUk9X3oLXG43RaA2eNXmu92ydAfdWr9SyQ5WHKDhZq1xzcGnB4eaz1qJ1TpbWhkTnsEqsw3h6aqL2MWEpKjopKLn88gFSKN4nBUTz2ZvXdPqyZMuFVqnZ79LY1JaM77pyrdyc8G68VFhyMWADd4ABEeLdFq2a8yrTGkdq1V1ef3KWLJCKFV3WHEXcwQkKyS2t8XFgpKMJ1gGu5tQ8BYEzboUjP6EJs5dVZmcjNgwyh1MYpSHorm4AUyfGAoSiNjwWjjfM2F8z4JEWxLdfk4ufoG25gbrzbKrhQJjFNr3TeqZJBfVpEgsn8QjmaV7RBzrk7Whx3K51hx6HZe9JkUG9z5abmBA7FZQMACx8FRLRaZBxc7GiEf3hiT4Sv7fyUmTagViamSXbzvpHGqyaVnN7PD62yfxSzkFWwjVfPG78ufotrQ7fxJ4gfAcz7DgpH8xBe1GhPLuDZP1kDHi3JcoJ6CF8w9w3q4pkZVCtwB7AqTwimMXztLhdULWGDjBc3PVXmzfziCbc2CzJHzfzbxVqSAi8UA5WJzNXaiZhFTXV"
SIGNED_P2PKH_PSBT_B64 = "cHNidP8BAKQCAAAAA67iNa8omsnuwjPKIhW/P/TBynhBUNYPW5RrQYeLFQQsAAAAAAD9////VMmRacRaSWcgWiHWKb8rehYxxHVvUyDwnZbPI9zbY6AAAAAAAP3///8EHlZ0jYBIH4lrB1Qoyq+RHiIaMu+lX1xz+YvCSqDIEQAAAAAA/f///wHoAwAAAAAAABYAFK7NHtw+/2WqIJ0CFec9cJBdwWhsWg8rAAABAH4CAAAAApqb4copEFyXdDwP0e55wOYNIophyOy/dPnnz/oBGQx7AgAAAAD9////mpvhyikQXJd0PA/R7nnA5g0iimHI7L90+efP+gEZDHsBAAAAAP3///8BQAcAAAAAAAAZdqkUOi1BRaTwmFI7PoEn8dqHz8VbjnmIrFoPKwAiAgKnRROVc1Np8uzfyCnA93TojvEwPf5bLwTbqrMKU1391kcwRAIgFB6kWP8+bJ3YRGfarxu6OUKUQGVivLNc5KVPOk7InOsCIC+jJbZRd44c2soNoLEsLFpDTKMyMHXVx2dUJyuCgADlAQABAFUCAAAAAYczIGnXEafNKmDVhBw4CixV6KIK3dpWopwAhGXv9luiAQAAAAD/////AQAAAAAAAAAAGXapFDotQUWk8JhSOz6BJ/Hah8/FW455iKwAAAAAIgICp0UTlXNTafLs38gpwPd06I7xMD3+Wy8E26qzClNd/dZHMEQCIGH0YKVXvcUrpK5q/fUsFphs0tNYGkLu7RPu1Q3wSsmNAiBSqP6iXeZZIPNRsdVeR+pFcHLPLC2Q5SwY1JKE5XmMAgEAAQBVAgAAAAEFasCnIh/lgnjJp2jQGiHmtkdKAZr25z8IyFLmhnytpQAAAAAA/////wEAAAAAAAAAABl2qRQ6LUFFpPCYUjs+gSfx2ofPxVuOeYisAAAAACICAqdFE5VzU2ny7N/IKcD3dOiO8TA9/lsvBNuqswpTXf3WRzBEAiAv+XdRSoVK1sCnZlk5Uxplf+1xwMCYiYCafuLwNJButQIgKJt4meDvwgsBDeFKk/xdUe0mUc59tZFhwDbdGq/UuK8BAAA="
- SIGNED_P2PKH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(SIGNED_P2PKH_PSBT).to_cbor())
+ SIGNED_P2PKH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(SIGNED_P2PKH_PSBT))
SIGNED_P2PKH_PSBT_SD = b'psbt\xff\x01\x00\xa4\x02\x00\x00\x00\x03\xae\xe25\xaf(\x9a\xc9\xee\xc23\xca"\x15\xbf?\xf4\xc1\xcaxAP\xd6\x0f[\x94kA\x87\x8b\x15\x04,\x00\x00\x00\x00\x00\xfd\xff\xff\xffT\xc9\x91i\xc4ZIg Z!\xd6)\xbf+z\x161\xc4uoS \xf0\x9d\x96\xcf#\xdc\xdbc\xa0\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x04\x1eVt\x8d\x80H\x1f\x89k\x07T(\xca\xaf\x91\x1e"\x1a2\xef\xa5_\\s\xf9\x8b\xc2J\xa0\xc8\x11\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x01\xe8\x03\x00\x00\x00\x00\x00\x00\x16\x00\x14\xae\xcd\x1e\xdc>\xffe\xaa \x9d\x02\x15\xe7=p\x90]\xc1hlZ\x0f+\x00O\x01\x045\x87\xcf\x03\x06\xb07\xf6\x80\x00\x00\x00k"\xc5\x12;\xa1\n\xde\xafK\xfc\xbbE\xd1\xa0-\x82\x8f%\xbf\x86F\x95z\x98\xd0b\x87\xc4\xe2\xb8P\x02\x8bB\xcdGv7l\x82y\x1bIAU\x15\x1fV\xc2\xd7\xb4q\xe0\xc7\xa5&\xa7\xce`\xdd\x87.8g\x10s\xc5\xda\n,\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x01\x00~\x02\x00\x00\x00\x02\x9a\x9b\xe1\xca)\x10\\\x97t<\x0f\xd1\xeey\xc0\xe6\r"\x8aa\xc8\xec\xbft\xf9\xe7\xcf\xfa\x01\x19\x0c{\x02\x00\x00\x00\x00\xfd\xff\xff\xff\x9a\x9b\xe1\xca)\x10\\\x97t<\x0f\xd1\xeey\xc0\xe6\r"\x8aa\xc8\xec\xbft\xf9\xe7\xcf\xfa\x01\x19\x0c{\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x01@\x07\x00\x00\x00\x00\x00\x00\x19v\xa9\x14:-AE\xa4\xf0\x98R;>\x81\'\xf1\xda\x87\xcf\xc5[\x8ey\x88\xacZ\x0f+\x00"\x02\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6G0D\x02 \x14\x1e\xa4X\xff>l\x9d\xd8Dg\xda\xaf\x1b\xba9B\x94@eb\xbc\xb3\\\xe4\xa5O:N\xc8\x9c\xeb\x02 /\xa3%\xb6Qw\x8e\x1c\xda\xca\r\xa0\xb1,,ZCL\xa320u\xd5\xc7gT\'+\x82\x80\x00\xe5\x01\x01\x03\x04\x01\x00\x00\x00"\x06\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6\x18s\xc5\xda\n,\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00U\x02\x00\x00\x00\x01\x873 i\xd7\x11\xa7\xcd*`\xd5\x84\x1c8\n,U\xe8\xa2\n\xdd\xdaV\xa2\x9c\x00\x84e\xef\xf6[\xa2\x01\x00\x00\x00\x00\xff\xff\xff\xff\x01\x00\x00\x00\x00\x00\x00\x00\x00\x19v\xa9\x14:-AE\xa4\xf0\x98R;>\x81\'\xf1\xda\x87\xcf\xc5[\x8ey\x88\xac\x00\x00\x00\x00"\x02\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6G0D\x02 a\xf4`\xa5W\xbd\xc5+\xa4\xaej\xfd\xf5,\x16\x98l\xd2\xd3X\x1aB\xee\xed\x13\xee\xd5\r\xf0J\xc9\x8d\x02 R\xa8\xfe\xa2]\xe6Y \xf3Q\xb1\xd5^G\xeaEpr\xcf,-\x90\xe5,\x18\xd4\x92\x84\xe5y\x8c\x02\x01\x01\x03\x04\x01\x00\x00\x00"\x06\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6\x18s\xc5\xda\n,\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00U\x02\x00\x00\x00\x01\x05j\xc0\xa7"\x1f\xe5\x82x\xc9\xa7h\xd0\x1a!\xe6\xb6GJ\x01\x9a\xf6\xe7?\x08\xc8R\xe6\x86|\xad\xa5\x00\x00\x00\x00\x00\xff\xff\xff\xff\x01\x00\x00\x00\x00\x00\x00\x00\x00\x19v\xa9\x14:-AE\xa4\xf0\x98R;>\x81\'\xf1\xda\x87\xcf\xc5[\x8ey\x88\xac\x00\x00\x00\x00"\x02\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6G0D\x02 /\xf9wQJ\x85J\xd6\xc0\xa7fY9S\x1ae\x7f\xedq\xc0\xc0\x98\x89\x80\x9a~\xe2\xf04\x90n\xb5\x02 (\x9bx\x99\xe0\xef\xc2\x0b\x01\r\xe1J\x93\xfc]Q\xed&Q\xce}\xb5\x91a\xc06\xdd\x1a\xaf\xd4\xb8\xaf\x01\x01\x03\x04\x01\x00\x00\x00"\x06\x02\xa7E\x13\x95sSi\xf2\xec\xdf\xc8)\xc0\xf7t\xe8\x8e\xf10=\xfe[/\x04\xdb\xaa\xb3\nS]\xfd\xd6\x18s\xc5\xda\n,\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
SIGNED_P2PKH_PSBT_B64_SD = "cHNidP8BAKQCAAAAA67iNa8omsnuwjPKIhW/P/TBynhBUNYPW5RrQYeLFQQsAAAAAAD9////VMmRacRaSWcgWiHWKb8rehYxxHVvUyDwnZbPI9zbY6AAAAAAAP3///8EHlZ0jYBIH4lrB1Qoyq+RHiIaMu+lX1xz+YvCSqDIEQAAAAAA/f///wHoAwAAAAAAABYAFK7NHtw+/2WqIJ0CFec9cJBdwWhsWg8rAE8BBDWHzwMGsDf2gAAAAGsixRI7oQrer0v8u0XRoC2CjyW/hkaVepjQYofE4rhQAotCzUd2N2yCeRtJQVUVH1bC17Rx4MelJqfOYN2HLjhnEHPF2gosAACAAQAAgAAAAIAAAQB+AgAAAAKam+HKKRBcl3Q8D9HuecDmDSKKYcjsv3T558/6ARkMewIAAAAA/f///5qb4copEFyXdDwP0e55wOYNIophyOy/dPnnz/oBGQx7AQAAAAD9////AUAHAAAAAAAAGXapFDotQUWk8JhSOz6BJ/Hah8/FW455iKxaDysAIgICp0UTlXNTafLs38gpwPd06I7xMD3+Wy8E26qzClNd/dZHMEQCIBQepFj/Pmyd2ERn2q8bujlClEBlYryzXOSlTzpOyJzrAiAvoyW2UXeOHNrKDaCxLCxaQ0yjMjB11cdnVCcrgoAA5QEBAwQBAAAAIgYCp0UTlXNTafLs38gpwPd06I7xMD3+Wy8E26qzClNd/dYYc8XaCiwAAIABAACAAAAAgAAAAAAAAAAAAAEAVQIAAAABhzMgadcRp80qYNWEHDgKLFXoogrd2lainACEZe/2W6IBAAAAAP////8BAAAAAAAAAAAZdqkUOi1BRaTwmFI7PoEn8dqHz8VbjnmIrAAAAAAiAgKnRROVc1Np8uzfyCnA93TojvEwPf5bLwTbqrMKU1391kcwRAIgYfRgpVe9xSukrmr99SwWmGzS01gaQu7tE+7VDfBKyY0CIFKo/qJd5lkg81Gx1V5H6kVwcs8sLZDlLBjUkoTleYwCAQEDBAEAAAAiBgKnRROVc1Np8uzfyCnA93TojvEwPf5bLwTbqrMKU1391hhzxdoKLAAAgAEAAIAAAACAAAAAAAAAAAAAAQBVAgAAAAEFasCnIh/lgnjJp2jQGiHmtkdKAZr25z8IyFLmhnytpQAAAAAA/////wEAAAAAAAAAABl2qRQ6LUFFpPCYUjs+gSfx2ofPxVuOeYisAAAAACICAqdFE5VzU2ny7N/IKcD3dOiO8TA9/lsvBNuqswpTXf3WRzBEAiAv+XdRSoVK1sCnZlk5Uxplf+1xwMCYiYCafuLwNJButQIgKJt4meDvwgsBDeFKk/xdUe0mUc59tZFhwDbdGq/UuK8BAQMEAQAAACIGAqdFE5VzU2ny7N/IKcD3dOiO8TA9/lsvBNuqswpTXf3WGHPF2gosAACAAQAAgAAAAIAAAAAAAAAAAAAA"
@@ -36,14 +35,16 @@ def tdata(mocker):
P2WPKH_PSBT_B43 = "1N0HGUN:R2Q*R86JDWEOBMHAETS.D$7T+SEGWXJO3JPKXA+O3JNN$$VLXOA4R/O+2+T$0BL68OC3*:/B4SOZWX3MY9B1R0AXW5-KVBGEJJWUNUTMA5-XE+IX*M5$/.++VV9F/RHZC9:E9JT$NLGK39-VJKFHLA*C90GDVYE01C17+N*JBV0RQLT8D*1*BVK+K2K/$8.VYDK3JPC2X634YJKT57OJNX61X$4J39$.4*TZK55UAA0ALQC0PLZC61AYGB$J:SKX63U23TBU.C9NB.9C0N$RKANBNTQTYPVL1ZG6SHLT093GQFJILC0QMUYEY9F-K8.-3:JMZ4ESOL8AO+CD*7U06IVD3U6Y.$HH5PU/NPL037224KA-1A09MM76ZJ.:HY4TS-Y/8MZC6P/D6*DQF6A9"
P2WPKH_PSBT_B58 = "UUucvki6KWyS35DhetbWPw1DiaccbHKywScF96E8VUwEnN1gss947UasRfkNxtrkzCeHziHyMCuoiQ2mSYsbYXuV3YwYBZwFh1c6xtBAEK1aDgPwMgqf74xTzf3m4KH4iUU5nHTqroDpoRZR59meafTCUBChZ5NJ8MoUdKE6avyYdSm5kUb4npmFpMpJ9S3qd2RedHMoQFRiXK3jwdH81emAEsFYSW3Kb7caPcWjkza4S4EEWWbaggofGFmxE5gNNg4A4LNC2ZUGLsALZffNvg3yh3qg6rFxhkiyzWc44kx9Khp6Evm1j4Njh8kjifkngLTPFtX3uWNLAB1XrvpPMx6kkkhr7RnFVrA4JsDp5BwVGAXBoSBLTqweFevZ5"
P2WPKH_PSBT_B64 = "cHNidP8BAHECAAAAAc88WMMpgq4gUIjZvUnrmwKs3009rnalFsazBrFd46FOAAAAAAD9////Anw/XQUAAAAAFgAULzSqHPAKU7BVopGgOn1F8KaYi1KAlpgAAAAAABYAFOZq/v/Dg45x8KJ7B+OwDt5q6OFgAAAAAAABAR8A4fUFAAAAABYAFNDEo+8J6Ze26Z45flGP4+QaEYyhIgYC56slN7XUnpcDCargbp5J82zhyf671E7I4NHMoLT5wxkYc8XaClQAAIABAACAAAAAgAAAAAAAAAAAACICA11J7M1U0AmeQ2did8em1GJdYR2oil30m/lReneRp3elGHPF2gpUAACAAQAAgAAAAIABAAAAAAAAAAAA"
- P2WPKH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(P2WPKH_PSBT).to_cbor())
+ P2WPKH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(P2WPKH_PSBT))
P2WPKH_PSBT_BBQR_PSBT = P2WPKH_PSBT # BBQr is decoded to binary before being passed to the PSBT constructor
SIGNED_P2WPKH_PSBT = b'psbt\xff\x01\x00q\x02\x00\x00\x00\x01\xcfe\xff;L\xd4\x7f\x12\x1f\xa7\xc9\x82(F\x18\xdb\x801G\xb0V\xd3\x93\x94\xd4\xecB\x0e\xfd\xfck\xa1\x02 l\xbd\xd8\x8a\xc5\x18l?.\xfd$%1\xedy\x17uvQ\xact\xf3\xd3\x1d\x85\xd6\x16\xcdj\x81\x01\x00\x00\x00'
SIGNED_P2WPKH_PSBT_B43 = "ZF1XCF+Z*C015XRRLXYR*QCNLC+GG904*T:WKMSDWEXX2VS57*S7X9FJGRN/0Q0$-OBHIJ8/B.C-BG*2ITD2B9C5VJ0AVI5GAH7LMHJ3.EY3KL*/6I*ERF8GTDFTN5KA6Z-NUJ0UV/2NBXH43OSU3T98BSCAIZ.:HWRXU/L.HMUDEJEO$3.C/80-LULS/CM0DV*$3*EM/736NIXS-0+:E-A4TDYZRGW9W181MRBNJ6A*O$VO/VT+SAX+TVO4DH.$Q$MKU6OFVP94EX8LXOK6F69TJI8T.38.BLI.55W3/928OSS-1SK022VB+Q0WZ3F33NB*EE:$*YD+*1BK.SU1EV3M2C4UG.PA.T--YRP8BB/QH:V-9F4B/XUZYCDUDAYG/CR4VT15"
SIGNED_P2WPKH_PSBT_B58 = "2HkajtjMgNpiuo5QQYDP4zEc3vrWa1f7qgwNkMySr8EJbPoEtguwAQ2qkgA7k7NzAvLjA3FA4C9ejVxLx8vSemVQxcda4LjDyrbpinuPeSakKBjvR1XrCa5jxU29xfiaYjLTKDPPAPHCdTJy4r7Zcc9kqaTk9NxoqMhdUiNqxfyuBoDeCwMemE2UE4D5GrDMMuhJvJ2vyJkK6w9a1P7cE6gwL4CVx7LrLtwRGbUUiQ3tkr8ve57kWjyTLT1FALNVVyNfDb4kJccqZ6Nv1riwPaRRUpr2yaBkTogG4nAK31ywpiAwqxZpswjUF6gpbnLJUQDsowNjYeW9NEA83S2oL3FshKWsfcB1vhKT5DvCQZzo"
SIGNED_P2WPKH_PSBT_B64 = "cHNidP8BAHECAAAAAc88WMMpgq4gUIjZvUnrmwKs3009rnalFsazBrFd46FOAAAAAAD9////Anw/XQUAAAAAFgAULzSqHPAKU7BVopGgOn1F8KaYi1KAlpgAAAAAABYAFOZq/v/Dg45x8KJ7B+OwDt5q6OFgAAAAAAABAR8A4fUFAAAAABYAFNDEo+8J6Ze26Z45flGP4+QaEYyhIgIC56slN7XUnpcDCargbp5J82zhyf671E7I4NHMoLT5wxlHMEQCID5l/ztM1H8SH6fJgihGGNuAMUewVtOTlNTsQg79/GuhAiBsvdiKxRhsPy79JCUx7XkXdXZRrCYjdPPTHYXWFs1qgQEAAAA="
- SIGNED_P2WPKH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(SIGNED_P2WPKH_PSBT).to_cbor())
+ SIGNED_P2WPKH_PSBT_UR_PSBT = UR(
+ "crypto-psbt", Types.psbt_to_cbor(SIGNED_P2WPKH_PSBT)
+ )
SIGNED_P2WPKH_PSBT_BBQR_PSBT = encode_bbqr(SIGNED_P2WPKH_PSBT, "Z", "P")
SIGNED_P2WPKH_PSBT_SD = b'psbt\xff\x01\x00q\x02\x00\x00\x00\x01\xcfe\xff;L\xd4\x7f\x12\x1f\xa7\xc9\x82(F\x18\xdb\x801G\xb0V\xd3\x93\x94\xd4\xecB\x0e\xfd\xfck\xa1\x02 l\xbd\xd8\x8a\xc5\x18l?.\xfd$%1\xedy\x17uvQ\xact\xf3\xd3\x1d\x85\xd6\x16\xcdj\x81\x01"\x06\x02\xe7\xab%7\xb5\xd4\x9e\x97\x03\t\xaa\xe0n\x9eI\xf3l\xe1\xc9\xfe\xbb\xd4N\xc8\xe0\xd1\xcc\xa0\xb4\xf9\xc3\x19\x18s\xc5\xda\nT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00"\x02\x03]I\xec\xcdT\xd0\t\x9eCgbw\xc7\xa6\xd4b]a\x1d\xa8\x8a]\xf4\x9b\xf9Qzw\x91\xa7w\xa5\x18s\xc5\xda\nT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00'
SIGNED_P2WPKH_PSBT_B64_SD = "cHNidP8BAHECAAAAAc88WMMpgq4gUIjZvUnrmwKs3009rnalFsazBrFd46FOAAAAAAD9////Anw/XQUAAAAAFgAULzSqHPAKU7BVopGgOn1F8KaYi1KAlpgAAAAAABYAFOZq/v/Dg45x8KJ7B+OwDt5q6OFgAAAAAAABAR8A4fUFAAAAABYAFNDEo+8J6Ze26Z45flGP4+QaEYyhIgIC56slN7XUnpcDCargbp5J82zhyf671E7I4NHMoLT5wxlHMEQCID5l/ztM1H8SH6fJgihGGNuAMUewVtOTlNTsQg79/GuhAiBsvdiKxRhsPy79JCUx7XkXdXZRrCYjdPPTHYXWFs1qgQEiBgLnqyU3tdSelwMJquBunknzbOHJ/rvUTsjg0cygtPnDGRhzxdoKVAAAgAEAAIAAAACAAAAAAAAAAAAAIgIDXUnszVTQCZ5DZ2J3x6bUYl1hHaiKXfSb+VF6d5Gnd6UYc8XaClQAAIABAACAAAAAgAEAAAAAAAAAAAA="
@@ -53,14 +54,14 @@ def tdata(mocker):
P2SH_P2WPKH_PSBT_B43 = "ISOGTD+S3R8H0DQLFI44D9XVW+NU6FLJ-.-6DZON$.R31OG$AFCWZGO40V:6HQ.DT2C3.CPVM-F+V+GB$A9G:.K3B:KCWPOU8.LZ4SO1D-W/:PCK5Y1.B$HQGWWR1BN8:9J-HXGFVVL1D3R+MTLP/10MGI6AN$1*5ITO3105-C1QBR+LAR5D7VM/1P*KBYJH6P4LH9GCU5DE2*8MP3*YT2K.KDV32OAMNKHV/VGLX9XJ0*B6850S794RVAWR*LEY40SCBLQ.*OR7T$RZ9581/GKU4KYV48LDPURZMDKBEZXRG2SDL4UYGF330F$4*1JCUL5TS+:*X*+E6D::-0L1L63IAMW:*IVLP$YQUV922+G$OJY.INJRHY/A$0.UFB.VD21PM8ED92HKS5TXCAPFS9LT199UMOMBNKM$HE*7*VOJQ*J7JY1PLG188K8IB97211B+AH$4$GDJ750S--S.H45Y4HA4N$PK5S03HS4K"
P2SH_P2WPKH_PSBT_B58 = "W7hsNtPR1YU4YQRATn9QwVubQ3s4aLKhoSpCJQtZuiqGxTQPhu1FB4bqZdtL2MpygirLgext5jZpLSRKGQEhcuiUjg5wvnyP5EP7w1RxkE4Zc5mxDKyEhRH7k3wcSA8TTahF7Rg7r2cWry4c7LySnwoAGtYP1VRwcgMfbYXroHrrKqgdfaKLmMD1M5bCYpU6fMCzcEK5hXQSFaupmhTyAPHiGAczMSmnsoaeZ4cCNpZzexK6FkYES1XTBkroLD68tYejJTjkEpASRVTwS1LUJHEUVmAgASWQ1r3x9yGQaSamXqvedoZ3dNuUsmVJNdGNjKFJRsQugzxEHEj2PWJCpYCUo4Ms79wRkSYjeaQaEEHnBLnkbhPdL6rUu5oGCpzkkgewTcH5hSPA8GefzSgLo3CrGQgY5K3GvPTH5aP6VvMWpUBHGiPqddjQzqeAePxKHi6T"
P2SH_P2WPKH_PSBT_B64 = "cHNidP8BAHICAAAAAXbva/K90EDzwdg6zLl0OfGrsaVWrR0PUpaB/6foypSKAQAAAAD9////Apw9XQUAAAAAF6kUJR3RFFeiWcO6R+XMo3F/5CFOApiHgJaYAAAAAAAWABTmav7/w4OOcfCiewfjsA7eaujhYAAAAAAAAQEgAOH1BQAAAAAXqRQzbKoT4IuWCAoytdgY1ZtKs7NnQocBBBYAFDiXH3OTD2wUHZd6xP1KcnyFSTWzIgYDoa+ASsEIqKUXghmMLQNLKL+QyIA/WlP3Ynb6aaTq538Yc8XaCjEAAIABAACAAAAAgAAAAAAAAAAAAAEAFgAUcL6x4EpQCUDp86uqZuGkmsVbjzUiAgKi/ImWxSYiSLXa78Wk0M3NAMEwR9DLEwKBNupjDYdahxhzxdoKMQAAgAEAAIAAAACAAQAAAAAAAAAAAA=="
- P2SH_P2WPKH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(P2SH_P2WPKH_PSBT).to_cbor())
+ P2SH_P2WPKH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(P2SH_P2WPKH_PSBT))
SIGNED_P2SH_P2WPKH_PSBT = b'psbt\xff\x01\x00r\x02\x00\x00\x00\x01v\xefk\xf2\xbd\xd0@\xf3\xc1\xd8:\xcc\xb9t9\xf1\xab\xb1\xa5V\xad\x1d\x0fR\x96\x81\xff\xa7\xe8\xca\x94\x8a\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x02\x9c=]\x05\x00\x00\x00\x00\x17\xa9\x14%\x1d\xd1\x14W\xa2Y\xc3\xbaG\xe5\xcc\xa3q\x7f\xe4!N\x02\x98\x87\x80\x96\x98\x00\x00\x00\x00\x00\x16\x00\x14\xe6j\xfe\xff\xc3\x83\x8eq\xf0\xa2{\x07\xe3\xb0\x0e\xdej\xe8\xe1`\x00\x00\x00\x00\x00\x01\x01 \x00\xe1\xf5\x05\x00\x00\x00\x00\x17\xa9\x143l\xaa\x13\xe0\x8b\x96\x08\n2\xb5\xd8\x18\xd5\x9bJ\xb3\xb3gB\x87"\x02\x03\xa1\xaf\x80J\xc1\x08\xa8\xa5\x17\x82\x19\x8c-\x03K(\xbf\x90\xc8\x80?ZS\xf7bv\xfai\xa4\xea\xe7\x7fG0D\x02 u\x0c\xf8\xe6\x03\x15l\xab\xaa7a`\x1f\xcb\xc5\xd92TC\x97\xbd\xed\xfeS\xeeC\xf4\x1d\xddc\x1cx\x02 4{\xe5K\xe5\xf2F\x04\xd5\x05V\xe8}K\x00\xcc\x93)\x90\x1f\r\x02,\xee?\xd8\xed\xd2\xb8\x97\xcaS\x01\x01\x04\x16\x00\x148\x97\x1fs\x93\x0fl\x14\x1d\x97z\xc4\xfdJr|\x85I5\xb3\x00\x00\x00'
SIGNED_P2SH_P2WPKH_PSBT_B43 = "H2ZW15J2ZL-VL/WIC5AQ67IT6:2*PR$1PNPWZ67EY3.D*MU1XLGL2:M$73JM9*$9Q6EJCOAWF:258LFQ$D209+HXGLHAW1P7F0GS3/9*+TM4.972T18+WAVDG0FBTR7KD*GY.UQ*2$$O:7L015ZB$TIRBR0X0JW7FTWZJOFA2BXZ-+F2DCNJ6CGT0:5GR5BJE8XE/G*Y3S0$11D4*F.C8OGM-M*UQDY-2X0+NF6X106N2$9FZSA-*6WIW+ET$79KLN8AVDGO*6Z+ON4J43Z5S*A$UZEH5VNKO.ZQKD+VC/BJANEHK+OLCBD5H1GSQUMOHJ6VO//5Q1515V6YKJ4FLMG8OU-2M-S.+GS+T10EI6EP*GCYGQPD9389V01Q52.$A+3O-YCO55.Q*BOXPW2CF.VEPR:.HWZ**QA5NITVI3:MQWKL"
SIGNED_P2SH_P2WPKH_PSBT_B58 = "mbNU9ochR3r2kucYTPNx2gt6qUqhQ2BCrRrQkjve3E7b4YoV1fG7Nno8bcE4Rtq5jiXfYNV1LYeRYPwek67KsJdfTL1y2pxK6Kis2hA2GF7s3eJkUzXdTBPGpmMW39bAnU2315fnDjfanJxRJsj9iefvwteXmCR2mY1vFZwDJ9E66mmtjXQjQ57bD33WoAbZqJjYucy5u8d1HmSAwBaMqfzYYNyjNkAKDCD1Jd3CZfcwo5jB1qLeq3i3hu4XGB8puf4fJ9B3uGjMAaL5Po32Wrw5RaAPBJ39hXJBskvsEKC6gcHEP92oXsTTDHQWrsAnLMs1fkjEBsvjHsWsff6PebdDCLdzRGoJavc5TUTyaydbitxWfUQT99ZCuoKQkxhGqVC65euWJCFSSR67"
SIGNED_P2SH_P2WPKH_PSBT_B64 = "cHNidP8BAHICAAAAAXbva/K90EDzwdg6zLl0OfGrsaVWrR0PUpaB/6foypSKAQAAAAD9////Apw9XQUAAAAAF6kUJR3RFFeiWcO6R+XMo3F/5CFOApiHgJaYAAAAAAAWABTmav7/w4OOcfCiewfjsA7eaujhYAAAAAAAAQEgAOH1BQAAAAAXqRQzbKoT4IuWCAoytdgY1ZtKs7NnQociAgOhr4BKwQiopReCGYwtA0sov5DIgD9aU/didvpppOrnf0cwRAIgdQz45gMVbKuqN2FgH8vF2TJUQ5e97f5T7kP0Hd1jHHgCIDR75Uvl8kYE1QVW6H1LAMyTKZAfDQIs7j/Y7dK4l8pTAQEEFgAUOJcfc5MPbBQdl3rE/UpyfIVJNbMAAAA="
SIGNED_P2SH_P2WPKH_PSBT_UR_PSBT = UR(
- "crypto-psbt", PSBT(SIGNED_P2SH_P2WPKH_PSBT).to_cbor()
+ "crypto-psbt", Types.psbt_to_cbor(SIGNED_P2SH_P2WPKH_PSBT)
)
SIGNED_P2SH_P2WPKH_PSBT_SD = b'psbt\xff\x01\x00r\x02\x00\x00\x00\x01v\xefk\xf2\xbd\xd0@\xf3\xc1\xd8:\xcc\xb9t9\xf1\xab\xb1\xa5V\xad\x1d\x0fR\x96\x81\xff\xa7\xe8\xca\x94\x8a\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x02\x9c=]\x05\x00\x00\x00\x00\x17\xa9\x14%\x1d\xd1\x14W\xa2Y\xc3\xbaG\xe5\xcc\xa3q\x7f\xe4!N\x02\x98\x87\x80\x96\x98\x00\x00\x00\x00\x00\x16\x00\x14\xe6j\xfe\xff\xc3\x83\x8eq\xf0\xa2{\x07\xe3\xb0\x0e\xdej\xe8\xe1`\x00\x00\x00\x00\x00\x01\x01 \x00\xe1\xf5\x05\x00\x00\x00\x00\x17\xa9\x143l\xaa\x13\xe0\x8b\x96\x08\n2\xb5\xd8\x18\xd5\x9bJ\xb3\xb3gB\x87"\x02\x03\xa1\xaf\x80J\xc1\x08\xa8\xa5\x17\x82\x19\x8c-\x03K(\xbf\x90\xc8\x80?ZS\xf7bv\xfai\xa4\xea\xe7\x7fG0D\x02 u\x0c\xf8\xe6\x03\x15l\xab\xaa7a`\x1f\xcb\xc5\xd92TC\x97\xbd\xed\xfeS\xeeC\xf4\x1d\xddc\x1cx\x02 4{\xe5K\xe5\xf2F\x04\xd5\x05V\xe8}K\x00\xcc\x93)\x90\x1f\r\x02,\xee?\xd8\xed\xd2\xb8\x97\xcaS\x01\x01\x04\x16\x00\x148\x97\x1fs\x93\x0fl\x14\x1d\x97z\xc4\xfdJr|\x85I5\xb3"\x06\x03\xa1\xaf\x80J\xc1\x08\xa8\xa5\x17\x82\x19\x8c-\x03K(\xbf\x90\xc8\x80?ZS\xf7bv\xfai\xa4\xea\xe7\x7f\x18s\xc5\xda\n1\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x16\x00\x14p\xbe\xb1\xe0JP\t@\xe9\xf3\xab\xaaf\xe1\xa4\x9a\xc5[\x8f5"\x02\x02\xa2\xfc\x89\x96\xc5&"H\xb5\xda\xef\xc5\xa4\xd0\xcd\xcd\x00\xc10G\xd0\xcb\x13\x02\x816\xeac\r\x87Z\x87\x18s\xc5\xda\n1\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00'
SIGNED_P2SH_P2WPKH_PSBT_B64_SD = "cHNidP8BAHICAAAAAXbva/K90EDzwdg6zLl0OfGrsaVWrR0PUpaB/6foypSKAQAAAAD9////Apw9XQUAAAAAF6kUJR3RFFeiWcO6R+XMo3F/5CFOApiHgJaYAAAAAAAWABTmav7/w4OOcfCiewfjsA7eaujhYAAAAAAAAQEgAOH1BQAAAAAXqRQzbKoT4IuWCAoytdgY1ZtKs7NnQociAgOhr4BKwQiopReCGYwtA0sov5DIgD9aU/didvpppOrnf0cwRAIgdQz45gMVbKuqN2FgH8vF2TJUQ5e97f5T7kP0Hd1jHHgCIDR75Uvl8kYE1QVW6H1LAMyTKZAfDQIs7j/Y7dK4l8pTAQEEFgAUOJcfc5MPbBQdl3rE/UpyfIVJNbMiBgOhr4BKwQiopReCGYwtA0sov5DIgD9aU/didvpppOrnfxhzxdoKMQAAgAEAAIAAAACAAAAAAAAAAAAAAQAWABRwvrHgSlAJQOnzq6pm4aSaxVuPNSICAqL8iZbFJiJItdrvxaTQzc0AwTBH0MsTAoE26mMNh1qHGHPF2goxAACAAQAAgAAAAIABAAAAAAAAAAAA"
@@ -70,13 +71,13 @@ def tdata(mocker):
P2TR_PSBT_B43 = "$MYCB*Z8$F$U43$$$AYNPYV7P2O$0N:NND-4/R6WA3K5UCTN2W2UH1W+-OO$GDVLG22/ZLRV1Q8.E8J7N420ZF-M4JE.DG07WFA+62X4.4ZA-OVEWYBN:QE73QV1QF+4N7281Z2I5S1N6Y9644OHRR*SE9ZV14W2K$43KBK:SHCYT$B0YG1-J6YXZKKN4676SPPD4DGPLT3L.8E117P1-7E4YOJWP2IPW81BC3TQ3YX2OP8MONZD+O8DV95:K93RLFWQSYIDM2YKLVSKZ*+K:WWO6-3H4:.J97WXTVTUL3/+8HAKSL9+8BPQHJK-MQ5SALS79II3T:P*C6D*1ZYSDDAZ82F0W*WRR91/:YOFKC9EFMQ1CSK2HN-HCLBXVRKS4/G:6MJ61OP$08QL0X:YAJGL*IL:D*/56V1/ZFDEM*3*F-NVZNQAIEFMF08Z2MM0I$S2B61W$EY++.6X**AH0CWY9DWE4D2U*E3AECQE2Y5R1ZHTOG1MKTZ3GHTBD7F02K-DPZL+ABUVMIELQWT:M+5.FT9-RAY3OS05+/J-S*BIOI0Q6YT$UQ-RI/.429T2/:66YNAHKCVH3J7AGS46TAHCI$JSJ9*NPE2XZWW+1L30SDVFNULC4T75VP:XBBXP9I750LGP1:8ZDP0YF*BKWQZ93-U2Q0EJSJ9WB3A0ZJGLNQ57BXMVSRPDDSI+7D9B8ZKBG7X+:U84V5DMYSW3W/*I*/*UB8MJQV0+2BSQTARB$DND/9N9.+T-6O8D*74K5M+LXP*-4I:P79JX-RJH2-MKW:X5DSO13Y0AASMVOAS/28/F9Q4$B*VL.$RW0ZO.UH5T7ODJS47.MA$AK3RQ/3L4O+KWU5E:SJ..:*X:GU*HCV9-HX7$2T-/9ZAY7J3W.7W+1Y-$IM6-"
P2TR_PSBT_B58 = "2C2dk2DpdViMV7XztuFHDKYpnMmQYUHxBC97tosVRCndABjAHMnx5Vjw2Hugev5DyrLPXfM58fxKHCcGdReZxLRr4ZDaXRy7SCssavWr9NgP7aPqbGnDZJirLEgau5p12f1FmEwoSMD9ZnrjoFwPZF5AhYr3R7ixUn7Kf7LDW63sdPV45a5z6CeUQvDELrxxyKVG4qej4GEH5DgED8PWFNQ4nq8cKU2TJL8oNZrMMSGSopG1YzEvoFf7fUzpZR6dC2hgBnEBGZWTccnAoA418aauwZU2dBqWYire6nhXsKZF4cVKweMFt8ZGFT3YRjM5uqc4i2ii4a9XrFJQd7DTLqsNHY2fUSfNSfuTdBSy7zh4eiDEU44XJcnBp1QJzb63nrAJnZjRnz6NcmRY2YrRgDq4LgRAyPCYs7UpGa1JgCK3hupDH8bPCbbtECqBXQ8nuZtNk3H6weCR4vuri2r9mMWhXY5thnyhcTjAwi51Cir3iHnjKcGPepL15U6BnNjfTAoQ6wKX3nN2pZDhn5RwyDpv7qPnouhLds7dKEn64HJqqBTVrDjTuWHNCBUMj6TcXTuPdSYH8CeL8YMfcMjhbRPHh1aSyhgLWuwBqL1eSW7wTAGLfJXoHcCJsMheMDma9MEMeP4UEAeEhNVQ5QEFFTCRH8MkMev4Fo6q4L39yhT1C5LAKkRMSnkJwKuUSAxqW4YiYH68dFjsW1MFwfXngDpcxS1QVBzhpW95Bb32VCLWHQzbCx3XcEMi5Q77MVW6aVyMHzYUNadH4Wbhn4QxQM11gPW2LQNyqwZjuxEesFJ8sqX2pCRHX6J5mBJKzyT9pyhvvQkxMu"
P2TR_PSBT_B64 = "cHNidP8BAKgCAAAAAfn+phUWoAfkdjJXSEFxjcDaXBr22RczfwaOVNq+Sb4/AAAAAAD9////AzoeAAAAAAAAIlEgdeZfiD3lhycx2Y6ob18IYvCSOdDpsA9J9ZIGnBhNAqLoAwAAAAAAACJRIJ0tm23mDNzdWQfBwJYxSRvdQ07uqoqvOzvxnWPVPkCZ6AMAAAAAAAAWABSuzR7cPv9lqiCdAhXnPXCQXcFobIO/KwBPAQQ1h88D4BfRu4AAAAABg1wLUSGDdsYUVUKKn0e/zOH2zoOX6tewA4fp2epWgwLPvXEAMR4OhYRMNzhygxQ5TrgwKmtQcNaS5BsUuoGAkBBzxdoKVgAAgAEAAIAAAACAAAEBK38nAAAAAAAAIlEgBqyC/Dbbtg1IeR2Bw8HrOX+pc+RWyMb7VMEEIR8EexoBAwQAAAAAIRZFxrHkNII86ea0SPvB5AUnIDg6DSEogry6dlNNd1KKrRkAc8XaClYAAIABAACAAAAAgAAAAAAJAAAAARcgRcax5DSCPOnmtEj7weQFJyA4Og0hKIK8unZTTXdSiq0AIQcg65BQBosBO949IE21msXbKhx4qKolBz+/LnrUnQUVxhkAc8XaClYAAIABAACAAAAAgAEAAAABAAAAAQUgIOuQUAaLATvePSBNtZrF2yoceKiqJQc/vy561J0FFcYAIQfcq45CM9kU8pgInl2NOydhigf1IT+Jmiu9unj9uQLFzxkAc8XaClYAAIABAACAAAAAgAAAAAAKAAAAAQUg3KuOQjPZFPKYCJ5djTsnYYoH9SE/iZorvbp4/bkCxc8AAA=="
- P2TR_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(P2TR_PSBT).to_cbor())
+ P2TR_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(P2TR_PSBT))
SIGNED_P2TR_PSBT = b'psbt\xff\x01\x00\xa8\x02\x00\x00\x00\x01\xf9\xfe\xa6\x15\x16\xa0\x07\xe4v2WHAq\x8d\xc0\xda\\\x1a\xf6\xd9\x173\x7f\x06\x8eT\xda\xbeI\xbe?\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x03:\x1e\x00\x00\x00\x00\x00\x00"Q u\xe6_\x88=\xe5\x87\'1\xd9\x8e\xa8o_\x08b\xf0\x929\xd0\xe9\xb0\x0fI\xf5\x92\x06\x9c\x18M\x02\xa2\xe8\x03\x00\x00\x00\x00\x00\x00"Q \x9d-\x9bm\xe6\x0c\xdc\xddY\x07\xc1\xc0\x961I\x1b\xddCN\xee\xaa\x8a\xaf;;\xf1\x9dc\xd5>@\x99\xe8\x03\x00\x00\x00\x00\x00\x00\x16\x00\x14\xae\xcd\x1e\xdc>\xffe\xaa \x9d\x02\x15\xe7=p\x90]\xc1hl\x83\xbf+\x00\x00\x01\x01+\x7f\'\x00\x00\x00\x00\x00\x00"Q \x06\xac\x82\xfc6\xdb\xb6\rHy\x1d\x81\xc3\xc1\xeb9\x7f\xa9s\xe4V\xc8\xc6\xfbT\xc1\x04!\x1f\x04{\x1a\x01\x08B\x01@(\xb0\x7f\x8d\x19\x9a\xa5\xa3\xae_ ti\x10G\x95\xc3)\x18\x1e\xca=Lq^\x9ah\xe7\xb58=\x87\x80\xd8\x1a\xbd\x0bb\x06@}\xd2\x0c?\xd9G\xac\xe9!%{\xe0E\x8bY\xca\xedH\xebh`\xbc\xbb\x13\x01\x13@(\xb0\x7f\x8d\x19\x9a\xa5\xa3\xae_ ti\x10G\x95\xc3)\x18\x1e\xca=Lq^\x9ah\xe7\xb58=\x87\x80\xd8\x1a\xbd\x0bb\x06@}\xd2\x0c?\xd9G\xac\xe9!%{\xe0E\x8bY\xca\xedH\xebh`\xbc\xbb\x13\x00\x00\x00\x00'
SIGNED_P2TR_PSBT_B43 = "$JBJ$DT-D-U/1AEWDTQ*PH4J+H:1+I467L27$UINP.QOHP:ZYLDCPD8/LI+DN/A.X7-PC4UCX-K$/OQO-G-H.CGX.+9:5JKUVI:PVG+C37HW*MVZDUS$J-CLTWQ6WQ.A0MGXBUZF:X:276$9AZTBLV82BDNXAV1XQ6..R3I+.LV4OLAXU0MO:KY3KB.:-2PFJOYQ/*95CD:5HPWA/HJ2OW1ZPNB*S39+EAP+60B73/9W9KU.A:DTLVNCOCV1/BBLE9O14Z5ACDF0N$PHZ-B:IEJHV17V91KA/WPGFPSZNSIB/-WNYY./+5VQV.DUAIILF88LFSGJ/E36.B6WJ1$I/FWPOI/L*3.8F2B1TNQS-24N8QJAF**+S13/RFDR9ZZ3/N4CP7S9Y9HKJ-$/B43SC*+BRP44+DUH+$79DJB1-9AY7N/SZPZSHJP6+KYW+4/GIWNVRW$DUE08UMY-7/FH3*ZPPAL2PWR$1+R996Y.E9H:PIB*SJQY.JOEQL/X+2Q5V91UL*/WNCH$$DY*GK.I9XN"
SIGNED_P2TR_PSBT_B58 = "9eehoGbwQ78EoHBL2mrxCSrMophCYTK9PxBW3WqL69ZFwj5F1ESdYXt9GdSKA3xxCgfDKhQt9PqBtSkNoKRFgnm6WyTASro6r5za7Nd2JtywPgYe1JdErssp47WvjrbkBBYV5jvWrzPTJhFrpyis8LLyKExp1XY4VwfSTrcFXfDEM7QoRDehks7s7w7CbLHg8zJEDqRjCdcZpzbVunb3FR7ypZHv41S8VKvhiGHFq1nW99F3dErPYbEs8Pc7gVwhJ6XuhmkpHArZp8pyFd3pQJhyBYQwqUR4QU41buYuFQ465SyMuCLyXhcevALrcjJRJVJsCpsEEZgqTk5z2oqsNPXNVHweNjeHBUdN9uJBgtQ6v5mVWRdsYUfmwFeQqyvDEaioqAnNNSpSe2ByNfcv8ftSfzocbNHLahUqTbjSvxThW84LpEwMUitaUQoguJweVscdRRitkx1kCmsaMC5JwrRH13zHVoFnJqPEUHZwqYTzAJCf"
SIGNED_P2TR_PSBT_B64 = "cHNidP8BAKgCAAAAAfn+phUWoAfkdjJXSEFxjcDaXBr22RczfwaOVNq+Sb4/AAAAAAD9////AzoeAAAAAAAAIlEgdeZfiD3lhycx2Y6ob18IYvCSOdDpsA9J9ZIGnBhNAqLoAwAAAAAAACJRIJ0tm23mDNzdWQfBwJYxSRvdQ07uqoqvOzvxnWPVPkCZ6AMAAAAAAAAWABSuzR7cPv9lqiCdAhXnPXCQXcFobIO/KwAAAQErfycAAAAAAAAiUSAGrIL8Ntu2DUh5HYHDwes5f6lz5FbIxvtUwQQhHwR7GgEIQgFAKLB/jRmapaOuXyB0aRBHlcMpGB7KPUxxXppo57U4PYeA2Bq9C2IGQH3SDD/ZR6zpISV74EWLWcrtSOtoYLy7EwETQCiwf40ZmqWjrl8gdGkQR5XDKRgeyj1McV6aaOe1OD2HgNgavQtiBkB90gw/2Ues6SEle+BFi1nK7UjraGC8uxMAAAAA"
- SIGNED_P2TR_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(SIGNED_P2TR_PSBT).to_cbor())
+ SIGNED_P2TR_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(SIGNED_P2TR_PSBT))
SIGNED_P2TR_PSBT_SD = b"psbt\xff\x01\x00\xa8\x02\x00\x00\x00\x01\xf9\xfe\xa6\x15\x16\xa0\x07\xe4v2WHAq\x8d\xc0\xda\\\x1a\xf6\xd9\x173\x7f\x06\x8eT\xda\xbeI\xbe?\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x03:\x1e\x00\x00\x00\x00\x00\x00\"Q u\xe6_\x88=\xe5\x87'1\xd9\x8e\xa8o_\x08b\xf0\x929\xd0\xe9\xb0\x0fI\xf5\x92\x06\x9c\x18M\x02\xa2\xe8\x03\x00\x00\x00\x00\x00\x00\"Q \x9d-\x9bm\xe6\x0c\xdc\xddY\x07\xc1\xc0\x961I\x1b\xddCN\xee\xaa\x8a\xaf;;\xf1\x9dc\xd5>@\x99\xe8\x03\x00\x00\x00\x00\x00\x00\x16\x00\x14\xae\xcd\x1e\xdc>\xffe\xaa \x9d\x02\x15\xe7=p\x90]\xc1hl\x83\xbf+\x00O\x01\x045\x87\xcf\x03\xe0\x17\xd1\xbb\x80\x00\x00\x00\x01\x83\\\x0bQ!\x83v\xc6\x14UB\x8a\x9fG\xbf\xcc\xe1\xf6\xce\x83\x97\xea\xd7\xb0\x03\x87\xe9\xd9\xeaV\x83\x02\xcf\xbdq\x001\x1e\x0e\x85\x84L78r\x83\x149N\xb80*kPp\xd6\x92\xe4\x1b\x14\xba\x81\x80\x90\x10s\xc5\xda\nV\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x01\x01+\x7f'\x00\x00\x00\x00\x00\x00\"Q \x06\xac\x82\xfc6\xdb\xb6\rHy\x1d\x81\xc3\xc1\xeb9\x7f\xa9s\xe4V\xc8\xc6\xfbT\xc1\x04!\x1f\x04{\x1a\x01\x03\x04\x00\x00\x00\x00\x01\x08B\x01@(\xb0\x7f\x8d\x19\x9a\xa5\xa3\xae_ ti\x10G\x95\xc3)\x18\x1e\xca=Lq^\x9ah\xe7\xb58=\x87\x80\xd8\x1a\xbd\x0bb\x06@}\xd2\x0c?\xd9G\xac\xe9!%{\xe0E\x8bY\xca\xedH\xebh`\xbc\xbb\x13\x01\x13@(\xb0\x7f\x8d\x19\x9a\xa5\xa3\xae_ ti\x10G\x95\xc3)\x18\x1e\xca=Lq^\x9ah\xe7\xb58=\x87\x80\xd8\x1a\xbd\x0bb\x06@}\xd2\x0c?\xd9G\xac\xe9!%{\xe0E\x8bY\xca\xedH\xebh`\xbc\xbb\x13!\x16E\xc6\xb1\xe44\x82<\xe9\xe6\xb4H\xfb\xc1\xe4\x05' 8:\r!(\x82\xbc\xbavSMwR\x8a\xad\x19\x00s\xc5\xda\nV\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\t\x00\x00\x00\x01\x17 E\xc6\xb1\xe44\x82<\xe9\xe6\xb4H\xfb\xc1\xe4\x05' 8:\r!(\x82\xbc\xbavSMwR\x8a\xad\x00\x01\x05 \xeb\x90P\x06\x8b\x01;\xde= M\xb5\x9a\xc5\xdb*\x1cx\xa8\xaa%\x07?\xbf.z\xd4\x9d\x05\x15\xc6!\x07 \xeb\x90P\x06\x8b\x01;\xde= M\xb5\x9a\xc5\xdb*\x1cx\xa8\xaa%\x07?\xbf.z\xd4\x9d\x05\x15\xc6\x19\x00s\xc5\xda\nV\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x00\x01\x00\x00\x00\x00\x01\x05 \xdc\xab\x8eB3\xd9\x14\xf2\x98\x08\x9e]\x8d;'a\x8a\x07\xf5!?\x89\x9a+\xbd\xbax\xfd\xb9\x02\xc5\xcf!\x07\xdc\xab\x8eB3\xd9\x14\xf2\x98\x08\x9e]\x8d;'a\x8a\x07\xf5!?\x89\x9a+\xbd\xbax\xfd\xb9\x02\xc5\xcf\x19\x00s\xc5\xda\nV\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\n\x00\x00\x00\x00\x00"
SIGNED_P2TR_PSBT_B64_SD = "cHNidP8BAKgCAAAAAfn+phUWoAfkdjJXSEFxjcDaXBr22RczfwaOVNq+Sb4/AAAAAAD9////AzoeAAAAAAAAIlEgdeZfiD3lhycx2Y6ob18IYvCSOdDpsA9J9ZIGnBhNAqLoAwAAAAAAACJRIJ0tm23mDNzdWQfBwJYxSRvdQ07uqoqvOzvxnWPVPkCZ6AMAAAAAAAAWABSuzR7cPv9lqiCdAhXnPXCQXcFobIO/KwBPAQQ1h88D4BfRu4AAAAABg1wLUSGDdsYUVUKKn0e/zOH2zoOX6tewA4fp2epWgwLPvXEAMR4OhYRMNzhygxQ5TrgwKmtQcNaS5BsUuoGAkBBzxdoKVgAAgAEAAIAAAACAAAEBK38nAAAAAAAAIlEgBqyC/Dbbtg1IeR2Bw8HrOX+pc+RWyMb7VMEEIR8EexoBAwQAAAAAAQhCAUAosH+NGZqlo65fIHRpEEeVwykYHso9THFemmjntTg9h4DYGr0LYgZAfdIMP9lHrOkhJXvgRYtZyu1I62hgvLsTARNAKLB/jRmapaOuXyB0aRBHlcMpGB7KPUxxXppo57U4PYeA2Bq9C2IGQH3SDD/ZR6zpISV74EWLWcrtSOtoYLy7EyEWRcax5DSCPOnmtEj7weQFJyA4Og0hKIK8unZTTXdSiq0ZAHPF2gpWAACAAQAAgAAAAIAAAAAACQAAAAEXIEXGseQ0gjzp5rRI+8HkBScgODoNISiCvLp2U013UoqtAAEFICDrkFAGiwE73j0gTbWaxdsqHHioqiUHP78uetSdBRXGIQcg65BQBosBO949IE21msXbKhx4qKolBz+/LnrUnQUVxhkAc8XaClYAAIABAACAAAAAgAEAAAABAAAAAAEFINyrjkIz2RTymAieXY07J2GKB/UhP4maK726eP25AsXPIQfcq45CM9kU8pgInl2NOydhigf1IT+Jmiu9unj9uQLFzxkAc8XaClYAAIABAACAAAAAgAAAAAAKAAAAAAA="
@@ -86,26 +87,26 @@ def tdata(mocker):
P2SH_PSBT_B43 = "2E8H6I5RDHU3OW$NGTKQZJ11SD4SFMWL9B-YDK*EGFZDIU0O41Q8TISDSW3KA76UDWO4CMIRH:9SD3H7.C011*YTFTAVN$IVXY*5UIS0-7U5UA+M2V6P-MM0Y2*0D8M$U5RYB7SIQH1BGZ-$D:RBSK*GZZ1EEIU2UWT46KG5$5NX:3ATOT//NBGR-$$4LGBU21E2*QFCEO4XNB2JMQ10+Y:IW3/HVL6+XU60UKMM7X-2II28Y5G$9+5+I.512IMGZJIPI.83O4+PTYD793:8QVB+IKED9ZZIYV+QN59QHXMIVOHOMT083AR6.+6:/K/.81E:HG9+EEU1GOHK-$ERC5ZV4KYQHKP$ZGAXBY8K+Z1-/LAA6C+*0N*5GW76/:7JDMNF/FOPQRDBZJ32Z+YIR50OD/CH4L4C6+BBLI22/:.WL/PPQUS-DX$7/RII6$AZAXP7Q+.D6T1JWH..KJU+0:STNNDP9/2UMRZB*HHUQTV*AQL:5XYE:J2G+OENWSTKQGP5P99M6:.KZ4S-2*E69RPHERYSG.8YBQOMFJYTNLYHMS:OYW5DN//GQKJK-.K-Y86W6-2S.1WJZUGOG-6BTF-ZFPU+CK+XC9D/$QPD45K7S0.$DQ67JB07KYF-878+XYWXUPO3/C-A5CZKCSRN.XGYFZUA2B0R$2VXGDJ6LXY*9DT6Q-4FYA4FGXRTO5KULIWPDI+OJDAMS51QO30QRSEV3.E418WRVSOMQ*ELLHV*HEG2C$EWJNTO$0YUFJ68NP-OX42PPKE:$-KYM$UH.$3QCM.XIK89$3SMADZ1LT0CE+K24NGV1R96ETTDE7*RE+ABL59SA7X9AE15G-YDR/W6WY16WA:5V9WUS*HIJXG8CPI9$RTA9T1-6F3TU7I/07G04UUANGX3ZT71J1./DQ+FA7M-FL28IMNGM4XQ2PTSMH-AR0V325U$L96E+GV:S$KCY:T*R*.NJ9:G*QMO756.GI4:IV7IADU9F:Y9WM0FIYJM7JC.V88RJ0JVMXOAA$9/9X1*RO+CE-2YM9L678J.24+SM5F.*8ZLR3WS+875*-7GSJW517R8$$515VI:H6PQVU6A1KOY8+TEJ7QM*$8QUJBD*ZCL7/M44XL-*I+LJ+9Y*Z418KBNS.CK1PZ8WP+SL1V59DG2PYPBZ8U9YB6JG1W3FG5RRE-*.URZYC1CP+-.*B4*XH2:DGNOI-$XBYA6M*9-KCG9:3FQ9$EB0QJN-ANA:$:CWAK*AQA4HPM2KKR1*GD68FM4E0L:NPJK9G8FCG*:$-I69Z63W.MTSST4Z8F8YLPQ$2S3C0AKTPK9:64JD97YDMEIOHVRSZ+$RDOD+3AF5428SMBA1TE-6W.5DHZCZHLAY+$MZQ7C8MBHO53A:L8/CRAG2XXF64H3MJ*LNN846OQFTK47CHSM5R.*K$3HTZJ3UKJ*KHN:-MU1Q8E9EOVIJ-9VM5XTQE/+XP.OG:IKY0FZYJ/MLXDGWS8-$M/55X+YME699G9AMEYES/AIMD*CQ4D1I5B4VD1/VJWF7V+7TM0P4HNB8C:AO*.8D2U/Q5U8FZTLJ3-E.*C:OQ1BJ96ZC4TAY4B*5GIIS1+Q31P:7:$M23SG$W143YJ0U+*A9KUKOJ:N$I5-0$6BMREZ1K8AM4A3.D95MAXEC11QH+Y5AYQIWAMT/PBJ:1C$9AJ0$MOA3U1DD3F2CABT///$C2FW/L1:6ZPGXB:DM42ZB1N$YF0C6-D/$$PU2W5NE4.F89/D+U1S21*5+G.5SMGVB7HS83+5*2+06EDINXO62I52+E0O+F.ORFH9K7WGX0:F3SK0FU/2A59*8RH+-R8.CUP2T7EHU5MWA59HI8Y4WDF78LA6LN1C.K-VP0V0EK0AY34FEH1T6.UT+WSQK84C-D$FML$K6JWZ$GE9-$I:XIBDI*2*DKD1SNJ73G4K*RY88NSE$GP6DNUF4RASV*GPQ7N86W7WR4:ZTV.PLE*Y$W4GSEYV$K5/S73EWN03PZUDW1C4NPWDNGOGX2YUWZQ9FI*ME432Z$-.UCPBTC16MC5B0TP0CK.*555I0.N0/8PZ8-58$PW56GZS$1$$5T*JWI/9WWH$DH.K9L5-36MIIIZ*0A6M.*+FP+XF+Z*XL$GCFMKFN$9C914R-NIZC.:3H*S75BX/$:7B4/FS0CR88F*4X+0*RNTMXZGB4JA.7J7KE.UGQO5JMRNDL3P+TSONS5TAXQ/YC5KID+J-3SJUNITZ-BH6HKQR52A6/IMV+78A*-*HI+9LG0*FFA39TCW8VB$XW.E-/7+:R2*0PI990UQJ1G7Q4$IWUIM2-/:95KPVMR.NMX8K8YUYC/+P*MJ.U35O8ZCO99/YLL*DCR.M+$XJ$D0RORJL4FWI+4$:AMF$05S9EN2HZ4X-R15-.54.8XAW.J+77W:MR1G5-WKA/SJW-4.:XZS4IT3LS6:9XVGNKNPPD7274DT50RIM226LUM:+D4-::.358G9.226J-FTW-UVQSYN+5G/QRDW+CUH/W8M05/SNNEFFC9.:QIPM8W20-Y37:J28GY*AC0YSC4B47.JOOXIHASQ$MUY5N9DFQOY42Z6BD:V0PKI4JDAMX4WA65CRMGC$U6G6HCEJ$BW3WGIX-RY6GPR5Z0G$4:JQGCVP665NVF5G1IH7VHUM64S*6Q7HNCFUBBGKNRPTNL+7::UQJ1SQJA.HX3FZYZ$B1C4DLYJQSIA/Q/F.VNZTV:445621T+DXP6Z-Y-+4UF*LBU/6*X77QC7UC93:X96WV6GSWG7GMJ*NAR1J0QLADV3-L$:+KU3NMLJ-:HLGOQFXS85+1*Z2KL1/*TEF88WBZ7M1EH+JHMKS$4291/ZEL7QP69WCY371GH8H7J6AZNKXZ+*A6X.W77$/FG$FA9QEKGEPDDSJL$09TKKRVVN1WV02MBHR9.DSH9+7HCJJYZ1DBASA8WV8J-4UFC8AVI5F/0E$B6-YTV57*6E4ZNXNI5Z.G29UKN*Z*I4KFB/Z4V4$J-XRZVC.-YKU0AE/9U*GNKPIDDS5VVJP1TA2HD*QW10QL-KD3LZAFH99TT.X9OJOQYS5TWFHS7+1ZR3XLF5M2HA6A/8C0Z6GM.58IVEV4ZL*7Z:L2KSOXXW24-TZ.14UG4-*T*2$2DGNAG*1EVD3UO$MA2X7B-KZR1RWH30OLO-MS+KZ9WU8FAB:SMYY+2AU.16TJU87I1/LXF/.A*Y0V8OFD.P-PX8-N98KQ92RPE9KFMETHP8E*:ABQ2WX-SE6XE7PTA2WY*35C-PPGZ63ST+/1T68GLV5VJYNN0/+4/OTBS*LQH+$8.DP.DKDRUCHM:-WEMJNHG$9EBQFIKSIK/67T1R/4DCONL5J.8RMQFR0EQ::-Z9*R3*W126ROH09TNL9P85JX1$Q/I$4EL-:EDNH1-4RN7A*GBVGPF2HM*ZGKP8AL+-T/.HHO*F1NQSF$5U:8IXDMTFRSF/*UT$:*X*K0$YHWL.5QMCF9XEJ69C+70FI7JQC09FUJ$-AI7$4M$A82XR3ENJ6+080*WHAVMZ02VLW-H7DC:MH187P7/LV3.LRMUNCCPPNCK3SD2EZ*RU77K.0617F/T950KU3Z-C905E*B7EOLN3DYDSF5O4Y*PLEKLSNTR1EOG14.0P21577NZPM1I4:XA1RUZPC+QXBIO1U6PDXE7C+C/RAN5PUJCOG29KE3TG/1T3Y8BN0AY2ZWIWN9N2YXYDKAWVYJU*1E*:ZK9VS:K/2ZURNSNQZAJ0-*BZJ$2BARJR044LWX.EM3NEH4GSXSZHKXCTISR+P8PCIR5TN182JVUZZQFADNN$*6BDFOHAAQIKST73:E6DC3L3*.QF+O1I330897*/M5S-+EK0F9JB*C914WH9ZGMF/7+66E9A-FL7+UTW:/0/YUQR6T27:O/9/V9*5T.K28254*YYEA*M2EG+Q3$XT3RD+S9HG2RY*R72SH/-C5DK7Z4IGF3N6/DNUMQ4A+1SC99-$JWK14A9B0SDLB9W20LZVC0MV4N5ZSY1BPL/-/+OT0AP2O+4ID3Z*F0/:*Y7CPEC-8TXO898LYV7SXZ4N3W74W01MMKWM$W3B1A+8U:9GIXEZJRV:IV3--U5L3UPKK$MKQ5J$00M3YRQ/7:YCC4$-7-P8O253QG$Z.*5IC+:9:ABCJ5DM.V+:QPC.G4DG6MLMK0UY:W2.7H1FNCWAV946CO--L78OBA+0O-1JF.-FJHXNLNEHJT$Q7339CCEC84F8BRN6V4+O1ANR*HCEM*GI1YI1W7I-7C/D$BNUO7-OWNC$MXE6CBZ1PPURYFC0IFJIEYXATJADL53ZURCI$L6F8.4PV6T0DTJKWUG2RFYCUB/FEAZ1R$FTLGTZPEQ$UU2Y7IC/C0WXA8ELCI9--X.ORR3CK6RC+S/:5/PJV3$2CMTAR1ZELG+CTYXLL5R.K0B-CWAHP:RHV.-RVKK$YP7W*D7EUGEAKE+ZM/8DPI6UM+I:P:-5D7Q6*-61/:Z3VHFHEHASIGRYI$U17DYT$TKPLNRX5Z0Q-JM+LFP:7/8.5OM6:4SKV:7*8/3SQ9:N859IK9O+B.MPE/UIZB++/XFWSMQREDM*96*P*MCN-LM$XNGM341T/N5/D3/KROM3LOX46KU.23Y3CKE*7DC7FT$I5*O/R3YKJ+/$LF.LZ2NJ*25B2UQK4C5RQ+4W+*7JR8-7-AWIX8-PE2*3EDJS07U76D8QR1E$2319*K3A40RS7X/GN90KMBE+8:7/TKVN-F-F9X3UBODVH2IPMDEVE1LI9PX9YTK8W4BIOS-RD9KAQGW$L0E0/JWMR6UA8HMZ$Y7/H8LHN:GSW58PUX+5UQ-N6QU31Z4+O9RRQ:5NPOARKDYJ*8W1N0K83PGZNVT44A:GT0$XT51J3KWVNOD0HIR13S$1QSD4ROECR98N6UGVQR09/T:U$2B-3TV8EOLWG7X4YTB:+BS34TNOMT6YJ2P-YD4PDP02L8+9K1*DRZ.AFJO-/WB*Y06IGTGWYVM25C7GG93+JRQCQRD4P8Z1HE:LA66/10GK6$5V+UJMC1OV.I-4IXN+L-XU-B-62.GN6L35HP-ZKNWR/5Y8Y-ZG10ABZUZMIL1NA6XO8-7K-.V3MQ:Y24TUA$TV83Z6U/999M84YK$T.H06VNUAQQ80-WU52PL*LC6/QAAD0X4W6W$CC+E.0BB41:ZJ*SYQDEKU8GUTLFWCHC8/ML1VZE8MXS0G..C51.VR:.PA.7.B+MPS1*4V.J*W.+/$R0I4-P*3GNJ:8MEX5$GV1/X-P:R3Y8NEFY.I3ADYYEMIW6:EJK:TLVZ55X+5BP$YPUG1UEZP66R/$LPGTM/TUGI6P/-7CKMN9K.1JE47AE.4BBYKH/REM6L+4/+RR0MTR0GYU*-A:A-689V/ZIYG+W2J636:Z*TX$Z+KZ9-+0DPS4Y6HTV-CMF:-J0VB-:32.IWAE:6E0TVGN-KHZUGO1SWR8JB*3A$L8KO:$T5*CP:PZ9/W-QOSHSDUW15Q94PGG7B+NHJLJ:CYSSVLOA.86HHVUTR+8$5121BT52JR$5XNS5ZRO44$5/LG8T3-QR*/I4P+81*H98N2J:H/IE8GMT70B:0C7JQU9OEKX3015QZ9D4T1MM+ZL7S+QH50H2YR71BYJZD-YPG5Q3Y*EQL0GLFMD2QPIB1:8SJBR1IKQQDUEW+:8O.YH25.XEL567F-0$9G1F$D$/V5/$M+F81++ZFD6/ZHVMFZ:S6K7R1W-MGT:*ZB5.A+H3MOE9I.PM7PRRK1$XEOBS4+0JR8VXH9QW3DRV5E:EPN*$5-3FKIQJ-YK6+/.PLUX9ANP5FMGCHN$TQ668OA:1TBSN6/.UE.1O6QN60VS$-ZBH.55V1UZE.B3J8BU$/QFC3DB$XF+9U--PN-IVWTM8VS*N+Q.R7-/8D.:$FCKWC4OWB/M+QINE*0$J4N9HJ98Y$2P+GETQ6W.*7S:7+C:PLFQ4*8$36$V.NE+DWPKQE9+S*BJ-T:K3T1E8BKDDIS0.B5P.4WSZ6KRWTH1LJ86L97LMS7TT6*9HW6BSNBEFCQ8IRTU:5C-$I7UN3P9O53U*IWFSHLGJO31F:Q*$ZI9DN.SNWD2CG-90Z*93F5AO00DCBEO5FAW2B5GREL$.P6H6-O8K//UNEPK:1.YXDPR1*K$FZ2WIM5$ILTC5NV13Y8EFP57006RBCYQ38.O0SCF+1:XEO425TTKD9/ADA+6LML/F8A4APJF*.IM147YB7U597Q7X7E*0RK2K4T:93WC1F3.DWH/M*PS79-9:VYS07.713F6Z.H5YC9KNBDN5A3BQCICHZLZV50S/GLSVOM/TVS6ICV80J/L*DXO$UI9H/9AW9:I8K6-PATOZRQAFOHH3$-3XOL:OMFAW/79DRMKT8-.SN-$53LX4FB9AI0*C9N-2X50$V:4VEH7DAR-RACA218Y*KKQG6B2-JL+WLW$7HU*B9CT9B*Y29R8QQRZY3XKIAL1YN7:$:8/JILC+-1MYN-O2Z8MERCK51L1MZAH.O$WIEUU0PBX$IQI8C-N$B6.$V.HQ3P.L0FL1CH66.TNZ$7:*QV.*R14I4G$.0*PJL+EF33PR-WPDQ2ZGJVL9V30E8KS:AOTF:7C1W+DG03V4-K6YYFFKOMCUDJF1L8QL/.K/DM:B0:P/+VXYTPZB-$G::OTWXPW$DM.AKR$GGP6QTDS2W:CWE:XNVQV8ZJU0*BZ4/+ARGC1FSX/HMM7S0821BPVX8Z7XCX2VODW0312:VR.*AG+$BPD+/R*.NEXS72Q*IR12R45IDPM0HG-.3UO-YWY1DEZ.6.TY.8N2M+6TVJ+NL/1LFVGKTTKKNCG8GFEYY*:1X*63CUKX8M:Q06-QK.L0GZ1S*..SY96Y8KUC4$/LEQZ7UJUU3/28K/KGQ+4K$8T:8+9RITK8AE921F*U044:QQ6ZG/4XZKEFA2YV8*HZJRAYYP:*.JDHUPV-8XK*F/ONYSLC3CG4P4MIUY1E7D5H.CNA8VUERW2:M*C3$J0W6YP/.Y687SS67X52*H+O$U9I+*:U.KJXBZV1VN*X*U0N1TK*1./AMFMG8YASIY58:1::9B5M73SQRFH07I*EZV5ICWTZYQKT6TOLQ4$CF*JXNY*93A+EK3YB1B*JP0K7:KH*VPOQ2S/*WWJ8OC17/MHUHVP:PJVS1$882A4AF8N2CBBGS1QV8-.L7WM58OGFWP3MLX$5:LOXTSK:CLLCCY+F+X:X*QZXQ7/6-N1-7UX-$AZRDU5XMIL543FI*0$/4EZKFQ/3-N387JEQWUN7H:KOV8*3:C7QR+XDT9HXI6:XT+.DHC3*STXQGH7/7I9T3I:EK:LCGPY/ZOAC-YKU+GBZD1ZI2C8G8EYOTYYNAHJBWAR1:Y5A9CDB+62HJ*ZTRGWQP/5HI.*:XDOZR52T$DP1X.BI4$N4W*DQ*AR.IRNZMT08:EVJ2//5LAX37--85RXV*8J5HMGJYUO*OHE0TA02UP2Y$.P*PO8+.RHC56N5.+ZQ/D0WC90-*KP*X4NPX$S*1/JK8I6$AA1L71F4DVQA6EHU+CXVFK*-RO2*J6YW6RN*IQHV77IEX*CF$C7HM1A$HZBEG*9RVVNA-Z.D2MJ61GDX2+7$+WSDJS92OL8G7M5NQXK/1HNIGSW3*4UY/46MGC42EEAXIP76R2+S-0NN59RD/A$Z:/71*/+5QD64LX705SKSCI2LNZ+LKY**8OTMBWE3BHSY67VIUY4QA0KJ-.THB2.YS9GT1-Q-T1:O7RV$*B35T$WFDAK389268BQ99A-O1MF3.IC69++:HBXM$FZB03OAIUI5$:AKW02:QB43RX5DI29V4M*XRBQWN6B41BM$PC$-SHJB+8FFYC0HZ4WLRSD7BM$URW287WLP2YF9CP:U-TL:VR7/9-F6KR89K*KK/-5-LZQA-$FH34:S6DPUL3O60O/MCJOT3V$KLPS"
P2SH_PSBT_B58 = "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"
P2SH_PSBT_B64 = "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"
- P2SH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(P2SH_PSBT).to_cbor())
+ P2SH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(P2SH_PSBT))
SIGNED_P2SH_PSBT = b'psbt\xff\x01\x00R\x02\x00\x00\x00\x01\xe2\xba\x11\xa5D\'C2\xd7\xcb^\x0c\xc9\xb1\x0f\xc2\x8aJ\x05"\xa3&\xf4\x8f\xf9_\x9b{\x88\xce\xde\xee\x10\x00\x00\x00\x00\xfd\xff\xff\xff\x01\x9d7\x01\x00\x00\x00\x00\x00\x16\x00\x14D\x7f\xde\x1e7\xd9rU\xb5\x82\x1d-\xee\x81n\x8f\x18\xf6\xba\xc93\x10\x04\x00\x00\x01\x00\xfd\x91\x12\x02\x00\x00\x00\x01B:\xec\x86\xfe4\xd2\xe8w\xe4\xadj\xe2\xb8.h\x0e<\xe3\xb6F,2"#\xb9\x97\r(|\xfc\xbf\x00\x00\x00\x00\x00\xfd\xff\xff\xffn\xd3\x08\xf3\xcc\x0f\x00\x00\x00"Q \xaa\xc3_\xe9\x1f \xd4\x88\x16\xb3\xc80\x11\xd1\x17\xef\xa3Z\xcd$\x14\xd3l\x1e\x02\xb0\xf2\x9f\xc3\x10m\x90\x00\x00\x00\x00\x00\x00\x00\x00\x1dj\x1balt.signetfaucet.com | 108\xec8\x01\x00\x00\x00\x00\x00\x16\x00\x14y\xe2\x05\xa8\x9f\x80n\x86\x8e\xb2\xb4e\xfco\xd6\xc9/\x0f/\x1f\xec8\x01\x00\x00\x00\x00\x00"Q \x12\xd8d\x9f\x18\x1aN\x1c\x89I&\xd5)\xe6\xabYx\x86\xb8EO<]\xef\xd6\x88\xde*\xa3J]\x07\xec8\x01\x00\x00\x00\x00\x00"Q \x17~p\xe7\x16=\xa2\xf3d\xb1\x8a\xc6\xf6-L\xd2\xbf:\xc0z\xe6$Q\xd9T|\ny\xc4\xc5\xebk\xec8\x01\x00\x00\x00\x00\x00"Q \x87}\xe4\x16f:@\xf8j\xfd\xdc\x11)\x81\x1af\xeb\x06\xb8%\x12\x94\xd7\x00v\xd7\xf3\xe2r\xfeN(\xec8\x01\x00\x00\x00\x00\x00"Q \r8\t\xde\xa9\xae\xb0\x11{\x9c\xfe\xcb\x01\x04\x10\x0bJ\xa8YQ\x84w\xf6\xfb\xbe[\x1fsL\xea\xce\x90\xec8\x01\x00\x00\x00\x00\x00"Q \xbcp\x9bh\xc0\x1e\xb3\xc4\xdd<\x1f&\xb5$\xa1w\xe5\x05w\x89\xf7\x90\xc5q\x8e\xb8_\x94\xe4o\xfd\xca\xec8\x01\x00\x00\x00\x00\x00"Q @\xfd\xd1\x830O,\xdd\xd4\x06\xd7r\x1a\xf5Dr\x0b\xd4\x1dr\xd4v\xe6\xb1\x8f\xd5\x1d*:N\x8af\xec8\x01\x00\x00\x00\x00\x00"Q \xc0\xe8C+F\x12\xe1`\xa9:\x0e\xb2DC\xcf\x15\xe8\xe2\xa3n\xb2vL\xd32\xa5\xed\xca\x06=4\xc9\xec8\x01\x00\x00\x00\x00\x00"Q \xc6M\xd6\xee\x04\xd8\x1c\xbek\xe1\x90q\xb8\xb4\x06\x19\xb2\x8f{\xaf\xdd\xf4\xd2\xb6\x84\xcf\xb4\xa9\x8a\x16\x93\\\xec8\x01\x00\x00\x00\x00\x00"Q ,d\xcc\xab\xadXa\xcePB\xfe\x95\xa3B\x8f\x83\x8dCi\xac1\xf1\xd3l\x9d\xb4\xf3\xa6IV5\xa5\xec8\x01\x00\x00\x00\x00\x00"Q 9\x83\xadB\x91\x12\xa8\xe1#\xae\xe5c&D\\\xb2\xd0\xbd\x17\xfd\x07\x17\xd3\x06[\xcdt-w\xf9y\xc2\xec8\x01\x00\x00\x00\x00\x00"Q \xf5cw\xc1k\x86\x9e\x80$9\x94=\x14\xb8\x101\xc8g\x18\xf6\xf3\'Q\xce\xa1i\x08j8\x80Q\xd6\xec8\x01\x00\x00\x00\x00\x00"Q \xd5\xc4\x92\xe2\xf9!\xdd\xaa\x01v\x00\xca\xa8\x0bd\xee:*o\x00\xa5\xce3\xc87\x1a\x96T\xb4\'\xb9\xce\xec8\x01\x00\x00\x00\x00\x00"Q \xaeY\xc1\xacX\xee\xaa\xd5\x98\xe6\xd0u\x88\x98]U\xe6z\x8d\x95\xce\xdf\x05\x9b\x92\xcf"\xdf\xdc\xf13\x16\xec8\x01\x00\x00\x00\x00\x00\x17\xa9\x14)\x15~r\xf1\xe7\x1a\xdf\x06\x8a\xe7D\xb6\x88#\xb2\xe6\xad`\xe7\x87\xec8\x01\x00\x00\x00\x00\x00"Q \x14\x0f\x00\x98N\x07\x02yO&*\xeb/\xacf2\xb2\x98r\xed\xb2\xe9\xd5\xfa\xed\xc7\xb9\xb4SZe\x13\xec8\x01\x00\x00\x00\x00\x00"Q \x14\xa0TP\xd6\xaf\x04\xd34\xc5\xe2\t\xd1\t\xeeO\xb6]w_\xf2S\x04m\xf0\xbad\x17^`\x92w\xec8\x01\x00\x00\x00\x00\x00"Q 6\xaf\x03 \xf2\xb5\x18ac$\xcd\x8b3f\x90\x0c\x83\x8f\x01$KD\x88\x17\x90\xf3\x83W\xc6/\x948\xec8\x01\x00\x00\x00\x00\x00"Q \x9b\xd6\xa1z{\xf1wK\xf7\xe6\xd9\x15\x88\x05\xde\x02\xf8\x81\xbd,\x99;\x02s\xd0CS\x03\x19\xa1"?\xec8\x01\x00\x00\x00\x00\x00"Q \xdc^\xder\x0fj\xdb\xbd\xccA\xa9\xca\xefs\xb6\xee\xc6\xb8\xa9\xb2\xdb\x0f7G\x19\xa1\xdd\xcd+\xb7\x16\xe7\xec8\x01\x00\x00\x00\x00\x00"Q \x92\x04D\xf0$ge\x88\x9d\x9b;}\xb7\xdc\xd4#?[\xb7)jiz\xfc\xf1\xf8\x17\xb8L\xb02\xfc\xec8\x01\x00\x00\x00\x00\x00"Q \xb91\xda\xca\xb1\xe0\x91\xcet\xda\x99n0\xaeB\x83\xb6\xa8\xaaU\xfc\xc1\xbb\xa0\xa8\xb5|\x92\x07\r\x1a\xf9\xec8\x01\x00\x00\x00\x00\x00"Q \xca\x8bJ\xd7X&\x0e\x01\xf0\x1a\x8f=--\x17\xd3\xf1\x91\xdc\xb3f\xf03-\x95Nm\xc7|%">\xec8\x01\x00\x00\x00\x00\x00"Q h\x98z\xe0\x7f\x84\xfc&\xbc\x99O\xbb\xb1\xb9lL\xd0\xbf\xb6\xa26\x0f\xcc2\xe9o1E<\x01\x96\xd4\xec8\x01\x00\x00\x00\x00\x00"Q \xeb\xf5[\xd8\x812().\x87\xf6\x1b\xfa\xd4\x85\x94#\x18\x12\xb0C_\xf1\xde\xba}\x12\xd0#\xa1`\x0c\xec8\x01\x00\x00\x00\x00\x00"Q \xf61\xafA\x1d;\xa9D{\xb6L\x95I\xa11\x9fA\x19+d\x11~\xa5\xdfpS\\\xc6\x0c~\x86\xca\xec8\x01\x00\x00\x00\x00\x00"Q \xd1\xfe\x0f\x90[/fx\x1f\x18\xe8:\x1aN\xf0\x15\x94\x1f\xf8\x9b\xed\xb7l\xc8\xcc\x17\x95\xea\xb6"\xc6\xd9\xec8\x01\x00\x00\x00\x00\x00"Q \xa9D\xa8poT\x01H\xe3\xf2C5\x96\x7fdm\xc7\xa8\x12\x06\xees\x03g\x15\xeb\xafft\xcb\xcd\xcf\xec8\x01\x00\x00\x00\x00\x00"Q \x8e\xaf-\xc7\x00\x02)\xf7p\xab\xa0\xfa\xbf\x1eO\xc9\x9b\x85\x85&\xb8o\xce\xea\x8e\xea\xf3d\x89C\xacf\xec8\x01\x00\x00\x00\x00\x00"Q \x12T\xff\xd8\xb8o\xa4\xba\xfc\x99:J\xcb\xd2\xb7\xd0WYZ\xc8\xc4|"\x1c\r\x9f\xe6Pt\xeb\xa5\x0b\xec8\x01\x00\x00\x00\x00\x00"Q 2\xd4\xabH\x9e\x04>\xf3\xdf\xf9.\xf5\xac\xed9U\x88f\x8b\x9b"\x9ay\xf2\xd2\xbd7\xe6\x0eL\xbf\x80\xec8\x01\x00\x00\x00\x00\x00"Q e\x10\tG6*\xea\xf5\xfd\x9f\xc8\xee9\x8f#\x9c#&3V\x92\x97&!\x94\x8b\xfb\x8f/}\x0f\xb1\xec8\x01\x00\x00\x00\x00\x00"Q Z\x1bG\xc6\xc2\xdf-j\xaf\x12\x82~\x0b\xaf\x00\x97\x05\xb4>\xce\xa05\x85\x06\xa9y\xffa-4\x1b2\xec8\x01\x00\x00\x00\x00\x00"Q Y\xf3\x08S\r\x9ebX b\xe6\xb8?wT\xd4Op\xcb\r*?.f\x95D\xd0\xd1\x9bzW\x9b\xec8\x01\x00\x00\x00\x00\x00"Q \x0f\x12\xe3\x1f\xa7\xab\xe1a\x18\x9c\x8d\xc4\xe0\x10yD,\xa7D\xc9O\xec&g\xb7\x08\xc1\x8e\x1a\xf9\x91\xd1\xec8\x01\x00\x00\x00\x00\x00"Q \x9c\x80U\xebcFM\xa239\xf3\xe3C\xef\x1d\xc5(O\x10\xa7\xd2\xf8\xb5\x99\xae\x830Y\xee\x8b,\xc2\xec8\x01\x00\x00\x00\x00\x00"Q \xfd\xd3w\x1b\x88^\xa7\xe9@\xb0"\x12\x1a\xc3\xb9+LT\xc3\x13\x1cE\xf7\xcb\xecH\xb9x\xd4\x06"L\xec8\x01\x00\x00\x00\x00\x00"Q \xb6\xcb\x7f\x12z\xaahN\xe9s\xa5\xd3Z\x88\x1f)\r\xad\xbd[;\xf0d\xc9\x9b\xcd\x9f\xb4Re\xe9\x80\xec8\x01\x00\x00\x00\x00\x00"Q \xcb\x9e\xe9\x079\xf0\x8bzK\xd4\x10\x15\x89\x92\xcd\x93\xbe\x1e\x074s\xa6\xc3\xfe\xf8p\xa3\xee\x92g\x05O\xec8\x01\x00\x00\x00\x00\x00"Q \xc6[j\x1e\xa5]\xb1\xe1\xe1\xc4\xfc\x89\xe2\x02\xad\xc5\xd3\xd3X\x00/\xda\xd1\xdc\x9a\x12b\xd6\xf0\xc1\xbb]\xec8\x01\x00\x00\x00\x00\x00"Q \xed\x9d\x05\xb5n\x11j\xef&\xc0\x91\xb8\x8e\xc7\xd5(\xd4\xf8y\xfa%\xa8\x99"jx\xbb/\x13\xfa\xef\xf7\xec8\x01\x00\x00\x00\x00\x00"Q \xf5\xeb\x93(\xb9\xdfO\xc7\x1f8\xae\xefO\x18k\x0c\x88\x99u\xab\xb2\xd5}0\xa6\xa3L\xa9\n\xe4X\xee\xec8\x01\x00\x00\x00\x00\x00"Q \xd3\x99&Qv\x18\xbf\xf8\xda\x88x[*Q}\t\xe8\x82\x97\x19\xda\xcb\xbb\x9e@\x98\x1a{\xf4\xa8\xe37\xec8\x01\x00\x00\x00\x00\x00"Q |\x0c30\xb7\xb7\xe8\x82?P\x85\xd1,\x12b\xe06\xc7!\x18\xfepd\x86\xcez\xdfD\x07\x8f\xd5\x86\xec8\x01\x00\x00\x00\x00\x00"Q \x13\x84\x0c\xa2+\xb3+w\xdf\xa4e\xc5\xd3\xc6c\xbcw\xf7V_\x90?\xa2\x16\xcfX\x82\xf8\xbd/\xc9,\xec8\x01\x00\x00\x00\x00\x00"Q v\xdd\x91\x9c\xbblE\x8d\xb1@h\xf8J\x1e\xb5S#\xe6\x87\xc1\xe1\x14\xb8i\x1c\xf8;\x8e\xf2W\xfe\x10\xec8\x01\x00\x00\x00\x00\x00"Q \x1e\x91\xd6\x14v\x06\x07\xfc\x14\x08\xcd\x0cr\x9a{\xb2\x93q\xe8\xd4y\xf5Z\x02\xa0\xd7.\x06\x00\xeb\xfd\xbe\xec8\x01\x00\x00\x00\x00\x00"Q \x06\x96\x9b\xfbHL"\x1cc4:Z@\xd4\xb6]\x0e\x8f\x92\xc7\xde\xc5\x80\x7f\xfaW`\x7f\x84k\x95\xd9\xec8\x01\x00\x00\x00\x00\x00"Q \x08\xf4\x0f8\xd9S7\xed:\x9d\xb8Z\xfaw\xd4W\x1b\xae\xbc\x9d\xec\x95\xfb\xc4\\\x96\x0b\xc7\xee\x07 \x06\xec8\x01\x00\x00\x00\x00\x00"Q I\xe0\xa5M\x0e\xe0\xb8\xe0\xce\x87^\x87c\xc8~u\t\xd1\xf9\xbd\x14\xfc\xf7M%\xdc\xab\xb0\xd4\xb1\x90\xc2\xec8\x01\x00\x00\x00\x00\x00"Q 94\x8b\x8f5\xea\xf7\\O\xe6\xc7\x9f\x82\x1d\xd2\x01k\x93\x1a\xcfj\xa5\x82_\x18\xe2\xdb\xa6q\xb9\x19\x81\xec8\x01\x00\x00\x00\x00\x00"Q \xa0^\x1e 16\xfem\xe3KR&\x15/\xd8{\x88~\xf1\xbb\xe0\x08\xb0\xe7,~\xe4\xaa \x03\xf7|\xec8\x01\x00\x00\x00\x00\x00"Q \xa6\xab\xf9\x9c\xee|\xba\xa6\x8e\xd5v\xa2\x81:\x91\x8b\x83w\x98\x82\xec \x8d\xbeHQ \x034K\xdd\xcd\xec8\x01\x00\x00\x00\x00\x00"Q \xad\x8a\x11\xdb\xa9}\xa6\xc6\x1a\x84\xf1\x94W\xb5\x9e\xc0]rZg7$O%|\xdd\x85b\x12\x123\xd6\xec8\x01\x00\x00\x00\x00\x00"Q S\xec\xfd\xd6\xa16*Y\x03$\x9fBp\xb7\xe7\xf9e\x98\xbf\xe2(\xa5\xa4j\x9c\xf2+\x9e\xf4\xa2\xfeM\xec8\x01\x00\x00\x00\x00\x00"Q Z\xdb\'\xb0\xb6\x9f\xd7\xb6\x01|-p@+\xd6|\xb8C\xda\x13\xda\xf1\xc9\xca\xc7Udh(\x0e\x9e\r\xec8\x01\x00\x00\x00\x00\x00"Q \x00\x0e/\xa7\x12\x02\x1b\xabN?e\xd1\xe25o\xdeJ\xd1j\'\xdd\xb1\xa0\x9f6\x9a\x02\x87\xb6D\xb7j\xec8\x01\x00\x00\x00\x00\x00"Q \xbe\xbc\xbavL\xd1\xfd4\x96\xf9\xd3`S2[\xee\xe9A\'\x9e\x83\x98\x9e\x07\xf7\x93J9\xbc\xcc\xf7w\xec8\x01\x00\x00\x00\x00\x00"Q O\xe7\xb3Mh\xd6\xff\xa3\xd2\x03O]\t!\xddG\x98\x9b\xc0Y\xcf\xce\x0b\x8b\xd0\x96bF\xa2\xbf\xcc9\xec8\x01\x00\x00\x00\x00\x00"Q \xc0\xf5\xdeU}U\xe8\x92\x97@7\xf8\xdaj\xa9d\xc6t\xb5/\xf21\xecz[\xbe\xccku\xb3\xed\x11\xec8\x01\x00\x00\x00\x00\x00"Q 8\xdc$x\xa4\x8d9\x82R\xd1\xe1\xcb\xf9\x8d\xb8\x00\xce\x08\x04y\xe12\xbbu\xbf\xa0\xb9j\xd4i\x13.\xec8\x01\x00\x00\x00\x00\x00"Q \x11\xf5\x15\x05\xd1i\x8d\x99\x9d\t\xeb=\x07\xaa\xab\x188\xe9\xb1\\\xd1\xea\xda\x17\x94\xa7\x00\xffz#\xa2P\xec8\x01\x00\x00\x00\x00\x00"Q #9\xe9\xf6\x12\xa0\xb5\xfaZT\x19\xe1\xe5\t\x8e\xe1\xbfT\x87wk\xff\xed\xf88H\xe1\xaa\'\xac\xb2P\xec8\x01\x00\x00\x00\x00\x00"Q \'\xa5\xfe\xa0\x17\x9ebpT\xbe\xe7m\xa3\xe3\x06\xcfdh\t\x10\xc5`\xf5.+V\xf1[\xda\xb2]F\xec8\x01\x00\x00\x00\x00\x00"Q 0\xbd\x1e\xfaz\xaa\xda\x12\x85\xa7\xf8\x9b\xb1\xf3B\x7fs"d\xf3&\xdd\x8c\xffI4\x16\xe1\x95N\xa2&\xec8\x01\x00\x00\x00\x00\x00"Q 2M\xae\xc0\x11\xdf\xf1\xe2\xca\x89qr|\xaa\x92\x1f\xf8\xd0BMH.\xfb\xdd\xe6\xd2\xed\x0c\x8c\xa2\xaa?\xec8\x01\x00\x00\x00\x00\x00"Q 7\x84\xe3nC\xa12\xef\x9cIOP=\tc\xdd\x10\x8d\xb1\xac\xd70T_8\x88[\x9e@\x162+\xec8\x01\x00\x00\x00\x00\x00"Q 2\x861\x03\xb5i\xd2\n\xb7FK\x06S4\x89\xe8\xf8\xebU\xe4n\x82\xfa[\x1b\xa8\x1c\x15\xde\x8ap\x0f\xec8\x01\x00\x00\x00\x00\x00"Q u\xce\xb0\xe5Z*t\x10R\xbd\x8b8\x13\xa3[\xec\xaedV~\xdf\x87\x8dj\xe1\xb54\t\x11Z\xb0/\xec8\x01\x00\x00\x00\x00\x00"Q g>c\xa6oO\x01k\x93p\r\x9e\x89v\xb5\x07B\xc8\xb8O\xa2P"\x10\xaa\x85\xea\x8aa\x9e\xf6*\xec8\x01\x00\x00\x00\x00\x00"Q \xe47\xe9\xa2\x93\x98\x9e\xd2\xcfY\xc2Q\xa5-XL\xb0\x9a\xb4\xe2\\\x9c\x81a\xdf\x9f\xa5\x0f\xe0u5(\xec8\x01\x00\x00\x00\x00\x00"Q [\xb52Rr\x0c\xcdo\x8d6\xd1\xa3K\r\x80jd\xc0\x0f\xf5\xa7w.\x96\xde\xea\xac\\\x126\x15L\xec8\x01\x00\x00\x00\x00\x00"Q \x80\x19r\x9ap\xc1\xaeE\x8b\x7f"0G\x9f\xd1\xab?\x10\xaa\xd5\xba\xc3k\xfa\x19\xa1\xa1\xd7\xa5>fN\xec8\x01\x00\x00\x00\x00\x00"Q \x83\xee%\x93)x|\xd2`\x8diVU\xb8\xd0\x11\xa1\xef\x04\xf7`\x03\xcfj\x89\xe1\xcb\xa5\xb5\xcb\xc1S\xec8\x01\x00\x00\x00\x00\x00"Q \x1d\xea\x8a\x84\x06S\x0f\xa1i\x18\xbfN\x1fPJ\xe0\xbcy\xbe\x81o\x9dp`\x0f\xfcZz\x08a\xc9!\xec8\x01\x00\x00\x00\x00\x00"Q \x0eY\x07\xbefD\x17\xb7\x93J\xfa\xcaQ\xfe\x97\xc4J\xc3\x00\xfa\xb5t\xdfS5\x0c\x9c\xe5y\x04m\x93\xec8\x01\x00\x00\x00\x00\x00"Q \x9f\xe8?\xc6|[\x9c6\xf7\x92(\xe5\x97\x95\xde\x96D\xa5\x84\xc7\x97\xa8g.\xa6N\xe7x\x91Y\xd7\xcc\xec8\x01\x00\x00\x00\x00\x00"Q \xdf\xf0OM\xe6\xd7\xf9#\x00AzbP\xe4\xa2\x0b\\\x83#\xe8$\xb5\x12\xf1\x04[\xd3w<\xc0\xaeI\xec8\x01\x00\x00\x00\x00\x00"Q \xfb\x94S\x9c\xd4\xe7\xc6\xde\x82O&\xb8v\x84\xc4\x96\x186\x82!FW\x8c\xbd\xbc\xc4Y\xf3\xeb\xa9\x95\x1f\xec8\x01\x00\x00\x00\x00\x00"Q \xfeH\xddCl\x7f\xad\xac\xb4H\xbb\xd4\xf3\x9b\xf4\x01\x85\x85\xcdH\xde\xa9}P\x85\xe9J\n\xf8epr\xec8\x01\x00\x00\x00\x00\x00"Q \xb1\xce\xfb\x0e\xf2\xdcJS;\x88\xa4#\x9dV@\x11;\xca\r\xc9E\x11\xafA\xae\x9dk\xc4|\x8a\xbf\xa2\xec8\x01\x00\x00\x00\x00\x00"Q \xb7\xba\xb6\xb1\x016\xea\x1cCns\xa7\xd8\x01\xe0(\xc4gt\x07a.<\xc2\x0f\x11\xab\xdbmc\xe6\xe1\xec8\x01\x00\x00\x00\x00\x00"Q \x96\x16\xcb\xdf\xce\x80Y\xe0RA\x07\x00+\xe6JJX@\xa75\x17\x11\x13\x12\xc8\n\xfc#lb\xcc\xdd\xec8\x01\x00\x00\x00\x00\x00"Q \x96\x84\x18\x96\xcd\xd51\x9dD\xcb]\xc1\xf0\x15\xbb\xe1\xafy0\xb6\xf3\xab\xa2\xdeyG\xdc\xb05J*\x84\xec8\x01\x00\x00\x00\x00\x00"Q \x93\xfeF\x1d\xd5\xe6\xd4?P\xa8!y\xf9"n<\xa6a/\xfe\x10\x89^\x00\xec\xd7\x1a\x9d\x17V\xfc\xc8\xec8\x01\x00\x00\x00\x00\x00"Q E\xdb\xd5\xdbR\x00?D\xf7\xb3\xfb\x1e]a\x19\xd0ea\xad\x9d\x8a\t\xfek\x1c\xe1hS\xf8\x98T)\xec8\x01\x00\x00\x00\x00\x00"Q \xc9\x15\xcdX\xc3\xa3\xd4\xaf\x1cJ#\x7fZ\xd1\xdf\x00\x8f\xac\xe0+\xc69\x17\xd0\xcc\x9b\xe9@\x9e.\xdb\x05\xec8\x01\x00\x00\x00\x00\x00"Q \xc9\xdc\xabz"~y\xd2:\xa7d\xea\x93k\x13B\x9c\xf1\xcd\x81\x04\x1f9\x0bQXRV\xd8\x805\xc6\xec8\x01\x00\x00\x00\x00\x00"Q \xca\x8c\xef\xbb\x12\x12\xfa\xa0x\x86\xea{\xe5^\x97\xdc<\x0b\xdd\xfcn\x0b;\x17\x96\x17\xc1\xdd\xff]1_\xec8\x01\x00\x00\x00\x00\x00"Q h\xd9;\xd8\xa6\xeav\xb9\xba\xd8\xed&`\x0e\xd2\x80\xc8\x9c-\xcc\xeb\xca\xab\xe7\xb26sG\x1bU\xafn\xec8\x01\x00\x00\x00\x00\x00"Q j\x11^{+\x04\xe12\x8e\x90\x8fP\xf0^\xfde)\';\xf2I\xfee\x12\xe0k\xe1r\xff\x02W=\xec8\x01\x00\x00\x00\x00\x00"Q j\x94\x02\xf1\xe9d\xdf\xb2U\xd4\xc5uB\xc8\x9e>\xe9\x88\x9e\xac\xab"n\xbe\xb9\xa4(n\x04\x96\x08K\xec8\x01\x00\x00\x00\x00\x00"Q \xc3Q\x83\xcepm\xf6e+\x88\x19\xe9\xc8\xe7\xe6\xc05e\x9ae\xd9\xcb\xf0xd\xf0\xb2\x18\xbd_\x92\xb9\xec8\x01\x00\x00\x00\x00\x00"Q \xc7\xaev\xe1\x8cs\xc6[\x07\x11\xc2\x97\x03\xe2\r\xd0\x03C\xbcf\x1b\x1c\x85\x1fB\x0bea@\x8f\xc0"\xec8\x01\x00\x00\x00\x00\x00"Q \xef\xec\xe2(\x1a\xe2T\x91\xd6\xdf\xdcr\x13\x8a\xd9\xafbg\x83\xf7F\xfc\x82\xf20[\xa6\x1f\x11\x90\x96R\xec8\x01\x00\x00\x00\x00\x00"Q \xed_DDI\xac$\x86BD\xe7\xcb\x83\x04P\x10\xe4\xd2\x1b\x92y\xf5v\xa8.Q\xb3Qp,\xb1\xc7\xec8\x01\x00\x00\x00\x00\x00"Q (\x15)\x8b\x12\x18V\xa4\xa2\x96(\xe2\xc1MC\x98X\xffD\x89b\xbc\x07\xf9>\xba%A\xc6\xa6ce\xec8\x01\x00\x00\x00\x00\x00"Q 8%\x83\xa5\x81\xf0\x947\xd6\xe6\xbe\x11\n\xf2E\x0b\xc9c;\xe6B\x02\xeb\xaalw~\xce\xd9b^3\xec8\x01\x00\x00\x00\x00\x00"Q 9s\x1cj\x1d\x0e|\x1b\xd2\x95\t\xbf8\xbd\x0ffx\xa99U\t\x9eB\xcf\x16\xa9 \x96\x11\xfc\xe2\x8c\xec8\x01\x00\x00\x00\x00\x00"Q 9\xde\xc3\xbf\x80(x\xb9\x16\xf8\x95vv\x15\xd4\xc9b\x9c\xb5\xab\x05#P\x80\x0fXs\xed\xe9\xcf9\x07\xec8\x01\x00\x00\x00\x00\x00"Q =\x19\xea\x06y\xd7"@\x83\x9b\xb6\xcd\xe2\xaa[CO{\x8bX]\x8e\xa4\x86\x0cm\x06\xd3-\x08H\x99\xec8\x01\x00\x00\x00\x00\x00"Q \xf1_\xea\xdd\xd3\xeb\xac\x80\xc6\x1cV\xdfwb\xb6@n\xdf\xd1\x89\xa0\xd8\xa5@\xca\x92\xaah|\xf9\xcb\xab\xec8\x01\x00\x00\x00\x00\x00"Q \xd4\x1e(b\xbeP\xaf\xd7\x86\xe7**/M\xc4m\x84\xaasj!\xb12\xf1\xb8\xd1\xcf\xa9\xd2\xb4\xa7\x85\xec8\x01\x00\x00\x00\x00\x00"Q \xa0\xf6-?L\x8f\xeeeo\xa7\xec\xe0(\xe9FW\xae\xb7D\x1c\xb8\xfe<\xc2 \xed.\xe1 \xc3F\x0f\xec8\x01\x00\x00\x00\x00\x00"Q \xafl7\xed.\xccZ\xf9j\xcf\xae\xae\x1e\x1c\xf0\nF\xe9\x0b,D\x04\xfe*\xe9N\xb4\x80\xd8@\xd8\x8d\xec8\x01\x00\x00\x00\x00\x00"Q Q\x87\x0b\x81\x19\xdc\xb6D\xbc\xf6\xf9&S\x90BQ\xf0Vt!\xd0\x05\x13\xa9\x8d\x0c\\&\x18\xeb\xf8h\xec8\x01\x00\x00\x00\x00\x00"Q QZZ\xceHH)\x9a\x87\xbdN\xabK\xef\x19\x96\x03\x8bW+\xcc\x9a\x98\xf1\xd4\xe6+\xbb\x9c\xf6r\xe7\xec8\x01\x00\x00\x00\x00\x00"Q |~\xa2\x1f\xa3aH\xd8Swh\x98i\x19\xa5\xf0\xae\xa6\xc1\xdb\x8bQ9\xbe\x85\xbe\xb1\xe5(\x89\xd0\xe7.\x10\x04\x00"\x02\x03q\xf1\xf6\xafr\x8e\xac\xd9\xc6}\xf5\xc4f\\\x08\xb2~\xba\xce\xaa\xfa\x890\x8e\xd2\x9d\x15\x110s\xb70G0D\x02 \x7f\xe5\xca\xb55\xd3K7\xfc\xc9\x9d70\xae\xe2\xec\xf7\x88\xdcU\xe1\xc8\x96\x9d\xfa;Q!\x0e\x1dU\x8b\x02 @\x98\x0f\x8e\x85\xa1\xfa\xac!\x86\xce\x0b\x0f\xbeq\xea\x030$\xb8wO\'\x82\xbeMj\xa8(\xea&\xcb\x01\x01\x04iR!\x03q\xf1\xf6\xafr\x8e\xac\xd9\xc6}\xf5\xc4f\\\x08\xb2~\xba\xce\xaa\xfa\x890\x8e\xd2\x9d\x15\x110s\xb70!\x03\xecr\x8bw\x978\x12\xa9X)\xc6\x9a\xdc`\xa9\xa9\xcb\xaeb\xf5\x9b\xf7\xa1\xd0\xd7\xfe^\xc6:_\x9c\x93!\x03\xff\x9bk\xbf\x86\x97\xac\xcd\xdaVb_\xde\xd7\xae\x8dd\x020=j\x13\xa2\x8bE>\xc5\xf7\x86\x18\x81"S\xae\x00\x00'
SIGNED_P2SH_PSBT_B43 = "B2YP-1*Y21HEW94RZC1$EXV5TH6E:J//GXZ0X804I$LL8./YV$D07MOZ5KZK1LOF-.57/P3$MBVEI$EA9QE4238TH*I9GTOODONTW3D0-BS9LPIDW2K3PZ5.2YBCMB-N6M3O2HLT:QUYR-E.XGIU81E18NVKVRVZ5FC.XVK1:H1EEU5$0M6RA5IL+$-VA:/K9VAH27DV$/A*4QIEGMYV:04AEZ.8V1RJH4J:.FS9C:RM**5+1ZDSBLOP938+DMYD5SMC6/+5MDUR:I3A7QQ3733:$7UHYZZ8.0E/H48-1S0R:5-I*I23-POU*DVL/WH6YYA$D:SRH8$7O1SZMAX$*880YBNSE4-X:LVM$L1+VMX7+GW76+GY/LMIQ*GPDL6K1GW5VNYMOE57FDASTF168P$KVHX*34TQ0KI1501YUXA*A3P*-6H/$L75Q$K8DGA+BSFN1+7VAG7ET1YNWSF3L36438JTQ3RC+:WK59K:/4DP$C2S0THC6/Z/$N+F55R+HO/J/XWH-NKS+A0LBB-I.KE$+9A+XDI:SHLKTY:/D81RAJ:/IDT5B6BVZOT6//DL6OUHV.*E44G+:UXS2FYJTKRLBRL:QCR:+3$8805NTR.LP72ZGS9/XQ$:EL371*G5R-9X8-P6FZBTD1522YLSB+JP--5NV*RKM7MQ-4D2B8GNM853UKWVP+6*DI1ZJ0UU5:0AKXT5D14GR$VZJ0U802UKEPAL1H4BQSCT$:A/I7E-U9FXEQZVNHZ7A020KD2.P9D*CSIYHRQ9NLT+F3U*QCPS-TDFSM34S-YE:D35*29XDVTJFLN0C8D$*PSUEOG+OQPBRD$87MJQNVF::UZCRKHDJ9DDGSHMOW.3UMCV$JF.06X0/*UM9BEKYHYF/MEY2C2AFUQ3MZES1ACZYXPWTVRLVSL+A364G1UMB6L3W4KQANE*WE4ARIX*.R2US8FM3**4.:K2*YAK*KV-IZ968O9TPAORT75JZ37A$3SXZV:/WG:T4:3PZU/354LGKY:C11+DKAA$$I.VQ31Y.T*4.MACXK0SXSBZ.:4CUA6EJRXLA-H6UABI+-B:OAU6786MXC-QQ*MKFH$NG*5X6AZ1FX426+FDMQR564ZB5M02FIBE1G987OLFA99A1I$XQB*UO4ZPA*29-91:+G3NPRHFT$7N+P6R88B8J10N.FFKCOLI2:H3-W36242JM50/WY/1LW9VI:LQ8+6MZHOJH2:OTIO+OE9JU.HOMXJEZQK6:EO/TV6856OSY$Q:TN4S9PNKSY+0H+YZ23KR90XSN/JE.BG9*R68P7NO7J/LN4KA5S95FDC74F4.+42BKPPF-/V-VXA01H70W-1HTX6D$*RT7:*R3*-:5$2JVWP7RKC8*PW9$1VPO*N.$AT4W:HQH-B$GNALUQ+6RS49UC34DWNDUEH:QXM9MMEIK7X6XXYTSVFC+CG2$AP1PA*MG*5ET37RIY23.:61H:GEJ3+RBO61YR2TT$6-+:--JLZHK//WN.8KEWJGKZQKHVA7BA065ZHYKG3+2F28W7/ZVU2XNE3UK535197-JBH.XF:PO.X-ZDHZCGO-LNE8.*RXII6-WURY55W.:BS+7-*1:.DZ941:D$+UCAMJ1*MI*436-43H2G1HL9W:*+WGS$3NFU7VGH/HD5TR78A20-LLFJM.47.PVA1Z-DIWS/996.8UOWS4S-2V8:05.BB/KHNGDIML:UO9SFX+P3I/9O0ZMXVP:6Z7C+*+J:H87N:OKR-WSCM-8/TND/5VA0/CSRKM7/B*:+JK7GU8SSK32SM2Y$IRAXW.B6HVWOFYFR3$9PNZHF/VMFJVA6E0CGO$GH:1IYB1*9M:R6.0Z$4CC049FGI4ALJEE6DJQ2OV5ZA3B76:*JXCRFUQ5./MIR0GDS/K+D9R-WSO:AGEWODG4/TUJ7SZD86:W8J3111IG264CPOAFI*$O8Y$3BSBPEOYV3UVJ8UOPVAMR5B6DJQC$7KV92JH7TT2$1RRYO.AKB0LEVQ6UP72T-ZZMUQX0B.+F5GUYN0GTM6YHKCUM47AFX-F2C71ZD1A22B:F/ILVM/JCWO-L+FD89+4*J/FYJE5MD/K77IUMTXEGD:NO5E0JY1FRA5J00JBVA:.+3UBG./OZYSWV*U28R1D2FYP5IZ7CLQPYBY9C*F6*$73XEHV4A/.FR5..O.PGD27.TGCE.OZ62JPQ+YV*SCDZXMJR.BLT8M4YOM2*DUG+WWQO22IZG63PN4VN./XTM4S72U-FIS-C1*W-24+2/$$XIX6IXJWIHWU4FU3:B*O2PDA+/FEV/FNB1WX+QA.+T0WGCK*6NO2G0E*+6GB+4F40BNAW.7AQCBYSKPVX2G0EJ6K:-QSFNWECO9-/.+RYH+M5MPM+BEOG3LT+VQ$BDS0LWW-E1PZI*Q4NCU$BTC1R2Q-F$Q*HO25$Y7ZQFRF$8*X6KY03EP8Y62-85ISD:UCQD79UIHC766JGYHHX2*U*JUTIJ794-1J0:ZBXUDBDY1E7$SDZA-A6I/JCTIPLDYMVIJ+6EHE-.KAB/MM/T041.IKKBZXT09N2ERFTB4+.T$SERP35/6W5YTD3O7*1$S8COHB-V+WLLD:*UY4DNSIW9X-Z*NKM.PKTL8G0+XYNU.UHD2*RS170RE:-+X$6UGZW3Q8RXC9E6L3V39S28AT:-LK7.4KU/.Z7H8:7-$ZOTWRI3/2LXWHLEO/NOQ$Z:PI3SB/XFC$-JHVNSLYD*EWC:$WTKR255-PJAPZZU*..B5:$RY29I/K3*U:LQ-:XW/AZK2QF+TS+REHIKN5ECSKK$81AN3Y7AT*/T.J*EKULVI82R8G574K7LVDJY1V:F-F1*/V:NSN::CKUV6-BPCTZ4K9DQ.9VB50*GSS3F$-$2+YBWEE*/HIK2A1$Y*HU0R6SQ.OB:6E*MLH07BW27974YCXX9.GGN.9OJ+A.9IK7603-WQWN$:9635.:C9ORL537:2BC98A3$NF8YBJNV:XB.H8THGOITAZY9C149*XN.ETT5UXW3PJ:Z/GGU+6FKQEYKHAVL99GAJW2KEAJ023A7/EFYN/J6KCBEA:RBG3Y:TV01AYR52ES-KT:LVVTJO3+--M:64I$1M5M3D276.4K7PG9S1JH.2.M5+./*7SVCVZ6E+5Y.G.6Y$D1UR3PKMO6DSXV/1:$71*I2F+03O-AF5C92J+Z1V*FTOO5JZ17HO1HENC-++MF9RGH3YT7HO3W0EWZN+Y*VV-:I54TIFTEHEA26-P-/0KO21P*4*JW3RMKQKV$O+4AKO54R/L1/IJ-2RFBTYZL6G5T1C6BPPKX4859YTVOZ46R7X:B:DFP6.SHH05P$O:P1BEB7FRXWWRR-FNAEMS64*VBI/5P+B3V44-8NXE32BJ8396WHG4UOML4*+T41BO7F+S/5NRO8*PU.7-COP-+2GJ8L53MD9GJRP:NP-UUWISJ8:5WUVU4T3L2YKXAS1P:QH$K+N$ACY+LB0JMCN3Y8XDDRIFRINYH970SJ3V8BEWVIJM$JILE.GNU$-B36Y8YVOHC*W2II3JC6/BGQ3ZJX3LY95AOG*+KM.ER53FMYA92$FSW+JQ:GOGTA/49UB:G3GWNPE9LYLYTSAKYAV8-NT0XYJM.T18.4QE9W$MXKSZ*O673K42BOZE.6VBS+$HH9//D7Z$R0QCTDDKC5YDAXS376RKV0V.UXRT9:MT/UNESC+TV0L47-JK.AY8I1:9HWBA22$QCFPKOM1R73G*XJ-1G+327OZ0CNV$KILYYPJXQRSA5KT2WVAZX+:PT+I390SFYJL$*5C8TK0A:P9C+RO.S.JS8$O8G:JHVPHY8L6*81TDZGJ*SY-OD47GJ2K.D+AKK1KZ:K4$:P0Z02AK:7HBEJOEO2TSAYXII1K+K:SKUTZ.N$20.DA$4BAUAHXZT:1DRAZVSNLZ8S.2:CFRJ54EM5QOZ0OS:GI*+KF6XF2P+ATAZP.W37*PNVSNLFXE/PL422D3SNLC4FLDU7-$NI1KS+HL/:/JLACHQGCZQPIC*:DI4Z*L+6N4R$HF:O+9AL7$:3+KPVD9AYA7YIIXNJ+DPQA254*Q0-.NG5U:HLI9O866LH4+ZY43B0X4G0E1:P3ZDDX+QIL4GAINUBQ:2PPK56IL/M5$0-MHXNYA4I$GV7$ABX/MDOM2OD92TF*B609Q+ZUF0HZNPC0WP4E0GWD$OJBWB8P1KP*743R8XLLIWUZ6JB5*+FJCOP4$+3FZU:PATSCHK5WCIHTGHTJXOHUB/72:8O-LPHS28DEBJ$BTF528L4BES:K-EB7*F/LOFY*CKOXTI9I:VYOUWQ8N1MRWDI$28EMX0F15NX$7.VD3UQ$BEXG0SMK622V9QIV58G2Q3+$:MH.ETK:WIJGF6T18K+.1+H-K8*C0ORXFAW-7.T8TY/G:KWVYH6Q67*B858TR*PXB/.$:71KUPTM14F:.S$RG8I*209OK9*ZU/8CG.ZQPVG$X$Y.AHB*CYN-WKWGCO84L0PN.MICLTMWFJLKQYZWX3PC6PMV7RI+-6L+BK5XVM:G3JZ9E9M3/K7FR82FAH6ZGEFFLD8:T4CBXW6EZ5JCBA32H:J8:I0U*H2LHBQ:FR520IADOKYAMK+:5$LJLGD0OZF5E4.Q$AUGI6PB0APPOT2CAOE:H/3M0LEXKOUIP5UQ3A+/T0MLDSHY-DL/8FOR$1/V*W1606S:UWNQ:8LREUUEX+WWV+5/-V:K$511Q2SQ5QAZ$ETG39*BCI4SLTBDH-SIJ+5*DKIQ1C6EM-LVP$GXABZM3SYKU7JKSF5V90UACPV//X*Z1N/QKVNB-E4W3*SFY:7WZY8LFJWVJBQ$EO*/M*:1ZEF85J5/.-WM6/HBDE7U418D477E/S*FR$KTC8GMF20TPH$1F2+L6ZS/G7/G9ZV7AYPP-E2ADBJQGB.ZB:9ZTQMVX2D0TK1Y3GGLNT2KIFXPY*$3VX2NQUHJ*GBS60VGJQR+MOMEV*YM*0Z4PIVT8BA/1XDEV+6I4WS5C9BMFMY5PN7Z35SAHSA3XXMTMZQ/1R0-+ADS3PL3T-Y:BRWRVIU6GFE8JV34NQH8.QO:G:NK3WNR/ZE4CZN-IMUYSBFB4$9KKBJFS/0B+UN:.RGEPJ.IT8W0GNT5-OKN0KZBFC-LA/IYCRIWW*MH-IIDL/GKXYAX*5:FNM/O53R94Y36-QGUAHLBDL5LOI+MDISDGPUX3:L+ZZZLZ$.$UW-JUD30NZGF6.OIS0+WLD6505B*2TT7XV9U1WQB$O0VTNAEDRD.3.GHXAWG6TNK6C1*-Z:1SH8/+$FHHNJ+/$LO9/$.XDT/J7*ISSZ9LLOBQ1/./P/0VH4LB66.O.DPUURO3O8$UJ:-8JS9NA-QT$-*X1ENZT3LJL2MT5MXKSAFPX/-HKA-ZMHY.86IPII7H33PNW/VCY$NENU0RUWK+IAX6-+KG7IJCLC0IAWM8M5Y4M1/QBOBJ*1HLUTPJHC9OUI35Q*GKBK/1U/BZ6OW951F4P*-I97$NQYQ8F8-JUZ1A01CH19S*3/6BA9I184X*TTMX.FTJM7J3OO/NSN8N52UT8M$VU-W6E4*-RH1*-8DB9VXM5W0-5WLBTSMGIJX1KAUA91CFOV*363546OL1QZ8KH3S6W-BCNG6YP49KWQT+6WKHFDWDI69-J/XMI71+B$OO*TFJMFCQD9KT1Z6YASB9FXKZDTQ*R0J:LHZ-5*YT$$9:U$KQ*2J0VY+G1VUVUE$PP5791W$GVJ5263PH4$EMB0N1I1G4*G7M8R6QIKLPXN03:-$-4E$-Z3N/FENF:VY$SUCWIR63XG-PXP$GF.SD3VDO3GIKDMQ.ZS9LMBCX093I-UY9HV+QW.F/83-/53E$NK5+J/IA0DYD/I690WP-S4J-ZYE:Q/.*7GCBXJ*+90:FH5.A$4BVAU0X7/PMZI88L:2ZOSTZEID0ZZMFZYM14QYP8$D5SU+.3.+-OCTIQUUHQ.W2JRTS78PPHA5MXHTKPL1XKTX6C-NZB3POUOXXND6$71Y4Y9OMP0FYWTDCZBADLHQ$1TQ*HG/4UTFZR2YGGD$XN/ADHK2Q:+BHEXHMPVF$NT3UQ8PG$BEDD0*JPSQBL5EGLN0+Y+9XTLA7X$CVH2TEMMD.XPIHI1YQCHKNNAHXL:QZH1Z:-2LV$ZO440VW+7CNYV9GRZ63HN54YJB+T3QC4.4365XBBSORRUIJQ8SH.PX*MSL+JCF00ZZRGEHP7VVS7YH7:3..5B2MAG60T4-CB0SQ6MOLENQUVESKPCZBBVP*+$P3XF+EY7MAN6GFM9V7JY9N90OLCUU-32YBEO9S+46D$*IZILD31NUYH4DN/RP6CO577XVL*HJ1FF3G33$Q6*:AE0GODRZ/05HMWV876O-L*Z3VXWV:54X$W12LW7*4BY5X*DL/G$O$F.E1X1RZN0OVGVQY1.9$NAZ262P4BZ7N/EGMZ.HHR6E:1K:NL5VY.BLNRU+NZ+6PGB8AA3EPO5NOOUX1OX7M37D*7JII5L/K6T1YFTG7:7XMJ.XP:B2RP0T2FG44ZXD.C$Z8$6C6F$R6T5X1UP24CZ53N5U494GK6805+$FI.2LKG:T57$1*WU/4IMP5Z.QEPCL5SI.12V.VNFOFCWH9XIOE6R+ZHAGZ:/T-QM$.4JJ0RAP2TA/CNUZ.JX-:9J$U*SZ+*VS:M-EQGMGPDXK$3Z2FA2$*+C5$58A0MB$4C*/0O*OSI1C$ATUV0MB02HKNAQXO3*0G7XS+6UZOP66+AKGRM.GWTO/YGEVAX7TFQ-RJZWX0VLPJ-Q42SZ/7WEO1BT/1*6O.C3SQZ7OZU7:B-A.$V$:WZU6NJUH:4AX/PLXLQE1WAQ3EE-PNM$LWPB4IKIWUA+L5FWM7DJFP+2OT3ERHL/TO92WZBM8LVP:0A.DP55RBXEN.J4$0AEXJ1JU-*9KIK*QH-YV.ZUA/Q3YL--CFV6.++K23/IHC/:T*T-NNA8RNL34PXWJW*JTBFN96LQ1XN8W96F4Y$QLE4T70EB/UAFQ-V.1J82IAY:52G2Q.A2RONFR/DXUUKH8OW1:6S9-*/LNO..2ZAQO/IWUFG1XZ:EJESXXKAA**8ZMMT*JS82BIEN-A9.:2MWJN/YW3FGNBV2Z6D50LI:P506UN/9-0PXUYAYEZ27ZND28TK13M+BE51*AD5ST6*.DP$W1W4.U/DI0+1LZ0DINQ+667HNMI58SO0S-VT2IRS64RYC7AOG-IZ*HAG3$JYW*Q:G::ATDA:3JYW26I*ETGNL62CNCUH$5Z*EZY5RJYHYQ5SX6RHI84UUZ*0B7OZE/*Q1U44F6UO4A5GI1:H$/$4EAG9C3RSSU4PI8V0LVOFY6EM0+OJAK9RX1XD-.4F2L9*85QMN6DI*+WBW/+2BWUGT*-+8UW8QD37:1GGHKA7-SSVT0KBWMPEQKTRWQOJ6Y04-HXD29VG"
SIGNED_P2SH_PSBT_B58 = "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"
SIGNED_P2SH_PSBT_B64 = "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"
- SIGNED_P2SH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(SIGNED_P2SH_PSBT).to_cbor())
+ SIGNED_P2SH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(SIGNED_P2SH_PSBT))
# Native Segwit Multisig
P2WSH_PSBT = b'psbt\xff\x01\x00\xb2\x02\x00\x00\x00\x02\xadC\x87\x14J\xfae\x07\xe1>\xaeP\xda\x1b\xf1\xb5\x1ag\xb3\x0f\xfb\x8e\x0c[\x8f\x98\xf5\xb3\xb1\xa68Y\x00\x00\x00\x00\x00\xfd\xff\xff\xffig%Y\x0f\xb8\xe4r\xab#N\xeb\xf3\xbf\x04\xd9J\xc0\xba\x94\xf6\xa5\xa4\xf8B\xea\xdb\x9a\xd3c`\xd4\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x02@B\x0f\x00\x00\x00\x00\x00"\x00 \xa9\x903\xc3\x86b3>Y\t\xae<=\x03\xbdq\x8d\xb2\x14Y\xfd\xd5P\x1e\xe8\xa0RaMY\xb4\xe2\xd8\xd2!\x01\x00\x00\x00\x00"\x00 \x8d\x02\x85\r\xab\x88^\xc5y\xbbm\xcb\x05\xd6 ;\x05\xf5\x17\x01\x86\xac\xb8\x90}l\xc1\xb4R\x99\xed\xd2\x00\x00\x00\x00O\x01\x045\x87\xcf\x04>b\xdf~\x80\x00\x00\x02A+I\x84\xd5I\xba^\xef\x1c\xa6\xe8\xf3u]\x9a\xe0\x16\xdam\x16ir\xca\x0eQ@6~\xddP\xda\x025\xb8K1\xdc8*|\xfbC\xba:{\x17K\xe9AaA\xe8\x16\xf6r[\xd1%\x12\xb5\xb2\xc4\xa5\xac\x14\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80O\x01\x045\x87\xcf\x04\x9d\xb1\xd0\x00\x80\x00\x00\x02?\xd8\xd7;\xc7\xb8\x8c\xa4\x93Z\xa57\xbf8\x94\xd5\xe2\x88\x9f\xab4\x1ca\x8fJWo\x8f\x19\x18\xc2u\x02h\xc3\rV\x9d#j}\xccW\x1b+\xb1\xd2\xadO\xa9\xf9\xb3R\xa8\t6\xa2\x89\n\x99\xaa#\xdbx\xec\x14&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80O\x01\x045\x87\xcf\x04\xba\xc1H9\x80\x00\x00\x02\x1dO\xbe\xbd\xd9g\xe1\xafqL\t\x97\xd3\x8f\xcfg\x0b\\\xe9\xd3\x01\xc0D\x0b\xbc\xc3\xb6\xa2\x0e\xb7r\x1c\x03V\x8e\xa1\xf3`Q\x91n\xd1\xb6\x90\xc3\x9e\x12\xa8\xe7\x06\x03\xb2\x80\xbd0\xce_(\x1f)\x18\xa5Sc\xaa\x14s\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x01\x01+\x80\x96\x98\x00\x00\x00\x00\x00"\x00 \x89\x801pn\xdd\x9e\xb1"g\x85G\x15Q\xce\xa3_\x17\t\xa9o\x85\x96.2\xa0k\xf6~\xc7\x11$\x01\x05iR!\x02N\x8d\x08\x0c}}\xba\\G\xfe\xb6\xb1\xc8\x12M\xebbA\x17\xe5\x8d\x8d~\xb1J@\x04Oq\xdd\x97\xf2!\x03\x05a\xd4\x82\xad\xb9=\xf1\xef\x13\xe8ep\x1a\xf2$n\xf0\xa3l\xbc\x8c\xa5\x12=\x8e\xecw\xceN8\xc7!\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87S\xae"\x06\x02N\x8d\x08\x0c}}\xba\\G\xfe\xb6\xb1\xc8\x12M\xebbA\x17\xe5\x8d\x8d~\xb1J@\x04Oq\xdd\x97\xf2\x1c&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x01\x00\x00\x00"\x06\x03\x05a\xd4\x82\xad\xb9=\xf1\xef\x13\xe8ep\x1a\xf2$n\xf0\xa3l\xbc\x8c\xa5\x12=\x8e\xecw\xceN8\xc7\x1c\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x01\x00\x00\x00"\x06\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x01\x00\x00\x00\x00\x01\x01+\x80\x96\x98\x00\x00\x00\x00\x00"\x00 3w\xad03\xd1\x05\x9c\xf1\xd25\xbb\x12%\xfc\xa2\xa4\xbf&\xc9R\xd5?o\xef\xc3:-UD\x8d\xc5\x01\x05iR!\x02"\x821\x12\xe5\xcc\x88K\x91\x16\xcb!B\x0c\xc7\x92\x98$\xcd/\xe8\xb7#[\xf9\x92\xe8\xae\xde\x14l"!\x02\x83\xcdG\xe5Sm\xcby\xe7\x11\x830\xe8\xe4\x80B\x12\xf6\x96\x19\xf1\xd6\xec\x99\r\xc75\xef\xb9\xce\xc5t!\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01S\xae"\x06\x02"\x821\x12\xe5\xcc\x88K\x91\x16\xcb!B\x0c\xc7\x92\x98$\xcd/\xe8\xb7#[\xf9\x92\xe8\xae\xde\x14l"\x1c\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00"\x06\x02\x83\xcdG\xe5Sm\xcby\xe7\x11\x830\xe8\xe4\x80B\x12\xf6\x96\x19\xf1\xd6\xec\x99\r\xc75\xef\xb9\xce\xc5t\x1c&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00"\x06\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x01iR!\x02\xad!\xd9\xad(\xab\x99\xac~\xdf\xd9\x1e"!O\x11YS\xab\t\xd1\xd5X\x10\x92\xfbG\xbd\xa5\x92r\xfe!\x03\xa0};\xe0\xba\xd6<\x805\xd2\x1c\x97\xb4\x10\x89\r=:\x19\xd2\xe4\x03\xaf\xb3\xfc\xfch&\xaa&\x02\xb8\xf4\xcfb\xbc\xc6\xa7\xa2kS\xae"\x02\x02\xad!\xd9\xad(\xab\x99\xac~\xdf\xd9\x1e"!O\x11YS\xab\t\xd1\xd5X\x10\x92\xfbG\xbd\xa5\x92r\xfe\x1c\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00"\x02\x03\xa0};\xe0\xba\xd6<\x805\xd2\x1c\x97\xb4\x10\x89\r=:\x19\xd2\xe4\x03\xaf\xb3\xfc\xfch&\xaa&\x02\xb8\xf4\xcfb\xbc\xc6\xa7\xa2k\x1c&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00'
P2WSH_PSBT_B43 = "9YO76-S3DRXKI-6JS23**6N$12A3MTF2R66Q0-C-*BD+VB.V3O1EM2VDNMX:*DHL-RMVYZ/.W:9XKN7$4/1M0$$U8+$77KE5:40Z527KZOHA-$MLTL21L3*ON6SCCF:4HMW2K1IS7VUOUF6JW/A+DGMGVF17C0BFK/Y*FDJQWWLX*EEJUR12L3*R0.F6W5674M-+KZUKD+77RB$PGQSTPRX49C25391EP+5/ZJ7$N$F+8*CU24O78HRO0-YO51IO7+A8RZ386S5AK200DG92O6P/QT3W.T$NA7*:GYGTFT+ZC9JWTD-BMVZPBNMT9/EGO.ZHBHAPYHU6MN.U.UZ118L8G4PXR5+*SOXHDQGS$+ZY0HX9X016901VG2$.22I8LNKUGLVRBP.G4Y6DXIAO5B6TPES$F8ALOIDB30SH:29L.*/GSED*V-L0CXWM3SI6YZB59SVDKAJPMCBMDF4:8/Y9FEFIN+5AJ:UQ.J*AC+3N5Y/OOU/HCMOBNRHMN-0QZH8*CQ4-7CSJ7+KU:UX5KFO9XUQG+5U2-2VD6NZCF+N0Y97CP8HR$+N2K98A+0Z8ILV0KI634*/WEI+97-B3E*TW-5F82$N.QRDP/4R9Z6/:0H0$A2DKP2V.RUNDT0E56489TJTX48.1DPCP1KY71RVFFEC:/8:3S6EIS2DETQ2U9.N6TK$6+:H6+UH7KG3ZDW39CLSET-V6MEZSTDL*/A65IK.F3TEJSF++3FOO+-F2SOYFS.V/*SSMCJ7$2Z63SS0K+*O88Y-9+A-IQ04-3VE7PAI$MCR*J6O0$*ZJ9W07:/G+ZVGHJIE:/00UE0*CXLY8COUJIB1ITXR.YNFTLT9B.-IA6KQ7R/56G.54NTU2E657O0KNC0DT$+EGI**JM5F0YNRL01/Y*O:1WQU5J*TTZJGG-HJZA2Q+0F:ML1PY1MXYWNM8ABM4*F33XH6HUZMAW82FRSP302M4NARGWWA2DI8CC1$84B/NFJ5WOJE.5UOUUMUILQJZIK3PA2P-18SQTV*R258MJQ+:++DYHCHI6B5I+J3$OB1AKOLKY4I5XD.3Q2JK*RJ1E1LOU1IV/H7555LHI:RKDV-W995M3-*H4-DBBLDSI9BC*C+U978N2-9K$6+0V/PN-TR.-WIBBBI:3QNPXZ/N4MHI+JI:NIN/80OOG39A9$$G3FE+V71:/Y1VD0UUW.+XTVSO$6SHD:1JXTWYUEAPZUD5/28Z5KW843*BS*2.$WYMG+7YI1.H38BL7YN8/4-34XGFS/L.+V0:RSOAU8NP4ZCAU3Q:GL1/SG5ZU$:*58DIWF8.RNIRG22S18LLNKJXQSY.PH3+66PH0J9*I8S9E70-+*W4ADFYICDA4-0$-MTPE7LO*1*UT/Q6DTUBY0MYTKELTSOGJ0*IFU-N9L3E*8T9/Z:D2JMAI-JJQ7EKP859SIN:+I:Z3G209-DA0$9*H7GBEMOM3V5S/T$LLA/J.U-C5+ZIALSP37NKX2*PWB216D6OITOLQ:3.OAG4U/R45PH$$:K1D/$75QC9SK6S7.O0UJFZK7F*PFY8XJHGP-O.P4E07/M-RKIHQ7L$VFN292+UN8F7KZYP$NF/JY4N+9.RXV1DS**QPYQVY2+U9QR/+1T7-2/YAG9K*T549*:/578Q.AI0/1TQZCCG9FLLL4J$+ETZ0LKF+*3DN84F8GC-P4EYLAF923H9JRXNHXDDPN/NX$O$4SELXX$S8QNZJO$Y7GD/LKH$5:-9J6PMTVT/G3+WS-T*FBFTI3JB/A0OWEPAY:GTOFMBV/M$L1.P$N0S2DL/O4D4SUVJ76S21/:Y$VKF4V+SV-0/UO1GSK:G*H-GGL+ST8MBNG*DUEZHCC-$4J9KRL39V9G00YDA6SW2IF8AKCR9L7YV05RGHEJA0BYZVPYOL:KV/UL+$5ZMHJ9F84Q4YU-XR9THI-/$2W9ZQNR-J-N+WXC+A3FSA$2B4$FQH$71P0T8EBR+WM3W-XT*UG$YKZV3*$HU8Q-XRBXD6Q8K.4$COENY4/V3VL5O7SP.0$5+R5VHO./ULKTKC0G/WG8-5*IXB.4QHRYG90IV48VVNZ2-W*Q0QN7XPJIXK1FNPVQNECX:1$+C.U7*I1.WF.N-UVXNPJZCIOCIFJC1-Z7SWS:3SP7N1OCJK.PB4PVGM*.H6BC8ED4*587E:UD"
P2WSH_PSBT_B58 = "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"
P2WSH_PSBT_B64 = "cHNidP8BALICAAAAAq1DhxRK+mUH4T6uUNob8bUaZ7MP+44MW4+Y9bOxpjhZAAAAAAD9////aWclWQ+45HKrI07r878E2UrAupT2paT4QurbmtNjYNQBAAAAAP3///8CQEIPAAAAAAAiACCpkDPDhmIzPlkJrjw9A71xjbIUWf3VUB7ooFJhTVm04tjSIQEAAAAAIgAgjQKFDauIXsV5u23LBdYgOwX1FwGGrLiQfWzBtFKZ7dIAAAAATwEENYfPBD5i336AAAACQStJhNVJul7vHKbo83VdmuAW2m0WaXLKDlFANn7dUNoCNbhLMdw4Knz7Q7o6exdL6UFhQegW9nJb0SUStbLEpawUAgjLdzAAAIABAACAAAAAgAIAAIBPAQQ1h88EnbHQAIAAAAI/2Nc7x7iMpJNapTe/OJTV4oifqzQcYY9KV2+PGRjCdQJoww1WnSNqfcxXGyux0q1PqfmzUqgJNqKJCpmqI9t47BQmu4PEMAAAgAEAAIAAAACAAgAAgE8BBDWHzwS6wUg5gAAAAh1Pvr3ZZ+GvcUwJl9OPz2cLXOnTAcBEC7zDtqIOt3IcA1aOofNgUZFu0baQw54SqOcGA7KAvTDOXygfKRilU2OqFHPF2gowAACAAQAAgAAAAIACAACAAAEBK4CWmAAAAAAAIgAgiYAxcG7dnrEiZ4VHFVHOo18XCalvhZYuMqBr9n7HESQBBWlSIQJOjQgMfX26XEf+trHIEk3rYkEX5Y2NfrFKQARPcd2X8iEDBWHUgq25PfHvE+hlcBryJG7wo2y8jKUSPY7sd85OOMchA2iVcuKLD+2p1pgcAjfZ5d7b/sFt5xQ/aAoC7V0Vn3WHU64iBgJOjQgMfX26XEf+trHIEk3rYkEX5Y2NfrFKQARPcd2X8hwmu4PEMAAAgAEAAIAAAACAAgAAgAAAAAABAAAAIgYDBWHUgq25PfHvE+hlcBryJG7wo2y8jKUSPY7sd85OOMccAgjLdzAAAIABAACAAAAAgAIAAIAAAAAAAQAAACIGA2iVcuKLD+2p1pgcAjfZ5d7b/sFt5xQ/aAoC7V0Vn3WHHHPF2gowAACAAQAAgAAAAIACAACAAAAAAAEAAAAAAQErgJaYAAAAAAAiACAzd60wM9EFnPHSNbsSJfyipL8myVLVP2/vwzotVUSNxQEFaVIhAiKCMRLlzIhLkRbLIUIMx5KYJM0v6LcjW/mS6K7eFGwiIQKDzUflU23LeecRgzDo5IBCEvaWGfHW7JkNxzXvuc7FdCEDC5DtLoa61/Kk/pdpu0F9e6nKoRJIB9v7Ni377rZefgFTriIGAiKCMRLlzIhLkRbLIUIMx5KYJM0v6LcjW/mS6K7eFGwiHAIIy3cwAACAAQAAgAAAAIACAACAAAAAAAAAAAAiBgKDzUflU23LeecRgzDo5IBCEvaWGfHW7JkNxzXvuc7FdBwmu4PEMAAAgAEAAIAAAACAAgAAgAAAAAAAAAAAIgYDC5DtLoa61/Kk/pdpu0F9e6nKoRJIB9v7Ni377rZefgEcc8XaCjAAAIABAACAAAAAgAIAAIAAAAAAAAAAAAABAWlSIQKtIdmtKKuZrH7f2R4iIU8RWVOrCdHVWBCS+0e9pZJy/iEDoH074LrWPIA10hyXtBCJDT06GdLkA6+z/PxoJqomPHYhA6GoQ/otQdk71nUpYZFfbkSKdBkkSj4CuPTPYrzGp6JrU64iAgKtIdmtKKuZrH7f2R4iIU8RWVOrCdHVWBCS+0e9pZJy/hwCCMt3MAAAgAEAAIAAAACAAgAAgAEAAAAAAAAAIgIDoH074LrWPIA10hyXtBCJDT06GdLkA6+z/PxoJqomPHYcc8XaCjAAAIABAACAAAAAgAIAAIABAAAAAAAAACICA6GoQ/otQdk71nUpYZFfbkSKdBkkSj4CuPTPYrzGp6JrHCa7g8QwAACAAQAAgAAAAIACAACAAQAAAAAAAAAAAA=="
- P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(P2WSH_PSBT).to_cbor())
+ P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(P2WSH_PSBT))
SIGNED_P2WSH_PSBT = b'psbt\xff\x01\x00\xb2\x02\x00\x00\x00\x02\xadC\x87\x14J\xfae\x07\xe1>\xaeP\xda\x1b\xf1\xb5\x1ag\xb3\x0f\xfb\x8e\x0c[\x8f\x98\xf5\xb3\xb1\xa68Y\x00\x00\x00\x00\x00\xfd\xff\xff\xffig%Y\x0f\xb8\xe4r\xab#N\xeb\xf3\xbf\x04\xd9J\xc0\xba\x94\xf6\xa5\xa4\xf8B\xea\xdb\x9a\xd3c`\xd4\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x02@B\x0f\x00\x00\x00\x00\x00"\x00 \xa9\x903\xc3\x86b3>Y\t\xae<=\x03\xbdq\x8d\xb2\x14Y\xfd\xd5P\x1e\xe8\xa0RaMY\xb4\xe2\xd8\xd2!\x01\x00\x00\x00\x00"\x00 \x8d\x02\x85\r\xab\x88^\xc5y\xbbm\xcb\x05\xd6 ;\x05\xf5\x17\x01\x86\xac\xb8\x90}l\xc1\xb4R\x99\xed\xd2\x00\x00\x00\x00\x00\x01\x01+\x80\x96\x98\x00\x00\x00\x00\x00"\x00 \x89\x801pn\xdd\x9e\xb1"g\x85G\x15Q\xce\xa3_\x17\t\xa9o\x85\x96.2\xa0k\xf6~\xc7\x11$"\x02\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87G0D\x02 h?m\x19\x04C\x89\x95\x8b\xba\xed\xbb\xba8)\t\xae^\xe3`\x16G\xc8\x8bq\x9c\x0e\xbc\xc5\xb1j\xa2\x02 \x05\rP(\xe0\x9cc])q\xe5\xe2S\x9f\xaf+\xe4_\xa9\xc6\xf9\r"%\xf4\xa2\x00;\xa2\xaf2W\x01\x01\x05iR!\x02N\x8d\x08\x0c}}\xba\\G\xfe\xb6\xb1\xc8\x12M\xebbA\x17\xe5\x8d\x8d~\xb1J@\x04Oq\xdd\x97\xf2!\x03\x05a\xd4\x82\xad\xb9=\xf1\xef\x13\xe8ep\x1a\xf2$n\xf0\xa3l\xbc\x8c\xa5\x12=\x8e\xecw\xceN8\xc7!\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87S\xae\x00\x01\x01+\x80\x96\x98\x00\x00\x00\x00\x00"\x00 3w\xad03\xd1\x05\x9c\xf1\xd25\xbb\x12%\xfc\xa2\xa4\xbf&\xc9R\xd5?o\xef\xc3:-UD\x8d\xc5"\x02\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01G0D\x02 ~O\x1b\x8c\xbb\x87x\xa3\xbb\xff\x04\xd8\x10Cq\xc8Y\x0f;N6\x97\xd8S\xfeti\x80\xb3\x12\xe0>\x02 l\x93=\x02m\xb4<\x90\xf4%\xf9Z${\xb7\xecO\x19\x15\xa3\xa3S\xf2Q\x81\xdcX\xfb\xd5&\x9e\xc5\x01\x01\x05iR!\x02"\x821\x12\xe5\xcc\x88K\x91\x16\xcb!B\x0c\xc7\x92\x98$\xcd/\xe8\xb7#[\xf9\x92\xe8\xae\xde\x14l"!\x02\x83\xcdG\xe5Sm\xcby\xe7\x11\x830\xe8\xe4\x80B\x12\xf6\x96\x19\xf1\xd6\xec\x99\r\xc75\xef\xb9\xce\xc5t!\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01S\xae\x00\x00\x00'
SIGNED_P2WSH_PSBT_B43 = "*SPXND+LRIGD5M1*NM-KV3RHL.*VA-BKB4S768T1HCIA:IJ:U+OW:72QTH6YLJ2ZVYJW90CFVID.GA2O1G$TG1K3I4759UGCO/U3Z$030$GR5R*OXST6TO$34/UZ*VJ+Z*A2CQVJ8CSN2Z5FK79JTWD$HDPEWX7C8C220T24FZ-RSZ:GM3Y578HCV*FG1QG-/$Q5H0LMI*I1HD$51K6UP.5N0/FOPFC/MIGLLXJP:YTGR11+1JX90+GDZ5+3$/BD*ISW36V$ZK5-3V5ID0VJ9U*X6PL*QH$SP5YQW/SWFNV80VD5MTEN46$P.7EUD4A1A$.5E7H5+51OZAD-.RY9HU*B8/+-TSQ2C4OA6+M6ZBDALSJ5IY2:XB481FZO.WLXUQND-FAB+XAESK9303ZFYA:6CX9AXG/2US*N+*79Y4U68*P/LNPP1PNCC.I3ATP:EN/MBPXU+P*3MX5HDBOR4HT:8RF.WO6HGFL8T*H-+61R+R6V-CJ*-VVLB83QPH*.G0/3T4FN2029Y96+3XMJPPSLU+Q6YW101MH8A3J2CYB*CFS$$NSL5I3OCN*:3V001Z:8PEG:+:HE54GUB2UM*GRY46/639A*40K$SB*G2P$D7PWJHP6SGNO.Z827V6$+09WZR-2GC4-2D9KSNAGK38WUFEV$1UIDZ/+83HX$IKJDYF3AEWR-L9ZX$/5QHW-1HA26CECX52/FQPAFE7ZRPCH9RA9XA556ASF8YW6I4+*ID/8VYMW.I-LQTMVLYFLTV097P*ZGRYONCULW37MFJ408I$CVCV2M.LJ+SV-49.33.WNDE2X5KCC4IVO8F9BH95UN$Q:SCZSR*M2UK/0BWQUO*YT.IB3UW8YV/8NGGOEZGA4QJ2-ICL5MIZ+4U1-QZFMXS6PEEH5IO5RU$+W.DF$5-AMFMQJV1LRLUAHJ9ZGM:WW*.06UQFBBDUO0:YVVO85FSFXE*/:1UIHQW5DJCY2CX0W94Q:D:T8ES9HZON85YXQZTC9+ASY/B525SCPL44BTZ8R1*15:+6-6FQ112E1$G9L"
SIGNED_P2WSH_PSBT_B58 = "8zF2eD2uMaxb2DsPbbKRp9Mpm1UH66wJ4uSMZPn5MA1nJwE8S3RAGDWCCvsguUhQDPCPVw5S8GsAJvAc811WwP71guKubiPxppUKqaWUkQN71B18krk1K2NrWCA9ewdJE1d1BopmzNBr5Qg3qZNCsN6EDSCn8uow2r97h2rnokSq4nXfy3KE2v7hBrGvSZw8A96WAJDSEnS1sP7U5wgtiSYdWxEHBfKocVC3G3sayPuMEjzA9QcYWpy1U6S3EW8YWw5kvQW88LKg8b3js9R7w9aWFnQwMdRg3CFSfGkoHegiWSufPejQ65Airoo8WqNvGVacmSZybkmcvu57KRobPuhZCDPbtJ5435eJsarQ9nmRpac6VJNoLrdHvkeWRZ9QEXk654TW7z6NV87it5vPVDNEnFW3c9pAdtZsYXHafw7CMSiWRPEsCoRKzodieHJFfeHiJGT5zqcP3bgmHTszp3GPMdRy3onHeFRCoyftuAEBkwsCyaYFwoSBE6YUgjHT1T4mWCoe7W4ktoDEKXsHawFC6sw6KCPzDbuTZJuaDoWijHeo7FnC97QVvMNHdVgz1ZmCerxQLrkFJsT8x5WYuVoMmcHRpbyRcuCV64YYPgFFfCZs7VVedPsgSNdkQ7qKCqVYnTaNiBpeE5NB4gwcMcCYUJMWXkqCq7t91o9Mi5ozv4R9yPonSUaTH13D6FSPY9RSZbU1F9SMgFXBoB4DdssC36RGpqZ3Fnm77RJB5v1WJAQ95RNXHuSuKB43X1HiiKYKohtFrwd7jCtbUGuUUs9mpd7VqdvVtbSE9jpQxgxJHvF983X43ZxKcE2K8AMr4WyL8s2Pi2Xj644V9zauy2qmLeNusxudGNgPdTsktjEoWCSuFPtxuqcmC8MwXh5cSQqiFkULgFNuGtkUajJQEnfW9jMfjm5y7Va5DhJN4S7MN371DgiusGnsmb5YZGBeycptyDykdsFXYs"
SIGNED_P2WSH_PSBT_B64 = "cHNidP8BALICAAAAAq1DhxRK+mUH4T6uUNob8bUaZ7MP+44MW4+Y9bOxpjhZAAAAAAD9////aWclWQ+45HKrI07r878E2UrAupT2paT4QurbmtNjYNQBAAAAAP3///8CQEIPAAAAAAAiACCpkDPDhmIzPlkJrjw9A71xjbIUWf3VUB7ooFJhTVm04tjSIQEAAAAAIgAgjQKFDauIXsV5u23LBdYgOwX1FwGGrLiQfWzBtFKZ7dIAAAAAAAEBK4CWmAAAAAAAIgAgiYAxcG7dnrEiZ4VHFVHOo18XCalvhZYuMqBr9n7HESQiAgNolXLiiw/tqdaYHAI32eXe2/7BbecUP2gKAu1dFZ91h0cwRAIgaD9tGQRDiZWLuu27ujgpCa5e42AWR8iLcZwOvMWxaqICIAUNUCjgnGNdKXHl4lOfryvkX6nG+Q0iJfSiADuirzJXAQEFaVIhAk6NCAx9fbpcR/62scgSTetiQRfljY1+sUpABE9x3ZfyIQMFYdSCrbk98e8T6GVwGvIkbvCjbLyMpRI9jux3zk44xyEDaJVy4osP7anWmBwCN9nl3tv+wW3nFD9oCgLtXRWfdYdTrgABASuAlpgAAAAAACIAIDN3rTAz0QWc8dI1uxIl/KKkvybJUtU/b+/DOi1VRI3FIgIDC5DtLoa61/Kk/pdpu0F9e6nKoRJIB9v7Ni377rZefgFHMEQCIH5PG4y7h3iju/8E2BBDcchZDztONpfYU/50aYCzEuA+AiBskz0CbbQ8kPQl+Voke7fsTxkVo6NT8lGB3Fj71SaexQEBBWlSIQIigjES5cyIS5EWyyFCDMeSmCTNL+i3I1v5kuiu3hRsIiECg81H5VNty3nnEYMw6OSAQhL2lhnx1uyZDcc177nOxXQhAwuQ7S6GutfypP6XabtBfXupyqESSAfb+zYt++62Xn4BU64AAAA="
- SIGNED_P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(SIGNED_P2WSH_PSBT).to_cbor())
+ SIGNED_P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(SIGNED_P2WSH_PSBT))
SIGNED_P2WSH_PSBT_SD = b'psbt\xff\x01\x00\xb2\x02\x00\x00\x00\x02\xadC\x87\x14J\xfae\x07\xe1>\xaeP\xda\x1b\xf1\xb5\x1ag\xb3\x0f\xfb\x8e\x0c[\x8f\x98\xf5\xb3\xb1\xa68Y\x00\x00\x00\x00\x00\xfd\xff\xff\xffig%Y\x0f\xb8\xe4r\xab#N\xeb\xf3\xbf\x04\xd9J\xc0\xba\x94\xf6\xa5\xa4\xf8B\xea\xdb\x9a\xd3c`\xd4\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x02@B\x0f\x00\x00\x00\x00\x00"\x00 \xa9\x903\xc3\x86b3>Y\t\xae<=\x03\xbdq\x8d\xb2\x14Y\xfd\xd5P\x1e\xe8\xa0RaMY\xb4\xe2\xd8\xd2!\x01\x00\x00\x00\x00"\x00 \x8d\x02\x85\r\xab\x88^\xc5y\xbbm\xcb\x05\xd6 ;\x05\xf5\x17\x01\x86\xac\xb8\x90}l\xc1\xb4R\x99\xed\xd2\x00\x00\x00\x00O\x01\x045\x87\xcf\x04>b\xdf~\x80\x00\x00\x02A+I\x84\xd5I\xba^\xef\x1c\xa6\xe8\xf3u]\x9a\xe0\x16\xdam\x16ir\xca\x0eQ@6~\xddP\xda\x025\xb8K1\xdc8*|\xfbC\xba:{\x17K\xe9AaA\xe8\x16\xf6r[\xd1%\x12\xb5\xb2\xc4\xa5\xac\x14\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80O\x01\x045\x87\xcf\x04\x9d\xb1\xd0\x00\x80\x00\x00\x02?\xd8\xd7;\xc7\xb8\x8c\xa4\x93Z\xa57\xbf8\x94\xd5\xe2\x88\x9f\xab4\x1ca\x8fJWo\x8f\x19\x18\xc2u\x02h\xc3\rV\x9d#j}\xccW\x1b+\xb1\xd2\xadO\xa9\xf9\xb3R\xa8\t6\xa2\x89\n\x99\xaa#\xdbx\xec\x14&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80O\x01\x045\x87\xcf\x04\xba\xc1H9\x80\x00\x00\x02\x1dO\xbe\xbd\xd9g\xe1\xafqL\t\x97\xd3\x8f\xcfg\x0b\\\xe9\xd3\x01\xc0D\x0b\xbc\xc3\xb6\xa2\x0e\xb7r\x1c\x03V\x8e\xa1\xf3`Q\x91n\xd1\xb6\x90\xc3\x9e\x12\xa8\xe7\x06\x03\xb2\x80\xbd0\xce_(\x1f)\x18\xa5Sc\xaa\x14s\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x01\x01+\x80\x96\x98\x00\x00\x00\x00\x00"\x00 \x89\x801pn\xdd\x9e\xb1"g\x85G\x15Q\xce\xa3_\x17\t\xa9o\x85\x96.2\xa0k\xf6~\xc7\x11$"\x02\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87G0D\x02 h?m\x19\x04C\x89\x95\x8b\xba\xed\xbb\xba8)\t\xae^\xe3`\x16G\xc8\x8bq\x9c\x0e\xbc\xc5\xb1j\xa2\x02 \x05\rP(\xe0\x9cc])q\xe5\xe2S\x9f\xaf+\xe4_\xa9\xc6\xf9\r"%\xf4\xa2\x00;\xa2\xaf2W\x01\x01\x05iR!\x02N\x8d\x08\x0c}}\xba\\G\xfe\xb6\xb1\xc8\x12M\xebbA\x17\xe5\x8d\x8d~\xb1J@\x04Oq\xdd\x97\xf2!\x03\x05a\xd4\x82\xad\xb9=\xf1\xef\x13\xe8ep\x1a\xf2$n\xf0\xa3l\xbc\x8c\xa5\x12=\x8e\xecw\xceN8\xc7!\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87S\xae"\x06\x02N\x8d\x08\x0c}}\xba\\G\xfe\xb6\xb1\xc8\x12M\xebbA\x17\xe5\x8d\x8d~\xb1J@\x04Oq\xdd\x97\xf2\x1c&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x01\x00\x00\x00"\x06\x03\x05a\xd4\x82\xad\xb9=\xf1\xef\x13\xe8ep\x1a\xf2$n\xf0\xa3l\xbc\x8c\xa5\x12=\x8e\xecw\xceN8\xc7\x1c\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x01\x00\x00\x00"\x06\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x01\x00\x00\x00\x00\x01\x01+\x80\x96\x98\x00\x00\x00\x00\x00"\x00 3w\xad03\xd1\x05\x9c\xf1\xd25\xbb\x12%\xfc\xa2\xa4\xbf&\xc9R\xd5?o\xef\xc3:-UD\x8d\xc5"\x02\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01G0D\x02 ~O\x1b\x8c\xbb\x87x\xa3\xbb\xff\x04\xd8\x10Cq\xc8Y\x0f;N6\x97\xd8S\xfeti\x80\xb3\x12\xe0>\x02 l\x93=\x02m\xb4<\x90\xf4%\xf9Z${\xb7\xecO\x19\x15\xa3\xa3S\xf2Q\x81\xdcX\xfb\xd5&\x9e\xc5\x01\x01\x05iR!\x02"\x821\x12\xe5\xcc\x88K\x91\x16\xcb!B\x0c\xc7\x92\x98$\xcd/\xe8\xb7#[\xf9\x92\xe8\xae\xde\x14l"!\x02\x83\xcdG\xe5Sm\xcby\xe7\x11\x830\xe8\xe4\x80B\x12\xf6\x96\x19\xf1\xd6\xec\x99\r\xc75\xef\xb9\xce\xc5t!\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01S\xae"\x06\x02"\x821\x12\xe5\xcc\x88K\x91\x16\xcb!B\x0c\xc7\x92\x98$\xcd/\xe8\xb7#[\xf9\x92\xe8\xae\xde\x14l"\x1c\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00"\x06\x02\x83\xcdG\xe5Sm\xcby\xe7\x11\x830\xe8\xe4\x80B\x12\xf6\x96\x19\xf1\xd6\xec\x99\r\xc75\xef\xb9\xce\xc5t\x1c&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00"\x06\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x01iR!\x02\xad!\xd9\xad(\xab\x99\xac~\xdf\xd9\x1e"!O\x11YS\xab\t\xd1\xd5X\x10\x92\xfbG\xbd\xa5\x92r\xfe!\x03\xa0};\xe0\xba\xd6<\x805\xd2\x1c\x97\xb4\x10\x89\r=:\x19\xd2\xe4\x03\xaf\xb3\xfc\xfch&\xaa&\x02\xb8\xf4\xcfb\xbc\xc6\xa7\xa2kS\xae"\x02\x02\xad!\xd9\xad(\xab\x99\xac~\xdf\xd9\x1e"!O\x11YS\xab\t\xd1\xd5X\x10\x92\xfbG\xbd\xa5\x92r\xfe\x1c\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00"\x02\x03\xa0};\xe0\xba\xd6<\x805\xd2\x1c\x97\xb4\x10\x89\r=:\x19\xd2\xe4\x03\xaf\xb3\xfc\xfch&\xaa&\x02\xb8\xf4\xcfb\xbc\xc6\xa7\xa2k\x1c&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00'
# Native Segwit Multisig with descriptor
@@ -115,14 +116,14 @@ def tdata(mocker):
DESC_P2WSH_PSBT_B43 = "3/6JFP0WH4Z9X7CPKDVO$8*3DH$NZCPN-$*3TN/E/KJNHYTO:W07H:D0BZAF74VNH+GPE2YELQ$X3F.5XI9F$BJ$25I1U.82XUY1HPDK/US8NGLTF.3JII1**LKAF9GQ5ZOUP0R.C127IUN6B7Z7US6M$8FN6/:*4PFJ//R3B2.NT3ITZO+7N24RQJW.XR9S5HU9SQX+5V+7Y/5T5LLMN3-64CIX:/+99881O9TCG*YH*PDT3+MJ9TI3MNM0GWAIEZVW*B*L6ZTYPHOCDO1+HHK*I+1YO.IVWBC:0585+J:DCG.**86V-EVV-NHS*/GPL/O*HQA11ZW7MH9-C:PM++$980X.YAMKQE7CSTUXVZNXFBARLIJPZ/KY0OG2:K:./1:LX-Z-DELF7$WQKJ07EPGC6F9DA4O8M9/RC6F.6BI2P2.1HKO2K3UMVV*85S-$MYK$60IP3E+J5E07L03TWZKIZ26R-G2:92Q24MZB*2FURCVC8I41B5OGFFZ/*5X7P1GQ*RGI65K1NO2-9-KXI3Y9.D.32A2ZKAXJF$*JP$OK8PGH38*+S:ZZO+S$ZJLRZ.VNSDR$T3G6KE-6FH+:W7*U921QCUI4G7Q6OMVKXN:XAI-T.TC4::5AEGYJKPWYCZ/KPRP4KMNHP4J4/C9Y/AX8JC:KFTJ3S5Z:/B:F9$Y1Y26GOF+6EEMYN.0LKWTKKQZ+:WCM-8IALYPY5H.KP8+6UDCD42W1N*0035.M*T4Y11ZL3BWFK06+79+Q1383T.H2AL8E-/3$4X$P*-PX/Y8DPLFTF8V$FAKBWMGJ4+:KNN4K7WWU0$EC+9ZQD2LFOP4GXN3/P-01-95QDT:V-M9$8:VQGA*1DM6QITM9I/SLTXYIQRQT5FV9VR6-B.HYAW9K-8+BD$$49+-ZEEXQJ:ULTAX5KB5VLXTN-YG77MJUEL.87-.EFWE10R8MGEE5I3*1C2F6I3*:BAPR17HF6DK7BBGVYG1:A514W:1+X*A8IZETH-GQ$APGF+XLF:3U:8GACB-S-$B.V1SK7B:TKYPF5BDG$JZ4A:SZ.F5XRQXH+H.:K948+VTDTASOJIP7XLHYFMXGL56US//B/I+HG/+.5$NOKLI3AIH/XO*HNXLG20RA60M7GU$VA22WC-B*3MHBTCHB170YB952IDBI2/0UB*MPS44$.V*863ZR:7PJ6:/*0XSG$M*QMIK*MZ2:970S0LB2TV5FP2J.B.M2PGKKH$4E94TCAT**HK78XO/0$RJ8.DBW/GT8-//P$QJ$1YA2YY$516:M$SKLBJO.GZOWG*LWUXIGJ5HI0IT/88HMDFT7P8WF9N$CD42-OKKQ+OHRNW$3$-X$$J-GG+9VFOLPOZ2G37ELDLR9U:$7+V-B$PV*N82AJ3K8O24NZ$Y*RQ0EW.33:D.+AFY85M4RQBJRRU38PO*VQZDAM9ZPBY..9*DOTH6IT/3UWUC*1:UVKCX/-3A7P/FVU$F.PZ8K71JZF*IYY.PMF4P2Y$UPLNRT*D7K4GE3SHC0OZDS7A0F7THR-COAA6LBX$4DM8+P4NL-NTH:7:A$OC08AG2MHE0CU6HTL52C2O/OWG/XRV+CHNCJEEEZQLJJ-AO3YJVLK:B9L4/1HTC1/0W.:+R8QEA7Q.TRH1H6D66JE$M8EMZXZ0MYE729E.-7CN020Q4C+YS0H/7MZ5K$0O0/PW6R4CMGYSJNSI:N+G2/.H4XQCQI2J221US22CPO18-K/3WO*D.:W::ZQ5S2+$HZPH-VX+C6RZD0.CTD/R9OIB7Y6NW+*K/R/CZN4VDV:-HA25I7CJR*0T0KZ0PZT+YIUP:Z81FIAN6W*S-I4YQ/D.Z2U3XHSY$3G4RRJL+G$M4OQESTFTJN.S/GNQKI:+.*43D/SKKGN2-59O3/YBSZ0./QXW**O.D5-E85SYXARPXUVWUQ/41EXU-QP587RGJ2PFP23GJ+6.NS-LN:R5GCDVN1L--0KV:Y00L6-J0-R+6/JE17K3N5IWPOS8FTG/3N381678BT1ZG86MFT/4VTL:/BX-N/QF:BG1PQLMNMLWD3*42E1.FSWSX29H*HJEBXP7O7GQOK$KN-JCT5B6YQD0IOV198W7:ZXP5"
DESC_P2WSH_PSBT_B58 = "3jx2X8ZwCij2rNtfMg7mupXikVogYxqSzch7asET73FeLCVjUDuMSCmyaT7QYNGSpubqL1hGQVrB7d3m7bq5DeMEg6ndo3hSMvp7P9qrB71vQuJLogN8yrD7dFuQVhgGVCC7bHR7GjaWBEPS33rN8HycsqZxqaYR9KpVehrXRb6RUdrZ9TYuwDA1BEDuEsFmb746DPEfaFodqaRCJAo6RqKntThwN1fcXSxSu4yURrLer1aBGBvXEwX3yNMkSFignLGGjRV9uvjE8AQQSZpph39B5GDvopCUbcGDKh8EoN6NRzZmxoCgynfwzfreBBzgKtFjKfEAb3YFVVkuzUpGhtgNrvT1uAEWprFn7gqF9yHErZXUpGnsWoboFRG8zfvpcsagtx95PetX6DGrq7Z1Fz1MovpT4Z2YF7aytwuKx44pWU5765PXAfUegR7CXNkRsYpteZ5zjs2tuPK3AjAGvjKCfmidb1tbgtVmWPP2Mrc13h9ygdzpKCp6PJ3t78EGeKZFqEjxvV5BcjFdVSVG4JqMEEC3qbhn9jnVsKz1susod1YfyDAUAR7VZbvcNmzUjaCUs4hpMUZmJkZjun57Zi7h1Ua8tyJYphAMtmXqzSHLnKMpsHBhr9jpY66b16uo3FMcHULqVgeHs1mJZvEk7e3smpJBr6k1rifAkFvTyUYKpte3ytEZiyjvjGKuexLAm6QP7BVfmqTo2G2tPwj5F9VmjvRKoNXbmxACHvvRDdbVPutrAYWGBNBhq8ZfNBQy3aJEqC7gHk2mhUhVBiCYbSNRXja4fyK9vb78v2Madh67sBThaHtQH91L1Lb9jhDos1gsJvs67HpbBNcJk1KFXDvLwQJGDnXubyW8iKh3pff5qumQxk9GL6jN8MqDrCQWheRKEEsQcNVAZPZ2sK5DETMuaAbcpHvEjm484ZdZetPUM8vkZ769BSzipYXq7UKzPAzKbtSpyaavE6uSN9bETaKjBpmTeg1ftrb4Kt9GHGUwqqUUZc8KhR3ebCuGZH8CwzYAQmkFStR3oHJ3McTUrv1wSNL9QneQqEVhr2gk11TPodbQP3uWh2w6RaUfy37zAWWen4AbhzdGWjRNqikHzFYpb1nbzCdqjegS6hH1y7GV2NAfTdNMtUWhgL913T7649LCyywKQhmJLTcKtoRj1JafydzGQWMwWLc7HJKDgm5u9rcEouYiEaN6sXFmzgoihee9dCzQ5znEwPrnRVTryXhGfmZaGcbCV6S7JTFSKyPGGBroQiiXyo8XA9k18mtwF16D6rW7uZFPGswKX4zMEf2W4StPB91rjULYtCkB8PyZhKRf74kf5mV2tYLRxLHmUEsmqs73iZfb9wz6Ejk23zrhqzscEzip5U2UtN331VUEiw4cD3UVH2HqZSWQKvxRBZHuqaHty8FXo5LLWvDD691Ku8KjRL5GJbVNT7ywRxUY3XYhkvCRJLZ9xuNt6v6irbJnMDEuN9ygtDz32mWKzdJwCKwe4Ds5ZU1FWjSuwk52Z2Hw3q2rvfCvhRLBRkYFbgjC8ZSCnVakdjVe63ZH1aG71nt8FLdnwWGQa7u9KN3X7rAbaEKcTSEwjzUNdEjf8P5hsE2QdKY1X2FtXxi6cwKMzPvJna73s2mhAJBygSiJMSiEQfS4xn2rVrtTgHjj1drJ6jji3MTGj5nSzz7WoDAJYdd5orgdboqzdw9KaVrkXFoKg3QoiWhX55mHpYZcV6p976GD8EXacWgLJ2iCGWddGs2vhf1LPFs2Yc2cN4ddAhHHyGVUPuH95RobwoV14kqzqCjnAiQHmMyohmvVBUjRek6cBxpEuEixkJbAy2J4YguX3cBUafUg6UBmapY7GC938r2QWHWVHu6TtvzQNsbJT6cYiZUjDyHuiLggt15NJRe84fqDB7Ss9acefv5uhGA3UsFkbUfnsdmS3jZafEUGghVNLs74aDmn36nCDRy"
DESC_P2WSH_PSBT_B64 = "cHNidP8BAKgCAAAAASfIE3KSbRjEmpj+yvNGEWM1x7cxOnB6yN1iT9Bk03ZpAQAAAAD9////A6CGAQAAAAAAFgAUgUB+pC3U8eOM//VprqOyuFudU9xADQMAAAAAACIAINN7iuGkSWCefm+wkog7BdT/dSCnhXhMiotm/E3cBedfyL0JAAAAAAAiACB5tu0swtfCrvbN5J17jz9+/IGljJvfMTpN74MH6xGTpj4GAQBPAQQ1h88EusFIOYAAAAIdT7692Wfhr3FMCZfTj89nC1zp0wHARAu8w7aiDrdyHANWjqHzYFGRbtG2kMOeEqjnBgOygL0wzl8oHykYpVNjqhRzxdoKMAAAgAEAAIAAAACAAgAAgE8BBDWHzwRJSRGbgAAAAiFiQOa0/WC6XnghBQZ2Y/POF/yviTsyV2sUBfuPf7zzAuamnuBpfF6O1liTVNz3mktFkOWANW3XhxrjrDpwQB8PFALov/IwAACAAQAAgAAAAIACAACATwEENYfPBEiJsyiAAAACeAg387MTK8NkVzJySOSqdVfBcF4jylEaMtBndWliYjIDalV1NbBVqBl33lhtc04soVvYVL2qWgN8/kwAS0rk37EUjLNrODAAAIABAACAAAAAgAIAAIAAAQErQEIPAAAAAAAiACBlNwymxPVuRQIyW6Hmzrh0viuvl91Y2zIDT0eo9aaD1gEDBAEAAAABBWlSIQJCaYD5Spy9Ou5KmagEJByY6SHIUTQg6WYzJ/9idEFjCiEC/FYt9dp5LRohsqyC5eLWJ3UB+Vrz2loNrKR2uEDWLHchAwuQ7S6GutfypP6XabtBfXupyqESSAfb+zYt++62Xn4BU64iBgMLkO0uhrrX8qT+l2m7QX17qcqhEkgH2/s2Lfvutl5+ARxzxdoKMAAAgAEAAIAAAACAAgAAgAAAAAAAAAAAIgYCQmmA+UqcvTruSpmoBCQcmOkhyFE0IOlmMyf/YnRBYwocAui/8jAAAIABAACAAAAAgAIAAIAAAAAAAAAAACIGAvxWLfXaeS0aIbKsguXi1id1Afla89paDaykdrhA1ix3HIyzazgwAACAAQAAgAAAAIACAACAAAAAAAAAAAAAAAEBaVIhAxJxGhUobdA8J0f7E7VomnEkvEUxMfwTRM7H+sSC6RvdIQMsxFJkFzYha8pYnAzBATjdV3NTdTOYsxKcFRr0f/k2kiEDaJVy4osP7anWmBwCN9nl3tv+wW3nFD9oCgLtXRWfdYdTriICA2iVcuKLD+2p1pgcAjfZ5d7b/sFt5xQ/aAoC7V0Vn3WHHHPF2gowAACAAQAAgAAAAIACAACAAAAAAAEAAAAiAgMsxFJkFzYha8pYnAzBATjdV3NTdTOYsxKcFRr0f/k2khwC6L/yMAAAgAEAAIAAAACAAgAAgAAAAAABAAAAIgIDEnEaFSht0DwnR/sTtWiacSS8RTEx/BNEzsf6xILpG90cjLNrODAAAIABAACAAAAAgAIAAIAAAAAAAQAAAAABAWlSIQIq050nYYikVbsAz9Fzzhp6i6428Ot46AKeRP7BCTrFPyEDoH074LrWPIA10hyXtBCJDT06GdLkA6+z/PxoJqomPHYhA6S8pGLg1aITEVC5wrJQPqlTYo5XSBR/XjZv0zfpEgfcU64iAgOgfTvgutY8gDXSHJe0EIkNPToZ0uQDr7P8/GgmqiY8dhxzxdoKMAAAgAEAAIAAAACAAgAAgAEAAAAAAAAAIgICKtOdJ2GIpFW7AM/Rc84aeouuNvDreOgCnkT+wQk6xT8cAui/8jAAAIABAACAAAAAgAIAAIABAAAAAAAAACICA6S8pGLg1aITEVC5wrJQPqlTYo5XSBR/XjZv0zfpEgfcHIyzazgwAACAAQAAgAAAAIACAACAAQAAAAAAAAAA"
- DESC_P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(DESC_P2WSH_PSBT).to_cbor())
+ DESC_P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(DESC_P2WSH_PSBT))
DESC_SIGNED_P2WSH_PSBT = b'psbt\xff\x01\x00\xa8\x02\x00\x00\x00\x01\'\xc8\x13r\x92m\x18\xc4\x9a\x98\xfe\xca\xf3F\x11c5\xc7\xb71:pz\xc8\xddbO\xd0d\xd3vi\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x03\xa0\x86\x01\x00\x00\x00\x00\x00\x16\x00\x14\x81@~\xa4-\xd4\xf1\xe3\x8c\xff\xf5i\xae\xa3\xb2\xb8[\x9dS\xdc@\r\x03\x00\x00\x00\x00\x00"\x00 \xd3{\x8a\xe1\xa4I`\x9e~o\xb0\x92\x88;\x05\xd4\xffu \xa7\x85xL\x8a\x8bf\xfcM\xdc\x05\xe7_\xc8\xbd\t\x00\x00\x00\x00\x00"\x00 y\xb6\xed,\xc2\xd7\xc2\xae\xf6\xcd\xe4\x9d{\x8f?~\xfc\x81\xa5\x8c\x9b\xdf1:M\xef\x83\x07\xeb\x11\x93\xa6>\x06\x01\x00\x00\x01\x01+@B\x0f\x00\x00\x00\x00\x00"\x00 e7\x0c\xa6\xc4\xf5nE\x022[\xa1\xe6\xce\xb8t\xbe+\xaf\x97\xddX\xdb2\x03OG\xa8\xf5\xa6\x83\xd6"\x02\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01G0D\x02 %W.f$%C\x19\xde|\x8b\x83J>\xb7\xcc\xdd\xcf0\xe3\x1e\xe5j\x90\x99\xa5OD"\xf5u\x85\x02 \x0b\x9a\x92\xb8\xa9\x9f[\xb9\xe4\xc5\xd6\\\x83\xc1\x8f9\xdbB?\x8b\xc0\xffW\x0b\x15\x98{\xd8\x92;\x8el\x01\x01\x05iR!\x02Bi\x80\xf9J\x9c\xbd:\xeeJ\x99\xa8\x04$\x1c\x98\xe9!\xc8Q4 \xe9f3\'\xffbtAc\n!\x02\xfcV-\xf5\xday-\x1a!\xb2\xac\x82\xe5\xe2\xd6\'u\x01\xf9Z\xf3\xdaZ\r\xac\xa4v\xb8@\xd6,w!\x03\x0b\x90\xed.\x86\xba\xd7\xf2\xa4\xfe\x97i\xbbA}{\xa9\xca\xa1\x12H\x07\xdb\xfb6-\xfb\xee\xb6^~\x01S\xae\x00\x00\x00\x00'
DESC_SIGNED_P2WSH_PSBT_B43 = "4/.G:UYEK5AMD0MHBHG13G.LD0DMSN0DAO:0IJPF8RF0JH4ZNAC:TYRA2JIO2QX:GRSJ8E:QGO0M3VZCDZMCOTMN9E63370-UTOCR31LI024JWT$REDBLL6YC*.J2R0KOHHEKJ.XHZL8J3FK2W5M402A7/FF$IL24B:UAFC1YC/4342.B$P*BLP0N35YHQ$G7V3*V:+CKF$L7V5.T1U78YG6*B20KIQBOG56QQK8KS/X2G3O6W6HS.JXETL:-5S$EON-ZZ6FO.DN03G-6HUHI:Y8FQTZ6.B/VG/R8:Z.RDX9LUY+XWUYX-T8D017HPLG+9V397ZT3:T*7ZTAYD.NW.SI:Y3GMA72:9L:7GDAEKTS-CR2:RTDE9:JJ-JMBJLAPBYLNZ1267-EI-QOR84L-QNISTKW+Y8T9QDIMF7*ZS+H4AED7EH7R01-JE9CC7E//87KCNFPA+BB277SZRI41.F/EZJ5V7WZXL$KU/BEFG1GXM17EN+EAFVL7UE7D+MIW1IWNTA$R9GTT8.V$-EMGV7FVWK.UVVE$LU81JSD7GYM+NO.2WSXG17.BUP2Z.--UKUWUMU7-PUZ32FT2VTTLXTG4A/ERGP01/.823-PNP9T$QBGS5PKO66W6VN.0KB7G+H6T8FLH0V9"
DESC_SIGNED_P2WSH_PSBT_B58 = "6U4CYuYnKrhe8dUK8v7w2Jg9m3oSVzMPucwDuvsiMsxPZSbBbHesQk5q3egGVfbe553KnFcwEFjPhRPWQ7MXPyZVinB2MPA3zeVuZHAHTphXCN3uS2TAiSpwGEAY1EWxjUywu3dPPhVDHUzz8sjiCfmvQYmXcLu9nBVG2S1v4sVWii3BvvxDmihkdSMDuoouFysRjttBB7RN9H2tDiSSNLRwWey6dMKr6hADHTXozKcgEr9R5sPhkXBmwMGwW2AbDAjaLBX3fAtDr8ExUtHBhADgE9JNZWRroRgHH9hkmG1FZkEQBGhpv1QuH8gdhonpgY7HYUXGmz1YUKuvjPybvQZrbwwGHViVNuiMvNFBsNJsyURz6U3Xv4RzQ3PwxrTkGwSW6wa4TqiLZACesQBB9taGVFEiVS7aNFAoSdRaTb5n1FsUR8rHiyPY2XsVM67ENHZ7TcGdpwsyeGL5aTm1Bu9GWKYxzFnhA7AW2ojjhZ7CT28rxg5cqCHZJWBL42ZowTiNVKRS87YqYQE7E5DHzh71jqVQ9dDPZAbec4QDnnT1LohBjsS9TWWevGYJ5dPFz93sMJyKstCjqcaqX94TP1LnQAo9"
DESC_SIGNED_P2WSH_PSBT_B64 = "cHNidP8BAKgCAAAAASfIE3KSbRjEmpj+yvNGEWM1x7cxOnB6yN1iT9Bk03ZpAQAAAAD9////A6CGAQAAAAAAFgAUgUB+pC3U8eOM//VprqOyuFudU9xADQMAAAAAACIAINN7iuGkSWCefm+wkog7BdT/dSCnhXhMiotm/E3cBedfyL0JAAAAAAAiACB5tu0swtfCrvbN5J17jz9+/IGljJvfMTpN74MH6xGTpj4GAQAAAQErQEIPAAAAAAAiACBlNwymxPVuRQIyW6Hmzrh0viuvl91Y2zIDT0eo9aaD1iICAwuQ7S6GutfypP6XabtBfXupyqESSAfb+zYt++62Xn4BRzBEAiAlVy5mJCVDGd58i4NKPrfM3c8w4x7lapCZpU9EIvV1hQIgC5qSuKmfW7nkxdZcg8GPOdtCP4vA/1cLFZh72JI7jmwBAQVpUiECQmmA+UqcvTruSpmoBCQcmOkhyFE0IOlmMyf/YnRBYwohAvxWLfXaeS0aIbKsguXi1id1Afla89paDaykdrhA1ix3IQMLkO0uhrrX8qT+l2m7QX17qcqhEkgH2/s2Lfvutl5+AVOuAAAAAA=="
DESC_SIGNED_P2WSH_PSBT_UR_PSBT = UR(
- "crypto-psbt", PSBT(DESC_SIGNED_P2WSH_PSBT).to_cbor()
+ "crypto-psbt", Types.psbt_to_cbor(DESC_SIGNED_P2WSH_PSBT)
)
# Nested Segwit Multisig
@@ -130,14 +131,14 @@ def tdata(mocker):
P2SH_P2WSH_PSBT_B43 = "7ZB23D47D0SL*Y69MFM-Y64LVJD48X$9XZO1J/-L0B.624*OS$T6-RL6--2HB:BJ/CZLFHQ8XWAXNB5UZ91+Y*/SV.4J:VE$J9MMCCOVW$EB6++CJ.X-O8OJ$TSAWI8W38*U:08G+2NKH*CCZRGY0ZABPJ3ESQ6VFNNSDNEYC8KG/QX8R72LXF*4Z+8373D*LLYIOUH+LKJKP5LM+2ZOXD05+G2-H-ZL5N585FA7BF9SYRFRX:U59MND9DEKQ13CKD7+M9TA*3/UP$IIY/9MSQKFLAOQ71UC98XLJ2DP+YP0+-WRV.9CNTV2/X/*1+VQK2:Z0MPT$1H$I:RS1T3.+072$4EWIC:.C0QK4M7JA:HE19Q$9H3U.APAPQN$K7$A6.G6S*K.X2NAAARU5E1-$SOXU3D$$AFF-CF9QMXU4UDF.*7:2DV5P+J$59J8P$4I.FII$FK0U/S6LV$B9.ZG73BC57G77:.03T7B1A1IB6S8-Z:93C$GZO.Q+O/ZSEFG9TRQWACXPPA1KDTTAS4WDT9*/J72B+U52S2ER58Y93VQ4SEQ:X54CW4-8*YXIRZVPV6EOHRE:F.EFUU4LQO+3ZOX706F+GJ2AP+UIEB*XY$*9Z4Q0S3JC1+9J07AA21I3$S8:V0EOY$F$XO/T9PDFY*0D+3YSJW7QVTOT6KID::3F.3:K1-S*243V53H+W.$Y3:C$V8.7GMF7BDZST:7D$C$6AKI3BUVNR2.0Q+BPVC2-I/TUN93WBXM495N8T.7PRSSCZM1M1ZJU.W+G-Z94JK69UVKJI.Q8$WV2MGZENWV26NR14GD83GKE5UTMANK+/X4+CJI*6UI63UEDVN3-FY5R2-B$3JD1SY3+:0ELB/IPL4LM8R$W2*:+.G1PX6X.I-4:CY.TP-Q7XN3.PHRD://U+-LJ6LI9QB477PKMJWT.GS7RC*DLCKE4KW4PL4NP$90:LJHR*5-52JV$DCHL33QBPCQVUO:Z5U+U+XALJ.:AJV+ZBD:JFB+0V:5TZ:GEBFSNTQJOPIGBL6QSG9QLINU3*928744+NWR3NV90670ZN7*V1ET5:A:DUSFHCR64YBKVESO$Q5TYD/QR3$N9Z.ZS09+L*.7UWBVXG63TFA33CNGX0:T+VVTG-Y-H:6Y9OX79R6COJJ:A00PO/8I/UIA2*E+ILV/6/C29QHJL05HINPAJZEMYVZNUVSB5TZT0*GWRMYT*W95M:GO0.NE*/S9EU86IS.M/1DO9DP41HA8-BI.XK6VCPEPX3LAAW*842PZ+8/889ODKLRE2PHP0HY9GB3Q6Y74NYHFI:1XHPGURQ+6YLRLCB5OW9/XLDORE6ZC-AQO++I71AWR0FXHAOF0WCY:JWXONP:L*Y7Z-6I6PSF0V-D87MYD:9W2LS8CU8YCVOT978VUB:6JA:/5U+70JM-I5T+RHHF-3FA+IBPVUBKVZV11.+SN71G7X3:L+RV-79GTG$3QAYAVR2F24/-M0FG2DVJ$4RGHRT55RQHVJ5JVS+H3:0+B1YSX57Y94/Z0-+Z07B4-M0BZREBSGUXZU+IL1C59B5QRAR:6BG9+2J.MIJJ5GJT6*2R1D5Z2.H*$L09W$0KLP4C/HIQ$D8AQS*K8:DGKSISC:LW.BR:JSCV+2EVOFAP.O+WOV6P1DMUQX3LYG/3KXK"
P2SH_P2WSH_PSBT_B58 = "iKPPtgBuDNJvZAkJsisSSKkAar78K5TV6Yt41d6teHVeAnqMdnN9j6cd3vgbKtuVYUFg6QJ6RyqarHnqd6jkYSxZxFPimGq9LG4BDffByiQnRkSzTm9CGVK5XYMP1U5REj1PVebpKoQrgXJyWdjautuAVrpkuAhUm7aHDYj5fYBVzqVRJ8GWpJrY3ZzhMNXLdej9UT3DhBHRf8ATeCZrn5JK3CKSkwTjF7Q97DqwjjSDnx9x8NX5v9UcWJyLnxc9Sj5TJDfBQ2MAjFgCd7fFXBxYbavLnhgfjjzades8wgAVxqMJSSN7tbhQacqu1FxVXLBxZsueHK6e4w2o7z3CGUYqJh53TN3KFENTyRh55HrnsAiBy9Kvnho3E4ey141PToTD3uShXef1s3kKKGhgUtYXmoCMqZshuce3wxjJP6A2Kzn6r9kcEXtNbrXEArnuihJ1bq2dS58Kg55WuwmXLZqMFwXTxj96Ds3hjeG8pJMpBKvUNRuJyPUUKPTtGAHUEsDzVL7kzcBLKdHiG8qPgS5PQHUW7jkik32BrHrDsvHK1t6SBLF8PKpdkZjPo6Pad4p7uS3vyXkV3bvucpjcR2jq4kmj1p5y73cUKFiopBujFRUTfX5dzU96KXZK5tkiWVcUF9hRvmaEfSKwfvVN5B7ThQrZkuMdKoB5VHAie3LrqEyzduJbwcA2ErTGCjArkJxY2YH9KeostknMwNn83C843L38nxqh2UXgd9CGgG57tvPg2BHqBd7pWXfbHCvazHao5i3M1QesrhDvW4tteabJjRQqsEaxiumg8R5J7ByRgxZFBgGQnU6PH8VkNQCVPBWpAdm4XCpccgFsSkbB1VaYJCfXF1qVCDvC9HZ2VfJCKwHvmagZ6hTeoxx1M4nh51tNeJEGSZahTxnWsF49me35MNXBS3agEQ42RACSgDUdPvCveyK2yUqnX5Ka4A5fMznqEZDhFQsfMrude688TKLyqtc4KfVXSDjZgK2xdpt8BsXHM77mA1vynDSkAps9L7qnPwx4UaGimG8XESSHBQSvyxE7U6j3UZiDLtuWeSwJMcjzEUAKuVhAAYAdv6qQkjwueHMPNifpgpoahUqhphExtzxsQujpsNAiYg5U3RqfbWQ77appzjFmGmvKrC8vXyGMzwM11Fve5ac8CKPssfjxeeZ53ufpCdgbLFLd7AVSA3HHhUpiEyuRVnhL5BGtQCvz1MvpbcNYyBwAZ6uRxnhjMmbxTnZ5qiyJEdmssTxZxhV5cYjZtngQun27QffbMqMvB83zrJKcr6SrahWmGabjXULdJVqqqbaY5KWsq5jFBh6B4FMR6zhxYj742d32zHWJWf4PwEQ1HdHZKiQgYrUKE5Rys2XKRSMK9AvYxEcMRTvW2Zhv4uDeDNS1ESsFQcS3ZR1kmZV8ZXzEfQFcXUa5dyjfYyoAXqkJZP8LcdjrUmWjdHezcn1CPJ4pf8zNirSufggFYhRbFkahK4rx9QzD2T4qCT5ygabSqUZHXgqnAxsHmoSD6w4oH7BrH55trHjRChXCVhs4qoU34s"
P2SH_P2WSH_PSBT_B64 = "cHNidP8BAHICAAAAAR30J629i3Y/R8woRpLQ9JUa31rKxyM+Ny4NEsme48GWAAAAAAD9////Atw5XQUAAAAAF6kUdSESczdYagEyToVUSXyT8VTNz+OHgJaYAAAAAAAWABTmav7/w4OOcfCiewfjsA7eaujhYAAAAABPAQQ1h88EPmLffoAAAAHdXEj2dn8EYJ+rRdXEYu5laq6lJI5Mp+3t63ckwty05QKrJBNPewhwQaGPYRif6+XaxozFXvTXn7pU24H6fRy1FxQCCMt3MAAAgAEAAIAAAACAAQAAgE8BBDWHzwSdsdAAgAAAAeeOv56oeaaFTrNonMKDHk1C8brbWGFvdlecVue+v0/RAn/g4yI3oYsyen7OOcT7caYl4Mn7nQbyonHcusUR+GhzFCa7g8QwAACAAQAAgAAAAIABAACATwEENYfPBLrBSDmAAAABpzrb4oeEh2NNy/w/fr3osfyZTx7AaGDPAcP+LqeR3bYC5ioqmXPuazp69HwimlvecLylm9BLuyl/VpPXqiVrl20Uc8XaCjAAAIABAACAAAAAgAEAAIAAAQEgAOH1BQAAAAAXqRSv3gkn8731qcPbSDu4TJOlJJZ/PocBBCIAIOeiFBX5x0vX6CacrAUVovrs1DDCcKJS5qptFS3sjpDpAQVpUiECZ+pFYkOTVjB+eG+vQFA3MNjZWiA6DjRcs1Wl36A/zgMhA2Ygckuwjah29wiVRgA6wFx51+6ayrzeCIQ2eE4zfxPtIQOnUlBn22cn2CPCZkMSI6cDaZK2SlLV20rT6pqMoQCJsFOuIgYCZ+pFYkOTVjB+eG+vQFA3MNjZWiA6DjRcs1Wl36A/zgMcc8XaCjAAAIABAACAAAAAgAEAAIAAAAAAAAAAACIGA2Ygckuwjah29wiVRgA6wFx51+6ayrzeCIQ2eE4zfxPtHCa7g8QwAACAAQAAgAAAAIABAACAAAAAAAAAAAAiBgOnUlBn22cn2CPCZkMSI6cDaZK2SlLV20rT6pqMoQCJsBwCCMt3MAAAgAEAAIAAAACAAQAAgAAAAAAAAAAAAAEAIgAgZBwTq05RkpqKv6FV6LQjuM07Qv0/bYfWVc9NUQOFvwQBAWlSIQI32jVSdTgeu7+YZKrWfgOZ2J/LV36c5rBoApTzhrNlDCEC+hEqm3XmRt862AFFeyJ7p1m8A+V7czj6OajUNgCfg4EhA/MUVfxGh4k3Po3LB8CmMRsvIHcGNO0elUgETaITZA3UU64iAgI32jVSdTgeu7+YZKrWfgOZ2J/LV36c5rBoApTzhrNlDBwCCMt3MAAAgAEAAIAAAACAAQAAgAEAAAAAAAAAIgIC+hEqm3XmRt862AFFeyJ7p1m8A+V7czj6OajUNgCfg4EcJruDxDAAAIABAACAAAAAgAEAAIABAAAAAAAAACICA/MUVfxGh4k3Po3LB8CmMRsvIHcGNO0elUgETaITZA3UHHPF2gowAACAAQAAgAAAAIABAACAAQAAAAAAAAAAAA=="
- P2SH_P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(P2SH_P2WSH_PSBT).to_cbor())
+ P2SH_P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(P2SH_P2WSH_PSBT))
SIGNED_P2SH_P2WSH_PSBT = b"psbt\xff\x01\x00r\x02\x00\x00\x00\x01\x1d\xf4'\xad\xbd\x8bv?G\xcc(F\x92\xd0\xf4\x95\x1a\xdfZ\xca\xc7#>7.\r\x12\xc9\x9e\xe3\xc1\x96\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x02\xdc9]\x05\x00\x00\x00\x00\x17\xa9\x14u!\x12s7Xj\x012N\x85TI|\x93\xf1T\xcd\xcf\xe3\x87\x80\x96\x98\x00\x00\x00\x00\x00\x16\x00\x14\xe6j\xfe\xff\xc3\x83\x8eq\xf0\xa2{\x07\xe3\xb0\x0e\xdej\xe8\xe1`\x00\x00\x00\x00\x00\x01\x01 \x00\xe1\xf5\x05\x00\x00\x00\x00\x17\xa9\x14\xaf\xde\t'\xf3\xbd\xf5\xa9\xc3\xdbH;\xb8L\x93\xa5$\x96\x7f>\x87\"\x02\x02g\xeaEbC\x93V0~xo\xaf@P70\xd8\xd9Z :\x0e4\\\xb3U\xa5\xdf\xa0?\xce\x03G0D\x02 \x1f\xa0f\x1ct\xd6\xb9S\xbd\xc4\"\x0cY\x19\xe0\xe4p\xdc\xe8qR\xc8$\xf4Hf\xa6\x07\x8e\xda\x16b\x02 W;\xfb\xc0\xbaWo]/\xcc\xd8\xdb\xe8\xc85\xee\x9bx\x1c\xea\xba\xf4[vM\xac\xc2\x11\xae-G\xc7\x01\x01\x04\"\x00 \xe7\xa2\x14\x15\xf9\xc7K\xd7\xe8&\x9c\xac\x05\x15\xa2\xfa\xec\xd40\xc2p\xa2R\xe6\xaam\x15-\xec\x8e\x90\xe9\x01\x05iR!\x02g\xeaEbC\x93V0~xo\xaf@P70\xd8\xd9Z :\x0e4\\\xb3U\xa5\xdf\xa0?\xce\x03!\x03f rK\xb0\x8d\xa8v\xf7\x08\x95F\x00:\xc0\\y\xd7\xee\x9a\xca\xbc\xde\x08\x846xN3\x7f\x13\xed!\x03\xa7RPg\xdbg'\xd8#\xc2fC\x12#\xa7\x03i\x92\xb6JR\xd5\xdbJ\xd3\xea\x9a\x8c\xa1\x00\x89\xb0S\xae\x00\x00\x00"
SIGNED_P2SH_P2WSH_PSBT_B43 = "CLQSGDZJQB4QIYKX08*DIBD23JSA8U413ZNG9T3LLKAV.2DC.M8794QPU1:E4Z06VG/+F$UKCBSIQH3V:N++4QS1NS:YJ1Z.JQ*+3T6D6PX-:WY8SYCHKR2GYKWNO46W:E$J65W$Y:1L*W0P5AUI9W:*PFQ*LX*+M$-BPO6-T31GOZFN$GMQ5RIB3VUKGNK-DXJKC6I236.$ZOEXVHM*D6ZM9+6QCXPMLG.P6O6O/P/QGGUEP8BMD.14T4H.1HEOF2*QI1PF*R.386+U8NOCJ3UE30ME5W$R*3APP:44M-WYBCU53QI1QV/QPVWF.T0$6EVP-YRSGZB34L+UTZ83H*NRJAYG79SXZATFWO9$R4XM5.O0WMVQ.3-*84Z8QVF38:O:6-PAOOUYUF1HK*+VKPC*JL6OSR-TH*FEQRPN4-9P4R*RWILCM5A:Y$48G4*B60N*E48WUH7$Q5PM8BCKWV-7UB0P4+TNUXR*P+E8/9FS$C$BFBOBL0GEU+5TGLVO:+8D-$OBU92TC43:0P17WZ1MINZKXD$B8.2$/9Z$Z*K7:QASII2WDNX7TQB416Q-C$J.:4-QCUF0X$FG+NRRD0-ABQ+ZX280T"
SIGNED_P2SH_P2WSH_PSBT_B58 = "UHKpqoaYsQu3iUJNB2senWYdHBJvWXgfwPpJqqeAgk8xfULMYw45dxfzet7W38RH77S7DsUfemWVfASNVja4cwR3oN4233ve3Ma5tKQ3JoU9wLCkbRywAqepAah5sGDtx6QpS5G2w5ZYeVWjBdZ4obcNBQkT4umEjsALQfMwTHk31xivf9rmvQEizfP7geH6wufyXbMa3kg2h4c1CYE2eZC6tvcCKnHDJurq5yLfrhUSEjw8JpgSYxMiqmrMa8auJ25XQhpaPdcpYKXT9c7xhUNrTFuokHbfHiosxe8UMhRAHwmR2opgUBJvLq6ACokkn5UupGxrNmRSc1iJBBghokW1U9Wa9NtjiZLFcy86CS2wtt5UdtQ31BA3Capr5sBHER6vFLfVTqG6tdZ9LDaZmScBEzKsc6DRmhGGYFcGfaEBreiC6hvtHiN3xEFXS1DuJ4Xf6cE6QXit1q4vu1cMjhvnHV2LPTW8P6B696CXSa5FK4gn64FAn5G9WJNjJUfVuV3RHUgJwVXV83C2i5cXk2diUBFtDgzsboeqnh82GKKLkP5rjvBh"
SIGNED_P2SH_P2WSH_PSBT_B64 = "cHNidP8BAHICAAAAAR30J629i3Y/R8woRpLQ9JUa31rKxyM+Ny4NEsme48GWAAAAAAD9////Atw5XQUAAAAAF6kUdSESczdYagEyToVUSXyT8VTNz+OHgJaYAAAAAAAWABTmav7/w4OOcfCiewfjsA7eaujhYAAAAAAAAQEgAOH1BQAAAAAXqRSv3gkn8731qcPbSDu4TJOlJJZ/PociAgJn6kViQ5NWMH54b69AUDcw2NlaIDoONFyzVaXfoD/OA0cwRAIgH6BmHHTWuVO9xCIMWRng5HDc6HFSyCT0SGamB47aFmICIFc7+8C6V29dL8zY2+jINe6beBzquvRbdk2swhGuLUfHAQEEIgAg56IUFfnHS9foJpysBRWi+uzUMMJwolLmqm0VLeyOkOkBBWlSIQJn6kViQ5NWMH54b69AUDcw2NlaIDoONFyzVaXfoD/OAyEDZiByS7CNqHb3CJVGADrAXHnX7prKvN4IhDZ4TjN/E+0hA6dSUGfbZyfYI8JmQxIjpwNpkrZKUtXbStPqmoyhAImwU64AAAA="
SIGNED_P2SH_P2WSH_PSBT_UR_PSBT = UR(
- "crypto-psbt", PSBT(SIGNED_P2SH_P2WSH_PSBT).to_cbor()
+ "crypto-psbt", Types.psbt_to_cbor(SIGNED_P2SH_P2WSH_PSBT)
)
SIGNED_P2SH_P2WSH_PSBT_SD = b'psbt\xff\x01\x00r\x02\x00\x00\x00\x01\x1d\xf4\'\xad\xbd\x8bv?G\xcc(F\x92\xd0\xf4\x95\x1a\xdfZ\xca\xc7#>7.\r\x12\xc9\x9e\xe3\xc1\x96\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x02\xdc9]\x05\x00\x00\x00\x00\x17\xa9\x14u!\x12s7Xj\x012N\x85TI|\x93\xf1T\xcd\xcf\xe3\x87\x80\x96\x98\x00\x00\x00\x00\x00\x16\x00\x14\xe6j\xfe\xff\xc3\x83\x8eq\xf0\xa2{\x07\xe3\xb0\x0e\xdej\xe8\xe1`\x00\x00\x00\x00O\x01\x045\x87\xcf\x04>b\xdf~\x80\x00\x00\x01\xdd\\H\xf6v\x7f\x04`\x9f\xabE\xd5\xc4b\xeeej\xae\xa5$\x8eL\xa7\xed\xed\xebw$\xc2\xdc\xb4\xe5\x02\xab$\x13O{\x08pA\xa1\x8fa\x18\x9f\xeb\xe5\xda\xc6\x8c\xc5^\xf4\xd7\x9f\xbaT\xdb\x81\xfa}\x1c\xb5\x17\x14\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80O\x01\x045\x87\xcf\x04\x9d\xb1\xd0\x00\x80\x00\x00\x01\xe7\x8e\xbf\x9e\xa8y\xa6\x85N\xb3h\x9c\xc2\x83\x1eMB\xf1\xba\xdbXaovW\x9cV\xe7\xbe\xbfO\xd1\x02\x7f\xe0\xe3"7\xa1\x8b2z~\xce9\xc4\xfbq\xa6%\xe0\xc9\xfb\x9d\x06\xf2\xa2q\xdc\xba\xc5\x11\xf8hs\x14&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80O\x01\x045\x87\xcf\x04\xba\xc1H9\x80\x00\x00\x01\xa7:\xdb\xe2\x87\x84\x87cM\xcb\xfc?~\xbd\xe8\xb1\xfc\x99O\x1e\xc0h`\xcf\x01\xc3\xfe.\xa7\x91\xdd\xb6\x02\xe6**\x99s\xeek:z\xf4|"\x9a[\xdep\xbc\xa5\x9b\xd0K\xbb)\x7fV\x93\xd7\xaa%k\x97m\x14s\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80\x00\x01\x01 \x00\xe1\xf5\x05\x00\x00\x00\x00\x17\xa9\x14\xaf\xde\t\'\xf3\xbd\xf5\xa9\xc3\xdbH;\xb8L\x93\xa5$\x96\x7f>\x87"\x02\x02g\xeaEbC\x93V0~xo\xaf@P70\xd8\xd9Z :\x0e4\\\xb3U\xa5\xdf\xa0?\xce\x03G0D\x02 \x1f\xa0f\x1ct\xd6\xb9S\xbd\xc4"\x0cY\x19\xe0\xe4p\xdc\xe8qR\xc8$\xf4Hf\xa6\x07\x8e\xda\x16b\x02 W;\xfb\xc0\xbaWo]/\xcc\xd8\xdb\xe8\xc85\xee\x9bx\x1c\xea\xba\xf4[vM\xac\xc2\x11\xae-G\xc7\x01\x01\x04"\x00 \xe7\xa2\x14\x15\xf9\xc7K\xd7\xe8&\x9c\xac\x05\x15\xa2\xfa\xec\xd40\xc2p\xa2R\xe6\xaam\x15-\xec\x8e\x90\xe9\x01\x05iR!\x02g\xeaEbC\x93V0~xo\xaf@P70\xd8\xd9Z :\x0e4\\\xb3U\xa5\xdf\xa0?\xce\x03!\x03f rK\xb0\x8d\xa8v\xf7\x08\x95F\x00:\xc0\\y\xd7\xee\x9a\xca\xbc\xde\x08\x846xN3\x7f\x13\xed!\x03\xa7RPg\xdbg\'\xd8#\xc2fC\x12#\xa7\x03i\x92\xb6JR\xd5\xdbJ\xd3\xea\x9a\x8c\xa1\x00\x89\xb0S\xae"\x06\x02g\xeaEbC\x93V0~xo\xaf@P70\xd8\xd9Z :\x0e4\\\xb3U\xa5\xdf\xa0?\xce\x03\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00"\x06\x03f rK\xb0\x8d\xa8v\xf7\x08\x95F\x00:\xc0\\y\xd7\xee\x9a\xca\xbc\xde\x08\x846xN3\x7f\x13\xed\x1c&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00"\x06\x03\xa7RPg\xdbg\'\xd8#\xc2fC\x12#\xa7\x03i\x92\xb6JR\xd5\xdbJ\xd3\xea\x9a\x8c\xa1\x00\x89\xb0\x1c\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00"\x00 d\x1c\x13\xabNQ\x92\x9a\x8a\xbf\xa1U\xe8\xb4#\xb8\xcd;B\xfd?m\x87\xd6U\xcfMQ\x03\x85\xbf\x04\x01\x01iR!\x027\xda5Ru8\x1e\xbb\xbf\x98d\xaa\xd6~\x03\x99\xd8\x9f\xcbW~\x9c\xe6\xb0h\x02\x94\xf3\x86\xb3e\x0c!\x02\xfa\x11*\x9bu\xe6F\xdf:\xd8\x01E{"{\xa7Y\xbc\x03\xe5{s8\xfa9\xa8\xd46\x00\x9f\x83\x81!\x03\xf3\x14U\xfcF\x87\x897>\x8d\xcb\x07\xc0\xa61\x1b/ w\x064\xed\x1e\x95H\x04M\xa2\x13d\r\xd4S\xae"\x02\x027\xda5Ru8\x1e\xbb\xbf\x98d\xaa\xd6~\x03\x99\xd8\x9f\xcbW~\x9c\xe6\xb0h\x02\x94\xf3\x86\xb3e\x0c\x1c\x02\x08\xcbw0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00"\x02\x02\xfa\x11*\x9bu\xe6F\xdf:\xd8\x01E{"{\xa7Y\xbc\x03\xe5{s8\xfa9\xa8\xd46\x00\x9f\x83\x81\x1c&\xbb\x83\xc40\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00"\x02\x03\xf3\x14U\xfcF\x87\x897>\x8d\xcb\x07\xc0\xa61\x1b/ w\x064\xed\x1e\x95H\x04M\xa2\x13d\r\xd4\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x80\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00'
@@ -149,14 +150,14 @@ def tdata(mocker):
MINIS_P2WSH_PSBT_B43 = "75W:GGD-BWMM*4TP9NAF77L:6V/PUOLESPFPQKQ57CC5ELTGF:IWI89XQDFGV.VM2.-S*0PRBXHCPG8$52N:X.MU2Z29SS11P67*86UF8VKH05CL7GB5BRT:7O*VSFVEA$5Q0NHIQ+F+W2R.9LLY26K9IM*LWSAN3797LD8RP.1NPFJO:Q9Z+7TW.74-NW95D$6M1Q+FVC9PFF:LIL59I-PJYPPG6B58LYGOY.CC9X+DDN9*W1GQ02.3YDQT4H/3E.JV+ZSFC8P0Q8HV8BY7*VLG5RI/Z+301:T2G56ODNRAN$*RX:N$9YP1::D0*V96PZX7W/L3VI8UPP4ET:::ZJ4-F84FOTK7FP25:H+Y+2:48LLR-E74EHPB435$X1P6JZ**C*84Y8UIOVP*/VL:UG9ID2Q.66G$ON70V7KJ9K15ZMFMFEY3ADI0T7NEFT81AD8/1SIT5Y$ZZ3JB*AXVCPB3/0UAX8-D8M1SWD7L.I2-+JW8QPA$5J:6BNVZW1BIU4OUFJE131SX68GV/ZE6E:E.Y.6Q-JVPP.S2GDXNEXNR2GL4L+7I6X66CW3G1KUF6XL--5$AA74+R.-DC$0E5PHHB*CDN+Y-6*N66.T79*9N$1*9EGMWJSZGMKK7PBY-QF6Y-XRPIZ$$2*MVRG5*:DACDHHU/N725G:$OPTU8Q1XJH9C*0/TTPY67P-JM-432EC+1+TK:J4JGH24:*J:QFRE3VP.YF71.KLG-.9D-H6L+UZ4J3DFJK*BXPIWUKQUTGLKEY3XVXDEV+$PI0VH+NNQ1.QQ1LDVJO-OLA9H7*072I25H99+8745AWL2AET$Z:+USI*R$W+AH54B.D1YFO5421NGLTSQZ:+ZP2-YW*72YCB$E$F37$++9*X.BU/W1-M:OT0-19EW4ILXCD+0W*9$$ZUF49HX2BETK:9RC9XZZO2IKA.HQ9KSB2SPWM/NEJ3L9K++*0AZC*EIYQ0JD9V3C8J93HPLSG795DB$D:IJBQS.C4.LG-OCY0FOSGEB8O*VK*98LQVWMAXQNR/RUQDM5YJLMKNHAZ2VW$CZ5+93WJ4C.AH-*WISRKMN:SE.L*ZU/I9N2RR+71W:B0IQU2/5R6N.6W2TF+68.ZTPBOJZUL1FL*PA-J0/1L0-O.XDAG:65BS49/S933SNXT/4.*8Q779GOHHE8.53V39WKO1VE*.ZXV$$IMZG*WT6UI+A.72MH+-.8-LVOJHRKHOP:U69IG.H2WJ7:"
MINIS_P2WSH_PSBT_B58 = "8vsnQ1aCezSMDDvQnutdZoPfBE3jeAtaVyAaJ2MFA3okEUQwcUsgJKkSo97SQe8yns793CxoYrMB7yDs2UFGvLJP4xwFaod14K14By9ByDVkSvKhka27fTSJd5aU4arYaUugGDcYVACZR1ZdK5k2bAPtjneKhq6CU7cqV9mz3ZRHskKw4zonXfMPZkfcwPxoYoW83aj2YbNaCmLyLvKnX3oJuniExGkHnBGkxjLNYyiHMZ17eTCzwactEEjgnbgRtHFdQv8sYQf6r6jjZsZ8UeLbKYoR43TFg27nz9AGhNQvA4KSH7wAm1r5x2WQh6oae9pRVKfQFKxzRAdqoYA1DAjXtWbqDXZ5wxhqqrFxBtns8kGjGqjmgvJarjGkjrXjQ9YpQRtrU8fzkVjfD8yMRZ8m1xeznQ3G5XCYN9XDkXTJ9hmLiK1qhtvU7thTZ1rFeP9rGgJbbrV1KWdd7s6G1BZfacSzWapoMgKUBZurcTPH5GD7BmTug5VK8bmyvQzn7FDrLXGwdDzHiVcBqfbHFTHgPmemNYRgjFvHC3v6MMd2rim3TBWCTJmo38SHmR4nJuZUy1JqyLnHndN5yJo5uhTwL54r68ReUw5uj8yjXdbszWqWPm4uZ42uV3VC6pcfu87nbPubYue3VFEHcW579EMB4bQXb3PLsBRuqAkbWDKFpfUEvzfqbjSJSzPM6446BTFkDg1wqTinJSfbcuaMj5jGzNC2RRDTey6haNEM18nhPHWtpyfVyynKNAQbT6U4UVMGfK5P52V3U36VLmNVy2PCXciBPwsCYtPoiJ9LECz3K2n2o1xqttFeEkHrVXTeVBgCs2bBG1ithZeoyXPfxayuxNEKw2DpmoH4qBFYmKSSdz1SeRn1rHdiN1BQ4HijPXtbjKm6ak3QvNWtCsNdJGFbG8aUN8HHTxcLCRyfRpL1beDPUauVXQr76jZoQLUrV3Ep3LX27uf1tbLp7J4CV1KWuET4YPcV48dE1PMwCzJKqrt7o2ukNGHuXXdf8X2fp5Y56kGvddL3Bk96VKKxUXVd6serKdebyNcCnS7vUjov92ph1LvbZ8byDvYf6jAe43tdNmuhNcvAgY76CghBbJpfsC2TJbHXyTZWoML5vJNnEW1seG1Let6gQ6yLXt4ZPQodh"
MINIS_P2WSH_PSBT_B64 = "cHNidP8BAKgCAAAAAZZZFyTIyHAAHpgx4RTJClY3DBD/wvYtvHlQBWiIcZydAAAAAAD9////AyChBwAAAAAAFgAUVpExmvtni79DrSaMRaiKiM2NT2tAQg8AAAAAACIAIJ/v3lcOin2rUPE1jh1mzXq69rL7BIX/ddrN29OP3A3zq40HAAAAAAAiACDfZk57e1AVXMBz66RuW/0oR+hUhBOkRWLyvAnNpy8cagAAAAAAAQCiAgAAAAABAU8jn+rTqB80fFdKbj1CdOpWL99Sy8fOXvs6iNQCMGMmAQAAAAD9////AQZ5HgAAAAAAIgAgGtm2ZA4YoTas6xCsjIQq247clo23ri8+wy0TRq/dMwcBQD/YWe8kwsYxkM6iEcf+7RaaFH3JU+nFKXO/gFUX23DngDPpbNA4sqoTRJ3/5io1PLJZdUZ+T699wfAsNhxhPOQAAAAAAQErBnkeAAAAAAAiACAa2bZkDhihNqzrEKyMhCrbjtyWjbeuLz7DLRNGr90zBwEFRCEDaJVy4osP7anWmBwCN9nl3tv+wW3nFD9oCgLtXRWfdYesc2R2qRRQZtW0nWWtzkLdyI8F8UQ/7KmQioitA///ALJoIgYDLMRSZBc2IWvKWJwMwQE43VdzU3UzmLMSnBUa9H/5NpIcAui/8jAAAIABAACAAAAAgAIAAIAAAAAAAQAAACIGA2iVcuKLD+2p1pgcAjfZ5d7b/sFt5xQ/aAoC7V0Vn3WHHHPF2gowAACAAQAAgAAAAIACAACAAAAAAAEAAAAAACICAnEftmGVk/vJgt8Yn9ZQ0htivPcj0929eTfkCa5qm+oEHALov/IwAACAAQAAgAAAAIACAACAAAAAAAMAAAAiAgKxoTXVKpUeAQDixkzK2NmSWE0DUbnae31O4vHK0SaoBBxzxdoKMAAAgAEAAIAAAACAAgAAgAAAAAADAAAAACICAnxuOjHDK8ueogVkcyIpbFujaTY/E2747lrLIcj51R5QHALov/IwAACAAQAAgAAAAIACAACAAQAAAAEAAAAiAgL2bDCgfbz9YefFtvrPTmwn+Ue6+suz/A6igeAWfm6UjRxzxdoKMAAAgAEAAIAAAACAAgAAgAEAAAABAAAAAA=="
- MINIS_P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(MINIS_P2WSH_PSBT).to_cbor())
+ MINIS_P2WSH_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(MINIS_P2WSH_PSBT))
SIGNED_MINIS_P2WSH_PSBT = b'psbt\xff\x01\x00\xa8\x02\x00\x00\x00\x01\x96Y\x17$\xc8\xc8p\x00\x1e\x981\xe1\x14\xc9\nV7\x0c\x10\xff\xc2\xf6-\xbcyP\x05h\x88q\x9c\x9d\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x03 \xa1\x07\x00\x00\x00\x00\x00\x16\x00\x14V\x911\x9a\xfbg\x8b\xbfC\xad&\x8cE\xa8\x8a\x88\xcd\x8dOk@B\x0f\x00\x00\x00\x00\x00"\x00 \x9f\xef\xdeW\x0e\x8a}\xabP\xf15\x8e\x1df\xcdz\xba\xf6\xb2\xfb\x04\x85\xffu\xda\xcd\xdb\xd3\x8f\xdc\r\xf3\xab\x8d\x07\x00\x00\x00\x00\x00"\x00 \xdffN{{P\x15\\\xc0s\xeb\xa4n[\xfd(G\xe8T\x84\x13\xa4Eb\xf2\xbc\t\xcd\xa7/\x1cj\x00\x00\x00\x00\x00\x01\x00\xa2\x02\x00\x00\x00\x00\x01\x01O#\x9f\xea\xd3\xa8\x1f4|WJn=Bt\xeaV/\xdfR\xcb\xc7\xce^\xfb:\x88\xd4\x020c&\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x01\x06y\x1e\x00\x00\x00\x00\x00"\x00 \x1a\xd9\xb6d\x0e\x18\xa16\xac\xeb\x10\xac\x8c\x84*\xdb\x8e\xdc\x96\x8d\xb7\xae/>\xc3-\x13F\xaf\xdd3\x07\x01@?\xd8Y\xef$\xc2\xc61\x90\xce\xa2\x11\xc7\xfe\xed\x16\x9a\x14}\xc9S\xe9\xc5)s\xbf\x80U\x17\xdbp\xe7\x803\xe9l\xd08\xb2\xaa\x13D\x9d\xff\xe6*5<\xb2YuF~O\xaf}\xc1\xf0,6\x1ca<\xe4\x00\x00\x00\x00\x01\x01+\x06y\x1e\x00\x00\x00\x00\x00"\x00 \x1a\xd9\xb6d\x0e\x18\xa16\xac\xeb\x10\xac\x8c\x84*\xdb\x8e\xdc\x96\x8d\xb7\xae/>\xc3-\x13F\xaf\xdd3\x07"\x02\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87G0D\x02 +\xe4\x00\xa1\xcb\xf1\x87\x8b\xef\x07\x86\x89\x1aV\x99\x0b%3W\xfb\xe0v\xc2S\\\xaf\xc4T\x8ej\xe6p\x02 \x1d/\\\x9eS\x0e<\xff\xd0\x81UL\xd1\x15|\x1c}y\x8e?\xdc\xaa\xbc=6\xc1\xcc\x06ll\xca\xc9\x01\x01\x05D!\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87\xacsdv\xa9\x14Pf\xd5\xb4\x9de\xad\xceB\xdd\xc8\x8f\x05\xf1D?\xec\xa9\x90\x8a\x88\xad\x03\xff\xff\x00\xb2h\x00\x00\x00\x00'
SIGNED_MINIS_P2WSH_PSBT_B43 = "1TFBDGI0U9N.JNF9JXZO5QI.R..ULE3SYFCOR2+C/2/N6GRF$UFW0$ONNTH.6JYIB/NLQX6H4IPU+P+BHLUB-40/ZB8IK$01$$CS3:5K6MD5R-1U7Z4Y$4QON+B9T:L3$V1OWNAAAK9PHL6:J:1FEHNJ1OV74-I*KNUCQ6G*JGP0/JC:N3Q-X-2-3+OF-:B$--I1TX8X7N+8606XP01.OV1CGGZ2R6R9+Z-KX9ZQXH-LXX75-P43.X6TO44.ARWD85RI1WHNLD903+IAV2FV6T5//T1EM9HNP*1EYDKUZN3*$U8L944W3K*Y2N0N7:AW-M:X0:PZURT:+4:ZBVOZ3$1BKQGHG1DDP8T8YO:NI7.NBVUVPN2-0-4:STS*GJM28W+B-J/T+IJTK4U.OV+MFEYLOC012A22J+L/37BE+E7PZ-2.7F:-UY/E$ZN1ZC2+P7V5FS4CIPRTDAGGCB-XBGZ7.3T7929P8$VPZQSAPU4V8/8BAR:PP/IE+DP.YWW1HJW/3JPDXE.Z90.BN91FW1HQSUVQDHL46*UXBX2BL9T23HT7F.TBS3:86MGX/I8M:YD*:+JMS$WKPWB65.T36WJP1.7A7H*K03GCUW0KGLU-H*5C6Z/0P*LQY2CL$-.P7XC1XG0HQPJM.FKGOC6S3+3KLZX:XW79I.-*4G.S6A05R:YE*6AU*UHA89R$RV.XJX5OQH:9UGKJ0X-JQ2EUTP2TBB/2B6933J.CNJW6M711I2GG-S9*8NTM*ONCBIBQ3BR87.HP17HKP*1P6$8*WRDVWUXRYRMDD9B-OG0+CZ7L3SKK0W64SUVH1-TRP8N$:.F1+6BQ0"
SIGNED_MINIS_P2WSH_PSBT_B58 = "3UCmDenEJ8kw38Fft6J4JkeeDFYGE139af8mZigLkDsjrthMUBvRfHGs8vFUB8R4LP71PWpogqs6qnCbALrfbFCntEtFGPUNLR4WPrZAe1NCDVwGKHiJfBhxZidHBW2AzLStnJ5utyBZaWG1EjbiPbnhjVNymwy83FQjHjJNr6cqYf71efwP1QXqM33cT5SiFiFw2ANxSKyJxbvWkvVexKqc46fBBkbBnhnPzh5ycnjjNL8v6vx2yzigCPNpRs1xXrPWvdCKf6dFQbuDneqS4uFuUvR1eWv7DfWDVoMZaxvvttKAoUhEELibnSJFkuQoh4637PRbRaAL4EeyRnYP4mqiKEXvTbT4Dp2mYBvW28eZ1irrXkWsLhNyRyuE54NahJpd9vVfpBpa7U5EDRReN83xSaiboWNJ8dxc6UdGAkKqYmDu5RmPAxKYfmTWmA2s1o1WWpNchgaqkYPygMR1VyV8jrbNc8jnhfzGiH9Jo2Wjc8snnUPHY7mGXMmcgvtZtVQqBgMpqfgo1p5JP94LdiTrvu6fPxA9a8GpRw2hXBjeZd1BszHXcPeVWWx8LLkCAn5BiVmRG4RFh8pSfz4yQd5VDWGvrSepRnToPDQNPAYLbQCMKMgUPf3m2uRQtRRqf5t7wcwnSAdCzYVqKScZV3SRWZM2aNZD8fDnj4XKd6TJmmBTuxe51h3odc7fJWqZju2MuJQqAV4grSwE24xk478pyfXSN7Jg9f54MucGTeGFuVFYyiTkozkLjfaXY9mB6SpCBP5wo1R"
SIGNED_MINIS_P2WSH_PSBT_B64 = "cHNidP8BAKgCAAAAAZZZFyTIyHAAHpgx4RTJClY3DBD/wvYtvHlQBWiIcZydAAAAAAD9////AyChBwAAAAAAFgAUVpExmvtni79DrSaMRaiKiM2NT2tAQg8AAAAAACIAIJ/v3lcOin2rUPE1jh1mzXq69rL7BIX/ddrN29OP3A3zq40HAAAAAAAiACDfZk57e1AVXMBz66RuW/0oR+hUhBOkRWLyvAnNpy8cagAAAAAAAQCiAgAAAAABAU8jn+rTqB80fFdKbj1CdOpWL99Sy8fOXvs6iNQCMGMmAQAAAAD9////AQZ5HgAAAAAAIgAgGtm2ZA4YoTas6xCsjIQq247clo23ri8+wy0TRq/dMwcBQD/YWe8kwsYxkM6iEcf+7RaaFH3JU+nFKXO/gFUX23DngDPpbNA4sqoTRJ3/5io1PLJZdUZ+T699wfAsNhxhPOQAAAAAAQErBnkeAAAAAAAiACAa2bZkDhihNqzrEKyMhCrbjtyWjbeuLz7DLRNGr90zByICA2iVcuKLD+2p1pgcAjfZ5d7b/sFt5xQ/aAoC7V0Vn3WHRzBEAiAr5AChy/GHi+8HhokaVpkLJTNX++B2wlNcr8RUjmrmcAIgHS9cnlMOPP/QgVVM0RV8HH15jj/cqrw9NsHMBmxsyskBAQVEIQNolXLiiw/tqdaYHAI32eXe2/7BbecUP2gKAu1dFZ91h6xzZHapFFBm1bSdZa3OQt3IjwXxRD/sqZCKiK0D//8AsmgAAAAA"
SIGNED_MINIS_P2WSH_PSBT_UR_PSBT = UR(
- "crypto-psbt", PSBT(SIGNED_MINIS_P2WSH_PSBT).to_cbor()
+ "crypto-psbt", Types.psbt_to_cbor(SIGNED_MINIS_P2WSH_PSBT)
)
SIGNED_MINIS_P2WSH_PSBT_SD = b'psbt\xff\x01\x00\xa8\x02\x00\x00\x00\x01\x96Y\x17$\xc8\xc8p\x00\x1e\x981\xe1\x14\xc9\nV7\x0c\x10\xff\xc2\xf6-\xbcyP\x05h\x88q\x9c\x9d\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x03 \xa1\x07\x00\x00\x00\x00\x00\x16\x00\x14V\x911\x9a\xfbg\x8b\xbfC\xad&\x8cE\xa8\x8a\x88\xcd\x8dOk@B\x0f\x00\x00\x00\x00\x00"\x00 \x9f\xef\xdeW\x0e\x8a}\xabP\xf15\x8e\x1df\xcdz\xba\xf6\xb2\xfb\x04\x85\xffu\xda\xcd\xdb\xd3\x8f\xdc\r\xf3\xab\x8d\x07\x00\x00\x00\x00\x00"\x00 \xdffN{{P\x15\\\xc0s\xeb\xa4n[\xfd(G\xe8T\x84\x13\xa4Eb\xf2\xbc\t\xcd\xa7/\x1cj\x00\x00\x00\x00\x00\x01\x00\xa2\x02\x00\x00\x00\x00\x01\x01O#\x9f\xea\xd3\xa8\x1f4|WJn=Bt\xeaV/\xdfR\xcb\xc7\xce^\xfb:\x88\xd4\x020c&\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x01\x06y\x1e\x00\x00\x00\x00\x00"\x00 \x1a\xd9\xb6d\x0e\x18\xa16\xac\xeb\x10\xac\x8c\x84*\xdb\x8e\xdc\x96\x8d\xb7\xae/>\xc3-\x13F\xaf\xdd3\x07\x01@?\xd8Y\xef$\xc2\xc61\x90\xce\xa2\x11\xc7\xfe\xed\x16\x9a\x14}\xc9S\xe9\xc5)s\xbf\x80U\x17\xdbp\xe7\x803\xe9l\xd08\xb2\xaa\x13D\x9d\xff\xe6*5<\xb2YuF~O\xaf}\xc1\xf0,6\x1ca<\xe4\x00\x00\x00\x00\x01\x01+\x06y\x1e\x00\x00\x00\x00\x00"\x00 \x1a\xd9\xb6d\x0e\x18\xa16\xac\xeb\x10\xac\x8c\x84*\xdb\x8e\xdc\x96\x8d\xb7\xae/>\xc3-\x13F\xaf\xdd3\x07"\x02\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87G0D\x02 +\xe4\x00\xa1\xcb\xf1\x87\x8b\xef\x07\x86\x89\x1aV\x99\x0b%3W\xfb\xe0v\xc2S\\\xaf\xc4T\x8ej\xe6p\x02 \x1d/\\\x9eS\x0e<\xff\xd0\x81UL\xd1\x15|\x1c}y\x8e?\xdc\xaa\xbc=6\xc1\xcc\x06ll\xca\xc9\x01\x01\x05D!\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87\xacsdv\xa9\x14Pf\xd5\xb4\x9de\xad\xceB\xdd\xc8\x8f\x05\xf1D?\xec\xa9\x90\x8a\x88\xad\x03\xff\xff\x00\xb2h"\x06\x03,\xc4Rd\x176!k\xcaX\x9c\x0c\xc1\x018\xddWsSu3\x98\xb3\x12\x9c\x15\x1a\xf4\x7f\xf96\x92\x1c\x02\xe8\xbf\xf20\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x01\x00\x00\x00"\x06\x03h\x95r\xe2\x8b\x0f\xed\xa9\xd6\x98\x1c\x027\xd9\xe5\xde\xdb\xfe\xc1m\xe7\x14?h\n\x02\xed]\x15\x9fu\x87\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00"\x02\x02q\x1f\xb6a\x95\x93\xfb\xc9\x82\xdf\x18\x9f\xd6P\xd2\x1bb\xbc\xf7#\xd3\xdd\xbdy7\xe4\t\xaej\x9b\xea\x04\x1c\x02\xe8\xbf\xf20\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x03\x00\x00\x00"\x02\x02\xb1\xa15\xd5*\x95\x1e\x01\x00\xe2\xc6L\xca\xd8\xd9\x92XM\x03Q\xb9\xda{}N\xe2\xf1\xca\xd1&\xa8\x04\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x03\x00\x00\x00\x00"\x02\x02|n:1\xc3+\xcb\x9e\xa2\x05ds")l[\xa3i6?\x13n\xf8\xeeZ\xcb!\xc8\xf9\xd5\x1eP\x1c\x02\xe8\xbf\xf20\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x01\x00\x00\x00\x01\x00\x00\x00"\x02\x02\xf6l0\xa0}\xbc\xfda\xe7\xc5\xb6\xfa\xcfNl\'\xf9G\xba\xfa\xcb\xb3\xfc\x0e\xa2\x81\xe0\x16~n\x94\x8d\x1cs\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x01\x00\x00\x00\x01\x00\x00\x00\x00'
SIGNED_MINIS_P2WSH_PSBT_B64_SD = "cHNidP8BAKgCAAAAAZZZFyTIyHAAHpgx4RTJClY3DBD/wvYtvHlQBWiIcZydAAAAAAD9////AyChBwAAAAAAFgAUVpExmvtni79DrSaMRaiKiM2NT2tAQg8AAAAAACIAIJ/v3lcOin2rUPE1jh1mzXq69rL7BIX/ddrN29OP3A3zq40HAAAAAAAiACDfZk57e1AVXMBz66RuW/0oR+hUhBOkRWLyvAnNpy8cagAAAAAAAQCiAgAAAAABAU8jn+rTqB80fFdKbj1CdOpWL99Sy8fOXvs6iNQCMGMmAQAAAAD9////AQZ5HgAAAAAAIgAgGtm2ZA4YoTas6xCsjIQq247clo23ri8+wy0TRq/dMwcBQD/YWe8kwsYxkM6iEcf+7RaaFH3JU+nFKXO/gFUX23DngDPpbNA4sqoTRJ3/5io1PLJZdUZ+T699wfAsNhxhPOQAAAAAAQErBnkeAAAAAAAiACAa2bZkDhihNqzrEKyMhCrbjtyWjbeuLz7DLRNGr90zByICA2iVcuKLD+2p1pgcAjfZ5d7b/sFt5xQ/aAoC7V0Vn3WHRzBEAiAr5AChy/GHi+8HhokaVpkLJTNX++B2wlNcr8RUjmrmcAIgHS9cnlMOPP/QgVVM0RV8HH15jj/cqrw9NsHMBmxsyskBAQVEIQNolXLiiw/tqdaYHAI32eXe2/7BbecUP2gKAu1dFZ91h6xzZHapFFBm1bSdZa3OQt3IjwXxRD/sqZCKiK0D//8AsmgiBgMsxFJkFzYha8pYnAzBATjdV3NTdTOYsxKcFRr0f/k2khwC6L/yMAAAgAEAAIAAAACAAgAAgAAAAAABAAAAIgYDaJVy4osP7anWmBwCN9nl3tv+wW3nFD9oCgLtXRWfdYccc8XaCjAAAIABAACAAAAAgAIAAIAAAAAAAQAAAAAAIgICcR+2YZWT+8mC3xif1lDSG2K89yPT3b15N+QJrmqb6gQcAui/8jAAAIABAACAAAAAgAIAAIAAAAAAAwAAACICArGhNdUqlR4BAOLGTMrY2ZJYTQNRudp7fU7i8crRJqgEHHPF2gowAACAAQAAgAAAAIACAACAAAAAAAMAAAAAIgICfG46McMry56iBWRzIilsW6NpNj8TbvjuWsshyPnVHlAcAui/8jAAAIABAACAAAAAgAIAAIABAAAAAQAAACICAvZsMKB9vP1h58W2+s9ObCf5R7r6y7P8DqKB4BZ+bpSNHHPF2gowAACAAQAAgAAAAIACAACAAQAAAAEAAAAA"
@@ -170,14 +171,14 @@ def tdata(mocker):
MINIS_TR_PSBT_B43 = "C.ZHL9FPQGNRBX4AMRTEV*BIH.4L3ZH**OGKXMO2GFGP56LMHQJ-C+EVKTIKZQUT0SM+JBF9S/PTF$Y-1YCH+*ZD$6:$L5H5X5N*/5I-1CD7K0CN:ATQ0QSZRJI64B-6M/3GVU0D0TSGORS9JP:+:IOJERDBGFH-G/$C*HA7EIG81125R41B*11/*96/YZ8GE1*830+J19NCJIDAJ5D1JRAX2+Z-$-GPZ49RUSYH.IJ1E$Z2C$5XPIDKTMC:A7X/Q8EBPM.HG9*LAUZDHIM+GAJ/W-J5D/:NY8:A++I6YWHD97292:85NTU1B7/X0P.3L9OU:TF0AQPV6IC3IWR4D6Z163.S/C05PAABYKWF$.WFJTGI7/KD/0D52H3OYSIH5369MW8G+:NWBXW+*6N1QZZ*-6SNG3JJIF8K/$D4W1BT15VCTHHT$TA8J:.X.V/ZN1A9WJD1QRX1E.OX73Y1BMI5U6*6TUVK-DK64L563I/*F439WUVLDQU-IUQAAJHH+*$OUD73FY7DYJTBL*9BS/12F/B5TEPDI1QQFLPP*Q6/RH2UK1U.TINN7XS:$Q2ZNGPRUZLGW/9ZI+$8AHVGTH86ZUYE9GA$0IQ-1*Y$11/J$DTO78H$VU4L4*SB59O1YDP4MZA5U*JZ7QB7:V4C321JC/1D309MEKMWT5--2N1OLQG63/BAF$8TOGVILJ8Q5JYIS0M652TE:QA6LN$FRVPQE*BXCPFP50SNO6*OHTG.R+G7KAGO:.JXA/U7MSM6DU5MQ3IVW$UJHI4RI2Z/.OZIIGUX3+MZT.ZJH/5Q.27YVSU0V3I1$9CV-.+*9.FGHDJWJTMNPZA4VK0TIVDVNL+/.A-/UQVPALKZ93+C5VY839JHJK5CPK*J:W7F:Q6T*1UYDW65WZG:$9P3ONB7SRMHXQ1LIB40TH+7/PFU:FY1CV7ZHG6-.3SJ:6Y5HHVGT1JZ/5-XAYLF1$2LO6$SGG1WQ677LWIP1:ML/BQX1HR1$V*+X//TEGE-SFTJ3/RYHH*$$W+66WLAGH6PCQB-56/DS:B7DCIXDV34S.ZI*FC*+KRV5D8V2KL2Z$K*-X/2M1CW+WQG0PXPHSZ66Y7:1KIW19+R2.68$.65*F/89.:EXFYXW54TK*9$77Y-OIBH7H+++TEEW9AEN+SYFPM.BOVRB+KZ$UC:$BNBNH8*TJDLSQ:IJFRZ:BHW969+Y0468-PXBJ6$V/2ZZ9J+/1PPW03QCO4I89GZ1BQY9QD2AMD85//O+-MQK66Q-EDFYRYQ20L$JO3M.*JYZ$TM2F202TZICVC7FQC-:HQRI7L2-5MC5W8S2P+CRPC4.:7DT5/Z7FWUN$7JPDGTRBD3BBV59KL.9EWJ9RF:AM/EWI4FT8O7CR7L82N+7FV9CXQ-Z7UL$W$QDWAOBP+7G1X+K4GTSN6C6Y+Q48HDN9ZAH-A/VHYW43-9S/CC$W.T.15/HP-4883MZGFEYXORA6R17E+XU*UUJH"
MINIS_TR_PSBT_B58 = "4U4YPeYHn8UsQ7XVsTRqLuoxaMQ8rhJsySbuRmzDdWziE1usHZu3cCA4rMpTKgF4dgauY6yGLhVQrz9jf2AF3LmW56uE5mPyCaxkW6GNWGY68jQUSE1Mf6VEdLT3BcA3HjspQGwk6FpRx6x7xYbonv3dU1CsWfp9YPDhqjfWipSCVf8H8YaaV7BwBeA9y9WyxUQjQ5oXHMyLPtCT2bryTj4G2J5QQCyUzvE9pKsn49rPMrXbVexjFPMWFG2XNxNs6uwrD4o4twbpBjohs3FiU2sgW96JzQ1PgBHN9TNLVmikHKsg4cgCfGKEmbWmN5Rmo1wHbqNmV77rR9txQxYMArfvmADbziQqEomVwi1sYjLysfRGdYe7dSe8uH2734aFyFs8oaRQx3ms8jRjnMYJpez3PyZa87NE3zAAwTNiEw6QJ2VgdgY3X1YAofvys2n9Qtt2ve6ehPCsCQvzbJe1MihCV8QAzc8t8LCJNcLcW87ZxMkoNdtJoszdhkZguoFs6xpFneS7VX4M3mzhxPtMz98i1z9eNQKKq1o8tWQHWt9znaMHsaLMtcDdaXXCHKQAdqvpWDWEtXgHy2J5T7jgzFMhreoDBkR3SAkr6D6fmdoNdHr6QPD1MFKP6RN97HC5tc4K1wNpyNTPHWNqLDAuakaKT85mNGX7Kk92suRG3vw6gqAQ1rvKUCWMe8GF4dzX5pCGuQiY1s3gq1pprApWiGKzEwDrvFL9XadKQpJGWHCTkKCaQVCt94ZT2ZtwkghMhaQ45ofehjU9RVE7gtnC64gCvrupg7zXAihGwxfqYPVfaiTyC4NaPU4CzKDDGwi133pV4W6RKYf2BBx4zJqEwwQSJFbPE1Y4fcfL2Zy9xe3p1v7HTp7H3h62uPBVDaRHWHnsmw2oAPdYVGFLbs3YyZKFpnMZCzvhLcF4BjoVdDe7nusjWfnZQx3ZN1fayr6hD8FZR2UzV8E8A9zV8GivvViHaQoSNygyQasGzLjgqYkYpcAykW8QvucGvjJWJdLRk8azXeGFmzzgCZxe1nY4MpSSTmZHpvEV15uLVuDvDHruBUzE2A5HEiaZUrQTJr4gUipK7Y9PATw3J1nencUT99noPJTFA5Kbq7P3rd8k8ruGswuYesuS91chmEW8ssEAhtTVpGmrY4oGrbuLo6F3EXntmLX6p6UKpuWCg8XgZWRdePnC5KcJc2AiKtBBVzu2dXFZgTyrkzpQkYBkHTvz6P4bM6oUBinwVBitt29GAME5M4Q8ZwkiFaW3iyLD9DqLVBxDiaEBeF8y9GRqNq6Q3gYTdgDERWF6fFmieDm3Wxz83fM9i6KFwjvPnLkkJeJFh3AkBPLiMmVPXwYCxFfQp2DefU72sb7nQu2GesYtYazB"
MINIS_TR_PSBT_B64 = "cHNidP8BALQCAAAAAV1wmxLC1I2zhBvb/xz9D47r6Lj1KCL0xr1jqS3yTIX/AAAAAAD9////A0BCDwAAAAAAIgAgGtm2ZA4YoTas6xCsjIQq247clo23ri8+wy0TRq/dMwcgoQcAAAAAACJRIECbDgsZc6aw71iJhjnT+24fhkwwaQcBeQzAKLfYAyKH3YgHAAAAAAAiUSBb9VQQXYabMAChLSgfclyBxe/EyI9CbdVU55TeBJFyUgAAAAAAAQEr73MeAAAAAAAiUSCKMs95fYJ22tHaq0FOis38SPVg352JZymPeaMp80ThwyIVwLGhNdUqlR4BAOLGTMrY2ZJYTQNRudp7fU7i8crRJqgEJSBxH7ZhlZP7yYLfGJ/WUNIbYrz3I9PdvXk35AmuapvqBK1WssAhFnEftmGVk/vJgt8Yn9ZQ0htivPcj0929eTfkCa5qm+oEPQH3BXv7e9eze4jSTr+PgvfiuCLkXs7bSOlAeCPQqaBnWALov/IwAACAAQAAgAAAAIACAACAAAAAAAMAAAAhFrGhNdUqlR4BAOLGTMrY2ZJYTQNRudp7fU7i8crRJqgEHQBzxdoKMAAAgAEAAIAAAACAAgAAgAAAAAADAAAAARcgsaE11SqVHgEA4sZMytjZklhNA1G52nt9TuLxytEmqAQBGCD3BXv7e9eze4jSTr+PgvfiuCLkXs7bSOlAeCPQqaBnWAAAAQUgCltZwSHuuC9ETlRoJyrNYv9NHUH8NLxR5mwpUS+4ousBBicAwCQgNCGNnpQXkylYa9f6nYj1HGwVeZN1xflZXOoQv2wj1IOtVrIhBwpbWcEh7rgvRE5UaCcqzWL/TR1B/DS8UeZsKVEvuKLrHQBzxdoKMAAAgAEAAIAAAACAAgAAgAAAAAAFAAAAIQc0IY2elBeTKVhr1/qdiPUcbBV5k3XF+Vlc6hC/bCPUgz0B+HPJ7BJ6Q0eyE8RsiTNNmOTI053J2hH40RD+MpDWZP0C6L/yMAAAgAEAAIAAAACAAgAAgAAAAAAFAAAAAAEFIPZsMKB9vP1h58W2+s9ObCf5R7r6y7P8DqKB4BZ+bpSNAQYnAMAkIHxuOjHDK8ueogVkcyIpbFujaTY/E2747lrLIcj51R5QrVayIQd8bjoxwyvLnqIFZHMiKWxbo2k2PxNu+O5ayyHI+dUeUD0Bv3zqft7M8nIO0b3NAPbE7MAFN+VV/xm4ztwJx+a3OlQC6L/yMAAAgAEAAIAAAACAAgAAgAEAAAABAAAAIQf2bDCgfbz9YefFtvrPTmwn+Ue6+suz/A6igeAWfm6UjR0Ac8XaCjAAAIABAACAAAAAgAIAAIABAAAAAQAAAAA="
- MINIS_TR_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(MINIS_TR_PSBT).to_cbor())
+ MINIS_TR_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(MINIS_TR_PSBT))
IN_KEY_SIGNED_MINIS_TR_PSBT = b'psbt\xff\x01\x00\xb4\x02\x00\x00\x00\x01]p\x9b\x12\xc2\xd4\x8d\xb3\x84\x1b\xdb\xff\x1c\xfd\x0f\x8e\xeb\xe8\xb8\xf5("\xf4\xc6\xbdc\xa9-\xf2L\x85\xff\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x03@B\x0f\x00\x00\x00\x00\x00"\x00 \x1a\xd9\xb6d\x0e\x18\xa16\xac\xeb\x10\xac\x8c\x84*\xdb\x8e\xdc\x96\x8d\xb7\xae/>\xc3-\x13F\xaf\xdd3\x07 \xa1\x07\x00\x00\x00\x00\x00"Q @\x9b\x0e\x0b\x19s\xa6\xb0\xefX\x89\x869\xd3\xfbn\x1f\x86L0i\x07\x01y\x0c\xc0(\xb7\xd8\x03"\x87\xdd\x88\x07\x00\x00\x00\x00\x00"Q [\xf5T\x10]\x86\x9b0\x00\xa1-(\x1fr\\\x81\xc5\xef\xc4\xc8\x8fBm\xd5T\xe7\x94\xde\x04\x91rR\x00\x00\x00\x00\x00\x01\x01+\xefs\x1e\x00\x00\x00\x00\x00"Q \x8a2\xcfy}\x82v\xda\xd1\xda\xabAN\x8a\xcd\xfcH\xf5`\xdf\x9d\x89g)\x8fy\xa3)\xf3D\xe1\xc3\x01\x08B\x01@Q3\x98\xe4[\xd0}HM\x86\x00H\xb4\xa0\x16\xb19\xc3-\x13F\xaf\xdd3\x07 \xa1\x07\x00\x00\x00\x00\x00"Q @\x9b\x0e\x0b\x19s\xa6\xb0\xefX\x89\x869\xd3\xfbn\x1f\x86L0i\x07\x01y\x0c\xc0(\xb7\xd8\x03"\x87\xdd\x88\x07\x00\x00\x00\x00\x00"Q [\xf5T\x10]\x86\x9b0\x00\xa1-(\x1fr\\\x81\xc5\xef\xc4\xc8\x8fBm\xd5T\xe7\x94\xde\x04\x91rR\x00\x00\x00\x00\x00\x01\x01+\xefs\x1e\x00\x00\x00\x00\x00"Q \x8a2\xcfy}\x82v\xda\xd1\xda\xabAN\x8a\xcd\xfcH\xf5`\xdf\x9d\x89g)\x8fy\xa3)\xf3D\xe1\xc3\x01\x08B\x01@Q3\x98\xe4[\xd0}HM\x86\x00H\xb4\xa0\x16\xb19\xc3-\x13F\xaf\xdd3\x07 \xa1\x07\x00\x00\x00\x00\x00"Q @\x9b\x0e\x0b\x19s\xa6\xb0\xefX\x89\x869\xd3\xfbn\x1f\x86L0i\x07\x01y\x0c\xc0(\xb7\xd8\x03"\x87\xdd\x88\x07\x00\x00\x00\x00\x00"Q [\xf5T\x10]\x86\x9b0\x00\xa1-(\x1fr\\\x81\xc5\xef\xc4\xc8\x8fBm\xd5T\xe7\x94\xde\x04\x91rR\x00\x00\x00\x00\x00\x01\x01+\xefs\x1e\x00\x00\x00\x00\x00"Q \x8a2\xcfy}\x82v\xda\xd1\xda\xabAN\x8a\xcd\xfcH\xf5`\xdf\x9d\x89g)\x8fy\xa3)\xf3D\xe1\xc3A\x14q\x1f\xb6a\x95\x93\xfb\xc9\x82\xdf\x18\x9f\xd6P\xd2\x1bb\xbc\xf7#\xd3\xdd\xbdy7\xe4\t\xaej\x9b\xea\x04\xf7\x05{\xfb{\xd7\xb3{\x88\xd2N\xbf\x8f\x82\xf7\xe2\xb8"\xe4^\xce\xdbH\xe9@x#\xd0\xa9\xa0gX@\xe0\xf3\n\xf0\x1b;\xf6\xde\x1d@X\xc0o\xe1s`\xea\xe2\x0bJ(\xbc4\xc1H\xa9%\xd7`q\xddC\x8b\xd3\xcd\xeb\x1d\xcc"w\x93\xcbj\x02[hW\xf0\xcd\xbc3>\xd3S\xf0a\xce\xfd\x92\x14\\\x9e\x1a\x17\x00\x00\x00\x00'
TAP_TREE_SIGNED_RECOV_PSBT_B43 = "2ZMQXUW070H/C$O912IUP38PY-B:Y$-RMWPWCEVH4INJ0O18-TBJ48CZOD$TWI4I/NE8VN6KM12$5ZSVRTAG309P5CUJ2C2//V/10X86GODPB2R6A.-1F03RUUBF1+7YE8I/JYD4EB9C+U2E*ECO6IS/FAIE8CSCDLXC3$O$N*WQ9M1R*V*AKQ0$1T9RPNVBEVDGRPOJH8W.+6WV5M8.F3BOON/VSH39A5Z17$:50YW8.QS+AO7ZR.:RO*PD-DZPBFCDLJY*9QV/+BT1W9PT7JQ0XX81B::I9YOOIUKCJ$V*39Q$GYUKV887917VA-S7U1*4RHVHP64V$L6+Y0Y-S-8MTY99L*VA*$C*IA1YRVZ.A85M07KQF:CUR1RYODG6IXQHI*J/LWU$I46Y*6OIR*B40O-0+7U6.B:..O*YZZHA-*UAKA3J.DJBUP9ZYOV34+9K4-5R074W7NP$ZSXH*YL1B0YFUBQSLB:LE*K7UM.$L-8L759$8R/A8NZQLYMHBAAK/Y8MDL.17RIOJE4$:QD+N4HTN3BOL+"
TAP_TREE_SIGNED_RECOV_PSBT_B58 = "2SudmehyNb1LkDuASe1chZCVpPJRP43zF2Ub1pehVv1WnSr4xckuEfFbCXCeSVuL2r43s6voxZbf4k8JeqvVwsVseK557UvqnpJ45Nts2vs274zxo1Pw1kEpZcKsMpsnaxp1rscFNrorxYGBQFBa3phYf39obkfjBcdTFuH724TJp95dPy3m66uegpNzCbWd3UnGbdXmALngVxMtZf26T4jEJrthxXZCDgQMM3ucGuYoVU1qdsGVCKvYo9NawBmRHsQGxxbEAdVkjDShJMMcpH9TpyVo8QUq28MNAMQYiBGFTTNGtm1iuQ118Tu37YAzCMtsEFL18hWNGjVGLPzednoie9iwxUrmm1fvHuxoZnjeop6h5aEJkksqZZESo8AYJXwVnv2NGvUn3KDMrRpEwWNp5m3Uj61UEeLWxav5kbf86x1rKukjpqA2GJBf3GqDvXHDf8EVoGTcNW7aAc3Edccd5dA4sy2QwfX2Ht1RHsfgVSWVRgfjZNUJGo"
TAP_TREE_SIGNED_RECOV_PSBT_B64 = "cHNidP8BALQCAAAAAV1wmxLC1I2zhBvb/xz9D47r6Lj1KCL0xr1jqS3yTIX/AAAAAAD9////A0BCDwAAAAAAIgAgGtm2ZA4YoTas6xCsjIQq247clo23ri8+wy0TRq/dMwcgoQcAAAAAACJRIECbDgsZc6aw71iJhjnT+24fhkwwaQcBeQzAKLfYAyKH3YgHAAAAAAAiUSBb9VQQXYabMAChLSgfclyBxe/EyI9CbdVU55TeBJFyUgAAAAAAAQEr73MeAAAAAAAiUSCKMs95fYJ22tHaq0FOis38SPVg352JZymPeaMp80Thw0EUcR+2YZWT+8mC3xif1lDSG2K89yPT3b15N+QJrmqb6gT3BXv7e9eze4jSTr+PgvfiuCLkXs7bSOlAeCPQqaBnWEDg8wrwGzv23h1AWMBv4XNg6uILSii8NMFIqSXXYHHdQ4vTzesdzCJ3k8tqAltoV/DNvDM+01PwYc79khRcnhoXAAAAAA=="
TAP_TREE_SIGNED_RECOV_PSBT_UR_PSBT = UR(
- "crypto-psbt", PSBT(TAP_TREE_SIGNED_RECOV_PSBT).to_cbor()
+ "crypto-psbt", Types.psbt_to_cbor(TAP_TREE_SIGNED_RECOV_PSBT)
)
TAP_TREE_SIGNED_RECOV_PSBT_SD = b'psbt\xff\x01\x00\xb4\x02\x00\x00\x00\x01]p\x9b\x12\xc2\xd4\x8d\xb3\x84\x1b\xdb\xff\x1c\xfd\x0f\x8e\xeb\xe8\xb8\xf5("\xf4\xc6\xbdc\xa9-\xf2L\x85\xff\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x03@B\x0f\x00\x00\x00\x00\x00"\x00 \x1a\xd9\xb6d\x0e\x18\xa16\xac\xeb\x10\xac\x8c\x84*\xdb\x8e\xdc\x96\x8d\xb7\xae/>\xc3-\x13F\xaf\xdd3\x07 \xa1\x07\x00\x00\x00\x00\x00"Q @\x9b\x0e\x0b\x19s\xa6\xb0\xefX\x89\x869\xd3\xfbn\x1f\x86L0i\x07\x01y\x0c\xc0(\xb7\xd8\x03"\x87\xdd\x88\x07\x00\x00\x00\x00\x00"Q [\xf5T\x10]\x86\x9b0\x00\xa1-(\x1fr\\\x81\xc5\xef\xc4\xc8\x8fBm\xd5T\xe7\x94\xde\x04\x91rR\x00\x00\x00\x00\x00\x01\x01+\xefs\x1e\x00\x00\x00\x00\x00"Q \x8a2\xcfy}\x82v\xda\xd1\xda\xabAN\x8a\xcd\xfcH\xf5`\xdf\x9d\x89g)\x8fy\xa3)\xf3D\xe1\xc3A\x14q\x1f\xb6a\x95\x93\xfb\xc9\x82\xdf\x18\x9f\xd6P\xd2\x1bb\xbc\xf7#\xd3\xdd\xbdy7\xe4\t\xaej\x9b\xea\x04\xf7\x05{\xfb{\xd7\xb3{\x88\xd2N\xbf\x8f\x82\xf7\xe2\xb8"\xe4^\xce\xdbH\xe9@x#\xd0\xa9\xa0gX@\xe0\xf3\n\xf0\x1b;\xf6\xde\x1d@X\xc0o\xe1s`\xea\xe2\x0bJ(\xbc4\xc1H\xa9%\xd7`q\xddC\x8b\xd3\xcd\xeb\x1d\xcc"w\x93\xcbj\x02[hW\xf0\xcd\xbc3>\xd3S\xf0a\xce\xfd\x92\x14\\\x9e\x1a\x17"\x15\xc0\xb1\xa15\xd5*\x95\x1e\x01\x00\xe2\xc6L\xca\xd8\xd9\x92XM\x03Q\xb9\xda{}N\xe2\xf1\xca\xd1&\xa8\x04% q\x1f\xb6a\x95\x93\xfb\xc9\x82\xdf\x18\x9f\xd6P\xd2\x1bb\xbc\xf7#\xd3\xdd\xbdy7\xe4\t\xaej\x9b\xea\x04\xadV\xb2\xc0!\x16q\x1f\xb6a\x95\x93\xfb\xc9\x82\xdf\x18\x9f\xd6P\xd2\x1bb\xbc\xf7#\xd3\xdd\xbdy7\xe4\t\xaej\x9b\xea\x04=\x01\xf7\x05{\xfb{\xd7\xb3{\x88\xd2N\xbf\x8f\x82\xf7\xe2\xb8"\xe4^\xce\xdbH\xe9@x#\xd0\xa9\xa0gX\x02\xe8\xbf\xf20\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x03\x00\x00\x00!\x16\xb1\xa15\xd5*\x95\x1e\x01\x00\xe2\xc6L\xca\xd8\xd9\x92XM\x03Q\xb9\xda{}N\xe2\xf1\xca\xd1&\xa8\x04\x1d\x00s\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x03\x00\x00\x00\x01\x17 \xb1\xa15\xd5*\x95\x1e\x01\x00\xe2\xc6L\xca\xd8\xd9\x92XM\x03Q\xb9\xda{}N\xe2\xf1\xca\xd1&\xa8\x04\x01\x18 \xf7\x05{\xfb{\xd7\xb3{\x88\xd2N\xbf\x8f\x82\xf7\xe2\xb8"\xe4^\xce\xdbH\xe9@x#\xd0\xa9\xa0gX\x00\x00\x01\x05 \n[Y\xc1!\xee\xb8/DNTh\'*\xcdb\xffM\x1dA\xfc4\xbcQ\xe6l)Q/\xb8\xa2\xeb!\x07\n[Y\xc1!\xee\xb8/DNTh\'*\xcdb\xffM\x1dA\xfc4\xbcQ\xe6l)Q/\xb8\xa2\xeb\x1d\x00s\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x05\x00\x00\x00!\x074!\x8d\x9e\x94\x17\x93)Xk\xd7\xfa\x9d\x88\xf5\x1cl\x15y\x93u\xc5\xf9Y\\\xea\x10\xbfl#\xd4\x83=\x01\xf8s\xc9\xec\x12zCG\xb2\x13\xc4l\x893M\x98\xe4\xc8\xd3\x9d\xc9\xda\x11\xf8\xd1\x10\xfe2\x90\xd6d\xfd\x02\xe8\xbf\xf20\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x00\x00\x00\x00\x05\x00\x00\x00\x01\x06\'\x00\xc0$ 4!\x8d\x9e\x94\x17\x93)Xk\xd7\xfa\x9d\x88\xf5\x1cl\x15y\x93u\xc5\xf9Y\\\xea\x10\xbfl#\xd4\x83\xadV\xb2\x00\x01\x05 \xf6l0\xa0}\xbc\xfda\xe7\xc5\xb6\xfa\xcfNl\'\xf9G\xba\xfa\xcb\xb3\xfc\x0e\xa2\x81\xe0\x16~n\x94\x8d!\x07|n:1\xc3+\xcb\x9e\xa2\x05ds")l[\xa3i6?\x13n\xf8\xeeZ\xcb!\xc8\xf9\xd5\x1eP=\x01\xbf|\xea~\xde\xcc\xf2r\x0e\xd1\xbd\xcd\x00\xf6\xc4\xec\xc0\x057\xe5U\xff\x19\xb8\xce\xdc\t\xc7\xe6\xb7:T\x02\xe8\xbf\xf20\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x01\x00\x00\x00\x01\x00\x00\x00!\x07\xf6l0\xa0}\xbc\xfda\xe7\xc5\xb6\xfa\xcfNl\'\xf9G\xba\xfa\xcb\xb3\xfc\x0e\xa2\x81\xe0\x16~n\x94\x8d\x1d\x00s\xc5\xda\n0\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x02\x00\x00\x80\x01\x00\x00\x00\x01\x00\x00\x00\x01\x06\'\x00\xc0$ |n:1\xc3+\xcb\x9e\xa2\x05ds")l[\xa3i6?\x13n\xf8\xeeZ\xcb!\xc8\xf9\xd5\x1eP\xadV\xb2\x00'
TAP_TREE_SIGNED_RECOV_PSBT_B64_SD = "cHNidP8BALQCAAAAAV1wmxLC1I2zhBvb/xz9D47r6Lj1KCL0xr1jqS3yTIX/AAAAAAD9////A0BCDwAAAAAAIgAgGtm2ZA4YoTas6xCsjIQq247clo23ri8+wy0TRq/dMwcgoQcAAAAAACJRIECbDgsZc6aw71iJhjnT+24fhkwwaQcBeQzAKLfYAyKH3YgHAAAAAAAiUSBb9VQQXYabMAChLSgfclyBxe/EyI9CbdVU55TeBJFyUgAAAAAAAQEr73MeAAAAAAAiUSCKMs95fYJ22tHaq0FOis38SPVg352JZymPeaMp80Thw0EUcR+2YZWT+8mC3xif1lDSG2K89yPT3b15N+QJrmqb6gT3BXv7e9eze4jSTr+PgvfiuCLkXs7bSOlAeCPQqaBnWEDg8wrwGzv23h1AWMBv4XNg6uILSii8NMFIqSXXYHHdQ4vTzesdzCJ3k8tqAltoV/DNvDM+01PwYc79khRcnhoXIhXAsaE11SqVHgEA4sZMytjZklhNA1G52nt9TuLxytEmqAQlIHEftmGVk/vJgt8Yn9ZQ0htivPcj0929eTfkCa5qm+oErVaywCEWcR+2YZWT+8mC3xif1lDSG2K89yPT3b15N+QJrmqb6gQ9AfcFe/t717N7iNJOv4+C9+K4IuRezttI6UB4I9CpoGdYAui/8jAAAIABAACAAAAAgAIAAIAAAAAAAwAAACEWsaE11SqVHgEA4sZMytjZklhNA1G52nt9TuLxytEmqAQdAHPF2gowAACAAQAAgAAAAIACAACAAAAAAAMAAAABFyCxoTXVKpUeAQDixkzK2NmSWE0DUbnae31O4vHK0SaoBAEYIPcFe/t717N7iNJOv4+C9+K4IuRezttI6UB4I9CpoGdYAAABBSAKW1nBIe64L0ROVGgnKs1i/00dQfw0vFHmbClRL7ii6yEHCltZwSHuuC9ETlRoJyrNYv9NHUH8NLxR5mwpUS+4ousdAHPF2gowAACAAQAAgAAAAIACAACAAAAAAAUAAAAhBzQhjZ6UF5MpWGvX+p2I9RxsFXmTdcX5WVzqEL9sI9SDPQH4c8nsEnpDR7ITxGyJM02Y5MjTncnaEfjREP4ykNZk/QLov/IwAACAAQAAgAAAAIACAACAAAAAAAUAAAABBicAwCQgNCGNnpQXkylYa9f6nYj1HGwVeZN1xflZXOoQv2wj1IOtVrIAAQUg9mwwoH28/WHnxbb6z05sJ/lHuvrLs/wOooHgFn5ulI0hB3xuOjHDK8ueogVkcyIpbFujaTY/E2747lrLIcj51R5QPQG/fOp+3szycg7Rvc0A9sTswAU35VX/GbjO3AnH5rc6VALov/IwAACAAQAAgAAAAIACAACAAQAAAAEAAAAhB/ZsMKB9vP1h58W2+s9ObCf5R7r6y7P8DqKB4BZ+bpSNHQBzxdoKMAAAgAEAAIAAAACAAgAAgAEAAAABAAAAAQYnAMAkIHxuOjHDK8ueogVkcyIpbFujaTY/E2747lrLIcj51R5QrVayAA=="
@@ -206,14 +207,14 @@ def tdata(mocker):
EXP_TR_MINIS_PSBT_B43 = "2+0M:*ILDQYN:FA2VEHKQ63OAENOFWPYRKA*/JXTUAIUQ/F8V2P2U/15CPXZPC6MRDM.5RR+:VRHCBI025RT8KUSR9$/1EQ8D5D86BQ+.QA9+$Y*FQI-AJW4HB2Y57BDE$X.-9R:/1B-BW-3S.UOYDMI/WOLJJ+VTCQECQ3+C91G5K7OSR96Q8.-Z+ZA66E96RJ5YT2*5:RB9-TBJ9F4ENHEK77//P*86FSM26G1S74HJ2$9UBSY+RAB9VP/3VSK1M3MUZCLBPRQSH7A4S3LC42ZEU7X93UKAWD$QDXK:T41-NVGQ0-5/U48574QI.ZFB5CO.7UJH+..EXQXU/OM--F4G*+$JCNBVC+Y4:--YJWJ9Y1Y3-0OL*FSCWB$ZVRKF-0M/Z4XXLJLJ6AILVQF$9YJ/1W$OF.T.AVK6+USK:0B60TLHJ:*1R*:*QPF48KP*RTXJQG84I*7NB7D8NF:X0MA9W9Z$C45G2D:8TREV59ZLC3G5FP8ZG-F-EFFEXGHBRAI+GLHU6Q+L50ZW.PR0GI/6/E72/81W::WJ+:Q9C89GCPM6AG7L0MWTN4L/EQJ:QP8UJ.TNQ4-.$1:X48$H-$E.MJ1DUT+T.CGEX1USNNC.TI+W+-L3U78GO:T:9R:/6YJ-B4TI2Y$.R2HA313-7GRAZ+YER6D4ZH5UX.FNCKJ2-N--M-4G0RF953GKW-MW3MVG0SOUIQC:DLLSNL588NFE4HKRMGJJ/NU4PFUOY+*ZB-4+P4PU*HLL*15K05LTH41+W6N547WSD:$FU9PAI68WUOVRQ7DRS09+YK$:KSV+*JX:P.45NIP/AM:ZLA1N/.K0$:N-MP+I.N89WCW*8-F7:KQQ*DNDSTQC$*H6CVCE.4*G+729:W9M-F1CTDP28R6DWH.JKNJGTYZVUWOKR684S4WHTTH*I1:G4TSB$DSVSM/T*ZAM3T9Q*NKWGKZL7UA3.SQ6A2IIZRADHA*SMASAWHEVU:RO9DB7NA65LOY5.$VU2.YI7WG0RKAFSUS.CTKM/.9EJ:0SSP1VNQX5$97HM1D6P*I4N$B$S$BB4HDU4C:MD89N6EPYRPPS4:GYR9TN9E96UJRW*EU4H$D6DC*.0J9P+H.+BRYGM$0SZI0-6W/X6UKPG8H-/QC$74-4K:C1JXTO.7QTOY24KE*E:-Q1.P3XSM$FAAM*Y6B6LTAS1VQJMI8YKI6.DE1338V$F$S/.IPP75$$VFW+MG1A:FXLMVD.Q73Z5MULV$QGJ5JY/0050-::MULH.+A.2LEMW92W8/*X+UN.5TBEPW9.-01G6T4U:L4:H6U30*WR4ZMBM6VJ6Q7OVWV1JK4U$R11IFLG:6PUHKNYEIXV+60UTL4NTGN$8GRUV2D5R+K/9OBO3IORN44L-7JJ-O7HNN*IE-IGAR*WUCKU5SCU9*0+*JP$4V/J9O.I6E4VX9WMMP+0-R6SFAJ+NJ2RDKDH4N:DQB8:.FYN3IK9/:WPH1TS-NVAHAUTWJXK6X7*5Y5C2V4N.199-4QSQT/B7ZYX16YF9PAV4DWKJT*1UGZUPNTJK/OC-01WFY35IY/BC02OTZ8QP.4L2KWQSTN+PIDQ*SYDH-1C9UQ-.G8YPM1O/8I92DOB/951U44D4QK4BXZBW/I+H4+PBUOJCC280BGUN5VI525F$0S:4G6M7CNB8ZNZDJ7:IKRH5+XZW*.2ZE6..PWJW178/3GL925KDR40T+6-XPJD9CEF1GQ6FXM:+Y.0:/WM:WGTRR.IEBA$QF963K445ME8NFRZ8//QWCU7S93R68*T*88UMYSTZSAS0FT89XRV-4N+Q0:XT2-0HU5+QG0S3DZ:2M9:1D2.V-16:G$BMDID6K.DXQ4CQZ4QACIIP.L$KLG9VLIK-HHV4N0PXP1XG07DAHSW07RXUQURG*/IS3$RB+X.W0-LRV3M90KE/E/K1CH$$JRGPEW*$50+X.93JN:S5RWT4NMO17ZSX25MGS71*2S*0HFFPM8SW4.CXNJAQW/UX-.8CA6HOI2:HGBT5V/H3R238:X97NBZJSWF/-8$FDRKRMVZFOQVQE5QYCV:151S-NY3$7Q:GTRDAB3Z$5M-R1$38GLLW8P$S47LRZB5RVQQVUY.$P2PLWZA8FBIM2WRPM*D34XCFC05$HX6EHM4F5QUP*$HOWGAY9IK-GC31.A23*NTPN1XR5Y$B*RP40P+X6ANI8KRQ-TY7$Z46/I.LRC55ZNV8J:QCN.B1M7B8/7:YNO410WAFGJ*8GD-0+XB:680J812L0:81$NPKW/.T37QMOAD$7G9GKWL2TMG6DOKZA-MK8+8SPZ$VOQTKG/7SZXLJK1L8$9SZ84RAI8K18G4BT.FDS$XA-G/Y584/39ETKU4LF5I7X0*X:/LLU.*:URSF:A18F/-3:4/QYS1V/K:8V+*F3QP*2Q7JI/+NHFZTDB/9W0NBJXUC8I3+X177NBS2.WDD1DQLWLC/Y:OITJ:F4-ZE0WXOWSQCJ/CZ$RU$SMIKL*.4X6D-9PSRR34NSOU.7LSXAQNEN5AYMFR*J*I.5$O3X.8.JVPZS$+Q73DBMD4Y5EIT3LAHJWRLWU+4$SJ88AAA.JNUPW.WIBI7JRL9C./MO*V:CAWRZ4/OH8X653SP*6ED:ZR25NGP-WQ6PM:/HKP0Z:1G+$-9.1:O$P9E2.4K.PN*Y//3U$5ORFNV29T6IV-CI/NP9/LHGSI+NQXSIO78UXEZT3XSX/0G7Z54/XE$V-1S5D*4KP/$IQ.E23.*XR/8$HK5-6Z+J3DYJTXG3IOSVWP$K1JQH-P2MZYS/GTEI03QTIP2RWM6I1EV3-W7NM*ZKN38KGG/CGNH/-CYGR$KVNLT9J$CB1$6ETSX$-HN4QQVV2TH.YW5S4/CBUR3Y-T0EBP::$D44YA$I**ZMM3/E*OXV:MX40067BGFKC*WUEV3Z7Q:CA*OYR2MKRY8OO.7.VQGEFWBIIQ2L7NTDBN+9BA3$7XPB:KYZV/GSLM:7LYI6C0V4AGCD*YKXXW*6C/DK0PB+-N1998D7JTP4J28ZGG*M/VV1F$FPCZ.3BN61OKD17+NU7ZYF$-03:EIGPJ*7U0-YH/5FJ.D/MRMFL+//JDKDOY.6SU$1IPF1CHDMA3FV.9B-VFC0$QMQDLRW05-VBTSP6PJSVOMUVZIS5N9$J*37$NC97ZLJ$C0B$SJ93$IGWDR6-/-ACZHS5WA97AW$3-H:DWA$MIZ190-7*G/LF9$J*CBRW51BXL4NBATDC55P++ZZYRG-K0WAAM5+9*LN9JV+CE2H313TA6F.XC6.:X-K++B.TZ3J+WV8O/R-CK1:L:9C38J0YL5LZ.GG797RO3XLZ$DEVLW69URIG*ML7-3NQHQXABICL9OXWT2$9+OK8Q+GTVC4Y*ELJK29EH1QEWVCC$UGZWFO8W9X7JOEH4W21WKJPL1U:93ZM+T0YHU8$O9B*LOOD$D:JVSV.OFPQ:YYXTSCO/GOY.XSM44RH8+Y.3HII7J7OH6FVM:WMPH0Q+1Z:44+DN.FF$2CZ*HSE15DIRCH3$H*JHPT6R:LH7$B:MBJG418TNRL7D/C6-Q1UTGZJMI-.-E:DX6439.RXYL+QSMCE3EQ849Q-:G4:O/D9LQ7Y-7PSZ7+MKI-4JBF:P7KV$U*JLRO4VXEAJYW/H75PKER$H2B7O:I-IW9-GM.MXJAZ$YXXO0L9FWCI8QOE0$9M4:M5GO6O5QQ/7:RA+HBDJCUCYNRUOE9*-ATGTTVNV4YLNU6M0EWECTAVJZ6YPJNYWOWE5F+KCHHNUC+93I+DM*2XHL-LPJFC6VO97MB$EQ3EAC:3+8C.HV48LLM0R8XXFF78PYOGF-V7JMP:W+6$OE7Q9B13GEL7PRZ4L/Y8T4GXKY:7FL2I2RMG5A+"
EXP_TR_MINIS_PSBT_B58 = "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"
EXP_TR_MINIS_PSBT_B64 = "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"
- EXP_TR_MINIS_PSBT_UR_PSBT = UR("crypto-psbt", PSBT(EXP_TR_MINIS_PSBT).to_cbor())
+ EXP_TR_MINIS_PSBT_UR_PSBT = UR("crypto-psbt", Types.psbt_to_cbor(EXP_TR_MINIS_PSBT))
SIGNED_EXP_TR_MINIS_PSBT = b'psbt\xff\x01\x00\xb4\x02\x00\x00\x00\x01\x7f\xca\x84\x9d\xd9\x85\xd8s\xa9Lz\xbd\x95\x05b\x1f<\xb1\xf3\x01:\x05j\xcda;\xc1\x8d\x88G\\\xf1\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x03 \xa1\x07\x00\x00\x00\x00\x00"Q \x87\\?;;\x80\x10\xc0\xfe\x06\xe3\xdc\xcbj\xed\x00\xc4\x9a\r\x91?\x8d\xc3\x1a\xb1\xda%;\ne\x8a\x82@B\x0f\x00\x00\x00\x00\x00"Q \x8a2\xcfy}\x82v\xda\xd1\xda\xabAN\x8a\xcd\xfcH\xf5`\xdf\x9d\x89g)\x8fy\xa3)\xf3D\xe1\xc3\xda\x81\x07\x00\x00\x00\x00\x00"Q \x12Z\xa5\xd2\xc5\x8bR\xc8~\xbd\x8d\xbb\x1dK\r,\xea\x10\xf2\x16G\x98\x90g<\x88\xa4\x0cP\'\xff:\x00\x00\x00\x00\x00\x01\x01+\xe5n\x1e\x00\x00\x00\x00\x00"Q S+\x82\x18\xb4|S\xa2\xf3\x15\xb1RH\xd0\xc3\x1d\xde)\xb3\xe2\xd6M\r\xeaP\xdb\xce\xae\x13g\xf5\xfbA\x14R\xb1/\x9c\xc6\xcd5\x8b\x97\xfa\xa0\xf1\xd0\x92F\xe3&\xe1\x1d\x07o`\x0e\xa7pns\xb7\xc8\xf3\xde@f\x8b\x87\x96I\x17\xe7\xaa\xc8y\xeb\x97\xf9GSX:\xf5+\x11eJ\x9bx\x18x\xaa\x1ax\xb8\x1d\xe9R\x0e\xe2jK\x8e\xadr\xcd\xc5VV\x1f\t\x11\xad\xcf\x93\x00\x00\x00\x00'
SIGNED_EXP_TR_MINIS_PSBT_B43 = "4TT$EW2BC750K0.EQ*OESR*TGYF.-DD/LNKXNKCH-6XECST3IQQE+:F6.Y/0JLF7F+GJN5RT*NFF:IV5+NZPT63T2:7-N/5Z67XO/QU*-Y5A/*5HX89U7DJWQ0I-6YIYT15-50EHV:4HD0T5J+M:FBO80S+V8R.NKPC86Y:EM/J8WSHFX$S$IQD.Q0/GQHLNY$R8$MRS6V*Y5VE6TMNMZU4$$AL/0P1*0VIWH:F5SI/UIRS46O64DL:VURGAY39L/FWKSPR9FWE6I43KBC27/1GSJN+FXOX*:Q3O-6BYTXWK5Z93Y3979VKYOP8VE/EQ6XUV14$J06O.NMPACBX/N.2-V+ODBBY-R8.6NPDSYJ:/XX0RWZ2:*P.BRF+9C*XQT.LBNN-DVA7.Q14LGOOENSM/I6$43M5271UL/Q+HM.-9-HV2:4Q6+WMP*IOWFIN.CA0ZR/414P7Y8$J41RYF11YMQ8.+8CFL:*W43S$DBC$JHKG8G*8UW*QTJ9R:JR42.W0DZ2RUW+MWIJ/YG6:XVR8V$594TU0QO0PDG-AAFEA+S/1ONG*05SNXP29T34$:-0OMFMUL:ZN330:GFKIT9RVMO$FT+Y8/*1C9JTU61R5661+-.WZ.U/8F9F:9ECFSHWS4$Z4-T*NK1LYPB1P7JJ8MJYD/6L+8.+/RZ6JGM$14Q$AA+*G29W$3.7OZMAH$HYVXUC9$NLMLYXG1352L..SF-+F-Q573B7*"
SIGNED_EXP_TR_MINIS_PSBT_B58 = "yBmUhxPER5LACMorWNH5G7qrTgLkwgd6sudwBgzFT78eurc9c2xwb7bhjyY7codASWJZsTU7tAAo51pgQMghHf64iBgA4V18jHKvEUSV9c47uTVoug7uZsx6DxcSSCnduUrh9L5oxoScPMkBR2dUjkEJYL9tJfZdtfztPy8m2MP587kj375NhNu3vHPb5mNrDaLtLC2rh5DZ6cASa4Vt1taRtpGLquwJE9NPQ7V6eEYvhpagxZvCvErNQZaSnhQQ3hgbHQgwQegmHehkXpVLTV3NqLh3uEWUosqNNhZesCRP9BTwp41dGETHi2Ksz8YRmjnyoFrL8g6xrX4j4YCMxkmf2tXY1XCPdMaLPJAmKu9f8o9MdJQrzHJCi6VuuvkfBKG6R9MAAPPkWE1Prj3GicD4aU7wWmo8A7eRZPpHbxwWxC3DMgveT4XPsGpe3MyMkzs6yG3Wfi3v5ae47oLhQuKexbwzDHtcNcNYsocS3d1fEAMW3SshGYpBzSY5YJiPX2JUZJ3Hr7QchnZmvAh37LAJRHHWELufq3xHpkGaWUExomR26eVFWyMwLjvpgUGxkuET9u4ByTwx1SWbygqmmtUsv15yLcnuoeuGVJr6KutdoWRShLdUDYQ8iHXgxSWFfMre75Ac6Ko9xzaarwKvGPcSxjtA18ZbyHyeP7xoYumZ"
SIGNED_EXP_TR_MINIS_PSBT_B64 = "cHNidP8BALQCAAAAAX/KhJ3ZhdhzqUx6vZUFYh88sfMBOgVqzWE7wY2IR1zxAAAAAAD9////AyChBwAAAAAAIlEgh1w/OzuAEMD+BuPcy2rtAMSaDZE/jcMasdolOwplioJAQg8AAAAAACJRIIoyz3l9gnba0dqrQU6KzfxI9WDfnYlnKY95oynzROHD2oEHAAAAAAAiUSASWqXSxYtSyH69jbsdSw0s6hDyFkeYkGc8iKQMUCf/OgAAAAAAAQEr5W4eAAAAAAAiUSBTK4IYtHxTovMVsVJI0MMd3imz4tZNDepQ286uE2f1+0EUUrEvnMbNNYuX+qDx0JJG4ybhHQdvYA6ncG5ztzxuEmXLToX/NmN8axrk+UvWU+drbTU4piY9m8SD4Zj49o39ekAEPMhGIog5xZmlR/87j90YTVZHO88f0V0WMzSkuEQaCJIKMU7q3c2GlpaAAl5XfyPGc7RMcLICj014xRR2efeGQRRolXLiiw/tqdaYHAI32eXe2/7BbecUP2gKAu1dFZ91h1e7ZIMQ2OzUSBPaEsAhalhjV3AIb1wvXmo/GDKFVcSpQPk6R2pV+yQ5qD7I895AZouHlkkX56rIeeuX+UdTWDr1KxFlSpt4GHiqGni4HelSDuJqS46tcs3FVlYfCRGtz5MAAAAA"
SIGNED_EXP_TR_MINIS_PSBT_UR_PSBT = UR(
- "crypto-psbt", PSBT(SIGNED_EXP_TR_MINIS_PSBT).to_cbor()
+ "crypto-psbt", Types.psbt_to_cbor(SIGNED_EXP_TR_MINIS_PSBT)
)
SIGNED_EXP_TR_MINIS_PSBT_SD = b'psbt\xff\x01\x00\xb4\x02\x00\x00\x00\x01\x7f\xca\x84\x9d\xd9\x85\xd8s\xa9Lz\xbd\x95\x05b\x1f<\xb1\xf3\x01:\x05j\xcda;\xc1\x8d\x88G\\\xf1\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x03 \xa1\x07\x00\x00\x00\x00\x00"Q \x87\\?;;\x80\x10\xc0\xfe\x06\xe3\xdc\xcbj\xed\x00\xc4\x9a\r\x91?\x8d\xc3\x1a\xb1\xda%;\ne\x8a\x82@B\x0f\x00\x00\x00\x00\x00"Q \x8a2\xcfy}\x82v\xda\xd1\xda\xabAN\x8a\xcd\xfcH\xf5`\xdf\x9d\x89g)\x8fy\xa3)\xf3D\xe1\xc3\xda\x81\x07\x00\x00\x00\x00\x00"Q \x12Z\xa5\xd2\xc5\x8bR\xc8~\xbd\x8d\xbb\x1dK\r,\xea\x10\xf2\x16G\x98\x90g<\x88\xa4\x0cP\'\xff:\x00\x00\x00\x00\x00\x01\x01+\xe5n\x1e\x00\x00\x00\x00\x00"Q S+\x82\x18\xb4|S\xa2\xf3\x15\xb1RH\xd0\xc3\x1d\xde)\xb3\xe2\xd6M\r\xeaP\xdb\xce\xae\x13g\xf5\xfbA\x14R\xb1/\x9c\xc6\xcd5\x8b\x97\xfa\xa0\xf1\xd0\x92F\xe3&\xe1\x1d\x07o`\x0e\xa7pns\xb7\xc8\xf3\xde@f\x8b\x87\x96I\x17\xe7\xaa\xc8y\xeb\x97\xf9GSX:\xf5+\x11eJ\x9bx\x18x\xaa\x1ax\xb8\x1d\xe9R\x0e\xe2jK\x8e\xadr\xcd\xc5VV\x1f\t\x11\xad\xcf\x93B\x15\xc1\x12\x97\x80=D@o\x05S\xab\xcbu\x93h\xb7\xb05\r\xa3\xa6!\x04[G\x8dtVX\x87\xaan\x99W\xbbd\x83\x10\xd8\xec\xd4H\x13\xda\x12\xc0!jXcWp\x08o\\/^j?\x182\x85U\xc4\xa9k R\xb1/\x9c\xc6\xcd5\x8b\x97\xfa\xa0\xf1\xd0\x92F\xe3&\xe1\x1d\x07o`\x0e\xa7pns\xb7\xffe\xaa \x9d\x02\x15\xe7=p\x90]\xc1hlX\x0b+\x00O\x01\x045\x87\xcf\x03\xdb\xde\xe7\x1b\x80\x00\x00\x00\xb3*S\x0b\x7f\xb7\xf7\xdb\x7fB\x9fcO\xa6\xf4%-P\xc6L\xea\xbd\xb5\xeaB\x97\xe4\x1e\x94\xf8\xae\x16\x02`\x9c%\xeaeN\x82\xec=\xf7\xd8wV\xb3\xc9"A\xe7i\xa7U\xfeoaw\x1e$Y\x00\xbb\x18\xa1\x10e\xfbC\xfeT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x01\x01\x1f\x10\'\x00\x00\x00\x00\x00\x00\x16\x00\x14I\x8cM\xa5\x8c\xbb\x9cZi\x88\xb82\xde\xb33l\xf4BT\xa0\x01\x03\x04\x01\x00\x00\x00"\x06\x03\xed\x17\xfd\x05\xafk\xcdQ\xf8\xddl\xf77\xac\x13j\xfa\x00h\x1f\xb2\xa9\xc3\xf5||\xad\xe8J\xf8\x1fa\x18e\xfbC\xfeT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00'
TEST_DATA_BBQR_MULTI = b"psbt\xff\x01\x00\xc3\x02\x00\x00\x00\x03/#\xc5\xf6C##\xcb\x1b\x1e\x8e\x11-E\x00 \xdb*\xfa\x10\x1e\xd1N\xdea'm\x99J\xba\x96*\n\x00\x00\x00\x00\xfd\xff\xff\xff\xd2h\x80v\xf6<\x08\xa0k\x16\xce\x9f\xd9\n1\xbfF\x06\x81\x01\x0c\xae]\x0b\x11\x8a\xb5\xdfZ\xa6\xd3\xcf\x00\x00\x00\x00\x00\xfd\xff\xff\xff\xe9E\x99\x03\x1a\xf2\xe0n\xd7c7\xd3\xccx\xe5\xcc\x80\xbfu\xc2y\x19\x80\xfaK\x00\xaa\xdb\xd4\x00C\x9e\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x02\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14N,\x8f\xf4\xae\xcc*/S\x03\x94\x8f\xdb~\xc9\xb7\xc1\x94\xeb\x97x\x00\x00\x00\x00\x00\x00\x00\x16\x00\x14\xfd\xfe\xbf\xcf\x13\xa7 \n\xe0\xa5\xca\x05\xad\xb0fSOphq\x00\x00\x00\x00O\x01\x045\x87\xcf\x03\xdb\xde\xe7\x1b\x80\x00\x00\x00\xb3*S\x0b\x7f\xb7\xf7\xdb\x7fB\x9fcO\xa6\xf4%-P\xc6L\xea\xbd\xb5\xeaB\x97\xe4\x1e\x94\xf8\xae\x16\x02`\x9c%\xeaeN\x82\xec=\xf7\xd8wV\xb3\xc9\"A\xe7i\xa7U\xfeoaw\x1e$Y\x00\xbb\x18\xa1\x10e\xfbC\xfeT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x01\x00\xfd\x88\x01\x02\x00\x00\x00\x01p\x89X\xbbU\x81\xa0\xc1(\xb1B\xb7\x02\x14\x17\xfa\\\xfe\x9e\xf6\xca\xb3\xe3T{$\xc0\xa1\xd1\x1c!\xc4\x08\x00\x00\x00\x00\xfd\xff\xff\xff\x0b\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14k\x0b\xa3\x1eb\x97\xcd\xe9=\x01\x86}{)\xd1\xb2\x05\xaf\x91l\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x1441\xdf\xbby\x91\x95\x98=(\xa8\xc7\x13\x8b1\xd7\x88\x15\x12\xe1\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14`7c\xbaI\xd36\xc5\x92\t)\xbc\xb4\xbfe6({\xee'\xe8\x03\x00\x00\x00\x00\x00\x00\x16\x00\x14y\xb9\x0cf\x17\xc2\xeb\xf1n\x18\xa3\xc7_9\x00+\xe8\xc2\xeb\x83\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14R\xf02\x18\xb2z|Mxp\xfcaS\x07\xac\xc9\xc0N\xc2\xdb\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14\xde\xa6\xb0\x1a\xd4]#\xa6\xf8\xb9\xd7\xb1\xe7=\xb6\r\x1bu\xc47\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14\x15'\xf3fl\xef\xb8\xbd\x00\xf9\x9e\xadeI\xac\xb6\xae\xdfJ3\x9c3+\x00\x00\x00\x00\x00\x16\x00\x14\x91[/\x02-\xe7z9\xe9=fnk\x8d\xc6\x98z\x94\x14O\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14\xee\x86\xfc\x98C\x97,32\x1a\x97\x9b78\x8fu\xc8\xb7q\x8b\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14\xf8\x9c.\x16\xfb{\xba\xacO\x9dN\xf9a\xf7\xe2!\x0f\xc9@\x86\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14\xd9`;\xfe\xa1\xd0\xf7\x13\x15\xe7\xe5\x19_\xd3\xdcrG\xe7\xd9\x88;W'\x00\x01\x01\x1f\x10'\x00\x00\x00\x00\x00\x00\x16\x00\x14\xd9`;\xfe\xa1\xd0\xf7\x13\x15\xe7\xe5\x19_\xd3\xdcrG\xe7\xd9\x88\"\x06\x03\xa4\"z%\xc1F\xf2\xb3\x07\xa3\xe7G;\x9e\xe3v\x95\x1d\xcb\x0e\xadU\xf0\xed\x16\n\xc36e\xcb\x05\x98\x18e\xfbC\xfeT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00,\x00\x00\x00\x00\x01\x00q\x02\x00\x00\x00\x01\xb0f\x7f\xd1\xe3\nN>\xa7\xb2\x9d\xfa0\x93S>&\x0b\x125\xce\xbc\x85E\x94\xeb\xff\xc8\xcca\x80\x8b\x01\x00\x00\x00\x00\xfd\xff\xff\xff\x02\xe8\x03\x00\x00\x00\x00\x00\x00\x16\x00\x14u<\x0b0e\x14\xc0I\x18+\xfa\xa7\xe8\x9b\xaf\x93\x7f\x10\t\x88\xbf\xac/\x00\x00\x00\x00\x00\x16\x00\x14J\xad3#:\xe1\x81\xea\x90\xa8\xc4\xb6T\x84qc\xc5\x92\x01\xbf\xe8\xcd%\x00\x01\x01\x1f\xe8\x03\x00\x00\x00\x00\x00\x00\x16\x00\x14u<\x0b0e\x14\xc0I\x18+\xfa\xa7\xe8\x9b\xaf\x93\x7f\x10\t\x88\"\x06\x02\xd7\xb1PI\x10\xbbq'\x14Js\t\xde\xee\xde2\xe8\x8a\x06W\r\x96\xdbh1\x9e\xb7V\x05\xd5D\x12\x18e\xfbC\xfeT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\x04\x00\x00\x00\x00\x01\x00R\x02\x00\x00\x00\x01\xfc\x11\xe3_\x96\xf5;\xb2\xe3\xccy\xfe2\xc8\xffh\x99\xdbM\x06\xf4iz[\xcd\x17\x87;tb\x1e\xb7\x00\x00\x00\x00\x00\xfd\xff\xff\xff\x01b\x07\x00\x00\x00\x00\x00\x00\x16\x00\x14\xbcZ\xe6\x1b+\xe5\xb6D\x05\xbf\x0e\xf6\x7fQ\xe2\xc5v\xd4\x97z}V'\x00\x01\x01\x1fb\x07\x00\x00\x00\x00\x00\x00\x16\x00\x14\xbcZ\xe6\x1b+\xe5\xb6D\x05\xbf\x0e\xf6\x7fQ\xe2\xc5v\xd4\x97z\"\x06\x02\xdf]\x7f\xd4t\x8b\x0e\x1b\nC\xa2X\x8as3\xa4'\x84I\xfc,R\xafJ\xe5\x05\x91\x83_\xc3\xab\x03\x18e\xfbC\xfeT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x00\x1e\x00\x00\x00\x00\"\x02\x03\xaa\xe4r \x02Tb\xff53D\xb3_\x83\x028\xe21\x11\xd4oH\xd8B\x07\xfc\x8f(\x0b,5\xac\x18e\xfbC\xfeT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x005\x00\x00\x00\x00\"\x02\x0246\xfb\xba\x95\x14\rX\x9c\x94\xc9\x05FW\x9d%\xe8\x1ebA\"ik\xf5\x01\x8f \x10\x1cN\xfd\x91\x18e\xfbC\xfeT\x00\x00\x80\x01\x00\x00\x80\x00\x00\x00\x80\x01\x00\x00\x00\x11\x00\x00\x00\x00"
@@ -76,7 +75,6 @@ def tdata(mocker):
def test_init(mocker, m5stickv):
- from ur.ur_decoder import URDecoder
from krux.qr import QRPartParser
parser = QRPartParser()
@@ -88,8 +86,7 @@ def test_init(mocker, m5stickv):
def test_parser(mocker, m5stickv, tdata):
- from ur.ur import UR
- from urtypes.crypto.psbt import PSBT
+ from uUR import UR, Types
from krux.qr import QRPartParser, FORMAT_NONE, FORMAT_PMOFN, FORMAT_UR, FORMAT_BBQR
cases = [
@@ -144,7 +141,7 @@ def test_parser(mocker, m5stickv, tdata):
res = parser.result()
if fmt == FORMAT_UR:
assert isinstance(res, UR)
- assert PSBT.from_cbor(res.cbor).data == tdata.TEST_DATA_BYTES
+ assert Types.psbt_from_cbor(res.cbor) == tdata.TEST_DATA_BYTES
elif fmt == FORMAT_BBQR:
assert isinstance(res, bytes)
if parser.total_count() > 1:
@@ -164,17 +161,30 @@ def test_parser_ur_decoder_states(mocker, m5stickv, tdata):
first_part = tdata.TEST_PARTS_FORMAT_MULTIPART_UR[0]
+ def stub_decoder(state):
+ """uUR.URDecoder is a static C type, so its methods cannot be patched.
+ qr.py resolves URDecoder from the module on every part it parses, so
+ swapping the module attribute for a stub reports the state we want."""
+
+ class StubURDecoder:
+ def __init__(self):
+ self.state = uUR.DECODER_PROCESSING
+
+ def receive_part(self, part):
+ self.state = state
+ return state
+
+ return StubURDecoder
+
# Transient errors are expected while scanning, parsing goes on
parser = QRPartParser()
- mocker.patch.object(
- uUR.URDecoder, "receive_part", return_value=uUR.DECODER_ERR_INVALID_PART
- )
+ mocker.patch.object(uUR, "URDecoder", stub_decoder(uUR.DECODER_ERR_INVALID_PART))
parser.parse(first_part)
assert not parser.is_complete()
for terminal_state in (uUR.DECODER_NO_RESULT, uUR.DECODER_ERR_INVALID_CHECKSUM):
parser = QRPartParser()
- mocker.patch.object(uUR.URDecoder, "receive_part", return_value=terminal_state)
+ mocker.patch.object(uUR, "URDecoder", stub_decoder(terminal_state))
with pytest.raises(ValueError):
parser.parse(first_part)
diff --git a/tests/test_wallet.py b/tests/test_wallet.py
index 245c8ef01..7e91b64bf 100644
--- a/tests/test_wallet.py
+++ b/tests/test_wallet.py
@@ -1,12 +1,20 @@
import pytest
-from ur.ur_decoder import URDecoder
+import uUR
+
+
+def decode_single_part_ur(part):
+ """uUR's decoder is a state machine with no single-shot decode() helper,
+ so feed the lone part and hand back the assembled UR."""
+ decoder = uUR.URDecoder()
+ assert decoder.receive_part(part) == uUR.DECODER_OK
+ return decoder.result
@pytest.fixture
def tdata(mocker):
import binascii
from collections import namedtuple
- from ur.ur import UR
+ from uUR import UR
from krux.bbqr import encode_bbqr
from embit.networks import NETWORKS
from krux.key import (
@@ -1096,7 +1104,7 @@ def test_load_multisig(mocker, m5stickv, tdata):
},
),
]
- from ur.ur import UR
+ from uUR import UR
n = 0
for case in cases:
@@ -1669,7 +1677,7 @@ def test_provably_unspendable_non_deterministic_chain_code(mocker, m5stickv, tda
def test_parse_wallet_raises_errors(mocker, m5stickv, tdata):
from krux.wallet import parse_wallet
- from ur.ur import UR
+ from uUR import UR
cases = [
tdata.BLUEWALLET_MULTISIG_WALLET_DATA_MISSING_KEYS,
@@ -1907,7 +1915,7 @@ def test_parse_wallet_via_ur_output(mocker, m5stickv):
]
for i, QRDATUM in enumerate(QRDATA):
- wallet_data = URDecoder().decode(QRDATUM)
+ wallet_data = decode_single_part_ur(QRDATUM)
descriptor, label = parse_wallet(wallet_data)
assert str(descriptor) == DESCRIPTORS[i]
print(DESCRIPTORS[i])
@@ -1935,7 +1943,7 @@ def test_parse_wallet_via_ur_account(mocker, m5stickv):
]
for i, QRDATUM in enumerate(QRDATA):
- wallet_data = URDecoder().decode(QRDATUM)
+ wallet_data = decode_single_part_ur(QRDATUM)
descriptor, label = parse_wallet(wallet_data)
assert str(descriptor) == DESCRIPTORS[i]
print(DESCRIPTORS[i])
diff --git a/uv.lock b/uv.lock
index 1f2cfd2c1..18600e024 100644
--- a/uv.lock
+++ b/uv.lock
@@ -267,8 +267,7 @@ version = "26.4.0"
source = { virtual = "." }
dependencies = [
{ name = "embit" },
- { name = "ur" },
- { name = "urtypes" },
+ { name = "uur" },
]
[package.optional-dependencies]
@@ -322,8 +321,7 @@ requires-dist = [
{ name = "pyserial", marker = "extra == 'flash'", specifier = ">=3.5,<4" },
{ name = "pyzbar", marker = "extra == 'simulator'", specifier = ">=0.1.9,<1" },
{ name = "qrcode", marker = "extra == 'sign'", specifier = ">=8.2,<9" },
- { name = "ur", editable = "vendor/foundation-ur-py" },
- { name = "urtypes", editable = "vendor/urtypes" },
+ { name = "uur", directory = "firmware/MaixPy/components/micropython/port/src/bc-ur" },
]
provides-extras = ["docs", "simulator", "flash", "sign"]
@@ -952,11 +950,6 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/6a/43/8bd850ee71a191bf072e31302c73a66be413fecdd98fdcd111ecbcce13ca/tomlkit-0.15.0-py3-none-any.whl", hash = "sha256:4dbc8f0fc024412b57ced8757ac7461305126a648ff8c2c807fcb8e133a78738", size = 41328, upload-time = "2026-05-10T07:38:23.517Z" },
]
-[[package]]
-name = "ur"
-version = "0.1.0"
-source = { editable = "vendor/foundation-ur-py" }
-
[[package]]
name = "urllib3"
version = "2.7.0"
@@ -967,9 +960,9 @@ wheels = [
]
[[package]]
-name = "urtypes"
+name = "uur"
version = "0.1.0"
-source = { editable = "vendor/urtypes" }
+source = { directory = "firmware/MaixPy/components/micropython/port/src/bc-ur" }
[[package]]
name = "vulture"
diff --git a/vendor/foundation-ur-py b/vendor/foundation-ur-py
deleted file mode 160000
index 746008ea0..000000000
--- a/vendor/foundation-ur-py
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 746008ea0fcb231c0d79770a23a38ef517a0a341
diff --git a/vendor/urtypes b/vendor/urtypes
deleted file mode 160000
index 4bf39ee3f..000000000
--- a/vendor/urtypes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4bf39ee3f6bf96b34f4722d5e46a3ffabfada22d
From 8090ac73c0618b8fc319efe8ece1c4ec1e81a2b0 Mon Sep 17 00:00:00 2001
From: odudex
Date: Fri, 31 Jul 2026 17:48:35 -0300
Subject: [PATCH 03/28] fix: remove Maix Bit and CIF camera support
The device was discontinued in 25.09.0 and has no known users. Its CIF
framesize was the only caller that fed the shannon entropy module a frame
larger than QVGA, overflowing that module's scratch buffer by 49152 bytes.
Also drops the OV5642 sensor handling, which only the Maix Bit used.
---
firmware/font/bdftokff.py | 1 -
src/krux/camera.py | 23 +++-------------
src/krux/kboard.py | 1 -
tests/conftest.py | 11 --------
tests/pages/test_flash_tools.py | 2 --
tests/pages/test_page.py | 15 -----------
tests/shared_mocks.py | 47 ---------------------------------
tests/test_camera.py | 36 +++++--------------------
tests/test_power.py | 2 +-
9 files changed, 11 insertions(+), 127 deletions(-)
diff --git a/firmware/font/bdftokff.py b/firmware/font/bdftokff.py
index 6f0887f22..36a482497 100644
--- a/firmware/font/bdftokff.py
+++ b/firmware/font/bdftokff.py
@@ -50,7 +50,6 @@
SMALL_FONT_DEVICES_TO_COPY = ["cube"]
MID_FONT_DEVICES_TO_COPY = [
- "bit",
"yahboom",
"wonder_mv",
"tzt",
diff --git a/src/krux/camera.py b/src/krux/camera.py
index 95088078d..89d27e95e 100644
--- a/src/krux/camera.py
+++ b/src/krux/camera.py
@@ -26,8 +26,7 @@
from .krux_settings import Settings
from .kboard import kboard
-OV2640_ID = 0x2642 # Lenses, vertical flip - Bit
-OV5642_ID = 0x5642 # Lenses, horizontal flip - Bit
+OV2640_ID = 0x2642 # Lenses, vertical flip - Embed Fire
OV7740_ID = 0x7742 # No lenses, no Flip - M5sitckV, Amigo
GC0328_ID = 0x9D # Dock
GC2145_ID = 0x45 # Yahboom, WonderK
@@ -53,11 +52,6 @@
(OV2640_ID, ENTROPY_MODE): (0x68, 0x78),
(OV2640_ID, BINARY_GRID_MODE): (0x44, 0x48),
(OV2640_ID, ZOOMED_MODE): (0x35, 0x50),
- (OV5642_ID, QR_SCAN_MODE): (0x60, 0x70),
- (OV5642_ID, ANTI_GLARE_MODE): (0x20, 0x28),
- (OV5642_ID, ENTROPY_MODE): (0x68, 0x78),
- (OV5642_ID, BINARY_GRID_MODE): (0x44, 0x48),
- (OV5642_ID, ZOOMED_MODE): (0x35, 0x50),
(OV7740_ID, QR_SCAN_MODE): (0x60, 0x70),
(OV7740_ID, ANTI_GLARE_MODE): (0x20, 0x28),
(OV7740_ID, ENTROPY_MODE): (0x68, 0x78),
@@ -114,18 +108,12 @@ def initialize_sensor(self, mode=QR_SCAN_MODE):
sensor.set_pixformat(sensor.GRAYSCALE)
else:
sensor.set_pixformat(sensor.RGB565)
- if self.cam_id == OV5642_ID:
- sensor.set_hmirror(1)
if self.cam_id == OV2640_ID:
if kboard.is_embed_fire:
sensor.set_hmirror(0)
else:
sensor.set_vflip(1)
- if kboard.is_bit:
- # CIF mode will use central pixels and discard darker periphery
- sensor.set_framesize(sensor.CIF)
- else:
- sensor.set_framesize(sensor.QVGA)
+ sensor.set_framesize(sensor.QVGA)
if mode != ENTROPY_MODE:
if self.cam_id == OV7740_ID:
self.config_ov_7740()
@@ -186,7 +174,6 @@ def luminosity_threshold(self):
GC0328_ID: self._config_gc0328_lum,
OV2640_ID: self._config_ovxx40_lum,
OV7740_ID: self._config_ovxx40_lum, # Same as OV2640
- OV5642_ID: self._config_ovxx40_lum, # Same as OV2640
GC2145_ID: self._config_gc2145_lum,
}
@@ -359,11 +346,7 @@ def toggle_camera_mode(self):
def snapshot(self):
"""Helper to take a customized snapshot from sensor"""
- img = sensor.snapshot()
- if kboard.is_bit:
- img.lens_corr(strength=1.1)
- img.rotation_corr(z_rotation=180)
- return img
+ return sensor.snapshot()
def initialize_run(self, mode=QR_SCAN_MODE):
"""Initializes and runs sensor"""
diff --git a/src/krux/kboard.py b/src/krux/kboard.py
index bf77ad934..30936c2a4 100644
--- a/src/krux/kboard.py
+++ b/src/krux/kboard.py
@@ -28,7 +28,6 @@ class KBoard:
def __init__(self):
self.is_amigo = board.config["type"] == "amigo"
- self.is_bit = board.config["type"] == "bit"
self.is_cube = board.config["type"] == "cube"
self.is_embed_fire = board.config["type"] == "embed_fire"
self.is_yahboom = board.config["type"] == "yahboom"
diff --git a/tests/conftest.py b/tests/conftest.py
index 15c2f2a29..98cad5bbb 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -8,7 +8,6 @@
board_m5stickv,
board_wonder_mv,
board_yahboom,
- board_bit,
board_wonder_k,
board_embed_fire,
encode_to_string,
@@ -172,15 +171,6 @@ def wonder_mv(monkeypatch, mp_modules):
reset_krux_modules()
-@pytest.fixture
-def bit(monkeypatch, mp_modules):
- import sys
-
- monkeypatch.setitem(sys.modules, "board", board_bit())
- monkeypatch.setitem(sys.modules, "pmu", None)
- reset_krux_modules()
-
-
@pytest.fixture
def wonder_k(monkeypatch, mp_modules):
import sys
@@ -207,7 +197,6 @@ def embed_fire(monkeypatch, mp_modules):
"cube",
"yahboom",
"wonder_mv",
- "bit",
"wonder_k",
]
)
diff --git a/tests/pages/test_flash_tools.py b/tests/pages/test_flash_tools.py
index c5b2d274e..ad9ef69f4 100644
--- a/tests/pages/test_flash_tools.py
+++ b/tests/pages/test_flash_tools.py
@@ -89,7 +89,6 @@ def test_tc_flash_hash(multiple_devices, mocker):
"cube": 208,
"yahboom": DOCK_FW_POS,
"wonder_mv": DOCK_FW_POS,
- "bit": DOCK_FW_POS,
"wonder_k": DOCK_FW_POS,
}
users_data_words_positions = {
@@ -99,7 +98,6 @@ def test_tc_flash_hash(multiple_devices, mocker):
"cube": 222,
"yahboom": DOCK_USER_POS,
"wonder_mv": DOCK_USER_POS,
- "bit": DOCK_USER_POS,
"wonder_k": DOCK_USER_POS,
}
fw_words_pos = fw_words_positions[board.config["type"]]
diff --git a/tests/pages/test_page.py b/tests/pages/test_page.py
index b731697b9..cb2585ff3 100644
--- a/tests/pages/test_page.py
+++ b/tests/pages/test_page.py
@@ -367,7 +367,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO = "amigo"
M5 = "m5stickv"
DOCK = "dock"
- BIT = "bit"
CUBE = "cube"
YAHBOOM = "yahboom"
WONDER_MV = "wonder_mv"
@@ -379,7 +378,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789ab…opqrstuvwxyz",
M5: "0123456…tuvwxyz",
DOCK: "0123456789abc…nopqrstuvwxyz",
- BIT: "0123456789abc…nopqrstuvwxyz",
CUBE: "0123456789abc…nopqrstuvwxyz",
YAHBOOM: "0123456789abc…nopqrstuvwxyz",
WONDER_MV: "0123456789abc…nopqrstuvwxyz",
@@ -390,7 +388,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789ab…nopqrstuvwxy",
M5: "0123456…stuvwxy",
DOCK: "0123456789abc…mnopqrstuvwxy",
- BIT: "0123456789abc…mnopqrstuvwxy",
CUBE: "0123456789abc…mnopqrstuvwxy",
YAHBOOM: "0123456789abc…mnopqrstuvwxy",
WONDER_MV: "0123456789abc…mnopqrstuvwxy",
@@ -401,7 +398,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789ab…mnopqrstuvwx",
M5: "0123456…rstuvwx",
DOCK: "0123456789abc…lmnopqrstuvwx",
- BIT: "0123456789abc…lmnopqrstuvwx",
CUBE: "0123456789abc…lmnopqrstuvwx",
YAHBOOM: "0123456789abc…lmnopqrstuvwx",
WONDER_MV: "0123456789abc…lmnopqrstuvwx",
@@ -412,7 +408,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789ab…lmnopqrstuvw",
M5: "0123456…qrstuvw",
DOCK: "0123456789abc…klmnopqrstuvw",
- BIT: "0123456789abc…klmnopqrstuvw",
CUBE: "0123456789abc…klmnopqrstuvw",
YAHBOOM: "0123456789abc…klmnopqrstuvw",
WONDER_MV: "0123456789abc…klmnopqrstuvw",
@@ -423,7 +418,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789ab…ghijklmnopqr",
M5: "0123456…lmnopqr",
DOCK: "0123456789abc…fghijklmnopqr",
- BIT: "0123456789abc…fghijklmnopqr",
CUBE: "0123456789abc…fghijklmnopqr",
YAHBOOM: "0123456789abc…fghijklmnopqr",
WONDER_MV: "0123456789abc…fghijklmnopqr",
@@ -434,7 +428,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789ab…fghijklmnopq",
M5: "0123456…klmnopq",
DOCK: "0123456789abcdefghijklmnopq",
- BIT: "0123456789abcdefghijklmnopq",
CUBE: "0123456789abcdefghijklmnopq",
YAHBOOM: "0123456789abcdefghijklmnopq",
WONDER_MV: "0123456789abcdefghijklmnopq",
@@ -445,7 +438,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789ab…efghijklmnop",
M5: "0123456…jklmnop",
DOCK: "0123456789abcdefghijklmnop",
- BIT: "0123456789abcdefghijklmnop",
CUBE: "0123456789abcdefghijklmnop",
YAHBOOM: "0123456789abcdefghijklmnop",
WONDER_MV: "0123456789abcdefghijklmnop",
@@ -456,7 +448,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789abcdefghijklmno",
M5: "0123456…ijklmno",
DOCK: "0123456789abcdefghijklmno",
- BIT: "0123456789abcdefghijklmno",
CUBE: "0123456789abcdefghijklmno",
YAHBOOM: "0123456789abcdefghijklmno",
WONDER_MV: "0123456789abcdefghijklmno",
@@ -467,7 +458,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789abcdefghijklmn",
M5: "0123456…hijklmn",
DOCK: "0123456789abcdefghijklmn",
- BIT: "0123456789abcdefghijklmn",
CUBE: "0123456789abcdefghijklmn",
YAHBOOM: "0123456789abcdefghijklmn",
WONDER_MV: "0123456789abcdefghijklmn",
@@ -478,7 +468,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789abcdefghijklm",
M5: "0123456…ghijklm",
DOCK: "0123456789abcdefghijklm",
- BIT: "0123456789abcdefghijklm",
CUBE: "0123456789abcdefghijklm",
YAHBOOM: "0123456789abcdefghijklm",
WONDER_MV: "0123456789abcdefghijklm",
@@ -489,7 +478,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789abcdefghij",
M5: "0123456…defghij",
DOCK: "0123456789abcdefghij",
- BIT: "0123456789abcdefghij",
CUBE: "0123456789abcdefghij",
YAHBOOM: "0123456789abcdefghij",
WONDER_MV: "0123456789abcdefghij",
@@ -500,7 +488,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789abcdefg",
M5: "0123456…abcdefg",
DOCK: "0123456789abcdefg",
- BIT: "0123456789abcdefg",
CUBE: "0123456789abcdefg",
YAHBOOM: "0123456789abcdefg",
WONDER_MV: "0123456789abcdefg",
@@ -511,7 +498,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789abcdef",
M5: "0123456789abcdef",
DOCK: "0123456789abcdef",
- BIT: "0123456789abcdef",
CUBE: "0123456789abcdef",
YAHBOOM: "0123456789abcdef",
WONDER_MV: "0123456789abcdef",
@@ -522,7 +508,6 @@ def test_fit_to_line_text(mocker, multiple_devices, mock_page_cls):
AMIGO: "0123456789abcde",
M5: "0123456789abcde",
DOCK: "0123456789abcde",
- BIT: "0123456789abcde",
CUBE: "0123456789abcde",
YAHBOOM: "0123456789abcde",
WONDER_MV: "0123456789abcde",
diff --git a/tests/shared_mocks.py b/tests/shared_mocks.py
index ee6a7097f..ebf88deb1 100644
--- a/tests/shared_mocks.py
+++ b/tests/shared_mocks.py
@@ -665,29 +665,6 @@ def board_wonder_mv():
)
-def board_bit():
- return mock.MagicMock(
- config={
- "type": "bit",
- "lcd": {"height": 240, "width": 320, "invert": 0, "lcd_type": 0},
- "sdcard": {"sclk": 27, "mosi": 28, "miso": 26, "cs": 29},
- "board_info": {
- "BOOT_KEY": 16,
- "LED_R": 13,
- "LED_G": 12,
- "LED_B": 14,
- "MIC0_WS": 19,
- "MIC0_DATA": 20,
- "MIC0_BCK": 18,
- },
- "krux": {
- "pins": {"BUTTON_A": 22, "BUTTON_B": 21, "BUTTON_C": 16},
- "display": {"touch": False, "font": [8, 16], "font_wide": [16, 16]},
- },
- }
- )
-
-
def board_wonder_k():
return mock.MagicMock(
config={
@@ -946,30 +923,6 @@ def mock_context(mocker):
),
)
- elif board.config["type"] == "bit":
- return mocker.MagicMock(
- input=mocker.MagicMock(
- touch=None,
- enter_event=mocker.MagicMock(return_value=False),
- page_event=mocker.MagicMock(return_value=False),
- page_prev_event=mocker.MagicMock(return_value=False),
- touch_event=mocker.MagicMock(return_value=False),
- ),
- display=mocker.MagicMock(
- font_width=8,
- font_height=16,
- total_lines=20, # 320 / 16
- width=mocker.MagicMock(return_value=DOCK_WIDTH),
- height=mocker.MagicMock(return_value=DOCK_HEIGHT),
- usable_width=mocker.MagicMock(return_value=DOCK_USABLE_WIDTH),
- usable_pixels_in_line=mocker.MagicMock(return_value=DOCK_USABLE_WIDTH),
- ascii_chars_per_line=mocker.MagicMock(return_value=DOCK_IN_LINE),
- to_lines=mocker.MagicMock(return_value=[""]),
- max_menu_lines=mocker.MagicMock(return_value=9),
- draw_hcentered_text=mocker.MagicMock(return_value=1),
- ),
- )
-
elif board.config["type"] == "wonder_k":
return mocker.MagicMock(
input=mocker.MagicMock(
diff --git a/tests/test_camera.py b/tests/test_camera.py
index 78854ee72..183a73c33 100644
--- a/tests/test_camera.py
+++ b/tests/test_camera.py
@@ -17,7 +17,6 @@ def test_initialize_sensors(mocker, multiple_devices):
from krux.camera import (
Camera,
OV7740_ID,
- OV5642_ID,
OV2640_ID,
GC0328_ID,
GC2145_ID,
@@ -26,7 +25,6 @@ def test_initialize_sensors(mocker, multiple_devices):
SENSORS_LIST = [
(OV7740_ID, "config_ov_7740"),
(OV2640_ID, "config_ov_2640"),
- (OV5642_ID, None),
(GC0328_ID, None),
(GC2145_ID, "config_gc_2145"),
]
@@ -50,7 +48,7 @@ def test_initialize_sensors(mocker, multiple_devices):
krux.camera.sensor.set_vflip.reset_mock()
- if board.config["type"] in ("cube", "wonder_k") or c.cam_id == OV5642_ID:
+ if board.config["type"] in ("cube", "wonder_k"):
krux.camera.sensor.set_hmirror.assert_called_with(1)
else:
krux.camera.sensor.set_hmirror.assert_not_called()
@@ -68,16 +66,10 @@ def test_initialize_sensors(mocker, multiple_devices):
krux.camera.sensor.set_pixformat.reset_mock()
krux.camera.sensor.set_framesize.assert_called()
- if board.config["type"] != "bit":
- assert (
- krux.camera.sensor.set_framesize.call_args.args[0]._extract_mock_name()
- == "mock.QVGA"
- )
- else:
- assert (
- krux.camera.sensor.set_framesize.call_args.args[0]._extract_mock_name()
- == "mock.CIF"
- )
+ assert (
+ krux.camera.sensor.set_framesize.call_args.args[0]._extract_mock_name()
+ == "mock.QVGA"
+ )
krux.camera.sensor.set_framesize.reset_mock()
@@ -139,7 +131,6 @@ def test_toggle_mode(mocker, m5stickv):
from krux.camera import (
Camera,
OV7740_ID,
- OV5642_ID,
OV2640_ID,
GC0328_ID,
GC2145_ID,
@@ -148,7 +139,7 @@ def test_toggle_mode(mocker, m5stickv):
ZOOMED_MODE,
)
- SENSORS_LIST = [OV7740_ID, OV5642_ID, OV2640_ID, GC0328_ID, GC2145_ID]
+ SENSORS_LIST = [OV7740_ID, OV2640_ID, GC0328_ID, GC2145_ID]
for sensor_id in SENSORS_LIST:
mocker.patch("krux.camera.sensor.get_id", lambda: sensor_id)
@@ -167,18 +158,9 @@ def test_toggle_mode(mocker, m5stickv):
def test_snapshot(mocker, multiple_devices):
import krux
- import board
from krux.camera import Camera
- if board.config["type"] == "bit":
- image = mocker.MagicMock(
- lens_corr=mocker.MagicMock(), rotation_corr=mocker.MagicMock()
- )
- mock_snapshot = mocker.MagicMock(return_value=image)
- else:
- mock_snapshot = mocker.MagicMock()
-
- mocker.patch("krux.camera.sensor.snapshot", side_effect=mock_snapshot)
+ mocker.patch("krux.camera.sensor.snapshot", side_effect=mocker.MagicMock())
c = Camera()
c.initialize_sensor()
@@ -186,10 +168,6 @@ def test_snapshot(mocker, multiple_devices):
krux.camera.sensor.snapshot.assert_called()
- if board.config["type"] == "bit":
- image.lens_corr.assert_called_with(strength=1.1)
- image.rotation_corr.assert_called_with(z_rotation=180)
-
def test_stop_sensor(mocker, multiple_devices):
import krux
diff --git a/tests/test_power.py b/tests/test_power.py
index 43422cec3..627fbc1d8 100644
--- a/tests/test_power.py
+++ b/tests/test_power.py
@@ -15,7 +15,7 @@ def test_pmu(mocker, multiple_devices):
manager = PowerManager()
- if board.config["type"] in ("dock", "yahboom", "wonder_mv", "bit", "wonder_k"):
+ if board.config["type"] in ("dock", "yahboom", "wonder_mv", "wonder_k"):
assert manager.pmu is None
assert manager.has_battery() is False
else:
From 5c4ece9a235892f052e585c246c84719c7d3a9d6 Mon Sep 17 00:00:00 2001
From: odudex
Date: Fri, 31 Jul 2026 18:01:33 -0300
Subject: [PATCH 04/28] chore: bump MaixPy with Shannon changes and RNG removal
Fixes the shannon heap overflow, removes the unused os.urandom binding,
and drops the Maix Bit build project.
---
firmware/MaixPy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/firmware/MaixPy b/firmware/MaixPy
index edb0cc97f..fbc30a5ca 160000
--- a/firmware/MaixPy
+++ b/firmware/MaixPy
@@ -1 +1 @@
-Subproject commit edb0cc97f7529f0735c93b206abee1e266938535
+Subproject commit fbc30a5cafa92f268fbf391055005ec2304fb925
From b0a7357edbca1c92c6069aeb0ebbec25b3030806 Mon Sep 17 00:00:00 2001
From: odudex
Date: Fri, 31 Jul 2026 18:07:06 -0300
Subject: [PATCH 05/28] docs: add Maix Bit removal and Shannon calc fix to
CHANGELOG
---
CHANGELOG.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3727da95..29f554257 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog 26.05.0 - May 2025
+### Security Fixes
+- Camera entropy: fix a heap buffer overflow in the Shannon entropy module. Only the Maix Bit could trigger it, a device discontinued in 25.09.0 with no known users; every other device feeds the module a frame that fits. The module copied the whole frame into a fixed 320x240 RGB565 (153,600 byte) scratch buffer, so the Maix Bit's larger CIF frames (352x288 RGB565, 202,752 bytes) wrote 49,152 bytes past the end. The scratch copy has been removed entirely, the read length is now capped and rounded to whole pixels, and the CIF path is gone along with the Maix Bit
+
+### Removed Maix Bit Code
+All Maix Bit support has been removed from the source tree, including its firmware build project. Support for the device was discontinued in 25.09.0, which at the time kept the build parameters available; those are now gone too. The OV5642 sensor handling, used only by that device, was removed along with it.
+
### Stackbit 1248 Vertical Layout
Added vertical layout option for Stackbit 1248 backup display, allowing users to choose between Standard (horizontal) and Vertical (transposed) grid orientations.
@@ -7,6 +13,7 @@ Added vertical layout option for Stackbit 1248 backup display, allowing users to
Switch from the pure-Python urtypes and foundation-ur-py packages to the new uUR C module, allowing faster UR QR codes decoding with a smaller RAM footprint. Tests and the simulator now build the same module for CPython instead of shimming the pure-Python packages, so host and device run identical UR code.
### Other Bug Fixes and Improvements
+- Remove the unused `os.urandom()` from the MaixPy firmware. It was never called by Krux and played no part in generating keys or mnemonics, which draw entropy from the camera or dice. It was backed by a deterministic PRNG, so it has been removed to keep it from being mistaken for a secure source later
- Improve scan TinySeed and other binary visibility by drawing punches only
- Added `flash_success` method to standardize green success flashes across confirmation screens
- Update Embit to latest - 3ae0ef2
From fc808059ff50d20dca510f3c9d3fa60b8bd24699 Mon Sep 17 00:00:00 2001
From: odudex
Date: Thu, 30 Jul 2026 10:52:55 -0300
Subject: [PATCH 06/28] fix: verify PSBT input amounts before showing the fee
Display, policy and sighash now all read inp.utxo, so the amount on the
review screen is the amount the signer commits to. Any attached previous
transaction must hash to the outpoint being spent, and legacy inputs
require one since their sighash does not commit to the amount.
---
src/krux/psbt.py | 44 +++--
tests/test_psbt_input_amounts.py | 321 +++++++++++++++++++++++++++++++
2 files changed, 353 insertions(+), 12 deletions(-)
create mode 100644 tests/test_psbt_input_amounts.py
diff --git a/src/krux/psbt.py b/src/krux/psbt.py
index 1be4b4192..6dadeff6b 100644
--- a/src/krux/psbt.py
+++ b/src/krux/psbt.py
@@ -147,6 +147,8 @@ def file_is_base64_encoded(self, file_path, chunk_size=64):
def validate(self):
"""Validates the PSBT"""
+ # Any non_witness_utxo present must really hash to the prevout txid.
+ self.psbt.verify(ignore_missing=True)
# From: https://github.com/diybitcoinhardware/embit/blob/master/examples/change.py#L110
xpubs = []
origin_less_xpub = None
@@ -156,6 +158,10 @@ def validate(self):
# Expected to fail to get xpubs from Miniscript PSBT
pass
for inp in self.psbt.inputs:
+ # Legacy sighashes do not commit to the input amount, so the full
+ # previous transaction is mandatory for non-segwit inputs.
+ if not inp.is_verified and not is_segwit_input(inp):
+ raise ValueError("missing non_witness_utxo on a legacy input")
# get policy of the input
try:
inp_policy = self.get_policy_from_psbt_input(
@@ -189,15 +195,13 @@ def validate(self):
def get_policy_from_psbt_input(self, tx_input, xpubs, origin_less_xpub=None):
"""Extracts the scriptPubKey from an input's UTXO and determines the policy."""
- if tx_input.witness_utxo:
- scriptpubkey = tx_input.witness_utxo.script_pubkey
- elif tx_input.non_witness_utxo:
- # Retrieve the scriptPubKey from the specified output in the non_witness_utxo
- scriptpubkey = tx_input.non_witness_utxo.vout[tx_input.vout].script_pubkey
- else:
+ # Same UTXO object the signer commits to, so policy, displayed amount
+ # and sighash can never be read from different fields
+ utxo = tx_input.utxo
+ if utxo is None:
raise ValueError("No UTXO information available in the input.")
- return get_policy(tx_input, scriptpubkey, xpubs, origin_less_xpub)
+ return get_policy(tx_input, utxo.script_pubkey, xpubs, origin_less_xpub)
def path_mismatch(self):
"""Verifies if the PSBT key path matches loaded keys's derivation path"""
@@ -327,11 +331,8 @@ def outputs(self):
inp_amount = 0
for inp in self.psbt.inputs:
- if inp.witness_utxo:
- inp_amount += inp.witness_utxo.value
- elif inp.non_witness_utxo: # Legacy
- # Retrieve the value from the specified output in the non_witness_utxo
- inp_amount += inp.non_witness_utxo.vout[inp.vout].value
+ # Use exactly the same UTXO object the signer commits to
+ inp_amount += inp.utxo.value
resume_inputs_str = (
(t("Inputs (%d):") % len(self.psbt.inputs))
+ self._btc_render(inp_amount)
@@ -822,3 +823,22 @@ def get_policy(scope, scriptpubkey, xpubs, origin_less_xpub=None):
pass
return policy
+
+
+def is_segwit_input(inp):
+ """True if the input's sighash commits to the input amount (BIP143/BIP341).
+
+ Only the scriptPubKey and the redeem script are consulted. A declared
+ witness_script is not enough on its own, otherwise attaching one to a
+ legacy input would be enough to skip the previous transaction requirement.
+ """
+ if inp.utxo is not None and inp.utxo.script_pubkey.script_type() in (
+ P2WPKH,
+ P2WSH,
+ P2TR,
+ ):
+ return True
+ return inp.redeem_script is not None and inp.redeem_script.script_type() in (
+ P2WPKH,
+ P2WSH,
+ )
diff --git a/tests/test_psbt_input_amounts.py b/tests/test_psbt_input_amounts.py
new file mode 100644
index 000000000..0c8a9b682
--- /dev/null
+++ b/tests/test_psbt_input_amounts.py
@@ -0,0 +1,321 @@
+"""Regression coverage for PSBT input amount verification.
+
+The amount shown on the review screen must be the same amount the signer
+commits to, and any previous transaction attached to an input must really
+hash to the outpoint being spent.
+"""
+
+import pytest
+from .shared_mocks import MockFile, mock_open
+
+TEST_MNEMONIC = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+
+
+def _kv(key, value):
+ """Serializes a PSBT key/value pair"""
+ from embit import compact
+
+ return compact.to_bytes(len(key)) + key + compact.to_bytes(len(value)) + value
+
+
+def _root():
+ from embit import bip32, bip39
+ from embit.networks import NETWORKS
+
+ seed = bip39.mnemonic_to_seed(TEST_MNEMONIC)
+ return bip32.HDKey.from_seed(seed, version=NETWORKS["test"]["xprv"])
+
+
+def _key_at(root, path):
+ """Returns the public key and its derivation path record"""
+ from embit.bip32 import parse_path
+ from embit.psbt import DerivationPath
+
+ derivation = parse_path(path)
+ pubkey = root.derive(derivation).to_public().key
+ return pubkey, DerivationPath(root.my_fingerprint, derivation)
+
+
+def _wallet():
+ from embit.networks import NETWORKS
+ from krux.key import Key, TYPE_SINGLESIG
+ from krux.wallet import Wallet
+
+ return Wallet(Key(TEST_MNEMONIC, TYPE_SINGLESIG, NETWORKS["test"]))
+
+
+def test_rejects_fabricated_non_witness_utxo(m5stickv):
+ """A previous tx that does not hash to the outpoint must be refused.
+
+ Legacy sighashes do not commit to the input amount, so without this check
+ a fabricated previous tx yields a signature that is valid against the real
+ UTXO while the device displays an understated fee.
+ """
+ from embit import script
+ from embit.psbt import PSBT
+ from embit.transaction import Transaction, TransactionInput, TransactionOutput
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ root = _root()
+ pubkey, derivation = _key_at(root, "m/44h/1h/0h/0/0")
+ script_pubkey = script.p2pkh(pubkey)
+
+ real_prev = Transaction(
+ vin=[TransactionInput(b"\x22" * 32, 0)],
+ vout=[TransactionOutput(100000000, script_pubkey)],
+ )
+ # Same scriptPubKey, understated value, so a different txid
+ fake_prev = Transaction(
+ vin=[TransactionInput(b"\x33" * 32, 0)],
+ vout=[TransactionOutput(20200, script_pubkey)],
+ )
+ assert fake_prev.txid() != real_prev.txid()
+
+ tx = Transaction(
+ vin=[TransactionInput(real_prev.txid(), 0)],
+ vout=[
+ TransactionOutput(20000, script.p2pkh(_key_at(root, "m/44h/1h/0h/0/7")[0]))
+ ],
+ )
+ psbt = PSBT(tx)
+ psbt.inputs[0].non_witness_utxo = fake_prev
+ psbt.inputs[0].bip32_derivations[pubkey] = derivation
+
+ with pytest.raises(ValueError, match="Previous txid"):
+ PSBTSigner(_wallet(), psbt.serialize(), FORMAT_NONE)
+
+
+def test_rejects_fabricated_non_witness_utxo_from_sdcard(mocker, m5stickv):
+ """The SD card fallback into compressed mode must not bypass the check"""
+ from embit import script
+ from embit.transaction import Transaction, TransactionInput, TransactionOutput
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ root = _root()
+ pubkey, derivation = _key_at(root, "m/44h/1h/0h/0/0")
+ script_pubkey = script.p2pkh(pubkey)
+
+ fake_prev = Transaction(
+ vin=[TransactionInput(b"\x33" * 32, 0)],
+ vout=[TransactionOutput(20200, script_pubkey)],
+ )
+ tx = Transaction(
+ vin=[TransactionInput(b"\x66" * 32, 0)],
+ vout=[TransactionOutput(20000, script_pubkey)],
+ )
+ partial_sig = _kv(b"\x02" + pubkey.sec(), b"\x30" * 71)
+ input_map = (
+ _kv(b"\x00", fake_prev.serialize())
+ + _kv(b"\x06" + pubkey.sec(), derivation.serialize())
+ + partial_sig
+ + partial_sig
+ + b"\x00"
+ )
+ raw = b"psbt\xff" + _kv(b"\x00", tx.serialize()) + b"\x00" + input_map + b"\x00"
+
+ mocker.patch("builtins.open", mock_open(MockFile(raw)))
+ with pytest.raises(ValueError, match="Previous txid"):
+ PSBTSigner(_wallet(), None, FORMAT_NONE, "dummy.psbt")
+
+
+def test_rejects_legacy_input_without_previous_tx(m5stickv):
+ """A legacy input carrying only a witness_utxo has an unverifiable amount"""
+ from embit import script
+ from embit.psbt import PSBT
+ from embit.transaction import Transaction, TransactionInput, TransactionOutput
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ root = _root()
+ pubkey, derivation = _key_at(root, "m/44h/1h/0h/0/0")
+ script_pubkey = script.p2pkh(pubkey)
+
+ tx = Transaction(
+ vin=[TransactionInput(b"\x44" * 32, 0)],
+ vout=[TransactionOutput(20000, script_pubkey)],
+ )
+ psbt = PSBT(tx)
+ psbt.inputs[0].witness_utxo = TransactionOutput(20200, script_pubkey)
+ psbt.inputs[0].bip32_derivations[pubkey] = derivation
+
+ with pytest.raises(ValueError):
+ PSBTSigner(_wallet(), psbt.serialize(), FORMAT_NONE)
+
+
+def _compressed_psbt_with_contradicting_amounts(root, real_value, declared_value):
+ """Builds a PSBT that forces the compressed parse and lies in witness_utxo.
+
+ A duplicated PSBT_IN_PARTIAL_SIG key makes the uncompressed parse raise,
+ so PSBTSigner falls back to CompressMode.CLEAR_ALL. That mode streams the
+ previous transaction into _utxo, which is what the signer reads, while
+ witness_utxo carries the attacker's value.
+ """
+ from embit import script
+ from embit.transaction import Transaction, TransactionInput, TransactionOutput
+
+ pubkey, derivation = _key_at(root, "m/84h/1h/0h/0/0")
+ script_pubkey = script.p2wpkh(pubkey)
+
+ prev_tx = Transaction(
+ vin=[TransactionInput(b"\x11" * 32, 0)],
+ vout=[TransactionOutput(real_value, script_pubkey)],
+ )
+ tx = Transaction(
+ vin=[TransactionInput(prev_tx.txid(), 0)],
+ vout=[
+ TransactionOutput(
+ 100000, script.p2wpkh(_key_at(root, "m/84h/1h/0h/0/7")[0])
+ )
+ ],
+ )
+ lying_utxo = TransactionOutput(declared_value, script_pubkey)
+ partial_sig = _kv(b"\x02" + pubkey.sec(), b"\x30" * 71)
+ input_map = (
+ _kv(b"\x00", prev_tx.serialize())
+ + _kv(b"\x01", lying_utxo.serialize())
+ + _kv(b"\x06" + pubkey.sec(), derivation.serialize())
+ + partial_sig
+ + partial_sig
+ + b"\x00"
+ )
+ raw = b"psbt\xff" + _kv(b"\x00", tx.serialize()) + b"\x00" + input_map + b"\x00"
+ return raw, tx, pubkey, script_pubkey
+
+
+def test_displayed_amount_is_the_signed_amount(mocker, m5stickv):
+ """Display and sighash must read the same UTXO, even in compressed mode"""
+ from embit import ec, script
+ from embit.transaction import SIGHASH
+ from krux.format import format_btc
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ root = _root()
+ real_value = 1000000000
+ raw, tx, pubkey, script_pubkey = _compressed_psbt_with_contradicting_amounts(
+ root, real_value, 101000
+ )
+
+ mocker.patch("builtins.open", mock_open(MockFile(raw)))
+ signer = PSBTSigner(_wallet(), None, FORMAT_NONE, "dummy.psbt")
+
+ tx_input = signer.psbt.inputs[0]
+ # The lie is still in the PSBT, it just is not what gets displayed
+ assert tx_input.witness_utxo.value == 101000
+ assert tx_input.utxo.value == real_value
+
+ messages, fee_percent = signer.outputs()
+ assert format_btc(real_value) in messages[0]
+ # 9.999 BTC of a 0.001 BTC spend, the high fee warning must fire
+ assert fee_percent >= 10.0
+
+ signer.sign(trim=False)
+ signature = list(signer.psbt.inputs[0].partial_sigs.values())[0]
+ parsed = ec.Signature.parse(signature[:-1])
+ signed_over = tx.sighash_segwit(
+ 0,
+ script.p2pkh_from_p2wpkh(script_pubkey),
+ real_value,
+ sighash=SIGHASH.ALL,
+ )
+ assert pubkey.verify(parsed, signed_over)
+
+
+def test_compressed_parse_keeps_legacy_psbt_usable(mocker, m5stickv):
+ """Compressed mode stores the previous output in _utxo, not non_witness_utxo"""
+ from embit import script
+ from embit.transaction import Transaction, TransactionInput, TransactionOutput
+ from krux.format import format_btc
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ root = _root()
+ pubkey, derivation = _key_at(root, "m/44h/1h/0h/0/0")
+ script_pubkey = script.p2pkh(pubkey)
+
+ prev_tx = Transaction(
+ vin=[TransactionInput(b"\x77" * 32, 0)],
+ vout=[TransactionOutput(100000000, script_pubkey)],
+ )
+ tx = Transaction(
+ vin=[TransactionInput(prev_tx.txid(), 0)],
+ vout=[TransactionOutput(20000, script_pubkey)],
+ )
+ partial_sig = _kv(b"\x02" + pubkey.sec(), b"\x30" * 71)
+ input_map = (
+ _kv(b"\x00", prev_tx.serialize())
+ + _kv(b"\x06" + pubkey.sec(), derivation.serialize())
+ + partial_sig
+ + partial_sig
+ + b"\x00"
+ )
+ raw = b"psbt\xff" + _kv(b"\x00", tx.serialize()) + b"\x00" + input_map + b"\x00"
+
+ mocker.patch("builtins.open", mock_open(MockFile(raw)))
+ signer = PSBTSigner(_wallet(), None, FORMAT_NONE, "dummy.psbt")
+
+ assert signer.psbt.inputs[0].non_witness_utxo is None
+ assert signer.psbt.inputs[0].utxo.value == 100000000
+ messages, _ = signer.outputs()
+ assert format_btc(100000000) in messages[0]
+
+
+@pytest.mark.xfail(
+ strict=True,
+ reason="Segwit inputs are not required to carry a previous transaction, so "
+ "their amounts stay unverified. Signing the same transaction twice, each "
+ "session declaring a different input truthfully, yields one valid signature "
+ "per input. Closing this means requiring previous transactions on segwit "
+ "inputs too, which rejects PSBTs from coordinators that omit them.",
+)
+def test_segwit_input_amounts_are_verified(m5stickv):
+ """Documents the residual exposure on multi input segwit transactions"""
+ from embit import script
+ from embit.psbt import PSBT
+ from embit.transaction import Transaction, TransactionInput, TransactionOutput
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ root = _root()
+ pubkey_0, derivation_0 = _key_at(root, "m/84h/1h/0h/0/0")
+ pubkey_1, derivation_1 = _key_at(root, "m/84h/1h/0h/0/1")
+
+ tx = Transaction(
+ vin=[TransactionInput(b"\x44" * 32, 0), TransactionInput(b"\x55" * 32, 1)],
+ vout=[
+ TransactionOutput(
+ 99990000, script.p2wpkh(_key_at(root, "m/84h/1h/0h/0/7")[0])
+ )
+ ],
+ )
+
+ def build(value_0, value_1):
+ psbt = PSBT(tx)
+ psbt.inputs[0].witness_utxo = TransactionOutput(
+ value_0, script.p2wpkh(pubkey_0)
+ )
+ psbt.inputs[0].bip32_derivations[pubkey_0] = derivation_0
+ psbt.inputs[1].witness_utxo = TransactionOutput(
+ value_1, script.p2wpkh(pubkey_1)
+ )
+ psbt.inputs[1].bip32_derivations[pubkey_1] = derivation_1
+ return psbt.serialize()
+
+ def signatures(raw):
+ signer = PSBTSigner(_wallet(), raw, FORMAT_NONE)
+ signer.sign(trim=False)
+ return [list(inp.partial_sigs.values())[0] for inp in signer.psbt.inputs]
+
+ try:
+ truthful = signatures(build(100000000, 100000000))
+ session_a = signatures(build(100000000, 1000))
+ session_b = signatures(build(1000, 100000000))
+ except ValueError:
+ # Rejected at load, which is the outcome this test wants
+ return
+
+ # A device that verified segwit amounts would never produce these
+ assert session_a[0] != truthful[0]
+ assert session_b[1] != truthful[1]
From c7e48ae1b58b72bc179e8578ea6d4e649c652a19 Mon Sep 17 00:00:00 2001
From: odudex
Date: Thu, 30 Jul 2026 11:23:44 -0300
Subject: [PATCH 07/28] fix: render negative amounts correctly in format_btc
Floor division and modulo round towards minus infinity, so -1000 sats
was shown as -1.99 999 000. Take the sign out before splitting.
---
src/krux/format.py | 8 +++++++-
tests/test_format.py | 15 +++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/krux/format.py b/src/krux/format.py
index 557a2ea97..e2d705924 100644
--- a/src/krux/format.py
+++ b/src/krux/format.py
@@ -33,12 +33,18 @@ def format_btc(amount):
while still using the idea behind the Satcomma standard
"""
+ # Floor division and modulo round towards minus infinity, so the sign has
+ # to be taken out before splitting the amount
+ sign = "-" if amount < 0 else ""
+ amount = abs(amount)
+
btc_without_decimal = amount // SATS_PER_BTC
btc_decimal_only = amount % SATS_PER_BTC
btc_decimal_8char = ("{:0>" + BTC_SATS_LEN + "}").format(btc_decimal_only)
return (
- generate_thousands_separator(btc_without_decimal)
+ sign
+ + generate_thousands_separator(btc_without_decimal)
+ render_decimal_separator()
+ btc_decimal_8char[:2]
+ THOUSANDS_SEPARATOR
diff --git a/tests/test_format.py b/tests/test_format.py
index 4432b6b0a..3fde27a7e 100644
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -22,3 +22,18 @@ def test_format_btc(m5stickv):
]
for case in cases:
assert format_btc(case[0]) == case[1]
+
+
+def test_format_btc_negative(m5stickv):
+ """A negative amount is the positive one with a minus sign.
+
+ Floor division and modulo round towards minus infinity, so splitting the
+ amount before taking the sign out used to render -1000 as -1.99 999 000.
+ """
+ from krux.format import format_btc, THOUSANDS_SEPARATOR
+
+ for amount in (1, 999, 1000, 100000000, 199999000, 2098989898989898):
+ assert format_btc(-amount) == "-" + format_btc(amount)
+
+ separator = THOUSANDS_SEPARATOR
+ assert format_btc(-1000) == "-0.00" + separator + "001" + separator + "000"
From d6813d88bd320d3806f91dd76a24a909eb86583c Mon Sep 17 00:00:00 2001
From: odudex
Date: Thu, 30 Jul 2026 11:30:41 -0300
Subject: [PATCH 08/28] fix: reject a PSBT whose outputs exceed its inputs
Such a transaction is invalid on chain, and it used to render as a small
negative fee with fee_percent clamped to 0.1, so the high fee warning
did not fire either. Fail at load instead.
---
src/krux/psbt.py | 7 +++++
tests/test_psbt_input_amounts.py | 45 ++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/src/krux/psbt.py b/src/krux/psbt.py
index 6dadeff6b..bdf892e88 100644
--- a/src/krux/psbt.py
+++ b/src/krux/psbt.py
@@ -178,6 +178,13 @@ def validate(self):
if self.policy != inp_policy:
raise ValueError("mixed inputs in the tx")
+ # A transaction spending more than it funds is invalid and would render
+ # as a negative fee, which reads like a cheap transaction on screen
+ if sum(out.value for out in self.psbt.outputs) > sum(
+ inp.utxo.value for inp in self.psbt.inputs
+ ):
+ raise ValueError("outputs exceed inputs")
+
if self.wallet.is_miniscript():
if not is_miniscript(self.policy):
raise ValueError("Not a miniscript PSBT")
diff --git a/tests/test_psbt_input_amounts.py b/tests/test_psbt_input_amounts.py
index 0c8a9b682..28cf828fb 100644
--- a/tests/test_psbt_input_amounts.py
+++ b/tests/test_psbt_input_amounts.py
@@ -144,6 +144,51 @@ def test_rejects_legacy_input_without_previous_tx(m5stickv):
PSBTSigner(_wallet(), psbt.serialize(), FORMAT_NONE)
+def _segwit_psbt(root, input_value, output_value):
+ """Single input p2wpkh PSBT with the given declared amounts"""
+ from embit import script
+ from embit.psbt import PSBT
+ from embit.transaction import Transaction, TransactionInput, TransactionOutput
+
+ pubkey, derivation = _key_at(root, "m/84h/1h/0h/0/0")
+ tx = Transaction(
+ vin=[TransactionInput(b"\x99" * 32, 0)],
+ vout=[
+ TransactionOutput(
+ output_value, script.p2wpkh(_key_at(root, "m/84h/1h/0h/0/7")[0])
+ )
+ ],
+ )
+ psbt = PSBT(tx)
+ psbt.inputs[0].witness_utxo = TransactionOutput(input_value, script.p2wpkh(pubkey))
+ psbt.inputs[0].bip32_derivations[pubkey] = derivation
+ return psbt.serialize()
+
+
+def test_rejects_outputs_exceeding_inputs(m5stickv):
+ """A negative fee is impossible on chain and must not reach the review screen.
+
+ It would render as a small negative amount and fee_percent clamps to 0.1,
+ so the high fee warning would not fire either.
+ """
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ root = _root()
+ with pytest.raises(ValueError, match="outputs exceed inputs"):
+ PSBTSigner(_wallet(), _segwit_psbt(root, 99000, 100000), FORMAT_NONE)
+
+
+def test_accepts_zero_fee(m5stickv):
+ """A zero fee is unusual but valid, only a negative one is impossible"""
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ root = _root()
+ signer = PSBTSigner(_wallet(), _segwit_psbt(root, 100000, 100000), FORMAT_NONE)
+ assert isinstance(signer, PSBTSigner)
+
+
def _compressed_psbt_with_contradicting_amounts(root, real_value, declared_value):
"""Builds a PSBT that forces the compressed parse and lies in witness_utxo.
From 518b3314f9d0d6bbccf755b04f79034e19dbff0f Mon Sep 17 00:00:00 2001
From: odudex
Date: Thu, 30 Jul 2026 12:31:57 -0300
Subject: [PATCH 09/28] feat: warn when PSBT input amounts cannot be verified
BIP143 commits only to the amount of the input being signed, so a
coordinator can declare a different input truthfully in each of two
sessions and combine one valid signature per input. Warn when a
non-taproot PSBT has more than one input and any amount is unbacked
by its previous transaction.
The warning states the risk rather than instructing the user, since a
malicious retry request is indistinguishable from a failed transfer,
and signing the same transaction twice is legitimate when one person
holds more than one key of a multisig.
Translations for the two new strings are still pending.
---
src/krux/pages/home_pages/home.py | 20 +++++++
src/krux/psbt.py | 13 +++++
tests/pages/home_pages/test_home.py | 39 +++++++++++++
tests/test_psbt_input_amounts.py | 89 ++++++++++++++++++++++++++++-
4 files changed, 159 insertions(+), 2 deletions(-)
diff --git a/src/krux/pages/home_pages/home.py b/src/krux/pages/home_pages/home.py
index 02a48ef66..5c6b0bd46 100644
--- a/src/krux/pages/home_pages/home.py
+++ b/src/krux/pages/home_pages/home.py
@@ -411,6 +411,23 @@ def _post_load_psbt_warn(self, signer):
return True
+ def _unverified_amounts_psbt_warn(self, signer):
+ """Warn when input amounts are not backed by their previous transactions"""
+ if signer.unverified_input_amounts():
+ self.ctx.display.clear()
+ self.ctx.display.draw_centered_text(
+ t("Warning:")
+ + " "
+ + t("Unverified input amounts!")
+ + "\n"
+ + t("The fee shown may be lower than the real fee."),
+ highlight_prefix=":",
+ )
+
+ return self.prompt(t("Proceed?"), BOTTOM_PROMPT_LINE)
+
+ return True
+
def _fees_psbt_warn(self, fee_percent):
"""Warn if fees greater than 10% of what is spent"""
if fee_percent >= 10.0:
@@ -510,6 +527,9 @@ def sign_psbt(self):
self.ctx.display.draw_centered_text(t("Processing…"))
outputs, fee_percent = signer.outputs()
+ if not self._unverified_amounts_psbt_warn(signer):
+ return MENU_CONTINUE
+
if not self._fees_psbt_warn(fee_percent):
return MENU_CONTINUE
diff --git a/src/krux/psbt.py b/src/krux/psbt.py
index bdf892e88..14e701d74 100644
--- a/src/krux/psbt.py
+++ b/src/krux/psbt.py
@@ -200,6 +200,19 @@ def validate(self):
if self.wallet.policy != self.policy:
raise ValueError("policy mismatch")
+ def unverified_input_amounts(self):
+ """True if an input amount could be understated without breaking its signature.
+
+ BIP143 commits only to the amount of the input being signed, so with more
+ than one input a coordinator can declare a different amount truthfully in
+ each of two signing sessions and combine one valid signature per input.
+ BIP341 hashes every input amount, so taproot is immune, and with a single
+ input the lie goes into its own sighash and invalidates it.
+ """
+ if len(self.psbt.inputs) < 2 or self.policy["type"] == P2TR:
+ return False
+ return any(not inp.is_verified for inp in self.psbt.inputs)
+
def get_policy_from_psbt_input(self, tx_input, xpubs, origin_less_xpub=None):
"""Extracts the scriptPubKey from an input's UTXO and determines the policy."""
# Same UTXO object the signer commits to, so policy, displayed amount
diff --git a/tests/pages/home_pages/test_home.py b/tests/pages/home_pages/test_home.py
index 2ee00eaaf..a5560a88a 100644
--- a/tests/pages/home_pages/test_home.py
+++ b/tests/pages/home_pages/test_home.py
@@ -941,6 +941,7 @@ def test_sign_psbt(mocker, m5stickv, tdata):
BUTTON_ENTER, # Load from QR code
BUTTON_ENTER, # Path mismatch ACK
BUTTON_ENTER, # PSBT Policy ACK
+ BUTTON_ENTER, # Unverified input amounts ACK
BUTTON_ENTER, # PSBT resume
BUTTON_ENTER, # output 1
BUTTON_ENTER, # output 2
@@ -966,6 +967,7 @@ def test_sign_psbt(mocker, m5stickv, tdata):
BUTTON_ENTER, # Load from QR code
BUTTON_ENTER, # Path mismatch ACK
BUTTON_ENTER, # PSBT Policy ACK
+ BUTTON_ENTER, # Unverified input amounts ACK
BUTTON_ENTER, # PSBT resume
BUTTON_ENTER, # output 1
BUTTON_ENTER, # output 2
@@ -992,6 +994,7 @@ def test_sign_psbt(mocker, m5stickv, tdata):
BUTTON_ENTER, # Load from QR code
BUTTON_ENTER, # Path mismatch ACK
BUTTON_ENTER, # PSBT Policy ACK
+ BUTTON_ENTER, # Unverified input amounts ACK
BUTTON_ENTER, # PSBT resume
BUTTON_ENTER, # output 1
BUTTON_ENTER, # output 2
@@ -1042,6 +1045,7 @@ def test_sign_psbt(mocker, m5stickv, tdata):
BUTTON_ENTER, # Load from SD card
BUTTON_ENTER, # Path mismatch ACK
BUTTON_ENTER, # PSBT Policy ACK
+ BUTTON_ENTER, # Unverified input amounts ACK
BUTTON_ENTER, # PSBT resume
BUTTON_ENTER, # output 1
BUTTON_ENTER, # output 2
@@ -1230,6 +1234,7 @@ def test_psbt_warnings(mocker, m5stickv, tdata):
BUTTON_ENTER, # Load from SD card
BUTTON_ENTER, # Path mismatch ACK
BUTTON_ENTER, # PSBT Policy ACK
+ BUTTON_ENTER, # Unverified input amounts ACK
BUTTON_ENTER, # PSBT resume
BUTTON_ENTER, # output 1
BUTTON_ENTER, # output 2
@@ -1912,3 +1917,37 @@ def test_sign_spent_and_self(mocker, m5stickv, tdata):
),
]
)
+
+
+def test_unverified_amounts_warning(mocker, m5stickv):
+ """The warning must be shown and must abort signing when declined"""
+ from krux.pages.home_pages.home import Home
+ from krux.input import BUTTON_ENTER, BUTTON_PAGE
+
+ class FakeSigner:
+ def __init__(self, unverified):
+ self.unverified = unverified
+
+ def unverified_input_amounts(self):
+ return self.unverified
+
+ # Declined
+ ctx = create_ctx(mocker, [BUTTON_PAGE])
+ home = Home(ctx)
+ mocker.spy(ctx.display, "draw_centered_text")
+ assert home._unverified_amounts_psbt_warn(FakeSigner(True)) is False
+ shown = ctx.display.draw_centered_text.call_args[0][0]
+ assert "Unverified input amounts!" in shown
+ assert "The fee shown may be lower than the real fee." in shown
+
+ # Accepted
+ ctx = create_ctx(mocker, [BUTTON_ENTER])
+ home = Home(ctx)
+ assert home._unverified_amounts_psbt_warn(FakeSigner(True)) is True
+
+ # Nothing to warn about, no prompt consumed
+ ctx = create_ctx(mocker, [])
+ home = Home(ctx)
+ mocker.spy(ctx.display, "draw_centered_text")
+ assert home._unverified_amounts_psbt_warn(FakeSigner(False)) is True
+ assert ctx.display.draw_centered_text.call_count == 0
diff --git a/tests/test_psbt_input_amounts.py b/tests/test_psbt_input_amounts.py
index 28cf828fb..6c7bc5063 100644
--- a/tests/test_psbt_input_amounts.py
+++ b/tests/test_psbt_input_amounts.py
@@ -229,6 +229,89 @@ def _compressed_psbt_with_contradicting_amounts(root, real_value, declared_value
return raw, tx, pubkey, script_pubkey
+def _two_input_psbt(root, taproot=False, with_prev_txs=False):
+ """Two input PSBT, optionally taproot, optionally carrying previous txs"""
+ from embit import script
+ from embit.psbt import PSBT
+ from embit.transaction import Transaction, TransactionInput, TransactionOutput
+
+ base = "m/86h/1h/0h" if taproot else "m/84h/1h/0h"
+ make = script.p2tr if taproot else script.p2wpkh
+
+ keys, prevs = [], []
+ for i in (0, 1):
+ pubkey, derivation = _key_at(root, "%s/0/%d" % (base, i))
+ keys.append((pubkey, derivation))
+ prevs.append(
+ Transaction(
+ vin=[TransactionInput(bytes([0xA0 + i]) * 32, 0)],
+ vout=[TransactionOutput(100000000, make(pubkey))],
+ )
+ )
+
+ tx = Transaction(
+ vin=[TransactionInput(prev.txid(), 0) for prev in prevs],
+ vout=[TransactionOutput(199990000, make(_key_at(root, "%s/0/7" % base)[0]))],
+ )
+ psbt = PSBT(tx)
+ for i, (pubkey, derivation) in enumerate(keys):
+ psbt.inputs[i].witness_utxo = prevs[i].vout[0]
+ if with_prev_txs:
+ psbt.inputs[i].non_witness_utxo = prevs[i]
+ if taproot:
+ psbt.inputs[i].taproot_bip32_derivations[pubkey] = ([], derivation)
+ psbt.inputs[i].taproot_internal_key = pubkey
+ else:
+ psbt.inputs[i].bip32_derivations[pubkey] = derivation
+ return psbt.serialize()
+
+
+def _taproot_wallet():
+ from embit.networks import NETWORKS
+ from krux.key import Key, TYPE_SINGLESIG, P2TR
+ from krux.wallet import Wallet
+
+ return Wallet(Key(TEST_MNEMONIC, TYPE_SINGLESIG, NETWORKS["test"], "", 0, P2TR))
+
+
+def test_warns_when_amounts_are_unverifiable(m5stickv):
+ """Two segwit v0 inputs with no previous transactions is the Path C setup"""
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ signer = PSBTSigner(_wallet(), _two_input_psbt(_root()), FORMAT_NONE)
+ assert signer.unverified_input_amounts() is True
+
+
+def test_no_warning_with_previous_transactions(m5stickv):
+ """Verified amounts cannot be understated, so there is nothing to warn about"""
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ raw = _two_input_psbt(_root(), with_prev_txs=True)
+ signer = PSBTSigner(_wallet(), raw, FORMAT_NONE)
+ assert signer.unverified_input_amounts() is False
+
+
+def test_no_warning_for_taproot(m5stickv):
+ """BIP341 hashes every input amount, so the two session trick cannot work"""
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ raw = _two_input_psbt(_root(), taproot=True)
+ signer = PSBTSigner(_taproot_wallet(), raw, FORMAT_NONE)
+ assert signer.unverified_input_amounts() is False
+
+
+def test_no_warning_for_single_input(m5stickv):
+ """A lie about the only input goes into its own sighash and breaks it"""
+ from krux.psbt import PSBTSigner
+ from krux.qr import FORMAT_NONE
+
+ signer = PSBTSigner(_wallet(), _segwit_psbt(_root(), 100000, 90000), FORMAT_NONE)
+ assert signer.unverified_input_amounts() is False
+
+
def test_displayed_amount_is_the_signed_amount(mocker, m5stickv):
"""Display and sighash must read the same UTXO, even in compressed mode"""
from embit import ec, script
@@ -312,8 +395,10 @@ def test_compressed_parse_keeps_legacy_psbt_usable(mocker, m5stickv):
reason="Segwit inputs are not required to carry a previous transaction, so "
"their amounts stay unverified. Signing the same transaction twice, each "
"session declaring a different input truthfully, yields one valid signature "
- "per input. Closing this means requiring previous transactions on segwit "
- "inputs too, which rejects PSBTs from coordinators that omit them.",
+ "per input. Krux warns about this through unverified_input_amounts() but "
+ "still signs if the user proceeds. Rejecting instead would need previous "
+ "transactions on segwit inputs, which Sparrow deliberately omits for Krux "
+ "and the other airgapped signers in WalletModel.alwaysIncludeNonWitnessUtxo.",
)
def test_segwit_input_amounts_are_verified(m5stickv):
"""Documents the residual exposure on multi input segwit transactions"""
From bdaed1a1b1559c62abd26d2a862bd34a7abca2b9 Mon Sep 17 00:00:00 2001
From: odudex
Date: Thu, 30 Jul 2026 13:00:51 -0300
Subject: [PATCH 10/28] i18n: translate the unverified input amounts warning
---
i18n/translations/de-DE.json | 2 ++
i18n/translations/es-MX.json | 2 ++
i18n/translations/fr-FR.json | 2 ++
i18n/translations/ja-JP.json | 2 ++
i18n/translations/ko-KR.json | 2 ++
i18n/translations/nl-NL.json | 2 ++
i18n/translations/pt-BR.json | 2 ++
i18n/translations/ru-RU.json | 2 ++
i18n/translations/tr-TR.json | 2 ++
i18n/translations/vi-VN.json | 2 ++
i18n/translations/zh-CN.json | 2 ++
src/krux/translations/__init__.py | 2 ++
src/krux/translations/de.py | 2 ++
src/krux/translations/es.py | 2 ++
src/krux/translations/fr.py | 2 ++
src/krux/translations/ja.py | 2 ++
src/krux/translations/ko.py | 2 ++
src/krux/translations/nl.py | 2 ++
src/krux/translations/pt.py | 2 ++
src/krux/translations/ru.py | 2 ++
src/krux/translations/tr.py | 2 ++
src/krux/translations/vi.py | 2 ++
src/krux/translations/zh.py | 2 ++
23 files changed, 46 insertions(+)
diff --git a/i18n/translations/de-DE.json b/i18n/translations/de-DE.json
index fe2a180c8..ff4c88970 100644
--- a/i18n/translations/de-DE.json
+++ b/i18n/translations/de-DE.json
@@ -307,6 +307,7 @@
"Test Suite Results": "Ergebnisse der Testsuite",
"Test:": "Test:",
"Text": "Text",
+ "The fee shown may be lower than the real fee.": "Die angezeigte Gebühr kann niedriger als die tatsächliche Gebühr sein.",
"Theme": "Thema",
"Thermal": "Thermisch",
"To ensure data is unrecoverable use Wipe Device feature": "Um sicherzustellen, dass die Daten nicht wiederhergestellt werden können, verwenden Sie die Funktion 'Gerät löschen'",
@@ -319,6 +320,7 @@
"Type Key": "Schlüssel eingeben",
"Undo": "Widerrufen",
"Unit": "Einheit",
+ "Unverified input amounts!": "Unverifizierte Input-Beträge!",
"Update KEF ID?": "KEF-ID aktualisieren?",
"Update QR Label?": "QR-Etikett aktualisieren?",
"Upgrade complete.": "Upgrade abgeschlossen.",
diff --git a/i18n/translations/es-MX.json b/i18n/translations/es-MX.json
index 08010b8b3..640ac8695 100644
--- a/i18n/translations/es-MX.json
+++ b/i18n/translations/es-MX.json
@@ -307,6 +307,7 @@
"Test Suite Results": "Resultados de la suite de pruebas",
"Test:": "Prueba:",
"Text": "Texto",
+ "The fee shown may be lower than the real fee.": "La comisión mostrada puede ser menor que la comisión real.",
"Theme": "Tema",
"Thermal": "Térmico",
"To ensure data is unrecoverable use Wipe Device feature": "Para garantizar que los datos no se puedan recuperar, utiliza la función de borrar dispositivo",
@@ -319,6 +320,7 @@
"Type Key": "Introduce la clave",
"Undo": "Deshacer",
"Unit": "Unidad",
+ "Unverified input amounts!": "¡Montos de entrada no verificados!",
"Update KEF ID?": "¿Actualizar ID de Kef?",
"Update QR Label?": "¿Actualizar etiqueta QR?",
"Upgrade complete.": "Actualización completa.",
diff --git a/i18n/translations/fr-FR.json b/i18n/translations/fr-FR.json
index bbc75e6d1..b3808148e 100644
--- a/i18n/translations/fr-FR.json
+++ b/i18n/translations/fr-FR.json
@@ -307,6 +307,7 @@
"Test Suite Results": "Résultats de la suite de tests",
"Test:": "Test:",
"Text": "Texte",
+ "The fee shown may be lower than the real fee.": "Les frais affichés peuvent être inférieurs aux frais réels.",
"Theme": "Thème",
"Thermal": "Thermique",
"To ensure data is unrecoverable use Wipe Device feature": "Pour assurer que les données soient irrécupérables, utilisez la fonctionnalité 'Effacer l'appareil'",
@@ -319,6 +320,7 @@
"Type Key": "Taper clé",
"Undo": "Annuler",
"Unit": "Unité",
+ "Unverified input amounts!": "Montants d'entrée non vérifiés !",
"Update KEF ID?": "Mettre à jour l'ID KEF ?",
"Update QR Label?": "Mettre à jour l'étiquette QR ?",
"Upgrade complete.": "Mise à jour complète.",
diff --git a/i18n/translations/ja-JP.json b/i18n/translations/ja-JP.json
index 1c5120759..8706d5292 100644
--- a/i18n/translations/ja-JP.json
+++ b/i18n/translations/ja-JP.json
@@ -307,6 +307,7 @@
"Test Suite Results": "テストスイートの結果",
"Test:": "テスト:",
"Text": "テキスト",
+ "The fee shown may be lower than the real fee.": "手数料は表示より高いかもしれません.",
"Theme": "テーマ",
"Thermal": "サーマル",
"To ensure data is unrecoverable use Wipe Device feature": "データが復元不可能であることを確実にするには、デバイス消去機能を使用してください",
@@ -319,6 +320,7 @@
"Type Key": "キーを入力する",
"Undo": "取り消し",
"Unit": "ユニット",
+ "Unverified input amounts!": "未検証のインプット金額!",
"Update KEF ID?": "KEF IDを更新しますか?",
"Update QR Label?": "QRラベルを更新しますか?",
"Upgrade complete.": "アップグレードが完了しました.",
diff --git a/i18n/translations/ko-KR.json b/i18n/translations/ko-KR.json
index bf6fe9f7d..26ccfcb34 100644
--- a/i18n/translations/ko-KR.json
+++ b/i18n/translations/ko-KR.json
@@ -307,6 +307,7 @@
"Test Suite Results": "테스트 제품군 결과",
"Test:": "Test:",
"Text": "텍스트",
+ "The fee shown may be lower than the real fee.": "표시된 수수료가 실제 수수료보다 적을 수 있습니다.",
"Theme": "테마",
"Thermal": "Thermal",
"To ensure data is unrecoverable use Wipe Device feature": "데이터 복구가 불가능하도록 장치 전체지우기 기능을 사용하십시오",
@@ -319,6 +320,7 @@
"Type Key": "비밀번호 입력",
"Undo": "실행 취소",
"Unit": "단위",
+ "Unverified input amounts!": "검증되지 않은 입력 값!",
"Update KEF ID?": "KEF ID를 업데이트하시겠습니까?",
"Update QR Label?": "QR 레이블을 업데이트하시겠습니까?",
"Upgrade complete.": "업그레이드가 완료되었습니다.",
diff --git a/i18n/translations/nl-NL.json b/i18n/translations/nl-NL.json
index d0d3a0af8..8741a29d3 100644
--- a/i18n/translations/nl-NL.json
+++ b/i18n/translations/nl-NL.json
@@ -307,6 +307,7 @@
"Test Suite Results": "Test Suite-resultaten",
"Test:": "Test:",
"Text": "Tekst",
+ "The fee shown may be lower than the real fee.": "Het getoonde tarief kan lager zijn dan het werkelijke tarief.",
"Theme": "Thema",
"Thermal": "Thermisch",
"To ensure data is unrecoverable use Wipe Device feature": "Gebruik de functie 'Apparaat wissen' om te zorgen dat de gegevens onherstelbaar zijn",
@@ -319,6 +320,7 @@
"Type Key": "Voer sleutel in",
"Undo": "Ongedaan maken",
"Unit": "Eenheid",
+ "Unverified input amounts!": "Niet-geverifieerde invoerbedragen!",
"Update KEF ID?": "KEF-ID bijwerken?",
"Update QR Label?": "QR-label bijwerken?",
"Upgrade complete.": "Upgrade afgerond.",
diff --git a/i18n/translations/pt-BR.json b/i18n/translations/pt-BR.json
index b5da39010..fbbc5b094 100644
--- a/i18n/translations/pt-BR.json
+++ b/i18n/translations/pt-BR.json
@@ -307,6 +307,7 @@
"Test Suite Results": "Resultados da suíte de testes",
"Test:": "Teste:",
"Text": "Texto",
+ "The fee shown may be lower than the real fee.": "A taxa exibida pode ser menor que a taxa real.",
"Theme": "Tema",
"Thermal": "Térmica",
"To ensure data is unrecoverable use Wipe Device feature": "Para garantir que os dados sejam irrecuperáveis, use o recurso Limpar Dispositivo",
@@ -319,6 +320,7 @@
"Type Key": "Digite a Chave",
"Undo": "Desfazer",
"Unit": "Unidade",
+ "Unverified input amounts!": "Valores de entrada não verificados!",
"Update KEF ID?": "Atualizar KEF ID?",
"Update QR Label?": "Atualizar etiqueta QR?",
"Upgrade complete.": "Atualização concluída.",
diff --git a/i18n/translations/ru-RU.json b/i18n/translations/ru-RU.json
index de66e87a9..324faf93f 100644
--- a/i18n/translations/ru-RU.json
+++ b/i18n/translations/ru-RU.json
@@ -307,6 +307,7 @@
"Test Suite Results": "Результаты набора тестов",
"Test:": "Испыт.:",
"Text": "Текст",
+ "The fee shown may be lower than the real fee.": "Показанная комиссия может быть ниже реальной комиссии.",
"Theme": "Тема",
"Thermal": "Термальный",
"To ensure data is unrecoverable use Wipe Device feature": "Для гарантии невосстановления данных используйте функцию Очистки Устройства",
@@ -319,6 +320,7 @@
"Type Key": "Ввести Ключ",
"Undo": "Отменить",
"Unit": "Единица Измерения",
+ "Unverified input amounts!": "Непроверенные суммы входов!",
"Update KEF ID?": "Обновить идентификатор KEF?",
"Update QR Label?": "Обновить QR-метку?",
"Upgrade complete.": "Обновление завершено.",
diff --git a/i18n/translations/tr-TR.json b/i18n/translations/tr-TR.json
index bfda16dc1..f54191ceb 100644
--- a/i18n/translations/tr-TR.json
+++ b/i18n/translations/tr-TR.json
@@ -307,6 +307,7 @@
"Test Suite Results": "Test Paketi Sonuçları",
"Test:": "Test:",
"Text": "Metin",
+ "The fee shown may be lower than the real fee.": "Gösterilen ücret gerçek ücretten düşük olabilir.",
"Theme": "Tema",
"Thermal": "Termal",
"To ensure data is unrecoverable use Wipe Device feature": "Verilerin geri kullanılamaz olduğundan emin olmak için Cihazı Sil özelliğini kullanın",
@@ -319,6 +320,7 @@
"Type Key": "Anahtar Yaz",
"Undo": "Geri Al",
"Unit": "Birim",
+ "Unverified input amounts!": "Doğrulanmamış giriş tutarları!",
"Update KEF ID?": "Kef Kimliği Güncellensin mi?",
"Update QR Label?": "QR Etiketi Güncellensin mi",
"Upgrade complete.": "Güncelleme tamamlandı.",
diff --git a/i18n/translations/vi-VN.json b/i18n/translations/vi-VN.json
index 9a7d36b4d..73184ef5a 100644
--- a/i18n/translations/vi-VN.json
+++ b/i18n/translations/vi-VN.json
@@ -307,6 +307,7 @@
"Test Suite Results": "Kết quả bộ thử nghiệm",
"Test:": "Kiểm tra bài cũ:",
"Text": "Văn bản",
+ "The fee shown may be lower than the real fee.": "Phí hiển thị có thể thấp hơn phí thực tế.",
"Theme": "Chủ đề",
"Thermal": "Nhiệt",
"To ensure data is unrecoverable use Wipe Device feature": "Sử dụng tính năng Xóa dữ liệu trên thiết bị để đảm bảo dữ liệu không thể phục hồi",
@@ -319,6 +320,7 @@
"Type Key": "Nhập khóa",
"Undo": "Hoàn tác",
"Unit": "Đơn vị",
+ "Unverified input amounts!": "Số tiền đầu vào chưa được xác minh!",
"Update KEF ID?": "Cập nhật ID KEF?",
"Update QR Label?": "Cập nhật nhãn QR?",
"Upgrade complete.": "Nâng cấp hoàn tất.",
diff --git a/i18n/translations/zh-CN.json b/i18n/translations/zh-CN.json
index 5fb695924..889ef9c22 100644
--- a/i18n/translations/zh-CN.json
+++ b/i18n/translations/zh-CN.json
@@ -307,6 +307,7 @@
"Test Suite Results": "测试套件结果",
"Test:": "测试:",
"Text": "文本",
+ "The fee shown may be lower than the real fee.": "费用可能高于显示的金额.",
"Theme": "主题",
"Thermal": "热敏",
"To ensure data is unrecoverable use Wipe Device feature": "要确保数据不可恢复,请使用擦除设备功能",
@@ -319,6 +320,7 @@
"Type Key": "输入私钥",
"Undo": "撤销",
"Unit": "单位",
+ "Unverified input amounts!": "未验证的输入金额!",
"Update KEF ID?": "更新KEF ID ?",
"Update QR Label?": "更新二维码标签?",
"Upgrade complete.": "升级已完成.",
diff --git a/src/krux/translations/__init__.py b/src/krux/translations/__init__.py
index 985fb3eb4..db1332154 100644
--- a/src/krux/translations/__init__.py
+++ b/src/krux/translations/__init__.py
@@ -341,6 +341,7 @@
912182018,
3701549678,
2612594937,
+ 3800135594,
1454688268,
1180180513,
2258131455,
@@ -353,6 +354,7 @@
2061556020,
1128404172,
2089395053,
+ 3805912365,
1374262427,
2518890350,
2786714360,
diff --git a/src/krux/translations/de.py b/src/krux/translations/de.py
index d29049583..84a2f14fb 100644
--- a/src/krux/translations/de.py
+++ b/src/krux/translations/de.py
@@ -329,6 +329,7 @@
"Ergebnisse der Testsuite",
"Test:",
"Text",
+ "Die angezeigte Gebühr kann niedriger als die tatsächliche Gebühr sein.",
"Thema",
"Thermisch",
"Um sicherzustellen, dass die Daten nicht wiederhergestellt werden können, verwenden Sie die Funktion 'Gerät löschen'",
@@ -341,6 +342,7 @@
"Schlüssel eingeben",
"Widerrufen",
"Einheit",
+ "Unverifizierte Input-Beträge!",
"KEF-ID aktualisieren?",
"QR-Etikett aktualisieren?",
"Upgrade abgeschlossen.",
diff --git a/src/krux/translations/es.py b/src/krux/translations/es.py
index cb5a2493e..e479611a3 100644
--- a/src/krux/translations/es.py
+++ b/src/krux/translations/es.py
@@ -329,6 +329,7 @@
"Resultados de la suite de pruebas",
"Prueba:",
"Texto",
+ "La comisión mostrada puede ser menor que la comisión real.",
"Tema",
"Térmico",
"Para garantizar que los datos no se puedan recuperar, utiliza la función de borrar dispositivo",
@@ -341,6 +342,7 @@
"Introduce la clave",
"Deshacer",
"Unidad",
+ "¡Montos de entrada no verificados!",
"¿Actualizar ID de Kef?",
"¿Actualizar etiqueta QR?",
"Actualización completa.",
diff --git a/src/krux/translations/fr.py b/src/krux/translations/fr.py
index 986286b67..65afb9c73 100644
--- a/src/krux/translations/fr.py
+++ b/src/krux/translations/fr.py
@@ -329,6 +329,7 @@
"Résultats de la suite de tests",
"Test:",
"Texte",
+ "Les frais affichés peuvent être inférieurs aux frais réels.",
"Thème",
"Thermique",
"Pour assurer que les données soient irrécupérables, utilisez la fonctionnalité 'Effacer l'appareil'",
@@ -341,6 +342,7 @@
"Taper clé",
"Annuler",
"Unité",
+ "Montants d'entrée non vérifiés !",
"Mettre à jour l'ID KEF\u2009?",
"Mettre à jour l'étiquette QR\u2009?",
"Mise à jour complète.",
diff --git a/src/krux/translations/ja.py b/src/krux/translations/ja.py
index 413eb5b4f..5f5946c9b 100644
--- a/src/krux/translations/ja.py
+++ b/src/krux/translations/ja.py
@@ -329,6 +329,7 @@
"テストスイートの結果",
"テスト:",
"テキスト",
+ "手数料は表示より高いかもしれません.",
"テーマ",
"サーマル",
"データが復元不可能であることを確実にするには、デバイス消去機能を使用してください",
@@ -341,6 +342,7 @@
"キーを入力する",
"取り消し",
"ユニット",
+ "未検証のインプット金額!",
"KEF IDを更新しますか?",
"QRラベルを更新しますか?",
"アップグレードが完了しました.",
diff --git a/src/krux/translations/ko.py b/src/krux/translations/ko.py
index e46b65ae8..d6888259e 100644
--- a/src/krux/translations/ko.py
+++ b/src/krux/translations/ko.py
@@ -329,6 +329,7 @@
"테스트 제품군 결과",
"Test:",
"텍스트",
+ "표시된 수수료가 실제 수수료보다 적을 수 있습니다.",
"테마",
"Thermal",
"데이터 복구가 불가능하도록 장치 전체지우기 기능을 사용하십시오",
@@ -341,6 +342,7 @@
"비밀번호 입력",
"실행 취소",
"단위",
+ "검증되지 않은 입력 값!",
"KEF ID를 업데이트하시겠습니까?",
"QR 레이블을 업데이트하시겠습니까?",
"업그레이드가 완료되었습니다.",
diff --git a/src/krux/translations/nl.py b/src/krux/translations/nl.py
index 49d6859d7..b38632f1f 100644
--- a/src/krux/translations/nl.py
+++ b/src/krux/translations/nl.py
@@ -329,6 +329,7 @@
"Test Suite-resultaten",
"Test:",
"Tekst",
+ "Het getoonde tarief kan lager zijn dan het werkelijke tarief.",
"Thema",
"Thermisch",
"Gebruik de functie 'Apparaat wissen' om te zorgen dat de gegevens onherstelbaar zijn",
@@ -341,6 +342,7 @@
"Voer sleutel in",
"Ongedaan maken",
"Eenheid",
+ "Niet-geverifieerde invoerbedragen!",
"KEF-ID bijwerken?",
"QR-label bijwerken?",
"Upgrade afgerond.",
diff --git a/src/krux/translations/pt.py b/src/krux/translations/pt.py
index 1a731b0ac..addba56d2 100644
--- a/src/krux/translations/pt.py
+++ b/src/krux/translations/pt.py
@@ -329,6 +329,7 @@
"Resultados da suíte de testes",
"Teste:",
"Texto",
+ "A taxa exibida pode ser menor que a taxa real.",
"Tema",
"Térmica",
"Para garantir que os dados sejam irrecuperáveis, use o recurso Limpar Dispositivo",
@@ -341,6 +342,7 @@
"Digite a Chave",
"Desfazer",
"Unidade",
+ "Valores de entrada não verificados!",
"Atualizar KEF ID?",
"Atualizar etiqueta QR?",
"Atualização concluída.",
diff --git a/src/krux/translations/ru.py b/src/krux/translations/ru.py
index ce5ea2f25..cbe7cb372 100644
--- a/src/krux/translations/ru.py
+++ b/src/krux/translations/ru.py
@@ -329,6 +329,7 @@
"Результаты набора тестов",
"Испыт.:",
"Текст",
+ "Показанная комиссия может быть ниже реальной комиссии.",
"Тема",
"Термальный",
"Для гарантии невосстановления данных используйте функцию Очистки Устройства",
@@ -341,6 +342,7 @@
"Ввести Ключ",
"Отменить",
"Единица Измерения",
+ "Непроверенные суммы входов!",
"Обновить идентификатор KEF?",
"Обновить QR-метку?",
"Обновление завершено.",
diff --git a/src/krux/translations/tr.py b/src/krux/translations/tr.py
index a6e3a8e88..22bea96af 100644
--- a/src/krux/translations/tr.py
+++ b/src/krux/translations/tr.py
@@ -329,6 +329,7 @@
"Test Paketi Sonuçları",
"Test:",
"Metin",
+ "Gösterilen ücret gerçek ücretten düşük olabilir.",
"Tema",
"Termal",
"Verilerin geri kullanılamaz olduğundan emin olmak için Cihazı Sil özelliğini kullanın",
@@ -341,6 +342,7 @@
"Anahtar Yaz",
"Geri Al",
"Birim",
+ "Doğrulanmamış giriş tutarları!",
"Kef Kimliği Güncellensin mi?",
"QR Etiketi Güncellensin mi",
"Güncelleme tamamlandı.",
diff --git a/src/krux/translations/vi.py b/src/krux/translations/vi.py
index 884679adf..9d1f62e24 100644
--- a/src/krux/translations/vi.py
+++ b/src/krux/translations/vi.py
@@ -329,6 +329,7 @@
"Kết quả bộ thử nghiệm",
"Kiểm tra bài cũ:",
"Văn bản",
+ "Phí hiển thị có thể thấp hơn phí thực tế.",
"Chủ đề",
"Nhiệt",
"Sử dụng tính năng Xóa dữ liệu trên thiết bị để đảm bảo dữ liệu không thể phục hồi",
@@ -341,6 +342,7 @@
"Nhập khóa",
"Hoàn tác",
"Đơn vị",
+ "Số tiền đầu vào chưa được xác minh!",
"Cập nhật ID KEF?",
"Cập nhật nhãn QR?",
"Nâng cấp hoàn tất.",
diff --git a/src/krux/translations/zh.py b/src/krux/translations/zh.py
index dbaf70a77..d9158fb15 100644
--- a/src/krux/translations/zh.py
+++ b/src/krux/translations/zh.py
@@ -329,6 +329,7 @@
"测试套件结果",
"测试:",
"文本",
+ "费用可能高于显示的金额.",
"主题",
"热敏",
"要确保数据不可恢复,请使用擦除设备功能",
@@ -341,6 +342,7 @@
"输入私钥",
"撤销",
"单位",
+ "未验证的输入金额!",
"更新KEF ID ?",
"更新二维码标签?",
"升级已完成.",
From 48920c31280cda2a68eab6d79d791414e5d924fe Mon Sep 17 00:00:00 2001
From: odudex
Date: Fri, 31 Jul 2026 09:49:29 -0300
Subject: [PATCH 11/28] docs: add PSBT input amount fixes to CHANGELOG
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29f554257..c8efbc588 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
### Security Fixes
- Camera entropy: fix a heap buffer overflow in the Shannon entropy module. Only the Maix Bit could trigger it, a device discontinued in 25.09.0 with no known users; every other device feeds the module a frame that fits. The module copied the whole frame into a fixed 320x240 RGB565 (153,600 byte) scratch buffer, so the Maix Bit's larger CIF frames (352x288 RGB565, 202,752 bytes) wrote 49,152 bytes past the end. The scratch copy has been removed entirely, the read length is now capped and rounded to whole pixels, and the CIF path is gone along with the Maix Bit
+- PSBT: stricter checks on the calculation of fee shown on screen
+- PSBT: warn before signing when the wallet coordinator did not send enough data to confirm those amounts
### Removed Maix Bit Code
All Maix Bit support has been removed from the source tree, including its firmware build project. Support for the device was discontinued in 25.09.0, which at the time kept the build parameters available; those are now gone too. The OV5642 sensor handling, used only by that device, was removed along with it.
@@ -12,8 +14,10 @@ Added vertical layout option for Stackbit 1248 backup display, allowing users to
### Migrate UR encoding to uUR C module
Switch from the pure-Python urtypes and foundation-ur-py packages to the new uUR C module, allowing faster UR QR codes decoding with a smaller RAM footprint. Tests and the simulator now build the same module for CPython instead of shimming the pure-Python packages, so host and device run identical UR code.
+
### Other Bug Fixes and Improvements
- Remove the unused `os.urandom()` from the MaixPy firmware. It was never called by Krux and played no part in generating keys or mnemonics, which draw entropy from the camera or dice. It was backed by a deterministic PRNG, so it has been removed to keep it from being mistaken for a secure source later
+- Fix display of negative amounts
- Improve scan TinySeed and other binary visibility by drawing punches only
- Added `flash_success` method to standardize green success flashes across confirmation screens
- Update Embit to latest - 3ae0ef2
From f15308e463079a9f87d2d23240f101bc5edc7daf Mon Sep 17 00:00:00 2001
From: odudex
Date: Fri, 31 Jul 2026 18:26:48 -0300
Subject: [PATCH 12/28] fix: register embed_fire in the bdftokff device list
The device was added in 26.03.0 but never listed, so glyph generation fell
through to the unmapped-device branch and printed an error on every run.
That branch happened to write the same 16px font, so the generated files
are unchanged by this.
---
firmware/font/bdftokff.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/firmware/font/bdftokff.py b/firmware/font/bdftokff.py
index 36a482497..72745f4bd 100644
--- a/firmware/font/bdftokff.py
+++ b/firmware/font/bdftokff.py
@@ -55,6 +55,7 @@
"tzt",
"wonder_k",
"yahboom_devkit",
+ "embed_fire",
]
BIG_FONT_DEVICES_TO_COPY = []
From a932922869c8d8411707f042f2872531ef917280 Mon Sep 17 00:00:00 2001
From: odudex
Date: Fri, 31 Jul 2026 18:26:48 -0300
Subject: [PATCH 13/28] chore: bump MaixPy with updated glyphs
---
firmware/MaixPy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/firmware/MaixPy b/firmware/MaixPy
index fbc30a5ca..4f0721d05 160000
--- a/firmware/MaixPy
+++ b/firmware/MaixPy
@@ -1 +1 @@
-Subproject commit fbc30a5cafa92f268fbf391055005ec2304fb925
+Subproject commit 4f0721d057a7a3320139cf0fb3c41d277b06ff1f
From dea991df96e524c55932cdddfd0e0810492101ea Mon Sep 17 00:00:00 2001
From: odudex
Date: Fri, 31 Jul 2026 18:40:41 -0300
Subject: [PATCH 14/28] chore: bump version to 26.08.0
---
CHANGELOG.md | 2 +-
mkdocs.yml | 2 +-
pyproject.toml | 2 +-
src/krux/metadata.py | 2 +-
uv.lock | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8efbc588..7656ca3a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changelog 26.05.0 - May 2025
+# Changelog 26.08.0 - May 2025
### Security Fixes
- Camera entropy: fix a heap buffer overflow in the Shannon entropy module. Only the Maix Bit could trigger it, a device discontinued in 25.09.0 with no known users; every other device feeds the module a frame that fits. The module copied the whole frame into a fixed 320x240 RGB565 (153,600 byte) scratch buffer, so the Maix Bit's larger CIF frames (352x288 RGB565, 202,752 bytes) wrote 49,152 bytes past the end. The scratch copy has been removed entirely, the read length is now capped and rounded to whole pixels, and the CIF path is gone along with the Maix Bit
diff --git a/mkdocs.yml b/mkdocs.yml
index 2633d4f46..ca6ecfd86 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -48,7 +48,7 @@ edit_uri: edit/main/docs
docs_dir: docs
site_dir: public
extra:
- latest_krux: krux-v26.04.0
+ latest_krux: krux-v26.08.0
latest_installer: v0.0.21
latest_installer_rpm: krux_installer-0.0.21-1.x86_64.rpm
latest_installer_deb: krux_installer_0.0.21_amd64.deb
diff --git a/pyproject.toml b/pyproject.toml
index 8293440ab..5fc06b1a9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@
[project]
name = "krux"
-version = "26.04.0"
+version = "26.08.0"
description = "Open-source signing device firmware for Bitcoin"
authors = [{ name = "Jeff S", email = "jeffreesun@protonmail.com" }]
readme = "README.md"
diff --git a/src/krux/metadata.py b/src/krux/metadata.py
index 0dc9bdba8..29084791e 100644
--- a/src/krux/metadata.py
+++ b/src/krux/metadata.py
@@ -19,5 +19,5 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-VERSION = "26.04.0"
+VERSION = "26.08.0"
SIGNER_PUBKEY = "03339e883157e45891e61ca9df4cd3bb895ef32d475b8e793559ea10a36766689b"
diff --git a/uv.lock b/uv.lock
index 18600e024..f09467cd1 100644
--- a/uv.lock
+++ b/uv.lock
@@ -263,7 +263,7 @@ wheels = [
[[package]]
name = "krux"
-version = "26.4.0"
+version = "26.8.0"
source = { virtual = "." }
dependencies = [
{ name = "embit" },
From 74d6ed407b06f648099f678bc920537da63198da Mon Sep 17 00:00:00 2001
From: odudex
Date: Sat, 1 Aug 2026 09:39:59 -0300
Subject: [PATCH 15/28] chore(Maixpy): bump cUR
---
firmware/MaixPy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/firmware/MaixPy b/firmware/MaixPy
index 4f0721d05..4c1c0880d 160000
--- a/firmware/MaixPy
+++ b/firmware/MaixPy
@@ -1 +1 @@
-Subproject commit 4f0721d057a7a3320139cf0fb3c41d277b06ff1f
+Subproject commit 4c1c0880d7f77358084c123383bcbc7fac9a8fd2
From 4c05cefbf3afc941996a37689489c3b2ee7fa086 Mon Sep 17 00:00:00 2001
From: odudex
Date: Sat, 1 Aug 2026 10:38:00 -0300
Subject: [PATCH 16/28] docs: update CHANGELOG
---
CHANGELOG.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7656ca3a7..d60032132 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,12 +20,20 @@ Switch from the pure-Python urtypes and foundation-ur-py packages to the new uUR
- Fix display of negative amounts
- Improve scan TinySeed and other binary visibility by drawing punches only
- Added `flash_success` method to standardize green success flashes across confirmation screens
-- Update Embit to latest - 3ae0ef2
+- Update Embit to latest - fff7ffa
- Replace custom quirc (library to decode QR codes from images) with k_quirc
- Fix default theme contrast failures for Light, CypherPink, network
indicators, and Amigo info panels
- Simplify generated-mnemonic confirmation with `Continue` and grouped
`Wallet Options`
+- Stored mnemonics: a corrupt `seeds.json` is now reported and kept intact
+ instead of being overwritten when storing a new mnemonic
+- Reject Base58 addresses whose version byte matches no network, previously
+ accepted as valid when verifying an address
+- Settings: malformed `settings.json` content is handled without errors, and
+ reading a setting no longer writes back to storage
+- Hide the QR code title in line and region view modes, where it overlapped
+ the part index
# Changelog 26.04.0 - April 2025
From 0b3e01b74307278250010980147d964a404d6a30 Mon Sep 17 00:00:00 2001
From: odudex
Date: Sat, 1 Aug 2026 11:03:26 -0300
Subject: [PATCH 17/28] fix: bind BBQr parts to the first part of the stream
Reject parts that disagree with the first part's encoding, file type or
total, or that conflict with content already stored at the same index.
Bound the accumulated payload at the base32 expansion of the deflate
decompression limit.
---
src/krux/bbqr.py | 9 +++++++
src/krux/qr.py | 17 +++++++++++++-
tests/test_qr.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/src/krux/bbqr.py b/src/krux/bbqr.py
index 71918cab2..6f9fb7be6 100644
--- a/src/krux/bbqr.py
+++ b/src/krux/bbqr.py
@@ -35,6 +35,15 @@
BBQR_ALWAYS_COMPRESS_THRESHOLD = 5000 # bytes
+# Upper bound for the accumulated payload of an animated BBQr, in chars.
+# The header encodes the part total as 2 base36 chars, so a crafted stream may
+# announce up to 1295 parts and keep the parser accumulating them. A part count
+# limit can't be used here: small screens generate many small parts, so a few KB
+# PSBT already takes more than a hundred of them. Bound the total instead, at the
+# base32 expansion (8/5) of the 100 KB decompression limit. Anything above it
+# could not be decoded anyway.
+BBQR_MAX_PAYLOAD_LEN = 160 * 1024
+
class BBQrCode:
"""A BBQr code, containing the data, encoding, and file type"""
diff --git a/src/krux/qr.py b/src/krux/qr.py
index ba1b64c84..02a81336a 100644
--- a/src/krux/qr.py
+++ b/src/krux/qr.py
@@ -131,6 +131,7 @@ class QRPartParser:
def __init__(self):
self.parts = {}
+ self.payload_len = 0
self.total = -1
self.format = None
self.decoder = None
@@ -188,9 +189,23 @@ def parse(self, data):
):
raise ValueError("Failed to decode UR")
elif self.format == FORMAT_BBQR:
- from .bbqr import parse_bbqr
+ from .bbqr import parse_bbqr, BBQR_MAX_PAYLOAD_LEN
part, index, total = parse_bbqr(data)
+ # Only the first part is passed to detect_format, and its encoding and
+ # file type are used to decode all of them. Parts of a BBQr aren't bound
+ # to each other by any checksum, so reject the ones that disagree with
+ # the first instead of splicing different streams into a corrupt result.
+ if data[2] != self.bbqr.encoding or data[3] != self.bbqr.file_type:
+ raise ValueError("BBQr header mismatch")
+ if self.total not in (-1, total):
+ raise ValueError("BBQr part total mismatch")
+ if self.parts.get(index, part) != part:
+ raise ValueError("Conflicting BBQr part")
+ if index not in self.parts:
+ self.payload_len += len(part)
+ if self.payload_len > BBQR_MAX_PAYLOAD_LEN:
+ raise ValueError("BBQr payload too big")
self.parts[index] = part
self.total = total
return index
diff --git a/tests/test_qr.py b/tests/test_qr.py
index ccff2fa96..7371f3171 100644
--- a/tests/test_qr.py
+++ b/tests/test_qr.py
@@ -279,6 +279,67 @@ def test_parse_pmofn_rejects_invalid_index(m5stickv):
parse_pmofn_qr_part("p4of3 data")
+def test_parser_rejects_bbqr_header_mismatch(m5stickv):
+ """Parts must agree with the encoding and file type of the first part,
+ which is the one detect_format used to set up decoding"""
+ from krux.qr import QRPartParser
+
+ parser = QRPartParser()
+ parser.parse("B$HP0200414243")
+
+ with pytest.raises(ValueError, match="BBQr header mismatch"):
+ parser.parse("B$ZU0201444546")
+
+ assert parser.parts == {0: "414243"}
+
+
+def test_parser_rejects_bbqr_total_mismatch(m5stickv):
+ """A part announcing a different total belongs to another stream"""
+ from krux.qr import QRPartParser
+
+ parser = QRPartParser()
+ parser.parse("B$2P0300AAAAAAAA")
+
+ with pytest.raises(ValueError, match="BBQr part total mismatch"):
+ parser.parse("B$2P0100MZXW6YTB")
+
+ assert parser.total == 3
+ assert not parser.is_complete()
+
+
+def test_parser_rejects_conflicting_bbqr_part(m5stickv):
+ """The same index can be re-scanned, but not with different content"""
+ from krux.qr import QRPartParser
+
+ parser = QRPartParser()
+ parser.parse("B$2P0200AAAAAAAA")
+ parser.parse("B$2P0200AAAAAAAA") # redundant scan of the same part is fine
+
+ with pytest.raises(ValueError, match="Conflicting BBQr part"):
+ parser.parse("B$2P0200MZXW6YTB")
+
+ assert parser.parts == {0: "AAAAAAAA"}
+
+
+def test_parser_rejects_oversized_bbqr_payload(m5stickv):
+ """Accumulated payload is bounded, a stream above it could not be decoded"""
+ from krux.qr import QRPartParser
+ from krux.bbqr import BBQR_MAX_PAYLOAD_LEN, int2base36
+
+ parser = QRPartParser()
+ part_size = 8192
+ parts = BBQR_MAX_PAYLOAD_LEN // part_size + 1
+ for index in range(parts - 1):
+ parser.parse(
+ "B$2P%s%s%s" % (int2base36(parts), int2base36(index), "A" * part_size)
+ )
+
+ with pytest.raises(ValueError, match="BBQr payload too big"):
+ parser.parse(
+ "B$2P%s%s%s" % (int2base36(parts), int2base36(parts - 1), "A" * part_size)
+ )
+
+
def test_detect_format_propagates_base_exceptions(mocker, m5stickv):
"""detect_format catches genuine parsing errors (returns FORMAT_NONE) but
must NOT swallow BaseException-level signals like KeyboardInterrupt.
From ec058d862b00a62bd06ec7932b31f007fc2b77e3 Mon Sep 17 00:00:00 2001
From: odudex
Date: Mon, 3 Aug 2026 14:55:27 -0300
Subject: [PATCH 18/28] docs: update CHANGELOG
---
CHANGELOG.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d60032132..e1bf93257 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changelog 26.08.0 - May 2025
+# Changelog 26.08.0 - August 2026
### Security Fixes
- Camera entropy: fix a heap buffer overflow in the Shannon entropy module. Only the Maix Bit could trigger it, a device discontinued in 25.09.0 with no known users; every other device feeds the module a frame that fits. The module copied the whole frame into a fixed 320x240 RGB565 (153,600 byte) scratch buffer, so the Maix Bit's larger CIF frames (352x288 RGB565, 202,752 bytes) wrote 49,152 bytes past the end. The scratch copy has been removed entirely, the read length is now capped and rounded to whole pixels, and the CIF path is gone along with the Maix Bit
@@ -35,7 +35,7 @@ Switch from the pure-Python urtypes and foundation-ur-py packages to the new uUR
- Hide the QR code title in line and region view modes, where it overlapped
the part index
-# Changelog 26.04.0 - April 2025
+# Changelog 26.04.0 - April 2026
### Security Fixes
- Reject PSBT inputs with non-standard sighash types before signing
@@ -50,7 +50,7 @@ Switch from the pure-Python urtypes and foundation-ur-py packages to the new uUR
- File manager: filter "."/".." and entries containing path separators from SD listings, blocking directory traversal via crafted FAT entries
- KEF decryption: in-session exponential backoff (1s, 2s, 4s … capped at 30s) on failed attempts, slowing interactive brute forcing without persisting lockout state to flash
-# Changelog 26.03.0 - March 2025
+# Changelog 26.03.0 - March 2026
### New Device Support: Embed Fire
This device shares similarities with the WonderMV but stands out with its larger 2.4" touchscreen.
From 1967e16b4ec09dfa7b8d550ad14c5340b8b8196e Mon Sep 17 00:00:00 2001
From: odudex
Date: Thu, 6 Aug 2026 14:04:54 -0300
Subject: [PATCH 19/28] docs: add Jean Do as security contact
---
SECURITY.md | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/SECURITY.md b/SECURITY.md
index 48fe20814..494c94e94 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,11 +1,14 @@
# Security policy
Please report any vulnerability or any bug that could potentially affect the
-security of users' funds by mail to
-[`odudex@proton.me`](mailto:odudex@proton.me).
+security of users' funds by mail to both of these addresses:
-You may use the [PGP public](https://github.com/odudex.gpg) key to encrypt your
-mail.
+- [`jean.dominique.lecomte.delisle@proton.me`](mailto:jean.dominique.lecomte.delisle@proton.me)
+- [`odudex@proton.me`](mailto:odudex@proton.me)
+
+You may use our PGP public keys to encrypt your mail:
+[Jean Do](https://github.com/jdlcdl.gpg),
+[odudex](https://github.com/odudex.gpg).
In the subject type `[Krux firmware] Security Report: `
and in the body a long description describing the issue. We aim to respond
From ddea2c2c11459e24efb9a0172102a25a01c51386 Mon Sep 17 00:00:00 2001
From: odudex
Date: Sun, 9 Aug 2026 21:25:28 -0300
Subject: [PATCH 20/28] feat: add R&D focus disclaimer, acknowledged once per
version at boot
Shown on the About page and, until acknowledged for the running version, before the application can be used. The acknowledged version is stored on flash, so a firmware update shows it again.
---
i18n/translations/de-DE.json | 4 +
i18n/translations/es-MX.json | 4 +
i18n/translations/fr-FR.json | 4 +
i18n/translations/ja-JP.json | 4 +
i18n/translations/ko-KR.json | 4 +
i18n/translations/nl-NL.json | 4 +
i18n/translations/pt-BR.json | 4 +
i18n/translations/ru-RU.json | 4 +
i18n/translations/tr-TR.json | 4 +
i18n/translations/vi-VN.json | 4 +
i18n/translations/zh-CN.json | 4 +
src/boot.py | 20 +++++
src/krux/krux_settings.py | 3 +
src/krux/pages/disclaimer.py | 141 ++++++++++++++++++++++++++++++
src/krux/pages/login.py | 7 ++
src/krux/translations/__init__.py | 4 +
src/krux/translations/de.py | 4 +
src/krux/translations/es.py | 4 +
src/krux/translations/fr.py | 4 +
src/krux/translations/ja.py | 4 +
src/krux/translations/ko.py | 4 +
src/krux/translations/nl.py | 4 +
src/krux/translations/pt.py | 4 +
src/krux/translations/ru.py | 4 +
src/krux/translations/tr.py | 4 +
src/krux/translations/vi.py | 4 +
src/krux/translations/zh.py | 4 +
tests/pages/test_disclaimer.py | 115 ++++++++++++++++++++++++
tests/pages/test_login.py | 12 +++
29 files changed, 390 insertions(+)
create mode 100644 src/krux/pages/disclaimer.py
create mode 100644 tests/pages/test_disclaimer.py
diff --git a/i18n/translations/de-DE.json b/i18n/translations/de-DE.json
index ff4c88970..65895ca4c 100644
--- a/i18n/translations/de-DE.json
+++ b/i18n/translations/de-DE.json
@@ -127,10 +127,12 @@
"Hexadecimal": "Hexadezimal",
"Hide Mnemonics": "Mnemonics ausblenden",
"High fees!": "Hohe Gebühren!",
+ "I understand": "Ich verstehe",
"ID": "ID",
"ID already exists": "ID existiert bereits",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "Wenn Ihr Gerätedisplay nach dieser Änderung nicht funktioniert, wird es nach 5 Sekunden automatisch mit den vorherigen Einstellungen neu gestartet.",
"Index": "Index",
+ "Innovative features may have undiscovered flaws that endanger funds.": "Innovative Funktionen können unentdeckte Fehler haben, die Gelder gefährden.",
"Inputs (%d):": "Input (%d):",
"Insufficient entropy!": "Unzureichende Entropie!",
"Invalid Tamper Check Code": "Ungültiger Tamper Check Code",
@@ -144,6 +146,7 @@
"Key": "Schlüssel",
"Key was not provided": "Schlüssel wurde nicht zur Verfügung gestellt",
"Krux Printer Test QR": "Krux Drucker Test-QR",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux ist ein Forschungs- und Entwicklungsprojekt, von Nerds für eigene Interessen gebaut, offen für die Welt.",
"LCD Type": "LCD-Typ",
"Language": "Sprache",
"Leave blank if you'd like Krux to pick a valid final word": "Lassen Sie das Feld leer, wenn Sie möchten, dass Krux ein gültiges letztes Wort auswählt",
@@ -330,6 +333,7 @@
"Use default Mode?": "Standard verwenden?",
"Use default PBKDF2 iter.?": "Standard-PBKDF2-Iteration verwenden.?",
"Use fingerprint as ID?": "Fingerabdruck als ID verwenden?",
+ "Use it at your own risk.": "Nutzung auf eigene Gefahr.",
"Used:": "Belegt:",
"User's Data": "Benutzerdaten",
"Value %s out of range: [%s, %s]": "Wert %S außerhalb des Bereichs: [ %s, %s]",
diff --git a/i18n/translations/es-MX.json b/i18n/translations/es-MX.json
index 640ac8695..dab908a36 100644
--- a/i18n/translations/es-MX.json
+++ b/i18n/translations/es-MX.json
@@ -127,10 +127,12 @@
"Hexadecimal": "Hexadecimal",
"Hide Mnemonics": "Ocultar Mnemónicos",
"High fees!": "¡Tarifas altas!",
+ "I understand": "Entiendo",
"ID": "Identificador",
"ID already exists": "ID ya existe",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "Si la pantalla de su dispositivo no funciona después de este cambio, se reiniciará automáticamente con la configuración anterior después de 5 segundos.",
"Index": "Índice",
+ "Innovative features may have undiscovered flaws that endanger funds.": "Las funciones innovadoras pueden tener fallos no descubiertos que arriesguen los fondos.",
"Inputs (%d):": "Entradas (%d):",
"Insufficient entropy!": "¡Entropía Insuficiente!",
"Invalid Tamper Check Code": "Código de verificación no válido",
@@ -144,6 +146,7 @@
"Key": "Clave",
"Key was not provided": "No se proporcionó la clave",
"Krux Printer Test QR": "Test de impresión QR",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux es un proyecto de investigación y desarrollo, hecho por nerds para sus propios intereses, abierto al mundo.",
"LCD Type": "Tipo de LCD",
"Language": "Idioma",
"Leave blank if you'd like Krux to pick a valid final word": "Déjalo en blanco si quieres que Krux elija una última palabra válida",
@@ -330,6 +333,7 @@
"Use default Mode?": "¿Usar el modo predeterminado?",
"Use default PBKDF2 iter.?": "Utilice el iter PBKDF2 predeterminado.?",
"Use fingerprint as ID?": "¿Usar huella dactilar como identificación?",
+ "Use it at your own risk.": "Úsalo bajo tu propio riesgo.",
"Used:": "Usado:",
"User's Data": "Usuario",
"Value %s out of range: [%s, %s]": "Valor %s fuera del rango: [ %s, %s]",
diff --git a/i18n/translations/fr-FR.json b/i18n/translations/fr-FR.json
index b3808148e..e955376e7 100644
--- a/i18n/translations/fr-FR.json
+++ b/i18n/translations/fr-FR.json
@@ -127,10 +127,12 @@
"Hexadecimal": "Hexadécimal",
"Hide Mnemonics": "Masquer les mnémoniques",
"High fees!": "Frais élevés !",
+ "I understand": "Je comprends",
"ID": "ID",
"ID already exists": "Id existe déjà",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "En cas d'échec d'affichage, l'appareil redémarrera automatiquement après 5 secondes utilisant les paramètres précédents.",
"Index": "Index",
+ "Innovative features may have undiscovered flaws that endanger funds.": "Les fonctions innovantes peuvent avoir des défauts non découverts qui mettent les fonds en danger.",
"Inputs (%d):": "Entrées (%d) :",
"Insufficient entropy!": "Entropie insuffisante !",
"Invalid Tamper Check Code": "Code de non compromis non valide",
@@ -144,6 +146,7 @@
"Key": "Clé",
"Key was not provided": "La clé n'a pas été fournie",
"Krux Printer Test QR": "Test de l'imprimante Krux QR",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux est un projet de recherche et développement, créé par des passionnés pour leurs propres intérêts, ouvert au monde.",
"LCD Type": "Type d'écran LCD",
"Language": "Langue",
"Leave blank if you'd like Krux to pick a valid final word": "Laissez vide si vous souhaitez que Krux choisisse un dernier mot valide",
@@ -330,6 +333,7 @@
"Use default Mode?": "Utiliser le mode par défaut ?",
"Use default PBKDF2 iter.?": "Utiliser l'itération PBKDF2 par défaut. ?",
"Use fingerprint as ID?": "Utiliser l'empreinte digitale comme pièce d'identité ?",
+ "Use it at your own risk.": "À utiliser à vos propres risques.",
"Used:": "Utilisé :",
"User's Data": "Utilisateur",
"Value %s out of range: [%s, %s]": "Valeur %s hors de portée: [%s, %s]",
diff --git a/i18n/translations/ja-JP.json b/i18n/translations/ja-JP.json
index 8706d5292..47a6d67be 100644
--- a/i18n/translations/ja-JP.json
+++ b/i18n/translations/ja-JP.json
@@ -127,10 +127,12 @@
"Hexadecimal": "エクサデシマル",
"Hide Mnemonics": "Mnemonicsを隠す",
"High fees!": "高い手数料!",
+ "I understand": "理解しました",
"ID": "ID",
"ID already exists": "IDはすでに存在します",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "この変更後にデバイスのディスプレイが動作しない場合、5秒後に以前の設定で自動的に再起動します.",
"Index": "インデックス",
+ "Innovative features may have undiscovered flaws that endanger funds.": "革新的な機能には未発見の欠陥があり、資金を危険にさらす可能性があります。",
"Inputs (%d):": "インプット(%d):",
"Insufficient entropy!": "不十分なエントロピー!",
"Invalid Tamper Check Code": "無効な改ざんチェックコード",
@@ -144,6 +146,7 @@
"Key": "キー",
"Key was not provided": "キーが提供されていません",
"Krux Printer Test QR": "KruxプリンターテストQR",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Kruxは研究開発プロジェクトです。オタクが自分の興味のために作り、世界に公開しています。",
"LCD Type": "LCDタイプ",
"Language": "言語 ",
"Leave blank if you'd like Krux to pick a valid final word": "有効な最終単語をKruxに選んでもらいたい場合は、空白のままにしてください",
@@ -330,6 +333,7 @@
"Use default Mode?": "1行目をデフォルトにする",
"Use default PBKDF2 iter.?": "デフォルトのPBKDF 2イテールを使用します.",
"Use fingerprint as ID?": "指紋をIDとして使用しますか?",
+ "Use it at your own risk.": "自己責任でご使用ください。",
"Used:": "使用済み:",
"User's Data": "ユーザーのデータ",
"Value %s out of range: [%s, %s]": "値%sが範囲外です: [ %s, %s]",
diff --git a/i18n/translations/ko-KR.json b/i18n/translations/ko-KR.json
index 26ccfcb34..b69ce408d 100644
--- a/i18n/translations/ko-KR.json
+++ b/i18n/translations/ko-KR.json
@@ -127,10 +127,12 @@
"Hexadecimal": "16진수",
"Hide Mnemonics": "니모닉 숨기기",
"High fees!": "수수료가 높습니다!",
+ "I understand": "이해했습니다",
"ID": "ID",
"ID already exists": "아이디가 이미 존재합니다",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "이 변경 후에도 장치 디스플레이가 작동하지 않으면 5초 후에 이전 설정으로 자동으로 재부팅됩니다.",
"Index": "인덱스",
+ "Innovative features may have undiscovered flaws that endanger funds.": "혁신적인 기능에는 발견되지 않은 결함이 있어 자금을 위험에 빠뜨릴 수 있습니다.",
"Inputs (%d):": "Input (%d):",
"Insufficient entropy!": "엔트로피가 충분하지 않습니다!",
"Invalid Tamper Check Code": "유효하지 않은 탬퍼 체크 코드",
@@ -144,6 +146,7 @@
"Key": "키",
"Key was not provided": "키가 제공되지 않았습니다",
"Krux Printer Test QR": "Krux 프린터 테스트 QR",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux는 괴짜들이 자신의 관심사를 위해 만들어 세상에 공개한 연구 개발 프로젝트입니다.",
"LCD Type": "LCD 유형",
"Language": "언어",
"Leave blank if you'd like Krux to pick a valid final word": "마지막 단어를 Krux가 선택하도록 하려면 비워두십시오",
@@ -330,6 +333,7 @@
"Use default Mode?": "기본 모드를 사용하시겠습니까?",
"Use default PBKDF2 iter.?": "기본 PBKDF2 반복문을 사용하십시오.?",
"Use fingerprint as ID?": "지문을 신분증으로 사용하시겠어요?",
+ "Use it at your own risk.": "본인 책임하에 사용하십시오.",
"Used:": "이미 사용됨:",
"User's Data": "사용자 데이터",
"Value %s out of range: [%s, %s]": "%s는 [%s, %s] 범위를 벗어났습니다",
diff --git a/i18n/translations/nl-NL.json b/i18n/translations/nl-NL.json
index 8741a29d3..8942628fa 100644
--- a/i18n/translations/nl-NL.json
+++ b/i18n/translations/nl-NL.json
@@ -127,10 +127,12 @@
"Hexadecimal": "Hexadecimaal",
"Hide Mnemonics": "Verberg geheugensteunen",
"High fees!": "Hoge kosten!",
+ "I understand": "Ik begrijp het",
"ID": "ID",
"ID already exists": "ID bestaat al",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "Als het scherm van uw apparaat na deze wijziging niet werkt, wordt het na 5 seconden automatisch opnieuw opgestart met de vorige instellingen.",
"Index": "Index",
+ "Innovative features may have undiscovered flaws that endanger funds.": "Innovatieve functies kunnen onontdekte fouten bevatten die tegoeden in gevaar brengen.",
"Inputs (%d):": "Invoer (%d):",
"Insufficient entropy!": "Onvoldoende Entropie!",
"Invalid Tamper Check Code": "Ongeldige sabotagecontrolecode",
@@ -144,6 +146,7 @@
"Key": "Sleutel",
"Key was not provided": "Sleutel niet verstrekt",
"Krux Printer Test QR": "Krux printer test QR",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux is een onderzoeks- en ontwikkelproject, gemaakt door nerds voor hun eigen interesses, open voor de wereld.",
"LCD Type": "LCD-type",
"Language": "Taal",
"Leave blank if you'd like Krux to pick a valid final word": "Laat leeg als je wilt dat Krux een geldig laatste woord kiest",
@@ -330,6 +333,7 @@
"Use default Mode?": "Standaard gebruiken?",
"Use default PBKDF2 iter.?": "Standaard PBKDF2-iter gebruiken.?",
"Use fingerprint as ID?": "Vingerafdruk gebruiken als ID?",
+ "Use it at your own risk.": "Gebruik op eigen risico.",
"Used:": "Gebruikt:",
"User's Data": "Gebruiker",
"Value %s out of range: [%s, %s]": "Waarde %s is buiten bereik: [%s, %s]",
diff --git a/i18n/translations/pt-BR.json b/i18n/translations/pt-BR.json
index fbbc5b094..cb70e7a38 100644
--- a/i18n/translations/pt-BR.json
+++ b/i18n/translations/pt-BR.json
@@ -127,10 +127,12 @@
"Hexadecimal": "Hexadecimal",
"Hide Mnemonics": "Ocultar Mnemônicos",
"High fees!": "Taxas altas!",
+ "I understand": "Eu entendo",
"ID": "ID",
"ID already exists": "ID já existe",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "Se a tela do seu dispositivo não funcionar após essa alteração, ele será reiniciado automaticamente com as configurações anteriores após 5 segundos.",
"Index": "Índice",
+ "Innovative features may have undiscovered flaws that endanger funds.": "Recursos inovadores podem ter falhas não descobertas que arriscam seus fundos.",
"Inputs (%d):": "Entradas (%d):",
"Insufficient entropy!": "Entropia insuficiente!",
"Invalid Tamper Check Code": "Código de verificação de integridade inválido",
@@ -144,6 +146,7 @@
"Key": "Chave",
"Key was not provided": "A chave não foi fornecida",
"Krux Printer Test QR": "Teste de impressão QR Krux",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux é um projeto de pesquisa e desenvolvimento, feito por nerds para seus próprios interesses, aberto ao mundo.",
"LCD Type": "Tipo de LCD",
"Language": "Idioma",
"Leave blank if you'd like Krux to pick a valid final word": "Deixe em branco se quiser que seja escolhida uma palavra final válida",
@@ -330,6 +333,7 @@
"Use default Mode?": "Usar o modo padrão?",
"Use default PBKDF2 iter.?": "Use o iter de chave padrão.?",
"Use fingerprint as ID?": "Usar fingerprint como ID?",
+ "Use it at your own risk.": "Use por sua conta e risco.",
"Used:": "Usado:",
"User's Data": "Usuário",
"Value %s out of range: [%s, %s]": "Valor %s fora do intervalo: [%s, %s]",
diff --git a/i18n/translations/ru-RU.json b/i18n/translations/ru-RU.json
index 324faf93f..49dab083b 100644
--- a/i18n/translations/ru-RU.json
+++ b/i18n/translations/ru-RU.json
@@ -127,10 +127,12 @@
"Hexadecimal": "Шестнадцатеричный",
"Hide Mnemonics": "Скрыть мнемоники",
"High fees!": "Высокие комиссии!",
+ "I understand": "Я понимаю",
"ID": "Идентификатор",
"ID already exists": "ID уже существует",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "Если после этого изменения дисплей устройства не работает, он автоматически перезагрузится с предыдущими настройками через 5 секунд.",
"Index": "Индекс",
+ "Innovative features may have undiscovered flaws that endanger funds.": "Инновационные функции могут содержать необнаруженные ошибки, угрожающие средствам.",
"Inputs (%d):": "Входы (%d):",
"Insufficient entropy!": "Недостаточная Энтропия!",
"Invalid Tamper Check Code": "Недействительный код проверки вскрытия",
@@ -144,6 +146,7 @@
"Key": "Ключ",
"Key was not provided": "Ключ не предоставлен",
"Krux Printer Test QR": "Тестовый QR Принтера Krux",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux это проект исследований и разработок, созданный энтузиастами для своих интересов и открытый миру.",
"LCD Type": "Тип ЖК-дисплея",
"Language": "Язык",
"Leave blank if you'd like Krux to pick a valid final word": "Оставьте пустым, если хотите, чтобы Krux выбрал подходящее последнее слово",
@@ -330,6 +333,7 @@
"Use default Mode?": "Использовать по умолчанию?",
"Use default PBKDF2 iter.?": "Использовать итер PBKDF2 по умолчанию.?",
"Use fingerprint as ID?": "Использовать отпечаток пальца как ID?",
+ "Use it at your own risk.": "Используйте на свой страх и риск.",
"Used:": "Использовано:",
"User's Data": "Пользователь",
"Value %s out of range: [%s, %s]": "Значение %s вне диапозона: [%s, %s]",
diff --git a/i18n/translations/tr-TR.json b/i18n/translations/tr-TR.json
index f54191ceb..daf9c54f7 100644
--- a/i18n/translations/tr-TR.json
+++ b/i18n/translations/tr-TR.json
@@ -127,10 +127,12 @@
"Hexadecimal": "Onaltılık",
"Hide Mnemonics": "Mnemonic'leri Gizle",
"High fees!": "Yüksek ücret!",
+ "I understand": "Anladım",
"ID": "ID",
"ID already exists": "ID zaten var",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "Bu değişiklikten sonra cihazınızın ekranı çalışmazsa, 5 saniye sonra önceki ayarlarla otomatik olarak yeniden başlatılır.",
"Index": "Dizin",
+ "Innovative features may have undiscovered flaws that endanger funds.": "Yenilikçi özellikler, fonları tehlikeye atan keşfedilmemiş hatalar içerebilir.",
"Inputs (%d):": "Girişler (%d):",
"Insufficient entropy!": "Yetersiz entropi!",
"Invalid Tamper Check Code": "Geçersiz Kurcalama Kontrol Kodu",
@@ -144,6 +146,7 @@
"Key": "Anahtar",
"Key was not provided": "Anahtar sağlanmadı",
"Krux Printer Test QR": "Krux Yazıcı Test QR'ı",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux, meraklıların kendi ilgi alanları için geliştirdiği, dünyaya açık bir araştırma ve geliştirme projesidir.",
"LCD Type": "LCD Tipi",
"Language": "Dil",
"Leave blank if you'd like Krux to pick a valid final word": "Krux'un geçerli bir son kelime seçmesini istiyorsanız boş bırakın",
@@ -330,6 +333,7 @@
"Use default Mode?": "Varsayılanı Kullan?",
"Use default PBKDF2 iter.?": "Varsayılan PBKDF2 yinelemesini kullan.?",
"Use fingerprint as ID?": "Parmak izi ID olarak kullanılmalı mı?",
+ "Use it at your own risk.": "Kendi sorumluluğunuzda kullanın.",
"Used:": "Kullanılan:",
"User's Data": "Kullanıcı",
"Value %s out of range: [%s, %s]": "%s değeri aralık dışında: [%s, %s]",
diff --git a/i18n/translations/vi-VN.json b/i18n/translations/vi-VN.json
index 73184ef5a..ecaaa53d5 100644
--- a/i18n/translations/vi-VN.json
+++ b/i18n/translations/vi-VN.json
@@ -127,10 +127,12 @@
"Hexadecimal": "Thập lục phân",
"Hide Mnemonics": "Ẩn Mnemonics",
"High fees!": "Phí cao!",
+ "I understand": "Tôi hiểu",
"ID": "ID",
"ID already exists": "Id đã tồn tại",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "Nếu màn hình thiết bị của bạn không hoạt động sau khi thay đổi này, màn hình sẽ tự động khởi động lại với các cài đặt trước đó sau 5 giây.",
"Index": "Chỉ mục",
+ "Innovative features may have undiscovered flaws that endanger funds.": "Các tính năng đổi mới có thể có lỗi chưa được phát hiện gây nguy hiểm cho tiền của bạn.",
"Inputs (%d):": "Đầu vào (%d):",
"Insufficient entropy!": "Entropy không đủ!",
"Invalid Tamper Check Code": "Mã kiểm tra giả mạo không hợp lệ",
@@ -144,6 +146,7 @@
"Key": "Chìa khóa",
"Key was not provided": "Khóa không được cung cấp",
"Krux Printer Test QR": "QR kiểm tra máy in Krux",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux là dự án nghiên cứu và phát triển, được tạo bởi những người đam mê cho sở thích riêng, mở cho cả thế giới.",
"LCD Type": "Loại LCD",
"Language": "Ngôn ngữ",
"Leave blank if you'd like Krux to pick a valid final word": "Để trống nếu bạn muốn Krux chọn một từ cuối cùng hợp lệ",
@@ -330,6 +333,7 @@
"Use default Mode?": "Sử dụng Chế độ mặc định?",
"Use default PBKDF2 iter.?": "Sử dụng trình lặp PBKDF2 mặc định.?",
"Use fingerprint as ID?": "Dùng vân tay làm ID?",
+ "Use it at your own risk.": "Sử dụng với rủi ro của riêng bạn.",
"Used:": "Đã sử dụng:",
"User's Data": "Người dùng",
"Value %s out of range: [%s, %s]": "Giá trị %s ngoài phạm vi: [ %s, %s]",
diff --git a/i18n/translations/zh-CN.json b/i18n/translations/zh-CN.json
index 889ef9c22..adc9cdd37 100644
--- a/i18n/translations/zh-CN.json
+++ b/i18n/translations/zh-CN.json
@@ -127,10 +127,12 @@
"Hexadecimal": "十六进制",
"Hide Mnemonics": "隐藏助记词",
"High fees!": "高费用!",
+ "I understand": "我明白",
"ID": "ID",
"ID already exists": "ID 已存在",
"If your device display does not work after this change, it will automatically reboot with previous settings after 5 seconds.": "如果您的设备显示屏在此更改后无法正常工作,它将在5秒后使用以前的设置自动重新启动.",
"Index": "索引",
+ "Innovative features may have undiscovered flaws that endanger funds.": "创新功能可能存在未发现的缺陷,危及您的资金。",
"Inputs (%d):": "输入 (%d):",
"Insufficient entropy!": "熵不足!",
"Invalid Tamper Check Code": "无效的防篡改检查码",
@@ -144,6 +146,7 @@
"Key": "密钥",
"Key was not provided": "未提供密钥",
"Krux Printer Test QR": "Krux 打印机测试二维码",
+ "Krux is a research and development project, made by nerds building tools for their own interests, open to the world.": "Krux 是一个研究与开发项目,由极客为自己的兴趣打造,向世界开放。",
"LCD Type": "LCD 类型",
"Language": "语言",
"Leave blank if you'd like Krux to pick a valid final word": "如果希望 Krux 自动计算最后一位 Checksum,请留空",
@@ -330,6 +333,7 @@
"Use default Mode?": "使用默认模式?",
"Use default PBKDF2 iter.?": "使用默认PBKDF2迭代.?",
"Use fingerprint as ID?": "使用指纹作为身份证件?",
+ "Use it at your own risk.": "使用风险自负。",
"Used:": "已用:",
"User's Data": "用户数据",
"Value %s out of range: [%s, %s]": "值 %s 超出范围:[ %s,%s ]",
diff --git a/src/boot.py b/src/boot.py
index 44f80ac10..47d992dfe 100644
--- a/src/boot.py
+++ b/src/boot.py
@@ -101,6 +101,24 @@ def tc_code_verification(ctx_pin):
return True
+def disclaimer(ctx_disclaimer):
+ """Loads and run the Disclaimer page, unless already acknowledged for this version.
+ Returns False if the user did not acknowledge it
+ """
+ from krux.pages.disclaimer import Disclaimer, acknowledged
+
+ acknowledgment = True
+ if not acknowledged():
+ acknowledgment = Disclaimer(ctx_disclaimer).show(acknowledge=True)
+
+ # Unimport Disclaimer to free memory
+ sys.modules.pop("krux.pages.disclaimer")
+ del sys.modules["krux"].pages.disclaimer
+ del Disclaimer
+
+ return acknowledgment
+
+
def login(ctx_login):
"""Loads and run the Login page"""
from krux.pages.login import Login
@@ -154,6 +172,8 @@ def home(ctx_home):
if not tc_code_verification(ctx):
power_manager.shutdown()
+if not disclaimer(ctx):
+ power_manager.shutdown()
login(ctx)
gc.collect()
home(ctx)
diff --git a/src/krux/krux_settings.py b/src/krux/krux_settings.py
index e19ab91b1..d25808955 100644
--- a/src/krux/krux_settings.py
+++ b/src/krux/krux_settings.py
@@ -49,6 +49,9 @@
TC_CODE_PATH = "/flash/tcc"
TC_CODE_PBKDF2_ITERATIONS = 100000
+# Stores the firmware version the disclaimer was acknowledged for
+DISCLAIMER_PATH = "/flash/disclaimer"
+
DEFAULT_LOCALE = "en-US"
DEFAULT_TX_PIN = (
diff --git a/src/krux/pages/disclaimer.py b/src/krux/pages/disclaimer.py
new file mode 100644
index 000000000..51a1f5035
--- /dev/null
+++ b/src/krux/pages/disclaimer.py
@@ -0,0 +1,141 @@
+# The MIT License (MIT)
+
+# Copyright (c) 2021-2026 Krux contributors
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+from . import Page, Menu, MENU_EXIT, MENU_SHUTDOWN
+from ..display import DEFAULT_PADDING, FONT_HEIGHT
+from ..krux_settings import t, DISCLAIMER_PATH
+from ..themes import theme
+
+
+class Disclaimer(Page):
+ """Research and development disclaimer, shown on the About page and,
+ once per firmware version, before the application can be used
+ """
+
+ def __init__(self, ctx):
+ super().__init__(ctx, None)
+
+ def _pages(self, warning):
+ """Splits the disclaimer text in as many pages as the display requires"""
+
+ paragraphs = [
+ t(
+ "Krux is a research and development project, made by nerds building"
+ " tools for their own interests, open to the world."
+ ),
+ t("Innovative features may have undiscovered flaws that endanger funds."),
+ ]
+
+ # Room left for the text, once the warning and its blank line are placed
+ available_lines = (self.ctx.display.height() - DEFAULT_PADDING) // FONT_HEIGHT
+ if warning:
+ available_lines -= len(self.ctx.display.to_lines(warning)) + 1
+
+ pages = ["\n\n".join(paragraphs)]
+ if (
+ len(self.ctx.display.to_lines(pages[0], available_lines + 1))
+ > available_lines
+ ):
+ # Small displays show one paragraph per page
+ pages = paragraphs
+ return pages
+
+ def show(self, acknowledge=False):
+ """Displays the disclaimer. When acknowledging, a confirmation page is
+ appended and the current version is stored, so it is not shown again
+ """
+
+ warning = t("Use it at your own risk.")
+ # When acknowledging, the warning is shown on the confirmation page
+ warning_lines = 0 if acknowledge else len(self.ctx.display.to_lines(warning))
+
+ pages = self._pages(None if acknowledge else warning)
+ for index, page in enumerate(pages):
+ text_lines = len(self.ctx.display.to_lines(page))
+ last_page = index == len(pages) - 1
+ total_lines = text_lines
+ if last_page and warning_lines:
+ total_lines += warning_lines + 1
+ offset_y = self.ctx.display.get_center_offset_y(total_lines)
+ self.ctx.display.clear()
+ self.ctx.display.draw_hcentered_text(page, offset_y)
+ if last_page and warning_lines:
+ self.ctx.display.draw_hcentered_text(
+ warning,
+ offset_y=offset_y + (text_lines + 1) * FONT_HEIGHT,
+ color=theme.highlight_color,
+ )
+ self.ctx.input.wait_for_button()
+
+ if acknowledge:
+ return self._acknowledge(warning)
+ return True
+
+ def _acknowledge(self, warning):
+ """Requires the user to confirm the warning, then stores the acknowledgment.
+ Returns False if the user chose to shut down instead
+ """
+
+ self.ctx.display.clear()
+ warning_lines = self.ctx.display.draw_hcentered_text(
+ warning, DEFAULT_PADDING, color=theme.highlight_color
+ )
+ menu_offset = DEFAULT_PADDING + (warning_lines + 1) * FONT_HEIGHT
+ menu = Menu(
+ self.ctx,
+ [
+ (t("I understand"), lambda: MENU_EXIT),
+ (t("Shutdown"), self.shutdown),
+ ],
+ offset=menu_offset,
+ back_label=None,
+ )
+ _, status = menu.run_loop()
+ if status == MENU_SHUTDOWN:
+ return False
+ store_acknowledgment()
+ return True
+
+
+def acknowledged():
+ """Returns True if the disclaimer was already acknowledged for this version"""
+
+ from ..metadata import VERSION
+
+ try:
+ with open(DISCLAIMER_PATH, "r") as disclaimer_file:
+ return disclaimer_file.read() == VERSION
+ except OSError:
+ return False
+
+
+def store_acknowledgment():
+ """Stores the version the disclaimer was acknowledged for"""
+
+ from ..metadata import VERSION
+
+ try:
+ with open(DISCLAIMER_PATH, "w") as disclaimer_file:
+ disclaimer_file.write(VERSION)
+ except OSError:
+ # Without storage the disclaimer will be shown again on the next boot
+ pass
diff --git a/src/krux/pages/login.py b/src/krux/pages/login.py
index fedd3bd07..5aa3ad5f1 100644
--- a/src/krux/pages/login.py
+++ b/src/krux/pages/login.py
@@ -404,6 +404,13 @@ def about(self):
import board
from ..metadata import VERSION
from ..qr import FORMAT_NONE
+ from .disclaimer import Disclaimer
+
+ Disclaimer(self.ctx).show()
+
+ # Unimport Disclaimer
+ sys.modules.pop("krux.pages.disclaimer")
+ del sys.modules["krux.pages"].disclaimer
title = "selfcustody.github.io/krux"
msg = (
diff --git a/src/krux/translations/__init__.py b/src/krux/translations/__init__.py
index db1332154..4fff71ce6 100644
--- a/src/krux/translations/__init__.py
+++ b/src/krux/translations/__init__.py
@@ -161,10 +161,12 @@
2691246967,
3903754133,
3876651191,
+ 3172752977,
299066170,
2880010062,
3327483300,
1102202885,
+ 3443175174,
3242179508,
649035497,
3248804547,
@@ -178,6 +180,7 @@
3000888649,
3264569915,
3835918229,
+ 3862270533,
911419226,
766317539,
4180141032,
@@ -364,6 +367,7 @@
3308623336,
2902186319,
1143897823,
+ 2559242947,
3336226318,
3984160815,
4003084591,
diff --git a/src/krux/translations/de.py b/src/krux/translations/de.py
index 84a2f14fb..c138f66f8 100644
--- a/src/krux/translations/de.py
+++ b/src/krux/translations/de.py
@@ -149,10 +149,12 @@
"Hexadezimal",
"Mnemonics ausblenden",
"Hohe Gebühren!",
+ "Ich verstehe",
"ID",
"ID existiert bereits",
"Wenn Ihr Gerätedisplay nach dieser Änderung nicht funktioniert, wird es nach 5 Sekunden automatisch mit den vorherigen Einstellungen neu gestartet.",
"Index",
+ "Innovative Funktionen können unentdeckte Fehler haben, die Gelder gefährden.",
"Input (%d):",
"Unzureichende Entropie!",
"Ungültiger Tamper Check Code",
@@ -166,6 +168,7 @@
"Schlüssel",
"Schlüssel wurde nicht zur Verfügung gestellt",
"Krux Drucker Test-QR",
+ "Krux ist ein Forschungs- und Entwicklungsprojekt, von Nerds für eigene Interessen gebaut, offen für die Welt.",
"LCD-Typ",
"Sprache",
"Lassen Sie das Feld leer, wenn Sie möchten, dass Krux ein gültiges letztes Wort auswählt",
@@ -352,6 +355,7 @@
"Standard verwenden?",
"Standard-PBKDF2-Iteration verwenden.?",
"Fingerabdruck als ID verwenden?",
+ "Nutzung auf eigene Gefahr.",
"Belegt:",
"Benutzerdaten",
"Wert %S außerhalb des Bereichs: [ %s, %s]",
diff --git a/src/krux/translations/es.py b/src/krux/translations/es.py
index e479611a3..39edf61b3 100644
--- a/src/krux/translations/es.py
+++ b/src/krux/translations/es.py
@@ -149,10 +149,12 @@
"Hexadecimal",
"Ocultar Mnemónicos",
"¡Tarifas altas!",
+ "Entiendo",
"Identificador",
"ID ya existe",
"Si la pantalla de su dispositivo no funciona después de este cambio, se reiniciará automáticamente con la configuración anterior después de 5 segundos.",
"Índice",
+ "Las funciones innovadoras pueden tener fallos no descubiertos que arriesguen los fondos.",
"Entradas (%d):",
"¡Entropía Insuficiente!",
"Código de verificación no válido",
@@ -166,6 +168,7 @@
"Clave",
"No se proporcionó la clave",
"Test de impresión QR",
+ "Krux es un proyecto de investigación y desarrollo, hecho por nerds para sus propios intereses, abierto al mundo.",
"Tipo de LCD",
"Idioma",
"Déjalo en blanco si quieres que Krux elija una última palabra válida",
@@ -352,6 +355,7 @@
"¿Usar el modo predeterminado?",
"Utilice el iter PBKDF2 predeterminado.?",
"¿Usar huella dactilar como identificación?",
+ "Úsalo bajo tu propio riesgo.",
"Usado:",
"Usuario",
"Valor %s fuera del rango: [ %s, %s]",
diff --git a/src/krux/translations/fr.py b/src/krux/translations/fr.py
index 65afb9c73..dcef15038 100644
--- a/src/krux/translations/fr.py
+++ b/src/krux/translations/fr.py
@@ -149,10 +149,12 @@
"Hexadécimal",
"Masquer les mnémoniques",
"Frais élevés\u2009!",
+ "Je comprends",
"ID",
"Id existe déjà",
"En cas d'échec d'affichage, l'appareil redémarrera automatiquement après 5 secondes utilisant les paramètres précédents.",
"Index",
+ "Les fonctions innovantes peuvent avoir des défauts non découverts qui mettent les fonds en danger.",
"Entrées (%d)\u2009:",
"Entropie insuffisante\u2009!",
"Code de non compromis non valide",
@@ -166,6 +168,7 @@
"Clé",
"La clé n'a pas été fournie",
"Test de l'imprimante Krux QR",
+ "Krux est un projet de recherche et développement, créé par des passionnés pour leurs propres intérêts, ouvert au monde.",
"Type d'écran LCD",
"Langue",
"Laissez vide si vous souhaitez que Krux choisisse un dernier mot valide",
@@ -352,6 +355,7 @@
"Utiliser le mode par défaut\u2009?",
"Utiliser l'itération PBKDF2 par défaut.\u2009?",
"Utiliser l'empreinte digitale comme pièce d'identité\u2009?",
+ "À utiliser à vos propres risques.",
"Utilisé\u2009:",
"Utilisateur",
"Valeur %s hors de portée: [%s, %s]",
diff --git a/src/krux/translations/ja.py b/src/krux/translations/ja.py
index 5f5946c9b..58bb2a48b 100644
--- a/src/krux/translations/ja.py
+++ b/src/krux/translations/ja.py
@@ -149,10 +149,12 @@
"エクサデシマル",
"Mnemonicsを隠す",
"高い手数料!",
+ "理解しました",
"ID",
"IDはすでに存在します",
"この変更後にデバイスのディスプレイが動作しない場合、5秒後に以前の設定で自動的に再起動します.",
"インデックス",
+ "革新的な機能には未発見の欠陥があり、資金を危険にさらす可能性があります。",
"インプット(%d):",
"不十分なエントロピー!",
"無効な改ざんチェックコード",
@@ -166,6 +168,7 @@
"キー",
"キーが提供されていません",
"KruxプリンターテストQR",
+ "Kruxは研究開発プロジェクトです。オタクが自分の興味のために作り、世界に公開しています。",
"LCDタイプ",
"言語 ",
"有効な最終単語をKruxに選んでもらいたい場合は、空白のままにしてください",
@@ -352,6 +355,7 @@
"1行目をデフォルトにする",
"デフォルトのPBKDF 2イテールを使用します.",
"指紋をIDとして使用しますか?",
+ "自己責任でご使用ください。",
"使用済み:",
"ユーザーのデータ",
"値%sが範囲外です: [ %s, %s]",
diff --git a/src/krux/translations/ko.py b/src/krux/translations/ko.py
index d6888259e..1158e2c4f 100644
--- a/src/krux/translations/ko.py
+++ b/src/krux/translations/ko.py
@@ -149,10 +149,12 @@
"16진수",
"니모닉 숨기기",
"수수료가 높습니다!",
+ "이해했습니다",
"ID",
"아이디가 이미 존재합니다",
"이 변경 후에도 장치 디스플레이가 작동하지 않으면 5초 후에 이전 설정으로 자동으로 재부팅됩니다.",
"인덱스",
+ "혁신적인 기능에는 발견되지 않은 결함이 있어 자금을 위험에 빠뜨릴 수 있습니다.",
"Input (%d):",
"엔트로피가 충분하지 않습니다!",
"유효하지 않은 탬퍼 체크 코드",
@@ -166,6 +168,7 @@
"키",
"키가 제공되지 않았습니다",
"Krux 프린터 테스트 QR",
+ "Krux는 괴짜들이 자신의 관심사를 위해 만들어 세상에 공개한 연구 개발 프로젝트입니다.",
"LCD 유형",
"언어",
"마지막 단어를 Krux가 선택하도록 하려면 비워두십시오",
@@ -352,6 +355,7 @@
"기본 모드를 사용하시겠습니까?",
"기본 PBKDF2 반복문을 사용하십시오.?",
"지문을 신분증으로 사용하시겠어요?",
+ "본인 책임하에 사용하십시오.",
"이미 사용됨:",
"사용자 데이터",
"%s는 [%s, %s] 범위를 벗어났습니다",
diff --git a/src/krux/translations/nl.py b/src/krux/translations/nl.py
index b38632f1f..e0b9c3fdf 100644
--- a/src/krux/translations/nl.py
+++ b/src/krux/translations/nl.py
@@ -149,10 +149,12 @@
"Hexadecimaal",
"Verberg geheugensteunen",
"Hoge kosten!",
+ "Ik begrijp het",
"ID",
"ID bestaat al",
"Als het scherm van uw apparaat na deze wijziging niet werkt, wordt het na 5 seconden automatisch opnieuw opgestart met de vorige instellingen.",
"Index",
+ "Innovatieve functies kunnen onontdekte fouten bevatten die tegoeden in gevaar brengen.",
"Invoer (%d):",
"Onvoldoende Entropie!",
"Ongeldige sabotagecontrolecode",
@@ -166,6 +168,7 @@
"Sleutel",
"Sleutel niet verstrekt",
"Krux printer test QR",
+ "Krux is een onderzoeks- en ontwikkelproject, gemaakt door nerds voor hun eigen interesses, open voor de wereld.",
"LCD-type",
"Taal",
"Laat leeg als je wilt dat Krux een geldig laatste woord kiest",
@@ -352,6 +355,7 @@
"Standaard gebruiken?",
"Standaard PBKDF2-iter gebruiken.?",
"Vingerafdruk gebruiken als ID?",
+ "Gebruik op eigen risico.",
"Gebruikt:",
"Gebruiker",
"Waarde %s is buiten bereik: [%s, %s]",
diff --git a/src/krux/translations/pt.py b/src/krux/translations/pt.py
index addba56d2..01339590f 100644
--- a/src/krux/translations/pt.py
+++ b/src/krux/translations/pt.py
@@ -149,10 +149,12 @@
"Hexadecimal",
"Ocultar Mnemônicos",
"Taxas altas!",
+ "Eu entendo",
"ID",
"ID já existe",
"Se a tela do seu dispositivo não funcionar após essa alteração, ele será reiniciado automaticamente com as configurações anteriores após 5 segundos.",
"Índice",
+ "Recursos inovadores podem ter falhas não descobertas que arriscam seus fundos.",
"Entradas (%d):",
"Entropia insuficiente!",
"Código de verificação de integridade inválido",
@@ -166,6 +168,7 @@
"Chave",
"A chave não foi fornecida",
"Teste de impressão QR Krux",
+ "Krux é um projeto de pesquisa e desenvolvimento, feito por nerds para seus próprios interesses, aberto ao mundo.",
"Tipo de LCD",
"Idioma",
"Deixe em branco se quiser que seja escolhida uma palavra final válida",
@@ -352,6 +355,7 @@
"Usar o modo padrão?",
"Use o iter de chave padrão.?",
"Usar fingerprint como ID?",
+ "Use por sua conta e risco.",
"Usado:",
"Usuário",
"Valor %s fora do intervalo: [%s, %s]",
diff --git a/src/krux/translations/ru.py b/src/krux/translations/ru.py
index cbe7cb372..5e8313dd8 100644
--- a/src/krux/translations/ru.py
+++ b/src/krux/translations/ru.py
@@ -149,10 +149,12 @@
"Шестнадцатеричный",
"Скрыть мнемоники",
"Высокие комиссии!",
+ "Я понимаю",
"Идентификатор",
"ID уже существует",
"Если после этого изменения дисплей устройства не работает, он автоматически перезагрузится с предыдущими настройками через 5 секунд.",
"Индекс",
+ "Инновационные функции могут содержать необнаруженные ошибки, угрожающие средствам.",
"Входы (%d):",
"Недостаточная Энтропия!",
"Недействительный код проверки вскрытия",
@@ -166,6 +168,7 @@
"Ключ",
"Ключ не предоставлен",
"Тестовый QR Принтера Krux",
+ "Krux это проект исследований и разработок, созданный энтузиастами для своих интересов и открытый миру.",
"Тип ЖК-дисплея",
"Язык",
"Оставьте пустым, если хотите, чтобы Krux выбрал подходящее последнее слово",
@@ -352,6 +355,7 @@
"Использовать по умолчанию?",
"Использовать итер PBKDF2 по умолчанию.?",
"Использовать отпечаток пальца как ID?",
+ "Используйте на свой страх и риск.",
"Использовано:",
"Пользователь",
"Значение %s вне диапозона: [%s, %s]",
diff --git a/src/krux/translations/tr.py b/src/krux/translations/tr.py
index 22bea96af..57ce6fa4c 100644
--- a/src/krux/translations/tr.py
+++ b/src/krux/translations/tr.py
@@ -149,10 +149,12 @@
"Onaltılık",
"Mnemonic'leri Gizle",
"Yüksek ücret!",
+ "Anladım",
"ID",
"ID zaten var",
"Bu değişiklikten sonra cihazınızın ekranı çalışmazsa, 5 saniye sonra önceki ayarlarla otomatik olarak yeniden başlatılır.",
"Dizin",
+ "Yenilikçi özellikler, fonları tehlikeye atan keşfedilmemiş hatalar içerebilir.",
"Girişler (%d):",
"Yetersiz entropi!",
"Geçersiz Kurcalama Kontrol Kodu",
@@ -166,6 +168,7 @@
"Anahtar",
"Anahtar sağlanmadı",
"Krux Yazıcı Test QR'ı",
+ "Krux, meraklıların kendi ilgi alanları için geliştirdiği, dünyaya açık bir araştırma ve geliştirme projesidir.",
"LCD Tipi",
"Dil",
"Krux'un geçerli bir son kelime seçmesini istiyorsanız boş bırakın",
@@ -352,6 +355,7 @@
"Varsayılanı Kullan?",
"Varsayılan PBKDF2 yinelemesini kullan.?",
"Parmak izi ID olarak kullanılmalı mı?",
+ "Kendi sorumluluğunuzda kullanın.",
"Kullanılan:",
"Kullanıcı",
"%s değeri aralık dışında: [%s, %s]",
diff --git a/src/krux/translations/vi.py b/src/krux/translations/vi.py
index 9d1f62e24..7720a579e 100644
--- a/src/krux/translations/vi.py
+++ b/src/krux/translations/vi.py
@@ -149,10 +149,12 @@
"Thập lục phân",
"Ẩn Mnemonics",
"Phí cao!",
+ "Tôi hiểu",
"ID",
"Id đã tồn tại",
"Nếu màn hình thiết bị của bạn không hoạt động sau khi thay đổi này, màn hình sẽ tự động khởi động lại với các cài đặt trước đó sau 5 giây.",
"Chỉ mục",
+ "Các tính năng đổi mới có thể có lỗi chưa được phát hiện gây nguy hiểm cho tiền của bạn.",
"Đầu vào (%d):",
"Entropy không đủ!",
"Mã kiểm tra giả mạo không hợp lệ",
@@ -166,6 +168,7 @@
"Chìa khóa",
"Khóa không được cung cấp",
"QR kiểm tra máy in Krux",
+ "Krux là dự án nghiên cứu và phát triển, được tạo bởi những người đam mê cho sở thích riêng, mở cho cả thế giới.",
"Loại LCD",
"Ngôn ngữ",
"Để trống nếu bạn muốn Krux chọn một từ cuối cùng hợp lệ",
@@ -352,6 +355,7 @@
"Sử dụng Chế độ mặc định?",
"Sử dụng trình lặp PBKDF2 mặc định.?",
"Dùng vân tay làm ID?",
+ "Sử dụng với rủi ro của riêng bạn.",
"Đã sử dụng:",
"Người dùng",
"Giá trị %s ngoài phạm vi: [ %s, %s]",
diff --git a/src/krux/translations/zh.py b/src/krux/translations/zh.py
index d9158fb15..7f2306684 100644
--- a/src/krux/translations/zh.py
+++ b/src/krux/translations/zh.py
@@ -149,10 +149,12 @@
"十六进制",
"隐藏助记词",
"高费用!",
+ "我明白",
"ID",
"ID 已存在",
"如果您的设备显示屏在此更改后无法正常工作,它将在5秒后使用以前的设置自动重新启动.",
"索引",
+ "创新功能可能存在未发现的缺陷,危及您的资金。",
"输入 (%d):",
"熵不足!",
"无效的防篡改检查码",
@@ -166,6 +168,7 @@
"密钥",
"未提供密钥",
"Krux 打印机测试二维码",
+ "Krux 是一个研究与开发项目,由极客为自己的兴趣打造,向世界开放。",
"LCD 类型",
"语言",
"如果希望 Krux 自动计算最后一位 Checksum,请留空",
@@ -352,6 +355,7 @@
"使用默认模式?",
"使用默认PBKDF2迭代.?",
"使用指纹作为身份证件?",
+ "使用风险自负。",
"已用:",
"用户数据",
"值 %s 超出范围:[ %s,%s ]",
diff --git a/tests/pages/test_disclaimer.py b/tests/pages/test_disclaimer.py
new file mode 100644
index 000000000..162520e0e
--- /dev/null
+++ b/tests/pages/test_disclaimer.py
@@ -0,0 +1,115 @@
+from unittest.mock import patch
+from . import create_ctx
+
+TEXT = (
+ "Krux is a research and development project, made by nerds building"
+ " tools for their own interests, open to the world."
+ + "\n\n"
+ + "Innovative features may have undiscovered flaws that endanger funds."
+)
+WARNING = "Use it at your own risk."
+
+
+def test_show(mocker, multiple_devices):
+ from krux.pages.disclaimer import Disclaimer
+ from krux.input import BUTTON_ENTER
+
+ BTN_SEQUENCE = [BUTTON_ENTER] # past the disclaimer
+
+ ctx = create_ctx(mocker, BTN_SEQUENCE)
+
+ Disclaimer(ctx).show()
+
+ drawn_texts = [
+ call.args[0] for call in ctx.display.draw_hcentered_text.call_args_list
+ ]
+ assert TEXT in drawn_texts
+ assert WARNING in drawn_texts
+ assert ctx.input.wait_for_button.call_count == len(BTN_SEQUENCE)
+
+
+def test_show_paginated(m5stickv, mocker):
+ from krux.pages.disclaimer import Disclaimer
+ from krux.input import BUTTON_ENTER
+
+ BTN_SEQUENCE = [
+ BUTTON_ENTER, # past the first page
+ BUTTON_ENTER, # past the second page
+ ]
+
+ ctx = create_ctx(mocker, BTN_SEQUENCE)
+ # Text too long for the display, it will be split in two pages
+ ctx.display.to_lines = mocker.MagicMock(return_value=[""] * 20)
+
+ Disclaimer(ctx).show()
+
+ assert ctx.input.wait_for_button.call_count == len(BTN_SEQUENCE)
+
+
+def test_acknowledge_stores_version(mocker, multiple_devices):
+ from krux.pages.disclaimer import Disclaimer
+ from krux.metadata import VERSION
+ from krux.input import BUTTON_ENTER
+ from ..shared_mocks import MockFile, mock_open
+
+ BTN_SEQUENCE = [
+ BUTTON_ENTER, # past the disclaimer
+ BUTTON_ENTER, # "I understand"
+ ]
+
+ ctx = create_ctx(mocker, BTN_SEQUENCE)
+ mock_file = MockFile()
+
+ with patch("builtins.open", mock_open(mock_file)):
+ Disclaimer(ctx).show(acknowledge=True)
+
+ drawn_texts = [
+ call.args[0] for call in ctx.display.draw_hcentered_text.call_args_list
+ ]
+ assert TEXT in drawn_texts
+ assert WARNING in drawn_texts
+ assert mock_file.write_data == VERSION
+
+
+def test_shutdown_instead_of_acknowledging(mocker, multiple_devices):
+ from krux.pages.disclaimer import Disclaimer
+ from krux.input import BUTTON_ENTER, BUTTON_PAGE
+ from ..shared_mocks import MockFile, mock_open
+
+ BTN_SEQUENCE = [
+ BUTTON_ENTER, # past the disclaimer
+ BUTTON_PAGE, # move to "Shutdown"
+ BUTTON_ENTER, # select it
+ BUTTON_ENTER, # confirm "Are you sure?"
+ ]
+
+ ctx = create_ctx(mocker, BTN_SEQUENCE)
+ mock_file = MockFile()
+
+ with patch("builtins.open", mock_open(mock_file)):
+ assert Disclaimer(ctx).show(acknowledge=True) is False
+
+ # Nothing stored, disclaimer will be shown again on the next boot
+ assert not mock_file.write_data
+
+
+def test_acknowledged(m5stickv):
+ from krux.pages.disclaimer import acknowledged
+ from krux.metadata import VERSION
+ from ..shared_mocks import MockFile, mock_open
+
+ with patch("builtins.open", mock_open(MockFile(VERSION))):
+ assert acknowledged() is True
+
+ # Disclaimer acknowledged for an older version
+ with patch("builtins.open", mock_open(MockFile("0.0.0"))):
+ assert acknowledged() is False
+
+
+def test_acknowledged_without_storage(m5stickv):
+ from krux.pages.disclaimer import acknowledged, store_acknowledgment
+
+ with patch("builtins.open", side_effect=OSError):
+ assert acknowledged() is False
+ # Does not raise, disclaimer will be shown again on the next boot
+ store_acknowledgment()
diff --git a/tests/pages/test_login.py b/tests/pages/test_login.py
index 434badc48..3498532cc 100644
--- a/tests/pages/test_login.py
+++ b/tests/pages/test_login.py
@@ -1562,6 +1562,7 @@ def test_about(mocker, multiple_devices):
from krux.qr import FORMAT_NONE
BTN_SEQUENCE = [
+ BUTTON_ENTER, # past disclaimer
BUTTON_ENTER, # past qr_code
]
@@ -1606,6 +1607,17 @@ def test_about(mocker, multiple_devices):
]
login.display_qr_codes.assert_has_calls(display_qr_codes_call)
+ disclaimer = (
+ "Krux is a research and development project, made by nerds building"
+ " tools for their own interests, open to the world."
+ + "\n\n"
+ + "Innovative features may have undiscovered flaws that endanger funds."
+ )
+ drawn_texts = [
+ call.args[0] for call in ctx.display.draw_hcentered_text.call_args_list
+ ]
+ assert disclaimer in drawn_texts
+ assert "Use it at your own risk." in drawn_texts
ctx.display.draw_hcentered_text.assert_has_calls(
[
mocker.call(msg, 250, highlight_prefix=":"),
From eb6a847487b89d109705254d822830c417c5b9e9 Mon Sep 17 00:00:00 2001
From: odudex
Date: Mon, 10 Aug 2026 15:04:29 -0300
Subject: [PATCH 21/28] docs: add R&D disclaimer and mission hardening
The disclaimer shown on the device is now also in the README and in the getting started page. Wording that might resemble marketing was removed.
---
README.md | 4 +++-
docs/faq.en.md | 2 +-
docs/getting-started/index.en.md | 8 +++++++-
docs/index.en.md | 8 +++++---
docs/parts.en.md | 2 +-
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index da06a7faf..7fac51a92 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,14 @@
-Krux is an open-source firmware facilitating the creation of Bitcoin signing devices from readily available components, such as Kendryte K210 devices. It transforms these devices into airgapped tools capable of handling transactions for both single and multisignature wallets, supporting offline signing via QR code or SD card, thus empowering users to securely self-custody their Bitcoin.
+Krux is an open-source firmware facilitating the creation of Bitcoin signing devices from readily available components, such as Kendryte K210 devices. It transforms these devices into airgapped tools capable of handling transactions for both single and multisignature wallets, supporting offline signing via QR code or SD card.
---
## Disclaimer
**WARNING**: *This software has not yet been formally audited by a third party. Use at your own risk!*
+Krux is a research and development project, made by nerds building tools for their own interests, open to the world. Innovative features may have undiscovered flaws that endanger funds.
+
---
# Getting Started
diff --git a/docs/faq.en.md b/docs/faq.en.md
index d794cc0b7..13ab7dcd7 100644
--- a/docs/faq.en.md
+++ b/docs/faq.en.md
@@ -10,7 +10,7 @@ Krux does not include hardware secure elements. The security of stored data reli
## What is the test (beta) version?
The test (beta) version includes the latest and most experimental features, which we occasionally share on our social media. The firmware can be found exclusively in the [test (beta) repository](https://github.com/odudex/krux_binaries). Use and flash the beta firmware if you are curious about new features or want to participate in the development process by hunting bugs, providing feedback, and sharing ideas in our Telegram groups or other social media platforms.
-Just remember that for regular use, use the official versions, which are signed, thoroughly tested, and well documented.
+Just remember that for regular use, use the official versions, which are the signed and documented ones.
## What is Krux Mobile Android app?
diff --git a/docs/getting-started/index.en.md b/docs/getting-started/index.en.md
index 2a774d339..3990d0f8f 100644
--- a/docs/getting-started/index.en.md
+++ b/docs/getting-started/index.en.md
@@ -21,4 +21,10 @@ These wallet coordinators are currently **compatible with Krux**:
- [Electrum Bitcoin Wallet](https://electrum.org/) (desktop / mobile - error 'cannot sign')
-
\ No newline at end of file
+
+
+## Disclaimer
+
+Krux is a research and development project, made by nerds building tools for their own interests, open to the world. Innovative features may have undiscovered flaws that endanger funds.
+
+**Use it at your own risk.**
diff --git a/docs/index.en.md b/docs/index.en.md
index 13e974cfc..ca44750f2 100644
--- a/docs/index.en.md
+++ b/docs/index.en.md
@@ -12,10 +12,12 @@ hide:
-Krux is an open-source firmware that transforms off-the-shelf Kendryte K210 devices, such as the Maix Amigo, M5StickV and [more](parts.md), into versatile bitcoin transaction signers. Beyond its core functionality, Krux is a flexible platform that can adapt to devices with different form factors, providing a suite of tools to assist with the creation and recovery of mnemonic backups, some of which include encryption options for enhanced security.
+Krux is open-source firmware that runs on off-the-shelf Kendryte K210 devices, such as the Maix Amigo, M5StickV and [more](parts.md), turning them into bitcoin transaction signers. It adapts to devices with different form factors and includes tools to create and recover mnemonic backups, some of them with encryption options.
-Devices like the Maix Amigo, Yahboom, WonderMV, TZT or Embed Fire come ready to use, with large touchscreens that make it easy and user-friendly to operate. These devices are ideal for those looking for a plug-and-play solution. On the other hand, Krux also supports development board kits, which are perfect for DIY enthusiasts who enjoy customizing and building their own hardware setups.
+Devices like the Maix Amigo, Yahboom, WonderMV, TZT or Embed Fire come assembled and have touchscreens. Krux also runs on development board kits, which require assembly and, in some cases, soldering.
-Interacting seamlessly with leading coordinator wallets through QR codes, SD cards, and even thermal printers, the user-friendly firmware offers unique features to support transactions and mnemonic backups in an offline environment.
+It interacts with wallet coordinators through QR codes, SD cards and thermal printers, keeping transactions and mnemonic backups in an offline environment.
+
+Krux is a research and development project. Read the [disclaimer](getting-started/index.md#disclaimer) before using it.
To learn more about Krux, check out [Getting Started](getting-started/index.md).
diff --git a/docs/parts.en.md b/docs/parts.en.md
index 9bf5beefe..12362a809 100644
--- a/docs/parts.en.md
+++ b/docs/parts.en.md
@@ -110,7 +110,7 @@ Supported by Krux since September 2024, this touchscreen device features a metal
### TZT
-Supported by Krux since October 2025, this touchscreen device comes in a premium milled aluminum housing and features five buttons. Available through the following distributors:
+Supported by Krux since October 2025, this touchscreen device comes in a milled aluminum housing and features five buttons. Available through the following distributors:
- [AliExpress](https://www.aliexpress.com/w/wholesale-canmv-k210-ai-vision.html)
From 649ea07ddbf6a1e968e6ada9e798e5d781d72fcf Mon Sep 17 00:00:00 2001
From: odudex
Date: Mon, 10 Aug 2026 16:22:56 -0300
Subject: [PATCH 22/28] fix(UI): add "estimated" term to entropy labels
Although space is limited, the addition of the term, coherent with documentation, help inform those who don't read it.
Split the label into a fixed "Estimated entropy:" prefix, drawn once, and a status line with Good, Poor! or Insufficient!, redrawn on change.
Reserve room for the extra line: crop the camera preview where it reached the last text line, and move the flash filling progress bar up.
---
...mnemonic-via-snapshot-capturing-300.en.png | Bin 129155 -> 131381 bytes
...via-snapshot-entropy-estimation-300.en.png | Bin 58194 -> 58544 bytes
...mnemonic-via-snapshot-capturing-250.en.png | Bin 139116 -> 142518 bytes
...via-snapshot-entropy-estimation-250.en.png | Bin 98771 -> 98883 bytes
i18n/translations/de-DE.json | 7 +--
i18n/translations/es-MX.json | 7 +--
i18n/translations/fr-FR.json | 7 +--
i18n/translations/ja-JP.json | 7 +--
i18n/translations/ko-KR.json | 7 +--
i18n/translations/nl-NL.json | 7 +--
i18n/translations/pt-BR.json | 7 +--
i18n/translations/ru-RU.json | 7 +--
i18n/translations/tr-TR.json | 7 +--
i18n/translations/vi-VN.json | 7 +--
i18n/translations/zh-CN.json | 7 +--
src/krux/display.py | 9 +++-
src/krux/pages/capture_entropy.py | 45 ++++++++++++------
src/krux/pages/fill_flash.py | 20 ++++++--
src/krux/pages/new_mnemonic/dice_rolls.py | 2 +-
src/krux/translations/__init__.py | 7 +--
src/krux/translations/de.py | 7 +--
src/krux/translations/es.py | 7 +--
src/krux/translations/fr.py | 7 +--
src/krux/translations/ja.py | 7 +--
src/krux/translations/ko.py | 7 +--
src/krux/translations/nl.py | 7 +--
src/krux/translations/pt.py | 7 +--
src/krux/translations/ru.py | 7 +--
src/krux/translations/tr.py | 7 +--
src/krux/translations/vi.py | 7 +--
src/krux/translations/zh.py | 7 +--
tests/pages/new_mnemonic/test_dice_rolls.py | 4 +-
tests/pages/test_capture_entropy.py | 8 ++--
tests/pages/test_fill_flash.py | 4 +-
34 files changed, 155 insertions(+), 98 deletions(-)
diff --git a/docs/img/maixpy_amigo/new-mnemonic-via-snapshot-capturing-300.en.png b/docs/img/maixpy_amigo/new-mnemonic-via-snapshot-capturing-300.en.png
index a3648fbed54556bb623e5a943dc423885010b839..6989c36d0b3e1953522355c54ff1260b46d13664 100644
GIT binary patch
delta 37040
zcmV)?K!U%6@dven2!ON!vT=WFkfv8vKl=Nv{k(7YTr!i8m}mwtAc#kf2L;cc%7;_s
z4G9Hmar*$6kSbCEgc1u1RMf;OgJl7wA|(`2DQ+cxut+La@B@fipvRKHAN3><$W2Tj
zCNr7LrKh{!_t|Tm4{NRcJa2c;WReM)nb8GFjW$(4u<+px|vC)6x8)486@;3|6
zYw|Xv)5RwxPq%TzZiRsrn05-li?W*d8AE5lrkU<+XrqZ%kl4_Tvo#TJEU-ltBTAT^
zS&&hRXqGZCUP>l(rk~vwgyrJzGr7fp%H_OiVf2Bq9Mu7zw2)gF?iUD2h=4uN
zKX4FB^BSOBzfOs}pOTF!)L`hVV$yZ60`z@F5rG*n(~4Cc@JxTlOfdnl2OV}6$3#g-
z&pNK^^e<}Y%{7>5S716pan?K>p3Skl2+o;I;rLX~W$WPl?KwFy!hn?mK}J*t)isM*
zXaJO_p&i0vUCdnC*Wo#%6IC_z(qoD4OLJDP{Pt&GYZEBL9B$yyp;-u*MN7kv8$}5@
z2s5N5;gO%{>5P8>mq(3EbHW=Bp1l0wkJ(EfO-~>T|CcYUw8cN{s{hj`Q}<~
zWW#Z?B}_*0+{R}BU|z^>aUGj#n#xZL=41dc+`|AVuCy}PTwN-WSqRF>0iB?cH0KX8
z$2OS7H!`@>M8Zak`(O}o_(L}(dw3TuACRM|r%7J3gzkS?rb57!4HFSlR=giG_fY%0
z*g5IAbGmHHO9d?8vDIVtz{6|Yx%(WO9bCcv`wwwxGO@{Y%IS2;?)%1_*fE>4(0Nx3
z!iaNH%*=}e#``m{H`vix4+S{WYD*JG9;~ZkrcS3(2^^gFthL%2zzZi!wk$+fl^UO4
zty(prs@H$1>_j-3cAnQ}!nI!Q!0H^!lPN3w+Avrr0wLHDR-vT9N)Z52W6&xbno27K
zLAAmHOv%2g&CNIgO+jc;_GYG4IrGi}4LSlffx@4+gKgP
ziAj3ab3bduFr#R-_dmrrO1StN2#b8$Vh1BcBZyK8?Faz
z*l%(9RMs75dxUi|D^3>`4}&MIgC<1!Y{b-(;8E~6oejqfH_~8r)_hr`Sc?H((z98qZK|?NIUR);5yor&ksZma
zU@CuFMwo#pz{TgCkDbfQq!=cpU}e4M`n<>L+8Wnpj#In$yAM)I!Gi}6@?4wY9HP~A
zgenT-q~av53Ewcd;yYJGg~K~%>pdXC>f!@{C)ccN#ZiDz!8x*npmSYKt+2O>3bLxA
z!mwO~OI?Sq_UtvotKczJ9A2LTrU9@3OU!?^#e@<`)=^pypr=O9o&SZ!{2O;gP$mVF
zqU5|sjoi@|XbeT!g9)CONs*+eVKtzrv51>eZ0O(99VKk5qA#BKJk0OP7>Sn0w!Lx{
zM^1Mdok%mHgtmBAY_?7(Ql(#7HO8U5MPth?Xx_^zLnN`eCp)*DA5D8QRmM0x1qCoYCVpV~en~N*8_bIye*h9f`nIN(NQPfpwOM)sh
zr>QpQ^)02K6Q7}kKsWIs^Q*Ht=GBX)PD%%7R~7WNhgftEGoU*1zLS_W%^-gg9BerK
z!)dcjI`JKOSMwqrSv1zQnPFy^zz-=$X=gA%N5!Cr(~VAy!H3gE#Ddd!6qK~lc@{_O
zmXCPaUUaHAK#WYd00@i9%Y31s*_+qB1zHthpnPAlA+Dl
zxeO&Pe98p?fg@|HsIrW*=R9-7ehDykVYxTYq>tL)UcFDV^L?E!xpdhM~=1Jmkd
zy3C^DGYp*+>|B~)NxX(2At(Y=Q_K}O)>lls4o7BlOr{eot6?ey5pG5?0#Zn1ICcvsBxg@(lJNgVbtAi_$qPMmqNhzlX*!xED(~pM&wVr4io9TG+Q|28$<(eOjIG3CLO$rh`%HQ
z(JOGQ_NbNEL&1MT^Eo;SmN>%>Oq+7<^LPa(6Ikyw%yYFtU`c>j!`Uy979}anGI1Ol
z0?m7l0KsnR`I((W;D9br2YvT+wnupn7JbPEodEDYRz_M6vwt-(p!d**!^(p*Ob+Hm
zJ&c%CNynz$Noh+XSIg<28rTLg5E=&=LTVg69LbAx{xpA0$_0%QQ1>$PH{a9A+eohwUkYCM@}2@MxYp
z)8RRl08ljofP&(@*3ylNXqhBicKe}b?R$}$&G1O|97QqC5
ze{(pjLb5NCFqwe6c0ja8J-XIj-b|fwVKOP0&?`FA6w2Ze(9nJ-#otWd&tcBC6y@h#
z6X?~j+V|MKyo`s}d#nQ}Si-rxo!8$rKR5quHj95E7DTUJf_`0kbRlTPT>Gmq%+-ae
zh-WV#g%v!CIJXK5AvG<;gusME#}Zm{Mzl_^(Ao@$+2Vc{hJs`0Pyz-r9w!`091CSg
ztZg^6C}GomhI}-n2PI?aF6z^D?*fd}0VXj-1UE(w$8WazeivljR?DZd?)cjc3GQ%1
zCkcO0{Q+CvV7uR(atT7*2$KR*yeJ{*43#J(g%-3b6v8~u)pZ|-7t(V|gjR%*Qdl}#
zDI^Nb6{x%)0xcJDq#Naij9$8VLoqc|K^2e`V*y!cQUoIKJU@})T`1To%<}`aQHpCZ
z(_Uc)YW4C5L^W3b+ydsox^2RTRXZ=6*0$R8ii^SJ+CNGCKHzB
ziD6nu6I(yB2AaQ`>e87VicP#$NFo)~ot?MUr$aBY9a
zb9e8up5TLPy{)bH*ts<2Gnb|&sI)#}S;4w09>t&;tX6CJkiAu!r(SYyW^+@RWYn0P
z5C(@v5N1|AUPy{q0ohS(O2aIp&yUA=cp}H*$b%#-L@CA`UqJMC2VYr+I0khAAciPm
z{L?BLqT#s7!OoBcf$hWH$!2GXH0y8
z29m>)##5P-8KjVzHX&ZfE`Uhy3dMK
zDyq1EDpfrX&kR}(cl_r!dGG!I1yf~#p^#Xg&A8gnF;jPhjTCbDQ^Y&9rYr#h9;kEt
z`}$!#V>;pPNr6>mADE|rTKIW70810F6G{=-ys`%XQy7I+9M>^%@g03z&_&d#7sFBQ
zT@@99s#4t)WpBV*?QyiPJlKCL9+=N@?)r?SOt9Y1*qh<&M^><-2%kQgLd|O)!XL<=
zrw-3M*GiC4jYn8bQPrq{jAwIDNE@31Ap$o;1G^%auuxzS&u-^n-=D&GIK^W|8s72u
zv+;Us0ZyNv4Ou%Ugh!J_d1yGJKx-zUHUIEfqigDtwT#XMbBgUB4Dx?8#>C
z5?vumCtwkXV|$P_+bndm2Hs66ALclV1mZmTy}~y`I&dq_Ekek|sdhzxOd}!ajH@+#
zys9Vx53jQcoaj)|mx_N<&57yehGL4oI+37Og%pFSs92IWAi6@clEvIXytDeoqisF?7=@inxg|U!S4&J!(+Ss8!4XkcKG+KiCAp
zOj-mF&sMQcV#10k1w{nC_Lx=0O09T!R@J;MNH#D&cLH$@;i2nsf|IZ!$eK9tUNVcGk&
zqJ|n(WCqP}G*{W^S9A{r8e?fS;5*Xe;bp;vwcshUDb6LJvpGmYtD@E!l!R)Xx=19|NU$}7_CSQc8VMc(BjwyKp;>K1>_!`m
zt_`7i%N!G!_$zL(qBq=e(_SN_9Zqi+An~uB{~KSugn;VU=#?4NDw*GwI<_%$EB#oZ
zz=~^Mr5O5Bflk30A<|<`MbE6>7aCo4itSPX4gFm~Fjz7C737N;9tZGMk?|D_3zYqAsP%w||Qx{B3W(N{zwbC0UTG4pp&X(&)Ev1{xK$uN@I%_Ois
z5-bS&kIiwc6Fjs!!^5+Al++qD;`LgwW)(ZkRqm<=tvzl%co-M&+<|8=O;IunTOCc7
zX%ktx%E^@nm_`ll%arIOC#Jv}F`V)4l5l^sAJyR;9wNl))~@^xPH+!fZ3ol6@#|dL!Tb!V5^aEQITn$PxN(48!2KgXY(RBs?_nzI@
z(a*7Rw1=5tULA`yQ^kyKZb+FR-mZUViD|}6d@|DNEDmB`RFxnOuFr6A9ax?99`z%E
zple=|4z*SaJ_39%r8eaJN=00F)VVHSza
z<{VfBKF+*=tG}2Ek6vocnuKSfNjToPc?%;l=#y(o85_tJMlPpKSFzBryaIopN3jx%
z=wuwBn>8sEh1qPOzvW#m=G^6#Y?y4?x~=v*x$P&r?u6TS?Gjdv2~3Sz)oKN_dM!Dv
zp&X24H3*hc38zg>7DsudPNb;R
zoFmK}(CBod1C3vV06qTdRGWX9yTc^Kh{E2UgXXv@L`0Mn%`y~1AwAyEfiQX$r?2Lq
zMVZ4yBm9U?jT7|eI!_{8bDSnW>lbhl-1NdlpafjGshZO
zBUg|bGgkyr<1P4m1TjC}SbKcO)%S2L1|&M%<7CV4%N*a)v0OM$mj}nJ#}UnDM5-(m
zbsyZ$x6M(nTQK|(7ao7Fi`3ph&s)&HHXi$k+fR1gmfK4qckG_P;LMp-okg=cnkQ%>cH@AU$GOB1#yA2|{6tf1DjM)K>=$TC#Pzp6_5&(kh|MC?TB`A>(10
z!xNKF%pIB4=yD?VvwZamR_3>hR*f~j>qx^Q0BDpJm9C=*Ve9KCtSkojRMQ;ci~w#+aOoiIBcY!_Xk~s66A?_zC6NG8
z3(^@v=h|a#LHqa7bG-h&feONM~a$MD)JOLQVcDD
z&Sc@2??N3`pROcj6ZRLZd3_Tdhvu7QH?)&9$0{v*Yf;G
zhak|S3lJlw0E`6?H@ilt;g&W7gxLl{sOSmQA}|sU&S&`6$}#-#@-m9KOJQO?ig|>!
z!X5YycGuv<@;;&fCIm{?A#+htD;T+y2B6S|WKDm&Iq&hbw-emM7MrZyx5IIyWH)E~
z8C!)d2o-aGH+FbwoG|xK9j>8*7JN^JcBYLtxgiI25URGxj(nmUh1j{fz}Y98R)twD
z=;n&P3Tp4`Qv*{iVLuKbgB-}7;u0sf5KJ(js+aRJa};^_$MPML-svF%38;j59Vu86
z;sJk<Ey(>Bj0-gStW$^DdCuu!o8x1tLph7|=4g%>Z%#jS!GxFfFjsqXgnR6TPh}
zDxxG=PF(r?;@nUsXijQUA>uw4m#hsn?8l|wVU(BY0@j6;gn(iO3jiOn;q&@Yox3WioJv57|5%uwXO*MGW
z(FESus?QQrUIa7@6iPVoBd?7BO}_*qNr|06@&z
z0+b4eIaml)VH%l!t;nvoz!9}RhtPiv99tJV5IK
z3@aR>t~5MghNGC_nJhTp3U+FNSdZ!4Fw=^)xf{S$1T2PiLj*L$H9V0>4Tp6P=Mf`^5F~%-v_$;mz_We0!0?=U0cJte>MRqY7+fv}FjyEe8QL=k{I?}Mgu|FaeB=4(@6+E-a1UE-vf$1khH)SP
zpfwP1{zU-c7J#*PR#Sh&3MHKaSY>;omh*eaDr`kZi_lDx;WM5=y~d^&obz?nogc93
zkspgFp_ive%VQ*HWC2A;DJG>*N@t}Mlu{_t84JQ#^O8QS{z-q;30}-<6khRa!2}#b
zZDy{J!9ivk0Y_6EW{jp|dxX+L9V#@=t5|iuC5jiK@;Zs0tV`{ynR+cfSKqU~jxiQo
z?1&%e<>Kg!q+-VEX(yIBn{X~f2x)#l$iC>WidI-W6{>?t0a+yHWm*-Rnev;uYOA{n
zo-$eHuGP6M%@u#Ms$82@n**$c1|zy6>;Th#PV2J{jj>vUks7`)!g9(HC+NNEt
z&E}WI$i#SgxbZkPY=#kfD80?%LEiEH$6G#?bz5#Xfb%&(COftPl^K};gA%b&Y2r90
ztxV&`YZ;nBd!woX)x18RI{?`nT0=yPIaefY0!v4s^EFA=v2>kBwx-3`6`_PPUsXJ8
zD4_eqdYFHbHH2hDnNZC!)aKI4-*5H#d0>DJo5b?-m@~GRX72%uQ7SOF{zIlj`VP$K
zW~X|sLf14~^f>A~#`QwCr&0j)Al*u89oF|tjmBDTHvl1pA=EMCLr%omNK0Hrm8ynX
zmEUHM2aDnS>4ZGA4z0jb_Uz=2(qS^6b51WUhP8in&b30RR0}N?#_*T65=R`r5&Mg1@62r3L
zp)r35x$r?Oz#_I@8tyNr@{!mzZn5tZ*Gz%gYDLyN(=e5KOEhsXjRq>+lx|`K;h0rL
zof))u6|0rHLh4_(IPVaxNP>ehJCstuPSABzbV~)L>(EVoed#<|Ima`h;i=6WtbqyD
zlV{zj>%kWr{muxkM!;(%Mly4uISbPH8K!@1#=^p4N>G(W{+e0%(&8O?Y7mCW-olpg
zQ@f~4pUmjJ4A~IFB45uaoZ%^`rFG$sneL?M&Bsm=!GV8S
z#s5Bd1V3^9ZhZe_3cxU{6_c)DUfp*}5l9hC#h{hwwW4_1a}>rf^nI|cw)=4Z8Yj|B
z@YCBKrAe3(bO4#9F_vpo0}4C^+6F2dzJs);9s1z@8x+@E
zeCQQO5tK;>DIugL9ZKixN+dzMUSq>B_OFZf?&%lRL|nUvI2`Lq2
zP11qS5V{`r$3P9OxttOv{9);f8o@UbZkNI{^KNLh332x=4EKSiOO#=*O^1I(=y;h6
zSyE_qY$;$O)*RB9d!lf~9M<)~QzkgL0vtH93Rzjfxn04oB3K68{}iZnXhp~__x%we
zOuTka)rw61cOxw_A8ar)iU55@bE@xOcNF}OoVyDb?%0Wk*4MC;9rjK-tj~Ke-1rLD
zUGRZKb$zRczd6R#39&|-fBRn+}?BUR&!Y}{(qXzV9t%6Q+V-j4JzL_a8k&at!F
z23+FXH9Ep#%b@M>$=N#;r6s-4i2*n{I>emE`wYe|5qHmxS^dl{}SA%h~
z$=W$9nqdTwNmUy$Mm$mu@8&L#Bw#L~P<73sq|>lAZ$^_jA?<$%B=WRf8N=(!d6$FC
z92tef@6j!umgXj*I<~O5hNbS0T@YA+Yg4rvbnakMs0$95wUjc-Fe$kC5)}H8-0V4*
z1(cZ0%LL)Ga!o549;AfH6a$`sSoP>y2@WJ6K#*>pvmZSdEZ8pn{#+{r68M#o4^43D
zNZ1b0jQDoRw>^K3fL04L)O$f{<-Wfr8o~vLVZl6(OL;3!P2)D**l7?n(KLs5B>u*L
z1zb*`VjEx;fSAB*;H1Xm*f^~oQFUD1Iymhh=Pl#tYLE4`b?g8zw+=-Nof(|B!;$Sp
z3XJp|#niB~k9aU4%p0E^di7!$>#;nGsy?m-694}25$u0lIfi4i8TQY5yy*Kbz*Gum
z)r-5D8u~E9wHhX&S$d#Z+qdZv#c~Csv3Q2ItxQ5#z#5{jFDTkJ5)c_d1Ux~>pSvTn
zq$3x+`eDj9>k(*(tf)(fwhn_{V2kUpc^z|k!7kit`Bc^&ce??mRf#IjtQk3D;hrV{
ztEp>yINyJxf2xE=v_2RSA(qiBP{^*(iqpk}?JJRASb)+|q%-Lzlu}H(aISa7L?RO5
zX0=mDh@tkNbTCxUJtGuKqZSx@=kJr=MPiN2^3WM0Sxuei-;8MW4I_G|q|j6L%&lS=
zlo5)IsHVpc5#QUYQyx@T9nA$t)F`wTP|W^kErovsVh)@T69VXDR1ABFVGC%^av>ST
z9UNa8aI|WKSR}P3L@mgtszq+7nP(M{TGg~FwO3P}K`Y2fu^9?y>uS@!$1=eQX+?xI
zv-PSdW@M%H)t%xg}>vTn=m0*hRD&rODNNij`ApSV+mA%TCNq(uNng40NBP*jCM##b0DqL8TTL`d+^
zbPy?IH-U78MGD}RRp<}~#``hP`*XdDs;P?>RV
zz-%g9*ABD3VyX7*Og+Ink}(TC+Uh`Ar>8Lb`Hb*LDd^A*BYHEaDQn7e11SRQ-~?7Q
z$Axx+Zya0U(o%=#?%a)jwnnJuua6B>^_Bk41vKpW`^U$HfzbAPjK8$VPaA
z8;PBh2@IJwVP0DyfQ2=tQcI8S$n+q^D-Xn&1|nmm6Lg)R6hSu)f0Q`oj4yw50fy{c
zI+fx+nJipUTsQJq6M;Ue)d-*kunH6-tn-0jD!{~`)yef#h<@fTG#&l5_Wp`J+1hfT@^Xf_fR2e5rb^xt
zicd5U^YoucJ+b_@B#Hqj1~tK&D!z8`Fl_H$e19ph>OQophDu@yL$TN9Jq{zVRz0ob
z=&`o+`!$FQ+!GZhVG0VQmw{?Hn9nNKt5faHYxNo0G-!zZhKnR643hN4L+zcQ
zObeElTwryR0whF1Byc?dP*9UwR19E=d_8)kFQQHYcmG;(twRyfDf(6mg1HQ~(2AF_
zngBL;&7%`>iY@d5rY!GS38OZcgF_&ETf!jR32%+a&wqbXjmjwrXnK8)CnjDDpme^0qz-`=
zjoifwf$s1usM2?sttn(yTd>133k*AV?ZCNv&%^!q|2HJf+`wUJL|PjGQ)*xSf_xlQ
z4=nT~{_TJ8VH{jq!oH;mmJH|uF5x*CUW>56@4uR%3Q>Ct?ey#tT1nvNDQP)R`MdX_
z;2++wC{>IOYw1S)FHX4W5&%Ym%tpI!RP}7U%ux^Vzb&0yo38Q1HKAbd-knelI+?y=
zHdn08=9tWS%;r7T;&)#w`Whn^hC=a~nNd>>XqA7PCn632?MlN`B_~L2qIzsM0jUBD
z2Mtvt&qfT+0&AXY=2Xsp6ahCqLRmHfRsgb~NZebAUZyvx+0D>sVR+
zZ-=;~Hb4SFXV@MA?NNNc6yk*~A9YURu48LhG2rRTOW0iqgQA!h80kX;5t`RLgu`pj
zE>Sf!3(Exlx<)c3-(xJt{+U=03OY}~P*Z$%)*W{{NjqoHGHW%fb3?Dj*{s@hHo@9@<@#)HQf4e=ZtGs~
z!1L!|l%Ow=a1pw*P)ta$L}bhTQ(ki|O8Dk*P=zs4?m|T6Sfe0n16HFs**7dAV^Dt(
zHRXoq2of&E9Iy#5D&wXPLpd5nj~Q8Le!lp+VaJ3XGv3bxW}3$j=Lwysngk|z=qoO3
z=xl$I-T*hcNXN{OkrPHT!iL^$XdZ!dD%I#cYM!20&9$!@Hh}s&VMTRm?3Sfzq)Qq-
z0l^}t6VbPkehr6zk(5%*t@c8<)FXfL=aQKgFW96Klj7ZtUoqqovVj!
zJb35P-l$P%^xRHQI302*TNY9VJB#tV^EIn5eE;%J?&+pR@ebq8JFqjaF;eM~dTbqO
zf4s)k_hc*@gRO9+Q~6x2P>`j0%hPil{U;W}=^oH5*3`o=2sNWL38m@fBNTkBZ5f^My_
z6v65$(36Zx#Z2=?g4fjtqyXqZ>8O;*fJz2XAGHBvau!l`RjZl<;sHR_!+%y47O`=w
zu4dKhLP?`ya)K~mAQZ6b5vG5BZm4qvYpM$Yi^y2jm|hSfG$K|pqcMZJYL2Z4^N*2*
z!%>bcvwvh6JtG;wb-#iFEE#Zim4Znj>N$GeADqo0_W>J?8#BkH7@;Kpdp5_Rx`OkTmw3spT{uS+I|wRz
zR5cc1V7{U{#V8N&v5bfB!7(R14?T3%PzQ~bHwKGY^Z^7LX-JI}aa~KPY0n;0XxtI+MFxMh|8zB?n--@r>O5f3_3%8tnS(kRrLsUkRUvbt*S@{EW?i=s
zy!UvAF1hc*k{lt-5(SW9^%3Js$ZbnO)j*m~;bM)0s~a(u%PQ`>AxDJc+dIWMq&vv{9
z0OzohPJm^>^qeIKb^s>OxdOd^n|@X?Uz<66CKzWKz+4UL;v&A^001BWNklb&ixctp@7I-TQb`~|0_1wgH$_Wr6>(VTzTNZQ^CPecnxcXJX4d7o1_
zTaXE=R}t1>yD3~?%_?TIA;jraiZuhm0vpw$s3QU0ZV8UkcOjL*0vqgP
zUHyz~gTxp?R{$)?ohZE~AxkplO*CN*
zG2@At=U%lFa3ri^9no+psWG)#i^GxWRg?Ut7Ce99?VP7aYMBB3S|5&9fw07j5p+`@
zDYZ^L8e`Szg^Qu~Xsif>(|qJe4*GzqaK~(5ynrYHZ;?o?o-zVMkp00O#a{WsbN9?4
z3<4lIb!%VI_uk3-S&yo{Yg-x3Q+P<%Bk1>TSF3K=PofQ3LnlWid+2l2^v
zNk^8j1y7{KKU_a+yzd&Nw8A~-=7~mRPNBV^&^09pVam|*0v_aLiXuu0m>_U$6$(RT
zg^8kCjkJ>*!g|o~su2~6bp?*p86Gs?(1d@u0P9$hOoTd(v;SjgV~vVP#K4A`#ent!
zZTQ=ZP{2Q2RuNuo=BB`Sb_rWN6>E%^#{$bzL)*}?Pj@o|R@Xe~lp^RlXP|@>$3C%O
zGAZb5!P0VvY7YGDs{>6_KCAgG(1L0KU2vdfjjVq~g?Wyj0jTf}T3unV-nquLH=uu3
zXa%eW&d35n0XNAV5a~i_-YaUa4t%W{()R(Ok?`9G&a9b^0c&tbk$Z0$5xrr`Io?Yf
z3#idYPPvn6xS3x-;r09C<9mX%I5Z%X6UN}o0uzj9PJJx}T;pP+I4gsxJN{B|W!8$N
zP*vEt2Zka1s
z<8D_qJ9>1LMT(U&!K71`E@}yQDw9#j(iNLj!F1XYRFkSyqca^V(+xp0S}06ZMX*GI
z)yz~ibKTrwT!(e;!!Xuf&3a{>t65b~LNk~|s)|sI<_w>;@6peD*1orSZS0>=C)2a4
zM6JH8?r;x~cLH{7uzmolGbw+jOl-z{e5l3m#8jj##F7W{Ai;{7Q6CR7k~R8B;x(X@
zIM^QyW(+cTzdZ`XS@hVx1R>`6kWRR06wuV`Kbp4t_1_Vnc6AnEarzZS=n+BBK{xSW
zZW3J4iaBmGbxJdOe8UhC2&<))hJaW^D-HBqNx+;c-U4425m0)x5b%F;Uj{Q1&xdq(
z17S3i$cJp>H-hwu@O4E#iZ?N8Jf4M7LYTFHPa+Wpg*l?W9!+)aS7@Y{8$d(}GfD)I
zB98rNF^%yw;k(9fw7B2ENZM?Rj6Q)Z;T`b3B8KL+)8fRw)$*yV+j6@Z`0zu=&`Du8
zouKPFOsAF8r4FSlfRKM)`By0&(HVVEYJpW{fm?2_Dbsw+5=Rh3oLe
z6`rIWqLNiT%4ix533uwVMbN)XYPkrk*quSP2gP
zERSA6%=0uoisEisC9N2wm~y`x_teG&EDi;X}tzN{8uWj_Gs>^QDSfr
zZesO7jiL~Jlm;^!>e?lJanO>&JEEVLbS6nk{0$9XR}g>jDF;d!0M?>}wWXU__*OG==XZinKMc*A?kFx5o-T5nkJI8Zqp539x<_5bMt^Pi_CDltv?0{UkbY24
znshf{@ZJ{;q0h>K?|=rQwKAbFkUxer*zw(}{#GfE|HG0O)L?W^M{N=9^t++
zE1-$ILC)o4HFYefypdGv@)~MM#JZu=M)WH^^_v8d!RMp+0EyXZeu|i_%py1RG{0w6
z!;wR)kWw(6Ot7?Eu{4{a){5!!6ca5d6F^a+?7@GMDMe1|opYKyQ$6xGpTjwqRFN(t
zL?mkbz$Bss@sPOM8PJyy91-+rPSS2~OnbSzW`*G#bfy)!ez;
z_l7!C=-lyC8j(YnevF6}fF`hPC^ZHb!a!
zbAKK8opRLahEKdnMITO%fR%tK#WkJeZ1>V)t_G@Vz(ib%*J=&{r~@|3+A}LQw(wb@
zFV(4)3n8UX`kzQAlBN~=x9}*gss=qx23u0YLrduPXruG8OPL3Ath2~U=O(KqY(zZ*
zS*ru_YF`~AXEhxB8}5IMl{2*TC=GvNMYGX3Jk#6gHU|riQ5tR7g$Of0-)~yL9QNz-
zU;TAL>
z8*5?z<1L@cx+m(GGwnRv&v0g(XZsnBw>@~k!%!X&==4}|DU0Lm5zI(V^
zMlx|g!o=@5y$7BK6T?D}a_QWqK9lN&6Rz3^MBcjx@yNy)$w%c~wZcmQ3QA(V=Nl2h!
z3CB6P!{N?;VjWyb8i{`~8_BrvqMKP#(50ARy4`8bGR&o<5>kU9Q{A2J(LpF?8a%&b
z1AIOCqaxeSa5i0g`x(C1*S40E00XjCp3^wGNoX(^Kd|J*^*?I0FbTKx`g3eXBCN{v
zVvWV*hDZSY*pUU9zv;Kw&a-&ECqY!?%s9{Ky!Q4poEg_XbDw`UP_1+wDo!a@Em?4?$KHm){#r1>1}7AX04nG#Q^1KxCLNdn{n)YT
z$&_j#ghGfVHG?U#Tz3K|GE(X0sk{77kVm`Sw%c|)tJ;5~HwlBY5f;T%-R$E)y*@J3
zT+{@nlQu9n0D$xOscCQ&jPlcyg{@V88o9d$(P%I#KsBSnpyoA=;MtO-N-Y7;F>{bU;lHWBHPb!wq1Ms86Nd9cJk*Lk*5Pu
z_mLydRg%3cyx6775jy=o(Mcoz4{hL>#i}k`1@x5)uQo4>6dFaS90}
z*mm1)+wIBSY>QQmf=Z%d(IP8!inuZO!2stRt3ZF3rKo68oFfDe$HH^amPU$I$f$89
z^H`p4vC>bSl5M+fx9#?%Zd=HMMx4-u3LB(>W8KK$zOF8d-2#{pT~sC?pz&MDlE!b1
zreQ7WWuxQ9$8X#ve(Sct+HTwJ$=}9`PPD;p^g^nh`C<{H8@s>YC6eNxRCBtqN!KWh
z$MS!KqpPNc2M!|ZQOX|Y=-yHl+iu%!yFJ<3M)^Ptw8ij(!4_x&W?~@S5|id#CqSp0
z5tu@qAly|a+o%_f6}6Rk&C;S;76}j}%OZlP~
zy=cp0YOQ$Bd*1V?uKoPyKOZl9*~|F8_q`9RtELJyeyS{NyK3`58{M?#e5#
zMBn%P)TcgmO6M6b@7uSJZ+OES@QF`+0{7f=&lCOa_^f9=3$K0cYjOSc*Yp1S?|*;H
z=Xsp&=X75CjC}?ht+S}h9MCM7n}?BXY&0*W1c}h0TC4mVXAp@xM%Zv2E-YHuoR6vT
zk#{*0+NGCXifgX920#DvKabgLwy^E7R4aMG3toV0uDJ$(`lo-2)z#JG?svr%SD@C4
zk-++%v@5T?6057L2!Zvuw5LAxskndUnrraIFMbjC+;h+4cHWb1&wAFgaP76%;-;H!
z!bo6kw=<}5w2-xSnLifkf#T{|RIT@&ML;OJrbp#@5)si#d9@8_XODVp)@s3>d>faX
zIvd)TzVxL{0_(A~lNEBe+;WSTa(V*V<6S1|tSLLSRJ~fh+p>M8iqt=!L-Rdu}MV|SCNGZ7JFDFW%yVB1Fm36tUl1IvG&{{a
z+;+b{d+!xSoKm%Wf&)T6;1Vr?<
z_4xG1$*IM%(E2$>4)Ah+dqtF3YsPnB#*6M_(2L*rzg*@cf;#qO0QNrR
z*DGak=A=IZ2++n9J_9+n?K3=$c0ZwlHh0(ofxPDiaGPkx-HNnk&?#4a2{|>WpuQed{xDNDwg<^|k(-St6#9g@=li@;~empi2YVCv49GT1l6On5iZ>B>mN>o?HkXIPuuJ-X0?WQ
zZk^A^PQ&@nOZi)=HU9Kn7pXOyd44CsnOo3UdoTL9G`YRm8^ajgg|%G$5d^jDCpGr_S$J6pXl?xGB|tVi2;LLFjP6Jm&L6S@C#9Zqx5&ghclsh9Ezrn+Stg-pN|p6+}VB1+f|
z^@;!VX-&$Pji>RAfq&mJ@YzY_;4<((AG}KzyT=`axUKqMj(bCWo8Z-XXn41j|Eyb8
zRTV@RcqIqmQNEl-xa_2AZ|A@4=R2=BG;cvo0JK2S=KMgrn*?~h1rk=Ay2&?QZkktq
z8a-_jg6l`w`g6V3qi&)8_nygKpM_V-+8Z4my*uoFv3r7sJn0M6;ILNV%+)Qhe5=lI
zY@JtXRX=`gU5v61+w=AdZQM`X(0Dk_wi^DxkgvJem~*0y;x_i92guXlRRaDMf&F#6@A+2)Gq=x6XZXc$ZxHxcu;O1wxoZt
zBN)O-xx4TuqnGAh8rfg@je6|*^9-+?mP}qE9a5y5kD;*#>?;ankH^xDk2!Wfd-@;h
zZ_t4JmS^&Yc6Kb=chd9;CN7tOg|4Pt2-Fcx?WbL&VlQB^Ph1T(f!CG7&YL~o4u4ct
zEwVPRe(8sfAm0X31m2nYLtVeSyqrbO?;MnF9M~EFUA8Ym^orWZV@|WFt1F%zxF1Cw
zHt<}sG+S(3{VxY5*%ZY|;z_AV43A%<4IF7IB
zvg4|hebCTrZSY?f-TbTxh@*VH8)glaYB%aAN`Aqp@g8LMhGOHgTizwvDm3C89>WNY
zevvwL{0ZDd3@pgKtTcXRN+1(31KmM$cPZ~-wrrd7Ws8zOQ|YMd@dO-jyJk&j;0yyg
zo7Z=Ou73>Jp)N4kKHePnKW@ARcD-EJGy_k=z^c30KZhartY3ZO`{@A%QB)}8u%8W)
zIyH{6wa0>vrV6D{Pw%0AZq|3|#9uH5M2ue_79LTF(qr|`TAXLvvYon?>Xk**^8I5E
z^U9$+0V(W+*@(HWB=?7U!y9Bdae3Ov&Zq!Mymv<+IOJ&g6s|`19WH_l*FVy<>Wsqo
zbR>^^&gS5a?D;=Vrf}K&Q3*b=hoA0=zIqRFhWK=Nfbqc|`ec56*8J=5!CpV-o(IBl^ZbAg
zdn^CDtq7OvIc?g|xo^)yr$^EY#JWg~ZTWI-%}pmzGv0&O61o||TPc%LL9{--1#VGA
zXHmf>T5w|_p?x%Ol1u5`89+R9?@BUAqS9?(<`j6K)PvV*oh)(Jiy3&<^66IWp;)XB
z)%Z@*|HLg{p99(JbUm)Jx(%gy9q_eVxwRPIl)K1u_z6&4nv30--`x$1#s3S%A;Rvv
z!KO*ljk_Vafc56iV+U{Oqs`^nab}wQJ9EI;SnT9|+{X*mtS8FH#o^knuJw4K*QZOD
z&7R=lIS+9hxp=bPf3yHTx$Jz9P1qq(p65+GFZ~);BH_6U{zicv1b`$};FCw-M@NOG
zB+x6OY@Gen48EZ6F{9n&z~q6s#*PxUt)6!$!mU1j5DA2IyuLi1tBYN$XU_w7{ggxF
zd>gTfY^^0fgi=3so#*jZk6!a__;bDNI=vuJK1@Xr+&jOh=ey#FQFw0c7;
zc0sFO?S!xT=|cB152)_AP+0YW9{+LhLg65k`65X0LYg45WGAe)a`03GB?*^*NOcGe
zt`CNgDu?-(U@kiElv>DC^-EJ0M;2550*PQUf$7>3GQJ~^N;z`*Qs
z(uG9XET5}XgaX!Tm7?zDF_YcITn=XdI!FHs^xwq
z-u|MC9qT=Y-S>kM9P0?pryYrv9}{Pn<1D@hfoEAsqFJx
z9R!NNAn%*gHjeY^0F!%fp&BnXb#K05@A(H+`S+Rmz5hVl`1RU&*l**}NEjk8Y5Qp4
z{zoR^VD062Hzcuslz(4he2*KQW
z-L>XF3K#_5?>OW`bpeIn&C!zD-I~`%0Kf0m-Ul(r(kdE=r?R^paFq@X50igT42bHl
zPb|R7jTCrNaA1l0io`tc(=zpZZ^L#eM@p~6d&ANf&{2~iL}HT2uJg3{b_udQ!(Z6jsv{Fu
zInQ5+BZ(5GAWe^g+@fY9J&-@EV$Z{k;waGfxek!{{Dp-iQa-i7fjet&(q
zupI(x)XhY|Ja}MX%lfL
z0=SD{&QE|Y>JOD6f13jjo4o<>P#o9cCA4<=bqiG>m&KINdsU(vw*ecB>`*OH3KfRy
z>XQv?VrOt-K~R1C5p>1}T=Jd&Ly-$8sswFZifpLgA9=QiSaw4_*>wfp+BOvy$-iJ7
zG^kP>K=DZX2I=4)y>Ji$G2+ZP;@mf{zdqx}%zt8$|j%8d%Z=*b?y1@_zl_Ed0i7vAV-S=---LXdMl29E#y$OuNW<3`{4
z2|SoZd!LAwK_Bl)m*w<+2ojL{OW&qnfmww23V;gzQSZxfzRB3jqlU?C=w0gkl3p!pshY*@=?hU*@=4|I{sGijlPP(5qE0b5Rel)Yh{tZGJ}%3Ua3}zK0X3
z>Aw@h#R(0z$^a?xN>IaA#&ObRSEYxSvw@}$RyD?21!X5P!rp5buHpB#xMbd(J?kU;
z>DaRAi`tR0L3b4@k!D@Ioun6Lrz`|YaD?%-i%g3)g|&tl6NfXtS~c4C?Nz@}Igqno
z{+OnR3lb&}%&S{l5CpYB41E#CJTk8rW==K~7W)<4mM&VwEME~pFV{zeSpLX8#sTuz
z_oyIIq+V!o<$}CE2-d!lvI~&{VGe@>Nxn{h67x_#1}%?-I!Jx9V36I-q6E0dD+HUh
zll*r69AI_mlWdK%EMPvlxCG>|tmW&dfy6L2YvAtQ26dxt!hzP&H&5ZbU#MrdR$!iF
zKr0a{^9oK;7EYU!6erKf@IK3N*+q{8xa%Y(F}Ac
zbWrz7*z-rw#@h1>qw_>n*(**@{z>4gISBB>hIGSC2{Eq$UVE+6^rc)&X>bX@@(2&(
z_nAm~z`@!qs6o^6YGkIyMf&8CJlloBG
zZo?FEz3_g?@ZAlOsr!~mT5XJFshvs<#xabyLc$OJC)6L==IX-g{ERAt(#8};+<=i@;xJ=o
zK(4Wg*cl!zUM8nbhgdh5e+P?eSquSwu2uUN+MMwn(W%>bEghi)9AZfGRvH11G<%E~3uhl!v9W=TEiBR@Om%yIqC!
zjQBbyxSwxoLzMO4om~}jaPMH_a<=VCr@@DnjxgQ=eE>qw2IveEe2WQt=XZAMOWPL+VDuOV
z*AT$=bR%vOZdL{c)gZj^fnIP{;kWa9wDEv9J;sLzXOkO~2tTe&_Sq14gO`Jn)kw0l
z6uAQzKH0$YBhSL)dE9b#X-@?(BE;;X={lZ#DAjFt?f(lQG1+}?H5CqcQ{D|Qn_@DL
zTaH3rQl1lFo*uC}FbDj$+g}|3kl04)eZIIqQcu3LKJp7kr19RxJtfQ$)g4A->NY0K
zT`F7tE5QJ3!Ecx#vCvJYpq9Y@;R?NzR9i@J%bPu_31yE9>XO-g*a*gQ#n@sHheFQC
zyoHEMB8&=eF)Mtc*%GJwc}Ha+>Y=(bw&&f;k5G{+?sV4tNA;UB0OWs=!`syBJ#k$rm
z?c9Fdgp(9~QR)EmkH%^G5_hbFj9CmPwkErg32Auzu+MKdFTJC0gwx1rT^)rRYnKiR
zCci^!BWDDvQ?>N=qrMS0NI`137uk-tQ-?-K(&<%V8~JNkX|9y83sfXp^FG}EO3VWb
zMrb8Dm!@hRdoae&Q04Ip9rT1xbua6}qU5DBkf#kLe^s*EKI^%*EEN#5Dj=I-0p
zRxgY|?A>fw4iK#@4N~xX_jEJ(-gUWD_|ayKfD8Lc<)9b3b&XN>Oye=q#Ieu38jh_7dN
zBDLAE;GQZKaT};`a|96*;$xMYB*GNy6Sce&E$H66nyNQ7Z|9hP<;XYI2#YzWLp8RA
zJ{9a{SB09sOhGMO&h6lz3v~59$sTNeqxbK`dxTBX9kdSr-tLSGIB5Hbm
zPAf3ef8Y@5ec`sZ5v`k=NcOr1k^;@*GY2Iq6e6+bm(2DlxE3sb4FwyPd}%mDF<}02
zWucxYq+00%BP=Q2Xr2ZS`^J_7$#a;o?p{D1B}v#d?6%$r1V;1zpP>cg1g&JIWtsX%
z&NfcwQ4l2ITHqrC{NcTVmi|_TTJ@$Nzby*<_KEW|r;7A8h@;;95$LSw)E7a+u)lW_
z_2bl*ndcQ|v#fFO#|mZLA1pPpHJU84S&@S3XN8^d2c
zj}xqZ0zXneowMwJ8_AR>+S;D-oz#P^ppn<*T8siNuX$)~oFkMlTi`tvY)9
zUC86(@5Wx1sx1+h`VVCe8KMbVXi$~I80x)Q1F_g+(Y6k!P;K1i7o$%!?Lmt1Pg_-8
zRA`~EsG*9+Dd53ww1!PzorO73c(DE#^DFsjt5M9qfuvsp!3BGPZTyCL6)M+m2byp6
z7)4IWiS}p;KEH7C`9;ojS+QBA9W>1ZTEl4(*p;T{so<1&so-k6j!-m96T+Bh$AO3t
z5UV)_9MH1*6_4@98oG0oFRfE{qBp{{Fc)V{olZ5AexfJXE!mNtcrA7AfP&YnsekUW
zXa{^>1zg#Gf!sJQHii=xNi(exKk;T41?@YgwkFgW
z3XjCaqobTtO|v+C4y+B|M?
zj}3Wcm_QR7aGFGhVFbNw-DqHta#x!~ygYwCwI?Mg%<7(P>sld&=r9Nw6eo44cLj*ve+BS9ZH(g3iR
zCo@3ZOAL?lW-d!3{oy@q7IV0Dq}RTcj}b(Z!T@^xSF3D`CqC(RE)+t^B4P%vawRP6
z^1ldqLnzpIV%~|MF!(Tc#K64Le5r-IiU#5MlOGgV4UJCC|5@D)YIO?9rRWK!UVJU-
zEbFjgFxHdJnM1hMkTZL65TGK>nhb{&u8^fAHjm{NeA>s1LXm#y9WlY=FH{w65bsZ6
z30;9rZYjMTo!a9)JO^@ORKGLblp;clA2HEj!1>2Igo-XaALm_$ehn0pKNRlRIFS)pnCc3GTgXhN_3OiA?W%-@#D0sLH#N=-O={SrR^!sMYj{kE
zELAm5D>#{deKrP0_NM50=&|Hnd)Mgsl+h8y$3dFi(7BHO(%Hl^2|+1M%9tpEZ+KUl
z14BWkE+Rr`mlqhTPz9#=lc~OGtL~kjLq8l_wrPks=ySoec#zG7X|t0+Y?CByX(;pB
z8$9Mgyd1meWb`#n^tHUvH_AaLpJIGgKkfZ=zBw=kSIz^PeLvCDn~#2?W7gWoU8>Cm
z%WvECeWN?QA%-BE&>e<8E+(i+vYkV(AlMK7xWgWEXoK!=!UHRqodT>RqgTUd^JGU=+hKo&oUmR{72wkgC(8DkVF(#KXc=*Y
z9|5=jQ6{b&Y~NH<9})-^tsZNY3PuIRI(Ak$8#AePCTg6xvKng=-dTHuE=yK4Y|`Bi
z#nuOTy31YmP^%AGNJ@Sn&&lcKBtnRVAp}z3;;}O#w_iU`CPyWnBO;Ygd=n7eVe8{q
zq!Hr4Lr*^^sSCwEOvSp}s@BYHzODGR96ns}&tz@(^}0N}4eRjbTSgM1U6+(P$vhN?A8uhtcJQpW!r1
zEfY!;6scl1m&=NUU_nRSzl6K7w`+ZrMJn+#~gn=cBq
z>#I3<)~m*Cnn}PgRsR2R0li}g67jrhNe}Et_>=USoAJMFHexwO($pM;Z=)_h(Bqw*
zz!eS1>CQIF3G-|H%#We%{|{dir2SuAsFe{>%L=7hl!x}LP6w!GU2SMoD!(|=Z3>4@sH*Z8$#R1&(e!;{0)SAk=B6D
zD_>+tzWtKf?dOzBMR~!i$7$7D1vb}t>$V}G<2VZnSJ|9qX`XWPv(Wc%xnE&n7U`#)
zla9)&AHEBisV|xmTh-@5*6}kkKZqOzm#%pkQuP!WaJa3D_&PHiNX)omuf3bK8BAC0
zDlO5axp+e7NjW~@;>ufAyp=cyd20dR*1r+I1=H9n`}rc|4hK?X(NNym2&E<&3yZ;v
zMx3OZmZjE(W_eC7F=+MbT0*@3Zr?w(q$nck8m6*w@8{y47Ws5oqL6)82fwp{;427t
zFT}V1J_VQUmSd>{71EDwKdm{0Z{A}wo_$jfE|p1l|NUAk`;ih`dN$lSEL#qkJ)ubK
zp_1V6o-)g&$(MYawq!4raOn#aFkoIOWG*Ze*?%+8{}{9W13S$`yDn3XkLZWr}JM
za>5VCh~=J!Wsj4~nD8}AlDyU(^Iuwx7X45WJZ2J
zHdq&9wB=sH3xCNGKV@8fH@Y&QG?2t@CK-ekwnrC?`SryfR;RuxIBX;u`SZ@7+?2L)
zc=HdcR6Boa_Rl2-w#}^e%jXYfD&9%L7OA1Jk6X^cVuU^RsYZx>$c}d1p6h29ADGMp77<)r9H}E7K>nB=8EVETG9#E
z)>CK@+fLhZ6QT8;nN=Cc#w<2>JqiE1h;>vmVWChW{*N5l1
zbM$nB&o4^v)Y~CIM4vCc={IFfjmca#1>phGd~`j;3O~;xV#6G#Ha?6)$H{!C1|#0_
zS5D81MNsVb{F`BGRQHvPLD(e6wkIvn*no0ZN$xKby;kbe{52rpOymx5zoFjYn))=D
z%;rn5tXG=?pZw=QfEMT~Oa6$SDE=U!2%TEsvTvetBh2PaUMdB8nEDin
zlG;}+yUi=TO0)t{2E2K7I}FYAr~F9nLQ~~IBJp?Z7Zf$~b2z*$M6M%Enkb&k=B!5g
zfo_pkr6F8eqgMCsm0#bnu0MZXTAG|eFC>qYyCbO@r@FbS$8SAYU#Zcz!1mU3PUo@ciPPn+T)yC`^kq+)r;M==2Y8Urq
zFlC+B7+==rl6B?`!Y)fx+sK8$I1HY%^dIQ{pxO=liK$BDS5Kdp6E-sl
z*qm=RG)#-A_)hgeDcMQ!t7nND%auSlQteb>I)_w<({JRS--iC9vQDE=HD>)7I??x)5$G_}En@~sP_b*jPTCtKcGA0q9ecPWDt^1I;(
zNoNuCER#h)7YTkB*S{M6_8k!rnE&Yl{9H|JB-&J!ql_UJr%+qDGG#eAa_(vn%;ovD
z(}7errAzw5-DTYM;qanMxqt9d%2sO=dW*6b79^SPK1gA23$apov=oe6RT-7XZQCw6
zjFqd9gvWM-7QUn#q%(erYExD#iRpHqS@3?3EQermG=0uuST?j6Na#bGx~Rwi*nRKK
znsXs$K+N-sfz8nmF-n|Fk|82A)!mSqbgQGfbbKtC)O#b`E_w@vyHRV0{+(Zt;1pKq
zS?^@w27Dz4)?Mkrc3w64x?&VKOcZ`QH71-KZYaxa4v<3
z#bp)gQ}kj=fJf9m%gAE6sOfSZME6?9(*2!3-L}}MvuGu#HtuwmaiX;Ra-pb_XUXN%)
z8#TkZs}SGAb<CACQ;z%>Keimgvfl6y?4V|q#6+QWyyAc=~SaLi;v_(fgq9yWX
zuuvYjjYC(tzBd1NKRTc&kY87Pq_6--
z>uJEadsJs3RjbWffk$olh~=7TloUn-Kl?bc_;?;BM!wN)68(F5LV0{Ygfh3sB9qu!Rgg~
zp2_09$ho&mU}q#C=}}Ojrol0d22WqL?Z;JiHtzEa*J?)80}VR}&JRa5yTLC`^ISbg
zZgfhD;)Y@fWq5zm5_?F7s9k3iQl(Sxy?aaeUD=7-<#i=s=>po4hBj{sED@^)?$V^r
z=_p&{74cv-wcGp@yiTX|8F&aa;L$lykBVV%S6M?Ig--$5d@6L>&=XMxwly6$CdPt&
zxXSw{A#FPMS3}qsT0aeZD=qD}1{+~)RVYKEJlaOq>RlD0U7n^h!L^pc?kiEJDBxQ}D)R4=8ebdp$
zOBD!>PZhM2W?9BhUY5v|Ni&3z{gtZpT$K9lvc=}a?~X?DZ2a;q@!6cq+|P)mijB5Z
zTGqspIFPod2fWb@H8yp{5q4KBZwe-ImKV{veV~!hl`;lerOSQ#`3u6fWn-GU^sXnj
zq>;Yx`pciM{U}i~m=57~Z+vJ74#q9NYLQi%)e}02-4t%*djCcdn7Y9WU5mHh{h0XC
zJ%_lHq9`U>OC&>1hU7YHk(b`bRxiNzTv*QEVxBAvLS=3r-tBcKaE1fNl)J&sqQv3ZMpu1>O!D8zzgNinU%ex!@g1&a>20%2|W@%7q~Io
zxrk=VXlQbX_G8iHD^DSQku{X+IE^2zJ^*vNwy`d_v8J=f|J5puIq-p{`-H*r8U1{9VhB=7dB1?NH~4vo^@dzo^AN>D!7SHu
zclw@C98%WwB%GyJs$F&OX`p5XKU
z4_C!4Q9;!eW#X*
z%U$A+M_cS&E7~y##g9o7Cg)eLPhXVd?M(B9k#wIoZvd25ezKF{L}3hU(Hw6-^GpdQ
zLcX(hOkRN+pj}tDcj4`Rk%e6BO4Kxw;`>eHg9^2EQAA)J&BX7JWlEnA9Q9+RaJVnM
zsq_8c1f!r!5^%$5_0;^zXog?w&|KblB-EZG~5-v6*2
zlB61Q`4lRWT70M^tu%0QQuz|W)MA07tj>CqR!eAmXN#V-0quLPq|sI3;n|p%b<+*2
z;sQRAAt3uKjsp&=h*nkp3<(P?9PZ2khK+PuSZs2Bv=B7GS`~9Z%tRfBr@tc50(GjY
z-t|_wA}LZ3vFS52YGfitUCGAfkpiz^g7pj8ug<7*puq-ThH3gUDUZa%Zol3b*1Uot
zNd&$+ul2;I2;N!!gPALWCLH0q+T;24bf6C6Gihj+Z*;R3A@bXQo)_A2KJi=XGON*O
zj=@naRQsGzJ-e7l)()bAEp?6nCx4LD3>yeGIUq%WX^}4fwz&T(7G(|wWC`sig5NSl
zk9_0LM=S>h5BoN~pPn?LXmN2#4uoxCL{J5*Cr;q_g~3*G2VF3aYM532Q6;Rkz*yb?
zJ(&Q;w|z#OT$#4EC%U&;5#_xJ77~XERwa6zr5|%$b#P2z;Pt0gF7yA_r%dex&x6W+#Nn#aKOd^Gf+XBQvs6W}r3t)Y
zhuy<2WFYcoc`J1w?qg0tvVN2rNGOj3ExNdv)}EL2$nn&`o@^JbcVC+i&Mhe}7qi;l
zkaXNKnDPl{Dei`|#m3RnK%G5T{ue08hRAwzjRi9LMeHl2q^H^_cO@&F6E)9eJ<(Hy
z86y~@jIzz*h^NhK
zyTNN(VU15npx&ZsZKmp8{JGG@J^`Ct(XcSr_AKdxD=`vF2bu9Mj9n*ovqYzhu|I#J
zTGBOCA}AaBp)@;fc-Eb<
zs-G4WAWm$S<5>zT|4o|bOn~$3-gW0#82oHG^dWYS&jj|Z6Bhc--ta6ZH5v#LbU5Y^
z=AN4LM#V!w5pgs1hU~ANXqtK-G{a5*NcIu&kplJ!O!daVj?Mko
zhfXiM{IPHv@SK;tS(fM-7O=JF4UG1E&aPjMJ!7o%eGvGZRtLuQ`A*djTUsXiZ^_x5
zJvYQ4Ftd8$$4i0azt#wnZqV(7PHfnVPwdDY)nd}{eVI4wqf?m;8T78?=3ug2LgQ&I
zRDkmG!#a)kzt_KUcF-Mte+mST6*%`wY6h>q-+g_%Q5E67Fo%E)H3^
z?{uHc)&^LrAz{!K)MM)Z!upx1{gtq%;P>Tpu
zcs8H6zkjT%21l&a<+`Mz7iXP%Qc-_U@BlwXy~wiJHr+zCVZYm{H%9a6Y8sHu=hPz^
zt`;}fdf_nRPv{2^x#tgk5H77qOqxyI$Eh~?Oqn;ZOpYW~B~+gK5+fNpAf(S^9GTtIs0^vcpKrqMGgvf#s-1Nn{x0
z{QRL^O|ZIEkFvq9DWjpiVHzm-&HwC!Do}YOWjo3K_)^kp|L@H>WdNz!EL>=XncsDE
z>#^a!1tcxJCntZC}FxTS-f13yozho0xth
zjO~wfAv2x9kdu=Gyl*nCO?Z1f2Nu@vNIspAnOnEJ2_286OW`MVJ_m8i27N2h8#0~i
z3>?1@X8b6eHMl9NmGf0f^2wG}gzGwxl(3t;7Yym+{@duvoG%sRT~1M!0@O5qnKxGs
zsOc;VogkBtcG>xjZ{YV}OD5v+Cfg;Xm|1Soo{va_0|O2LAn)6O_Q>eT;1ZeQ!CbG}+TN!r>^_0i75C
zKg5wP9(!&vnYkRec7%q>yu|iz7xs4CK47@$WL7UF@uXs)=sj$_sNpWObFNMCY@=j3
zXIP<-Jm!!Anpq#UY4Y8*s(nJ>C^Upx6w#L9*lY{fa&IZX{vqDVezCrz8%A+=*{J
z+L3@6Z-O5MH;dD10v_7S5s|`sk<8jP+xvFPThIuDx@pld!P&AsxEv0DmKE1moqD6A
zzkZG;7%ar-eLc7EVkArKxYluf(Y}5?`4U!^*Toy%7D8Mcbu3>T^-;FiloNO5Be$Np
z@Rtx=xbShRmGSU?4nfSM;V&@U3rt*c$iTaJnG_w{7>JK@!WSJy_wG^RLiny<4HJs+
z0$c?(kdYZpn5&D$us4WHsp{B$4YtD|*>=KmX7u2CVHy3cPBrsod2mH27(6xhA(zBYa_pM3ps?8!{PNjI>7
z&&ZYe4LKu-oFPhG{|(4p#lE>1I`YPm6T65;s!Cofviuv0oi5OASEg`p{Ge11E#k
zJ3SZ@;K>5x;W08rF8zwMru#lN%9A8P+yoN6cCDA@f9v$!HE9@}wTsq)73poZZ8B%h$U$nkvx)J{VhV!^29N
zlZkJ8#AGU(!SJrr_Krp58Xr7x(ik>Z2Yg2&Ub#)xx(q{}`hoxTwRR(`_Q~^_;?n3-
zOoW*W=5_E9rJoPwZ^#&=p*F_>LliQ2xqosq+%I#GeC|rCIFoA7anzAO-{GhhR`Iai
zjncI8!=U|!yV|JpK8RL-kX&%8Y@V$0*vaNDY;M~7#<7FP4OMQDz`0l4n
zp!0r+A@f$SlfH=4*N8MywO@Bx+GN+1Ju_%tC4>XWK1cCu@-3g@$AH0lKV>S`2Pv2T
zo~mwH&a*|`0H4;}O9Pl+5t5AB_w?!chkGOwv9!Ze9FG|&N3e^%hx0cru21
z)DoWz6f+5+YNOnQOwOR)6J1Wbnrf1ZeE5%tmSAHzfV5nl*@Kh1DZjS@4#o8x#x)AO
zkLmV(9_M=%3`(xrMgrwO17f#Pz;1T;{p9m^vFEavr-Bf;6k>bVu-4Md;z9AqhQklc
zThh|+qa|z5p=kIogweo}E?g#A)%ST)IE>uR3Z;4%XxnRzh(APnvX-+aYcz8|Egx_9
zdjZyUO;uCb4zi4bXR4~?gC9yqRPVQrK#MRqAuCdvkNzYYSuzyP>KGd}i?UrZ5hcXm
zMttIr`OOyXK`8tmC)UwWvKf@xk!LK*?TcC@U(k!}m{zJ&Pj8g`~$mo1`BaCn0
z6nNW{vs_)@n}2Uc{k|j?HLeW^oNE25o?+Kw@sy4W9~)}WP;B;p3&-oxAD@UIKwEAL^ZzBxtR5TiQLvuD!ga07mqh+&(oAy|7
znKk>N@V4UijCk^|AJ?uNf5xXueE`<6D%n5UQPvpw2g)Sxx}w68^iW$XRuY%riyZg7
zL(t_!v_%s=%x?7^&bU=Kr9U_==9Q7l#Uc;-x(51w=Q{g!kM6Q-PPu%xS3*&jl0Ba!
zGI^f}rT33#2=fZ9c;p(lNzh8&ktbtIozRe@7a~@#XL~QdBNZszbl}DY6${|+`oY05
zrp}Oa1TC)N;;RjMC(wo&y=seLXC{7_uhkNTVDwOBj9G`9PJs%M85tS*Me{&H;d{{j
zGz=)mBs#co5d+Sh%*7SL`%OsQ8r@sJZLTY9FR0
zD<4hH;G>Bdk-Kv>pAxC#Mn~9Wz|E!Dqg55!4Y%iQyYee^z;Wp|0DwHc^h3J0eC&Dk
z_l|b{ve<@Q2vDpse-9zFWh20Vn;WyxDv^&0BUF>j)0>>2qkdL;f`F5sEbi(F_J7Qw_2
zpB0kuL`z?gOeu^}0f@HMiECGKLC&Yd-(UxkxcKOahYCF^-rCh8x8o}JbLeM&%Z<6u
zsm%rnw1$kJ%{U@vOcHb*iogFTiu@Oz0oJ)bgL{=%$udF}k$a_aRX(vQ*=@1tiv)g<
zr1hhAwlg@#l8Y7lb85`q9p}Ia49`@X`2_ZAzRo*YE2?BSbAaUsj9}nMKc}~V
z6|=#1o`?RXAG-&upfp#A*80ivWhC8j6EvPTN$l2$YyFV%HC8c?PjgFvw?Hk&MKnD#
z%G0>w4K7SG>K(IRE7H69dQ+Dk4=tPkTe4kw(TE=7H2h+zDCKngR<|JX;dDnSZVf0
zmCcB&75n|=f_fzTKw+|a=Gp!h16aXMX09jMvRS=E*Fa&4!qPAsvV!d;67#pu&L8Pu
zqB92rhd&f~+a9G~;v+;d*lBiFby+tcB8Qd5Lk|PnQPadmaLc^u-f2zwGcF$8U8&(o
z8h4*p1af(|k@~!Qkl6Hv*!PuRj?YD$A)lTTXTXOhJX+x^9|1NAx{?4>88P9gn+MTf
z>cVP^+g0HH@5W5_vX&ioy@7W)eNmhitdRu+jmmEhP>GV&Uv7MTW*W{|IP+^+P%&{B
zK|^7McuH};;$Y7^8tlK6wFpoC2S5z;)^?MbGgi2$jyM^WuV;{m9({8ap8XWfG#;WiQf(I;Tx+R
zt=m@R`AWRUBR+~d
zAg+Up>BPKW6z2>|=mLZHVC*Ap`%2@(NDXWzPHDZeY$Ip_aeZGcs%GBIzEa$ZzXM_U
z0PofSq?15pcJkrW*?IJncoC)wy@7x)j#VU5K>dEh&cDu*W0~^t0=}{
zBRUB5SbybY8fskSq~`OmRXq}c!ev#h6n6r)zq9akEFut5F`MxE*S_}p7e4z>f9&M;
z?O(UH-#O$Fn=SP1+o1gx+l_N`)lvktbhs99nz6W
zI;#dCj9eGxOEOBW@+q@h07YgpDS*i>=`~8NYyvb07fmd@tV-{iBQmPR0JiloLo5I=
zlG(eje|tD>;F+-#{S*baKcs
z3xD2X*#YLY18jmH$(={4#p-_)lPh|?8JrKf+^tXSqTX4{2G;qz8z}i?scAniyhE*m
zgJg+(wvKOs#W-w9W1uFWVyPy{wS&w}B)^d1gv2lnFq;4~7{!mkV@_~6BGQ{ceyuhL
zdmWrlt-;?$*fi~M{ra2u+-E=g|N63&yf>%$T!5u}85Y
zG*gUbnU*{?l3Qrg1b`_4iOrNDjd$|X%sYy;e4>5M872_3wGk*~amj;|Be1WWNq@cX
zwz?DpmJHB~Hs%Uu_4WR3bQ3{0J}jqiq`oS8c-Sc9;=g~z4z}`$%4lalK(btB+t`0DlHr@-KnzHNhlc4bmc$0gk-{
zzn}o^Mepw3$GwC_1?!zhMUxHd1b@gS?oB*gm;M{%TD*#45meoC)m`)6Nzg8NPhp~l~_hG8Juf1i+c&FyfC>YmVX#5UDM{vi4J>9VX?--s+_J!f%R^z(oT;UZKD)Rg37*b~t4p6H%R7)ZisgL9z({j?ZRB+O>AcYib;VCWQSZsAOZ
zmH^Uy%A8vB3K5YZ7FA>jm5OMbKres}V$+0IUV7;l{^$#z|Cw92ZoQbD<19J^-+Q##
zZolQZcRc^y@B6NQ;lF;zJD&aH!!Y=HsHB`sC)}M(Ky1SSDMsJU<2tQW?3QD^R6_b&
zk^1PJ(ys|g#k4Kw)PG#GN*$&L#+zooLoUN&7?uJcI@wI&Z41R@)I7?W=bhs+bQ7f*
zNAhWb;HB8??G+I3rE5RDi>D;wNh5EsdHn3cdI`bxbsgUmY@lZ)WnLr#v2MpWyZU4&
zWIc~CGePN>lcAg~i;*BK)Q%lsH8v%nCUw1>DH@^;)Gkf0bbs%8&H9Wjp0s!(mO!-R
z#d2|2kdWNw~8Hp4SneYjAR|?Z0<>7k$}{hi=~_K*J7|9j`Ft_V&P{
z&-4oWoIy+Qt}x^LJxle|u5QuO%#m6`0nqx5wRRDtx<^sbS_})8J^G=DU^>~!%P+n3
zcfat3FZ{TL!{_Wk#zjickt{!d1XNF;P?!_j?GFT_)vAy^h
zM)4JAonr}DsK8893)73v8ey>}D6ySs%2raNGWT~-<3v7RC0@D<8|YVq~3s`%5Lxfz<1b>m)2Oz?}Tb&yq{US8xj@z
zo>|VRb&OYi_f6{5T6s!Nu9_c3xl)bAR}=ufFoi3nUM&2A)Q8H<1D0=*pFU
z@mt>YuK(ga-|?P*WqWly8bF(>=lOy%Ct`}#LN|&M_yTCI3e^V^sZZo7KpG-9~r?J@*$RAx(&=WJxS-(-(P`>psgLvxnBU*
zbARD!1|!vCbon3np8FhD-7~F^du~YxWivVH$CbYlNS}{5$J}w9fUobd-bO!B71!pP
zPIQul8>ct#d7N>&po+MJ>k=jW>yXFCcjRkd{o4Qb>T9q4`t>*7_!#bi?i#Ry-u=#Z
zzVn0M{_c0b@Z9sy^XO>nOOz@Un%ES!;D4mRLaiKKx$ErFyOuK(q9Nq2iChT=+2L5T>V)$)@Afikj5U|mve_uG
zBmosS0?g6URg0wi2#>sxyfH1*A%7?VA3cZFG@5DW=CX9``x5W(m?p}dn>UX?_qoq~
z;>OLJKQrxipFay+&Z2t-EWqs}uZjr%x$pRszxeEP&wa
zGV_TAT?fwh54s*MZNXfhY91RxiS4NVZMypAdv;$zK4#4aVF$D^u$!JPr;do(>TPUX
zTQ5d3*JT53n(C|GpNBLZmVb0yMfYNA5+Fc@_`rtrI=5ieaxM!dL%RB8Rl=aS1SBWv+DeBvg@)J>BPU@Fxhw$GA_~oO%oQZmS=?eZiG#j@9?k=hZFrhVZXC#Y
zU+NC^&WppWu^AHsNDaUOh0qvZ9fw+dUO|D1F~36_>=0pEgnw#I57T*88`0)K&XhSD^$l}bcbCz$OQiqARm1G8~)fgY`5F(@ttG2
z^3>Iu0Y@49#R;f7$jQkGx7!V9lhD9n9Awmi>K+ATvWYSb(CGc6Hsv6aO_u;O0fu3S
zK{%8y%^C;bgS6)JRAR$ByG=3$s;EGqL;4t)b0Pw0a(^0bg1~_1;6zGs-M}vA^O(63
z2Xnxx1P~yUnjMGQ#Fu_R_KGDhF^3EQPPD=|XR<^j%>0J}&}26vZ|}|`6GOBNrBCBS
z(}J4y7R(^I3do%GqmI&aX(Xte(i4fRkwZw;(vPXvIO;tl=wiOm;omMLmgJ^tvWW7M
z18pER)PHuVUL=eut#L#S@<3uy`zAh(iNIpvv*6eJR4^@OMnA|Y4~|PnmaY#_M7^H^
zv638}9PGC1x&0=6zgK&|Gze(@Y#;AbdZdqb8AZO%gfRqyOdJ#`iU~x5AOQiTfh2}F&)u^f`#JXW
z>uyuGsj73%-fND*hcU)nYo9t*x9+WbtGRE__v-F-Rx{U}bIm#CX#amh@}lQAV&M+z
zR~pP#xDBOriA^cOZNg)><4A|?WI!Zkb&VR6XW*Wl?pY|SjaDh&(965EkZLSsSQXPs
zSd&>PD@7JB8kmDp0iC61_XA>i`1>@MTu^mfjaJDyu%@H7_$M92R_3@=R@!1;OZv+-
zwussHP@)wpoYoK>RY`yP!^ue8IxJ1@<39Jytyi$J!_JXSm-H#W|^JLlC`Z(&S);nh1_boj^%&-3ExP0lV}W}}MC
zFn{S5C;OgGx$&Nst>20aq)^A1yRn%jyumzonkw$Fv(A|<{!D*&-Pi!nGjY9zPn1p)
zQODf^{>7ZxgM-;l4Yv&~Q1f_mx94V4p4)5*|I~<;bb2t^%UFzfKv``)gYvqU>z;pCC@46ky1=ddEWLL>2l?3M#7|Y2x{2lI
zH}BqE=oWu@DkoLhY^R88bCvVi{MEBPr<<*G;@vntsiJ~Rf_F^B@zxZ`9E08o*HrN)
z2x8u(!B%AM=6iS9AZ`fOOlEhtZnBHXf+ZY*xne|rCtNn-9)5SlM?Vc#!gp3r8r*}?
zcXchzdfn#(7-nUyj`?S-t%QfakkZZI;9S7Flmve+#kg1GR1v6LAuFO;*QK}x@#TGR
z>Au6`M>%(&>uJ`hs5m=hJe&wxss87FDIrp)xy_R@*}Z)&8+`p&5B{RubVViq(8wXE
zLxRYUv~WTqu^UNoNrV+VtMlcVr6I$u&WA2*WovPWl%7LM9b1)G$mzg|WE8#embMe9TNPSnymFV^CxT{Xd
zO6e{x0i>B$LO-mPdnK7g-dUUqS7!g!J@+X^V;^+S<0!el*E*c!6b{(Si1CU`YjuB{
z>r&6UD6Y1@!dfHVtM+6$n{Jz%Om
zaD7{AOd30s3QU_wGJm$)v+t2Kb<-vST~(R;jCxKFcj)1HKWXlo?x-dP8&7|JIo(T>
z9^9gsYLTR)lEwx%v+V4e{zE3KurnNNl?-~RZdEah4ri>01EulGDCw(u4p-}yU3_8#
zUF;3y$|MLtN>q{Ni{Z^awC*FOkb{8ZB2+~L$NDV=(Rij9BpuJRCK)Fv>2KrXxoBEE
zuMpwuvc7mD<6fR%?Y24kpqTCA;0jxil;<>%Cz}Ql(kTLZ2SLgw2M4uc1WS%wtcy#7O2%G?404=I4LmGd%Z|-^g<>
zy~M81eEv(X@cQd-^7@;%=ngkuxX#>+GrK?pZX5i(I$w7p+_Z2z>B;I%DY-WVNsvId
z#YWx5@$Ckia~DX;+|%->)5J!nNX?cC`Qf4g;S<$_lg&hA5s5)^gxTP3pXptAUX<7N
zdnQp%WXCnOgE@bXeY_)^4L%19^WJPSoLt3$&uQqmlabi=~}dVC~j$`
zYI*WogN#KC$#IAzky=|1SM;KkKZBDB!V|lJq8bjJ5mbLm0FE57cVxpV7Pe)i{nj-UC|-{J3n
z_A{K#J7#|~=4KJQS&+pNMB`PPnNJ%3@N~*e6V7hmrFUoBlnv3oJ>gcNH5Wy2-5@uv
zp*GWRpO3-YSs*TKHjRx$MrU!uq=f}Ex!+BTk(uW`9%xIMem*#X*_^X^=H}@suV2hu
z0F4t~ycxLu!TE*w=eu1du@Gj96!aH5GbN!_5AJ`jZgBr^_9=cum9>V`Kz~H`FQ$u%x#rAk25qyEcDix4O~lnN-a1D-
zhNcH~mWk$@$Q4qaiXxLZCUPNB^_ck<%R8$Jv2^7()4
z=NB{APqy;4CtFv#_?)(^L|xUeVu(B5yN`It*}HgzUdrCx_inhB)mUUBIN=&0xO)$K
zp@^zCL?%(+inA;0^Lw!#9_LzIX^>Q!(3(rFFUa{G&R1S0j)h$SVX+eCe?~?_h99@c
zB4_9UK%fU-w_;cFSP%H9dY_aoXXSrlap}H$jvwXR)z`(-xS0$~_ObjEEIm2AU_4D~
zGeet5g-vKAvMXYMHjpOLHmTETLw1XIr$tdDD3@w-S52h_-qld8Nn2Shoy8jIHOL~~
z4KWo@P&sogDL&rQ6rGUPTIk4{t{B98kwwl=>n`-*7QDMy>*39=BB8SqF)@F-27zkb
zA`Z_T>(1Z%`@bNc{lc%|X3}t)2p7AZoXvZ77K*SHLr(M}$J7V21d6=c_k8N&O}=Kk
zk(--_cau4Np3>DK>Y0F(4Kk@{Q+(fL25`egrEBG&Byp!3TpL^>L*P6;#ZMK+4&O@R@(VxEbcW+$~
z$!t6--HmQ8mY(r46cjqvrlLan&4?pYQ#R5>aWtaaWs&b6VLd$JGb;}7{`dL%ybl9s
z?9Wc+&Pn1iXi+_y$|%H#Na#a9yyoZzyW}IH^FW-E@gElYx^C{}{uO^MJy3i--V%eQ
z$!ZF?A?d6U0C`3)Z}4z39y%k{@Kn~8i6Aw9n=*w)G_FnQ6sKz^GzQPAF(a9p&?ZHi
zqT$;^xMSRdgso?n~N?mEpNm1G}iH<__97MLqLWgy*BT7
zQ}%rPbm9{`<+&Ned$b9~n=@^`OTKweb1zgU%G#D#%`XOKJp?T)rL>O
ze)jyvV&%RT#saJOau1O^-9LwT4o;HKWHi!j-33#}BytnFM)HjEh`&+uc?w$w!;Bt*$6o|2Upg|DivCIxFy8vLMHcG%FXh?T4lYT-TEA+Dg*
z2+wdZNxP7T{-%E^Y73!|;cX6W3gbhYf;Sx*Y&T)u3F1?V0*HV`001BWNklT_*~Le$e@@rXuJ(L$OmZm+hdY{?+>;^C}fsT&ED(J;|_Ddwjjo^24&)Mu4t*TEB~
zP93~=m=x<43SDc=lhNizpADInSq$dRMCf6f2)$eQVs(F|s}J2)GpA=3nT0c4?Nz?|
z$?0J*5KFtm=XB=vQ{`j5@uA(87X@s$M?|o0^uEJHFzf90GrP2|bu(-;B~)@n34~f#
zU|91`GX1!mZj1QGWi2d|%=Li!aPnx@m7CfL0S6zQfQLdb3hvWe(rbouJLxA(x5vFq6vJ7?&
zw!UJ6Kf7lUukBg{qa$^e0Zs`xwjXq^???BTm
z!kwxp2`-39Xsw|Ww5CD88mPAXB?wxCevQc%z*RZEzPL+-qqt|-pR5!*m&Ry0J-B~e
zsTU+cwH$08qH5~a##fipJB~WNM3@$Ga9KO)$tmrXsTup638C4X165Q&XUi~Ck35YY
z@o_47uODtuzWRqB60YG&vI+!uf`fcn&X}ggw?2Q9YxABvw`bg)eGgx(of$g`aYNgN
z9NmZ#v$C1QW@J539MmJJsvz9D*l~aB0?u}GSp7sG;hIl$qW2yNClboNc;H*-JAU%D
zH~G-VKg3I#ageRigb=wY7YiZLhk`=_()lWhSq3(HU|=<3okarI7?@62FRfQj!lzLr
zTwlERilk*QHrJvuzJM*PR8IH2#goH|418h5Dqq9^<4E3YP@zoB<_GhwT6KRIb60Qj
zWwROQuDb8xu0QO#2VTE%L#118VCG`oymzo3x#X-TbFiY-2+~?}1auNshHS_dToj8YFM9$V}(ernQ10`;@w`BY@;q)4UJ9^oDijR7~h!1$#JFzl}ZwOO${
zQlJ=_*gIm-!mo<7h>ECH8VY|E6$yL8gy0fZoVj~AJ*u$7t(myRlCdUYHCKG3=Udco
z$@oX^hb2CfWcXL}eL0RuA{V6)-Y`VIw7=t@Z6aTP_l}Bc3_6kbc@4cG
zUFzFq=`KCL>x#n?0LzpKO&t$?F)iS1Bpn!~xigvJinOL!R}p`6L<|)X6OXvao?@V+
zBmUUz@_oLXyF4SM{*QzYCsG>*DC`~i^u-yUJh>qszj?y7**M*Id24oV_b#4(QEi$;
zRq%@onsjLnvDFMkxTFDh1h`D7%o)%xkX%``VWY~%gAyrZF33O#-P_FGMLzw;ZNB>Y
zHLi(>(GU+xsUCmcFpe^3s?=n>q>E~PCdeq?-GQ@Jex3uCr0)}va%6-tJe4zHi)S%H#L9ny;)QG#Yni}n;V22-ZG`=Z
zfQbf?&~y|kU0E)b^(QW;8#6&oB6-5FC}!-V5Z@)+6N@wbPHJB($KO1Mh7wssaW%p}
zOp_3`TqYSdqOrxPg)Yxh`5*rzMBbVn+3tHp76T(4EmOrX;>Bw26`d;4HyVHgcW^#s
z=X{fHd47LVPMUIUH*?+Knh86gVl`)*klw?vK&01-_{eZUkgzVGE^Gmp1{z}5%4>Lp
z%|ME62r9-b(3|2Syu9D>i+Aqw4X39x50%2kXPSqFwG#^baCW!E#ELm$z($}=6BUa}
z??}c{I?yDDWG}h7+W5rF1KM!KB_Hh$cN}ds&1HZ5TT6w*2$g&Pv{raoR#^8J4>!Dm
z4s=h>sOfSeFU6oPMAh$+BOiAW6|UcG1p4IQs@V0$v^VCi^f}HK2WHk%eq2ljwU8sk
zB`fzNOgMClbYAY^MV|Vx8bgto^r)igD&dhw3NJuBC@+LTv<7c%AvIVqRJrd$al>IM
z&JcfyN{!(#BDvi`Lw}T*Vte!m4k_TM6w{0Q!CvlR}l`rgK0YZ-Z
zwXVmL)B2UMTQB4)h?Oi7-T~v58m@9BaUR(Ar=^I%$+ZbHW%2|_n;o5vd238P{_cOX
zGk2%W#ff>Qk4nOo)Fb+yoJF^^`oz6%mbm8(g146HE5%eK0Zjo#G!^(6*CrrtBYdOG
zzy~JtSc*G^#qMp??r!El(@3^
ze-;}fivSGc)c7|Ic4tiJ10IT@)4F828tRDE0z7zdVb4}O!IR$+1ZTTxSU7j1vqjqX
zNon2KchG%jo?;RAy|JGK_CW%i6;UeUmAJd^46EZf-y@e_Sd7Ajpqx%y=1&oCh)zhG
z&?#_}kjMa2vb%{TI)J5E5buBJ;uHjoJ0m&lVg(&hqVd19yhqiM`aoOc!s@+YO=;T0
zEh8<#ZUhuakAI%+z-wE}z7>I!-1wSDu(ZeXA=>%kHnP@53@w%f=a;@|It4+mVDU6+
z;27r)KfCGNK=_7sjgP)bSYs`6J??wXwbtm?=?1D!lg3m8Ip<^K=ShErh??@*hV4m1
zOzHd1-VF1|=cO(q!Kvn0{L&kDI91^ru3tkcA!-kl2{jg#i-RNzLj^-e@`OSDeI
zx=2%T*FyNrK3L?~jD&M>u7~mi?_v4zv=T;odPW?hATH7nRS|8jt%6sEiOasL_rO~c
zjYL$DCozI`#pdpAkxMVw_sXy1k_SO{G#-p}aT186>MlLPPP}3^2`ofZ#G^gbT#TU-
zZ_*+ZYQnW4(zNzv@vgpelV7kiKfBTR(B@QbobCN&Z|u6s`L6pOq&IO~n3~E2Zu4Gz
zt~@j@-P0`R7Gr-ASTEkRRR8Wetd`CsD%xZ?_gm~1(h>i~H|}t=HTexE8&?xC&HRvJ
zGQ0UkH8EpDp7$1i1syJnvUnf3M0j@-OV_NOtMn}uk@<-0;ZdKF``>pDZOFM$hfp$b
z-Z#>02FXYwLu%)Rm6b5)RKiUTt9ml)L*~~*%f$M4X?TA=n=-@7d#JR{8b;pr{r5Y5
zlyg^JcaZ%aL<$|-p-WjNkc32RV&WQpOxC4@pU7qCj?FG+2Hhh+Unl@&D6|%fnABcT
zunE#8Q3<>zohE716qc=Ri*rpyQ<-n3VK!7GbYe4ZB0Y&@TAAn`KGYu6D#o|R{=6VS
zr%dAYc|3m*Tij~)Ak9TPEUN#cDH*$<%-p5zm
zV0VAkseEUaqSEZ;O`J%h>6Pv#Az~!pn0KS^9Gip18mX=*{>u;d9bqI%2&c@6)*3P?
z)3jweX|!o#+Q#`dMX++MXTefaTQOJ*5^4m`hEg|-FTVOM3$CTXYehyXa$zV7O8J?h
zY}vw6Vk)O9&-gX>)TQMZMQ9MqX74G>MAd&mDoZD`8kZ#+V%eOfXsg5oRRn1*q6u1v
zXl=8^oZ&s*--WKmUF+P{j=a>c-3h<^+8til8P83^HBmOL(QsO8k!7cMNUN)PkL*X1
zE24&HWzL8Y)HbH@Bo*#t%pPl}sq*Ts^LK8kYL;CZE`B0cY1co2jwyp*s~-v?+gE
zb*u}sby|cyXJQOzo)c|#v?KIuve6-eKiTpQMZ&V60~MvQrfXsjjW9qJjLx9U#*`Wl
zh8ful1%kYJe6eOL3(+c!D9e8y
z+*B?O1M6d<67D;cG##!Fp}(O8=MsNQuc1w8n+a`6q&5?6igPW4po6dRWf{lUWsJSV
zORYSvLqnX3^#X(o3S7!|FYbHPu}qUv;7bzSF#EGWLt7meg-Lx_>7rKd8|7|S#IxdV
z#QPxPp<7tm!Qds@ve%YEB6+-ug=|H%CK(}Msy-Cb>?2UPv&W|yKD6Q19e98Btuyq_
z9bTLoH=1$^p?^xRbgYxKD|CNC5|hZ?)2&m%{~@GhvgLoeRo
zW7n?p+Qm87W#Wa+#KnF_QjKo}C*P#eyRn(V__Es@u8}2ZfyIWd7W%vutMOD8x$4wv
z?H6Rq`rg6buJ|x=9yDbN-&ubf3$FazEhoZZDWm>M7QB)Xl*8Y=F1dqW(T~Sg9O3Ma
zMRouU5j9f9kK|vq27{~G8+~>xEr-@E)Jo<>H^w;VSbQ){T22ZPNvzrioq|wJ(}YgJ
zRkcYY29WqTrNkGaostV7ur@r!f`lg#TdaoVO5wKng^^@NGZwV!(Aa;B@qtx7c2-FXss`eOXmD3eWB?PI
z7(GQYSH*e{F*%74C&IM3!G7BE%A0q%+h?v50EOEYZE2FBRt`3KrUYxb>Gs^*dW;Rx
zm$LGjd0Mdq+~_E0KC^$vc=K$>uk7~xgEueu_>B{O@zz`X;Zqlg5ailcWfWdq*xFR
z+($^6=&~t<_>vI%8QdH(mkrU}&D)05Sp}z62oKs)WXc6Epx(o}))E5=(g`xebD3BD
z!V~Q>+810Ql;c-fKCGNmSHyO4&B$+8c-w0WX!jIDV-^%w9`{>$Lj(bF4#eYpRg@Oc
zG$GTil?DkDEgpaF9p!)HaNw7dUa`Yr6;M|q2TpN3;TvZ?EUMvGcY$mt^rcg7pUqsH
zUvLfB`$SV`awl**!n3_;!$l%Su{i9SBVkNP@g_Eh*&-RnMIP@mt50x&!lzz;i|cpp
za(B1mmEFv@fAk}4wXy4w+||vQQw+E6Y?8AKL$i%h_WC;1SmznC!tb0%7IotMfo8;!tlt-yo8K%EPR0EKaTmpxr8`=8K|O<7%SA20r@DVmlQ}h_l9C_GMo9SHX`OA^(ao{B@81;^2U$09^T_;
zuC9M)kpuIqrRF_mO~n*4GEc^52s4VVlo95_#h)Pyc!t3g@ek}h2lq2g(9ow
z4Q{?ZFFu+p)Xuy()32GWtBxP#+?CfA&sg|~O(w9Uq(s8lxQm2Qj-Mi)1{_UHBlU$*
zRY@?uCW#`7W?m;j6NhF(wTVm{bZXMHL1ceck#J#<93PLkzo0x=cWDiJIgYu66;L%6
z=LCHxbVYWl)al{!5D)-K86uf<5EJv*p}TsSf2EY@^__4bg1`;$77^2FElUwEoXUa%
zuD*K=im&1!(|-hQWOThOQ?2$_m$c9ZRF9Oy6&gSn0bL{7ogSNJ`l*?i8@-#%>EM5B
z-NZ72!6Tp@i{R@tsO)6#u-mF!*u-w`ob*{Hw+QggV9X|AZ4F1+fTwVY`dkQ0DH5(5
zF3j$joAjdRj)*Eg5dc==;TJk7pT2uXPEIDi>H1CP-ML^9zuH=aM|n5dTW3Pp#P-M>
zo6Cq}9OU2;*2DYo%-h#f9M&TBubh7yWC^Ft&N_sA++~&KD>bYKex0(sr5tR6AIkvw
zsN+7(lfw#<5TqDbu91
zrcB$^M`=LL#KDx#kW)~n)|!gA-E}Q9P57pu4gLD
zyBN??^!Gl;5J#|e=v;FA#T03V_R!xs1R<;to?hFZXIPQo-7>DSR>?9^YL6Sz+jfH3&oB;0P`731lKcIaBlf5WUZ?+u$f^Bjt5>z=;0Ip2o$
zHyYc;=;GMv#GZ+1H`C_M)Qx{8D^K_&twFQHiPzIwr>RGqaS~G}p@b@WL5RfMN^?($
z8R0^lpL**y(v+{;oUpsNpt~V+pr}qBp6%`-u7>_5;vB;`Vzt7b{&I1kD