mascara - rename things + break out mascara asset server

1 files changed, 11 insertions, 4 deletions

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') {