AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: make wizard.keystore_from_data more robust;

Browse Source 
- always store 'keystore_type' in cosigner data and use same types as main
- dont share 'hardware_device' in root of dict, but store for each cosigner
- properly return hardware keystore for hardware cosigners
This commit is contained in:
Sander van Grieken
2023-09-18 23:56:17 +02:00
parent 81089a1ef9
commit 2caa8f13cf
3 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/gui/qml/components/wizard/WCCosignerKeystore.qml
View File

@@ -19,7 +19,9 @@ WizardComponent {
function apply() {
wizard_data['cosigner_keystore_type'] = keystoregroup.checkedButton.keystoretype
wizard_data['multisig_current_cosigner'] = cosigner
wizard_data['multisig_cosigner_data'][cosigner.toString()] = {}
wizard_data['multisig_cosigner_data'][cosigner.toString()] = {
'keystore_type': keystoregroup.checkedButton.keystoretype
}
}
ButtonGroup {
@@ -80,13 +82,13 @@ WizardComponent {
}
ElRadioButton {
ButtonGroup.group: keystoregroup
property string keystoretype: 'key'
property string keystoretype: 'masterkey'
checked: true
text: qsTr('Cosigner key')
}
ElRadioButton {
ButtonGroup.group: keystoregroup
property string keystoretype: 'seed'
property string keystoretype: 'haveseed'
text: qsTr('Cosigner seed')
}
}