Merge branch 'master' into buyForm

1 files changed, 9 insertions, 1 deletions

diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index 3b6ec154f..e387be895 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -107,7 +107,15 @@ function createSyncProvider (providerConfig) {
         syncProviderUrl = MetamaskConfig.network.default
     }
   }
-  return new HttpProvider(syncProviderUrl)
+
+  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) {