Merge pull request #131 from trufflesuite/fix/metamask-not-syncing

Fix/metamask not syncing
trufflesuite · Oct 22, 2018 · 86defd4 · 86defd4
2 parents 8cdbe18 + 36e2758
commit 86defd4
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 68 deletions.
diff --git a/dist/drizzle.js b/dist/drizzle.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/drizzleStatus/drizzleStatusSaga.js b/src/drizzleStatus/drizzleStatusSaga.js
@@ -38,12 +38,12 @@ function * initializeDrizzle (action) {
 
     const syncAlways = options.syncAlways
 
-    if (web3.currentProvider.isMetaMask) {
-      // Using MetaMask, attempt block polling.
+    if (web3.currentProvider.isMetaMask && !window.ethereum) {
+      // Using old MetaMask, attempt block polling.
       const interval = options.polls.blocks
       yield put({ type: 'BLOCKS_POLLING', drizzle, interval, web3, syncAlways })
     } else {
-      // Not using MetaMask, attempt subscription block listening.
+      // Not using old MetaMask, attempt subscription block listening.
       yield put({ type: 'BLOCKS_LISTENING', drizzle, web3, syncAlways })
     }
 

diff --git a/src/web3/web3Saga.js b/src/web3/web3Saga.js
@@ -10,8 +10,26 @@ export function * initializeWeb3 ({ options }) {
   try {
     var web3 = {}
 
+    if (window.ethereum) {
+      const { ethereum } = window
+      web3 = new Web3(ethereum)
+      try {
+        yield call(ethereum.enable)
+
+        web3.eth.cacheSendTransaction = txObject =>
+          put({ type: 'SEND_WEB3_TX', txObject, stackId, web3 })
+
+        yield put({ type: 'WEB3_INITIALIZED' })
+
+        return web3
+      } catch (error) {
+        // User denied account access...
+        console.log(error)
+      }
+    }
+
     // Checking if Web3 has been injected by the browser (Mist/MetaMask)
-    if (typeof window.web3 !== 'undefined') {
+    else if (typeof window.web3 !== 'undefined') {
       // Use Mist/MetaMask's provider.
       web3 = new Web3(window.web3.currentProvider)
       web3.eth.cacheSendTransaction = txObject =>