git://git.novaco.in
/
electrum-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
2313015
)
fix: this wasnt the right place
author
ThomasV
<thomasv@gitorious>
Mon, 19 Nov 2012 17:12:05 +0000 (21:12 +0400)
committer
ThomasV
<thomasv@gitorious>
Mon, 19 Nov 2012 17:12:05 +0000 (21:12 +0400)
backends/bitcoind/util.py
patch
|
blob
|
history
diff --git
a/backends/bitcoind/util.py
b/backends/bitcoind/util.py
index
ec03b16
..
f9b9ddc
100644
(file)
--- a/
backends/bitcoind/util.py
+++ b/
backends/bitcoind/util.py
@@
-83,7
+83,6
@@
def hash_160(public_key):
def public_key_to_bc_address(public_key):
- if public_key == 'None': return 'None'
h160 = hash_160(public_key)
return hash_160_to_bc_address(h160)
@@
-95,6
+94,7
@@
def hash_160_to_bc_address(h160):
return b58encode(addr)
def bc_address_to_hash_160(addr):
+ if addr == 'None': return 'None'
bytes = b58decode(addr, 25)
return bytes[1:21]