From: Ardis Lu <ardisglu@gmail.com>
Date: Tue, 21 May 2024 01:54:06 +0000 (-0700)
Subject: Move calculate to standalone file
X-Git-Url: https://git.ardis.lu/?a=commitdiff_plain;h=fa8a867e8cc77d39fc73303c31c7037dcd3761a4;p=block-hash-calculator

Move calculate to standalone file
---

diff --git a/calculate.js b/calculate.js
new file mode 100644
index 0000000..1b9e776
--- /dev/null
+++ b/calculate.js
@@ -0,0 +1,87 @@
+// ethereumjs/rlp v5.0.2
+// noble/hashes/sha3 v1.4.0
+import { RLP, keccak256 } from './vendor.js';
+
+// Uint8Array to hex string
+function hex(array) {
+  return `0x${[...array].map(v => v.toString(16).padStart(2, '0')).join('')}`;
+}
+
+// Calculate the header, RLP-encoded header, and Keccak-256 hash of RLP
+function calculate(block) {
+  // Header fields available at genesis
+  const header = [
+    block.parentHash,
+    block.sha3Uncles,
+    block.miner,
+    block.stateRoot,
+    block.transactionsRoot,
+    block.receiptsRoot,
+    block.logsBloom,
+    BigInt(block.difficulty),
+    BigInt(block.number),
+    BigInt(block.gasLimit),
+    BigInt(block.gasUsed),
+    BigInt(block.timestamp),
+    block.extraData,
+    block.mixHash,
+    BigInt(block.nonce)
+  ];
+
+  // Avalanche Apricot Phase 1 (no specification)
+  // https://github.com/ava-labs/coreth/blob/master/README.md#block-format
+  if (block?.extDataHash) {
+    header.push(block.extDataHash);
+  }
+
+  // London hard fork
+  // https://eips.ethereum.org/EIPS/eip-1559#block-hash-changing
+  if (block?.baseFeePerGas) {
+    header.push(BigInt(block.baseFeePerGas));
+  }
+
+  // Avalanche Apricot Phase 4 (no specification)
+  // https://github.com/ava-labs/coreth/blob/f4aa91c7af01cc27b95dfc0086fd92a8174cf67c/core/types/block.go#L99
+  if (block?.extDataGasUsed) {
+    header.push(BigInt(block.extDataGasUsed));
+    header.push(BigInt(block.blockGasCost));
+  }
+
+  // Paris hard fork
+  // https://eips.ethereum.org/EIPS/eip-3675#block-structure
+  if (block.nonce === '0x0000000000000000') {
+    header[14] = '0x0000000000000000'; // MUST be string and not a number
+  }
+
+  // Shapella hard fork
+  // https://eips.ethereum.org/EIPS/eip-4895#new-field-in-the-execution-payload-header-withdrawals-root
+  if (block?.withdrawalsRoot) {
+    header.push(block.withdrawalsRoot);
+  }
+
+  // Dencun hard fork
+  // https://eips.ethereum.org/EIPS/eip-4844#header-extension
+  if (block?.blobGasUsed) {
+    header.push(
+      BigInt(block.blobGasUsed),
+      BigInt(block.excessBlobGas)
+    );
+  }
+
+  // Dencun hard fork
+  // https://eips.ethereum.org/EIPS/eip-4788#block-structure-and-validity
+  if (block?.parentBeaconBlockRoot) {
+    header.push(block.parentBeaconBlockRoot);
+  }
+
+  const rlp = RLP.encode(header);
+  const hash = keccak256(rlp);
+
+  return {
+    header,
+    rlp: hex(rlp),
+    hash: hex(hash)
+  };
+}
+
+export { calculate };
\ No newline at end of file
diff --git a/index.html b/index.html
index 6cf87f1..48714d4 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,8 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="modulepreload" href="/vendor.js">
+  <link rel="modulepreload" href="./calculate.js">
+  <link rel="modulepreload" href="./vendor.js">
   <link rel="icon" href="data:,">
   <title>Block Hash Calculator</title>
   <style>
@@ -117,91 +118,7 @@
   </main>
 
   <script type="module">
-    // ethereumjs/rlp v5.0.2
-    // noble/hashes/sha3 v1.4.0
-    import { RLP, keccak256 } from '/vendor.js';
-
-    // Uint8Array to hex string
-    function hex(array) {
-      return `0x${[...array].map(v => v.toString(16).padStart(2, '0')).join('')}`;
-    }
-
-    // Calculate the header, RLP-encoded header, and Keccak-256 hash of RLP
-    function calculate(block) {
-      // Header fields available at genesis
-      const header = [
-        block.parentHash,
-        block.sha3Uncles,
-        block.miner,
-        block.stateRoot,
-        block.transactionsRoot,
-        block.receiptsRoot,
-        block.logsBloom,
-        BigInt(block.difficulty),
-        BigInt(block.number),
-        BigInt(block.gasLimit),
-        BigInt(block.gasUsed),
-        BigInt(block.timestamp),
-        block.extraData,
-        block.mixHash,
-        BigInt(block.nonce)
-      ];
-
-      // Avalanche Apricot Phase 1 (no specification)
-      // https://github.com/ava-labs/coreth/blob/master/README.md#block-format
-      if (block?.extDataHash) {
-        header.push(block.extDataHash);
-      }
-
-      // London hard fork
-      // https://eips.ethereum.org/EIPS/eip-1559#block-hash-changing
-      if (block?.baseFeePerGas) {
-        header.push(BigInt(block.baseFeePerGas));
-      }
-
-      // Avalanche Apricot Phase 4 (no specification)
-      // https://github.com/ava-labs/coreth/blob/f4aa91c7af01cc27b95dfc0086fd92a8174cf67c/core/types/block.go#L99
-      if (block?.extDataGasUsed) {
-        header.push(BigInt(block.extDataGasUsed));
-        header.push(BigInt(block.blockGasCost));
-      }
-
-      // Paris hard fork
-      // https://eips.ethereum.org/EIPS/eip-3675#block-structure
-      if (block.nonce === '0x0000000000000000') {
-        header[14] = '0x0000000000000000'; // MUST be string and not a number
-      }
-
-      // Shapella hard fork
-      // https://eips.ethereum.org/EIPS/eip-4895#new-field-in-the-execution-payload-header-withdrawals-root
-      if (block?.withdrawalsRoot) {
-        header.push(block.withdrawalsRoot);
-      }
-
-      // Dencun hard fork
-      // https://eips.ethereum.org/EIPS/eip-4844#header-extension
-      if (block?.blobGasUsed) {
-        header.push(
-          BigInt(block.blobGasUsed),
-          BigInt(block.excessBlobGas)
-        );
-      }
-
-      // Dencun hard fork
-      // https://eips.ethereum.org/EIPS/eip-4788#block-structure-and-validity
-      if (block?.parentBeaconBlockRoot) {
-        header.push(block.parentBeaconBlockRoot);
-      }
-
-      const rlp = RLP.encode(header);
-      const hash = keccak256(rlp);
-
-      return {
-        header,
-        rlp: hex(rlp),
-        hash: hex(hash)
-      };
-    }
+    import { calculate } from './calculate.js';
 
     document.querySelector('form').addEventListener('submit', async e => {
       e.preventDefault();