from twisted.internet import defer
import p2pool
-from p2pool.bitcoin import getwork
-from p2pool.util import expiring_dict, jsonrpc, variable
+from p2pool.bitcoin import data as bitcoin_data, getwork
+from p2pool.util import expiring_dict, jsonrpc, pack, variable
-class _Page(jsonrpc.Server):
+class _Provider(object):
def __init__(self, parent, long_poll):
- jsonrpc.Server.__init__(self)
self.parent = parent
self.long_poll = long_poll
def rpc_getwork(self, request, data=None):
return self.parent._getwork(request, data, long_poll=self.long_poll)
-
- def render_GET(self, request):
- request.content = StringIO.StringIO(json.dumps(dict(id=0, method='getwork')))
- return self.render_POST(request)
+
+class _GETableServer(jsonrpc.HTTPServer):
+ def __init__(self, provider, render_get_func):
+ jsonrpc.HTTPServer.__init__(self, provider)
+ self.render_GET = render_get_func
class WorkerBridge(object):
def __init__(self):
self.worker_views = {}
- self.work_cache = {} # request_process_func(request) -> blockattempt
- self.work_cache_times = self.worker_bridge.new_work_event.times
-
self.merkle_root_to_handler = expiring_dict.ExpiringDict(300)
- def attach_to(self, res):
- res.putChild('', _Page(self, long_poll=False))
- res.putChild('long-polling', _Page(self, long_poll=True))
+ def attach_to(self, res, get_handler=None):
+ res.putChild('', _GETableServer(_Provider(self, long_poll=False), get_handler))
+
+ def repost(request):
+ request.content = StringIO.StringIO(json.dumps(dict(id=0, method='getwork')))
+ return s.render_POST(request)
+ s = _GETableServer(_Provider(self, long_poll=True), repost)
+ res.putChild('long-polling', s)
@defer.inlineCallbacks
def _getwork(self, request, data, long_poll):
request.setHeader('X-Long-Polling', '/long-polling')
- request.setHeader('X-Roll-NTime', 'expire=10')
+ request.setHeader('X-Roll-NTime', 'expire=100')
request.setHeader('X-Is-P2Pool', 'true')
+ if request.getHeader('Host') is not None:
+ request.setHeader('X-Stratum', 'stratum+tcp://' + request.getHeader('Host'))
if data is not None:
header = getwork.decode_data(data)
if header['merkle_root'] not in self.merkle_root_to_handler:
print >>sys.stderr, '''Couldn't link returned work's merkle root with its handler. This should only happen if this process was recently restarted!'''
defer.returnValue(False)
- defer.returnValue(self.merkle_root_to_handler[header['merkle_root']](header, request))
+ defer.returnValue(self.merkle_root_to_handler[header['merkle_root']](header, request.getUser() if request.getUser() is not None else '', '\0'*self.worker_bridge.COINBASE_NONCE_LENGTH))
if p2pool.DEBUG:
id = random.randrange(1000, 10000)
yield self.worker_bridge.new_work_event.get_deferred()
self.worker_views[request_id] = self.worker_bridge.new_work_event.times
- key = self.worker_bridge.preprocess_request(request)
+ x, handler = self.worker_bridge.get_work(*self.worker_bridge.preprocess_request(request.getUser() if request.getUser() is not None else ''))
+ res = getwork.BlockAttempt(
+ version=x['version'],
+ previous_block=x['previous_block'],
+ merkle_root=bitcoin_data.check_merkle_link(bitcoin_data.hash256(x['coinb1'] + '\0'*self.worker_bridge.COINBASE_NONCE_LENGTH + x['coinb2']), x['merkle_link']),
+ timestamp=x['timestamp'],
+ bits=x['bits'],
+ share_target=x['share_target'],
+ )
+ assert res.merkle_root not in self.merkle_root_to_handler
- if self.work_cache_times != self.worker_bridge.new_work_event.times:
- self.work_cache = {}
- self.work_cache_times = self.worker_bridge.new_work_event.times
-
- if key in self.work_cache:
- res, orig_timestamp = self.work_cache.pop(key)
- else:
- res, handler = self.worker_bridge.get_work(*key)
- assert res.merkle_root not in self.merkle_root_to_handler
- self.merkle_root_to_handler[res.merkle_root] = handler
- orig_timestamp = res.timestamp
-
- if res.timestamp + 12 < orig_timestamp + 600:
- self.work_cache[key] = res.update(timestamp=res.timestamp + 12), orig_timestamp
+ self.merkle_root_to_handler[res.merkle_root] = handler
if p2pool.DEBUG:
print 'POLL %i END identifier=%i' % (id, self.worker_bridge.new_work_event.times)
defer.returnValue(res.getwork(identifier=str(self.worker_bridge.new_work_event.times), submitold=True))
+
+class CachingWorkerBridge(object):
+ def __init__(self, inner):
+ self._inner = inner
+ self.net = self._inner.net
+
+ self.COINBASE_NONCE_LENGTH = (inner.COINBASE_NONCE_LENGTH+1)//2
+ self.new_work_event = inner.new_work_event
+ self.preprocess_request = inner.preprocess_request
+
+ self._my_bits = (self._inner.COINBASE_NONCE_LENGTH - self.COINBASE_NONCE_LENGTH)*8
+
+ self._cache = {}
+ self._times = None
+
+ def get_work(self, *args):
+ if self._times != self.new_work_event.times:
+ self._cache = {}
+ self._times = self.new_work_event.times
+
+ if args not in self._cache:
+ x, handler = self._inner.get_work(*args)
+ self._cache[args] = x, handler, 0
+
+ x, handler, nonce = self._cache.pop(args)
+
+ res = (
+ dict(x, coinb1=x['coinb1'] + pack.IntType(self._my_bits).pack(nonce)),
+ lambda header, user, coinbase_nonce: handler(header, user, pack.IntType(self._my_bits).pack(nonce) + coinbase_nonce),
+ )
+
+ if nonce + 1 != 2**self._my_bits:
+ self._cache[args] = x, handler, nonce + 1
+
+ return res