From 9a61d23c68e7d5300bc2c340d449e3acb119c92d Mon Sep 17 00:00:00 2001
From: John Tobey <John.Tobey@gmail.com>
Date: Mon, 8 Aug 2011 13:47:06 -0400
Subject: [PATCH] Document parse_AuxPow in comments.

---
 deserialize.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/deserialize.py b/deserialize.py
index 46382f1..a1764da 100644
--- a/deserialize.py
+++ b/deserialize.py
@@ -146,6 +146,11 @@ def deserialize_WalletTx(d, transaction_index=None, owner_keys=None):
   result += " fromMe:"+str(d['fromMe'])+" spent:"+str(d['spent'])
   return result
 
+# The CAuxPow (auxiliary proof of work) structure supports merged mining.
+# A flag in the block version field indicates the structure's presence.
+# As of 8/2011, the Original Bitcoin Client does not use it.  CAuxPow
+# originated in Namecoin; see
+# https://github.com/vinced/namecoin/blob/mergedmine/doc/README_merged-mining.md.
 def parse_AuxPow(vds):
   d = parse_MerkleTx(vds)
   n_chainMerkleBranch = vds.read_compact_size()