instead of trying to use bitcoind's clock offset, just use raw system clock for share...

diff --git a/p2pool/main.py b/p2pool/main.py
index 977b417..76f406f 100644 (file)
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -58,7 +58,6 @@ def getwork(bitcoind, use_getblocktemplate=False):
         bits=bitcoin_data.FloatingIntegerType().unpack(work['bits'].decode('hex')[::-1]) if isinstance(work['bits'], (str, unicode)) else bitcoin_data.FloatingInteger(work['bits']),
         coinbaseflags=work['coinbaseflags'].decode('hex') if 'coinbaseflags' in work else ''.join(x.decode('hex') for x in work['coinbaseaux'].itervalues()) if 'coinbaseaux' in work else '',
         height=work['height'],
-        clock_offset=time.time() - (work['curtime'] if 'curtime' in work else work['time']),
         last_update=time.time(),
         use_getblocktemplate=use_getblocktemplate,
     ))

diff --git a/p2pool/work.py b/p2pool/work.py
index e98831c..9829fb5 100644 (file)
--- a/p2pool/work.py
+++ b/p2pool/work.py
@@ -94,7 +94,6 @@ class WorkerBridge(worker_interface.WorkerBridge):
                     transactions=[],
                     merkle_link=bitcoin_data.calculate_merkle_link([None], 0),
                     subsidy=net.PARENT.SUBSIDY_FUNC(self.block_height_var.value),
-                    clock_offset=self.bitcoind_work.value['clock_offset'],
                     last_update=self.bitcoind_work.value['last_update'],
                 )
             
@@ -202,7 +201,7 @@ class WorkerBridge(worker_interface.WorkerBridge):
                     desired_version=3,
                 ),
                 block_target=self.current_work.value['bits'].target,
-                desired_timestamp=int(time.time() - self.current_work.value['clock_offset']),
+                desired_timestamp=int(time.time() + 0.5),
                 desired_target=desired_share_target,
                 ref_merkle_link=dict(branch=[], index=0),
                 net=self.net,