git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a6479af
)
Merge remote-tracking branch 'origin/master' into tx_preforwarding
author
Forrest Voight
<forrest@forre.st>
Mon, 15 Oct 2012 06:35:01 +0000 (
02:35
-0400)
committer
Forrest Voight
<forrest@forre.st>
Mon, 15 Oct 2012 06:35:01 +0000 (
02:35
-0400)
p2pool/bitcoin/networks.py
patch
|
blob
|
history
diff --git
a/p2pool/bitcoin/networks.py
b/p2pool/bitcoin/networks.py
index
b46f3f9
..
6e074f3
100644
(file)
--- a/
p2pool/bitcoin/networks.py
+++ b/
p2pool/bitcoin/networks.py
@@
-29,7
+29,7
@@
nets = dict(
P2P_PREFIX='0b110907'.decode('hex'),
P2P_PORT=18333,
ADDRESS_VERSION=111,
- RPC_PORT=8332,
+ RPC_PORT=18332,
RPC_CHECK=defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
'bitcoinaddress' in (yield bitcoind.rpc_help()) and
(yield bitcoind.rpc_getinfo())['testnet']