Merge pull request #409 from JithinKS97/dependency-upgrades

Dependency upgrades

Author: xaler5

.nvmrc

@@ -1 +1 @@
-14.19.3
+16.18.0

client/package.json

@@ -6,9 +6,9 @@
   "dependencies": {
     "@sentry/react": "^6.8.0",
     "@truffle/contract": "^4.3.15",
-    "bootstrap": "^4.6.0",
+    "bootstrap": "^5.0.0",
     "contracts": "0.1.0",
-    "cross-env": "5.0.5",
+    "cross-env": "7.0.3",
     "devtools-detect": "^3.0.1",
     "highlight.js": "10.7.2-local",
     "html-react-parser": "^3.0.1",
@@ -17,7 +17,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-ga": "^3.3.0",
-    "react-markdown": "^7.0.0",
+    "react-markdown": "^8.0.0",
     "react-redux": "^7.2.4",
     "react-responsive": "^9.0.0-beta.10",
     "react-router": "^5.2.0",
@@ -27,7 +27,7 @@
     "react-sidebar": "^3.0.2",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.3.0",
-    "web3": "1.5.2"
+    "web3": "1.8.0"
   },
   "scripts": {
     "start": "react-scripts start",

client/scripts/deploy_contracts.mjs

@@ -5,8 +5,8 @@ import fs from 'fs';
 import * as ethutil from '../src/utils/ethutil.js';
 import * as constants from '../src/constants.js';
 import HDWalletProvider from '@truffle/hdwallet-provider';
-import * as gamedata from '../src/gamedata/gamedata.json';
-import * as EthernautABI from 'contracts/build/contracts/Ethernaut.sol/Ethernaut.json';
+import * as gamedata from '../src/gamedata/gamedata.json' assert {type: "json"};
+import * as EthernautABI from 'contracts/build/contracts/Ethernaut.sol/Ethernaut.json' assert {type: "json"};
 
 let web3;
 let ethernaut;

client/src/constants.js

@@ -1,6 +1,6 @@
 import dotenv from 'dotenv';
 import pkgWeb3 from 'web3';
-import * as pkgJSON from '../package.json';
+
 dotenv.config()
 
 export const DEBUG = process.env.NODE_ENV !== 'production'
@@ -12,7 +12,7 @@ export const NETWORKS = {
   UNDEFINED: undefined,
   LOCAL: {
     name: 'local',
-    id: '*',
+    id: '1337',
     url: 'http://localhost',
     port: 8545
   },
@@ -53,7 +53,7 @@ export const NETWORKS_INGAME = {
   UNDEFINED: undefined,
   LOCAL: {
     name: 'local',
-    id: '*',
+    id: '1337',
     url: 'http://localhost',
     port: 8545
   },
@@ -118,7 +118,7 @@ export const ADDRESSES = {
 }
 
 // Storage
-export const VERSION = pkgJSON.default.version
+export const VERSION = "0.1.0"
 export const STORAGE_PLAYER_DATA_KEY = `ethernaut_player_data_${VERSION}_`
 
 // Paths
@@ -144,7 +144,7 @@ export const SHOW_VERSION = true
 export const ACTIVE_NETWORK = NETWORKS.LOCAL
 
 let id_to_network = {}
-Object.keys(NETWORKS).filter((network) => NETWORKS[network] && NETWORKS[network].name !== 'local').forEach(network => id_to_network[NETWORKS[network].id] = NETWORKS[network].name)
+Object.keys(NETWORKS).filter((network) => NETWORKS[network] /*&& NETWORKS[network].name !== 'local'*/).forEach(network => id_to_network[NETWORKS[network].id] = NETWORKS[network].name)
 
 
 export const ID_TO_NETWORK = id_to_network

contracts/package.json

@@ -6,13 +6,13 @@
     "@openzeppelin/contracts": "3.2.0",
     "@truffle/hdwallet-provider": "^1.3.0",
     "colors": "^1.4.0",
-    "cross-env": "5.0.5",
+    "cross-env": "7.0.3",
     "ethereumjs-util": "^7.0.10",
     "hardhat": "^2.9.2",
     "openzeppelin-contracts-08": "npm:@openzeppelin/[email protected]",
     "openzeppelin-test-helpers": "^0.5.1",
     "prompt": "^1.1.0",
-    "web3": "^1.3.5"
+    "web3": "1.8.0"
   },
   "devDependencies": {
     "@nomiclabs/hardhat-truffle5": "^2.0.0",