Skip to content

Dependency upgrades #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 17, 2022
Merged

Dependency upgrades #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0de6fc5
Upgrading node version from 14.19.3 to 16.0.0
Oct 14, 2022
5bd3905
Upgraded web3 from 1.5.2 to 1.8.0
Oct 14, 2022
301b56c
Upgraded bootstrap from 4.6.0 to 5.0.0
Oct 14, 2022
2088f55
Upgraded cross-env from 5.0.5 to 7.0.3
Oct 14, 2022
a59e0db
Upgraded react-markdown from 7.0.0 to 8.0.0
Oct 14, 2022
9da582a
updating node from 16.0.0 to 16.18.0
Oct 14, 2022
e1f2fec
adapt to new node version json import assertion
xaler5 Oct 17, 2022
fa30cfe
Merge pull request #5 from OpenZeppelin/dependency-upgrades
JithinKS97 Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.19.3
16.18.0
8 changes: 4 additions & 4 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions client/scripts/deploy_contracts.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions client/src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -12,7 +12,7 @@ export const NETWORKS = {
UNDEFINED: undefined,
LOCAL: {
name: 'local',
id: '*',
id: '1337',
url: 'http://localhost',
port: 8545
},
Expand Down Expand Up @@ -53,7 +53,7 @@ export const NETWORKS_INGAME = {
UNDEFINED: undefined,
LOCAL: {
name: 'local',
id: '*',
id: '1337',
url: 'http://localhost',
port: 8545
},
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading