|
|
|
/**
|
|
|
|
* @file The entry point for the web extension singleton process.
|
|
|
|
*/
|
|
|
|
// these need to run before anything else
|
|
|
|
/* eslint-disable import/first,import/order */
|
|
|
|
import setupFetchDebugging from './lib/setupFetchDebugging'
|
|
|
|
/* eslint-enable import/order */
|
|
|
|
|
|
|
|
setupFetchDebugging()
|
|
|
|
|
|
|
|
// polyfills
|
|
|
|
import 'abortcontroller-polyfill/dist/polyfill-patch-fetch'
|
|
|
|
|
|
|
|
import endOfStream from 'end-of-stream'
|
|
|
|
import pump from 'pump'
|
|
|
|
import debounce from 'debounce-stream'
|
|
|
|
import log from 'loglevel'
|
|
|
|
import extension from 'extensionizer'
|
|
|
|
import storeTransform from 'obs-store/lib/transform'
|
|
|
|
import asStream from 'obs-store/lib/asStream'
|
|
|
|
import PortStream from 'extension-port-stream'
|
|
|
|
import migrations from './migrations'
|
|
|
|
import Migrator from './lib/migrator'
|
|
|
|
import ExtensionPlatform from './platforms/extension'
|
|
|
|
import LocalStore from './lib/local-store'
|
|
|
|
import ReadOnlyNetworkStore from './lib/network-store'
|
|
|
|
import createStreamSink from './lib/createStreamSink'
|
|
|
|
import NotificationManager from './lib/notification-manager'
|
|
|
|
import MetamaskController from './metamask-controller'
|
|
|
|
import rawFirstTimeState from './first-time-state'
|
|
|
|
import getFirstPreferredLangCode from './lib/get-first-preferred-lang-code'
|
|
|
|
import getObjStructure from './lib/getObjStructure'
|
|
|
|
import setupEnsIpfsResolver from './lib/ens-ipfs/setup'
|
|
|
|
|
|
|
|
import {
|
|
|
|
ENVIRONMENT_TYPE_POPUP,
|
|
|
|
ENVIRONMENT_TYPE_NOTIFICATION,
|
|
|
|
ENVIRONMENT_TYPE_FULLSCREEN,
|
|
|
|
} from './lib/enums'
|
|
|
|
/* eslint-enable import/first */
|
|
|
|
|
|
|
|
const { sentry } = global
|
|
|
|
const firstTimeState = { ...rawFirstTimeState }
|
|
|
|
|
|
|
|
log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'warn')
|
|
|
|
|
|
|
|
const platform = new ExtensionPlatform()
|
|
|
|
|
|
|
|
const notificationManager = new NotificationManager()
|
|
|
|
global.METAMASK_NOTIFIER = notificationManager
|
|
|
|
|
|
|
|
let popupIsOpen = false
|
|
|
|
let notificationIsOpen = false
|
|
|
|
const openMetamaskTabsIDs = {}
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
const requestAccountTabIds = {}
|
|
|
|
|
|
|
|
// state persistence
|
|
|
|
const inTest = process.env.IN_TEST === 'true'
|
|
|
|
const localStore = inTest ? new ReadOnlyNetworkStore() : new LocalStore()
|
|
|
|
let versionedData
|
|
|
|
|
|
|
|
if (inTest || process.env.METAMASK_DEBUG) {
|
|
|
|
global.metamaskGetState = localStore.get.bind(localStore)
|
|
|
|
}
|
|
|
|
|
|
|
|
// initialization flow
|
|
|
|
initialize().catch(log.error)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* An object representing a transaction, in whatever state it is in.
|
|
|
|
* @typedef TransactionMeta
|
|
|
|
*
|
|
|
|
* @property {number} id - An internally unique tx identifier.
|
|
|
|
* @property {number} time - Time the tx was first suggested, in unix epoch time (ms).
|
|
|
|
* @property {string} status - The current transaction status (unapproved, signed, submitted, dropped, failed, rejected), as defined in `tx-state-manager.js`.
|
|
|
|
* @property {string} metamaskNetworkId - The transaction's network ID, used for EIP-155 compliance.
|
|
|
|
* @property {boolean} loadingDefaults - TODO: Document
|
|
|
|
* @property {Object} txParams - The tx params as passed to the network provider.
|
|
|
|
* @property {Object[]} history - A history of mutations to this TransactionMeta object.
|
|
|
|
* @property {string} origin - A string representing the interface that suggested the transaction.
|
|
|
|
* @property {Object} nonceDetails - A metadata object containing information used to derive the suggested nonce, useful for debugging nonce issues.
|
|
|
|
* @property {string} rawTx - A hex string of the final signed transaction, ready to submit to the network.
|
|
|
|
* @property {string} hash - A hex string of the transaction hash, used to identify the transaction on the network.
|
|
|
|
* @property {number} submittedTime - The time the transaction was submitted to the network, in Unix epoch time (ms).
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The data emitted from the MetaMaskController.store EventEmitter, also used to initialize the MetaMaskController. Available in UI on React state as state.metamask.
|
|
|
|
* @typedef MetaMaskState
|
|
|
|
* @property {boolean} isInitialized - Whether the first vault has been created.
|
|
|
|
* @property {boolean} isUnlocked - Whether the vault is currently decrypted and accounts are available for selection.
|
|
|
|
* @property {boolean} isAccountMenuOpen - Represents whether the main account selection UI is currently displayed.
|
|
|
|
* @property {Object} identities - An object matching lower-case hex addresses to Identity objects with "address" and "name" (nickname) keys.
|
|
|
|
* @property {Object} unapprovedTxs - An object mapping transaction hashes to unapproved transactions.
|
|
|
|
* @property {Array} frequentRpcList - A list of frequently used RPCs, including custom user-provided ones.
|
|
|
|
* @property {Array} addressBook - A list of previously sent to addresses.
|
|
|
|
* @property {Object} contractExchangeRates - Info about current token prices.
|
|
|
|
* @property {Array} tokens - Tokens held by the current user, including their balances.
|
|
|
|
* @property {Object} send - TODO: Document
|
|
|
|
* @property {boolean} useBlockie - Indicates preferred user identicon format. True for blockie, false for Jazzicon.
|
|
|
|
* @property {Object} featureFlags - An object for optional feature flags.
|
|
|
|
* @property {boolean} welcomeScreen - True if welcome screen should be shown.
|
|
|
|
* @property {string} currentLocale - A locale string matching the user's preferred display language.
|
|
|
|
* @property {Object} provider - The current selected network provider.
|
|
|
|
* @property {string} provider.rpcUrl - The address for the RPC API, if using an RPC API.
|
|
|
|
* @property {string} provider.type - An identifier for the type of network selected, allows MetaMask to use custom provider strategies for known networks.
|
|
|
|
* @property {string} network - A stringified number of the current network ID.
|
|
|
|
* @property {Object} accounts - An object mapping lower-case hex addresses to objects with "balance" and "address" keys, both storing hex string values.
|
|
|
|
* @property {hex} currentBlockGasLimit - The most recently seen block gas limit, in a lower case hex prefixed string.
|
|
|
|
* @property {TransactionMeta[]} currentNetworkTxList - An array of transactions associated with the currently selected network.
|
|
|
|
* @property {Object} unapprovedMsgs - An object of messages pending approval, mapping a unique ID to the options.
|
|
|
|
* @property {number} unapprovedMsgCount - The number of messages in unapprovedMsgs.
|
|
|
|
* @property {Object} unapprovedPersonalMsgs - An object of messages pending approval, mapping a unique ID to the options.
|
|
|
|
* @property {number} unapprovedPersonalMsgCount - The number of messages in unapprovedPersonalMsgs.
|
|
|
|
* @property {Object} unapprovedEncryptionPublicKeyMsgs - An object of messages pending approval, mapping a unique ID to the options.
|
|
|
|
* @property {number} unapprovedEncryptionPublicKeyMsgCount - The number of messages in EncryptionPublicKeyMsgs.
|
|
|
|
* @property {Object} unapprovedDecryptMsgs - An object of messages pending approval, mapping a unique ID to the options.
|
|
|
|
* @property {number} unapprovedDecryptMsgCount - The number of messages in unapprovedDecryptMsgs.
|
|
|
|
* @property {Object} unapprovedTypedMsgs - An object of messages pending approval, mapping a unique ID to the options.
|
|
|
|
* @property {number} unapprovedTypedMsgCount - The number of messages in unapprovedTypedMsgs.
|
|
|
|
* @property {string[]} keyringTypes - An array of unique keyring identifying strings, representing available strategies for creating accounts.
|
|
|
|
* @property {Keyring[]} keyrings - An array of keyring descriptions, summarizing the accounts that are available for use, and what keyrings they belong to.
|
|
|
|
* @property {string} selectedAddress - A lower case hex string of the currently selected address.
|
|
|
|
* @property {string} currentCurrency - A string identifying the user's preferred display currency, for use in showing conversion rates.
|
|
|
|
* @property {number} conversionRate - A number representing the current exchange rate from the user's preferred currency to Ether.
|
|
|
|
* @property {number} conversionDate - A unix epoch date (ms) for the time the current conversion rate was last retrieved.
|
|
|
|
* @property {boolean} forgottenPassword - Returns true if the user has initiated the password recovery screen, is recovering from seed phrase.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @typedef VersionedData
|
|
|
|
* @property {MetaMaskState} data - The data emitted from MetaMask controller, or used to initialize it.
|
|
|
|
* @property {Number} version - The latest migration version that has been run.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initializes the MetaMask controller, and sets up all platform configuration.
|
|
|
|
* @returns {Promise} Setup complete.
|
|
|
|
*/
|
|
|
|
async function initialize() {
|
|
|
|
const initState = await loadStateFromPersistence()
|
|
|
|
const initLangCode = await getFirstPreferredLangCode()
|
|
|
|
await setupController(initState, initLangCode)
|
|
|
|
log.debug('MetaMask initialization complete.')
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// State and Persistence
|
|
|
|
//
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Loads any stored data, prioritizing the latest storage strategy.
|
|
|
|
* Migrates that data schema in case it was last loaded on an older version.
|
|
|
|
* @returns {Promise<MetaMaskState>} Last data emitted from previous instance of MetaMask.
|
|
|
|
*/
|
|
|
|
async function loadStateFromPersistence() {
|
|
|
|
// migrations
|
|
|
|
const migrator = new Migrator({ migrations })
|
|
|
|
migrator.on('error', console.warn)
|
|
|
|
|
|
|
|
// read from disk
|
|
|
|
// first from preferred, async API:
|
|
|
|
versionedData =
|
|
|
|
(await localStore.get()) || migrator.generateInitialState(firstTimeState)
|
|
|
|
|
|
|
|
// check if somehow state is empty
|
|
|
|
// this should never happen but new error reporting suggests that it has
|
|
|
|
// for a small number of users
|
|
|
|
// https://github.com/metamask/metamask-extension/issues/3919
|
|
|
|
if (versionedData && !versionedData.data) {
|
|
|
|
// unable to recover, clear state
|
|
|
|
versionedData = migrator.generateInitialState(firstTimeState)
|
|
|
|
sentry.captureMessage('MetaMask - Empty vault found - unable to recover')
|
|
|
|
}
|
|
|
|
|
|
|
|
// report migration errors to sentry
|
|
|
|
migrator.on('error', (err) => {
|
|
|
|
// get vault structure without secrets
|
|
|
|
const vaultStructure = getObjStructure(versionedData)
|
|
|
|
sentry.captureException(err, {
|
|
|
|
// "extra" key is required by Sentry
|
|
|
|
extra: { vaultStructure },
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
// migrate data
|
|
|
|
versionedData = await migrator.migrateData(versionedData)
|
|
|
|
if (!versionedData) {
|
|
|
|
throw new Error('MetaMask - migrator returned undefined')
|
|
|
|
}
|
|
|
|
|
|
|
|
// write to disk
|
|
|
|
if (localStore.isSupported) {
|
|
|
|
localStore.set(versionedData)
|
|
|
|
} else {
|
|
|
|
// throw in setTimeout so as to not block boot
|
|
|
|
setTimeout(() => {
|
|
|
|
throw new Error('MetaMask - Localstore not supported')
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// return just the data
|
|
|
|
return versionedData.data
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initializes the MetaMask Controller with any initial state and default language.
|
|
|
|
* Configures platform-specific error reporting strategy.
|
|
|
|
* Streams emitted state updates to platform-specific storage strategy.
|
|
|
|
* Creates platform listeners for new Dapps/Contexts, and sets up their data connections to the controller.
|
|
|
|
*
|
|
|
|
* @param {Object} initState - The initial state to start the controller with, matches the state that is emitted from the controller.
|
|
|
|
* @param {string} initLangCode - The region code for the language preferred by the current user.
|
|
|
|
* @returns {Promise} After setup is complete.
|
|
|
|
*/
|
|
|
|
function setupController(initState, initLangCode) {
|
|
|
|
//
|
|
|
|
// MetaMask Controller
|
|
|
|
//
|
|
|
|
|
|
|
|
const controller = new MetamaskController({
|
|
|
|
infuraProjectId: process.env.INFURA_PROJECT_ID,
|
|
|
|
// User confirmation callbacks:
|
|
|
|
showUserConfirmation: triggerUi,
|
|
|
|
openPopup,
|
|
|
|
// initial state
|
|
|
|
initState,
|
|
|
|
// initial locale code
|
|
|
|
initLangCode,
|
|
|
|
// platform specific api
|
|
|
|
platform,
|
|
|
|
extension,
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
getRequestAccountTabIds: () => {
|
|
|
|
return requestAccountTabIds
|
|
|
|
},
|
|
|
|
getOpenMetamaskTabsIds: () => {
|
|
|
|
return openMetamaskTabsIDs
|
|
|
|
},
|
|
|
|
})
|
|
|
|
|
|
|
|
setupEnsIpfsResolver({
|
|
|
|
getCurrentNetwork: controller.getCurrentNetwork,
|
|
|
|
getIpfsGateway: controller.preferencesController.getIpfsGateway.bind(
|
|
|
|
controller.preferencesController,
|
|
|
|
),
|
|
|
|
provider: controller.provider,
|
|
|
|
})
|
|
|
|
|
|
|
|
// setup state persistence
|
|
|
|
pump(
|
|
|
|
asStream(controller.store),
|
|
|
|
debounce(1000),
|
|
|
|
storeTransform(versionifyData),
|
|
|
|
createStreamSink(persistData),
|
|
|
|
(error) => {
|
|
|
|
log.error('MetaMask - Persistence pipeline failed', error)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Assigns the given state to the versioned object (with metadata), and returns that.
|
|
|
|
* @param {Object} state - The state object as emitted by the MetaMaskController.
|
|
|
|
* @returns {VersionedData} The state object wrapped in an object that includes a metadata key.
|
|
|
|
*/
|
|
|
|
function versionifyData(state) {
|
|
|
|
versionedData.data = state
|
|
|
|
return versionedData
|
|
|
|
}
|
|
|
|
|
|
|
|
async function persistData(state) {
|
|
|
|
if (!state) {
|
|
|
|
throw new Error('MetaMask - updated state is missing')
|
|
|
|
}
|
|
|
|
if (!state.data) {
|
|
|
|
throw new Error('MetaMask - updated state does not have data')
|
|
|
|
}
|
|
|
|
if (localStore.isSupported) {
|
|
|
|
try {
|
|
|
|
await localStore.set(state)
|
|
|
|
} catch (err) {
|
|
|
|
// log error so we dont break the pipeline
|
|
|
|
log.error('error setting state in local store:', err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// connect to other contexts
|
|
|
|
//
|
|
|
|
extension.runtime.onConnect.addListener(connectRemote)
|
|
|
|
extension.runtime.onConnectExternal.addListener(connectExternal)
|
|
|
|
|
|
|
|
const metamaskInternalProcessHash = {
|
|
|
|
[ENVIRONMENT_TYPE_POPUP]: true,
|
|
|
|
[ENVIRONMENT_TYPE_NOTIFICATION]: true,
|
|
|
|
[ENVIRONMENT_TYPE_FULLSCREEN]: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
const metamaskBlockedPorts = ['trezor-connect']
|
|
|
|
|
|
|
|
const isClientOpenStatus = () => {
|
|
|
|
return (
|
|
|
|
popupIsOpen ||
|
|
|
|
Boolean(Object.keys(openMetamaskTabsIDs).length) ||
|
|
|
|
notificationIsOpen
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A runtime.Port object, as provided by the browser:
|
|
|
|
* @see https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/runtime/Port
|
|
|
|
* @typedef Port
|
|
|
|
* @type Object
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Connects a Port to the MetaMask controller via a multiplexed duplex stream.
|
|
|
|
* This method identifies trusted (MetaMask) interfaces, and connects them differently from untrusted (web pages).
|
|
|
|
* @param {Port} remotePort - The port provided by a new context.
|
|
|
|
*/
|
|
|
|
function connectRemote(remotePort) {
|
|
|
|
const processName = remotePort.name
|
|
|
|
const isMetaMaskInternalProcess = metamaskInternalProcessHash[processName]
|
|
|
|
|
|
|
|
if (metamaskBlockedPorts.includes(remotePort.name)) {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isMetaMaskInternalProcess) {
|
|
|
|
const portStream = new PortStream(remotePort)
|
|
|
|
// communication with popup
|
|
|
|
controller.isClientOpen = true
|
|
|
|
controller.setupTrustedCommunication(portStream, remotePort.sender)
|
|
|
|
|
|
|
|
if (processName === ENVIRONMENT_TYPE_POPUP) {
|
|
|
|
popupIsOpen = true
|
|
|
|
|
|
|
|
endOfStream(portStream, () => {
|
|
|
|
popupIsOpen = false
|
|
|
|
controller.isClientOpen = isClientOpenStatus()
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
if (processName === ENVIRONMENT_TYPE_NOTIFICATION) {
|
|
|
|
notificationIsOpen = true
|
|
|
|
|
|
|
|
endOfStream(portStream, () => {
|
|
|
|
notificationIsOpen = false
|
|
|
|
controller.isClientOpen = isClientOpenStatus()
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
if (processName === ENVIRONMENT_TYPE_FULLSCREEN) {
|
|
|
|
const tabId = remotePort.sender.tab.id
|
|
|
|
openMetamaskTabsIDs[tabId] = true
|
|
|
|
|
|
|
|
endOfStream(portStream, () => {
|
|
|
|
delete openMetamaskTabsIDs[tabId]
|
|
|
|
controller.isClientOpen = isClientOpenStatus()
|
|
|
|
})
|
|
|
|
}
|
|
|
|
} else {
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
if (remotePort.sender && remotePort.sender.tab && remotePort.sender.url) {
|
|
|
|
const tabId = remotePort.sender.tab.id
|
|
|
|
const url = new URL(remotePort.sender.url)
|
|
|
|
const { origin } = url
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
|
|
|
|
remotePort.onMessage.addListener((msg) => {
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
if (msg.data && msg.data.method === 'eth_requestAccounts') {
|
|
|
|
requestAccountTabIds[origin] = tabId
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
connectExternal(remotePort)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// communication with page or other extension
|
|
|
|
function connectExternal(remotePort) {
|
|
|
|
const portStream = new PortStream(remotePort)
|
|
|
|
controller.setupUntrustedCommunication(portStream, remotePort.sender)
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// User Interface setup
|
|
|
|
//
|
|
|
|
|
|
|
|
updateBadge()
|
|
|
|
controller.txController.on('update:badge', updateBadge)
|
|
|
|
controller.messageManager.on('updateBadge', updateBadge)
|
|
|
|
controller.personalMessageManager.on('updateBadge', updateBadge)
|
|
|
|
controller.decryptMessageManager.on('updateBadge', updateBadge)
|
|
|
|
controller.encryptionPublicKeyManager.on('updateBadge', updateBadge)
|
|
|
|
controller.typedMessageManager.on('updateBadge', updateBadge)
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
controller.permissionsController.permissions.subscribe(updateBadge)
|
|
|
|
controller.appStateController.on('updateBadge', updateBadge)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Updates the Web Extension's "badge" number, on the little fox in the toolbar.
|
|
|
|
* The number reflects the current number of pending transactions or message signatures needing user approval.
|
|
|
|
*/
|
|
|
|
function updateBadge() {
|
|
|
|
let label = ''
|
|
|
|
const unapprovedTxCount = controller.txController.getUnapprovedTxCount()
|
|
|
|
const { unapprovedMsgCount } = controller.messageManager
|
|
|
|
const { unapprovedPersonalMsgCount } = controller.personalMessageManager
|
|
|
|
const { unapprovedDecryptMsgCount } = controller.decryptMessageManager
|
|
|
|
const {
|
|
|
|
unapprovedEncryptionPublicKeyMsgCount,
|
|
|
|
} = controller.encryptionPublicKeyManager
|
|
|
|
const { unapprovedTypedMessagesCount } = controller.typedMessageManager
|
|
|
|
const pendingPermissionRequests = Object.keys(
|
|
|
|
controller.permissionsController.permissions.state.permissionsRequests,
|
|
|
|
).length
|
|
|
|
const waitingForUnlockCount =
|
|
|
|
controller.appStateController.waitingForUnlock.length
|
|
|
|
const count =
|
|
|
|
unapprovedTxCount +
|
|
|
|
unapprovedMsgCount +
|
|
|
|
unapprovedPersonalMsgCount +
|
|
|
|
unapprovedDecryptMsgCount +
|
|
|
|
unapprovedEncryptionPublicKeyMsgCount +
|
|
|
|
unapprovedTypedMessagesCount +
|
|
|
|
pendingPermissionRequests +
|
|
|
|
waitingForUnlockCount
|
|
|
|
if (count) {
|
|
|
|
label = String(count)
|
|
|
|
}
|
|
|
|
extension.browserAction.setBadgeText({ text: label })
|
|
|
|
extension.browserAction.setBadgeBackgroundColor({ color: '#037DD6' })
|
|
|
|
}
|
|
|
|
|
|
|
|
return Promise.resolve()
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// Etc...
|
|
|
|
//
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Opens the browser popup for user confirmation
|
|
|
|
*/
|
|
|
|
async function triggerUi() {
|
|
|
|
const tabs = await platform.getActiveTabs()
|
|
|
|
const currentlyActiveMetamaskTab = Boolean(
|
|
|
|
tabs.find((tab) => openMetamaskTabsIDs[tab.id]),
|
|
|
|
)
|
|
|
|
// Vivaldi is not closing port connection on popup close, so popupIsOpen does not work correctly
|
|
|
|
// To be reviewed in the future if this behaviour is fixed - also the way we determine isVivaldi variable might change at some point
|
|
|
|
const isVivaldi =
|
|
|
|
tabs.length > 0 &&
|
|
|
|
tabs[0].extData &&
|
|
|
|
tabs[0].extData.indexOf('vivaldi_tab') > -1
|
|
|
|
if ((isVivaldi || !popupIsOpen) && !currentlyActiveMetamaskTab) {
|
|
|
|
await notificationManager.showPopup()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Opens the browser popup for user confirmation of watchAsset
|
|
|
|
* then it waits until user interact with the UI
|
|
|
|
*/
|
|
|
|
async function openPopup() {
|
|
|
|
await triggerUi()
|
|
|
|
await new Promise((resolve) => {
|
|
|
|
const interval = setInterval(() => {
|
|
|
|
if (!notificationIsOpen) {
|
|
|
|
clearInterval(interval)
|
|
|
|
resolve()
|
|
|
|
}
|
|
|
|
}, 1000)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// On first install, open a new tab with MetaMask
|
|
|
|
extension.runtime.onInstalled.addListener(({ reason }) => {
|
|
|
|
if (
|
|
|
|
reason === 'install' &&
|
|
|
|
!(process.env.METAMASK_DEBUG || process.env.IN_TEST)
|
|
|
|
) {
|
|
|
|
platform.openExtensionInBrowser()
|
|
|
|
}
|
|
|
|
})
|