From abfc5632efcc72b3ad45ec1df8bf5889f75a8472 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Wed, 10 Aug 2016 10:54:55 -0700
Subject: Fix ether warning checkbox.

---
 app/scripts/lib/config-manager.js  | 8 ++++++--
 app/scripts/metamask-controller.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 727cd46fc..3d84edfd0 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -274,9 +274,13 @@ ConfigManager.prototype.getConfirmed = function () {
   return ('isConfirmed' in data) && data.isConfirmed
 }
 
-ConfigManager.prototype.setShouldntShowWarning = function (confirmed) {
+ConfigManager.prototype.setShouldntShowWarning = function () {
   var data = this.getData()
-  data.isEthConfirmed = confirmed
+  if (data.isEthConfirmed) {
+    data.isEthConfirmed = !data.isEthConfirmed
+  } else {
+    data.isEthConfirmed = true    
+  }
   this.setData(data)
 }
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index dd43ac2fc..e7e96a472 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -243,7 +243,7 @@ module.exports = class MetamaskController {
 
   agreeToEthWarning (cb) {
     try {
-      this.configManager.setShouldntShowWarning(true)
+      this.configManager.setShouldntShowWarning()
       cb()
     } catch (e) {
       cb(e)
-- 
cgit 


From 3417c421c8c5a73d363a724613145807bdbee354 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 11 Aug 2016 13:23:49 -0700
Subject: inpage-provider - remove createSyncProvider, just fail

---
 app/scripts/lib/inpage-provider.js | 43 +++-----------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index e387be895..5e8b240bc 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -1,9 +1,7 @@
-const HttpProvider = require('web3/lib/web3/httpprovider')
 const Streams = require('mississippi')
 const ObjectMultiplex = require('./obj-multiplex')
 const StreamProvider = require('web3-stream-provider')
 const RemoteStore = require('./remote-store.js').RemoteStore
-const MetamaskConfig = require('../config.js')
 
 module.exports = MetamaskInpageProvider
 
@@ -27,13 +25,6 @@ function MetamaskInpageProvider (connectionStream) {
   })
   self.publicConfigStore = publicConfigStore
 
-  // connect to sync provider
-  self.syncProvider = createSyncProvider(publicConfigStore.get('provider'))
-  // subscribe to publicConfig to update the syncProvider on change
-  publicConfigStore.subscribe(function (state) {
-    self.syncProvider = createSyncProvider(state.provider)
-  })
-
   // connect to async provider
   var asyncProvider = new StreamProvider()
   Streams.pipe(asyncProvider, multiStream.createStream('provider'), asyncProvider, function (err) {
@@ -65,9 +56,10 @@ MetamaskInpageProvider.prototype.send = function (payload) {
       result = selectedAddress || '0x0000000000000000000000000000000000000000'
       break
 
-    // fallback to normal rpc
+    // throw not-supported Error
     default:
-      return self.syncProvider.send(payload)
+      var message = 'The MetaMask Web3 object does not support synchronous methods. See https://github.com/MetaMask/faq#all-async---think-of-metamask-as-a-light-client for details.'
+      throw new Error(message)
 
   }
 
@@ -89,35 +81,6 @@ MetamaskInpageProvider.prototype.isConnected = function () {
 
 // util
 
-function createSyncProvider (providerConfig) {
-  providerConfig = providerConfig || {}
-  let syncProviderUrl
-
-  if (providerConfig.rpcTarget) {
-    syncProviderUrl = providerConfig.rpcTarget
-  } else {
-    switch (providerConfig.type) {
-      case 'testnet':
-        syncProviderUrl = MetamaskConfig.network.testnet
-        break
-      case 'mainnet':
-        syncProviderUrl = MetamaskConfig.network.mainnet
-        break
-      default:
-        syncProviderUrl = MetamaskConfig.network.default
-    }
-  }
-
-  const provider = new HttpProvider(syncProviderUrl)
-  // Stubbing out the send method to throw on sync methods:
-  provider.send = function() {
-    var message = 'The MetaMask Web3 object does not support synchronous methods. See https://github.com/MetaMask/faq#all-async---think-of-metamask-as-a-light-client for details.'
-    throw new Error(message)
-  }
-
-  return provider
-}
-
 function remoteStoreWithLocalStorageCache (storageKey) {
   // read local cache
   var initState = JSON.parse(localStorage[storageKey] || '{}')
-- 
cgit 


From 53b1334d37c2792e76e2a114acb3e7b47399e8aa Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 11 Aug 2016 13:31:00 -0700
Subject: clean -formatting

---
 app/scripts/lib/inpage-provider.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index 5e8b240bc..e9e0ccf00 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -39,9 +39,9 @@ function MetamaskInpageProvider (connectionStream) {
 
 MetamaskInpageProvider.prototype.send = function (payload) {
   const self = this
+  
   let selectedAddress
-
-  var result = null
+  let result = null
   switch (payload.method) {
 
     case 'eth_accounts':
-- 
cgit 


From 9904b4ef5a3d942c97e0585a9f1e4a5ddc7de8e6 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Thu, 11 Aug 2016 13:59:14 -0700
Subject: Add ability to hide logging messages in production.

---
 app/scripts/config.js              | 3 ++-
 app/scripts/metamask-controller.js | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/config.js b/app/scripts/config.js
index 5f6ffd936..297a3a7a0 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -2,6 +2,7 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/'
 const TESTNET_RPC_URL = 'https://morden.infura.io/'
 const DEFAULT_RPC_URL = TESTNET_RPC_URL
 const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/'
+const DEVELOPMENT_MODE = true
 
 module.exports = {
   network: {
@@ -10,5 +11,5 @@ module.exports = {
     testnet: TESTNET_RPC_URL,
     classic: CLASSIC_RPC_URL,
   },
+  developmentMode: DEVELOPMENT_MODE
 }
-
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index dd43ac2fc..a5c167223 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -7,6 +7,7 @@ const HostStore = require('./lib/remote-store.js').HostStore
 const Web3 = require('web3')
 const ConfigManager = require('./lib/config-manager')
 const extension = require('./lib/extension')
+const developmentMode = require('./config').developmentMode
 
 module.exports = class MetamaskController {
 
@@ -93,7 +94,7 @@ module.exports = class MetamaskController {
 
     function logger (err, request, response) {
       if (err) return console.error(err)
-      if (!request.isMetamaskInternal) {
+      if (developmentMode && !request.isMetamaskInternal) {
         console.log(`RPC (${originDomain}):`, request, '->', response)
         if (response.error) {
           console.error('Error in RPC response:\n', response.error)
@@ -218,7 +219,9 @@ module.exports = class MetamaskController {
 
   // Log blocks
   processBlock (block) {
-    console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
+    if (developmentMode) {
+      console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
+    }
     this.verifyNetwork()
   }
 
-- 
cgit 


From 804e8df87f6ccd4cad62c659022c00791a3921e9 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Thu, 11 Aug 2016 14:03:51 -0700
Subject: Lint

---
 app/scripts/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts')

diff --git a/app/scripts/config.js b/app/scripts/config.js
index 297a3a7a0..ce0ba7a01 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -11,5 +11,5 @@ module.exports = {
     testnet: TESTNET_RPC_URL,
     classic: CLASSIC_RPC_URL,
   },
-  developmentMode: DEVELOPMENT_MODE
+  developmentMode: DEVELOPMENT_MODE,
 }
-- 
cgit 


From d7dffedf4825c468d32f389935fcac6e242a2232 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 11 Aug 2016 14:04:20 -0700
Subject: deps - local-message-stream extracted as module post-message-stream

---
 app/scripts/contentscript.js            |  2 +-
 app/scripts/inpage.js                   |  2 +-
 app/scripts/lib/local-message-stream.js | 56 ---------------------------------
 3 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 app/scripts/lib/local-message-stream.js

(limited to 'app/scripts')

diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 1eb04059d..de2cf263b 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -1,4 +1,4 @@
-const LocalMessageDuplexStream = require('./lib/local-message-stream.js')
+const LocalMessageDuplexStream = require('post-message-stream')
 const PortStream = require('./lib/port-stream.js')
 const ObjectMultiplex = require('./lib/obj-multiplex')
 const extension = require('./lib/extension')
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index 055235671..7c508c66f 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -1,7 +1,7 @@
 /*global Web3*/
 cleanContextForImports()
 require('web3/dist/web3.min.js')
-const LocalMessageDuplexStream = require('./lib/local-message-stream.js')
+const LocalMessageDuplexStream = require('post-message-stream')
 const setupDappAutoReload = require('./lib/auto-reload.js')
 const MetamaskInpageProvider = require('./lib/inpage-provider.js')
 restoreContextAfterImports()
diff --git a/app/scripts/lib/local-message-stream.js b/app/scripts/lib/local-message-stream.js
deleted file mode 100644
index 821e51046..000000000
--- a/app/scripts/lib/local-message-stream.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const Duplex = require('readable-stream').Duplex
-const inherits = require('util').inherits
-
-module.exports = LocalMessageDuplexStream
-
-inherits(LocalMessageDuplexStream, Duplex)
-
-function LocalMessageDuplexStream (opts) {
-  Duplex.call(this, {
-    objectMode: true,
-  })
-
-  // this._origin = opts.origin
-  this._name = opts.name
-  this._target = opts.target
-
-  // console.log('LocalMessageDuplexStream ('+this._name+') - initialized...')
-  window.addEventListener('message', this._onMessage.bind(this), false)
-}
-
-// private
-
-LocalMessageDuplexStream.prototype._onMessage = function (event) {
-  var msg = event.data
-  // console.log('LocalMessageDuplexStream ('+this._name+') - heard message...', event)
-  // validate message
-  if (event.origin !== location.origin) return // console.log('LocalMessageDuplexStream ('+this._name+') - rejected - (event.origin !== location.origin) ')
-  if (typeof msg !== 'object') return // console.log('LocalMessageDuplexStream ('+this._name+') - rejected - (typeof msg !== "object") ')
-  if (msg.target !== this._name) return // console.log('LocalMessageDuplexStream ('+this._name+') - rejected - (msg.target !== this._name) ', msg.target, this._name)
-  if (!msg.data) return // console.log('LocalMessageDuplexStream ('+this._name+') - rejected - (!msg.data) ')
-  // console.log('LocalMessageDuplexStream ('+this._name+') - accepted', msg.data)
-  // forward message
-  try {
-    this.push(msg.data)
-  } catch (err) {
-    this.emit('error', err)
-  }
-}
-
-// stream plumbing
-
-LocalMessageDuplexStream.prototype._read = noop
-
-LocalMessageDuplexStream.prototype._write = function (data, encoding, cb) {
-  // console.log('LocalMessageDuplexStream ('+this._name+') - sending message...')
-  var message = {
-    target: this._target,
-    data: data,
-  }
-  window.postMessage(message, location.origin)
-  cb()
-}
-
-// util
-
-function noop () {}
-- 
cgit 


From 243d83dd336de01644f3d4ec00f49aa22b641005 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Thu, 11 Aug 2016 14:24:35 -0700
Subject: Separate developmentMode conditional to only wrap log.

---
 app/scripts/metamask-controller.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index ac0f32117..269bc5afd 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -94,8 +94,10 @@ module.exports = class MetamaskController {
 
     function logger (err, request, response) {
       if (err) return console.error(err)
-      if (developmentMode && !request.isMetamaskInternal) {
-        console.log(`RPC (${originDomain}):`, request, '->', response)
+      if (!request.isMetamaskInternal) {
+        if (developmentMode) {
+          console.log(`RPC (${originDomain}):`, request, '->', response)
+        }
         if (response.error) {
           console.error('Error in RPC response:\n', response.error)
         }
-- 
cgit 


From c0f7c491055e3ab8d12efd78b9ff496ff292d74b Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 11 Aug 2016 14:35:55 -0700
Subject: inpage-prov - sync error - fix link

---
 app/scripts/lib/inpage-provider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts')

diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index e9e0ccf00..b3ed3d9e2 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -58,7 +58,7 @@ MetamaskInpageProvider.prototype.send = function (payload) {
 
     // throw not-supported Error
     default:
-      var message = 'The MetaMask Web3 object does not support synchronous methods. See https://github.com/MetaMask/faq#all-async---think-of-metamask-as-a-light-client for details.'
+      var message = 'The MetaMask Web3 object does not support synchronous methods. See https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#all-async---think-of-metamask-as-a-light-client for details.'
       throw new Error(message)
 
   }
-- 
cgit 


From b8856d765daeb9c3b5be9a3067f977d85222639c Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Thu, 11 Aug 2016 15:42:21 -0700
Subject: Setting defaults to production.

---
 app/scripts/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts')

diff --git a/app/scripts/config.js b/app/scripts/config.js
index ce0ba7a01..620872249 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -2,7 +2,7 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/'
 const TESTNET_RPC_URL = 'https://morden.infura.io/'
 const DEFAULT_RPC_URL = TESTNET_RPC_URL
 const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/'
-const DEVELOPMENT_MODE = true
+const DEVELOPMENT_MODE = false
 
 module.exports = {
   network: {
-- 
cgit 


From 2b0c6953e27b937d8ff75aad00786e3501599a73 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Thu, 11 Aug 2016 18:58:23 -0700
Subject: Create global variable that changes ui logging.

---
 app/scripts/config.js              | 2 --
 app/scripts/metamask-controller.js | 9 ++-------
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/config.js b/app/scripts/config.js
index 620872249..ba012c6b8 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -2,7 +2,6 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/'
 const TESTNET_RPC_URL = 'https://morden.infura.io/'
 const DEFAULT_RPC_URL = TESTNET_RPC_URL
 const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/'
-const DEVELOPMENT_MODE = false
 
 module.exports = {
   network: {
@@ -11,5 +10,4 @@ module.exports = {
     testnet: TESTNET_RPC_URL,
     classic: CLASSIC_RPC_URL,
   },
-  developmentMode: DEVELOPMENT_MODE,
 }
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 269bc5afd..e7e96a472 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -7,7 +7,6 @@ const HostStore = require('./lib/remote-store.js').HostStore
 const Web3 = require('web3')
 const ConfigManager = require('./lib/config-manager')
 const extension = require('./lib/extension')
-const developmentMode = require('./config').developmentMode
 
 module.exports = class MetamaskController {
 
@@ -95,9 +94,7 @@ module.exports = class MetamaskController {
     function logger (err, request, response) {
       if (err) return console.error(err)
       if (!request.isMetamaskInternal) {
-        if (developmentMode) {
-          console.log(`RPC (${originDomain}):`, request, '->', response)
-        }
+        console.log(`RPC (${originDomain}):`, request, '->', response)
         if (response.error) {
           console.error('Error in RPC response:\n', response.error)
         }
@@ -221,9 +218,7 @@ module.exports = class MetamaskController {
 
   // Log blocks
   processBlock (block) {
-    if (developmentMode) {
-      console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
-    }
+    console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
     this.verifyNetwork()
   }
 
-- 
cgit 


From b1f68ec9cd2549a7b52272407f1543ae0b1d9326 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Thu, 11 Aug 2016 19:44:59 -0700
Subject: Add global var for background.

---
 app/scripts/background.js          | 1 +
 app/scripts/config.js              | 2 ++
 app/scripts/lib/idStore.js         | 9 ++++++---
 app/scripts/metamask-controller.js | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 34c994ab7..e04309e74 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -13,6 +13,7 @@ const extension = require('./lib/extension')
 
 const STORAGE_KEY = 'metamask-config'
 
+
 const controller = new MetamaskController({
   // User confirmation callbacks:
   showUnconfirmedMessage,
diff --git a/app/scripts/config.js b/app/scripts/config.js
index ba012c6b8..7a1d54a3b 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -3,6 +3,8 @@ const TESTNET_RPC_URL = 'https://morden.infura.io/'
 const DEFAULT_RPC_URL = TESTNET_RPC_URL
 const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/'
 
+global.METAMASK_DEBUG = false
+
 module.exports = {
   network: {
     default: DEFAULT_RPC_URL,
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index c6ac55a03..f63e03ec6 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -153,8 +153,9 @@ IdentityStore.prototype.getNetwork = function (err) {
       this._currentState.network = 'loading'
       return this._didUpdate()
     }
-
-    console.log('web3.getNetwork returned ' + network)
+    if (global.METAMASK_DEBUG) {
+      console.log('web3.getNetwork returned ' + network)
+    }
     this._currentState.network = network
     this._didUpdate()
   })
@@ -475,7 +476,9 @@ IdentityStore.prototype._restoreFromSeed = function (password, seed, derivedKey)
 
   keyStore.generateNewAddress(derivedKey, 3)
   configManager.setWallet(keyStore.serialize())
-  console.log('restored from seed. saved to keystore')
+  if (global.METAMASK_DEBUG) {
+    console.log('restored from seed. saved to keystore')
+  }
   return keyStore
 }
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e7e96a472..2c141a402 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -94,7 +94,9 @@ module.exports = class MetamaskController {
     function logger (err, request, response) {
       if (err) return console.error(err)
       if (!request.isMetamaskInternal) {
-        console.log(`RPC (${originDomain}):`, request, '->', response)
+        if (global.METAMASK_DEBUG) {
+          console.log(`RPC (${originDomain}):`, request, '->', response)
+        }
         if (response.error) {
           console.error('Error in RPC response:\n', response.error)
         }
@@ -218,7 +220,9 @@ module.exports = class MetamaskController {
 
   // Log blocks
   processBlock (block) {
-    console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
+    if (global.METAMASK_DEBUG) {
+      console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
+    }
     this.verifyNetwork()
   }
 
-- 
cgit 


From 0b660f4ac84e27967f96f3292f607aba9afc5ed8 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 12 Aug 2016 13:25:38 -0700
Subject: deps - extracted ensnare to module

---
 app/scripts/lib/auto-reload.js |  2 +-
 app/scripts/lib/ensnare.js     | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 app/scripts/lib/ensnare.js

(limited to 'app/scripts')

diff --git a/app/scripts/lib/auto-reload.js b/app/scripts/lib/auto-reload.js
index b45f02009..c4c8053f0 100644
--- a/app/scripts/lib/auto-reload.js
+++ b/app/scripts/lib/auto-reload.js
@@ -1,5 +1,5 @@
 const once = require('once')
-const ensnare = require('./ensnare.js')
+const ensnare = require('ensnare')
 
 module.exports = setupDappAutoReload
 
diff --git a/app/scripts/lib/ensnare.js b/app/scripts/lib/ensnare.js
deleted file mode 100644
index 6100f7c79..000000000
--- a/app/scripts/lib/ensnare.js
+++ /dev/null
@@ -1,24 +0,0 @@
-module.exports = ensnare
-
-// creates a proxy object that calls cb everytime the obj's properties/fns are accessed
-function ensnare (obj, cb) {
-  var proxy = {}
-  Object.keys(obj).forEach(function (key) {
-    var val = obj[key]
-    switch (typeof val) {
-      case 'function':
-        proxy[key] = function () {
-          cb()
-          val.apply(obj, arguments)
-        }
-        return
-      default:
-        Object.defineProperty(proxy, key, {
-          get: function () { cb(); return obj[key] },
-          set: function (val) { cb(); obj[key] = val; return val },
-        })
-        return
-    }
-  })
-  return proxy
-}
-- 
cgit 


From e826eb932c918202bcf30d32d57464a4b860073b Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Sun, 14 Aug 2016 18:39:19 -0700
Subject: Remove ethereum classic provider

Fixes #542
---
 app/scripts/config.js             | 2 --
 app/scripts/lib/config-manager.js | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/config.js b/app/scripts/config.js
index 7a1d54a3b..04e2907d4 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -1,7 +1,6 @@
 const MAINET_RPC_URL = 'https://mainnet.infura.io/'
 const TESTNET_RPC_URL = 'https://morden.infura.io/'
 const DEFAULT_RPC_URL = TESTNET_RPC_URL
-const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/'
 
 global.METAMASK_DEBUG = false
 
@@ -10,6 +9,5 @@ module.exports = {
     default: DEFAULT_RPC_URL,
     mainnet: MAINET_RPC_URL,
     testnet: TESTNET_RPC_URL,
-    classic: CLASSIC_RPC_URL,
   },
 }
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 3d84edfd0..d14d3afc3 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -4,7 +4,6 @@ const migrations = require('./migrations')
 
 const TESTNET_RPC = MetamaskConfig.network.testnet
 const MAINNET_RPC = MetamaskConfig.network.mainnet
-const CLASSIC_RPC = MetamaskConfig.network.classic
 
 /* The config-manager is a convenience object
  * wrapping a pojo-migrator.
@@ -145,9 +144,6 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
     case 'testnet':
       return TESTNET_RPC
 
-    case 'classic':
-      return CLASSIC_RPC
-
     default:
       return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC
   }
@@ -279,7 +275,7 @@ ConfigManager.prototype.setShouldntShowWarning = function () {
   if (data.isEthConfirmed) {
     data.isEthConfirmed = !data.isEthConfirmed
   } else {
-    data.isEthConfirmed = true    
+    data.isEthConfirmed = true
   }
   this.setData(data)
 }
-- 
cgit