tMerge pull request #1294 from romanz/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 12feb4cf9c3aec9c4debde17f70dc703849eb609
DIR parent 7a3ddfc6a47996562b0a118f47f75011dc93cce7
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Sat, 13 Jun 2015 13:25:28 +0200
Merge pull request #1294 from romanz/master
bitcoin: remove dead code
Diffstat:
M lib/bitcoin.py | 30 ------------------------------
1 file changed, 0 insertions(+), 30 deletions(-)
---
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -20,7 +20,6 @@
import hashlib
import base64
import re
-import sys
import hmac
import version
t@@ -173,31 +172,6 @@ def is_old_seed(seed):
# pywallet openssl private key implementation
-def i2d_ECPrivateKey(pkey, compressed=False):
- if compressed:
- key = '3081d30201010420' + \
- '%064x' % pkey.secret + \
- 'a081a53081a2020101302c06072a8648ce3d0101022100' + \
- '%064x' % _p + \
- '3006040100040107042102' + \
- '%064x' % _Gx + \
- '022100' + \
- '%064x' % _r + \
- '020101a124032200'
- else:
- key = '308201130201010420' + \
- '%064x' % pkey.secret + \
- 'a081a53081a2020101302c06072a8648ce3d0101022100' + \
- '%064x' % _p + \
- '3006040100040107044104' + \
- '%064x' % _Gx + \
- '%064x' % _Gy + \
- '022100' + \
- '%064x' % _r + \
- '020101a144034200'
-
- return key.decode('hex') + i2o_ECPublicKey(pkey.pubkey, compressed)
-
def i2o_ECPublicKey(pubkey, compressed=False):
# public keys are 65 bytes long (520 bits)
# 0x04 + 32-byte X-coordinate + 32-byte Y-coordinate
t@@ -348,10 +322,6 @@ def GetPubKey(pubkey, compressed=False):
return i2o_ECPublicKey(pubkey, compressed)
-def GetPrivKey(pkey, compressed=False):
- return i2d_ECPrivateKey(pkey, compressed)
-
-
def GetSecret(pkey):
return ('%064x' % pkey.secret).decode('hex')