Skip to content

Commit e7ed552

Browse files
build(deps): bump web3[-*] from 1.2.1 to 1.2.4
Refactor typings as necessary. In order for `bignumber.js` in the root `node_modules` to not conflict with `@types/bignumber.js`, specify `"bignumber.js": "5.0.0"` in `devDependencies` and `"embark-ui/bignumber.js"` in `nohoist` of the root `package.json`. Bump simples from 0.8.8 to 0.9.0-alpha-10 in `packages/embark-blockchain-process/package.json` and refactor `packages/embark-blockchain-process/src/proxy.js`. Drop simples as a dependency in `packages/embark/package.json` since it's not needed there. The upgrade of simples allows embark 4.2.x's proxy to work correctly with geth `>=1.9.1`. Bump ganache-cli from 6.4.3 to 6.7.0 (latest) because 6.4.3 doesn't support `eth_chainId` and since web3 1.2.4 makes use of the `eth_chainId` RPC method (EIP 695). BREAKING CHANGE: bump embark's minimum supported version of geth from `>=1.8.14` to `>=1.9.0` and its minimum supported version of parity from `>=2.0.0` to `>=2.2.1`. This is necessary since web3 1.2.4 makes use of the `eth_chainId` RPC method (EIP 695) and those client versions are the earliest ones to implement it.
1 parent 706e43c commit e7ed552

File tree

40 files changed

+487
-1019
lines changed

40 files changed

+487
-1019
lines changed

dapps/templates/boilerplate/embark.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"buildDir": "dist/",
1010
"config": "config/",
1111
"versions": {
12-
"web3": "1.2.1",
12+
"web3": "1.2.4",
1313
"solc": "0.5.0",
1414
"ipfs-api": "17.2.4"
1515
},

dapps/templates/demo/embark.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"buildDir": "dist/",
1010
"config": "config/",
1111
"versions": {
12-
"web3": "1.2.1",
12+
"web3": "1.2.4",
1313
"solc": "0.5.0",
1414
"ipfs-api": "17.2.4"
1515
},

dapps/tests/app/embark.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"config": "config/",
1717
"versions": {
1818
"solc": "0.4.25",
19-
"web3": "1.2.1",
19+
"web3": "1.2.4",
2020
"ipfs-api": "17.2.7"
2121
},
2222
"plugins": {

dapps/tests/contracts/embark.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"namesystem": "ens.json"
1313
},
1414
"versions": {
15-
"web3": "1.2.1",
15+
"web3": "1.2.4",
1616
"solc": "0.4.24"
1717
},
1818
"plugins": {

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"@babel/preset-typescript": "7.1.0",
1111
"babel-plugin-dynamic-import-node": "2.2.0",
1212
"babel-plugin-macros": "2.4.5",
13+
"bignumber.js": "5.0.0",
1314
"chalk": "2.4.2",
1415
"coveralls": "3.0.2",
1516
"eslint-plugin-react": "7.14.3",
@@ -81,7 +82,8 @@
8182
"embark/embark-test-contract-1",
8283
"embark-dapp-template-demo/bootstrap",
8384
"embark-dapp-test-app/embark-dapp-test-service",
84-
"embark-dapp-test-app/zeppelin-solidity"
85+
"embark-dapp-test-app/zeppelin-solidity",
86+
"embark-ui/bignumber.js"
8587
]
8688
}
8789
}

packages/embark-blockchain-connector/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
"embarkjs": "^4.1.1",
5555
"ethereumjs-tx": "1.3.7",
5656
"ethereumjs-util": "6.0.0",
57-
"ganache-cli": "6.4.3",
58-
"web3": "1.2.1"
57+
"ganache-cli": "6.7.0",
58+
"web3": "1.2.4"
5959
},
6060
"devDependencies": {
6161
"@babel/cli": "7.2.3",

packages/embark-blockchain-listener/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"embark-core": "^4.1.1",
5252
"embark-process-logs-api": "^4.1.1",
5353
"embark-utils": "^4.1.1",
54-
"web3": "1.2.1"
54+
"web3": "1.2.4"
5555
},
5656
"devDependencies": {
5757
"@babel/cli": "7.2.3",

packages/embark-blockchain-process/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"pump": "3.0.0",
6363
"semver": "5.6.0",
6464
"shelljs": "0.8.3",
65-
"simples": "0.8.8",
65+
"simples": "0.9.0-alpha-10",
6666
"stream-json": "1.3.0",
6767
"ws": "7.1.2"
6868
},

packages/embark-blockchain-process/src/gethClient.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const constants = require('embark-core/constants');
99

1010
const DEFAULTS = {
1111
"BIN": "geth",
12-
"VERSIONS_SUPPORTED": ">=1.8.14",
12+
"VERSIONS_SUPPORTED": ">=1.9.0",
1313
"NETWORK_TYPE": "custom",
1414
"NETWORK_ID": 1337,
1515
"RPC_API": ['eth', 'web3', 'net', 'debug', 'personal'],
@@ -392,4 +392,3 @@ class GethClient {
392392
}
393393

394394
module.exports = GethClient;
395-

packages/embark-blockchain-process/src/parityClient.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const constants = require('embark-core/constants');
99

1010
const DEFAULTS = {
1111
"BIN": "parity",
12-
"VERSIONS_SUPPORTED": ">=2.0.0",
12+
"VERSIONS_SUPPORTED": ">=2.2.1",
1313
"NETWORK_TYPE": "dev",
1414
"NETWORK_ID": 17,
1515
"RPC_API": ["web3", "eth", "pubsub", "net", "parity", "private", "parity_pubsub", "traces", "rpc", "shh", "shh_pubsub"],

0 commit comments

Comments
 (0)