import signal
import traceback
-from twisted.internet import defer, reactor, task, threads
+from twisted.internet import defer, reactor, task
from twisted.web import server, resource
from twisted.python import log
from nattraverso import portmapper, ipdiscover
@deferral.retry('Error getting work from bitcoind:', 3)
@defer.inlineCallbacks
-def getwork(bitcoind, ht):
- # a block could arrive in between these two queries
- work = bitcoin.getwork.BlockAttempt.from_getwork((yield bitcoind.rpc_getwork()))
+def getwork(bitcoind, ht, net):
try:
- height = ht.getHeight(work.previous_block)
- except ValueError:
- height = 1000 # XXX
- defer.returnValue((work, height))
+ work = yield bitcoind.rpc_getmemorypool()
+ defer.returnValue(dict(
+ version=work['version'],
+ previous_block_hash=int(work['previousblockhash'], 16),
+ transactions=[bitcoin.data.tx_type.unpack(x.decode('hex')) for x in work['transactions']],
+ subsidy=work['coinbasevalue'],
+ time=work['time'],
+ target=bitcoin.data.FloatingIntegerType().unpack(work['bits'].decode('hex')[::-1]) if isinstance(work['bits'], (str, unicode)) else bitcoin.data.FloatingInteger(work['bits']),
+ ))
+ except jsonrpc.Error, e:
+ if e.code != -32601:
+ raise
+
+ print "---> Update your bitcoind to support the 'getmemorypool' RPC call. Not including transactions in generated blocks! <---"
+ work = bitcoin.getwork.BlockAttempt.from_getwork((yield bitcoind.rpc_getwork()))
+ try:
+ subsidy = net.BITCOIN_SUBSIDY_FUNC(ht.getHeight(work.previous_block))
+ except ValueError:
+ subsidy = net.BITCOIN_SUBSIDY_FUNC(1000)
+
+ defer.returnValue(dict(
+ version=work.version,
+ previous_block_hash=work.previous_block,
+ transactions=[],
+ subsidy=subsidy,
+ time=work.timestamp,
+ target=work.block_target,
+ ))
@deferral.retry('Error getting payout script from bitcoind:', 1)
@defer.inlineCallbacks
@defer.inlineCallbacks
def main(args):
try:
- if args.charts:
- from . import draw
-
print 'p2pool (version %s)' % (p2pool_init.__version__,)
print
+ try:
+ from . import draw
+ except ImportError:
+ draw = None
+ print "Install Pygame and PIL to enable visualizations! Visualizations disabled."
+ print
# connect to bitcoind over JSON-RPC and do initial getwork
url = 'http://%s:%i/' % (args.bitcoind_address, args.bitcoind_rpc_port)
else:
my_script = bitcoin.data.pubkey_hash_to_script2(args.pubkey_hash)
print ' ...success!'
- print ' Payout script:', my_script.encode('hex')
+ print ' Payout script:', bitcoin.data.script2_to_human(my_script, args.net)
print
print 'Loading cached block headers...'
@defer.inlineCallbacks
def set_real_work1():
- work, height = yield getwork(bitcoind, ht)
- changed = work.previous_block != current_work.value['previous_block'] if current_work.value is not None else True
+ work = yield getwork(bitcoind, ht, args.net)
+ changed = work['previous_block_hash'] != current_work.value['previous_block'] if current_work.value is not None else True
current_work.set(dict(
- version=work.version,
- previous_block=work.previous_block,
- target=work.target,
- height=height,
+ version=work['version'],
+ previous_block=work['previous_block_hash'],
+ target=work['target'],
best_share_hash=current_work.value['best_share_hash'] if current_work.value is not None else None,
+ aux_work=current_work.value['aux_work'] if current_work.value is not None else None,
))
current_work2.set(dict(
- clock_offset=time.time() - work.timestamp,
+ transactions=work['transactions'],
+ subsidy=work['subsidy'],
+ clock_offset=time.time() - work['time'],
last_update=time.time(),
))
if changed:
print ' ...success!'
print
+ @defer.inlineCallbacks
+ def set_merged_work():
+ if not args.merged_url:
+ return
+ while True:
+ merged = jsonrpc.Proxy(args.merged_url, (args.merged_userpass,))
+ auxblock = yield deferral.retry('Error while calling merged getauxblock:', 1)(merged.rpc_getauxblock)()
+ x = dict(current_work.value)
+ x['aux_work'] = dict(
+ hash=int(auxblock['hash'], 16),
+ target=bitcoin.data.HashType().unpack(auxblock['target'].decode('hex')),
+ chain_id=auxblock['chainid'],
+ )
+ #print x['aux_work']
+ current_work.set(x)
+ yield deferral.sleep(1)
+ set_merged_work()
+
start_time = time.time() - current_work2.value['clock_offset']
# setup p2p logic and join p2pool network
if len(shares) > 5:
print 'Processing %i shares...' % (len(shares),)
- some_new = False
+ new_count = 0
for share in shares:
if share.hash in tracker.shares:
#print 'Got duplicate share, ignoring. Hash: %s' % (p2pool.format_hash(share.hash),)
continue
- some_new = True
+
+ new_count += 1
#print 'Received share %s from %r' % (p2pool.format_hash(share.hash), share.peer.addr if share.peer is not None else None)
tracker.add(share)
- #for peer2, share_hash in desired:
- # print 'Requesting parent share %x' % (share_hash,)
- # peer2.send_getshares(hashes=[share_hash], parents=2000)
-
- if share.bitcoin_hash <= share.header['target']:
- print
- print 'GOT BLOCK! Passing to bitcoind! %s bitcoin: %x' % (p2pool.format_hash(share.hash), share.bitcoin_hash,)
- print
- if factory.conn.value is not None:
- factory.conn.value.send_block(block=share.as_block(tracker, args.net))
- else:
- print 'No bitcoind connection! Erp!'
if shares and peer is not None:
peer_heads.setdefault(shares[0].hash, set()).add(peer)
- if some_new:
+ if new_count:
set_real_work2()
if len(shares) > 5:
- print '... done processing %i shares. Have: %i/~%i' % (len(shares), len(tracker.shares), 2*args.net.CHAIN_LENGTH)
+ print '... done processing %i shares. New: %i Have: %i/~%i' % (len(shares), new_count, len(tracker.shares), 2*args.net.CHAIN_LENGTH)
+
+ @tracker.verified.added.watch
+ def _(share):
+ if share.bitcoin_hash <= share.header['target']:
+ print
+ print 'GOT BLOCK! Passing to bitcoind! %s bitcoin: %x' % (p2pool.format_hash(share.hash), share.bitcoin_hash,)
+ print
+ if factory.conn.value is not None:
+ factory.conn.value.send_block(block=share.as_block(tracker, args.net))
+ else:
+ print 'No bitcoind connection! Erp!'
def p2p_share_hashes(share_hashes, peer):
t = time.time()
if is_lan:
pm = yield portmapper.get_port_mapper()
yield pm._upnp.add_port_mapping(lan_ip, args.p2pool_port, args.p2pool_port, 'p2pool', 'TCP') # XXX try to forward external correct port?
+ except defer.TimeoutError:
+ pass
except:
if p2pool_init.DEBUG:
log.err(None, "UPnP error:")
# setup worker logic
merkle_root_to_transactions = expiring_dict.ExpiringDict(300)
- run_identifier = struct.pack('<Q', random.randrange(2**64))
+ run_identifier = struct.pack('<I', random.randrange(2**32))
share_counter = skiplists.CountsSkipList(tracker, run_identifier)
removed_unstales = set()
- def get_share_counts():
+ def get_share_counts(doa=False):
height, last = tracker.get_height_and_last(current_work.value['best_share_hash'])
- matching_in_chain = share_counter(current_work.value['best_share_hash'], height) | removed_unstales
+ matching_in_chain = share_counter(current_work.value['best_share_hash'], max(0, height - 1)) | removed_unstales
shares_in_chain = my_shares & matching_in_chain
stale_shares = my_shares - matching_in_chain
+ if doa:
+ stale_doa_shares = stale_shares & doa_shares
+ stale_not_doa_shares = stale_shares - stale_doa_shares
+ return len(shares_in_chain) + len(stale_shares), len(stale_doa_shares), len(stale_not_doa_shares)
return len(shares_in_chain) + len(stale_shares), len(stale_shares)
@tracker.verified.removed.watch
def _(share):
removed_unstales.add(share.hash)
def compute(state, payout_script):
- if payout_script is None:
+ if payout_script is None or random.uniform(0, 100) < args.worker_fee:
payout_script = my_script
if state['best_share_hash'] is None and args.net.PERSIST:
raise jsonrpc.Error(-12345, u'p2pool is downloading shares')
raise jsonrpc.Error(-12345, u'p2pool is not connected to any peers')
if time.time() > current_work2.value['last_update'] + 60:
raise jsonrpc.Error(-12345, u'lost contact with bitcoind')
- pre_extra_txs = [tx for tx in tx_pool.itervalues() if tx.is_good()]
- pre_extra_txs = pre_extra_txs[:2**16 - 1] # merkle_branch limit
- extra_txs = []
- size = 0
- for tx in pre_extra_txs:
- this_size = len(bitcoin.data.tx_type.pack(tx.tx))
- if size + this_size > 500000:
- break
- extra_txs.append(tx)
- size += this_size
- # XXX check sigops!
+
+ if state['aux_work'] is not None:
+ aux_str = '\xfa\xbemm' + bitcoin.data.HashType().pack(state['aux_work']['hash'])[::-1] + struct.pack('<ii', 1, 0)
+ else:
+ aux_str = ''
+
# XXX assuming generate_tx is smallish here..
def get_stale_frac():
shares, stale_shares = get_share_counts()
return ""
frac = stale_shares/shares
return 2*struct.pack('<H', int(65535*frac + .5))
- subsidy = args.net.BITCOIN_SUBSIDY_FUNC(state['height']) + sum(tx.value_in - tx.value_out for tx in extra_txs)
+ subsidy = current_work2.value['subsidy']
generate_tx = p2pool.generate_transaction(
tracker=tracker,
previous_share_hash=state['best_share_hash'],
new_script=payout_script,
subsidy=subsidy,
- nonce=run_identifier + struct.pack('<Q', random.randrange(2**64)) + get_stale_frac(),
+ nonce=run_identifier + struct.pack('<H', random.randrange(2**16)) + get_stale_frac() + aux_str,
block_target=state['target'],
net=args.net,
)
- print 'New work for worker! Difficulty: %.06f Payout if block: %.6f %s' % (0xffff*2**208/p2pool.coinbase_type.unpack(generate_tx['tx_ins'][0]['script'])['share_data']['target'], (generate_tx['tx_outs'][-1]['value']-subsidy//200)*1e-8, args.net.BITCOIN_SYMBOL)
+ print 'New work for worker! Difficulty: %.06f Payout if block: %.6f %s Total block value: %.6f %s including %i transactions' % (0xffff*2**208/p2pool.coinbase_type.unpack(generate_tx['tx_ins'][0]['script'])['share_data']['target'], (generate_tx['tx_outs'][-1]['value']-subsidy//200)*1e-8, args.net.BITCOIN_SYMBOL, subsidy*1e-8, args.net.BITCOIN_SYMBOL, len(current_work2.value['transactions']))
#print 'Target: %x' % (p2pool.coinbase_type.unpack(generate_tx['tx_ins'][0]['script'])['share_data']['target'],)
#, have', shares.count(my_script) - 2, 'share(s) in the current chain. Fee:', sum(tx.value_in - tx.value_out for tx in extra_txs)/100000000
- transactions = [generate_tx] + [tx.tx for tx in extra_txs]
+ transactions = [generate_tx] + list(current_work2.value['transactions'])
merkle_root = bitcoin.data.merkle_hash(transactions)
merkle_root_to_transactions[merkle_root] = transactions # will stay for 1000 seconds
return bitcoin.getwork.BlockAttempt(state['version'], state['previous_block'], merkle_root, timestamp, state['target'], target2)
my_shares = set()
+ doa_shares = set()
times = {}
def got_response(data, user):
print
print 'GOT BLOCK! Passing to bitcoind! bitcoin: %x' % (hash_,)
print
+ try:
+ aux_pow = dict(
+ merkle_tx=dict(
+ tx=transactions[0],
+ block_hash=hash_,
+ merkle_branch=[x['hash'] for x in p2pool.calculate_merkle_branch(transactions, 0)],
+ index=0,
+ ),
+ merkle_branch=[],
+ index=0,
+ parent_block_header=header,
+ )
+
+ a, b = transactions[0]['tx_ins'][0]['script'][-32-8:-8].encode('hex'), bitcoin.data.aux_pow_type.pack(aux_pow).encode('hex')
+ #print a, b
+ merged = jsonrpc.Proxy(args.merged_url, (args.merged_userpass,))
+ def _(res):
+ print "MERGED RESULT:", res
+ merged.rpc_getauxblock(a, b).addBoth(_)
+ except:
+ log.err(None, 'Error while processing merged mining POW:')
target = p2pool.coinbase_type.unpack(transactions[0]['tx_ins'][0]['script'])['share_data']['target']
if hash_ > target:
print 'Worker submitted share with hash > target:\nhash : %x\ntarget: %x' % (hash_, target)
return False
share = p2pool.Share.from_block(block)
my_shares.add(share.hash)
+ if share.previous_hash != current_work.value['best_share_hash']:
+ doa_shares.add(share.hash)
print 'GOT SHARE! %s %s prev %s age %.2fs' % (user, p2pool.format_hash(share.hash), p2pool.format_hash(share.previous_hash), time.time() - times[share.nonce]) + (' DEAD ON ARRIVAL' if share.previous_hash != current_work.value['best_share_hash'] else '')
good = share.previous_hash == current_work.value['best_share_hash']
# maybe revert back to tracker being non-blocking so 'good' can be more accurate?
def get_rate():
if current_work.value['best_share_hash'] is not None:
height, last = tracker.get_height_and_last(current_work.value['best_share_hash'])
- att_s = p2pool.get_pool_attempts_per_second(tracker, current_work.value['best_share_hash'], args.net, min(height, 720))
- return json.dumps(att_s)
+ att_s = p2pool.get_pool_attempts_per_second(tracker, current_work.value['best_share_hash'], args.net, min(height - 1, 720))
+ fracs = [read_stale_frac(share) for share in itertools.islice(tracker.get_chain_known(current_work.value['best_share_hash']), 120) if read_stale_frac(share) is not None]
+ return json.dumps(int(att_s / (1. - (math.median(fracs) if fracs else 0))))
return json.dumps(None)
def get_users():
web_root.putChild('rate', WebInterface(get_rate, 'application/json'))
web_root.putChild('users', WebInterface(get_users, 'application/json'))
- if args.charts:
+ web_root.putChild('fee', WebInterface(lambda: json.dumps(args.worker_fee), 'application/json'))
+ if draw is not None:
web_root.putChild('chain_img', WebInterface(lambda: draw.get(tracker, current_work.value['best_share_hash']), 'image/png'))
reactor.listenTCP(args.worker_port, server.Site(web_root))
# done!
- tx_pool = expiring_dict.ExpiringDict(600, get_touches=False) # hash -> tx
- get_raw_transaction = deferral.DeferredCacher(lambda tx_hash: bitcoind.rpc_getrawtransaction('%x' % tx_hash), expiring_dict.ExpiringDict(100))
-
- class Tx(object):
- def __init__(self, tx, seen_at_block):
- self.hash = bitcoin.data.tx_type.hash256(tx)
- self.tx = tx
- self.seen_at_block = seen_at_block
- self.mentions = set([bitcoin.data.tx_type.hash256(tx)] + [tx_in['previous_output']['hash'] for tx_in in tx['tx_ins']])
- #print
- #print '%x %r' % (seen_at_block, tx)
- #for mention in self.mentions:
- # print '%x' % mention
- #print
- self.parents_all_in_blocks = False
- self.value_in = 0
- #print self.tx
- self.value_out = sum(txout['value'] for txout in self.tx['tx_outs'])
- self._find_parents_in_blocks()
-
- @defer.inlineCallbacks
- def _find_parents_in_blocks(self):
- for tx_in in self.tx['tx_ins']:
- try:
- raw_transaction = yield get_raw_transaction(tx_in['previous_output']['hash'])
- except Exception:
- return
- self.value_in += raw_transaction['tx']['txouts'][tx_in['previous_output']['index']]['value']
- #print raw_transaction
- if not raw_transaction['parent_blocks']:
- return
- self.parents_all_in_blocks = True
-
- def is_good(self):
- if not self.parents_all_in_blocks:
- return False
- x = self.is_good2()
- #print 'is_good:', x
- return x
-
- @defer.inlineCallbacks
- def new_tx(tx_hash):
- try:
- assert isinstance(tx_hash, (int, long))
- #print 'REQUESTING', tx_hash
- tx = yield (yield factory.getProtocol()).get_tx(tx_hash)
- #print 'GOT', tx
- tx_pool[bitcoin.data.tx_type.hash256(tx)] = Tx(tx, current_work.value['previous_block'])
- except:
- log.err(None, 'Error handling tx:')
- # disable for now, for testing impact on stales
- #factory.new_tx.watch(new_tx)
+ # do new getwork when a block is heard on the p2p interface
def new_block(block_hash):
work_updated.happened()
yield deferral.sleep(3)
try:
if time.time() > current_work2.value['last_update'] + 60:
- print '''LOST CONTACT WITH BITCOIND for 60 seconds, check that it isn't frozen or dead'''
+ print '''---> LOST CONTACT WITH BITCOIND for 60 seconds, check that it isn't frozen or dead <---'''
if current_work.value['best_share_hash'] is not None:
height, last = tracker.get_height_and_last(current_work.value['best_share_hash'])
if height > 2:
- att_s = p2pool.get_pool_attempts_per_second(tracker, current_work.value['best_share_hash'], args.net, min(height - 1, 120))
+ att_s = p2pool.get_pool_attempts_per_second(tracker, current_work.value['best_share_hash'], args.net, min(height - 1, 720))
weights, total_weight = tracker.get_cumulative_weights(current_work.value['best_share_hash'], min(height, 720), 2**100)
- shares, stale_shares = get_share_counts()
- print 'Pool: %sH/s in %i shares (%i/%i verified) Recent: %.02f%% >%sH/s Shares: %i (%i stale) Peers: %i' % (
- math.format(att_s),
+ shares, stale_doa_shares, stale_not_doa_shares = get_share_counts(True)
+ stale_shares = stale_doa_shares + stale_not_doa_shares
+ fracs = [read_stale_frac(share) for share in itertools.islice(tracker.get_chain_known(current_work.value['best_share_hash']), 120) if read_stale_frac(share) is not None]
+ print 'Pool: %sH/s in %i shares (%i/%i verified) Recent: %.02f%% >%sH/s Shares: %i (%i orphan, %i dead) Peers: %i' % (
+ math.format(int(att_s / (1. - (math.median(fracs) if fracs else 0)))),
height,
len(tracker.verified.shares),
len(tracker.shares),
weights.get(my_script, 0)/total_weight*100,
- math.format(weights.get(my_script, 0)/total_weight*att_s),
+ math.format(int(weights.get(my_script, 0)*att_s//total_weight / (1. - (math.median(fracs) if fracs else 0)))),
shares,
- stale_shares,
+ stale_not_doa_shares,
+ stale_doa_shares,
len(p2p_node.peers),
) + (' FDs: %i R/%i W' % (len(reactor.getReaders()), len(reactor.getWriters())) if p2pool_init.DEBUG else '')
- fracs = [read_stale_frac(share) for share in itertools.islice(tracker.get_chain_known(current_work.value['best_share_hash']), 120) if read_stale_frac(share) is not None]
if fracs:
med = math.median(fracs)
print 'Median stale proportion:', med
print ' Own:', stale_shares/shares
if med < .99:
print ' Own efficiency: %.02f%%' % (100*(1 - stale_shares/shares)/(1 - med),)
-
-
+
+
except:
log.err()
except:
# return the modified argument list
return new_arg_strings
+
+ def convert_arg_line_to_args(self, arg_line):
+ return [arg for arg in arg_line.split() if arg.strip()]
parser = FixedArgumentParser(description='p2pool (version %s)' % (p2pool_init.__version__,), fromfile_prefix_chars='@')
- parser.convert_arg_line_to_args = lambda arg_line: (arg for arg in arg_line.split() if arg.strip())
parser.add_argument('--version', action='version', version=p2pool_init.__version__)
parser.add_argument('--net',
help='use specified network (default: bitcoin)',
parser.add_argument('-a', '--address',
help='generate to this address (defaults to requesting one from bitcoind)',
type=str, action='store', default=None, dest='address')
- parser.add_argument('--charts',
- help='generate charts on the web interface (requires PIL and pygame)',
- action='store_const', const=True, default=False, dest='charts')
parser.add_argument('--logfile',
help='''log to specific file (defaults to <network_name>.log in run_p2pool.py's directory)''',
type=str, action='store', default=None, dest='logfile')
+ parser.add_argument('--merged-url',
+ help='call getauxblock on this url to get work for merged mining',
+ type=str, action='store', default=None, dest='merged_url')
+ parser.add_argument('--merged-userpass',
+ help='merge daemon user and password, separated by a colon. Example: ncuser:ncpass',
+ type=str, action='store', default=None, dest='merged_userpass')
p2pool_group = parser.add_argument_group('p2pool interface')
p2pool_group.add_argument('--p2pool-port', metavar='PORT',
worker_group = parser.add_argument_group('worker interface')
worker_group.add_argument('-w', '--worker-port', metavar='PORT',
- help='listen on PORT for RPC connections from miners asking for work and providing responses (default: bitcoin: 9332 namecoin: 9331 ixcoin: 9330 i0coin: 9329, +10000 for testnets)',
+ help='listen on PORT for RPC connections from miners asking for work and providing responses (default: bitcoin: 9332 namecoin: 9331 ixcoin: 9330 i0coin: 9329 solidcoin: 9328 litecoin: 9327, +10000 for testnets)',
type=int, action='store', default=None, dest='worker_port')
+ worker_group.add_argument('-f', '--fee', metavar='FEE_PERCENTAGE',
+ help='''charge workers mining to their own bitcoin address (by setting their miner's username to a bitcoin address) this percentage fee to mine on your p2pool instance. Amount displayed at http://127.0.0.1:9332/fee . default: 0''',
+ type=float, action='store', default=0, dest='worker_fee')
bitcoind_group = parser.add_argument_group('bitcoind interface')
bitcoind_group.add_argument('--bitcoind-address', metavar='BITCOIND_ADDRESS',
help='connect to a bitcoind at this address (default: 127.0.0.1)',
type=str, action='store', default='127.0.0.1', dest='bitcoind_address')
bitcoind_group.add_argument('--bitcoind-rpc-port', metavar='BITCOIND_RPC_PORT',
- help='connect to a bitcoind at this port over the RPC interface - used to get the current highest block via getwork (default: 8332, 8338 for ixcoin)',
+ help='connect to a bitcoind at this port over the RPC interface - used to get the current highest block via getwork (default: 8332 ixcoin: 8338 i0coin: 7332 litecoin: 9332)',
type=int, action='store', default=None, dest='bitcoind_rpc_port')
bitcoind_group.add_argument('--bitcoind-p2p-port', metavar='BITCOIND_P2P_PORT',
- help='connect to a bitcoind at this port over the p2p interface - used to submit blocks and get the pubkey to generate to via an IP transaction (default: 8333 normally. 18333 for testnet)',
+ help='connect to a bitcoind at this port over the p2p interface - used to submit blocks and get the pubkey to generate to via an IP transaction (default: 8333 namecoin: 8334 ixcoin: 8337 i0coin: 7333 solidcoin: 7555 litecoin: 9333, +10000 for testnets)',
type=int, action='store', default=None, dest='bitcoind_p2p_port')
bitcoind_group.add_argument(metavar='BITCOIND_RPCUSER',
p2pool_init.DEBUG = True
if args.logfile is None:
- args.logfile = os.path.join(os.path.dirname(sys.argv[0]), args.net_name + ('_testnet' if args.testnet else '') + '.log')
+ args.logfile = os.path.join(os.path.dirname(sys.argv[0]), args.net_name + ('_testnet' if args.testnet else '') + '.log')
- class ReopeningFile(object):
- def __init__(self, *open_args, **open_kwargs):
- self.open_args, self.open_kwargs = open_args, open_kwargs
- self.inner_file = open(*self.open_args, **self.open_kwargs)
+ class LogFile(object):
+ def __init__(self, filename):
+ self.filename = filename
+ self.inner_file = None
+ self.reopen()
def reopen(self):
- self.inner_file.close()
- self.inner_file = open(*self.open_args, **self.open_kwargs)
+ if self.inner_file is not None:
+ self.inner_file.close()
+ open(self.filename, 'a').close()
+ f = open(self.filename, 'rb')
+ f.seek(0, os.SEEK_END)
+ length = f.tell()
+ if length > 100*1000*1000:
+ f.seek(-1000*1000, os.SEEK_END)
+ while True:
+ if f.read(1) in ('', '\n'):
+ break
+ data = f.read()
+ f.close()
+ f = open(self.filename, 'wb')
+ f.write(data)
+ f.close()
+ self.inner_file = open(self.filename, 'a')
def write(self, data):
self.inner_file.write(data)
def flush(self):
self.buf = lines[-1]
def flush(self):
pass
- logfile = ReopeningFile(args.logfile, 'w')
+ logfile = LogFile(args.logfile)
sys.stdout = sys.stderr = log.DefaultObserver.stderr = TimestampingPipe(TeePipe([sys.stderr, logfile]))
if hasattr(signal, "SIGUSR1"):
def sigusr1(signum, frame):
try:
args.pubkey_hash = bitcoin.data.address_to_pubkey_hash(args.address, args.net)
except Exception, e:
- raise ValueError('error parsing address: ' + repr(e))
+ parser.error('error parsing address: ' + repr(e))
else:
args.pubkey_hash = None
+ if (args.merged_url is None) ^ (args.merged_userpass is None):
+ parser.error('must specify --merged-url and --merged-userpass')
+
reactor.callWhenRunning(main, args)
reactor.run()
git://git.novaco.in / p2pool.git / blobdiff