diff options
| author | Le Quoc Viet <vietlq85@gmail.com> | 2018-03-15 16:11:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 16:11:42 +0800 |
| commit | 04079455e36e48433cf8055c8f1f79e1e7e18298 (patch) | |
| tree | d7de2a6603b67b56abacf09bee4d2bbbfe886b8f /app/scripts/popup-core.js | |
| parent | 5bdee96e73f65a0b369277e9c56b0afe5159e65b (diff) | |
| parent | e2efc91aee64072c408ab509219dcbfb389c7609 (diff) | |
| download | tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.tar.gz tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.tar.zst tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.zip | |
Merge pull request #1 from MetaMask/master
Merge from the source
Diffstat (limited to 'app/scripts/popup-core.js')
| -rw-r--r-- | app/scripts/popup-core.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js index f1eb394d7..2e4334bb1 100644 --- a/app/scripts/popup-core.js +++ b/app/scripts/popup-core.js @@ -1,6 +1,7 @@ const EventEmitter = require('events').EventEmitter const async = require('async') const Dnode = require('dnode') +const Eth = require('ethjs') const EthQuery = require('eth-query') const launchMetamaskUi = require('../../ui') const StreamProvider = require('web3-stream-provider') @@ -34,6 +35,7 @@ function setupWeb3Connection (connectionStream) { providerStream.on('error', console.error.bind(console)) global.ethereumProvider = providerStream global.ethQuery = new EthQuery(providerStream) + global.eth = new Eth(providerStream) } function setupControllerConnection (connectionStream, cb) { |