fix rebase bugs

oasislabs · Jun 13, 2023 · 0a13029 · 0a13029
1 parent 6df1195
commit 0a13029
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/packages/hardhat-core/package.json b/packages/hardhat-core/package.json
@@ -22,6 +22,9 @@
   "engines": {
     "node": ">=14.0.0"
   },
+  "bin": {
+    "hardhat": "internal/cli/bootstrap.js"
+  },
   "scripts": {
     "lint": "yarn prettier --check && yarn eslint",
     "lint:fix": "yarn prettier --write && yarn eslint --fix",
@@ -85,11 +88,7 @@
     "eslint-plugin-import": "2.24.1",
     "eslint-plugin-no-only-tests": "3.0.0",
     "eslint-plugin-prettier": "3.4.0",
-<<<<<<< HEAD
     "ethers": "^6.1.0",
-    "ethers-v5": "npm:ethers@5",
-=======
->>>>>>> 1bda760f2 (add signedCall verification and return zero for getStorage)
     "mocha": "^10.0.0",
     "prettier": "2.4.1",
     "rimraf": "^3.0.2",
@@ -131,7 +130,7 @@
     "env-paths": "^2.2.0",
     "ethereum-cryptography": "^1.0.3",
     "ethereumjs-abi": "^0.6.8",
-    "ethers": "^5.0.0",
+    "ethers-v5": "npm:ethers@5",
     "find-up": "^2.1.0",
     "fp-ts": "1.19.3",
     "fs-extra": "^7.0.1",

diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/modules/eth.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/modules/eth.ts
@@ -15,7 +15,7 @@ import {
 import * as t from "io-ts";
 import cloneDeep from "lodash/cloneDeep";
 import * as cbor from "cborg";
-import * as ethers from "ethers";
+import * as ethers from "ethers-v5";
 import { _TypedDataEncoder } from "@ethersproject/hash";
 import { cipher, signedCalls } from "@oasisprotocol/sapphire-paratime";
 import { hexlify } from "@ethersproject/bytes";

diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/modules/web3.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/modules/web3.ts
@@ -34,9 +34,7 @@ export class Web3Module {
   }
 
   private async _clientVersionAction(): Promise<string> {
-    const hardhatPackage = await getPackageJson();
-    const ethereumjsVMPackage = require("@oasislabs/ethereumjs-vm/package.json");
-    return `HardhatNetwork/${hardhatPackage.version}/@oasislabs/ethereumjs-vm/${ethereumjsVMPackage.version}`;
+    return this._node.getClientVersion();
   }
 
   // web3_sha3

diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/provider.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/provider.ts
@@ -103,7 +103,7 @@ export class HardhatNetworkProvider
   constructor(
     private readonly _config: HardhatNetworkProviderConfig,
     private readonly _logger: ModulesLogger,
-    private readonly _artifacts?: Artifacts
+    private readonly _artifacts?: Artifacts,
     private readonly _genesisAccounts: GenesisAccount[] = [],
     private readonly _allowUnlimitedContractSize = false,
     private readonly _initialDate?: Date,