Merge branch 'update-ethereumjs' of github.com:trufflesuite/ganache into update-ethereumjs

Author: davidmurdoch

src/chains/ethereum/ethereum/tests/tet.js

@@ -0,0 +1,10 @@
+const { copySync, readdir, remove } = require("fs-extra");
+const tmp = require("tmp-promise");
+const { join, normalize } = require("path");
+const ganache = require("../../../../packages/ganache/lib/index.js");
+(async function () {
+  const originalDbPath = join(__dirname, "databases", "vNull");
+  const dbPath = normalize((await tmp.dir()).path);
+  console.log(dbPath);
+  copySync(originalDbPath, dbPath); // use a copy of the test db
+})();

src/chains/filecoin/filecoin/package.json

@@ -47,7 +47,6 @@
     "tooling"
   ],
   "dependencies": {
-    "ipfs": "0.52.3",
     "ipfs-http-server": "0.1.4",
     "ipld-dag-cbor": "0.17.0",
     "leveldown": "6.1.0",

src/chains/filecoin/filecoin/src/blockchain.ts

@@ -25,7 +25,7 @@ import { Ticket } from "./things/ticket";
 import { FileRef } from "./things/file-ref";
 import fs from "fs";
 import path from "path";
-import { CID as IPFS_CID } from "ipfs";
+declare const ipfs: any;
 import { Account } from "./things/account";
 import Database from "./database";
 import TipsetManager from "./data-managers/tipset-manager";
@@ -757,7 +757,7 @@ export default class Blockchain extends Emittery<BlockchainEvents> {
         );
       }
 
-      const chunks = this.ipfsServer.node.files.read(new IPFS_CID(cid), {
+      const chunks = this.ipfsServer.node.files.read(new (this as any)(cid), {
         timeout: 500 // Enforce a timeout; otherwise will hang if CID not found
       });
 

src/chains/filecoin/filecoin/src/ipfs-server.ts

@@ -1,7 +1,7 @@
 import path from "path";
 import fs from "fs";
 
-import { IPFS, create as createIPFS } from "ipfs";
+declare const ipfs: any;
 import IPFSHttpServer from "ipfs-http-server";
 import { FilecoinInternalOptions } from "@ganache/filecoin-options";
 
@@ -18,7 +18,7 @@ type IPFSHttpServer = {
 class IPFSServer {
   public readonly options: IPFSChainOptions;
 
-  public node: IPFS | null;
+  public node: any | null;
 
   private httpServer: IPFSHttpServer | null;
 
@@ -34,7 +34,7 @@ class IPFSServer {
       await fs.promises.mkdir(folder);
     }
 
-    this.node = await createIPFS({
+    this.node = await (this as any)({
       repo: folder,
       config: {
         Addresses: {

src/chains/filecoin/filecoin/src/things/serializable-object.ts

@@ -2,7 +2,7 @@ import { SerializableLiteral } from "./serializable-literal";
 import deepEqual from "deep-equal";
 import { CID } from "./cid";
 import cbor from "borc";
-import { CID as IPFS_CID } from "ipfs";
+declare const ipfs: any;
 import multihashing from "multihashing";
 import multicodec from "multicodec";
 
@@ -106,7 +106,8 @@ interface Serializable<C> {
 }
 
 abstract class SerializableObject<C extends BaseConfig>
-  implements Serializable<SerializedObject<C>> {
+  implements Serializable<SerializedObject<C>>
+{
   protected abstract get config(): Definitions<C>;
 
   // The constructor can take in a serialized object, or a deserialized one.
@@ -127,9 +128,9 @@ abstract class SerializableObject<C extends BaseConfig>
     const deserializedInput: PropertyType<C, N> | undefined = (options as any)[
       valueConfig.deserializedName
     ];
-    const serializedInput:
-      | SerializedPropertyType<C, N>
-      | undefined = (options as any)[valueConfig.serializedName];
+    const serializedInput: SerializedPropertyType<C, N> | undefined = (
+      options as any
+    )[valueConfig.serializedName];
 
     if (typeof deserializedInput !== "undefined") {
       return deserializedInput;
@@ -193,7 +194,7 @@ abstract class SerializableObject<C extends BaseConfig>
     // but it was async, which caused a number of issues during object construction.
     const cborBuffer = cbor.encode(this.serialize());
     const multihash = multihashing(cborBuffer, "blake2b-256");
-    const rawCid = new IPFS_CID(
+    const rawCid = new (this as any)(
       1,
       multicodec.print[multicodec.DAG_CBOR],
       multihash