Fix accountsChanged event emittance (a part of EIP-1193)

poanetwork · Apr 13, 2020 · b40bcbd · b40bcbd
1 parent 29cf01c
commit b40bcbd
Show file tree

Hide file tree

Showing 9 changed files with 241 additions and 260 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- [#354](https://github.com/poanetwork/nifty-wallet/pull/354) - Fix `accountsChanged` event emittance (a part of EIP-1193)
 - [#353](https://github.com/poanetwork/nifty-wallet/pull/353) - Fix synchronous eth_accounts request
 
 ## 5.0.1 Mon Apr 06 2020

diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -145,7 +145,6 @@ setupMetamaskMeshMetrics()
  * @property {Object} infuraNetworkStatus - An object of infura network status checks.
  * @property {Block[]} recentBlocks - An array of recent blocks, used to calculate an effective but cheap gas price.
  * @property {Array} shapeShiftTxList - An array of objects describing shapeshift exchange attempts.
- * @property {Array} lostAccounts - TODO: Remove this feature. A leftover from the version-3 migration where our seed-phrase library changed to fix a bug where some accounts were mis-generated, but we recovered the old accounts as "lost" instead of losing them.
  * @property {boolean} forgottenPassword - Returns true if the user has initiated the password recovery screen, is recovering from seed phrase.
  */
 
@@ -267,6 +266,9 @@ function setupController (initState, initLangCode) {
     getRequestAccountTabIds: () => {
       return requestAccountTabIds
     },
+    getOpenMetamaskTabsIds: () => {
+      return openMetamaskTabsIDs
+    },
     encryptor: isEdge ? new EdgeEncryptor() : undefined,
   })
   global.metamaskController = controller

diff --git a/app/scripts/controllers/permissions/index.js b/app/scripts/controllers/permissions/index.js
@@ -298,13 +298,18 @@ export class PermissionsController {
    */
   async updatePermittedAccounts (origin, accounts) {
 
-    await this.validatePermittedAccounts(accounts)
+    // await this.validatePermittedAccounts(accounts)
 
-    this.permissions.updateCaveatFor(
-      origin, 'eth_accounts', CAVEAT_NAMES.exposedAccounts, accounts,
-    )
+    // this.permissions.updateCaveatFor(
+    //   origin, 'eth_accounts', CAVEAT_NAMES.exposedAccounts, accounts,
+    // )
+
+    // this.notifyDomain(origin, {
+    //   method: NOTIFICATION_NAMES.accountsChanged,
+    //   result: accounts,
+    // })
 
-    this.notifyDomain(origin, {
+    this.notifyAllDomains({
       method: NOTIFICATION_NAMES.accountsChanged,
       result: accounts,
     })
@@ -378,14 +383,14 @@ export class PermissionsController {
     // if the accounts changed from the perspective of the dapp,
     // update "last seen" time for the origin and account(s)
     // exception: no accounts -> no times to update
-    if (
-      payload.method === NOTIFICATION_NAMES.accountsChanged &&
-      Array.isArray(payload.result)
-    ) {
-      this.permissionsLog.updateAccountsHistory(
-        origin, payload.result,
-      )
-    }
+    // if (
+    //   payload.method === NOTIFICATION_NAMES.accountsChanged &&
+    //   Array.isArray(payload.result)
+    // ) {
+    //   this.permissionsLog.updateAccountsHistory(
+    //     origin, payload.result,
+    //   )
+    // }
 
     this._notifyDomain(origin, payload)
 
@@ -448,8 +453,8 @@ export class PermissionsController {
     // do nothing if the account is not permitted for the origin, or
     // if it's already first in the array of permitted accounts
     if (
-      !permittedAccounts.includes(account) ||
-      permittedAccounts[0] === account
+      !permittedAccounts.includes(account)
+      //  || permittedAccounts[0] === account
     ) {
       return
     }

diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
@@ -61,23 +61,6 @@ const inpageProvider = new MetamaskInpageProvider(metamaskStream)
 // set a high max listener count to avoid unnecesary warnings
 inpageProvider.setMaxListeners(100)
 
-// Augment the provider with its enable method
-inpageProvider.enable = function (options = {}) {
-  return new Promise((resolve, reject) => {
-    if (options.mockRejection) {
-      reject('User rejected account access')
-    } else {
-      inpageProvider.sendAsync({ method: 'eth_accounts', params: [] }, (error, response) => {
-        if (error) {
-          reject(error)
-        } else {
-          resolve(response.result)
-        }
-      })
-    }
-  })
-}
-
 // Work around for web3@1.0 deleting the bound `sendAsync` but not the unbound
 // `sendAsync` method on the prototype, causing `this` reference issues
 const proxiedInpageProvider = new Proxy(inpageProvider, {

diff --git a/app/scripts/lib/ComposableObservableStore.js b/app/scripts/lib/ComposableObservableStore.js
@@ -1,4 +1,4 @@
-const ObservableStore = require('obs-store')
+import ObservableStore from 'obs-store'
 
 /**
  * An ObservableStore that can composes a flat
@@ -46,34 +46,6 @@ class ComposableObservableStore extends ObservableStore {
     }
     return flatState
   }
-
-  /**
-   * Merges all child store state into a single object rather than
-   * returning an object keyed by child store class name
-   * Removes heavy objects that are not needed on UI
-   *
-   * @returns {Object} - Object containing merged child store state
-   */
-  getFilteredFlatState () {
-    let flatState = {}
-    for (const key in this.config) {
-      let nextState
-      if (key === 'RecentBlocksController') {
-        nextState = {}
-      } else if (key === 'TxController') {
-        const state = this.config[key].getState()
-        const txList = state.selectedAddressTxList.map(item => ({...item, history: null, nonceDetails: null}))
-        nextState = {
-          ...state,
-          selectedAddressTxList: txList,
-        }
-      } else {
-        nextState = this.config[key].getState()
-      }
-      flatState = { ...flatState, ...nextState }
-    }
-    return flatState
-  }
 }
 
 module.exports = ComposableObservableStore