Fix hardhat-deploy compatibility (#647)

* Change to modify network object instead of replace

* Bump hardhat version

package.json

@@ -53,7 +53,7 @@
     "@truffle/contract": "^4.0.36",
     "buidler-gas-reporter": "^0.1.3",
     "decache": "^4.5.1",
-    "hardhat": "^2.0.7",
+    "hardhat": "^2.5.0",
     "hardhat-gas-reporter": "^1.0.1",
     "mocha": "5.2.0",
     "nyc": "^14.1.1",
@@ -61,4 +61,4 @@
     "truffle": "5.0.31",
     "truffle-config": "^1.1.18"
   }
-}
+}

plugins/resources/nomiclabs.utils.js

@@ -133,12 +133,12 @@ function configureNetworkEnv(env, networkName, networkConfig, provider, isHardha
   env.config.networks[networkName] = networkConfig;
   env.config.defaultNetwork = networkName;
 
-  env.network = {
+  env.network = Object.assign(env.network, {
     name: networkName,
     config: networkConfig,
     provider: provider,
     isHardhatEVM: isHardhatEVM
-  }
+  });
 
   env.ethereum = provider;