Convert2cc

electrum/gui/qt/main_window.py

@@ -33,7 +33,8 @@
 import csv
 from decimal import Decimal
 import base64
-from functools import partial
+from functools import partial, reduce
+import operator
 import queue
 import asyncio
 from typing import Optional, TYPE_CHECKING, Sequence, List, Union
@@ -593,15 +594,16 @@ def on_cb(x):
  if cb_checked:
  self.config.set_key('dont_show_testnet_warning', True)
 
- def open_wallet(self):
+ def open_wallet(self, filename=None):
  try:
  wallet_folder = self.get_wallet_folder()
  except FileNotFoundError as e:
  self.show_error(str(e))
  return
- filename, __ = QFileDialog.getOpenFileName(self, "Select your wallet file", wallet_folder)
  if not filename:
- return
+ filename, __ = QFileDialog.getOpenFileName(self, "Select your wallet file", wallet_folder)
+ if not filename:
+ return
  self.gui_object.new_window(filename)
 
  def select_backup_dir(self, b):
@@ -2471,6 +2473,7 @@ def show_wallet_info(self):
  seed_available += f" ({ks.get_seed_type()})"
  keystore_types = [k.get_type_text() for k in self.wallet.get_keystores()]
  grid = QGridLayout()
+ # this can be changed to self.wallet.storage.basename()
  basename = os.path.basename(self.wallet.storage.path)
  grid.addWidget(WWLabel(_("Wallet name")+ ':'), 0, 0)
  grid.addWidget(WWLabel(basename), 0, 1)
@@ -2571,17 +2574,21 @@ def label(idx, ks):
  ks_vbox.addWidget(WWLabel(_("Master Public Key")))
  ks_vbox.addWidget(mpk_text)
  ks_vbox.addLayout(der_path_hbox)
-
  ks_stack.addWidget(ks_w)
 
  select_ks(0)
  vbox.addWidget(ks_stack)
 
  vbox.addStretch(1)
- btn_export_info = run_hook('wallet_info_buttons', self, dialog)
+ wallet_info_btns = run_hook('wallet_info_buttons', self, dialog)
  btn_close = CloseButton(dialog)
- btns = Buttons(btn_export_info, btn_close)
- vbox.addLayout(btns)
+ if wallet_info_btns:
+ # now more than one wallet_info_butons hook, needs concat
+ wallet_info_btns = reduce(operator.concat, wallet_info_btns)
+ buttons = Buttons(*wallet_info_btns, btn_close)
+ else:
+ buttons = Buttons(btn_close)
+ vbox.addLayout(buttons)
  dialog.setLayout(vbox)
  dialog.exec_()
 

electrum/gui/qt/util.py

@@ -1,4 +1,5 @@
 import asyncio
+import json
 import os.path
 import time
 import sys
@@ -388,7 +389,7 @@ def text_dialog(
  return txt.toPlainText()
 
 class ChoicesLayout(object):
- def __init__(self, msg, choices, on_clicked=None, checked_index=0):
+ def __init__(self, msg, choices, on_clicked=None, checked_index=0, disable_buttons=False):
  vbox = QVBoxLayout()
  if len(msg) > 50:
  vbox.addWidget(WWLabel(msg))
@@ -402,12 +403,21 @@ def __init__(self, msg, choices, on_clicked=None, checked_index=0):
  self.group = group = QButtonGroup()
  for i,c in enumerate(choices):
  button = QRadioButton(gb2)
- button.setText(c)
+ if isinstance(c, tuple):
+ # tuple of text, icon path
+ logo = QIcon()
+ logo.addPixmap(QPixmap(icon_path(c[1])))
+ button.setText(c[0])
+ button.setIcon(logo)
+ else:
+ button.setText(c)
  vbox2.addWidget(button)
  group.addButton(button)
  group.setId(button, i)
  if i==checked_index:
  button.setChecked(True)
+ if disable_buttons:
+ button.setEnabled(False)
 
  if on_clicked:
  group.buttonClicked.connect(partial(on_clicked, self))

electrum/plugin.py

@@ -232,6 +232,8 @@ def run_hook(name, *args):
  results.append(r)
 
  if results:
+ if name == "wallet_info_buttons":
+ return results
  assert len(results) == 1, results
  return results[0]
 

electrum/plugins/coldcard/coldcard.py

@@ -2,6 +2,7 @@
 # Coldcard Electrum plugin main code.
 #
 #
+import copy
 import os, time, io
 import traceback
 from typing import TYPE_CHECKING, Optional

electrum/plugins/coldcard/qt.py

@@ -1,12 +1,12 @@
 import time, os
 from functools import partial
-import copy
+import json
 
 from PyQt5.QtCore import Qt, pyqtSignal
-from PyQt5.QtWidgets import QPushButton, QLabel, QVBoxLayout, QWidget, QGridLayout
+from PyQt5.QtWidgets import QPushButton, QLabel, QVBoxLayout, QWidget, QGridLayout, QHBoxLayout
 
 from electrum.gui.qt.util import (WindowModalDialog, CloseButton, Buttons, getOpenFileName,
- getSaveFileName)
+ getSaveFileName, WWLabel)
 from electrum.gui.qt.transaction_dialog import TxDialog
 from electrum.gui.qt.main_window import ElectrumWindow
 
@@ -47,19 +47,25 @@ def show_address(keystore=keystore):
  def wallet_info_buttons(self, main_window, dialog):
  # user is about to see the "Wallet Information" dialog
  # - add a button if multisig wallet, and a Coldcard is a cosigner.
+ buttons = []
  wallet = main_window.wallet
 
  if type(wallet) is not Multisig_Wallet:
  return
 
- if not any(type(ks) == self.keystore_class for ks in wallet.get_keystores()):
+ coldcard_keystores = [
+ ks
+ for ks in wallet.get_keystores()
+ if type(ks) == self.keystore_class
+ ]
+ if not coldcard_keystores:
  # doesn't involve a Coldcard wallet, hide feature
  return
 
  btn = QPushButton(_("Export for Coldcard"))
  btn.clicked.connect(lambda unused: self.export_multisig_setup(main_window, wallet))
-
- return btn
+ buttons.append(btn)
+ return buttons
 
  def export_multisig_setup(self, main_window, wallet):
 
@@ -73,7 +79,7 @@ def export_multisig_setup(self, main_window, wallet):
  config=self.config,
  )
  if fileName:
- with open(fileName, "wt") as f:
+ with open(fileName, "w") as f:
  ColdcardPlugin.export_ms_wallet(wallet, f, basename)
  main_window.show_message(_("Wallet setup file exported successfully"))
 

electrum/plugins/convert2cc/__init__.py

@@ -0,0 +1,6 @@
+from electrum.i18n import _
+
+fullname = _('convert2cc')
+description = _('Provides support for converting hardware wallet to Coldcard')
+requires = [('ckcc', 'github.com/Coldcard/ckcc-protocol')]
+available_for = ['qt']