update typescript

package.json

@@ -49,7 +49,7 @@
     "semver": "7.3.5",
     "shx": "0.3.3",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4",
+    "typescript": "5.1.6",
     "validate-npm-package-name": "3.0.0",
     "yargs": "16.2.0"
   },

packages/cli/package.json

@@ -59,7 +59,7 @@
     "cross-env": "7.0.3",
     "mocha": "9.1.3",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "5.1.6"
   },
   "dependencies": {
     "@ganache/colors": "0.4.0",

packages/colors/package.json

@@ -44,6 +44,6 @@
     "cross-env": "7.0.3",
     "mocha": "9.1.3",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "5.1.6"
   }
 }

packages/core/package.json

@@ -64,7 +64,7 @@
     "nyc": "15.1.0",
     "superagent": "6.1.0",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4",
+    "typescript": "5.1.6",
     "ws": "8.2.3"
   }
 }

packages/ethereum/address/package.json

@@ -53,7 +53,7 @@
     "mocha": "9.1.3",
     "nyc": "15.1.0",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "5.1.6"
   },
   "dependencies": {
     "@ethereumjs/util": "8.0.5",

packages/ethereum/block/package.json

@@ -53,7 +53,7 @@
     "mocha": "9.1.3",
     "nyc": "15.1.0",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "5.1.6"
   },
   "dependencies": {
     "@ethereumjs/common": "3.1.1",

packages/ethereum/block/src/block.ts

@@ -8,7 +8,7 @@ import {
 } from "@ganache/ethereum-transaction";
 import type { Common } from "@ethereumjs/common";
 import { encode, decode } from "@ganache/rlp";
-import { BlockHeader, makeHeader } from "./runtime-block";
+import { BlockHeader, makeHeader } from "./helpers";
 import { keccak } from "@ganache/utils";
 import {
   BlockRawTransaction,
@@ -24,6 +24,8 @@ import {
 } from "./serialize";
 import { BlockParams } from "./block-params";
 
+export type { BlockHeader } from "./helpers";
+
 export type BaseFeeHeader = BlockHeader &
   Required<Pick<BlockHeader, "baseFeePerGas">>;
 

packages/ethereum/block/src/helpers.ts

@@ -0,0 +1,50 @@
+import { Data, Quantity } from "@ganache/utils";
+import { EthereumRawBlockHeader } from "./serialize";
+
+export type BlockHeader = {
+  parentHash: Data;
+  sha3Uncles: Data;
+  miner: Data;
+  stateRoot: Data;
+  transactionsRoot: Data;
+  receiptsRoot: Data;
+  logsBloom: Data;
+  difficulty: Quantity;
+  totalDifficulty: Quantity;
+  number: Quantity;
+  gasLimit: Quantity;
+  gasUsed: Quantity;
+  timestamp: Quantity;
+  extraData: Data;
+  mixHash: Data;
+  nonce: Data;
+  baseFeePerGas?: Quantity;
+  withdrawalsRoot?: Data;
+};
+
+export function makeHeader(
+  raw: EthereumRawBlockHeader,
+  totalDifficulty: Buffer
+): BlockHeader {
+  return {
+    parentHash: Data.from(raw[0], 32),
+    sha3Uncles: Data.from(raw[1], 32),
+    miner: Data.from(raw[2], 20),
+    stateRoot: Data.from(raw[3], 32),
+    transactionsRoot: Data.from(raw[4], 32),
+    receiptsRoot: Data.from(raw[5], 32),
+    logsBloom: Data.from(raw[6], 256),
+    difficulty: Quantity.from(raw[7], false),
+    number: Quantity.from(raw[8], false),
+    gasLimit: Quantity.from(raw[9], false),
+    gasUsed: Quantity.from(raw[10], false),
+    timestamp: Quantity.from(raw[11], false),
+    extraData: Data.from(raw[12]),
+    mixHash: Data.from(raw[13], 32),
+    nonce: Data.from(raw[14], 8),
+    totalDifficulty: Quantity.from(totalDifficulty, false),
+    baseFeePerGas:
+      raw[15] === undefined ? undefined : Quantity.from(raw[15], false),
+    withdrawalsRoot: raw[16] === undefined ? undefined : Data.from(raw[16], 32)
+  };
+}