AaronFiore/electrum
1
0
Fork 0
Code Activity

misc ui and lib fixes for py3

Browse Source
This commit is contained in:
Dmitry Sorokin
2017-02-04 17:48:13 +03:00
committed by ThomasV
parent d304ccdf17
commit f02d18226b
9 changed files with 36 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
lib/account.py
View File

8
lib/base_wizard.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Electrum - lightweight Bitcoin client
# Copyright (C) 2016 Thomas Voegtlin
@@ -22,12 +22,7 @@
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import six
import os
from . import bitcoin
from . import keystore
@@ -36,6 +31,7 @@ from .wallet import Wallet, Imported_Wallet, Standard_Wallet, Multisig_Wallet, w
from .i18n import _
from .plugins import run_hook
class BaseWizard(object):
def __init__(self, config, storage):

21
lib/bitcoin.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
#!/usr/bin/env python
#
# Electrum - lightweight Bitcoin client
# Copyright (C) 2011 thomasv@gitorious
@@ -100,8 +99,6 @@ except:
def aes_encrypt_with_iv(key, iv, data):
assert_bytes(key, iv, data)
if six.PY2:
key, iv, data = map(str, (key, iv, data))
if AES:
padlen = 16 - (len(data) % 16)
if padlen == 0:
@@ -117,8 +114,6 @@ def aes_encrypt_with_iv(key, iv, data):
def aes_decrypt_with_iv(key, iv, data):
assert_bytes(key, iv, data)
if six.PY2:
key, iv, data = map(str, (key, iv, data))
if AES:
cipher = AES.new(key, AES.MODE_CBC, iv)
data = cipher.decrypt(data)
@@ -135,7 +130,7 @@ def aes_decrypt_with_iv(key, iv, data):
def EncodeAES(secret, s):
assert_bytes(s)
iv = _bytes(os.urandom(16))
iv = bytes(os.urandom(16))
# aes_cbc = pyaes.AESModeOfOperationCBC(secret, iv=iv)
# aes = pyaes.Encrypter(aes_cbc)
# e = iv + aes.feed(s) + aes.feed()
@@ -144,7 +139,7 @@ def EncodeAES(secret, s):
return base64.b64encode(e)
def DecodeAES(secret, e):
e = _bytes(base64.b64decode(e))
e = bytes(base64.b64decode(e))
iv, e = e[:16], e[16:]
# aes_cbc = pyaes.AESModeOfOperationCBC(secret, iv=iv)
# aes = pyaes.Decrypter(aes_cbc)
@@ -289,6 +284,7 @@ def hash_160(public_key):
md.update(sha256(public_key))
return md.digest()
def hash_160_to_bc_address(h160, addrtype, witness_program_version=1):
s = bytes([addrtype])
if addrtype == ADDRTYPE_P2WPKH:
@@ -302,6 +298,7 @@ def bc_address_to_hash_160(addr):
_bytes = base_decode(addr, 25, base=58)
return _bytes[0], _bytes[1:21]
def hash160_to_p2pkh(h160):
return hash_160_to_bc_address(h160, ADDRTYPE_P2PKH)
@@ -309,11 +306,13 @@ def hash160_to_p2pkh(h160):
def hash160_to_p2sh(h160):
return hash_160_to_bc_address(h160, ADDRTYPE_P2SH)
def public_key_to_p2pkh(public_key):
return hash160_to_p2pkh(hash_160(public_key))
def public_key_to_p2wpkh(public_key):
return hash160_to_bc_address(hash_160(public_key), ADDRTYPE_P2WPKH)
return hash_160_to_bc_address(hash_160(public_key), ADDRTYPE_P2WPKH)
@@ -512,14 +511,12 @@ from ecdsa.util import string_to_number, number_to_string
def msg_magic(message):
varint = var_int(len(message))
if six.PY3:
encoded_varint = varint.encode('ascii')
else:
encoded_varint = b"".join([chr(int(varint[i:i+2], 16)) for i in range(0, len(varint), 2)])
encoded_varint = varint.encode('ascii')
return b"\x18Bitcoin Signed Message:\n" + encoded_varint + message
def verify_message(address, sig, message):
assert_bytes(sig, message)
try:
h = Hash(msg_magic(message))
public_key, compressed = pubkey_from_signature(sig, h)

27
lib/blockchain.py
View File

