aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/background.js
diff options
context:
space:
mode:
authorPhyrexTsai <x01ep23i@hotmail.com>2018-07-04 09:06:10 +0800
committerGitHub <noreply@github.com>2018-07-04 09:06:10 +0800
commitf38dc03b27a457733315cbb16d59d0ea339505da (patch)
tree77cfdf13c0e83c8e6d87099bfedddc3d58667de1 /app/scripts/background.js
parent11736e6318182ab5b43430410a46059e5f46ad52 (diff)
parent13b03ec090df70512d43e0d6acbe6bf60040a892 (diff)
downloadtangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.gz
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.bz2
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.lz
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.xz
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.zst
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.zip
Merge pull request #4 from brunobar79/portal-metamask-lint-fix
Lint fix for Integration ENS with IPFS
Diffstat (limited to 'app/scripts/background.js')
-rw-r--r--app/scripts/background.js17
1 files changed, 9 insertions, 8 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 610409975..1479d9f72 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -16,6 +16,7 @@ const ExtensionPlatform = require('./platforms/extension')
const Migrator = require('./lib/migrator/')
const migrations = require('./migrations/')
const PortStream = require('./lib/port-stream.js')
+const createStreamSink = require('./lib/createStreamSink')
const NotificationManager = require('./lib/notification-manager.js')
const MetamaskController = require('./metamask-controller')
const firstTimeState = require('./first-time-state')
@@ -68,7 +69,6 @@ initialize().catch(log.error)
setupMetamaskMeshMetrics()
-
/**
* An object representing a transaction, in whatever state it is in.
* @typedef TransactionMeta
@@ -279,7 +279,7 @@ function setupController (initState, initLangCode) {
asStream(controller.store),
debounce(1000),
storeTransform(versionifyData),
- storeTransform(persistData),
+ createStreamSink(persistData),
(error) => {
log.error('MetaMask - Persistence pipeline failed', error)
}
@@ -295,7 +295,7 @@ function setupController (initState, initLangCode) {
return versionedData
}
- function persistData (state) {
+ async function persistData (state) {
if (!state) {
throw new Error('MetaMask - updated state is missing', state)
}
@@ -303,12 +303,13 @@ function setupController (initState, initLangCode) {
throw new Error('MetaMask - updated state does not have data', state)
}
if (localStore.isSupported) {
- localStore.set(state)
- .catch((err) => {
+ try {
+ await localStore.set(state)
+ } catch (err) {
+ // log error so we dont break the pipeline
log.error('error setting state in local store:', err)
- })
+ }
}
- return state
}
//
@@ -382,7 +383,7 @@ function setupController (initState, initLangCode) {
}
// communication with page or other extension
- function connectExternal(remotePort) {
+ function connectExternal (remotePort) {
const originDomain = urlUtil.parse(remotePort.sender.url).hostname
const portStream = new PortStream(remotePort)
controller.setupUntrustedCommunication(portStream, originDomain)