diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-12 17:22:23 +0800 |
---|---|---|
committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-12 17:22:23 +0800 |
commit | 7eb6dae4185d083ebb967256fdd09203b5092480 (patch) | |
tree | 46d2d7b845e4e54bdb9d5e6028601b7516dc5928 /app/scripts | |
parent | 836bf2e1a38bb6917f1b7fe9db0604c8143c7adf (diff) | |
download | tangerine-wallet-browser-7eb6dae4185d083ebb967256fdd09203b5092480.tar tangerine-wallet-browser-7eb6dae4185d083ebb967256fdd09203b5092480.tar.gz tangerine-wallet-browser-7eb6dae4185d083ebb967256fdd09203b5092480.tar.bz2 tangerine-wallet-browser-7eb6dae4185d083ebb967256fdd09203b5092480.tar.lz tangerine-wallet-browser-7eb6dae4185d083ebb967256fdd09203b5092480.tar.xz tangerine-wallet-browser-7eb6dae4185d083ebb967256fdd09203b5092480.tar.zst tangerine-wallet-browser-7eb6dae4185d083ebb967256fdd09203b5092480.zip |
Added signTokenTx; Adding token confirmation screen
Diffstat (limited to 'app/scripts')
-rw-r--r-- | app/scripts/popup-core.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js index f1eb394d7..94ba141bc 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) { @@ -47,6 +49,7 @@ function setupControllerConnection (connectionStream, cb) { }) connectionStream.pipe(accountManagerDnode).pipe(connectionStream) accountManagerDnode.once('remote', function (accountManager) { + console.log({ accountManager }) // setup push events accountManager.on = eventEmitter.on.bind(eventEmitter) cb(null, accountManager) |