AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9534 from scgbckbone/fix_msg_sign

Browse Source 
fix Coldcard msg signing for segwit v0 address types
This commit is contained in:
accumulator
2025-02-10 13:46:46 +01:00
committed by GitHub
parent 9cca92d837 4f5a732fef
commit 7e5ad079b2
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/plugins/coldcard/coldcard.py
View File

@@ -212,9 +212,9 @@ class CKCCClient(HardwareClientBase):
return self.dev.send_recv(CCProtocolPacker.version(), timeout=1000).split('\n') return self.dev.send_recv(CCProtocolPacker.version(), timeout=1000).split('\n')
@runs_in_hwd_thread @runs_in_hwd_thread
def sign_message_start(self, path, msg): def sign_message_start(self, path, msg, addr_fmt):
# this starts the UX experience. # this starts the UX experience.
self.dev.send_recv(CCProtocolPacker.sign_message(msg, path), timeout=None) self.dev.send_recv(CCProtocolPacker.sign_message(msg, path, addr_fmt), timeout=None)
@runs_in_hwd_thread @runs_in_hwd_thread
def sign_message_poll(self): def sign_message_poll(self):
@@ -328,12 +328,18 @@ class Coldcard_KeyStore(Hardware_KeyStore):
return b'' return b''
path = self.get_derivation_prefix() + ("/%d/%d" % sequence) path = self.get_derivation_prefix() + ("/%d/%d" % sequence)
if script_type:
addr_fmt = self._encode_txin_type(script_type)
else:
addr_fmt = AF_CLASSIC
try: try:
cl = self.get_client() cl = self.get_client()
try: try:
self.handler.show_message("Signing message (using %s)..." % path) self.handler.show_message("Signing message (using %s)..." % path)
cl.sign_message_start(path, msg) cl.sign_message_start(path, msg, addr_fmt)
while 1: while 1:
# How to kill some time, without locking UI? # How to kill some time, without locking UI?