Support merged mining via CAuxPow structure.

deserialize.py

@@ -146,7 +146,15 @@ def deserialize_WalletTx(d, transaction_index=None, owner_keys=None):
   result += " fromMe:"+str(d['fromMe'])+" spent:"+str(d['spent'])
   return result
 
-def parse_Block(vds):
+def parse_AuxPow(vds):
+  d = parse_MerkleTx(vds)
+  n_chainMerkleBranch = vds.read_compact_size()
+  d['chainMerkleBranch'] = vds.read_bytes(32*n_chainMerkleBranch)
+  d['chainIndex'] = vds.read_int32()
+  d['parentBlock'] = parse_BlockHeader(vds)
+  return d
+
+def parse_BlockHeader(vds):
   d = {}
   header_start = vds.read_cursor
   d['version'] = vds.read_int32()
@@ -157,6 +165,12 @@ def parse_Block(vds):
   d['nNonce'] = vds.read_uint32()
   header_end = vds.read_cursor
   d['__header__'] = vds.input[header_start:header_end]
+  return d
+
+def parse_Block(vds):
+  d = parse_BlockHeader(vds)
+  if d['version'] & (1 << 8):
+    d['auxpow'] = parse_AuxPow(vds)
   d['transactions'] = []
   nTransactions = vds.read_compact_size()
   for i in xrange(nTransactions):