AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet_db upgrades: (trivial) make upgrades more standalone

Browse Source 
and robust to code changes
This commit is contained in:
SomberNight
2021-09-19 17:32:25 +02:00
parent 0b05edc705
commit b7cdf3fe11
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
electrum/wallet_db.py
View File

@@ -33,7 +33,7 @@ import binascii
from . import util, bitcoin from . import util, bitcoin
from .util import profiler, WalletFileException, multisig_type, TxMinedInfo, bfh from .util import profiler, WalletFileException, multisig_type, TxMinedInfo, bfh
from .invoices import PR_TYPE_ONCHAIN, Invoice from .invoices import Invoice
from .keystore import bip44_derivation from .keystore import bip44_derivation
from .transaction import Transaction, TxOutpoint, tx_from_any, PartialTransaction, PartialTxOutput from .transaction import Transaction, TxOutpoint, tx_from_any, PartialTransaction, PartialTxOutput
from .logging import Logger from .logging import Logger
@@ -557,6 +557,7 @@ class WalletDB(JsonDB):
if not self._is_upgrade_method_needed(24, 24): if not self._is_upgrade_method_needed(24, 24):
return return
# add 'type' field to onchain requests # add 'type' field to onchain requests
PR_TYPE_ONCHAIN = 0
requests = self.data.get('payment_requests', {}) requests = self.data.get('payment_requests', {})
for k, r in list(requests.items()): for k, r in list(requests.items()):
if r.get('address') == k: if r.get('address') == k:
@@ -624,6 +625,7 @@ class WalletDB(JsonDB):
def _convert_version_29(self): def _convert_version_29(self):
if not self._is_upgrade_method_needed(28, 28): if not self._is_upgrade_method_needed(28, 28):
return return
PR_TYPE_ONCHAIN = 0
requests = self.data.get('payment_requests', {}) requests = self.data.get('payment_requests', {})
invoices = self.data.get('invoices', {}) invoices = self.data.get('invoices', {})
for d in [invoices, requests]: for d in [invoices, requests]:
@@ -659,8 +661,8 @@ class WalletDB(JsonDB):
def _convert_version_30(self): def _convert_version_30(self):
if not self._is_upgrade_method_needed(29, 29): if not self._is_upgrade_method_needed(29, 29):
return return
PR_TYPE_ONCHAIN = 0
from .invoices import PR_TYPE_ONCHAIN, PR_TYPE_LN PR_TYPE_LN = 2
requests = self.data.get('payment_requests', {}) requests = self.data.get('payment_requests', {})
invoices = self.data.get('invoices', {}) invoices = self.data.get('invoices', {})
for d in [invoices, requests]: for d in [invoices, requests]:
@@ -682,8 +684,7 @@ class WalletDB(JsonDB):
def _convert_version_31(self): def _convert_version_31(self):
if not self._is_upgrade_method_needed(30, 30): if not self._is_upgrade_method_needed(30, 30):
return return
PR_TYPE_ONCHAIN = 0
from .invoices import PR_TYPE_ONCHAIN
requests = self.data.get('payment_requests', {}) requests = self.data.get('payment_requests', {})
invoices = self.data.get('invoices', {}) invoices = self.data.get('invoices', {})
for d in [invoices, requests]: for d in [invoices, requests]: