Remove unused imports. Explicitly import a few deep imports.

This commit is contained in:
Justin Turner Arthur 2017-11-12 22:54:04 -06:00
parent 9a0aa9b478
commit 857eb4ac1d
60 changed files with 84 additions and 185 deletions

View File

@ -1,7 +1,5 @@
#!/usr/bin/python2 #!/usr/bin/python2
import sys
import re import re
import hashlib
import os import os
from versions import version, version_win, version_mac, version_android, version_apk from versions import version, version_win, version_mac, version_android, version_apk

View File

@ -1,7 +1,6 @@
#!/usr/bin/python2 #!/usr/bin/python2
import sys, re, shutil, os, hashlib import os
import imp
import getpass import getpass
if __name__ == '__main__': if __name__ == '__main__':

View File

@ -87,7 +87,7 @@ if is_local or is_android:
imp.load_module('electrum_plugins', *imp.find_module('plugins')) imp.load_module('electrum_plugins', *imp.find_module('plugins'))
from electrum import bitcoin, network from electrum import bitcoin
from electrum import SimpleConfig, Network from electrum import SimpleConfig, Network
from electrum.wallet import Wallet, Imported_Wallet from electrum.wallet import Wallet, Imported_Wallet
from electrum.storage import WalletStorage from electrum.storage import WalletStorage

View File

@ -23,9 +23,9 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import sys
import os
import signal import signal
import sys
try: try:
import PyQt5 import PyQt5
@ -39,11 +39,12 @@ import PyQt5.QtCore as QtCore
from electrum.i18n import _, set_language from electrum.i18n import _, set_language
from electrum.plugins import run_hook from electrum.plugins import run_hook
from electrum import SimpleConfig, Wallet, WalletStorage from electrum import WalletStorage
from electrum.synchronizer import Synchronizer # from electrum.synchronizer import Synchronizer
from electrum.verifier import SPV # from electrum.verifier import SPV
from electrum.util import DebugMem, UserCancelled, InvalidPassword, print_error # from electrum.util import DebugMem
from electrum.wallet import Abstract_Wallet from electrum.util import UserCancelled, print_error
# from electrum.wallet import Abstract_Wallet
from .installwizard import InstallWizard, GoBack from .installwizard import InstallWizard, GoBack

View File

@ -25,9 +25,9 @@
from electrum.i18n import _ from electrum.i18n import _
import PyQt5
from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from .util import * from .util import *
from .history_list import HistoryList from .history_list import HistoryList

View File

@ -26,7 +26,7 @@ import webbrowser
from .util import * from .util import *
from electrum.i18n import _ from electrum.i18n import _
from electrum.util import block_explorer_URL, format_satoshis, format_time from electrum.util import block_explorer_URL
from electrum.plugins import run_hook from electrum.plugins import run_hook
from electrum.bitcoin import is_address from electrum.bitcoin import is_address

View File

@ -26,14 +26,13 @@ import webbrowser
from electrum.i18n import _ from electrum.i18n import _
from electrum.bitcoin import is_address from electrum.bitcoin import is_address
from electrum.util import block_explorer_URL, format_satoshis, format_time, age from electrum.util import block_explorer_URL
from electrum.plugins import run_hook from electrum.plugins import run_hook
from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
QAbstractItemView, QFileDialog, QMenu, QTreeWidgetItem) QAbstractItemView, QFileDialog, QMenu, QTreeWidgetItem)
from .util import MyTreeWidget, pr_tooltips, pr_icons from .util import MyTreeWidget
class ContactList(MyTreeWidget): class ContactList(MyTreeWidget):

View File

@ -1,10 +1,8 @@
from electrum.i18n import _ from electrum.i18n import _
import PyQt5
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
import PyQt5.QtCore as QtCore
from PyQt5.QtWidgets import QSlider, QToolTip from PyQt5.QtWidgets import QSlider, QToolTip
import threading import threading

View File

@ -27,8 +27,7 @@ import webbrowser
from .util import * from .util import *
from electrum.i18n import _ from electrum.i18n import _
from electrum.util import block_explorer_URL, format_satoshis, format_time from electrum.util import block_explorer_URL
from electrum.plugins import run_hook
from electrum.util import timestamp_to_datetime, profiler from electrum.util import timestamp_to_datetime, profiler

View File

@ -1,12 +1,13 @@
import sys
import os import os
import sys
import threading
import traceback
from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
import PyQt5.QtCore as QtCore from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
import electrum
from electrum import Wallet, WalletStorage from electrum import Wallet, WalletStorage
from electrum.util import UserCancelled, InvalidPassword from electrum.util import UserCancelled, InvalidPassword
from electrum.base_wizard import BaseWizard from electrum.base_wizard import BaseWizard
@ -55,9 +56,8 @@ class CosignWidget(QWidget):
self.update() self.update()
def paintEvent(self, event): def paintEvent(self, event):
import math
bgcolor = self.palette().color(QPalette.Background) bgcolor = self.palette().color(QPalette.Background)
pen = QPen(bgcolor, 7, QtCore.Qt.SolidLine) pen = QPen(bgcolor, 7, Qt.SolidLine)
qp = QPainter() qp = QPainter()
qp.begin(self) qp.begin(self)
qp.setPen(pen) qp.setPen(pen)

