From 6cce68e02a4c121ebec4b7d236dd5374a7f04a2d Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 31 Mar 2020 13:54:41 +0100
Subject: [PATCH] ZIP 211 pseudocode: correct missing consensusBranchId
 argument in call to H.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 zip-0221.html | 3 ++-
 zip-0221.rst  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zip-0221.html b/zip-0221.html
index 9d9222b8..2526221e 100644
--- a/zip-0221.html
+++ b/zip-0221.html
@@ -398,7 +398,8 @@ License: MIT</pre>
     <span class="k">return</span> <span class="n">ZcashMMRNode</span><span class="p">(</span>
         <span class="n">left_child</span><span class="o">=</span><span class="n">left_child</span><span class="p">,</span>
         <span class="n">right_child</span><span class="o">=</span><span class="n">right_child</span><span class="p">,</span>
-        <span class="n">hashSubtreeCommitment</span><span class="o">=</span><span class="n">H</span><span class="p">(</span><span class="n">left_child</span><span class="o">.</span><span class="n">serialize</span><span class="p">()</span> <span class="o">+</span> <span class="n">right_child</span><span class="o">.</span><span class="n">serialize</span><span class="p">()),</span>
+        <span class="n">hashSubtreeCommitment</span><span class="o">=</span><span class="n">H</span><span class="p">(</span><span class="n">left_child</span><span class="o">.</span><span class="n">serialize</span><span class="p">()</span> <span class="o">+</span> <span class="n">right_child</span><span class="o">.</span><span class="n">serialize</span><span class="p">(),</span>
+                                <span class="n">left_child</span><span class="o">.</span><span class="n">consensusBranchId</span><span class="p">),</span>
         <span class="n">nEarliestTimestamp</span><span class="o">=</span><span class="n">left_child</span><span class="o">.</span><span class="n">nEarliestTimestamp</span><span class="p">,</span>
         <span class="n">nLatestTimestamp</span><span class="o">=</span><span class="n">right_child</span><span class="o">.</span><span class="n">nLatestTimestamp</span><span class="p">,</span>
         <span class="n">nEarliestTargetBits</span><span class="o">=</span><span class="n">left_child</span><span class="o">.</span><span class="n">nEarliestTargetBits</span><span class="p">,</span>
diff --git a/zip-0221.rst b/zip-0221.rst
index a927baac..4a488856 100644
--- a/zip-0221.rst
+++ b/zip-0221.rst
@@ -405,7 +405,8 @@ Tree nodes and hashing (pseudocode)
         return ZcashMMRNode(
             left_child=left_child,
             right_child=right_child,
-            hashSubtreeCommitment=H(left_child.serialize() + right_child.serialize()),
+            hashSubtreeCommitment=H(left_child.serialize() + right_child.serialize(),
+                                    left_child.consensusBranchId),
             nEarliestTimestamp=left_child.nEarliestTimestamp,
             nLatestTimestamp=right_child.nLatestTimestamp,
             nEarliestTargetBits=left_child.nEarliestTargetBits,