Adding witness data

bboerst · May 20, 2024 · dacd446 · dacd446
1 parent 425e485
commit dacd446
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -20,3 +20,11 @@ If anyone can explain this, please open a PR with details.
 
 ### Summary
 If anyone can explain this, please open a PR with details.
+
+## Witness data
+- Spec: https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/ts_src/block.ts#L106-L109
+
+### Summary
+The merkle root for the witness data is in an OP_RETURN output.
+
+https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/ts_src/block.ts#L106-L109
diff --git a/index.html b/index.html
@@ -173,9 +173,13 @@
       padding-top: 4px;
     }
 
-    .type-tag {
+    .nologo {
+      padding-top: 4px;
+      font-weight: bold;
+    }
+
+    .tag {
       position: absolute;
-      top: 10px;
       right: 10px;
       padding: 5px 10px;
       background-color: #f5f5f5;
@@ -185,6 +189,14 @@
       cursor: pointer;
     }
 
+    .tag.type {
+      top: 10px;
+    }
+
+    .tag.opreturnindex {
+      top: 38px;
+    }
+
     .help-icon {
       display: inline-block;
       width: 12px;
@@ -218,6 +230,14 @@ <h2>What is Merged Mining?</h2>
       <p>Merged mining is implemented by embedding metadata from the auxiliary blockchain into the coinbase transaction of the parent blockchain's blocks. This metadata typically includes block hashes and other relevant information.</p>
     </div>
   </div>
+
+  <div id="witnessPopup" class="popup">
+    <div class="popup-content">
+      <span class="close" onclick="closeWitnessPopup()">&times;</span>
+      <h2>What is the Witness OP_RETURN?</h2>
+      <p>The merkle root for the witness data is in an OP_RETURN output.</p>
+    </div>
+  </div>
 
   <script>
     let currentBlockIndex = 0;
@@ -287,7 +307,8 @@ <h2>What is Merged Mining?</h2>
             outputsHtml += "<div class='core-logo'><a href='https://stake.coredao.org/' target='_blank'><img src='https://coredao.org/_next/image?url=%2F_next%2Fstatic%2Fmedia%2Flight.2e337d5a.png&w=384&q=75' height='30'></a></div><br>";
             outputsHtml += "<strong>Validator Address:</strong> <div class='hash'><a href='https://stake.coredao.org/validator/" + validatorAddress + "' target='_blank'>" + validatorAddress + "</a></div><br>";
             outputsHtml += "<strong>Reward Address:</strong> <div class='hash'><a href='https://scan.coredao.org/address/" + rewardAddress + "' target='_blank'>" + rewardAddress + "</a></div>";
-            outputsHtml += "<div class='type-tag' onclick='openMergedMiningPopup()'>merged mining <div class='help-icon'></div></div>";
+            outputsHtml += "<div class='tag type' onclick='openMergedMiningPopup()'>merged mining <div class='help-icon'></div></div>";
+            // outputsHtml += "<div class='tag opreturnindex'>OP_RETURN " + j + "</div>";
             outputsHtml += "</div>";
           }
 
@@ -299,7 +320,21 @@ <h2>What is Merged Mining?</h2>
             outputsHtml += "<div class='section-container'>";
             outputsHtml += "<div class='rootstock-logo'><a href='https://explorer.rootstock.io/' target='_blank'><img src='https://rootstock.blockscout.com/assets/network_logo.svg' height='23'></a></div><br>";
             outputsHtml += "<strong>Hash For Merged Mining:</strong> <div class='hash'>" + rskBlockData + "</div>";
-            outputsHtml += "<div class='type-tag' onclick='openMergedMiningPopup()'>merged mining <div class='help-icon'></div></div>";
+            outputsHtml += "<div class='tag type' onclick='openMergedMiningPopup()'>merged mining <div class='help-icon'></div></div>";
+            // outputsHtml += "<div class='tag opreturnindex'>OP_RETURN " + j + "</div>";
+            outputsHtml += "</div>";
+          }
+
+          // Witness data
+          if (output.scriptpubkey && output.scriptpubkey_asm && output.scriptpubkey_asm.includes("OP_RETURN OP_PUSHBYTES_36 aa21a9ed")) {
+            var witnessData = output.scriptpubkey_asm.split("OP_RETURN OP_PUSHBYTES_36 ")[1];
+            var witnessBlockData = witnessData.slice(8, 72);
+
+            outputsHtml += "<div class='section-container'>";
+            outputsHtml += "<div class='nologo'>Witness data</div><br>";
+            outputsHtml += "<strong>Merkle root:</strong> <div class='hash'>" + witnessBlockData + "</div>";
+            outputsHtml += "<div class='tag type' onclick='openWitnessPopup()'>witness <div class='help-icon'></div></div>";
+            // outputsHtml += "<div class='tag opreturnindex'>OP_RETURN " + j + "</div>";
             outputsHtml += "</div>";
           }
 
@@ -352,6 +387,14 @@ <h2>What is Merged Mining?</h2>
     function closeMergedMiningPopup() {
       document.getElementById("mergedMiningPopup").style.display = "none";
     }
+
+    function openWitnessPopup() {
+      document.getElementById("witnessPopup").style.display = "block";
+    }
+
+    function closeWitnessPopup() {
+      document.getElementById("witnessPopup").style.display = "none";
+    }
 
     init();
   </script>