View File

@ -23,11 +23,10 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
from .util import * from .util import *
from electrum.i18n import _ from electrum.i18n import _
from electrum.util import block_explorer_URL, format_satoshis, format_time from electrum.util import format_time
from electrum.plugins import run_hook
class InvoiceList(MyTreeWidget): class InvoiceList(MyTreeWidget):
filter_columns = [0, 1, 2, 3] # Date, Requestor, Description, Amount filter_columns = [0, 1, 2, 3] # Date, Requestor, Description, Amount

View File

@ -25,7 +25,6 @@
import sys, time, threading import sys, time, threading
import os, json, traceback import os, json, traceback
import shutil import shutil
import socket
import weakref import weakref
import webbrowser import webbrowser
import csv import csv
@ -33,13 +32,11 @@ from decimal import Decimal
import base64 import base64
from functools import partial from functools import partial
import PyQt5 from PyQt5.QtCore import Qt
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtWidgets import *
import PyQt5.QtCore as QtCore
from electrum.util import bh2u, bfh from electrum.util import bh2u, bfh
from . import icons_rc
from electrum import keystore from electrum import keystore
from electrum.bitcoin import COIN, is_address, TYPE_ADDRESS from electrum.bitcoin import COIN, is_address, TYPE_ADDRESS
@ -48,25 +45,21 @@ from electrum.i18n import _
from electrum.util import (format_time, format_satoshis, PrintError, from electrum.util import (format_time, format_satoshis, PrintError,
format_satoshis_plain, NotEnoughFunds, format_satoshis_plain, NotEnoughFunds,
UserCancelled) UserCancelled)
from electrum import Transaction, mnemonic from electrum import Transaction
from electrum import util, bitcoin, commands, coinchooser from electrum import util, bitcoin, commands, coinchooser
from electrum import SimpleConfig, paymentrequest from electrum import paymentrequest
from electrum.wallet import Wallet, Multisig_Wallet from electrum.wallet import Multisig_Wallet
try: try:
from electrum.plot import plot_history from electrum.plot import plot_history
except: except:
plot_history = None plot_history = None
from .amountedit import AmountEdit, BTCAmountEdit, MyLineEdit, BTCkBEdit from .amountedit import AmountEdit, BTCAmountEdit, MyLineEdit
from .qrcodewidget import QRCodeWidget, QRDialog from .qrcodewidget import QRCodeWidget, QRDialog
from .qrtextedit import ShowQRTextEdit, ScanQRTextEdit from .qrtextedit import ShowQRTextEdit, ScanQRTextEdit
from .transaction_dialog import show_transaction from .transaction_dialog import show_transaction
from .fee_slider import FeeSlider from .fee_slider import FeeSlider
from electrum import ELECTRUM_VERSION
import re
from .util import * from .util import *
@ -85,11 +78,11 @@ class StatusBarButton(QPushButton):
self.func() self.func()
def keyPressEvent(self, e): def keyPressEvent(self, e):
if e.key() == QtCore.Qt.Key_Return: if e.key() == Qt.Key_Return:
self.func() self.func()
from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED from electrum.paymentrequest import PR_PAID
class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
@ -928,7 +921,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
def new_payment_request(self): def new_payment_request(self):
addr = self.wallet.get_unused_address() addr = self.wallet.get_unused_address()
if addr is None: if addr is None:
from electrum.wallet import Imported_Wallet
if not self.wallet.is_deterministic(): if not self.wallet.is_deterministic():
msg = [ msg = [
_('No more addresses in your wallet.'), _('No more addresses in your wallet.'),
@ -2071,7 +2063,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
return d.run() return d.run()
def tx_from_text(self, txt): def tx_from_text(self, txt):
from electrum.transaction import tx_from_str, Transaction from electrum.transaction import tx_from_str
try: try:
tx = tx_from_str(txt) tx = tx_from_str(txt)
return Transaction(tx) return Transaction(tx)

View File

@ -27,11 +27,11 @@ import socket
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
from PyQt5.QtWidgets import *
import PyQt5.QtCore as QtCore import PyQt5.QtCore as QtCore
from electrum.i18n import _ from electrum.i18n import _
from electrum.bitcoin import NetworkConstants from electrum.bitcoin import NetworkConstants
from electrum.network import serialize_server, deserialize_server
from electrum.util import print_error from electrum.util import print_error
from .util import * from .util import *

View File

@ -23,8 +23,9 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
from PyQt5.QtCore import Qt
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtWidgets import *
from electrum.i18n import _ from electrum.i18n import _
from .util import * from .util import *
import re import re

View File

@ -1,6 +1,6 @@
from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
from PyQt5.QtGui import *
import PyQt5.QtGui as QtGui import PyQt5.QtGui as QtGui
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
QApplication, QVBoxLayout, QTextEdit, QHBoxLayout, QPushButton, QWidget) QApplication, QVBoxLayout, QTextEdit, QHBoxLayout, QPushButton, QWidget)

