git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(from parent 1:
80c9591
)
fixed compute_work using its own previous result instead of bitcoind_work
author
Forrest Voight
<forrest@forre.st>
Sun, 24 Jun 2012 15:58:31 +0000 (11:58 -0400)
committer
Forrest Voight
<forrest@forre.st>
Sun, 24 Jun 2012 16:38:59 +0000 (12:38 -0400)
p2pool/work.py
patch
|
blob
|
history
diff --git
a/p2pool/work.py
b/p2pool/work.py
index
853862a
..
57c9769
100644
(file)
--- a/
p2pool/work.py
+++ b/
p2pool/work.py
@@
-94,8
+94,8
@@
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.current_work.value['clock_offset'],
- last_update=self.current_work.value['last_update'],
+ clock_offset=self.bitcoind_work.value['clock_offset'],
+ last_update=self.bitcoind_work.value['last_update'],
)
self.current_work.set(t)