commit 2b2a8d17df1afa8d4b7157280d3484142425cc8a
parent 6226b658ea4c62ca484c54b9567aa1996f42e7a1
Author: ThomasV <thomasv@gitorious>
Date: Tue, 17 Jun 2014 11:02:46 +0200
bundle dependencies in 'packages' dir. use qrcode instead of pyqrnative
Diffstat:
6 files changed, 41 insertions(+), 1012 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -6,10 +6,7 @@ include electrum
recursive-include lib *.py
recursive-include gui *.py
recursive-include plugins *.py
-recursive-include ecdsa *.py
-recursive-include aes *.py
-recursive-include requests *.py
-recursive-include pbkdf2 *.py
+recursive-include packages *.py
include app.fil
include icons.qrc
recursive-include icons *
diff --git a/electrum b/electrum
@@ -39,6 +39,9 @@ if __builtin__.use_local_modules:
imp.load_module('electrum', *imp.find_module('lib'))
imp.load_module('electrum_gui', *imp.find_module('gui'))
+if is_local:
+ sys.path.append('packages')
+
from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands, pick_random_server
from electrum.util import print_msg, print_stderr, print_json, set_verbosity
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -435,7 +435,6 @@ class ElectrumWindow(QMainWindow):
self.update_wallet()
self.need_update.clear()
- self.receive_qr.update_qr()
run_hook('timer_actions')
def format_amount(self, x, is_diff=False, whitespaces=False):
@@ -791,7 +790,7 @@ class ElectrumWindow(QMainWindow):
url = urlparse.urlunparse(p)
else:
url = ""
- self.receive_qr.set_addr(url)
+ self.receive_qr.setData(url)
def create_send_tab(self):
diff --git a/gui/qt/qrcodewidget.py b/gui/qt/qrcodewidget.py
@@ -3,46 +3,38 @@ from PyQt4.QtCore import *
import PyQt4.QtCore as QtCore
import PyQt4.QtGui as QtGui
-from electrum import bmp, pyqrnative
+import os
+import qrcode
+
+from electrum import bmp
+from electrum.i18n import _
class QRCodeWidget(QWidget):
def __init__(self, data = None):
QWidget.__init__(self)
- self.addr = None
+ self.data = None
self.qr = None
- if data:
- self.set_addr(data)
- self.update_qr()
-
- def set_addr(self, addr):
- if self.addr != addr:
- if len(addr) < 128:
- MinSize = 210
- else:
- MinSize = 500
- self.setMinimumSize(MinSize, MinSize)
- self.addr = addr
+ self.setData(data)
+
+
+ def setData(self, data):
+ if self.data != data:
+ self.data = data
+ if self.data:
+ self.qr = qrcode.QRCode()
+ self.qr.add_data(self.data)
+ k = len(self.qr.get_matrix())
+ self.setMinimumSize(k*5,k*5)
+ else:
self.qr = None
- self.update()
-
- def update_qr(self):
- if self.addr and not self.qr:
- for size in range(len(pyqrnative.QRUtil.PATTERN_POSITION_TABLE)): # [4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32]:
- try:
- self.qr = pyqrnative.QRCode(size, pyqrnative.QRErrorCorrectLevel.L)
- self.qr.addData(self.addr)
- self.qr.make()
- break
- except Exception:
- self.qr=None
- continue
- self.update()
- def paintEvent(self, e):
+ self.update()
+
- if not self.addr:
+ def paintEvent(self, e):
+ if not self.data:
return
black = QColor(0, 0, 0, 255)
@@ -53,27 +45,32 @@ class QRCodeWidget(QWidget):
qp.begin(self)
qp.setBrush(white)
qp.setPen(white)
- qp.drawRect(0, 0, 198, 198)
+ r = qp.viewport()
+ qp.drawRect(0, 0, r.width(), r.height())
qp.end()
return
-
- k = self.qr.getModuleCount()
+
+ matrix = self.qr.get_matrix()
+ k = len(matrix)
qp = QtGui.QPainter()
qp.begin(self)
r = qp.viewport()
- boxsize = min(r.width(), r.height())*0.8/k
+
+ margin = 10
+ framesize = min(r.width(), r.height())
+ boxsize = int( (framesize - 2*margin)/k )
size = k*boxsize
left = (r.width() - size)/2
- top = (r.height() - size)/2
+ top = (r.height() - size)/2
- # Make a white margin around the QR in case of dark theme use:
- margin = 10
+ # Make a white margin around the QR in case of dark theme use
qp.setBrush(white)
+ qp.setPen(white)
qp.drawRect(left-margin, top-margin, size+(margin*2), size+(margin*2))
for r in range(k):
for c in range(k):
- if self.qr.isDark(r, c):
+ if matrix[r][c]:
qp.setBrush(black)
qp.setPen(black)
else:
@@ -83,8 +80,6 @@ class QRCodeWidget(QWidget):
qp.end()
-import os
-from electrum.i18n import _
class QRDialog(QDialog):
@@ -92,9 +87,7 @@ class QRDialog(QDialog):
QDialog.__init__(self, parent)
d = self
- d.setModal(1)
d.setWindowTitle(title)
- d.setMinimumSize(270, 300)
vbox = QVBoxLayout()
qrw = QRCodeWidget(data)
vbox.addWidget(qrw, 1)
diff --git a/lib/pyqrnative.py b/lib/pyqrnative.py
@@ -1,962 +0,0 @@
-import math
-
-#from PIL import Image, ImageDraw
-
-#QRCode for Python
-#
-#Ported from the Javascript library by Sam Curren
-#
-#QRCode for Javascript
-#http://d-project.googlecode.com/svn/trunk/misc/qrcode/js/qrcode.js
-#
-#Copyright (c) 2009 Kazuhiko Arase
-#
-#URL: http://www.d-project.com/
-#
-#Licensed under the MIT license:
-# http://www.opensource.org/licenses/mit-license.php
-#
-# The word "QR Code" is registered trademark of
-# DENSO WAVE INCORPORATED
-# http://www.denso-wave.com/qrcode/faqpatent-e.html
-
-
-class QR8bitByte:
-
- def __init__(self, data):
- self.mode = QRMode.MODE_8BIT_BYTE
- self.data = data
-
- def getLength(self):
- return len(self.data)
-
- def write(self, buffer):
- for i in range(len(self.data)):
- #// not JIS ...
- buffer.put(ord(self.data[i]), 8)
- def __repr__(self):
- return self.data
-
-class QRCode:
- def __init__(self, typeNumber, errorCorrectLevel):
- self.typeNumber = typeNumber
- self.errorCorrectLevel = errorCorrectLevel
- self.modules = None
- self.moduleCount = 0
- self.dataCache = None
- self.dataList = []
- def addData(self, data):
- newData = QR8bitByte(data)
- self.dataList.append(newData)
- self.dataCache = None
- def isDark(self, row, col):
- if (row < 0 or self.moduleCount <= row or col < 0 or self.moduleCount <= col):
- raise Exception("%s,%s - %s" % (row, col, self.moduleCount))
- return self.modules[row][col]
- def getModuleCount(self):
- return self.moduleCount
- def make(self):
- self.makeImpl(False, self.getBestMaskPattern() )
- def makeImpl(self, test, maskPattern):
-
- self.moduleCount = self.typeNumber * 4 + 17
- self.modules = [None for x in range(self.moduleCount)]
-
- for row in range(self.moduleCount):
-
- self.modules[row] = [None for x in range(self.moduleCount)]
-
- for col in range(self.moduleCount):
- self.modules[row][col] = None #//(col + row) % 3;
-
- self.setupPositionProbePattern(0, 0)
- self.setupPositionProbePattern(self.moduleCount - 7, 0)
- self.setupPositionProbePattern(0, self.moduleCount - 7)
- self.setupPositionAdjustPattern()
- self.setupTimingPattern()
- self.setupTypeInfo(test, maskPattern)
-
- if (self.typeNumber >= 7):
- self.setupTypeNumber(test)
-
- if (self.dataCache == None):
- self.dataCache = QRCode.createData(self.typeNumber, self.errorCorrectLevel, self.dataList)
- self.mapData(self.dataCache, maskPattern)
-
- def setupPositionProbePattern(self, row, col):
-
- for r in range(-1, 8):
-
- if (row + r <= -1 or self.moduleCount <= row + r): continue
-
- for c in range(-1, 8):
-
- if (col + c <= -1 or self.moduleCount <= col + c): continue
-
- if ( (0 <= r and r <= 6 and (c == 0 or c == 6) )
- or (0 <= c and c <= 6 and (r == 0 or r == 6) )
- or (2 <= r and r <= 4 and 2 <= c and c <= 4) ):
- self.modules[row + r][col + c] = True;
- else:
- self.modules[row + r][col + c] = False;
-
- def getBestMaskPattern(self):
-
- minLostPoint = 0
- pattern = 0
-
- for i in range(8):
-
- self.makeImpl(True, i);
-
- lostPoint = QRUtil.getLostPoint(self);
-
- if (i == 0 or minLostPoint > lostPoint):
- minLostPoint = lostPoint
- pattern = i
-
- return pattern
-
-
- def setupTimingPattern(self):
-
- for r in range(8, self.moduleCount - 8):
- if (self.modules[r][6] != None):
- continue
- self.modules[r][6] = (r % 2 == 0)
-
- for c in range(8, self.moduleCount - 8):
- if (self.modules[6][c] != None):
- continue
- self.modules[6][c] = (c % 2 == 0)
-
- def setupPositionAdjustPattern(self):
-
- pos = QRUtil.getPatternPosition(self.typeNumber)
-
- for i in range(len(pos)):
-
- for j in range(len(pos)):
-
- row = pos[i]
- col = pos[j]
-
- if (self.modules[row][col] != None):
- continue
-
- for r in range(-2, 3):
-
- for c in range(-2, 3):
-
- if (r == -2 or r == 2 or c == -2 or c == 2 or (r == 0 and c == 0) ):
- self.modules[row + r][col + c] = True
- else:
- self.modules[row + r][col + c] = False
-
- def setupTypeNumber(self, test):
-
- bits = QRUtil.getBCHTypeNumber(self.typeNumber)
-
- for i in range(18):
- mod = (not test and ( (bits >> i) & 1) == 1)
- self.modules[i // 3][i % 3 + self.moduleCount - 8 - 3] = mod;
-
- for i in range(18):
- mod = (not test and ( (bits >> i) & 1) == 1)
- self.modules[i % 3 + self.moduleCount - 8 - 3][i // 3] = mod;
-
- def setupTypeInfo(self, test, maskPattern):
-
- data = (self.errorCorrectLevel << 3) | maskPattern
- bits = QRUtil.getBCHTypeInfo(data)
-
- #// vertical
- for i in range(15):
-
- mod = (not test and ( (bits >> i) & 1) == 1)
-
- if (i < 6):
- self.modules[i][8] = mod
- elif (i < 8):
- self.modules[i + 1][8] = mod
- else:
- self.modules[self.moduleCount - 15 + i][8] = mod
-
- #// horizontal
- for i in range(15):
-
- mod = (not test and ( (bits >> i) & 1) == 1);
-
- if (i < 8):
- self.modules[8][self.moduleCount - i - 1] = mod
- elif (i < 9):
- self.modules[8][15 - i - 1 + 1] = mod
- else:
- self.modules[8][15 - i - 1] = mod
-
- #// fixed module
- self.modules[self.moduleCount - 8][8] = (not test)
-
- def mapData(self, data, maskPattern):
-
- inc = -1
- row = self.moduleCount - 1
- bitIndex = 7
- byteIndex = 0
-
- for col in range(self.moduleCount - 1, 0, -2):
-
- if (col == 6): col-=1
-
- while (True):
-
- for c in range(2):
-
- if (self.modules[row][col - c] == None):
-
- dark = False
-
- if (byteIndex < len(data)):
- dark = ( ( (data[byteIndex] >> bitIndex) & 1) == 1)
-
- mask = QRUtil.getMask(maskPattern, row, col - c)
-
- if (mask):
- dark = not dark
-
- self.modules[row][col - c] = dark
- bitIndex-=1
-
- if (bitIndex == -1):
- byteIndex+=1
- bitIndex = 7
-
- row += inc
-
- if (row < 0 or self.moduleCount <= row):
- row -= inc
- inc = -inc
- break
- PAD0 = 0xEC
- PAD1 = 0x11
-
- @staticmethod
- def createData(typeNumber, errorCorrectLevel, dataList):
-
- rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel)
-
- buffer = QRBitBuffer();
-
- for i in range(len(dataList)):
- data = dataList[i]
- buffer.put(data.mode, 4)
- buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber) )
- data.write(buffer)
-
- #// calc num max data.
- totalDataCount = 0;
- for i in range(len(rsBlocks)):
- totalDataCount += rsBlocks[i].dataCount
-
- if (buffer.getLengthInBits() > totalDataCount * 8):
- raise Exception("code length overflow. ("
- + buffer.getLengthInBits()
- + ">"
- + totalDataCount * 8
- + ")")
-
- #// end code
- if (buffer.getLengthInBits() + 4 <= totalDataCount * 8):
- buffer.put(0, 4)
-
- #// padding
- while (buffer.getLengthInBits() % 8 != 0):
- buffer.putBit(False)
-
- #// padding
- while (True):
-
- if (buffer.getLengthInBits() >= totalDataCount * 8):
- break
- buffer.put(QRCode.PAD0, 8)
-
- if (buffer.getLengthInBits() >= totalDataCount * 8):
- break
- buffer.put(QRCode.PAD1, 8)
-
- return QRCode.createBytes(buffer, rsBlocks)
-
- @staticmethod
- def createBytes(buffer, rsBlocks):
-
- offset = 0
-
- maxDcCount = 0
- maxEcCount = 0
-
- dcdata = [0 for x in range(len(rsBlocks))]
- ecdata = [0 for x in range(len(rsBlocks))]
-
- for r in range(len(rsBlocks)):
-
- dcCount = rsBlocks[r].dataCount
- ecCount = rsBlocks[r].totalCount - dcCount
-
- maxDcCount = max(maxDcCount, dcCount)
- maxEcCount = max(maxEcCount, ecCount)
-
- dcdata[r] = [0 for x in range(dcCount)]
-
- for i in range(len(dcdata[r])):
- dcdata[r][i] = 0xff & buffer.buffer[i + offset]
- offset += dcCount
-
- rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount)
- rawPoly = QRPolynomial(dcdata[r], rsPoly.getLength() - 1)
-
- modPoly = rawPoly.mod(rsPoly)
- ecdata[r] = [0 for x in range(rsPoly.getLength()-1)]
- for i in range(len(ecdata[r])):
- modIndex = i + modPoly.getLength() - len(ecdata[r])
- if (modIndex >= 0):
- ecdata[r][i] = modPoly.get(modIndex)
- else:
- ecdata[r][i] = 0
-
- totalCodeCount = 0
- for i in range(len(rsBlocks)):
- totalCodeCount += rsBlocks[i].totalCount
-
- data = [None for x in range(totalCodeCount)]
- index = 0
-
- for i in range(maxDcCount):
- for r in range(len(rsBlocks)):
- if (i < len(dcdata[r])):
- data[index] = dcdata[r][i]
- index+=1
-
- for i in range(maxEcCount):
- for r in range(len(rsBlocks)):
- if (i < len(ecdata[r])):
- data[index] = ecdata[r][i]
- index+=1
-
- return data
-
-
-class QRMode:
- MODE_NUMBER = 1 << 0
- MODE_ALPHA_NUM = 1 << 1
- MODE_8BIT_BYTE = 1 << 2
- MODE_KANJI = 1 << 3
-
-class QRErrorCorrectLevel:
- L = 1
- M = 0
- Q = 3
- H = 2
-
-class QRMaskPattern:
- PATTERN000 = 0
- PATTERN001 = 1
- PATTERN010 = 2
- PATTERN011 = 3
- PATTERN100 = 4
- PATTERN101 = 5
- PATTERN110 = 6
- PATTERN111 = 7
-
-class QRUtil(object):
- PATTERN_POSITION_TABLE = [
- [],
- [6, 18],
- [6, 22],
- [6, 26],
- [6, 30],
- [6, 34],
- [6, 22, 38],
- [6, 24, 42],
- [6, 26, 46],
- [6, 28, 50],
- [6, 30, 54],
- [6, 32, 58],
- [6, 34, 62],
- [6, 26, 46, 66],
- [6, 26, 48, 70],
- [6, 26, 50, 74],
- [6, 30, 54, 78],
- [6, 30, 56, 82],
- [6, 30, 58, 86],
- [6, 34, 62, 90],
- [6, 28, 50, 72, 94],
- [6, 26, 50, 74, 98],
- [6, 30, 54, 78, 102],
- [6, 28, 54, 80, 106],
- [6, 32, 58, 84, 110],
- [6, 30, 58, 86, 114],
- [6, 34, 62, 90, 118],
- [6, 26, 50, 74, 98, 122],
- [6, 30, 54, 78, 102, 126],
- [6, 26, 52, 78, 104, 130],
- [6, 30, 56, 82, 108, 134],
- [6, 34, 60, 86, 112, 138],
- [6, 30, 58, 86, 114, 142],
- [6, 34, 62, 90, 118, 146],
- [6, 30, 54, 78, 102, 126, 150],
- [6, 24, 50, 76, 102, 128, 154],
- [6, 28, 54, 80, 106, 132, 158],
- [6, 32, 58, 84, 110, 136, 162],
- [6, 26, 54, 82, 110, 138, 166],
- [6, 30, 58, 86, 114, 142, 170]
- ]
-
- G15 = (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0)
- G18 = (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0)
- G15_MASK = (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1)
-
- @staticmethod
- def getBCHTypeInfo(data):
- d = data << 10;
- while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) >= 0):
- d ^= (QRUtil.G15 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) ) )
-
- return ( (data << 10) | d) ^ QRUtil.G15_MASK
- @staticmethod
- def getBCHTypeNumber(data):
- d = data << 12;
- while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) >= 0):
- d ^= (QRUtil.G18 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) ) )
- return (data << 12) | d
- @staticmethod
- def getBCHDigit(data):
- digit = 0;
- while (data != 0):
- digit += 1
- data >>= 1
- return digit
- @staticmethod
- def getPatternPosition(typeNumber):
- return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1]
- @staticmethod
- def getMask(maskPattern, i, j):
- if maskPattern == QRMaskPattern.PATTERN000 : return (i + j) % 2 == 0
- if maskPattern == QRMaskPattern.PATTERN001 : return i % 2 == 0
- if maskPattern == QRMaskPattern.PATTERN010 : return j % 3 == 0
- if maskPattern == QRMaskPattern.PATTERN011 : return (i + j) % 3 == 0
- if maskPattern == QRMaskPattern.PATTERN100 : return (math.floor(i / 2) + math.floor(j / 3) ) % 2 == 0
- if maskPattern == QRMaskPattern.PATTERN101 : return (i * j) % 2 + (i * j) % 3 == 0
- if maskPattern == QRMaskPattern.PATTERN110 : return ( (i * j) % 2 + (i * j) % 3) % 2 == 0
- if maskPattern == QRMaskPattern.PATTERN111 : return ( (i * j) % 3 + (i + j) % 2) % 2 == 0
- raise Exception("bad maskPattern:" + maskPattern);
- @staticmethod
- def getErrorCorrectPolynomial(errorCorrectLength):
- a = QRPolynomial([1], 0);
- for i in range(errorCorrectLength):
- a = a.multiply(QRPolynomial([1, QRMath.gexp(i)], 0) )
- return a
- @staticmethod
- def getLengthInBits(mode, type):
-
- if 1 <= type and type < 10:
-
- #// 1 - 9
-
- if mode == QRMode.MODE_NUMBER : return 10
- if mode == QRMode.MODE_ALPHA_NUM : return 9
- if mode == QRMode.MODE_8BIT_BYTE : return 8
- if mode == QRMode.MODE_KANJI : return 8
- raise Exception("mode:" + mode)
-
- elif (type < 27):
-
- #// 10 - 26
-
- if mode == QRMode.MODE_NUMBER : return 12
- if mode == QRMode.MODE_ALPHA_NUM : return 11
- if mode == QRMode.MODE_8BIT_BYTE : return 16
- if mode == QRMode.MODE_KANJI : return 10
- raise Exception("mode:" + mode)
-
- elif (type < 41):
-
- #// 27 - 40
-
- if mode == QRMode.MODE_NUMBER : return 14
- if mode == QRMode.MODE_ALPHA_NUM : return 13
- if mode == QRMode.MODE_8BIT_BYTE : return 16
- if mode == QRMode.MODE_KANJI : return 12
- raise Exception("mode:" + mode)
-
- else:
- raise Exception("type:" + type)
- @staticmethod
- def getLostPoint(qrCode):
-
- moduleCount = qrCode.getModuleCount();
-
- lostPoint = 0;
-
- #// LEVEL1
-
- for row in range(moduleCount):
-
- for col in range(moduleCount):
-
- sameCount = 0;
- dark = qrCode.isDark(row, col);
-
- for r in range(-1, 2):
-
- if (row + r < 0 or moduleCount <= row + r):
- continue
-
- for c in range(-1, 2):
-
- if (col + c < 0 or moduleCount <= col + c):
- continue
- if (r == 0 and c == 0):
- continue
-
- if (dark == qrCode.isDark(row + r, col + c) ):
- sameCount+=1
- if (sameCount > 5):
- lostPoint += (3 + sameCount - 5)
-
- #// LEVEL2
-
- for row in range(moduleCount - 1):
- for col in range(moduleCount - 1):
- count = 0;
- if (qrCode.isDark(row, col ) ): count+=1
- if (qrCode.isDark(row + 1, col ) ): count+=1
- if (qrCode.isDark(row, col + 1) ): count+=1
- if (qrCode.isDark(row + 1, col + 1) ): count+=1
- if (count == 0 or count == 4):
- lostPoint += 3
-
- #// LEVEL3
-
- for row in range(moduleCount):
- for col in range(moduleCount - 6):
- if (qrCode.isDark(row, col)
- and not qrCode.isDark(row, col + 1)
- and qrCode.isDark(row, col + 2)
- and qrCode.isDark(row, col + 3)
- and qrCode.isDark(row, col + 4)
- and not qrCode.isDark(row, col + 5)
- and qrCode.isDark(row, col + 6) ):
- lostPoint += 40
-
- for col in range(moduleCount):
- for row in range(moduleCount - 6):
- if (qrCode.isDark(row, col)
- and not qrCode.isDark(row + 1, col)
- and qrCode.isDark(row + 2, col)
- and qrCode.isDark(row + 3, col)
- and qrCode.isDark(row + 4, col)
- and not qrCode.isDark(row + 5, col)
- and qrCode.isDark(row + 6, col) ):
- lostPoint += 40
-
- #// LEVEL4
-
- darkCount = 0;
-
- for col in range(moduleCount):
- for row in range(moduleCount):
- if (qrCode.isDark(row, col) ):
- darkCount+=1
-
- ratio = abs(100 * darkCount / moduleCount / moduleCount - 50) / 5
- lostPoint += ratio * 10
-
- return lostPoint
-
-class QRMath:
-
- @staticmethod
- def glog(n):
- if (n < 1):
- raise Exception("glog(" + n + ")")
- return LOG_TABLE[n];
- @staticmethod
- def gexp(n):
- while n < 0:
- n += 255
- while n >= 256:
- n -= 255
- return EXP_TABLE[n];
-
-EXP_TABLE = [x for x in range(256)]
-
-LOG_TABLE = [x for x in range(256)]
-
-for i in range(8):
- EXP_TABLE[i] = 1 << i;
-
-for i in range(8, 256):
- EXP_TABLE[i] = EXP_TABLE[i - 4] ^ EXP_TABLE[i - 5] ^ EXP_TABLE[i - 6] ^ EXP_TABLE[i - 8]
-
-for i in range(255):
- LOG_TABLE[EXP_TABLE[i] ] = i
-
-class QRPolynomial:
-
- def __init__(self, num, shift):
-
- if (len(num) == 0):
- raise Exception(num.length + "/" + shift)
-
- offset = 0
-
- while offset < len(num) and num[offset] == 0:
- offset += 1
-
- self.num = [0 for x in range(len(num)-offset+shift)]
- for i in range(len(num) - offset):
- self.num[i] = num[i + offset]
-
-
- def get(self, index):
- return self.num[index]
- def getLength(self):
- return len(self.num)
- def multiply(self, e):
- num = [0 for x in range(self.getLength() + e.getLength() - 1)];
-
- for i in range(self.getLength()):
- for j in range(e.getLength()):
- num[i + j] ^= QRMath.gexp(QRMath.glog(self.get(i) ) + QRMath.glog(e.get(j) ) )
-
- return QRPolynomial(num, 0);
- def mod(self, e):
-
- if (self.getLength() - e.getLength() < 0):
- return self;
-
- ratio = QRMath.glog(self.get(0) ) - QRMath.glog(e.get(0) )
-
- num = [0 for x in range(self.getLength())]
-
- for i in range(self.getLength()):
- num[i] = self.get(i);
-
- for i in range(e.getLength()):
- num[i] ^= QRMath.gexp(QRMath.glog(e.get(i) ) + ratio)
-
- # recursive call
- return QRPolynomial(num, 0).mod(e);
-
-class QRRSBlock:
-
- RS_BLOCK_TABLE = [
-
- #// L
- #// M
- #// Q
- #// H
-
- #// 1
- [1, 26, 19],
- [1, 26, 16],
- [1, 26, 13],
- [1, 26, 9],
-
- #// 2
- [1, 44, 34],
- [1, 44, 28],
- [1, 44, 22],
- [1, 44, 16],
-
- #// 3
- [1, 70, 55],
- [1, 70, 44],
- [2, 35, 17],
- [2, 35, 13],
-
- #// 4
- [1, 100, 80],
- [2, 50, 32],
- [2, 50, 24],
- [4, 25, 9],
-
- #// 5
- [1, 134, 108],
- [2, 67, 43],
- [2, 33, 15, 2, 34, 16],
- [2, 33, 11, 2, 34, 12],
-
- #// 6
- [2, 86, 68],
- [4, 43, 27],
- [4, 43, 19],
- [4, 43, 15],
-
- #// 7
- [2, 98, 78],
- [4, 49, 31],
- [2, 32, 14, 4, 33, 15],
- [4, 39, 13, 1, 40, 14],
-
- #// 8
- [2, 121, 97],
- [2, 60, 38, 2, 61, 39],
- [4, 40, 18, 2, 41, 19],
- [4, 40, 14, 2, 41, 15],
-
- #// 9
- [2, 146, 116],
- [3, 58, 36, 2, 59, 37],
- [4, 36, 16, 4, 37, 17],
- [4, 36, 12, 4, 37, 13],
-
- #// 10
- [2, 86, 68, 2, 87, 69],
- [4, 69, 43, 1, 70, 44],
- [6, 43, 19, 2, 44, 20],
- [6, 43, 15, 2, 44, 16],
-
- # 11
- [4, 101, 81],
- [1, 80, 50, 4, 81, 51],
- [4, 50, 22, 4, 51, 23],
- [3, 36, 12, 8, 37, 13],
-
- # 12
- [2, 116, 92, 2, 117, 93],
- [6, 58, 36, 2, 59, 37],
- [4, 46, 20, 6, 47, 21],
- [7, 42, 14, 4, 43, 15],
-
- # 13
- [4, 133, 107],
- [8, 59, 37, 1, 60, 38],
- [8, 44, 20, 4, 45, 21],
- [12, 33, 11, 4, 34, 12],
-
- # 14
- [3, 145, 115, 1, 146, 116],
- [4, 64, 40, 5, 65, 41],
- [11, 36, 16, 5, 37, 17],
- [11, 36, 12, 5, 37, 13],
-
- # 15
- [5, 109, 87, 1, 110, 88],
- [5, 65, 41, 5, 66, 42],
- [5, 54, 24, 7, 55, 25],
- [11, 36, 12],
-
- # 16
- [5, 122, 98, 1, 123, 99],
- [7, 73, 45, 3, 74, 46],
- [15, 43, 19, 2, 44, 20],
- [3, 45, 15, 13, 46, 16],
-
- # 17
- [1, 135, 107, 5, 136, 108],
- [10, 74, 46, 1, 75, 47],
- [1, 50, 22, 15, 51, 23],
- [2, 42, 14, 17, 43, 15],
-
- # 18
- [5, 150, 120, 1, 151, 121],
- [9, 69, 43, 4, 70, 44],
- [17, 50, 22, 1, 51, 23],
- [2, 42, 14, 19, 43, 15],
-
- # 19
- [3, 141, 113, 4, 142, 114],
- [3, 70, 44, 11, 71, 45],
- [17, 47, 21, 4, 48, 22],
- [9, 39, 13, 16, 40, 14],
-
- # 20
- [3, 135, 107, 5, 136, 108],
- [3, 67, 41, 13, 68, 42],
- [15, 54, 24, 5, 55, 25],
- [15, 43, 15, 10, 44, 16],
-
- # 21
- [4, 144, 116, 4, 145, 117],
- [17, 68, 42],
- [17, 50, 22, 6, 51, 23],
- [19, 46, 16, 6, 47, 17],
-
- # 22
- [2, 139, 111, 7, 140, 112],
- [17, 74, 46],
- [7, 54, 24, 16, 55, 25],
- [34, 37, 13],
-
- # 23
- [4, 151, 121, 5, 152, 122],
- [4, 75, 47, 14, 76, 48],
- [11, 54, 24, 14, 55, 25],
- [16, 45, 15, 14, 46, 16],
-
- # 24
- [6, 147, 117, 4, 148, 118],
- [6, 73, 45, 14, 74, 46],
- [11, 54, 24, 16, 55, 25],
- [30, 46, 16, 2, 47, 17],
-
- # 25
- [8, 132, 106, 4, 133, 107],
- [8, 75, 47, 13, 76, 48],
- [7, 54, 24, 22, 55, 25],
- [22, 45, 15, 13, 46, 16],
-
- # 26
- [10, 142, 114, 2, 143, 115],
- [19, 74, 46, 4, 75, 47],
- [28, 50, 22, 6, 51, 23],
- [33, 46, 16, 4, 47, 17],
-
- # 27
- [8, 152, 122, 4, 153, 123],
- [22, 73, 45, 3, 74, 46],
- [8, 53, 23, 26, 54, 24],
- [12, 45, 15, 28, 46, 16],
-
- # 28
- [3, 147, 117, 10, 148, 118],
- [3, 73, 45, 23, 74, 46],
- [4, 54, 24, 31, 55, 25],
- [11, 45, 15, 31, 46, 16],
-
- # 29
- [7, 146, 116, 7, 147, 117],
- [21, 73, 45, 7, 74, 46],
- [1, 53, 23, 37, 54, 24],
- [19, 45, 15, 26, 46, 16],
-
- # 30
- [5, 145, 115, 10, 146, 116],
- [19, 75, 47, 10, 76, 48],
- [15, 54, 24, 25, 55, 25],
- [23, 45, 15, 25, 46, 16],
-
- # 31
- [13, 145, 115, 3, 146, 116],
- [2, 74, 46, 29, 75, 47],
- [42, 54, 24, 1, 55, 25],
- [23, 45, 15, 28, 46, 16],
-
- # 32
- [17, 145, 115],
- [10, 74, 46, 23, 75, 47],
- [10, 54, 24, 35, 55, 25],
- [19, 45, 15, 35, 46, 16],
-
- # 33
- [17, 145, 115, 1, 146, 116],
- [14, 74, 46, 21, 75, 47],
- [29, 54, 24, 19, 55, 25],
- [11, 45, 15, 46, 46, 16],
-
- # 34
- [13, 145, 115, 6, 146, 116],
- [14, 74, 46, 23, 75, 47],
- [44, 54, 24, 7, 55, 25],
- [59, 46, 16, 1, 47, 17],
-
- # 35
- [12, 151, 121, 7, 152, 122],
- [12, 75, 47, 26, 76, 48],
- [39, 54, 24, 14, 55, 25],
- [22, 45, 15, 41, 46, 16],
-
- # 36
- [6, 151, 121, 14, 152, 122],
- [6, 75, 47, 34, 76, 48],
- [46, 54, 24, 10, 55, 25],
- [2, 45, 15, 64, 46, 16],
-
- # 37
- [17, 152, 122, 4, 153, 123],
- [29, 74, 46, 14, 75, 47],
- [49, 54, 24, 10, 55, 25],
- [24, 45, 15, 46, 46, 16],
-
- # 38
- [4, 152, 122, 18, 153, 123],
- [13, 74, 46, 32, 75, 47],
- [48, 54, 24, 14, 55, 25],
- [42, 45, 15, 32, 46, 16],
-
- # 39
- [20, 147, 117, 4, 148, 118],
- [40, 75, 47, 7, 76, 48],
- [43, 54, 24, 22, 55, 25],
- [10, 45, 15, 67, 46, 16],
-
- # 40
- [19, 148, 118, 6, 149, 119],
- [18, 75, 47, 31, 76, 48],
- [34, 54, 24, 34, 55, 25],
- [20, 45, 15, 61, 46, 16]
-
- ]
-
- def __init__(self, totalCount, dataCount):
- self.totalCount = totalCount
- self.dataCount = dataCount
-
- @staticmethod
- def getRSBlocks(typeNumber, errorCorrectLevel):
- rsBlock = QRRSBlock.getRsBlockTable(typeNumber, errorCorrectLevel);
- if rsBlock == None:
- raise Exception("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + errorCorrectLevel)
-
- length = len(rsBlock) / 3
-
- list = []
-
- for i in range(length):
-
- count = rsBlock[i * 3 + 0]
- totalCount = rsBlock[i * 3 + 1]
- dataCount = rsBlock[i * 3 + 2]
-
- for j in range(count):
- list.append(QRRSBlock(totalCount, dataCount))
-
- return list;
-
- @staticmethod
- def getRsBlockTable(typeNumber, errorCorrectLevel):
- if errorCorrectLevel == QRErrorCorrectLevel.L:
- return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
- elif errorCorrectLevel == QRErrorCorrectLevel.M:
- return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
- elif errorCorrectLevel == QRErrorCorrectLevel.Q:
- return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
- elif errorCorrectLevel == QRErrorCorrectLevel.H:
- return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
- else:
- return None;
-
-class QRBitBuffer:
- def __init__(self):
- self.buffer = []
- self.length = 0
- def __repr__(self):
- return ".".join([str(n) for n in self.buffer])
- def get(self, index):
- bufIndex = math.floor(index / 8)
- val = ( (self.buffer[bufIndex] >> (7 - index % 8) ) & 1) == 1
- print "get ", val
- return ( (self.buffer[bufIndex] >> (7 - index % 8) ) & 1) == 1
- def put(self, num, length):
- for i in range(length):
- self.putBit( ( (num >> (length - i - 1) ) & 1) == 1)
- def getLengthInBits(self):
- return self.length
- def putBit(self, bit):
- bufIndex = self.length // 8
- if len(self.buffer) <= bufIndex:
- self.buffer.append(0)
- if bit:
- self.buffer[bufIndex] |= (0x80 >> (self.length % 8) )
- self.length+=1
diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@ data_files += [
setup(
name="Electrum",
version=version.ELECTRUM_VERSION,
- install_requires=['slowaes', 'ecdsa>=0.9', 'pbkdf2', 'requests', 'pyasn1', 'pyasn1-modules', 'tlslite>=0.4.5'],
+ install_requires=['slowaes', 'ecdsa>=0.9', 'pbkdf2', 'requests', 'pyasn1', 'pyasn1-modules', 'tlslite>=0.4.5', 'qrcode'],
package_dir={
'electrum': 'lib',
'electrum_gui': 'gui',
@@ -79,7 +79,6 @@ setup(
'electrum.paymentrequest',
'electrum.paymentrequest_pb2',
'electrum.plugins',
- 'electrum.pyqrnative',
'electrum.simple_config',
'electrum.socks',
'electrum.synchronizer',