View File

@ -23,15 +23,11 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import re
import platform import platform
from decimal import Decimal
from PyQt5.QtCore import Qt
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtWidgets import QHBoxLayout, QVBoxLayout, QLabel, QWidget
import PyQt5.QtCore as QtCore
import PyQt5.QtGui as QtGui
from PyQt5.QtWidgets import (QHBoxLayout, QVBoxLayout, QLabel, QWidget)
from electrum_gui.qt.qrcodewidget import QRCodeWidget from electrum_gui.qt.qrcodewidget import QRCodeWidget
from electrum.i18n import _ from electrum.i18n import _
@ -55,7 +51,7 @@ class QR_Window(QWidget):
self.address = '' self.address = ''
self.label = '' self.label = ''
self.amount = 0 self.amount = 0
self.setFocusPolicy(QtCore.Qt.NoFocus) self.setFocusPolicy(Qt.NoFocus)
main_box = QHBoxLayout() main_box = QHBoxLayout()

View File

@ -24,9 +24,9 @@
# SOFTWARE. # SOFTWARE.
from electrum.i18n import _ from electrum.i18n import _
from electrum.util import block_explorer_URL, format_satoshis, format_time, age from electrum.util import format_time, age
from electrum.plugins import run_hook from electrum.plugins import run_hook
from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED from electrum.paymentrequest import PR_UNKNOWN
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
from PyQt5.QtWidgets import QTreeWidgetItem, QMenu from PyQt5.QtWidgets import QTreeWidgetItem, QMenu

View File

@ -25,6 +25,7 @@
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
from PyQt5.QtWidgets import *
from electrum.i18n import _ from electrum.i18n import _
from .util import * from .util import *

View File

@ -26,12 +26,10 @@ import copy
import datetime import datetime
import json import json
import PyQt5
from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
import PyQt5.QtCore as QtCore from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from electrum import transaction
from electrum.bitcoin import base_encode from electrum.bitcoin import base_encode
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import run_hook from electrum.plugins import run_hook

View File

@ -1,8 +1,6 @@
import os.path import os.path
import time import time
import traceback
import sys import sys
import threading
import platform import platform
import queue import queue
from collections import namedtuple from collections import namedtuple
@ -23,7 +21,7 @@ else:
dialogs = [] dialogs = []
from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_EXPIRED
pr_icons = { pr_icons = {
PR_UNPAID:":icons/unpaid.png", PR_UNPAID:":icons/unpaid.png",

View File

@ -24,7 +24,6 @@
# SOFTWARE. # SOFTWARE.
from .util import * from .util import *
from electrum.i18n import _ from electrum.i18n import _
from electrum.bitcoin import is_address
class UTXOList(MyTreeWidget): class UTXOList(MyTreeWidget):

View File

@ -4,8 +4,7 @@ _ = lambda x:x
from electrum import WalletStorage, Wallet from electrum import WalletStorage, Wallet
from electrum.util import format_satoshis, set_verbosity from electrum.util import format_satoshis, set_verbosity
from electrum.bitcoin import is_address, COIN, TYPE_ADDRESS from electrum.bitcoin import is_address, COIN, TYPE_ADDRESS
from electrum.network import filter_protocol import getpass, datetime
import sys, getpass, datetime
# minimal fdisk like gui for console usage # minimal fdisk like gui for console usage
# written by rofl0r, with some bits stolen from the text gui (ncurses) # written by rofl0r, with some bits stolen from the text gui (ncurses)

View File

@ -27,9 +27,8 @@ import os
from . import bitcoin from . import bitcoin
from . import keystore from . import keystore
from .keystore import bip44_derivation from .keystore import bip44_derivation
from .wallet import Wallet, Imported_Wallet, Standard_Wallet, Multisig_Wallet, wallet_types from .wallet import Imported_Wallet, Standard_Wallet, Multisig_Wallet, wallet_types
from .i18n import _ from .i18n import _
from .plugins import run_hook
class BaseWizard(object): class BaseWizard(object):

View File

@ -25,7 +25,6 @@
import hashlib import hashlib
import base64 import base64
import re
import hmac import hmac
import os import os
import json import json

View File

@ -27,7 +27,7 @@ from math import floor, log10
from .bitcoin import sha256, COIN, TYPE_ADDRESS from .bitcoin import sha256, COIN, TYPE_ADDRESS
from .transaction import Transaction from .transaction import Transaction
from .util import NotEnoughFunds, PrintError, profiler from .util import NotEnoughFunds, PrintError
# A simple deterministic PRNG. Used to deterministically shuffle a # A simple deterministic PRNG. Used to deterministically shuffle a

View File

@ -23,10 +23,8 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import os
import sys import sys
import datetime import datetime
import time
import copy import copy
import argparse import argparse
import json import json
@ -41,9 +39,7 @@ from .import bitcoin
from .bitcoin import is_address, hash_160, COIN, TYPE_ADDRESS from .bitcoin import is_address, hash_160, COIN, TYPE_ADDRESS
from .i18n import _ from .i18n import _
from .transaction import Transaction from .transaction import Transaction
from .import paymentrequest
from .paymentrequest import PR_PAID, PR_UNPAID, PR_UNKNOWN, PR_EXPIRED from .paymentrequest import PR_PAID, PR_UNPAID, PR_UNKNOWN, PR_EXPIRED
from .import contacts
from .plugins import run_hook from .plugins import run_hook
known_commands = {} known_commands = {}

View File

@ -20,16 +20,12 @@
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import sys
import re import re
import dns import dns
import os
import json import json
from . import bitcoin from . import bitcoin
from . import dnssec from . import dnssec
from .util import print_error
from .i18n import _
class Contacts(dict): class Contacts(dict):

View File

@ -24,7 +24,6 @@
# SOFTWARE. # SOFTWARE.
import ast import ast
import os import os
import sys
import time import time
# from jsonrpc import JSONRPCResponseManager # from jsonrpc import JSONRPCResponseManager
@ -34,12 +33,11 @@ from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCReq
from .version import ELECTRUM_VERSION from .version import ELECTRUM_VERSION
from .network import Network from .network import Network
from .util import json_decode, DaemonThread from .util import json_decode, DaemonThread
from .util import print_msg, print_error, print_stderr, UserCancelled from .util import print_error
from .wallet import Wallet from .wallet import Wallet
from .storage import WalletStorage from .storage import WalletStorage
from .commands import known_commands, Commands from .commands import known_commands, Commands
from .simple_config import SimpleConfig from .simple_config import SimpleConfig
from .plugins import run_hook
from .exchange_rate import FxThread from .exchange_rate import FxThread

View File

@ -31,8 +31,8 @@
# https://github.com/rthalley/dnspython/blob/master/tests/test_dnssec.py # https://github.com/rthalley/dnspython/blob/master/tests/test_dnssec.py
import traceback # import traceback
import sys # import sys
import time import time
import struct import struct
@ -56,7 +56,6 @@ import dns.rdtypes.ANY.SOA
import dns.rdtypes.ANY.TXT import dns.rdtypes.ANY.TXT
import dns.rdtypes.IN.A import dns.rdtypes.IN.A
import dns.rdtypes.IN.AAAA import dns.rdtypes.IN.AAAA
from dns.exception import DNSException
# Pure-Python version of dns.dnssec._validate_rsig # Pure-Python version of dns.dnssec._validate_rsig

View File

@ -4,14 +4,12 @@ import requests
import sys import sys
from threading import Thread from threading import Thread
import time import time
import traceback
import csv import csv
from decimal import Decimal from decimal import Decimal
from .bitcoin import COIN from .bitcoin import COIN
from .i18n import _ from .i18n import _
from .util import PrintError, ThreadJob from .util import PrintError, ThreadJob
from .util import format_satoshis
# See https://en.wikipedia.org/wiki/ISO_4217 # See https://en.wikipedia.org/wiki/ISO_4217

View File

@ -24,21 +24,16 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import struct
from unicodedata import normalize from unicodedata import normalize
from .version import *
from . import bitcoin from . import bitcoin
from .bitcoin import pw_encode, pw_decode, bip32_root, bip32_private_derivation, bip32_public_derivation, bip32_private_key, deserialize_xprv, deserialize_xpub
from .bitcoin import public_key_from_private_key, public_key_to_p2pkh
from .bitcoin import * from .bitcoin import *
from .bitcoin import is_old_seed, is_new_seed, is_seed
from .util import PrintError, InvalidPassword, hfu from .util import PrintError, InvalidPassword, hfu
from .mnemonic import Mnemonic, load_wordlist from .mnemonic import Mnemonic, load_wordlist
from .plugins import run_hook from .plugins import run_hook
class KeyStore(PrintError): class KeyStore(PrintError):
def has_seed(self): def has_seed(self):

View File

@ -35,7 +35,6 @@ import pbkdf2
from .util import print_error from .util import print_error
from .bitcoin import is_old_seed, is_new_seed from .bitcoin import is_old_seed, is_new_seed
from . import version from . import version
from . import i18n
# http://www.asahi-net.or.jp/~ax2s-kmtn/ref/unicode/e_asia.html # http://www.asahi-net.or.jp/~ax2s-kmtn/ref/unicode/e_asia.html
CJK_INTERVALS = [ CJK_INTERVALS = [
@ -164,7 +163,6 @@ class Mnemonic(object):
return i % custom_entropy == 0 return i % custom_entropy == 0
def make_seed(self, seed_type='standard', num_bits=132, custom_entropy=1): def make_seed(self, seed_type='standard', num_bits=132, custom_entropy=1):
from . import version
prefix = version.seed_prefix(seed_type) prefix = version.seed_prefix(seed_type)
# increase num_bits in order to obtain a uniform distibution for the last word # increase num_bits in order to obtain a uniform distibution for the last word
bpw = math.log(len(self.wordlist), 2) bpw = math.log(len(self.wordlist), 2)

View File

@ -26,11 +26,10 @@ import queue
import os import os
import stat import stat
import errno import errno
import sys
import random import random
import re
import select import select
import traceback from collections import defaultdict
from collections import defaultdict, deque
import threading import threading
import socket import socket
import json import json

View File

@ -23,10 +23,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import hashlib import hashlib
import os.path
import re
import sys import sys
import threading
import time import time
import traceback import traceback
import json import json

View File

@ -4,8 +4,6 @@ from electrum.i18n import _
import datetime import datetime
from collections import defaultdict from collections import defaultdict
from electrum.util import format_satoshis
from electrum.bitcoin import COIN from electrum.bitcoin import COIN
import matplotlib import matplotlib

View File

@ -31,7 +31,7 @@ import pkgutil
import time import time
import threading import threading
from .util import * from .util import print_error
from .i18n import _ from .i18n import _
from .util import profiler, PrintError, DaemonThread, UserCancelled, ThreadJob from .util import profiler, PrintError, DaemonThread, UserCancelled, ThreadJob
from . import bitcoin from . import bitcoin

View File

@ -35,8 +35,6 @@
import os import os
import math import math
import base64
import binascii
import hashlib import hashlib
from .pem import * from .pem import *

View File

@ -1,4 +1,3 @@
import ast
import json import json
import threading import threading
import time import time
@ -6,7 +5,7 @@ import os
import stat import stat
from copy import deepcopy from copy import deepcopy
from .util import user_dir, print_error, print_msg, print_stderr, PrintError from .util import user_dir, print_error, print_stderr, PrintError
from .bitcoin import MAX_FEE_RATE, FEE_TARGETS from .bitcoin import MAX_FEE_RATE, FEE_TARGETS

View File

@ -25,8 +25,6 @@
import os import os
import ast import ast
import threading import threading
import random
import time
import json import json
import copy import copy
import re import re
@ -35,8 +33,7 @@ import pbkdf2, hmac, hashlib
import base64 import base64
import zlib import zlib
from .i18n import _ from .util import PrintError, profiler
from .util import NotEnoughFunds, PrintError, profiler
from .plugins import run_hook, plugin_loaders from .plugins import run_hook, plugin_loaders
from .keystore import bip44_derivation from .keystore import bip44_derivation
from . import bitcoin from . import bitcoin

View File

@ -25,9 +25,9 @@
from threading import Lock from threading import Lock
import hashlib import hashlib
from .bitcoin import Hash, hash_encode # from .bitcoin import Hash, hash_encode
from .transaction import Transaction from .transaction import Transaction
from .util import print_error, print_msg, ThreadJob, bh2u from .util import ThreadJob, bh2u
class Synchronizer(ThreadJob): class Synchronizer(ThreadJob):

View File

@ -4,7 +4,6 @@ import os
import unittest import unittest
import tempfile import tempfile
import shutil import shutil
import json
from io import StringIO from io import StringIO
from lib.simple_config import (SimpleConfig, read_system_config, from lib.simple_config import (SimpleConfig, read_system_config,

View File

@ -2,13 +2,10 @@ import unittest
from lib import transaction from lib import transaction
from lib.bitcoin import TYPE_ADDRESS from lib.bitcoin import TYPE_ADDRESS
import pprint
from lib.keystore import xpubkey_to_address from lib.keystore import xpubkey_to_address
from lib.util import bh2u from lib.util import bh2u
from lib.util import bh2u
unsigned_blob = '01000000012a5c9a94fcde98f5581cd00162c60a13936ceb75389ea65bf38633b424eb4031000000005701ff4c53ff0488b21e03ef2afea18000000089689bff23e1e7fb2f161daa37270a97a3d8c2e537584b2d304ecb47b86d21fc021b010d3bd425f8cf2e04824bfdf1f1f5ff1d51fadd9a41f9e3fb8dd3403b1bfe00000000ffffffff0140420f00000000001976a914230ac37834073a42146f11ef8414ae929feaafc388ac00000000' unsigned_blob = '01000000012a5c9a94fcde98f5581cd00162c60a13936ceb75389ea65bf38633b424eb4031000000005701ff4c53ff0488b21e03ef2afea18000000089689bff23e1e7fb2f161daa37270a97a3d8c2e537584b2d304ecb47b86d21fc021b010d3bd425f8cf2e04824bfdf1f1f5ff1d51fadd9a41f9e3fb8dd3403b1bfe00000000ffffffff0140420f00000000001976a914230ac37834073a42146f11ef8414ae929feaafc388ac00000000'
signed_blob = '01000000012a5c9a94fcde98f5581cd00162c60a13936ceb75389ea65bf38633b424eb4031000000006c493046022100a82bbc57a0136751e5433f41cf000b3f1a99c6744775e76ec764fb78c54ee100022100f9e80b7de89de861dc6fb0c1429d5da72c2b6b2ee2406bc9bfb1beedd729d985012102e61d176da16edd1d258a200ad9759ef63adf8e14cd97f53227bae35cdb84d2f6ffffffff0140420f00000000001976a914230ac37834073a42146f11ef8414ae929feaafc388ac00000000' signed_blob = '01000000012a5c9a94fcde98f5581cd00162c60a13936ceb75389ea65bf38633b424eb4031000000006c493046022100a82bbc57a0136751e5433f41cf000b3f1a99c6744775e76ec764fb78c54ee100022100f9e80b7de89de861dc6fb0c1429d5da72c2b6b2ee2406bc9bfb1beedd729d985012102e61d176da16edd1d258a200ad9759ef63adf8e14cd97f53227bae35cdb84d2f6ffffffff0140420f00000000001976a914230ac37834073a42146f11ef8414ae929feaafc388ac00000000'
v2_blob = "0200000001191601a44a81e061502b7bfbc6eaa1cef6d1e6af5308ef96c9342f71dbf4b9b5000000006b483045022100a6d44d0a651790a477e75334adfb8aae94d6612d01187b2c02526e340a7fd6c8022028bdf7a64a54906b13b145cd5dab21a26bd4b85d6044e9b97bceab5be44c2a9201210253e8e0254b0c95776786e40984c1aa32a7d03efa6bdacdea5f421b774917d346feffffff026b20fa04000000001976a914024db2e87dd7cfd0e5f266c5f212e21a31d805a588aca0860100000000001976a91421919b94ae5cefcdf0271191459157cdb41c4cbf88aca6240700" v2_blob = "0200000001191601a44a81e061502b7bfbc6eaa1cef6d1e6af5308ef96c9342f71dbf4b9b5000000006b483045022100a6d44d0a651790a477e75334adfb8aae94d6612d01187b2c02526e340a7fd6c8022028bdf7a64a54906b13b145cd5dab21a26bd4b85d6044e9b97bceab5be44c2a9201210253e8e0254b0c95776786e40984c1aa32a7d03efa6bdacdea5f421b774917d346feffffff026b20fa04000000001976a914024db2e87dd7cfd0e5f266c5f212e21a31d805a588aca0860100000000001976a91421919b94ae5cefcdf0271191459157cdb41c4cbf88aca6240700"

View File

@ -27,21 +27,15 @@
# Note: The deserialization code originally comes from ABE. # Note: The deserialization code originally comes from ABE.
from . import bitcoin from .util import print_error, profiler
from .bitcoin import *
from .util import print_error, profiler, to_string
from . import bitcoin from . import bitcoin
from .bitcoin import * from .bitcoin import *
import time
import sys
import struct import struct
# #
# Workalike python implementation of Bitcoin's CDataStream class. # Workalike python implementation of Bitcoin's CDataStream class.
# #
import struct
import random
from .keystore import xpubkey_to_address, xpubkey_to_pubkey from .keystore import xpubkey_to_address, xpubkey_to_pubkey
NO_SIGNATURE = 'ff' NO_SIGNATURE = 'ff'

View File

@ -583,7 +583,6 @@ class timeout(Exception):
pass pass
import socket import socket
import errno
import json import json
import ssl import ssl
import time import time

View File

@ -28,18 +28,14 @@
import os import os
import hashlib
import ast
import threading import threading
import random import random
import time import time
import json import json
import copy import copy
import re
import stat
import errno import errno
from functools import partial from functools import partial
from collections import namedtuple, defaultdict from collections import defaultdict
from .i18n import _ from .i18n import _
from .util import NotEnoughFunds, PrintError, UserCancelled, profiler, format_satoshis from .util import NotEnoughFunds, PrintError, UserCancelled, profiler, format_satoshis
@ -56,15 +52,12 @@ from . import bitcoin
from . import coinchooser from . import coinchooser
from .synchronizer import Synchronizer from .synchronizer import Synchronizer
from .verifier import SPV from .verifier import SPV
from .mnemonic import Mnemonic
from . import paymentrequest from . import paymentrequest
from .paymentrequest import PR_PAID, PR_UNPAID, PR_UNKNOWN, PR_EXPIRED from .paymentrequest import PR_PAID, PR_UNPAID, PR_UNKNOWN, PR_EXPIRED
from .paymentrequest import InvoiceStore from .paymentrequest import InvoiceStore
from .contacts import Contacts from .contacts import Contacts
from .storage import WalletStorage
TX_STATUS = [ TX_STATUS = [
_('Replaceable'), _('Replaceable'),
_('Unconfirmed parent'), _('Unconfirmed parent'),
@ -1281,7 +1274,6 @@ class Abstract_Wallet(PrintError):
self.storage.put('payment_requests', self.receive_requests) self.storage.put('payment_requests', self.receive_requests)
def add_payment_request(self, req, config): def add_payment_request(self, req, config):
import os
addr = req['address'] addr = req['address']
amount = req.get('amount') amount = req.get('amount')
message = req.get('memo') message = req.get('memo')

View File

@ -23,7 +23,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import queue import queue
import threading, os, json, time import threading, os, json
from collections import defaultdict from collections import defaultdict
try: try:
from SimpleWebSocketServer import WebSocket, SimpleSSLWebSocketServer from SimpleWebSocketServer import WebSocket, SimpleSSLWebSocketServer

View File

@ -22,10 +22,8 @@
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
from datetime import datetime
import sys
from . import util from . import util
from .util import profiler, print_error, bh2u from .util import profiler, bh2u
import ecdsa import ecdsa
import hashlib import hashlib

View File

@ -23,8 +23,6 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import socket
import threading
import time import time
from xmlrpc.client import ServerProxy from xmlrpc.client import ServerProxy

View File

@ -1,4 +1,3 @@
from electrum.util import print_msg
from .digitalbitbox import DigitalBitboxPlugin from .digitalbitbox import DigitalBitboxPlugin
from ..hw_wallet import CmdLineHandler from ..hw_wallet import CmdLineHandler

View File

@ -1,11 +1,10 @@
from PyQt5.QtWidgets import (QInputDialog, QLineEdit)
from ..hw_wallet.qt import QtHandlerBase, QtPluginBase from ..hw_wallet.qt import QtHandlerBase, QtPluginBase
from .digitalbitbox import DigitalBitboxPlugin from .digitalbitbox import DigitalBitboxPlugin
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import hook from electrum.plugins import hook
from electrum.wallet import Wallet, Standard_Wallet from electrum.wallet import Standard_Wallet
from electrum.bitcoin import EncodeAES
class Plugin(DigitalBitboxPlugin, QtPluginBase): class Plugin(DigitalBitboxPlugin, QtPluginBase):
icon_unpaired = ":icons/digitalbitbox_unpaired.png" icon_unpaired = ":icons/digitalbitbox_unpaired.png"

View File

@ -37,7 +37,6 @@ from email.encoders import encode_base64
from PyQt5.QtGui import * from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
import PyQt5.QtCore as QtCore
import PyQt5.QtGui as QtGui import PyQt5.QtGui as QtGui
from PyQt5.QtWidgets import (QVBoxLayout, QLabel, QGridLayout, QLineEdit) from PyQt5.QtWidgets import (QVBoxLayout, QLabel, QGridLayout, QLineEdit)

View File

@ -1,5 +1,4 @@
from electrum.plugins import hook from electrum.plugins import hook
from electrum.util import print_msg, raw_input
from .keepkey import KeepKeyPlugin from .keepkey import KeepKeyPlugin
from ..hw_wallet import CmdLineHandler from ..hw_wallet import CmdLineHandler

View File

@ -1,7 +1,6 @@
from binascii import hexlify, unhexlify from binascii import hexlify, unhexlify
import threading
from PyQt5.Qt import (QDialog, QInputDialog, QLineEdit, QTextEdit, QVBoxLayout, QLabel) from PyQt5.Qt import QDialog, QLineEdit, QTextEdit, QVBoxLayout, QLabel
import PyQt5.QtCore as QtCore import PyQt5.QtCore as QtCore
from PyQt5.QtWidgets import * from PyQt5.QtWidgets import *
@ -9,8 +8,8 @@ from electrum.i18n import _
from electrum_gui.qt.util import * from electrum_gui.qt.util import *
from electrum.util import print_msg from electrum.util import print_msg
import os, hashlib, websocket, threading, logging, json, copy import os, hashlib, websocket, logging, json, copy
from electrum_gui.qt.qrcodewidget import QRCodeWidget, QRDialog from electrum_gui.qt.qrcodewidget import QRCodeWidget
from btchip.btchip import * from btchip.btchip import *
DEBUG = False DEBUG = False

View File

@ -1,19 +1,16 @@
from struct import pack, unpack from struct import pack, unpack
import hashlib import hashlib
import time
import sys import sys
import os
import traceback import traceback
import electrum
from electrum import bitcoin from electrum import bitcoin
from electrum.bitcoin import TYPE_ADDRESS, int_to_hex, var_int from electrum.bitcoin import TYPE_ADDRESS, int_to_hex, var_int
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import BasePlugin, hook from electrum.plugins import BasePlugin
from electrum.keystore import Hardware_KeyStore, parse_xpubkey from electrum.keystore import Hardware_KeyStore
from electrum.transaction import push_script, Transaction from electrum.transaction import Transaction
from ..hw_wallet import HW_PluginBase from ..hw_wallet import HW_PluginBase
from electrum.util import format_satoshis_plain, print_error, is_verbose, bfh, bh2u from electrum.util import print_error, is_verbose, bfh, bh2u
try: try:
import hid import hid

View File

@ -1,8 +1,6 @@
import threading import threading
from PyQt5.Qt import (QDialog, QInputDialog, QLineEdit, from PyQt5.Qt import QInputDialog, QLineEdit, QVBoxLayout, QLabel
QVBoxLayout, QLabel)
import PyQt5.QtCore as QtCore
from electrum.i18n import _ from electrum.i18n import _
from .ledger import LedgerPlugin from .ledger import LedgerPlugin

View File

@ -1,18 +1,13 @@
import base64
import re
import threading import threading
from binascii import hexlify, unhexlify from binascii import hexlify, unhexlify
from functools import partial
from electrum.util import bfh, bh2u from electrum.util import bfh, bh2u
from electrum.bitcoin import (is_segwit_address, b58_address_to_hash160, xpub_from_pubkey, from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey,
public_key_to_p2pkh, EncodeBase58Check, TYPE_ADDRESS, TYPE_SCRIPT, NetworkConstants)
TYPE_ADDRESS, TYPE_SCRIPT,
NetworkConstants)
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import BasePlugin, hook from electrum.plugins import BasePlugin
from electrum.transaction import deserialize, Transaction from electrum.transaction import deserialize
from electrum.keystore import Hardware_KeyStore, is_xpubkey, parse_xpubkey from electrum.keystore import Hardware_KeyStore, is_xpubkey, parse_xpubkey
from ..hw_wallet import HW_PluginBase from ..hw_wallet import HW_PluginBase

View File

@ -25,10 +25,8 @@
import socket import socket
import os import os
import re
import requests import requests
import json import json
from hashlib import sha256
from urllib.parse import urljoin from urllib.parse import urljoin
from urllib.parse import quote from urllib.parse import quote
@ -38,9 +36,9 @@ from electrum import keystore
from electrum.bitcoin import * from electrum.bitcoin import *
from electrum.mnemonic import Mnemonic from electrum.mnemonic import Mnemonic
from electrum import version from electrum import version
from electrum.wallet import Multisig_Wallet, Deterministic_Wallet, Wallet from electrum.wallet import Multisig_Wallet, Deterministic_Wallet
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import BasePlugin, run_hook, hook from electrum.plugins import BasePlugin, hook
from electrum.util import NotEnoughFunds from electrum.util import NotEnoughFunds
# signing_xpub is hardcoded so that the wallet can be restored from seed, without TrustedCoin's server # signing_xpub is hardcoded so that the wallet can be restored from seed, without TrustedCoin's server

View File

@ -2,12 +2,8 @@
# create a BIP70 payment request signed with a certificate # create a BIP70 payment request signed with a certificate
import tlslite import tlslite
import time
import hashlib
from electrum.transaction import Transaction from electrum.transaction import Transaction
from electrum import bitcoin
from electrum import x509
from electrum import paymentrequest from electrum import paymentrequest
from electrum import paymentrequest_pb2 as pb2 from electrum import paymentrequest_pb2 as pb2

View File

@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import util, json import util
from collections import defaultdict
from electrum.network import filter_protocol from electrum.network import filter_protocol
from electrum.blockchain import hash_header from electrum.blockchain import hash_header

View File

@ -1,7 +1,8 @@
import select, time, electrum, queue import select, time, queue
# import electrum
from electrum import Connection, Interface, SimpleConfig from electrum import Connection, Interface, SimpleConfig
from electrum.network import filter_protocol, parse_servers from electrum.network import parse_servers
from collections import defaultdict from collections import defaultdict
# electrum.util.set_verbosity(1) # electrum.util.set_verbosity(1)