coldcard/firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
scgbckbone 2025-04-03 16:00:47 +02:00 committed by doc-hex
parent 1ca170946f
commit b47412bbc1
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/address_explorer.py
View File

@ -503,7 +503,7 @@ async def make_address_summary_file(path, addr_fmt, ms_wallet, account_num,
if ms_wallet:
# sign with my key at the same path as first address of export
addr_fmt = AF_CLASSIC
derive = ms_wallet.get_my_key(settings.get('xfp'))[1]
derive = ms_wallet.get_my_deriv(settings.get('xfp'))
derive += "/%d/%d" % (change, start)
else:
derive = path.format(account=account_num, change=change, idx=start) # first addr

12
testing/test_ccc.py
View File

@ -516,19 +516,13 @@ def ccc_ms_setup(microsd_path, virtdisk_path, scan_a_qr, is_q1, cap_menu, pick_m
@pytest.fixture
def bitcoind_create_watch_only_wallet(pick_menu_item, need_keypress, microsd_path,
cap_story, bitcoind, press_cancel):
cap_story, bitcoind, press_cancel, load_export):
def doit(ms_menu_item):
pick_menu_item(ms_menu_item)
pick_menu_item("Descriptors")
pick_menu_item("Bitcoin Core")
time.sleep(.1)
need_keypress("1")
time.sleep(.1)
title, story = cap_story()
assert "Bitcoin Core multisig setup file written" in story
fname = story.split("\n\n")[-1]
with open(microsd_path(fname), "r") as f:
res = f.read()
res = load_export("sd", label="Bitcoin Core multisig setup", is_json=False)
res = res.replace("importdescriptors ", "").strip()
r1 = res.find("[")