From: Forrest Voight Date: Fri, 3 Feb 2012 20:08:20 +0000 (-0500) Subject: moved CONF_FILE_FUNCs from networks to bitcoin.networks, added the namecoin func... X-Git-Tag: 0.8.3~10 X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=742aa8a6dee98845da19c515c124634818ff1ee5 moved CONF_FILE_FUNCs from networks to bitcoin.networks, added the namecoin func, fixed the testnet funcs --- diff --git a/p2pool/bitcoin/networks.py b/p2pool/bitcoin/networks.py index e059daa..79583f6 100644 --- a/p2pool/bitcoin/networks.py +++ b/p2pool/bitcoin/networks.py @@ -1,3 +1,6 @@ +import os +import platform + from twisted.internet import defer from . import data @@ -14,6 +17,7 @@ BitcoinMainnet = math.Object( )), POW_FUNC=data.hash256, SYMBOL='BTC', + CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Bitcoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Bitcoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.bitcoin'), 'bitcoin.conf'), ) BitcoinTestnet = math.Object( P2P_PREFIX='fabfb5da'.decode('hex'), @@ -26,6 +30,7 @@ BitcoinTestnet = math.Object( )), POW_FUNC=data.hash256, SYMBOL='tBTC', + CONF_FILE_FUNC=BitcoinMainnet.CONF_FILE_FUNC, ) NamecoinMainnet = math.Object( @@ -39,6 +44,7 @@ NamecoinMainnet = math.Object( )), POW_FUNC=data.hash256, SYMBOL='NMC', + CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Namecoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Namecoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.namecoin'), 'bitcoin.conf'), ) NamecoinTestnet = math.Object( P2P_PREFIX='fabfb5fe'.decode('hex'), @@ -51,6 +57,7 @@ NamecoinTestnet = math.Object( )), POW_FUNC=data.hash256, SYMBOL='tNMC', + CONF_FILE_FUNC=NamecoinMainnet.CONF_FILE_FUNC, ) LitecoinMainnet = math.Object( @@ -64,6 +71,7 @@ LitecoinMainnet = math.Object( )), POW_FUNC=lambda data: pack.IntType(256).unpack(__import__('ltc_scrypt').getPoWHash(data)), SYMBOL='LTC', + CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Litecoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Litecoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.litecoin'), 'litecoin.conf'), ) LitecoinTestnet = math.Object( P2P_PREFIX='fcc1b7dc'.decode('hex'), @@ -76,4 +84,5 @@ LitecoinTestnet = math.Object( )), POW_FUNC=lambda data: pack.IntType(256).unpack(__import__('ltc_scrypt').getPoWHash(data)), SYMBOL='tLTC', + CONF_FILE_FUNC=LitecoinMainnet.CONF_FILE_FUNC, ) diff --git a/p2pool/main.py b/p2pool/main.py index cc1137b..3692892 100644 --- a/p2pool/main.py +++ b/p2pool/main.py @@ -967,9 +967,9 @@ def run(): args.bitcoind_rpc_username, args.bitcoind_rpc_password = ([None, None] + args.bitcoind_rpc_userpass)[-2:] if args.bitcoind_rpc_password is None: - if not hasattr(net, 'CONF_FILE_FUNC'): + if not hasattr(net.PARENT, 'CONF_FILE_FUNC'): parser.error('This network has no configuration file function. Manually enter your RPC password.') - conf_path = net.CONF_FILE_FUNC() + conf_path = net.PARENT.CONF_FILE_FUNC() if not os.path.exists(conf_path): parser.error('''Bitcoin configuration file not found. Manually enter your RPC password.\r\n''' '''If you actually haven't created a configuration file, you should create one at %s with the text:\r\n''' diff --git a/p2pool/networks.py b/p2pool/networks.py index c6c779c..b41f044 100644 --- a/p2pool/networks.py +++ b/p2pool/networks.py @@ -1,6 +1,3 @@ -import os -import platform - from p2pool.bitcoin import networks from p2pool.util import math @@ -25,7 +22,6 @@ BitcoinMainnet = math.Object( PERSIST=True, WORKER_PORT=9332, BOOTSTRAP_ADDRS='74.220.242.6:9334 93.97.192.93 66.90.73.83 67.83.108.0 219.84.64.174 24.167.17.248 109.74.195.142 83.211.86.49 89.78.212.44 94.23.34.145 168.7.116.243 72.14.191.28 94.174.40.189:9344'.split(' '), - CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Bitcoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Bitcoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.bitcoin'), 'bitcoin.conf'), ) BitcoinTestnet = math.Object( PARENT=networks.BitcoinTestnet, @@ -42,7 +38,6 @@ BitcoinTestnet = math.Object( PERSIST=False, WORKER_PORT=19332, BOOTSTRAP_ADDRS='72.14.191.28'.split(' '), - CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Bitcoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Bitcoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.bitcoin'), 'testnet', 'bitcoin.conf'), ) LitecoinMainnet = math.Object( @@ -60,7 +55,6 @@ LitecoinMainnet = math.Object( PERSIST=True, WORKER_PORT=9327, BOOTSTRAP_ADDRS='76.26.53.101 124.205.120.178 190.195.79.161 173.167.113.73 82.161.65.210 67.83.108.0 78.101.67.239 78.100.161.252 87.58.117.233 78.100.162.223 216.239.45.4 78.101.131.221 72.14.191.28 97.81.163.217 69.126.183.240 219.84.64.174 78.101.119.27 89.211.228.244 178.152.122.30 172.16.0.3 76.26.53.101:51319'.split(' '), - CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Litecoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Litecoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.litecoin'), 'litecoin.conf'), ) LitecoinTestnet = math.Object( PARENT=networks.LitecoinTestnet, @@ -77,7 +71,6 @@ LitecoinTestnet = math.Object( PERSIST=False, WORKER_PORT=19327, BOOTSTRAP_ADDRS='72.14.191.28'.split(' '), - CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Litecoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Litecoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.litecoin'), 'testnet', 'litecoin.conf'), ) nets=dict((net.NAME, net) for net in set([BitcoinMainnet, BitcoinTestnet, LitecoinMainnet, LitecoinTestnet]))