diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-07-29 10:29:28 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-29 10:29:28 +0800 |
commit | 591fe3f9be46ee53a7e9ad841347fee87aae7e50 (patch) | |
tree | d3336e17bd74fcf0c4b6edbc194b28ec37abe644 /app | |
parent | 0b4124874343ce8bee6a27efa9a8c3b43a47fb2b (diff) | |
parent | 6151339840b9d05b170d39c2b2f6c195a93d03c9 (diff) | |
download | tangerine-wallet-browser-591fe3f9be46ee53a7e9ad841347fee87aae7e50.tar tangerine-wallet-browser-591fe3f9be46ee53a7e9ad841347fee87aae7e50.tar.gz tangerine-wallet-browser-591fe3f9be46ee53a7e9ad841347fee87aae7e50.tar.bz2 tangerine-wallet-browser-591fe3f9be46ee53a7e9ad841347fee87aae7e50.tar.lz tangerine-wallet-browser-591fe3f9be46ee53a7e9ad841347fee87aae7e50.tar.xz tangerine-wallet-browser-591fe3f9be46ee53a7e9ad841347fee87aae7e50.tar.zst tangerine-wallet-browser-591fe3f9be46ee53a7e9ad841347fee87aae7e50.zip |
Merge pull request #498 from MetaMask/AddEthClassic
Add eth classic
Diffstat (limited to 'app')
-rw-r--r-- | app/scripts/chromereload.js | 1 | ||||
-rw-r--r-- | app/scripts/config.js | 2 | ||||
-rw-r--r-- | app/scripts/lib/config-manager.js | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/scripts/chromereload.js b/app/scripts/chromereload.js index cd85a8114..88333ba8a 100644 --- a/app/scripts/chromereload.js +++ b/app/scripts/chromereload.js @@ -30,7 +30,6 @@ // } // }; -const extension = require('./lib/extension') window.LiveReloadOptions = { host: 'localhost' }; (function e (t, n, r) { function s (o, u) { if (!n[o]) { if (!t[o]) { var a = typeof require === 'function' && require; if (!u && a) return a(o, !0); if (i) return i(o, !0); var f = new Error("Cannot find module '" + o + "'"); throw f.code = 'MODULE_NOT_FOUND', f } var l = n[o] = {exports: {}}; t[o][0].call(l.exports, function (e) { var n = t[o][1][e]; return s(n ? n : e) }, l, l.exports, e, t, n, r) } return n[o].exports } var i = typeof require === 'function' && require; for (var o = 0; o < r.length; o++)s(r[o]); return s })({1: [function (require, module, exports) { diff --git a/app/scripts/config.js b/app/scripts/config.js index f26e6778d..5f6ffd936 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -1,12 +1,14 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/' const TESTNET_RPC_URL = 'https://morden.infura.io/' const DEFAULT_RPC_URL = TESTNET_RPC_URL +const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/' module.exports = { network: { default: DEFAULT_RPC_URL, mainnet: MAINET_RPC_URL, testnet: TESTNET_RPC_URL, + classic: CLASSIC_RPC_URL, }, } diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index d7df5343b..727cd46fc 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -4,6 +4,7 @@ const migrations = require('./migrations') const TESTNET_RPC = MetamaskConfig.network.testnet const MAINNET_RPC = MetamaskConfig.network.mainnet +const CLASSIC_RPC = MetamaskConfig.network.classic /* The config-manager is a convenience object * wrapping a pojo-migrator. @@ -144,6 +145,9 @@ ConfigManager.prototype.getCurrentRpcAddress = function () { case 'testnet': return TESTNET_RPC + case 'classic': + return CLASSIC_RPC + default: return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC } |