X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=blobdiff_plain;f=p2pool%2Fwork.py;h=5534b0162c42cf2f6403ff82beecab6b296d3122;hp=df9f787061f1e5529a755100a11b5871d3070d8d;hb=41c4fdc3cee33965f9ae00c0eb0eb8b81d3ff107;hpb=4cde79363018833bd47e411d12dff8263a17c8e6

diff --git a/p2pool/work.py b/p2pool/work.py
index df9f787..5534b01 100644
--- a/p2pool/work.py
+++ b/p2pool/work.py
@@ -68,7 +68,7 @@ class WorkerBridge(worker_interface.WorkerBridge):
             merged_proxy = jsonrpc.HTTPProxy(merged_url, dict(Authorization='Basic ' + base64.b64encode(merged_userpass)))
             while self.running:
                 auxblock = yield deferral.retry('Error while calling merged getauxblock:', 30)(merged_proxy.rpc_getauxblock)()
-                self.merged_work.set(dict(self.merged_work.value, **{auxblock['chainid']: dict(
+                self.merged_work.set(math.merge_dicts(self.merged_work.value, {auxblock['chainid']: dict(
                     hash=int(auxblock['hash'], 16),
                     target='p2pool' if auxblock['target'] == 'p2pool' else pack.IntType(256).unpack(auxblock['target'].decode('hex')),
                     merged_proxy=merged_proxy,