@@ -1,5 +1,3 @@
#!/usr/bin/env python
#
# Electrum - lightweight Bitcoin client
# Copyright (C) 2012 thomasv@ecdsa.org
#
@@ -22,14 +20,6 @@
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import six
import os
import threading
@@ -100,8 +90,9 @@ def can_connect(header):
class Blockchain(util.PrintError):
'''Manages blockchain headers and their verification'''
"""
Manages blockchain headers and their verification
"""
def __init__(self, config, checkpoint, parent_id):
self.config = config
@@ -165,10 +156,10 @@ class Blockchain(util.PrintError):
raise BaseException("insufficient proof of work: %s vs target %s" % (int('0x' + _hash, 16), target))
def verify_chunk(self, index, data):
num = len(data) / 80
num = len(data) // 80
prev_header = None
if index != 0:
prev_header = self.read_header(index*2016 - 1)
prev_header = self.read_header(index * 2016 - 1)
bits, target = self.get_target(index)
for i in range(num):
raw_header = data[i*80:(i+1) * 80]
@@ -294,17 +285,17 @@ class Blockchain(util.PrintError):
nTargetTimespan = 14 * 24 * 60 * 60
nActualTimespan = max(nActualTimespan, nTargetTimespan / 4)
nActualTimespan = min(nActualTimespan, nTargetTimespan * 4)
new_target = min(MAX_TARGET, (target*nActualTimespan) / nTargetTimespan)
new_target = min(MAX_TARGET, (target * nActualTimespan) / nTargetTimespan)
# convert new target to bits
c = ("%064x" % new_target)[2:]
while c[:2] == '00' and len(c) > 6:
c = c[2:]
bitsN, bitsBase = len(c) / 2, int('0x' + c[:6], 16)
bitsN, bitsBase = len(c) // 2, int('0x' + c[:6], 16)
if bitsBase >= 0x800000:
bitsN += 1
bitsBase >>= 8
new_bits = bitsN << 24 | bitsBase
return new_bits, bitsBase << (8 * (bitsN-3))
return new_bits, bitsBase << (8 * (bitsN - 3))
def can_connect(self, header, check_height=True):
height = header['block_height']
@@ -327,7 +318,7 @@ class Blockchain(util.PrintError):
def connect_chunk(self, idx, hexdata):
try:
data = hexdata.decode('hex')
data = bfh(hexdata)
self.verify_chunk(idx, data)
#self.print_error("validated chunk %d" % idx)
self.save_chunk(idx, data)

2
lib/util.py
View File

@@ -332,7 +332,7 @@ def bfh(x):
elif isinstance(x, (list, tuple, map)):
return [bfh(sub) for sub in x]
else:
raise TypeError('Unexpected type: ' + type(x))
raise TypeError('Unexpected type: ' + str(type(x)))
def bh2u(x):

12
lib/verifier.py
View File

@@ -1,5 +1,3 @@
#!/usr/bin/env python
#
# Electrum - Lightweight Bitcoin Client
# Copyright (c) 2012 Thomas Voegtlin
#
@@ -22,12 +20,6 @@
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import six
from .util import ThreadJob
from .bitcoin import *
@@ -48,7 +40,7 @@ class SPV(ThreadJob):
unverified = self.wallet.get_unverified_txs()
for tx_hash, tx_height in unverified.items():
# do not request merkle branch before headers are available
if tx_height>0 and tx_hash not in self.merkle_roots and tx_height <= lh:
if (tx_height > 0) and (tx_hash not in self.merkle_roots) and (tx_height <= lh):
request = ('blockchain.transaction.get_merkle',
[tx_hash, tx_height])
self.network.send([request], self.verify_merkle)
@@ -86,7 +78,7 @@ class SPV(ThreadJob):
h = hash_decode(target_hash)
for i in range(len(merkle_s)):
item = merkle_s[i]
h = Hash( hash_decode(item) + h ) if ((pos >> i) & 1) else Hash( h + hash_decode(item) )
h = Hash(hash_decode(item) + h) if ((pos >> i) & 1) else Hash(h + hash_decode(item))
return hash_encode(h)
def undo_verifications(self):

5
lib/wallet.py
View File

@@ -1,5 +1,3 @@
#!/usr/bin/env python
#
# Electrum - lightweight Bitcoin client
# Copyright (C) 2015 Thomas Voegtlin
#
@@ -73,7 +71,6 @@ TX_STATUS = [
]
class Abstract_Wallet(PrintError):
"""
Wallet classes are created to handle various address generation methods.
@@ -297,7 +294,6 @@ class Abstract_Wallet(PrintError):
self.verifier.merkle_roots.pop(tx_hash, None)
# tx will be verified only if height > 0
print('unverif', tx_hash, tx_height)
if tx_hash not in self.verified_tx:
self.unverified_tx[tx_hash] = tx_height
@@ -477,7 +473,6 @@ class Abstract_Wallet(PrintError):
return tx_hash, status, label, can_broadcast, can_bump, amount, fee, height, conf, timestamp, exp_n
def get_addr_io(self, address):
h = self.history.get(address, [])
received = {}