5 files changed, 28 insertions, 10 deletions
diff --git a/mascara/src/background.js b/mascara/src/background.js
index 6f9fb3d13..957570050 100644
--- a/mascara/src/background.js
+++ b/mascara/src/background.js
@@ -8,6 +8,7 @@ const PortStream = require('../../app/scripts/lib/port-stream.js')
 
 const DbController = require('./lib/index-db-controller')
 
+const SwPlatform = require('../../app/scripts/platforms/sw')
 const MetamaskController = require('../../app/scripts/metamask-controller')
 const extension = {} //require('../../app/scripts/lib/extension')
 
@@ -17,7 +18,8 @@ const migrations = require('../../app/scripts/migrations/')
 const firstTimeState = require('../../app/scripts/first-time-state')
 
 const STORAGE_KEY = 'metamask-config'
-const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+// const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+const METAMASK_DEBUG = true
 let popupIsOpen = false
 
 const log = require('loglevel')
@@ -70,7 +72,11 @@ function setupController (initState, client) {
   // MetaMask Controller
   //
 
+  const platform = new SwPlatform()
+
   const controller = new MetamaskController({
+    // platform specific implementation
+    platform,
     // User confirmation callbacks:
     showUnconfirmedMessage: noop,
     unlockAccountMessage: noop,
diff --git a/mascara/src/lib/setup-provider.js b/mascara/src/lib/setup-provider.js
index 4f2432ae4..62335b18d 100644
--- a/mascara/src/lib/setup-provider.js
+++ b/mascara/src/lib/setup-provider.js
@@ -4,14 +4,14 @@ const MetamaskInpageProvider = require('../../../app/scripts/lib/inpage-provider
 module.exports = getProvider
 
 
-function getProvider(){
+function getProvider(opts){
   if (global.web3) {
     console.log('MetaMask ZeroClient - using environmental web3 provider')
     return global.web3.currentProvider
   }
   console.log('MetaMask ZeroClient - injecting zero-client iframe!')
   var iframeStream = setupIframe({
-    zeroClientProvider: 'http://localhost:9001',
+    zeroClientProvider: opts.mascaraUrl,
     sandboxAttributes: ['allow-scripts', 'allow-popups', 'allow-same-origin'],
     container: document.body,
   })
diff --git a/mascara/src/mascara.js b/mascara/src/mascara.js
index 759353c1b..f9bed7e52 100644
--- a/mascara/src/mascara.js
+++ b/mascara/src/mascara.js
@@ -1,15 +1,22 @@
 const Web3 = require('web3')
 const setupProvider = require('./lib/setup-provider.js')
 
+const MASACARA_DOMAIN = 'http://localhost:9001'
+
 //
 // setup web3
 //
-var provider = setupProvider()
-hijackProvider(provider)
+
+var provider = setupProvider({
+  mascaraUrl: MASACARA_DOMAIN + '/proxy/',
+})
+instrumentForUserInteractionTriggers(provider)
+
 var web3 = new Web3(provider)
 web3.setProvider = function(){
   console.log('MetaMask - overrode web3.setProvider')
 }
+
 //
 //
 // export web3
@@ -25,12 +32,12 @@ var shouldPop = false
 window.addEventListener('click', function(){
   if (!shouldPop) return
   shouldPop = false
-  window.open('http://localhost:9001/popup/popup.html', '', 'width=360 height=500')
+  window.open(MASACARA_DOMAIN, '', 'width=360 height=500')
   console.log('opening window...')
 })
 
 
-function hijackProvider(provider){
+function instrumentForUserInteractionTriggers(provider){
   var _super = provider.sendAsync.bind(provider)
   provider.sendAsync = function(payload, cb){
     if (payload.method === 'eth_sendTransaction') {
diff --git a/mascara/src/dapp-connection.js b/mascara/src/proxy.js
index 30680c9d7..e580076c1 100644
--- a/mascara/src/dapp-connection.js
+++ b/mascara/src/proxy.js
@@ -4,7 +4,7 @@ const SwStream = require('sw-stream/lib/sw-stream.js')
 const SetupUntrustedComunication = ('./lib/setup-untrusted-connection.js')
 
 const background = new SWcontroller({
-  fileName: '/popup/sw-build.js',
+  fileName: '/background.js',
 })
 
 const pageStream = new ParentStream()
diff --git a/mascara/src/popup.js b/mascara/src/ui.js
index ef7759a81..c4866867b 100644
--- a/mascara/src/popup.js
+++ b/mascara/src/ui.js
@@ -4,8 +4,13 @@ const SwStream = require('sw-stream/lib/sw-stream.js')
 const MetaMaskUiCss = require('../../ui/css')
 const setupIframe = require('./lib/setup-iframe.js')
 const MetamaskInpageProvider = require('../../app/scripts/lib/inpage-provider.js')
+const MetamascaraPlatform = require('../../app/scripts/platforms/window')
 const startPopup = require('../../app/scripts/popup-core')
 
+// create platform global
+global.platform = new MetamascaraPlatform()
+
+
 var css = MetaMaskUiCss()
 injectCss(css)
 const container = document.getElementById('app-content')
@@ -14,7 +19,7 @@ var name = 'popup'
 window.METAMASK_UI_TYPE = name
 
 const background = new SWcontroller({
-  fileName: '/popup/sw-build.js',
+  fileName: '/background.js',
 })
 
 // Setup listener for when the service worker is read
@@ -33,4 +38,4 @@ background.on('ready', (readSw) => {
 })
 
 background.startWorker()
-console.log('hello from /library/popup.js')
+console.log('hello from MetaMascara ui!')