diff --git a/CHANGELOG.md b/CHANGELOG.md index 343ef0c7e..a3ca430aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Current Master +- [#340](https://github.com/poanetwork/nifty-wallet/pull/340) - (Feature) Update in-page provider (EIP-1193) - [#334](https://github.com/poanetwork/nifty-wallet/pull/334) - (Feature) Ability to set tx value for payable methods - [#333](https://github.com/poanetwork/nifty-wallet/pull/333) - (Fix) Support RSK testnet explorer links - [#332](https://github.com/poanetwork/nifty-wallet/pull/332) - (Chore) Return to main screen from removal of imported account diff --git a/app/scripts/lib/select-chain-id.js b/app/scripts/lib/select-chain-id.js index 8e5228b17..41c2403e6 100644 --- a/app/scripts/lib/select-chain-id.js +++ b/app/scripts/lib/select-chain-id.js @@ -1,17 +1,29 @@ import { - MAINNET_CHAIN_ID, - ROPSTEN_CHAIN_ID, - RINKEBY_CHAIN_ID, - KOVAN_CHAIN_ID, - GOERLI_CHAIN_ID, -} from './enums' + MAINNET_CHAINID, + ROPSTEN_CHAINID, + RINKEBY_CHAINID, + KOVAN_CHAINID, + GOERLI_TESTNET_CHAINID, + POA_CHAINID, + DAI_CHAINID, + POA_SOKOL_CHAINID, + RSK_CHAINID, + RSK_TESTNET_CHAINID, + CLASSIC_CHAINID, +} from '../controllers/network/enums' const standardNetworkId = { - '1': MAINNET_CHAIN_ID, - '3': ROPSTEN_CHAIN_ID, - '4': RINKEBY_CHAIN_ID, - '42': KOVAN_CHAIN_ID, - '5': GOERLI_CHAIN_ID, + '1': MAINNET_CHAINID, + '3': ROPSTEN_CHAINID, + '4': RINKEBY_CHAINID, + '42': KOVAN_CHAINID, + '5': GOERLI_TESTNET_CHAINID, + '99': POA_CHAINID, + '100': DAI_CHAINID, + '77': POA_SOKOL_CHAINID, + '30': RSK_CHAINID, + '31': RSK_TESTNET_CHAINID, + '61': CLASSIC_CHAINID, } function selectChainId (metamaskState) { diff --git a/package-lock.json b/package-lock.json index 1e2231c3e..394885eb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44881,52 +44881,18 @@ "dev": true }, "nifty-wallet-inpage-provider": { - "version": "github:poanetwork/nifty-wallet-inpage-provider#e8af227f73c75642fdcf9be3393db4d3ab858506", - "from": "github:poanetwork/nifty-wallet-inpage-provider#1.2.3", + "version": "github:poanetwork/nifty-wallet-inpage-provider#3cd5e332d1311fcadd05f3b48b049d7cbf657afc", + "from": "github:poanetwork/nifty-wallet-inpage-provider#1.3.0", "requires": { - "json-rpc-engine": "^3.7.4", - "json-rpc-middleware-stream": "^2.0.0", + "eth-json-rpc-errors": "^2.0.2", + "fast-deep-equal": "^2.0.1", + "json-rpc-engine": "^5.1.5", + "json-rpc-middleware-stream": "^2.1.1", "loglevel": "^1.6.1", "obj-multiplex": "^1.0.0", - "obs-store": "^3.0.0", + "obs-store": "^4.0.3", "pump": "^3.0.0", "safe-event-emitter": "^1.0.1" - }, - "dependencies": { - "babelify": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz", - "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=", - "requires": { - "babel-core": "^6.0.14", - "object-assign": "^4.0.0" - } - }, - "json-rpc-engine": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz", - "integrity": "sha512-6QNcvm2gFuuK4TKU1uwfH0Qd/cOSb9c1lls0gbnIhciktIUQJwz6NQNAW4B1KiGPenv7IKu97V222Yo1bNhGuA==", - "requires": { - "async": "^2.0.1", - "babel-preset-env": "^1.7.0", - "babelify": "^7.3.0", - "json-rpc-error": "^2.0.0", - "promise-to-callback": "^1.0.0", - "safe-event-emitter": "^1.0.1" - } - }, - "obs-store": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/obs-store/-/obs-store-3.0.2.tgz", - "integrity": "sha512-GzBr7KM2TYWoJSlF3sVo1cMIOeyxgXpEdegXLZyYONRpunFHsBdKwOba0ki17kN2stLaEwTNolJChGHafqM7Fw==", - "requires": { - "babel-preset-es2015": "^6.22.0", - "babelify": "^7.3.0", - "readable-stream": "^2.2.2", - "through2": "^2.0.3", - "xtend": "^4.0.1" - } - } } }, "nise": { diff --git a/package.json b/package.json index 820633ac8..c5ff79cbf 100644 --- a/package.json +++ b/package.json @@ -156,7 +156,7 @@ "mkdirp": "^0.5.1", "multihashes": "^0.4.12", "nanoid": "^2.1.6", - "nifty-wallet-inpage-provider": "github:poanetwork/nifty-wallet-inpage-provider#1.2.3", + "nifty-wallet-inpage-provider": "github:poanetwork/nifty-wallet-inpage-provider#1.3.0", "nonce-tracker": "^1.0.0", "number-to-bn": "^1.7.0", "obj-multiplex": "^1.0.0",