+
+
+
+ );
+ };
+
+ return (
+
+
+ {t('snapInstallWarningCheck')}
+
+
+
+ );
+}
+
+SnapInstallWarning.propTypes = {
+ /**
+ * onCancel handler
+ */
+ onCancel: PropTypes.func,
+ /**
+ * onSubmit handler
+ */
+ onSubmit: PropTypes.func,
+ /**
+ * Name of snap
+ */
+ snapName: PropTypes.string,
+};
diff --git a/ui/components/app/flask/snap-settings-card/snap-settings-card.js b/ui/components/app/flask/snap-settings-card/snap-settings-card.js
index 09debc698..95afbc810 100644
--- a/ui/components/app/flask/snap-settings-card/snap-settings-card.js
+++ b/ui/components/app/flask/snap-settings-card/snap-settings-card.js
@@ -13,12 +13,14 @@ import ToggleButton from '../../../ui/toggle-button';
import Chip from '../../../ui/chip';
import ColorIndicator from '../../../ui/color-indicator';
import Button from '../../../ui/button';
+import Tooltip from '../../../ui/tooltip';
import {
COLORS,
TYPOGRAPHY,
FONT_WEIGHT,
ALIGN_ITEMS,
+ JUSTIFY_CONTENT,
DISPLAY,
TEXT_ALIGN,
} from '../../../../helpers/constants/design-system';
@@ -41,7 +43,7 @@ const SnapSettingsCard = ({
name,
description,
icon,
- dateAdded,
+ dateAdded = '',
version,
url,
onToggle,
@@ -87,12 +89,14 @@ const SnapSettingsCard = ({
{name}
+
+
+
{this.renderHeaderIcon()}
+ {headerTitle}
+ {
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ npmPackageName ? (
+ {headerText}
-
- {Object.keys(permissions).map((permission) => (
-
);
}
PermissionsConnectPermissionList.propTypes = {
- permissions: PropTypes.objectOf(PropTypes.bool).isRequired,
+ permissions: PropTypes.object.isRequired,
};
diff --git a/ui/helpers/constants/design-system.js b/ui/helpers/constants/design-system.js
index 893e332da..89b0a3801 100644
--- a/ui/helpers/constants/design-system.js
+++ b/ui/helpers/constants/design-system.js
@@ -113,7 +113,7 @@ export const DISPLAY = {
LIST_ITEM: 'list-item',
};
-const FRACTIONS = {
+export const FRACTIONS = {
HALF: '1/2',
ONE_THIRD: '1/3',
TWO_THIRDS: '2/3',
diff --git a/ui/helpers/constants/routes.js b/ui/helpers/constants/routes.js
index 1de62a7ff..1969ff49b 100644
--- a/ui/helpers/constants/routes.js
+++ b/ui/helpers/constants/routes.js
@@ -12,6 +12,8 @@ const ALERTS_ROUTE = '/settings/alerts';
const NETWORKS_ROUTE = '/settings/networks';
const NETWORKS_FORM_ROUTE = '/settings/networks/form';
const ADD_NETWORK_ROUTE = '/settings/networks/add-network';
+const SNAPS_LIST_ROUTE = '/settings/snaps-list';
+const SNAPS_VIEW_ROUTE = '/settings/snaps-view';
const CONTACT_LIST_ROUTE = '/settings/contact-list';
const CONTACT_EDIT_ROUTE = '/settings/contact-list/edit-contact';
const CONTACT_ADD_ROUTE = '/settings/contact-list/add-contact';
@@ -28,6 +30,9 @@ const CONNECT_HARDWARE_ROUTE = '/new-account/connect';
const SEND_ROUTE = '/send';
const CONNECT_ROUTE = '/connect';
const CONNECT_CONFIRM_PERMISSIONS_ROUTE = '/confirm-permissions';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+const CONNECT_SNAP_INSTALL_ROUTE = '/snap-install';
+///: END:ONLY_INCLUDE_IN
const CONNECTED_ROUTE = '/connected';
const CONNECTED_ACCOUNTS_ROUTE = '/connected/accounts';
const SWAPS_ROUTE = '/swaps';
@@ -202,6 +207,8 @@ export {
SECURITY_ROUTE,
GENERAL_ROUTE,
ABOUT_US_ROUTE,
+ SNAPS_LIST_ROUTE,
+ SNAPS_VIEW_ROUTE,
CONTACT_LIST_ROUTE,
CONTACT_EDIT_ROUTE,
CONTACT_ADD_ROUTE,
@@ -213,6 +220,9 @@ export {
INITIALIZE_SEED_PHRASE_INTRO_ROUTE,
CONNECT_ROUTE,
CONNECT_CONFIRM_PERMISSIONS_ROUTE,
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ CONNECT_SNAP_INSTALL_ROUTE,
+ ///: END:ONLY_INCLUDE_IN
CONNECTED_ROUTE,
CONNECTED_ACCOUNTS_ROUTE,
PATH_NAME_MAP,
diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index ae2568fbb..9cb8a6ed3 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -4,6 +4,7 @@ import BigNumber from 'bignumber.js';
import * as ethUtil from 'ethereumjs-util';
import { DateTime } from 'luxon';
import { util } from '@metamask/controllers';
+import slip44 from '@metamask/slip44';
import { addHexPrefix } from '../../../app/scripts/lib/util';
import {
GOERLI_CHAIN_ID,
@@ -580,3 +581,18 @@ export function roundToDecimalPlacesRemovingExtraZeroes(
.dec(toBigNumber.dec(numberish).toFixed(numberOfDecimalPlaces))
.toNumber();
}
+
+/**
+ * Gets the name of the SLIP-44 protocol corresponding to the specified
+ * `coin_type`.
+ *
+ * @param {string | number} coinType - The SLIP-44 `coin_type` value whose name
+ * to retrieve.
+ * @returns {string | undefined} The name of the protocol if found.
+ */
+export function coinTypeToProtocolName(coinType) {
+ if (String(coinType) === '1') {
+ return 'Test Networks';
+ }
+ return slip44[coinType]?.name || undefined;
+}
diff --git a/ui/hooks/useOriginMetadata.js b/ui/hooks/useOriginMetadata.js
index e3365316e..1c4152aba 100644
--- a/ui/hooks/useOriginMetadata.js
+++ b/ui/hooks/useOriginMetadata.js
@@ -1,5 +1,5 @@
import { useSelector } from 'react-redux';
-import { getSubjectMetadata } from '../selectors';
+import { getTargetSubjectMetadata } from '../selectors';
import { SUBJECT_TYPES } from '../../shared/constants/app';
/**
@@ -19,24 +19,35 @@ import { SUBJECT_TYPES } from '../../shared/constants/app';
* current origin
*/
export function useOriginMetadata(origin) {
- const subjectMetadata = useSelector(getSubjectMetadata);
+ const targetSubjectMetadata = useSelector((state) =>
+ getTargetSubjectMetadata(state, origin),
+ );
+
if (!origin) {
return null;
}
- const url = new URL(origin);
- const minimumOriginMetadata = {
- host: url.host,
- hostname: url.hostname,
- origin,
- subjectType: SUBJECT_TYPES.UNKNOWN,
- };
+ let minimumOriginMetadata = null;
+ try {
+ const url = new URL(origin);
+ minimumOriginMetadata = {
+ host: url.host,
+ hostname: url.hostname,
+ origin,
+ subjectType: SUBJECT_TYPES.UNKNOWN,
+ };
+ } catch (_) {
+ // do nothing
+ }
- if (subjectMetadata?.[origin]) {
+ if (targetSubjectMetadata && minimumOriginMetadata) {
return {
...minimumOriginMetadata,
- ...subjectMetadata[origin],
+ ...targetSubjectMetadata,
};
+ } else if (targetSubjectMetadata) {
+ return targetSubjectMetadata;
}
+
return minimumOriginMetadata;
}
diff --git a/ui/pages/confirmation/confirmation.scss b/ui/pages/confirmation/confirmation.scss
index 7635c87c5..482f1c210 100644
--- a/ui/pages/confirmation/confirmation.scss
+++ b/ui/pages/confirmation/confirmation.scss
@@ -1,4 +1,5 @@
@import 'components/confirmation-footer/confirmation-footer';
+@import 'templates/flask/snap-confirm/index';
.confirmation-page {
width: 100%;
@@ -20,7 +21,6 @@
&__content {
grid-area: content;
- padding: 16px 16px 0;
min-width: 0;
& > :last-child {
diff --git a/ui/pages/confirmation/templates/add-ethereum-chain.js b/ui/pages/confirmation/templates/add-ethereum-chain.js
index a56565692..2a16852dd 100644
--- a/ui/pages/confirmation/templates/add-ethereum-chain.js
+++ b/ui/pages/confirmation/templates/add-ethereum-chain.js
@@ -206,6 +206,7 @@ function getValues(pendingApproval, t, actions) {
pendingApproval.id,
ethErrors.provider.userRejectedRequest(),
),
+ networkDisplay: true,
};
}
diff --git a/ui/pages/confirmation/templates/flask/snap-confirm/index.scss b/ui/pages/confirmation/templates/flask/snap-confirm/index.scss
new file mode 100644
index 000000000..7fed11cd3
--- /dev/null
+++ b/ui/pages/confirmation/templates/flask/snap-confirm/index.scss
@@ -0,0 +1,10 @@
+.snap-confirm {
+ padding: 16px 32px;
+ border-top: 1px solid var(--Grey-100);
+ border-bottom: 1px solid var(--Grey-100);
+ margin: 24px 0 16px 0;
+
+ .text {
+ font-family: monospace;
+ }
+}
diff --git a/ui/pages/confirmation/templates/flask/snap-confirm/snap-confirm.js b/ui/pages/confirmation/templates/flask/snap-confirm/snap-confirm.js
new file mode 100644
index 000000000..4a3a2268c
--- /dev/null
+++ b/ui/pages/confirmation/templates/flask/snap-confirm/snap-confirm.js
@@ -0,0 +1,105 @@
+import {
+ RESIZE,
+ TYPOGRAPHY,
+} from '../../../../../helpers/constants/design-system';
+
+function getValues(pendingApproval, t, actions) {
+ const { prompt, description, textAreaContent } = pendingApproval.requestData;
+
+ return {
+ content: [
+ {
+ element: 'Typography',
+ key: 'title',
+ children: prompt,
+ props: {
+ variant: TYPOGRAPHY.H3,
+ align: 'center',
+ fontWeight: 'bold',
+ boxProps: {
+ margin: [0, 0, 4],
+ },
+ },
+ },
+ ...(description
+ ? [
+ {
+ element: 'Typography',
+ key: 'subtitle',
+ children: description,
+ props: {
+ variant: TYPOGRAPHY.H6,
+ align: 'center',
+ boxProps: {
+ margin: [0, 0, 4],
+ },
+ },
+ },
+ ]
+ : []),
+ ...(textAreaContent
+ ? [
+ {
+ element: 'div',
+ key: 'text-area',
+ children: {
+ element: 'TextArea',
+ props: {
+ // TODO(ritave): Terrible hard-coded height hack. Fixing this to adjust automatically to current window height would
+ // mean allowing template compoments to change global css, and since the intended use of the template
+ // renderer was to allow users to build their own UIs, this would be a big no-no.
+ height: '238px',
+ value: textAreaContent,
+ readOnly: true,
+ resize: RESIZE.VERTICAL,
+ scrollable: true,
+ className: 'text',
+ },
+ },
+ props: {
+ className: 'snap-confirm',
+ },
+ },
+ ]
+ : []),
+ {
+ element: 'Typography',
+ key: 'only-interact-with-entities-you-trust',
+ children: [
+ {
+ element: 'span',
+ key: 'only-connect-trust',
+ children: `${t('onlyConnectTrust')} `,
+ },
+ {
+ element: 'a',
+ children: t('learnMore'),
+ key: 'learnMore-a-href',
+ props: {
+ href:
+ 'https://metamask.zendesk.com/hc/en-us/articles/4405506066331-User-guide-Dapps',
+ target: '__blank',
+ },
+ },
+ ],
+ props: {
+ variant: TYPOGRAPHY.H7,
+ align: 'center',
+ boxProps: {
+ margin: 0,
+ },
+ },
+ },
+ ],
+ approvalText: t('approveButtonText'),
+ cancelText: t('reject'),
+ onApprove: () => actions.resolvePendingApproval(pendingApproval.id, true),
+ onCancel: () => actions.resolvePendingApproval(pendingApproval.id, false),
+ };
+}
+
+const snapConfirm = {
+ getValues,
+};
+
+export default snapConfirm;
diff --git a/ui/pages/confirmation/templates/index.js b/ui/pages/confirmation/templates/index.js
index 2bbf54b1e..5b7aa6f78 100644
--- a/ui/pages/confirmation/templates/index.js
+++ b/ui/pages/confirmation/templates/index.js
@@ -6,10 +6,16 @@ import {
} from '../../../store/actions';
import addEthereumChain from './add-ethereum-chain';
import switchEthereumChain from './switch-ethereum-chain';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import snapConfirm from './flask/snap-confirm/snap-confirm';
+///: END:ONLY_INCLUDE_IN
const APPROVAL_TEMPLATES = {
[MESSAGE_TYPE.ADD_ETHEREUM_CHAIN]: addEthereumChain,
[MESSAGE_TYPE.SWITCH_ETHEREUM_CHAIN]: switchEthereumChain,
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ [MESSAGE_TYPE.SNAP_CONFIRM]: snapConfirm,
+ ///: END:ONLY_INCLUDE_IN
};
export const TEMPLATED_CONFIRMATION_MESSAGE_TYPES = Object.keys(
diff --git a/ui/pages/confirmation/templates/switch-ethereum-chain.js b/ui/pages/confirmation/templates/switch-ethereum-chain.js
index 4eee4a69f..cd28f21b0 100644
--- a/ui/pages/confirmation/templates/switch-ethereum-chain.js
+++ b/ui/pages/confirmation/templates/switch-ethereum-chain.js
@@ -85,6 +85,7 @@ function getValues(pendingApproval, t, actions) {
pendingApproval.id,
ethErrors.provider.userRejectedRequest(),
),
+ networkDisplay: true,
};
}
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index e2b080834..004312a85 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -21,7 +21,13 @@ import WhatsNewPopup from '../../components/app/whats-new-popup';
import RecoveryPhraseReminder from '../../components/app/recovery-phrase-reminder';
import ActionableMessage from '../../components/ui/actionable-message/actionable-message';
import Typography from '../../components/ui/typography/typography';
-import { TYPOGRAPHY, FONT_WEIGHT } from '../../helpers/constants/design-system';
+import {
+ TYPOGRAPHY,
+ FONT_WEIGHT,
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ COLORS,
+ ///: END:ONLY_INCLUDE_IN
+} from '../../helpers/constants/design-system';
import {
ASSET_ROUTE,
@@ -105,6 +111,11 @@ export default class Home extends PureComponent {
showWhatsNewPopup: PropTypes.bool.isRequired,
hideWhatsNewPopup: PropTypes.func.isRequired,
notificationsToShow: PropTypes.bool.isRequired,
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ errorsToShow: PropTypes.object.isRequired,
+ shouldShowErrors: PropTypes.bool.isRequired,
+ removeSnapError: PropTypes.func.isRequired,
+ ///: END:ONLY_INCLUDE_IN
showRecoveryPhraseReminder: PropTypes.bool.isRequired,
setRecoveryPhraseReminderHasBeenShown: PropTypes.func.isRequired,
setRecoveryPhraseReminderLastShown: PropTypes.func.isRequired,
@@ -242,6 +253,11 @@ export default class Home extends PureComponent {
setWeb3ShimUsageAlertDismissed,
originOfCurrentTab,
disableWeb3ShimUsageAlert,
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ removeSnapError,
+ errorsToShow,
+ shouldShowErrors,
+ ///: END:ONLY_INCLUDE_IN
infuraBlocked,
newNetworkAdded,
setNewNetworkAdded,
@@ -250,6 +266,43 @@ export default class Home extends PureComponent {
} = this.props;
return (
-
- {PERMISSION_TYPES[permission].label}
-
-
- ))}
+ {Object.keys(permissions).map((permission) => {
+ const listValue =
+ PERMISSION_LIST_VALUES[
+ getPermissionKey(permission, PERMISSION_LIST_VALUES)
+ ];
+
+ const { label, leftIcon, rightIcon } =
+ typeof listValue === 'function' ? listValue(permission) : listValue;
+
+ return (
+
+
+ {label}
+ {rightIcon && }
+
+ );
+ })}
+
+ {t('areYouDeveloper')}
+
+ global.platform.openTab({
+ url: targetSubjectMetadata.sourceCode,
+ })
+ }
+ >
+ {t('openSourceCode')}
+
+
- {page === '2' ? (
+ {page === '2' && isRequestingAccounts ? (
);
}
@@ -197,6 +227,9 @@ export default class PermissionConnect extends Component {
permissionsRequestId,
connectPath,
confirmPermissionPath,
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ snapInstallPath,
+ ///: END:ONLY_INCLUDE_IN
} = this.props;
const {
selectedAccountAddresses,
@@ -257,6 +290,29 @@ export default class PermissionConnect extends Component {
/>
)}
/>
+ {
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ }
+ this.goBack()}
@@ -178,9 +206,11 @@ export default class PermissionConnect extends Component {
{t('back')}
) : null}
-
- {t('xOfY', [page, '2'])}
-
+ {isRequestingAccounts ? (
+
+ {t('xOfY', [page, totalPages])}
+
+ ) : null}
+ {Object.entries(snaps).length ? (
+
+
+ {t('noSnaps')}
+
+
+ )}
+
+ );
+};
+
+export default SnapListTab;
diff --git a/ui/pages/settings/flask/snaps-list-tab/snap-list-tab.stories.js b/ui/pages/settings/flask/snaps-list-tab/snap-list-tab.stories.js
new file mode 100644
index 000000000..452b7754b
--- /dev/null
+++ b/ui/pages/settings/flask/snaps-list-tab/snap-list-tab.stories.js
@@ -0,0 +1,50 @@
+import React, { useState } from 'react';
+import { Provider } from 'react-redux';
+import configureStore from '../../../../store/store';
+import testData from '../../../../../.storybook/test-data';
+import SnapListTab from './snap-list-tab';
+
+// Using Test Data For Redux
+const store = configureStore(testData);
+
+export default {
+ title: 'Pages/Settings/SnapListTab',
+ id: __filename,
+ decorators: [(story) =>
+
+
+ {t('expandExperience')}
+
+
+ {t('manageSnaps')}
+
+
+
+ ) : (
+
+ {Object.entries(snaps).map(([key, snap]) => {
+ return (
+ {
+ onToggle(snap);
+ }}
+ description={snap.manifest.description}
+ url={snap.id}
+ name={snap.manifest.proposedName}
+ status={snap.status}
+ version={snap.version}
+ onClick={() => {
+ onClick(snap);
+ }}
+ />
+ );
+ })}
+
+
+ {
+ setSnap(s);
+ setViewingSnap(true);
+ }}
+ />
+
+ );
+};
+const state = store.getState();
+DefaultStory.args = {
+ snaps: state.metamask.snaps,
+ viewingSnap: false,
+};
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/settings/flask/view-snap/index.js b/ui/pages/settings/flask/view-snap/index.js
new file mode 100644
index 000000000..520826cbb
--- /dev/null
+++ b/ui/pages/settings/flask/view-snap/index.js
@@ -0,0 +1 @@
+export { default } from './view-snap';
diff --git a/ui/pages/settings/flask/view-snap/index.scss b/ui/pages/settings/flask/view-snap/index.scss
new file mode 100644
index 000000000..d0efae6f7
--- /dev/null
+++ b/ui/pages/settings/flask/view-snap/index.scss
@@ -0,0 +1,114 @@
+.view-snap {
+ padding: 12px 18px;
+
+ @media screen and (min-width: $break-large) {
+ padding: 12px;
+ }
+
+ &__subheader {
+ @include H4;
+
+ padding: 16px 4px;
+ border-bottom: 1px solid var(--alto);
+ margin-right: 24px;
+ height: 72px;
+ align-items: center;
+ display: flex;
+ flex-flow: row nowrap;
+
+ @media screen and (max-width: $break-small) {
+ margin-right: 0;
+ padding: 0 0 16px;
+ flex-direction: column;
+ align-items: center;
+ gap: 8px;
+ height: max-content;
+ }
+ }
+
+ &__title {
+ @media screen and (max-width: $break-small) {
+ padding-bottom: 16px;
+ }
+ }
+
+ &__pill-toggle-container {
+ align-items: center;
+ display: flex;
+ flex-grow: 1;
+
+ @media screen and (max-width: $break-small) {
+ width: 100%;
+ justify-content: space-between;
+ }
+ }
+
+ &__pill-container {
+ @media screen and (max-width: $break-small) {
+ padding-left: 0;
+ display: inline-block;
+ }
+ }
+
+ &__toggle-container {
+ @media screen and (max-width: $break-small) {
+ padding-left: 0;
+ display: inline-block;
+ }
+ }
+
+ &__content-container {
+ @media screen and (max-width: $break-small) {
+ width: 100%;
+ }
+ }
+
+ &__section {
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ flex-direction: column;
+ border-bottom: 1px solid var(--Grey-100);
+ padding-bottom: 16px;
+ margin-bottom: 16px;
+
+ @media screen and (max-width: $break-small) {
+ height: initial;
+ padding: 5px 0 16px;
+ }
+
+ .connected-sites-list__content-row {
+ border-top: none;
+ border-bottom: 1px solid var(--ui-2);
+
+ &:last-child {
+ border-bottom: none;
+ }
+ }
+
+ &:last-child {
+ margin-bottom: 0;
+ border-bottom: none;
+ }
+ }
+
+ &__permission-list {
+ padding-bottom: 0;
+
+ .permission {
+ padding-top: 16px;
+
+ &:last-child {
+ border-bottom: none;
+ }
+ }
+ }
+
+ &__remove-button {
+ max-width: 175px;
+
+ @media screen and (max-width: $break-small) {
+ align-self: center;
+ }
+ }
+}
diff --git a/ui/pages/settings/flask/view-snap/view-snap.js b/ui/pages/settings/flask/view-snap/view-snap.js
new file mode 100644
index 000000000..14c2b050e
--- /dev/null
+++ b/ui/pages/settings/flask/view-snap/view-snap.js
@@ -0,0 +1,171 @@
+import React, { useEffect } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
+import Button from '../../../../components/ui/button';
+import Typography from '../../../../components/ui/typography';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import {
+ TYPOGRAPHY,
+ COLORS,
+ TEXT_ALIGN,
+ FRACTIONS,
+} from '../../../../helpers/constants/design-system';
+import SnapsAuthorshipPill from '../../../../components/app/flask/snaps-authorship-pill';
+import Box from '../../../../components/ui/box';
+import ToggleButton from '../../../../components/ui/toggle-button';
+import PermissionsConnectPermissionList from '../../../../components/app/permissions-connect-permission-list/permissions-connect-permission-list';
+import ConnectedSitesList from '../../../../components/app/connected-sites-list';
+import Tooltip from '../../../../components/ui/tooltip';
+import { SNAPS_LIST_ROUTE } from '../../../../helpers/constants/routes';
+import {
+ disableSnap,
+ enableSnap,
+ removeSnap,
+ removePermissionsFor,
+} from '../../../../store/actions';
+import { getSnaps, getSubjectsWithPermission } from '../../../../selectors';
+
+function ViewSnap() {
+ const t = useI18nContext();
+ const history = useHistory();
+ const location = useLocation();
+ const { pathname } = location;
+ const pathNameTail = pathname.match(/[^/]+$/u)[0];
+ const snaps = useSelector(getSnaps);
+ const snap = Object.entries(snaps)
+ .map(([_, snapState]) => snapState)
+ .find((snapState) => {
+ const decoded = decodeURIComponent(escape(window.atob(pathNameTail)));
+ return snapState.id === decoded;
+ });
+
+ useEffect(() => {
+ if (!snap) {
+ history.push(SNAPS_LIST_ROUTE);
+ }
+ }, [history, snap]);
+
+ const authorshipPillUrl = `https://npmjs.com/package/${snap?.manifest.source.location.npm.packageName}`;
+ const connectedSubjects = useSelector((state) =>
+ getSubjectsWithPermission(state, snap?.permissionName),
+ );
+ const dispatch = useDispatch();
+ const onDisconnect = (connectedOrigin, snapPermissionName) => {
+ dispatch(
+ removePermissionsFor({
+ [connectedOrigin]: [snapPermissionName],
+ }),
+ );
+ };
+ const onToggle = () => {
+ if (snap.enabled) {
+ dispatch(disableSnap(snap.id));
+ } else {
+ dispatch(enableSnap(snap.id));
+ }
+ };
+
+ if (!snap) {
+ return null;
+ }
+ return (
+
+
+ );
+}
+
+export default React.memo(ViewSnap);
diff --git a/ui/pages/settings/index.scss b/ui/pages/settings/index.scss
index f257c79af..d5864e2a8 100644
--- a/ui/pages/settings/index.scss
+++ b/ui/pages/settings/index.scss
@@ -3,6 +3,8 @@
@import 'networks-tab/index';
@import 'settings-tab/index';
@import 'contact-list-tab/index';
+@import 'flask/snaps-list-tab/index';
+@import 'flask/view-snap/index';
.settings-page {
position: relative;
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index fd94271ba..7d6f37458 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -11,6 +11,10 @@ import {
ABOUT_US_ROUTE,
SETTINGS_ROUTE,
NETWORKS_ROUTE,
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ SNAPS_VIEW_ROUTE,
+ SNAPS_LIST_ROUTE,
+ ///: END:ONLY_INCLUDE_IN
CONTACT_LIST_ROUTE,
CONTACT_ADD_ROUTE,
CONTACT_EDIT_ROUTE,
@@ -26,6 +30,10 @@ import InfoTab from './info-tab';
import SecurityTab from './security-tab';
import ContactListTab from './contact-list-tab';
import ExperimentalTab from './experimental-tab';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import SnapListTab from './flask/snaps-list-tab';
+import ViewSnap from './flask/view-snap';
+///: END:ONLY_INCLUDE_IN
class SettingsPage extends PureComponent {
static propTypes = {
@@ -35,6 +43,7 @@ class SettingsPage extends PureComponent {
history: PropTypes.object,
isAddressEntryPage: PropTypes.bool,
isPopup: PropTypes.bool,
+ isSnapViewPage: PropTypes.bool,
pathnameI18nKey: PropTypes.string,
initialBreadCrumbRoute: PropTypes.string,
breadCrumbTextKey: PropTypes.string,
@@ -74,8 +83,8 @@ class SettingsPage extends PureComponent {
currentPath,
mostRecentOverviewPage,
addNewNetwork,
+ isSnapViewPage,
} = this.props;
-
return (
+
+
+
+
+
+ {snap.manifest.proposedName}
+
+
+
+
+
+
+
+
+
+
+
+
+ {snap.manifest.description}
+
+
+
+ {t('permissions')}
+
+ {t('snapAccess', [snap.manifest.proposedName])}
+
+
+
+
+
+
+
+ {t('connectedSites')}
+
+
+ {t('connectedSnapSites', [snap.manifest.proposedName])}
+
+ {
+ onDisconnect(origin, snap.permissionName);
+ }}
+ />
+
+
+
+ {t('removeSnap')}
+
+ {t('removeSnapDescription')}
+
+
+
+
- {this.renderSubHeader()}
+ {isSnapViewPage ? null : this.renderSubHeader()}
{this.renderContent()}
+ ),
+ content: t('snaps'),
+ key: SNAPS_LIST_ROUTE,
+ },
+ ///: END:ONLY_INCLUDE_IN
{
icon: 
,
content: t('securityAndPrivacy'),
@@ -280,6 +306,16 @@ class SettingsPage extends PureComponent {
path={`${CONTACT_VIEW_ROUTE}/:id`}
component={ContactListTab}
/>
+ {
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+
@@ -66,6 +70,7 @@ const Settings = ({ history }) => {
history={history}
pathnameI18nKey={pathnameI18nKey}
backRoute={backRoute}
+ isSnapViewPage={isSnapViewPage}
/>
);
diff --git a/ui/selectors/permissions.js b/ui/selectors/permissions.js
index 09d845d5c..be0543ef5 100644
--- a/ui/selectors/permissions.js
+++ b/ui/selectors/permissions.js
@@ -4,6 +4,7 @@ import {
getOriginOfCurrentTab,
getSelectedAddress,
getSubjectMetadata,
+ getTargetSubjectMetadata,
} from '.';
// selectors
@@ -96,6 +97,27 @@ export function getConnectedSubjectsForSelectedAddress(state) {
return connectedSubjects;
}
+export function getSubjectsWithPermission(state, permissionName) {
+ const subjects = getPermissionSubjects(state);
+
+ const connectedSubjects = [];
+
+ Object.entries(subjects).forEach(([origin, { permissions }]) => {
+ if (permissions[permissionName]) {
+ const { extensionId, name, iconUrl } =
+ getTargetSubjectMetadata(state, origin) || {};
+
+ connectedSubjects.push({
+ extensionId,
+ origin,
+ name,
+ iconUrl,
+ });
+ }
+ });
+ return connectedSubjects;
+}
+
/**
* Returns an object mapping addresses to objects mapping origins to connected
* subject info. Subject info objects have the following properties:
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index f61daadd2..c287422e9 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1,4 +1,7 @@
import { createSelector } from 'reselect';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import { memoize } from 'lodash';
+///: END:ONLY_INCLUDE_IN
import { addHexPrefix } from '../../app/scripts/lib/util';
import {
MAINNET_CHAIN_ID,
@@ -16,13 +19,20 @@ import {
TRANSPORT_STATES,
} from '../../shared/constants/hardware-wallets';
+import {
+ MESSAGE_TYPE,
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ SUBJECT_TYPES,
+ ///: END:ONLY_INCLUDE_IN
+} from '../../shared/constants/app';
+
+import { TRUNCATED_NAME_CHAR_LIMIT } from '../../shared/constants/labels';
+
import {
SWAPS_CHAINID_DEFAULT_TOKEN_MAP,
ALLOWED_SWAPS_CHAIN_IDS,
} from '../../shared/constants/swaps';
-import { TRUNCATED_NAME_CHAR_LIMIT } from '../../shared/constants/labels';
-
import {
shortenAddress,
getAccountByAddress,
@@ -50,7 +60,6 @@ import {
getLedgerWebHidConnectedStatus,
getLedgerTransportStatus,
} from '../ducks/app/app';
-import { MESSAGE_TYPE } from '../../shared/constants/app';
/**
* One of the only remaining valid uses of selecting the network subkey of the
@@ -526,6 +535,31 @@ export function getSubjectMetadata(state) {
return state.metamask.subjectMetadata;
}
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+/**
+ * @param {string} svgString - The raw SVG string to make embeddable.
+ * @returns {string} The embeddable SVG string.
+ */
+const getEmbeddableSvg = memoize(
+ (svgString) => `data:image/svg+xml;utf8,${encodeURIComponent(svgString)}`,
+);
+///: END:ONLY_INCLUDE_IN
+
+export function getTargetSubjectMetadata(state, origin) {
+ const metadata = getSubjectMetadata(state)[origin];
+
+ ///: BEGIN:ONLY_INCLUDE_IN(flask)
+ if (metadata?.subjectType === SUBJECT_TYPES.SNAP) {
+ const { svgIcon, ...remainingMetadata } = metadata;
+ return {
+ ...remainingMetadata,
+ iconUrl: svgIcon ? getEmbeddableSvg(svgIcon) : null,
+ };
+ }
+ ///: END:ONLY_INCLUDE_IN
+ return metadata;
+}
+
export function getRpcPrefsForCurrentProvider(state) {
const { frequentRpcListDetail, provider } = state.metamask;
const selectRpcInfo = frequentRpcListDetail.find(
@@ -650,6 +684,12 @@ export function getShowWhatsNewPopup(state) {
return state.appState.showWhatsNewPopup;
}
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+export function getSnaps(state) {
+ return state.metamask.snaps;
+}
+///: END:ONLY_INCLUDE_IN
+
/**
* Get an object of notification IDs and if they are allowed or not.
*
diff --git a/ui/store/actions.js b/ui/store/actions.js
index 0899f0dbc..71ba543e3 100644
--- a/ui/store/actions.js
+++ b/ui/store/actions.js
@@ -807,6 +807,33 @@ export function txError(err) {
};
}
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+export function disableSnap(snapId) {
+ return async (dispatch) => {
+ await promisifiedBackground.disableSnap(snapId);
+ await forceUpdateMetamaskState(dispatch);
+ };
+}
+
+export function enableSnap(snapId) {
+ return async (dispatch) => {
+ await promisifiedBackground.enableSnap(snapId);
+ await forceUpdateMetamaskState(dispatch);
+ };
+}
+
+export function removeSnap(snap) {
+ return async (dispatch) => {
+ await promisifiedBackground.removeSnap(snap);
+ await forceUpdateMetamaskState(dispatch);
+ };
+}
+
+export async function removeSnapError(msgData) {
+ return promisifiedBackground.removeSnapError(msgData);
+}
+///: END:ONLY_INCLUDE_IN
+
export function cancelMsg(msgData) {
return async (dispatch) => {
dispatch(showLoadingIndication());
diff --git a/yarn.lock b/yarn.lock
index d98e508cc..035f99887 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2586,49 +2586,12 @@
semver "^7.3.5"
yargs "^17.0.1"
-"@metamask/contract-metadata@^1.29.0", "@metamask/contract-metadata@^1.31.0":
+"@metamask/contract-metadata@^1.31.0":
version "1.31.0"
resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-1.31.0.tgz#9e3e46de7a955ea1ca61f7db20d9a17b5e91d3d0"
integrity sha512-4FBJkg/vDiYp/thIiZknxrJ0lfsj2eWIPenwlNZmoqOhoL4VqhK5eKWxi+EuGMvv9taP+QBRk6Key7wC1uL78A==
-"@metamask/controllers@^17.0.0":
- version "17.0.0"
- resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-17.0.0.tgz#7ef00b4f7583d8075115e8a2f074d7b66646bbe8"
- integrity sha512-myPlAk8SpNm5SwHHKGgm2XDLP4bxNR2UsKoQlYtV7bJq3l8FV1agSFwHBwDhg61/52Xvqdqy+1YDVdV3kOwPgg==
- dependencies:
- "@ethereumjs/common" "^2.3.1"
- "@ethereumjs/tx" "^3.2.1"
- "@metamask/contract-metadata" "^1.29.0"
- "@types/uuid" "^8.3.0"
- abort-controller "^3.0.0"
- async-mutex "^0.2.6"
- babel-runtime "^6.26.0"
- eth-ens-namehash "^2.0.8"
- eth-json-rpc-infura "^5.1.0"
- eth-keyring-controller "^6.2.1"
- eth-method-registry "1.1.0"
- eth-phishing-detect "^1.1.14"
- eth-query "^2.1.2"
- eth-rpc-errors "^4.0.0"
- eth-sig-util "^3.0.0"
- ethereumjs-util "^7.0.10"
- ethereumjs-wallet "^1.0.1"
- ethers "^5.4.1"
- ethjs-unit "^0.1.6"
- ethjs-util "^0.1.6"
- human-standard-collectible-abi "^1.0.2"
- human-standard-token-abi "^2.0.0"
- immer "^9.0.6"
- isomorphic-fetch "^3.0.0"
- jsonschema "^1.2.4"
- nanoid "^3.1.12"
- punycode "^2.1.1"
- single-call-balance-checker-abi "^1.0.0"
- uuid "^8.3.2"
- web3 "^0.20.7"
- web3-provider-engine "^16.0.3"
-
-"@metamask/controllers@^25.0.0":
+"@metamask/controllers@^25.0.0", "@metamask/controllers@^25.1.0":
version "25.1.0"
resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-25.1.0.tgz#2efee24a9a2b03ab2a2b0422c8f250931c269560"
integrity sha512-syndn2lIhtlACzaqjDrw23dJzw8pZ6en4Cr35C7B9RRS87EhahUqkPP73moAzLtvbyqtBlAUO1HHrqV3lw4E5g==
@@ -2717,6 +2680,24 @@
resolved "https://registry.yarnpkg.com/@metamask/forwarder/-/forwarder-1.1.0.tgz#13829d8244bbf19ea658c0b20d21a77b67de0bdd"
integrity sha512-Hggj4y0QIjDzKGTXzarhEPIQyFSB2bi2y6YLJNwaT4JmP30UB5Cj6gqoY0M4pj3QT57fzp0BUuGp7F/AUe28tw==
+"@metamask/iframe-execution-environment-service@^0.9.0":
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@metamask/iframe-execution-environment-service/-/iframe-execution-environment-service-0.9.0.tgz#721e15ee4651741a599940dbcfa524cc55eaaa47"
+ integrity sha512-a240sg83sX1dxfBDdRd0uoujaN4V9VtHKELMcTMgpYCI0uE83//Q01a7L8MiBtLhzr8o4D/xXRUIDR0Y9NKc3Q==
+ dependencies:
+ "@metamask/controllers" "^25.1.0"
+ "@metamask/object-multiplex" "^1.2.0"
+ "@metamask/post-message-stream" "^4.0.0"
+ "@metamask/snap-controllers" "^0.9.0"
+ "@metamask/snap-types" "^0.9.0"
+ "@metamask/snap-workers" "^0.9.0"
+ eth-rpc-errors "^4.0.3"
+ json-rpc-engine "^6.1.0"
+ json-rpc-middleware-stream "^3.0.0"
+ nanoid "^3.1.31"
+ pump "^3.0.0"
+ stream "^0.0.2"
+
"@metamask/jazzicon@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@metamask/jazzicon/-/jazzicon-2.0.0.tgz#5615528e91c0fc5c9d79202d1f0954a7922525a0"
@@ -2747,10 +2728,10 @@
resolved "https://registry.yarnpkg.com/@metamask/metamask-eth-abis/-/metamask-eth-abis-2.1.0.tgz#316c2e72373506f1a0120b76e432760a27eb6806"
integrity sha512-T8LBEB0PQo0N1tZQKZ2K8BGmv+IDLcXkzt8Pn7x0YnwZD6YpCIvKqYM3iy2fJ6wFXeCvRKqpn4K6EqwnkSJAbQ==
-"@metamask/object-multiplex@^1.1.0":
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/@metamask/object-multiplex/-/object-multiplex-1.1.0.tgz#6b1507c4d10caafd2ea82dd2a5360b91631e036e"
- integrity sha512-ImDw5+NdO5qnzmK/rpSlPmQMQm6HIC6wAHdR9nBaDK8TpeuRik5H8DCUcoNrxSeUAk1iHwchZ03lpZu6mZfrdw==
+"@metamask/object-multiplex@^1.1.0", "@metamask/object-multiplex@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@metamask/object-multiplex/-/object-multiplex-1.2.0.tgz#38fc15c142f61939391e1b9a8eed679696c7e4f4"
+ integrity sha512-hksV602d3NWE2Q30Mf2Np1WfVKaGqfJRy9vpHAmelbaD0OkDt06/0KQkRR6UVYdMbTbkuEu8xN5JDUU80inGwQ==
dependencies:
end-of-stream "^1.4.4"
once "^1.4.0"
@@ -2765,15 +2746,6 @@
readable-stream "^2.2.2"
through2 "^2.0.3"
-"@metamask/obs-store@^6.0.2":
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/@metamask/obs-store/-/obs-store-6.0.2.tgz#1fbc458cc617557a4557f9ab58e6676c474df2b1"
- integrity sha512-MjnP+xNZGBx46YZrR8ZYPb+ScPfxJUbs09MTByuQKxMsf7Lxz17oBTI5ZMkOZOTSBBxhknKdjJg+nAM8mMopwg==
- dependencies:
- "@metamask/safe-event-emitter" "^2.0.0"
- readable-stream "^2.2.2"
- through2 "^2.0.3"
-
"@metamask/obs-store@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@metamask/obs-store/-/obs-store-7.0.0.tgz#6cae5f28306bb3e83a381bc9ae22682316095bd3"
@@ -2807,13 +2779,13 @@
pump "^3.0.0"
webextension-polyfill-ts "^0.25.0"
-"@metamask/rpc-methods@^0.5.0":
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/@metamask/rpc-methods/-/rpc-methods-0.5.0.tgz#3c0073d80e68eceb8b9fa19bea0b2daef8638a42"
- integrity sha512-OFGd4T20dYTYxdB8WK0xa6FXRaNmJR5mAS7Wp7+6n8rqKljKJ0jDyfpGia1YKI6gKsB7Xdn5efnWxviuF/XQXQ==
+"@metamask/rpc-methods@^0.9.0":
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@metamask/rpc-methods/-/rpc-methods-0.9.0.tgz#eb55cc39d2ea9a663211e8d805bdf566af70c764"
+ integrity sha512-wii0TMuRscet8+x3tqfAcEmY0TrMFzOnD3QFpFVUy3fznv4b/EzDD/XLQToafd2yUaDjUrrS9FHwU9omqzPxcg==
dependencies:
"@metamask/key-tree" "^3.0.1"
- "@metamask/snap-controllers" "^0.5.0"
+ "@metamask/snap-controllers" "^0.9.0"
eth-rpc-errors "^4.0.2"
"@metamask/safe-event-emitter@^2.0.0":
@@ -2821,57 +2793,49 @@
resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c"
integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==
-"@metamask/snap-controllers@^0.4.0":
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.4.0.tgz#20647f061e20263f462347c2bf0d59f7aedd6898"
- integrity sha512-pZ9S72Y9u2KBrMdzFauz6t4LIxJBqcT6uzxstxdY8y0qroeeTJum6Z0L9HFkVSsTLP3JMyVSDD6FwRsHIwXewg==
- dependencies:
- "@metamask/controllers" "^17.0.0"
- "@metamask/object-multiplex" "^1.1.0"
- "@metamask/obs-store" "^6.0.2"
- "@metamask/post-message-stream" "4.0.0"
- "@metamask/safe-event-emitter" "^2.0.0"
- "@metamask/snap-workers" "^0.4.0"
- "@types/deep-freeze-strict" "^1.1.0"
- deep-freeze-strict "^1.1.1"
- eth-rpc-errors "^4.0.2"
- fast-deep-equal "^3.1.3"
- immer "^9.0.6"
- json-rpc-engine "^6.1.0"
- json-rpc-middleware-stream "^3.0.0"
- nanoid "^3.1.28"
- pump "^3.0.0"
+"@metamask/slip44@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@metamask/slip44/-/slip44-2.0.0.tgz#1b646a1418af341d5ea979c28015a817ff23af33"
+ integrity sha512-eRomm783ti/1b/TlNnlTCUkYRuTaMYkeTAG0z2rt/WyT8UzxY+8+v/kbl9vk5qhDHeclzBrd9gbqLnLU1kh+Ow==
-"@metamask/snap-controllers@^0.5.0":
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.5.0.tgz#a77563ea7bea0ba7c6fd73059f9ecbf86be16fd4"
- integrity sha512-eKuKQh17LrHfkpk8T5J87jg4TTmnoG65JpPHgpV+GLyohF4CMEtyK6uJYoPcm5c3z7IArcYbuucc1bqLbz9JoA==
+"@metamask/snap-controllers@^0.9.0":
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.9.0.tgz#e0006fc9991e995dd86dff792106990aae2aeda0"
+ integrity sha512-os3fEai0w4ctpyy6ExlthY8tnww98Vm+RVwOZgrCKDY5dAXqlSXpyWc1uOfkQyiPhUEJtdznJTWzaWzNIO9MfQ==
dependencies:
- "@metamask/controllers" "^17.0.0"
+ "@metamask/controllers" "^25.1.0"
"@metamask/object-multiplex" "^1.1.0"
"@metamask/obs-store" "^7.0.0"
"@metamask/post-message-stream" "4.0.0"
"@metamask/safe-event-emitter" "^2.0.0"
- "@metamask/snap-workers" "^0.5.0"
+ "@metamask/snap-workers" "^0.9.0"
"@types/deep-freeze-strict" "^1.1.0"
+ ajv "^8.8.2"
+ concat-stream "^2.0.0"
deep-freeze-strict "^1.1.1"
eth-rpc-errors "^4.0.2"
fast-deep-equal "^3.1.3"
+ gunzip-maybe "^1.4.2"
immer "^9.0.6"
json-rpc-engine "^6.1.0"
json-rpc-middleware-stream "^3.0.0"
- nanoid "^3.1.28"
+ nanoid "^3.1.31"
pump "^3.0.0"
+ readable-web-to-node-stream "^3.0.2"
+ semver "^7.3.5"
+ tar-stream "^2.2.0"
-"@metamask/snap-workers@^0.4.0":
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/@metamask/snap-workers/-/snap-workers-0.4.0.tgz#ba561eb15a7b7e7b353738ad5635a68c03cf64b0"
- integrity sha512-usPEnwRXIwaDc06f8Jis4/CxXzmZJpPOLucOMqkxGAAz3hepA/T5fbfus12sibo5h6QsG0VTqBQ5AqKFlTr0zQ==
+"@metamask/snap-types@^0.9.0":
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@metamask/snap-types/-/snap-types-0.9.0.tgz#aa164111be1b5c53fbaaf03c1bccbdbd0741daa4"
+ integrity sha512-pK4tvurUhcKMEkTD0XvQze5HCbtrgmpFWDztBekNIMJTXDrnYIEw4Dxn+LwCX7WJ0DN/03brQSEzmIrYbcBw7Q==
+ dependencies:
+ "@metamask/controllers" "^25.1.0"
-"@metamask/snap-workers@^0.5.0":
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/@metamask/snap-workers/-/snap-workers-0.5.0.tgz#9f1b8243f64819e40d66e659d580b6da59cb8015"
- integrity sha512-sR30/nmkndPeLox282BdTNnU3g6Mo5Gt8rdr6PUSyfosbwrYtrbZcXFqR+ozK/gNhJ3de7hpjLXKNkVSF8OjOQ==
+"@metamask/snap-workers@^0.9.0":
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@metamask/snap-workers/-/snap-workers-0.9.0.tgz#215407b632fef4723dd75af7accf1f02a6a46916"
+ integrity sha512-+4YY5CQ7OPFPWh4QF5e4COgc0aWL6Df7Oc8/y//Sabp1rmXWI429OzCOlBi+NGJfQ1K7ORBMlRtOwYB9ZmWyLA==
"@metamask/test-dapp@^5.0.0":
version "5.0.0"
@@ -5303,10 +5267,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
-ajv@^8.0.1:
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.2.tgz#1396e27f208ed56dd5638ab5a251edeb1c91d402"
- integrity sha512-V0HGxJd0PiDF0ecHYIesTOqfd1gJguwQUOYfMfAWnRsWQEXfc5ifbUFhD3Wjc+O+y7VAqL+g07prq9gHQ/JOZQ==
+ajv@^8.0.1, ajv@^8.8.2:
+ version "8.8.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb"
+ integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -6914,6 +6878,13 @@ browserify-unibabel@^3.0.0:
resolved "https://registry.yarnpkg.com/browserify-unibabel/-/browserify-unibabel-3.0.0.tgz#5a6b8f0f704ce388d3927df47337e25830f71dda"
integrity sha1-WmuPD3BM44jTkn30czfiWDD3Hdo=
+browserify-zlib@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+ integrity sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=
+ dependencies:
+ pako "~0.2.0"
+
browserify-zlib@^0.2.0, browserify-zlib@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
@@ -9839,10 +9810,10 @@ duplexer@^0.1.1, duplexer@~0.1.1:
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-duplexify@^3.1.2, duplexify@^3.4.2:
- version "3.5.1"
- resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
- integrity sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==
+duplexify@^3.1.2, duplexify@^3.4.2, duplexify@^3.5.0:
+ version "3.7.1"
+ resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+ integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
dependencies:
end-of-stream "^1.0.0"
inherits "^2.0.1"
@@ -9921,6 +9892,11 @@ elliptic@6.5.3, elliptic@6.5.4, elliptic@=3.0.3, elliptic@^6.0.0, elliptic@^6.4.
minimalistic-assert "^1.0.1"
minimalistic-crypto-utils "^1.0.1"
+emitter-component@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6"
+ integrity sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY=
+
emittery@0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.0.tgz#bb373c660a9d421bb44706ec4967ed50c02a8026"
@@ -11417,7 +11393,7 @@ ethjs-util@0.1.3:
is-hex-prefixed "1.0.0"
strip-hex-prefix "1.0.0"
-ethjs-util@0.1.6, ethjs-util@^0.1.3, ethjs-util@^0.1.6:
+ethjs-util@0.1.6, ethjs-util@^0.1.3:
version "0.1.6"
resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.6.tgz#f308b62f185f9fe6237132fb2a9818866a5cd536"
integrity sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==
@@ -13433,6 +13409,18 @@ gulplog@^1.0.0:
dependencies:
glogg "^1.0.0"
+gunzip-maybe@^1.4.2:
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz#b913564ae3be0eda6f3de36464837a9cd94b98ac"
+ integrity sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==
+ dependencies:
+ browserify-zlib "^0.1.4"
+ is-deflate "^1.0.0"
+ is-gzip "^1.0.0"
+ peek-stream "^1.1.0"
+ pumpify "^1.3.3"
+ through2 "^2.0.3"
+
gzip-size@5.1.1, gzip-size@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -15019,6 +15007,11 @@ is-decimal@^1.0.0, is-decimal@^1.0.2:
resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
+is-deflate@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-deflate/-/is-deflate-1.0.0.tgz#c862901c3c161fb09dac7cdc7e784f80e98f2f14"
+ integrity sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ=
+
is-descriptor@^0.1.0:
version "0.1.6"
resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -15147,6 +15140,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
dependencies:
is-extglob "^2.1.1"
+is-gzip@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
+ integrity sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=
+
is-hex-prefixed@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554"
@@ -19105,7 +19103,7 @@ nanoid@^2.0.0, nanoid@^2.1.6:
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
-nanoid@^3.1.12, nanoid@^3.1.23, nanoid@^3.1.28, nanoid@^3.1.31:
+nanoid@^3.1.23, nanoid@^3.1.31:
version "3.2.0"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
@@ -20444,6 +20442,11 @@ package-json@^6.3.0:
registry-url "^5.0.0"
semver "^6.2.0"
+pako@~0.2.0:
+ version "0.2.9"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+ integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
+
pako@~1.0.2, pako@~1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -20816,6 +20819,15 @@ pbkdf2@^3.0.17, pbkdf2@^3.0.3, pbkdf2@^3.0.9:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
+peek-stream@^1.1.0:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/peek-stream/-/peek-stream-1.1.3.tgz#3b35d84b7ccbbd262fff31dc10da56856ead6d67"
+ integrity sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==
+ dependencies:
+ buffer-from "^1.0.0"
+ duplexify "^3.5.0"
+ through2 "^2.0.3"
+
peer-book@^0.9.1, peer-book@~0.9.0:
version "0.9.1"
resolved "https://registry.yarnpkg.com/peer-book/-/peer-book-0.9.1.tgz#42dffd7b1faf263bd6abe2907a26f7411f4dbf34"
@@ -22811,6 +22823,13 @@ readable-stream@~1.0.15:
isarray "0.0.1"
string_decoder "~0.10.x"
+readable-web-to-node-stream@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb"
+ integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==
+ dependencies:
+ readable-stream "^3.6.0"
+
readdir-scoped-modules@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
@@ -24937,6 +24956,13 @@ stream-to-pull-stream@^1.7.2, stream-to-pull-stream@^1.7.3:
looper "^3.0.0"
pull-stream "^3.2.3"
+stream@^0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef"
+ integrity sha1-f1Nj8Ff2WSxVlfALyAon9c7B8O8=
+ dependencies:
+ emitter-component "^1.1.1"
+
streamsearch@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
@@ -25522,7 +25548,7 @@ tar-fs@^2.0.0:
pump "^3.0.0"
tar-stream "^2.1.4"
-tar-stream@^2.0.0, tar-stream@^2.0.1, tar-stream@^2.1.4:
+tar-stream@^2.0.0, tar-stream@^2.0.1, tar-stream@^2.1.4, tar-stream@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
@@ -26751,7 +26777,7 @@ util.promisify@1.0.0:
define-properties "^1.1.2"
object.getownpropertydescriptors "^2.0.3"
-util@0.10.3, util@~0.10.1:
+util@0.10.3:
version "0.10.3"
resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
@@ -26777,6 +26803,13 @@ util@^0.12.0, util@^0.12.3, util@~0.12.0:
safe-buffer "^5.1.2"
which-typed-array "^1.1.2"
+util@~0.10.1:
+ version "0.10.4"
+ resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+ integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+ dependencies:
+ inherits "2.0.3"
+
utila@^0.4.0, utila@~0.4:
version "0.4.0"
resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"