feat: add support for the merge hardfork (#3971)

Co-authored-by: David Murdoch <[email protected]>
Co-authored-by: David Murdoch <[email protected]>

Author: MicaiahReid

.github/workflows/pr.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [12.0.0, 12.x, 14.x, 16.x, 18.x]
+        node: [14.0.0, 14.x, 16.x, 18.x]
         os: [windows-2019, ubuntu-18.04, ubuntu-20.04, macos-11]
         exclude:
           # Node v18 does not run on ubuntu-18.04: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442

.github/workflows/push.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [12.0.0, 12.x, 14.x, 16.x, 18.x]
+        node: [14.0.0, 14.x, 16.x, 18.x]
         os: [ubuntu-20.04]
 
     runs-on: ${{ matrix.os }}

.nvmrc

@@ -1 +1 @@
-v12.0.0
+v14.0.0

CONTRIBUTING.md

@@ -2,11 +2,11 @@
 
 ## Getting set up
 
-- Use Node.js v12.0.0.
-  - Why v12.0.0? Because this is the first LTS release of Node.js v12 and is the earliest version Ganache supports.
+- Use Node.js v14.0.0.
+  - Why v14.0.0? Because this is the first LTS release of Node.js v14 and is the earliest version Ganache supports.
   - recommendation: use [nvm](https://github.com/nvm-sh/nvm) on Linux and macOS, and [nvm-windows](https://github.com/coreybutler/nvm-windows) on
     Windows, to configure your node version.
-    - On Linux and macOS, if you have `nvm` installed, just run `nvm use` to switch to Node.js v12.0.0.
+    - On Linux and macOS, if you have `nvm` installed, just run `nvm use` to switch to Node.js v14.0.0.
 - `git clone [email protected]:trufflesuite/ganache.git`
 - `cd ganache`
 - `npm install` (use npm v6)
@@ -153,7 +153,7 @@ index 2a2aa9e..57cbf21 100644
 
 These are guidelines, not rules. :-)
 
-- Use Node.js v12.0.0 for most local development.
+- Use Node.js v14.0.0 for most local development.
 - Use `bigint` literals, e.g., `123n`; if the number is externally configurable and/or could exceed
   `Number.MAX_SAFE_INTEGER`.
 - Write tests.

package-lock.json

@@ -3,8 +3,8 @@
   "author": "David Murdoch <[email protected]> (https://davidmurdoch.com)",
   "private": true,
   "engines": {
-    "node": ">=12.0.0",
-    "npm": ">=6.12.0"
+    "node": ">=14.0.0",
+    "npm": ">=6.14.4"
   },
   "scripts": {
     "build": "npm run tsc && cross-env NODE_OPTIONS=--max_old_space_size=4096 lerna run build",
@@ -47,8 +47,8 @@
     "pretty-quick": "3.1.2",
     "semver": "7.3.5",
     "shx": "0.3.3",
-    "ts-node": "10.4.0",
-    "typescript": "4.6.4",
+    "ts-node": "10.9.1",
+    "typescript": "4.7.4",
     "validate-npm-package-name": "3.0.0",
     "yargs": "16.2.0"
   },

package.json

@@ -1,14 +1,15 @@
-import { Data, JsonRpcDataInputArg } from "@ganache/utils";
+import { Address as EJSAddress } from "@ethereumjs/util";
+import { JsonRpcDataInputArg, Data } from "@ganache/utils";
 
-export class Address extends Data {
+export class Address extends EJSAddress {
   static ByteLength = 20;
 
-  constructor(value: string | Buffer) {
-    super(value, Address.ByteLength);
+  constructor(value: Buffer) {
+    super(value);
   }
 
   public static from<T extends string | Buffer = string | Buffer>(value: T) {
-    return new Address(value);
+    return new Address(Data.toBuffer(value, Address.ByteLength));
   }
 
   static toBuffer(value: JsonRpcDataInputArg): Buffer {
@@ -18,4 +19,8 @@ export class Address extends Data {
   static toString(value: JsonRpcDataInputArg): string {
     return Address.from(value).toString();
   }
+
+  toJSON() {
+    return this.toString();
+  }
 }