diff --git a/electrum/gui/qml/components/wizard/WCCreateSeed.qml b/electrum/gui/qml/components/wizard/WCCreateSeed.qml index 096a016b4..905f4c49b 100644 --- a/electrum/gui/qml/components/wizard/WCCreateSeed.qml +++ b/electrum/gui/qml/components/wizard/WCCreateSeed.qml @@ -91,8 +91,8 @@ WizardComponent { Bitcoin { id: bitcoin onGeneratedSeedChanged: { - seedtext.text = generated_seed - setWarningText(generated_seed.split(' ').length) + seedtext.text = generatedSeed + setWarningText(generatedSeed.split(' ').length) } } } diff --git a/electrum/gui/qml/components/wizard/WCHaveSeed.qml b/electrum/gui/qml/components/wizard/WCHaveSeed.qml index 596b7ddce..f8bd211e6 100644 --- a/electrum/gui/qml/components/wizard/WCHaveSeed.qml +++ b/electrum/gui/qml/components/wizard/WCHaveSeed.qml @@ -21,13 +21,13 @@ WizardComponent { if (cosigner) { wizard_data['multisig_cosigner_data'][cosigner.toString()]['seed'] = seedtext.text wizard_data['multisig_cosigner_data'][cosigner.toString()]['seed_variant'] = seed_variant_cb.currentValue - wizard_data['multisig_cosigner_data'][cosigner.toString()]['seed_type'] = bitcoin.seed_type + wizard_data['multisig_cosigner_data'][cosigner.toString()]['seed_type'] = bitcoin.seedType wizard_data['multisig_cosigner_data'][cosigner.toString()]['seed_extend'] = extendcb.checked wizard_data['multisig_cosigner_data'][cosigner.toString()]['seed_extra_words'] = extendcb.checked ? customwordstext.text : '' } else { wizard_data['seed'] = seedtext.text wizard_data['seed_variant'] = seed_variant_cb.currentValue - wizard_data['seed_type'] = bitcoin.seed_type + wizard_data['seed_type'] = bitcoin.seedType wizard_data['seed_extend'] = extendcb.checked wizard_data['seed_extra_words'] = extendcb.checked ? customwordstext.text : '' } @@ -222,7 +222,7 @@ WizardComponent { Bitcoin { id: bitcoin - onSeedTypeChanged: contentText.text = bitcoin.seed_type + onSeedTypeChanged: contentText.text = bitcoin.seedType onValidationMessageChanged: validationtext.text = validationMessage } diff --git a/electrum/gui/qml/qebitcoin.py b/electrum/gui/qml/qebitcoin.py index f651123a9..c0820293a 100644 --- a/electrum/gui/qml/qebitcoin.py +++ b/electrum/gui/qml/qebitcoin.py @@ -8,7 +8,7 @@ from electrum.i18n import _ from electrum.bip32 import is_bip32_derivation, normalize_bip32_derivation, xpub_type from electrum.logging import get_logger from electrum.slip39 import decode_mnemonic, Slip39Error -from electrum.util import parse_URI, create_bip21_uri, InvalidBitcoinURI, get_asyncio_loop +from electrum.util import get_asyncio_loop from electrum.transaction import tx_from_any from electrum.mnemonic import Mnemonic, is_any_2fa_seed_type from electrum.old_mnemonic import wordlist as old_wordlist @@ -19,27 +19,24 @@ class QEBitcoin(QObject): _logger = get_logger(__name__) generatedSeedChanged = pyqtSignal() - generatedSeed = '' - seedTypeChanged = pyqtSignal() - seedType = '' - validationMessageChanged = pyqtSignal() - _validationMessage = '' - - _words = None def __init__(self, config, parent=None): super().__init__(parent) self.config = config + self._seed_type = '' + self._generated_seed = '' + self._validationMessage = '' + self._words = None @pyqtProperty('QString', notify=generatedSeedChanged) - def generated_seed(self): - return self.generatedSeed + def generatedSeed(self): + return self._generated_seed @pyqtProperty('QString', notify=seedTypeChanged) - def seed_type(self): - return self.seedType + def seedType(self): + return self._seed_type @pyqtProperty('QString', notify=validationMessageChanged) def validationMessage(self): @@ -58,7 +55,7 @@ class QEBitcoin(QObject): self._logger.debug('generating seed of type ' + str(seed_type)) async def co_gen_seed(seed_type, language): - self.generatedSeed = mnemonic.Mnemonic(language).make_seed(seed_type=seed_type) + self._generated_seed = mnemonic.Mnemonic(language).make_seed(seed_type=seed_type) self._logger.debug('seed generated') self.generatedSeedChanged.emit() @@ -101,7 +98,7 @@ class QEBitcoin(QObject): elif wallet_type == 'multisig' and seed_type not in ['standard', 'segwit', 'bip39']: seed_valid = False - self.seedType = seed_type + self._seed_type = seed_type self.seedTypeChanged.emit() self._logger.debug('seed verified: ' + str(seed_valid)) @@ -137,22 +134,6 @@ class QEBitcoin(QObject): def verifyDerivationPath(self, path): return is_bip32_derivation(path) - @pyqtSlot(str, result='QVariantMap') - def parse_uri(self, uri: str) -> dict: - try: - return parse_URI(uri) - except InvalidBitcoinURI as e: - return { 'error': str(e) } - - @pyqtSlot(str, QEAmount, str, int, int, result=str) - def create_bip21_uri(self, address, satoshis, message, timestamp, expiry): - extra_params = {} - if expiry: - extra_params['time'] = str(timestamp) - extra_params['exp'] = str(expiry) - - return create_bip21_uri(address, satoshis.satsInt, message, extra_query_params=extra_params) - @pyqtSlot(str, result=bool) def isRawTx(self, rawtx): try: