diff options
| author | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-19 18:59:13 +0800 |
|---|---|---|
| committer | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-19 18:59:32 +0800 |
| commit | b51b9be37d01ba9651a4250bc2e7ba0809a81c27 (patch) | |
| tree | 332039ad3508bdf1e4c4b5472b2b0b0e9d992c54 | |
| parent | 3d262ae6083e5d1c24cac0fc41e488fbf5a98a52 (diff) | |
| download | dexon-wallet-b51b9be37d01ba9651a4250bc2e7ba0809a81c27.tar.gz dexon-wallet-b51b9be37d01ba9651a4250bc2e7ba0809a81c27.tar.zst dexon-wallet-b51b9be37d01ba9651a4250bc2e7ba0809a81c27.zip | |
Fix blockNumber converter
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 6 | ||||
| -rw-r--r-- | package.json | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 220aeb2a..4c059c71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Develop Branch +## 1.2.3 Wed Dec 19 2018 + ## 1.2.2 Wed Dec 12 2018 ## 1.2.1 Tue Dec 11 2018 diff --git a/app/manifest.json b/app/manifest.json index d87e35f9..8a968c93 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "1.2.2", + "version": "1.2.3", "manifest_version": 2, "author": "https://dexon.org", "description": "__MSG_appDescription__", diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 471a6e80..8054f678 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -14,8 +14,8 @@ const AccountTracker = require('./lib/account-tracker') const RpcEngine = require('json-rpc-engine') const debounce = require('debounce') const createEngineStream = require('json-rpc-middleware-stream/engineStream') -const createFilterMiddleware = require('eth-json-rpc-filters') -const createSubscriptionManager = require('eth-json-rpc-filters/subscriptionManager') +const createFilterMiddleware = require('@dexon-foundation/eth-json-rpc-filters') +const createSubscriptionManager = require('@dexon-foundation/eth-json-rpc-filters/subscriptionManager') const createOriginMiddleware = require('./lib/createOriginMiddleware') const createLoggerMiddleware = require('./lib/createLoggerMiddleware') const createProviderMiddleware = require('./lib/createProviderMiddleware') @@ -1520,7 +1520,7 @@ module.exports = class MetamaskController extends EventEmitter { * @param {string} nickname - Optional nickname of the selected network. * @returns {Promise<String>} - The RPC Target URL confirmed. */ - async setCustomRpc(rpcTarget, chainId, ticker = 'DXN', nickname = '') { + async setCustomRpc (rpcTarget, chainId, ticker = 'DXN', nickname = '') { this.networkController.setRpcTarget(rpcTarget, chainId, ticker, nickname) await this.preferencesController.addToFrequentRpcList(rpcTarget, chainId, ticker, nickname) return rpcTarget diff --git a/package.json b/package.json index 011e1148..c53cbd96 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "@sentry/browser": "^4.1.1", "@dexon-foundation/dekusan-inpage-provider": "^1.2.3", "@dexon-foundation/dexon-keyring-controller": "^4.0.0", + "@dexon-foundation/eth-json-rpc-filters": "^3.0.1", "@dexon-foundation/jazzicon": "^2.0.0", "@material-ui/core": "^3.1.0", "@zxing/library": "^0.8.0", @@ -119,7 +120,6 @@ "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", "eth-ens-namehash": "^2.0.8", "eth-hd-keyring": "^1.2.2", - "eth-json-rpc-filters": "^3.0.1", "eth-json-rpc-infura": "^3.0.0", "eth-keyring-controller": "^3.3.1", "eth-ledger-bridge-keyring": "^0.1.1", |