tgui: update stdio and text after db and storage separation (#6567) - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 48a7e5cc2bb6fd147e9c67c461f98251535d7ade
DIR parent 21c35726009295412b0d5d51e8dff6c2ac064842
HTML Author: Henrik Grimler <henrik@grimler.se>
Date: Wed, 9 Sep 2020 17:54:42 +0200
gui: update stdio and text after db and storage separation (#6567)
e1ce3aace7e3143da24115890d9bae78a9f5bcaf updated the qt and kivy guis, but not stdio or text one.
Diffstat:
M electrum/gui/stdio.py | 5 ++++-
M electrum/gui/text.py | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
DIR diff --git a/electrum/gui/stdio.py b/electrum/gui/stdio.py
t@@ -5,6 +5,7 @@ import logging
from electrum import util
from electrum import WalletStorage, Wallet
+from electrum.wallet_db import WalletDB
from electrum.util import format_satoshis
from electrum.bitcoin import is_address, COIN
from electrum.transaction import PartialTxOutput
t@@ -30,6 +31,8 @@ class ElectrumGui:
password = getpass.getpass('Password:', stream=None)
storage.decrypt(password)
+ db = WalletDB(storage.read(), manual_upgrades=False)
+
self.done = 0
self.last_balance = ""
t@@ -40,7 +43,7 @@ class ElectrumGui:
self.str_amount = ""
self.str_fee = ""
- self.wallet = Wallet(storage, config=config)
+ self.wallet = Wallet(db, storage, config=config)
self.wallet.start_network(self.network)
self.contacts = self.wallet.contacts
DIR diff --git a/electrum/gui/text.py b/electrum/gui/text.py
t@@ -14,6 +14,7 @@ from electrum.util import format_satoshis
from electrum.bitcoin import is_address, COIN
from electrum.transaction import PartialTxOutput
from electrum.wallet import Wallet
+from electrum.wallet_db import WalletDB
from electrum.storage import WalletStorage
from electrum.network import NetworkParameters, TxBroadcastError, BestEffortRequestFailed
from electrum.interface import ServerAddr
t@@ -41,7 +42,8 @@ class ElectrumGui:
if storage.is_encrypted():
password = getpass.getpass('Password:', stream=None)
storage.decrypt(password)
- self.wallet = Wallet(storage, config=config)
+ db = WalletDB(storage.read(), manual_upgrades=False)
+ self.wallet = Wallet(db, storage, config=config)
self.wallet.start_network(self.network)
self.contacts = self.wallet.contacts