Block, Blockchain: bugfix releases (client preparation) fixing London HF at block 0 or 1 handling (#1495)

Author: holgerd77

packages/block/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 3.5.1 - 2021-09-28
+
+- Fixed a bug not initializing the HF correctly when run on a custom chain with the `london` HF happening on block 0 or 1, PR [#1492](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1492)
+
 ## 3.5.0 - 2021-09-24
 
 ### Experimental Merge/PoS Support

packages/block/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethereumjs/block",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "Provides Block serialization and help functions",
   "license": "MPL-2.0",
   "author": "mjbecze ([email protected])",

packages/blockchain/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 5.4.2 - 2021-09-28
+
+- Fixed a bug not initializing the HF correctly when run on a custom chain with the `london` HF happening on block 0 or 1, PR [#1492](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1492)
+
 ## 5.4.1 - 2021-09-24
 
 ### Experimental Casper/PoS and Merge Support

packages/blockchain/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethereumjs/blockchain",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "A module to store and interact with blocks",
   "license": "MPL-2.0",
   "keywords": [
@@ -35,7 +35,7 @@
   },
   "author": "mjbecze <[email protected]>",
   "dependencies": {
-    "@ethereumjs/block": "^3.5.0",
+    "@ethereumjs/block": "^3.5.1",
     "@ethereumjs/common": "^2.5.0",
     "@ethereumjs/ethash": "^1.1.0",
     "debug": "^2.2.0",

packages/client/README.md

@@ -21,7 +21,7 @@ Here are some use cases:
 - Set up your own local development networks (PoA Clique)
 - Run a network with your own custom [EthereumJS VM](../vm)
 - Analyze what's in the Ethereum `mainnet` [transaction pool](./lib/sync/txpool.ts)
-- Run experiments on Ethereum browser sync (see [example](./examples/light-browser-sync.md))
+- Run experiments with Ethereum browser sync (see [example](./examples/light-browser-sync.md))
 
 The client has an extremely modular design by building upon central other libraries in the EthereumJS monorepo ([VM](../vm), [Merkle Patricia Tree](../trie), [Blockchain](../blockchain), [Block](../block), [tx](../tx), [devp2p](../devp2p) and [Common](../common)) and is therefore extremely well suited for a deep dive into Ethereum protocol development.
 
@@ -32,13 +32,7 @@ We invite you to explore and would be delighted if you give us feedback on your
 ## INSTALL
 
 ```shell
-npm install @ethereumjs/client // Release during Fall 2021
-```
-
-For the `ethereumjs` CLI command to work run:
-
-```shell
-npm link
+npm install -g @ethereumjs/client // Release during Fall 2021
 ```
 
 As long as there is no up-to-date client release on npm and for development purposes the client can be used like this:

packages/client/bin/cli.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env client
+#!/usr/bin/env node
 
 import { homedir } from 'os'
 import path from 'path'
@@ -33,7 +33,7 @@ const args = require('yargs')
       default: undefined,
     },
     syncmode: {
-      describe: 'Blockchain sync mode',
+      describe: 'Blockchain sync mode (light sync experimental)',
       choices: ['light', 'full'],
       default: Config.SYNCMODE_DEFAULT,
     },
@@ -47,11 +47,11 @@ const args = require('yargs')
       default: `${homedir()}/Library/Ethereum/ethereumjs`,
     },
     customChain: {
-      describe: 'Path to custom chain parameters json file from Common',
+      describe: 'Path to custom chain parameters json file (@ethereumjs/common format)',
       coerce: path.resolve,
     },
     customGenesisState: {
-      describe: 'Path to custom genesis state json file from Common',
+      describe: 'Path to custom genesis state json file (@ethereumjs/common format)',
       coerce: path.resolve,
     },
     gethGenesis: {
@@ -213,6 +213,22 @@ async function run() {
       input: process.stdin,
       output: process.stdout,
     })
+
+    // Hide key input
+    ;(rl as any).input.on('keypress', function () {
+      // get the number of characters entered so far:
+      const len = (rl as any).line.length
+      // move cursor back to the beginning of the input:
+      readline.moveCursor((rl as any).output, -len, 0)
+      // clear everything to the right of the cursor:
+      readline.clearLine((rl as any).output, 1)
+      // replace the original input with asterisks:
+      for (let i = 0; i < len; i++) {
+        // eslint-disable-next-line no-extra-semi
+        ;(rl as any).output.write('*')
+      }
+    })
+
     const question = (text: string) => {
       return new Promise<string>((resolve) => {
         rl.question(text, resolve)
@@ -225,18 +241,21 @@ async function run() {
         const inputKey = await question(
           `Please enter the 0x-prefixed private key to unlock ${address}:\n`
         )
+        ;(rl as any).history = (rl as any).history.slice(1)
         const privKey = toBuffer(inputKey)
         const derivedAddress = Address.fromPrivateKey(privKey)
         if (address.equals(derivedAddress)) {
           accounts.push([address, privKey])
         } else {
-          throw new Error(
+          console.error(
             `Private key does not match for ${address} (address derived: ${derivedAddress})`
           )
+          process.exit()
         }
       }
-    } catch (error) {
-      console.error(`Encountered error unlocking account:\n${error}`)
+    } catch (e: any) {
+      console.error(`Encountered error unlocking account:\n${e.message}`)
+      process.exit()
     }
     rl.close()
   }
@@ -310,12 +329,14 @@ async function run() {
     (args.customChainParams || args.customGenesisState || args.gethGenesis) &&
     (!(args.network === 'mainnet') || args.networkId)
   ) {
-    throw new Error('cannot specify both custom chain parameters and preset network ID')
+    console.error('cannot specify both custom chain parameters and preset network ID')
+    process.exit()
   }
   // Use custom chain parameters file if specified
   if (args.customChain) {
     if (!args.customGenesisState) {
-      throw new Error('cannot have custom chain parameters without genesis state')
+      console.error('cannot have custom chain parameters without genesis state')
+      process.exit()
     }
     try {
       const customChainParams = JSON.parse(readFileSync(args.customChain, 'utf-8'))
@@ -325,7 +346,8 @@ async function run() {
         customChains: [[customChainParams, genesisState]],
       })
     } catch (err: any) {
-      throw new Error(`invalid chain parameters: ${err.message}`)
+      console.error(`invalid chain parameters: ${err.message}`)
+      process.exit()
     }
   } else if (args.gethGenesis) {
     // Use geth genesis parameters file if specified
@@ -346,10 +368,12 @@ async function run() {
 
   if (args.mine) {
     if (common.consensusType() !== ConsensusType.ProofOfAuthority) {
-      throw new Error('Currently mining is only supported for PoA consensus')
+      console.error('Currently mining is only supported for PoA consensus')
+      process.exit()
     }
     if (!args.unlock) {
-      throw new Error('Please provide an account to sign sealed blocks with `--unlock [address]` ')
+      console.error('Please provide an account to sign sealed blocks with `--unlock [address]` ')
+      process.exit()
     }
   }
 

packages/client/package.json

@@ -49,8 +49,8 @@
     "tsc": "../../config/cli/ts-compile.sh"
   },
   "dependencies": {
-    "@ethereumjs/block": "^3.5.0",
-    "@ethereumjs/blockchain": "^5.4.1",
+    "@ethereumjs/block": "^3.5.1",
+    "@ethereumjs/blockchain": "^5.4.2",
     "@ethereumjs/common": "^2.5.0",
     "@ethereumjs/devp2p": "^4.2.0",
     "@ethereumjs/tx": "^3.3.1",

packages/devp2p/package.json

@@ -65,7 +65,7 @@
     "snappyjs": "^0.6.1"
   },
   "devDependencies": {
-    "@ethereumjs/block": "^3.5.0",
+    "@ethereumjs/block": "^3.5.1",
     "@ethereumjs/tx": "^3.3.1",
     "@types/async": "^2.4.1",
     "@types/chalk": "^2.2.0",

packages/ethash/package.json

@@ -31,7 +31,7 @@
     "docs:build": "typedoc --options typedoc.js"
   },
   "dependencies": {
-    "@ethereumjs/block": "^3.5.0",
+    "@ethereumjs/block": "^3.5.1",
     "@types/levelup": "^4.3.0",
     "buffer-xor": "^2.0.1",
     "ethereumjs-util": "^7.1.1",

packages/vm/package.json

@@ -48,8 +48,8 @@
     "tsc": "../../config/cli/ts-compile.sh"
   },
   "dependencies": {
-    "@ethereumjs/block": "^3.5.0",
-    "@ethereumjs/blockchain": "^5.4.1",
+    "@ethereumjs/block": "^3.5.1",
+    "@ethereumjs/blockchain": "^5.4.2",
     "@ethereumjs/common": "^2.5.0",
     "@ethereumjs/tx": "^3.3.1",
     "merkle-patricia-tree": "^4.2.1",