coldcard/ckcc-protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not ask cc to calculate master xpub - use already calculated 'master_xpub' attribute; README.md updated to list convert2cc

Browse Source
This commit is contained in:
avirgovi 2022-03-05 11:21:54 +01:00
parent ef61911047
commit 52588ec9f4
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
README.md
View File

@ -52,32 +52,33 @@ Options:
Commands:
addr Show the human version of an address
auth Indicate specific user is present (for HSM).
backup Creates 7z encrypted backup file after prompting user to...
bag Factory: set or read bag number -- single use only!
chain Get which blockchain (Bitcoin/Testnet) is configured.
backup Creates 7z encrypted backup file after...
bag Factory: set or read bag number -- single use...
chain Get which blockchain (Bitcoin/Testnet) is...
convert2cc Convert existing Electrum wallet file into...
debug Start interactive (local) debug session
eval Simulator only: eval a python statement
exec Simulator only: exec a python script
get-locker Get the value held in the Storage Locker (not Bitcoin...
get-locker Get the value held in the Storage Locker (not...
hsm Get current status of HSM feature.
hsm-start Enable Hardware Security Module (HSM) mode.
list List all attached Coldcard devices
local-conf Generate the 6-digit code needed for a specific PSBT file...
logout Securely logout of device (will require replug to start over)
local-conf Generate the 6-digit code needed for a...
logout Securely logout of device (will require...
msg Sign a short text message
multisig Create a skeleton file which defines a multisig wallet.
multisig Create a skeleton file which defines a...
p2sh Show a multisig payment address on-screen.
pass Provide a BIP39 passphrase
pubkey Get the public key for a derivation path
pubkey Get the public key for a derivation path Dump...
reboot Reboot coldcard, force relogin and start over
sign Approve a spending transaction by signing it on Coldcard
sign Approve a spending transaction by signing it...
test Test USB connection (debug/dev)
upgrade Send firmware file (.dfu) and trigger upgrade process
upload Send file to Coldcard (PSBT transaction or firmware)
user Create a new user on the Coldcard for HSM policy (also...
upgrade Send firmware file (.dfu) and trigger upgrade...
upload Send file to Coldcard (PSBT transaction or...
user Create a new user on the Coldcard for HSM...
version Get the version of the firmware installed
xfp Get the fingerprint for this wallet (master level)
xpub Get the XPUB for this wallet (master level, or any derivation)
xfp Get the fingerprint for this wallet (master...
xpub Get the XPUB for this wallet (master level,...
```

2
ckcc/electrum.py
View File

@ -102,7 +102,7 @@ def cc_adjust_hww_keystore(keystore: dict, dev: ColdcardDevice = None) -> dict:
label = "Coldcard {}".format(xfp)
new_keystore["label"] = label
# 5. ckcc xpub (master xpub)
master_ext_pubkey = dev.send_recv(CCProtocolPacker.get_xpub("m"), timeout=None)
master_ext_pubkey = dev.master_xpub
new_keystore["ckcc_xpub"] = master_ext_pubkey
return new_keystore