From f0218bdbbbc54bc5b495d813cf295da18000d136 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Wed, 10 Jul 2019 16:31:48 -0230
Subject: Rename accountManager usages (#6790)

Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
---
 app/scripts/popup-core.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/scripts/popup-core.js')

diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index e964d001d..c08e9fa24 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -19,7 +19,7 @@ function initializePopup ({ container, connectionStream }, cb) {
   // setup app
   async.waterfall([
     (cb) => connectToAccountManager(connectionStream, cb),
-    (accountManager, cb) => launchMetamaskUi({ container, accountManager }, cb),
+    (backgroundConnection, cb) => launchMetamaskUi({ container, backgroundConnection }, cb),
   ], cb)
 }
 
@@ -63,15 +63,15 @@ function setupControllerConnection (connectionStream, cb) {
   // this is a really sneaky way of adding EventEmitter api
   // to a bi-directional dnode instance
   const eventEmitter = new EventEmitter()
-  const accountManagerDnode = Dnode({
+  const backgroundDnode = Dnode({
     sendUpdate: function (state) {
       eventEmitter.emit('update', state)
     },
   })
-  connectionStream.pipe(accountManagerDnode).pipe(connectionStream)
-  accountManagerDnode.once('remote', function (accountManager) {
+  connectionStream.pipe(backgroundDnode).pipe(connectionStream)
+  backgroundDnode.once('remote', function (backgroundConnection) {
     // setup push events
-    accountManager.on = eventEmitter.on.bind(eventEmitter)
-    cb(null, accountManager)
+    backgroundConnection.on = eventEmitter.on.bind(eventEmitter)
+    cb(null, backgroundConnection)
   })
 }
-- 
cgit 


From e9a63d5d5b428e8ace6423652d8691205bb129f0 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Thu, 1 Aug 2019 10:54:33 -0230
Subject: Default Privacy Mode to ON, allow force sharing address (#6904)

---
 app/scripts/popup-core.js | 77 -----------------------------------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 app/scripts/popup-core.js

(limited to 'app/scripts/popup-core.js')

diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
deleted file mode 100644
index c08e9fa24..000000000
--- a/app/scripts/popup-core.js
+++ /dev/null
@@ -1,77 +0,0 @@
-const {EventEmitter} = require('events')
-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')
-const {setupMultiplex} = require('./lib/stream-utils.js')
-
-module.exports = initializePopup
-
-/**
- * Asynchronously initializes the MetaMask popup UI
- *
- * @param {{ container: Element, connectionStream: * }} config Popup configuration object
- * @param {Function} cb Called when initialization is complete
- */
-function initializePopup ({ container, connectionStream }, cb) {
-  // setup app
-  async.waterfall([
-    (cb) => connectToAccountManager(connectionStream, cb),
-    (backgroundConnection, cb) => launchMetamaskUi({ container, backgroundConnection }, cb),
-  ], cb)
-}
-
-/**
- * Establishes streamed connections to background scripts and a Web3 provider
- *
- * @param {PortDuplexStream} connectionStream PortStream instance establishing a background connection
- * @param {Function} cb Called when controller connection is established
- */
-function connectToAccountManager (connectionStream, cb) {
-  // setup communication with background
-  // setup multiplexing
-  const mx = setupMultiplex(connectionStream)
-  // connect features
-  setupControllerConnection(mx.createStream('controller'), cb)
-  setupWeb3Connection(mx.createStream('provider'))
-}
-
-/**
- * Establishes a streamed connection to a Web3 provider
- *
- * @param {PortDuplexStream} connectionStream PortStream instance establishing a background connection
- */
-function setupWeb3Connection (connectionStream) {
-  const providerStream = new StreamProvider()
-  providerStream.pipe(connectionStream).pipe(providerStream)
-  connectionStream.on('error', console.error.bind(console))
-  providerStream.on('error', console.error.bind(console))
-  global.ethereumProvider = providerStream
-  global.ethQuery = new EthQuery(providerStream)
-  global.eth = new Eth(providerStream)
-}
-
-/**
- * Establishes a streamed connection to the background account manager
- *
- * @param {PortDuplexStream} connectionStream PortStream instance establishing a background connection
- * @param {Function} cb Called when the remote account manager connection is established
- */
-function setupControllerConnection (connectionStream, cb) {
-  // this is a really sneaky way of adding EventEmitter api
-  // to a bi-directional dnode instance
-  const eventEmitter = new EventEmitter()
-  const backgroundDnode = Dnode({
-    sendUpdate: function (state) {
-      eventEmitter.emit('update', state)
-    },
-  })
-  connectionStream.pipe(backgroundDnode).pipe(connectionStream)
-  backgroundDnode.once('remote', function (backgroundConnection) {
-    // setup push events
-    backgroundConnection.on = eventEmitter.on.bind(eventEmitter)
-    cb(null, backgroundConnection)
-  })
-}
-- 
cgit