tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9a8f9cefed436d58aec6e239b91749300e8a9765
DIR parent 3fdfd23ca995893390f6ce77f468f91f3b4f33fc
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 28 May 2015 15:27:33 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M plugins/btchipwallet.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
DIR diff --git a/plugins/btchipwallet.py b/plugins/btchipwallet.py
t@@ -14,7 +14,7 @@ from electrum.bitcoin import EncodeBase58Check, DecodeBase58Check, public_key_to
from electrum.i18n import _
from electrum.plugins import BasePlugin, hook
from electrum.transaction import deserialize
-from electrum.wallet import BIP32_HD_Wallet
+from electrum.wallet import BIP32_HD_Wallet, BIP32_Wallet
from electrum.util import format_satoshis
import hashlib
t@@ -130,7 +130,12 @@ class BTChipWallet(BIP32_HD_Wallet):
return 'create_accounts'
def can_create_accounts(self):
- return True
+ return False
+
+ def synchronize(self):
+ # synchronize existing accounts
+ BIP32_Wallet.synchronize(self)
+ # no further accounts for the moment
def can_change_password(self):
return False