Merge pull request #1267 from nomiclabs/fix-hardhat-network-bugs

Fix Hardhat Network bugs
NomicFoundation · Feb 23, 2021 · ddbb37b · ddbb37b
2 parents b646360 + c6f8cdb
commit ddbb37b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/hardhat-core/src/internal/hardhat-network/jsonrpc/client.ts b/packages/hardhat-core/src/internal/hardhat-network/jsonrpc/client.ts
@@ -22,7 +22,6 @@ import {
 
 export class JsonRpcClient {
   private _cache: Map<string, any> = new Map();
-  private _scopedForkCacheFolderCreated?: boolean;
 
   constructor(
     private _httpProvider: HttpProvider,
@@ -429,11 +428,7 @@ export class JsonRpcClient {
   ) {
     const requestPath = this._getDiskCachePathForKey(forkCachePath, cacheKey);
 
-    if (this._scopedForkCacheFolderCreated !== true) {
-      this._scopedForkCacheFolderCreated = true;
-      await fsExtra.ensureDir(path.dirname(requestPath));
-    }
-
+    await fsExtra.ensureDir(path.dirname(requestPath));
     await fsExtra.writeJSON(requestPath, rawResult, {
       encoding: "utf8",
     });

diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/node.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/node.ts
@@ -1,7 +1,7 @@
 import VM from "@nomiclabs/ethereumjs-vm";
 import Bloom from "@nomiclabs/ethereumjs-vm/dist/bloom";
 import { EVMResult, ExecResult } from "@nomiclabs/ethereumjs-vm/dist/evm/evm";
-import { ERROR } from "@nomiclabs/ethereumjs-vm/dist/exceptions";
+import { ERROR, VmError } from "@nomiclabs/ethereumjs-vm/dist/exceptions";
 import { RunBlockResult } from "@nomiclabs/ethereumjs-vm/dist/runBlock";
 import { StateManager } from "@nomiclabs/ethereumjs-vm/dist/state";
 import chalk from "chalk";
@@ -931,6 +931,13 @@ export class HardhatNode extends EventEmitter {
 
     const error = vmResult.exceptionError;
 
+    // If this is an internal VM error, or a different kind of error was
+    // thrown, we just rethrow. An example of a non-VmError being thrown here
+    // is an HTTP error coming from the ForkedStateManager.
+    if (!(error instanceof VmError) || error.error === ERROR.INTERNAL_ERROR) {
+      throw error;
+    }
+
     if (error.error === ERROR.OUT_OF_GAS) {
       if (this._isContractTooLargeStackTrace(stackTrace)) {
         return encodeSolidityStackTrace(