Skip to content

Commit

Permalink
[FLASK] Add Snaps Keyring (#19710)
Browse files Browse the repository at this point in the history
* flask - add restricted snap_manageAccounts

* snap keyring: use local snap keyring instead of package

* mvp snap-keyring

* fixed the easier lint errors

* fix missing permission text

* add removal function

* update snap keyring

* update dep

* update git link

* update messages and remove snap keyring from lib

* set snapprovider as soon as possible

* chore: update snap keyring dependency

* chore: pass SnapController to SnapKeyring constructor

* chore: update deps and comment line (wip)

* fix latest update for snaps and remove setController

* update yarn lock

* add routes

* add messages

* add message

* add snap account detail page

* add snap account card

* add snap account page

* update route

* add background

* use css grid

* update snap text styling

* fix lint

* remove unused import

* change manage link to go to snap

* add types for react-router-dom

* add link to settings

* add breadcrumb to header

* add popover

* add prop types

* add link to propTypes

* fix icon in header and tag

* update popover

* update yarn.lock

* add link to account list menu

* update from deprecated

* add add-snap-popup

* use popoverheader

* fix lint

* update to use modal instead of popup

* add install snap

* remove export of DeferredPromise

* change snap keyring to its own enum

* update imports and fences

* fix snapId and route

* fix header and button for snapCard

* hide app header on AddSnapAccountPage

* update icon

* match path to SnapAccountDetail

* set getting started button to close modal

* fix key prop warning

* add By Metamask message

* fix label

* add fence to snapkeyringtype

* update yarn.lock

* refactor removeAccount and static snap list

* update removeSnap

* feat: remove associated accounts when snap is removed

* add get snaps installed to snaps page

* fix updateAvailable

* add tests to ui components

* update test

* update scss

* udpate config snap popup style

* fixed https://www.notion.so/Show-pop-up-only-once-c6aa8494486a4ece8a5c5e35fea56ab5

* update accountListMenu click to open tab or push depending on environment

* update yark.lock

* remove unused uuid

* update lock

* update eth-snap-keyring

* udpate install from snap page

* update to install to use popup

* use release versino of eth-snap-keyring

* chore: bump snaps-utils version to `0.34.1-flask.1`

* update configure snap

* chore: update eth-snap-keyring

* chore: update policies

* fix: remove unused

* fix: fix snap-account-detail-page test

* fix: fix styles

* chore: remove swappable-obj-proxy

* fix: fix duplicate entry

* fix: disable export private key for snaps account

* feat: shuffle snap lists on every reload

* fix: configure not popping up

* refactor: snapsAddSnapAccountModalDismissal into action and selector

* fix: E2BIG when running prettier

* fix: lint default export or add-snap-account-modal

* fix: lint, remove vendor prefix

* fix: fix snapCreatedByMetamask to snapCreatedByMetaMask

* Add `manageAccounts` RPC method (#19724)

* Update dependencies

* Remove snap-keyring-permissions

* Update dependencies

* Update dependencies

* Update imports

* removed portfolio link from wallet view (#19716)

* removed portfolio link from wallet view

* removed unused code

* updated test

* updated spec file

* updated test

* Validate LavaMoat policies on each PR (#19703)

* Validate LavaMoat policies on each PR

The LavaMoat policies are now validated on every PR. This makes it
easier to validate policy changes, as they should always correspond
with the changes made in the PR (unlike today, when they could be due
to a change in platform or a previous PR).

Closes #19680

* Update LavaMoat policies

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>

* fix(action): add required permissions to remove labels (#19728)

* Fix dependencies

* signature approved metrics e2e test (#19628)

* Update dependencies

* Integrate Snow with LavaMoat scuttling protection (#17969)

* Update lavamoat policies

* Security Provider cleanup (#19694)

* security-prov: isFlaggedSecurityProviderResponse

* security-prov: create shared/modules/util

* security prov: rn isFlagged -> isSuspcious
- util fn returns true if response is not verified and flagged

* security prov: add util test
and support undefined param

* security prov: reorg util fn
- no logic changes

* Update LavaMoat policies (#19744)

Update LavaMoat policies to match what CI expects.

* Replacing deprecated constants & creating stories (#19686)

* Replacing deprecated constants & creating stories

* updating snapshot

* fix: fix imports

* chore: update policy.json

* fix: move SmartTransactionController out of snaps code fence

* fix: yarn.lock dedupe

* fix: lavamoat policy

* fix: update test

* fix: remove snapshot, the list of snaps are always randomized.

* fix: resole snaps-controller to use flask

---------

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Gauthier Petetin <gauthierpetetin@hotmail.com>
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Co-authored-by: weizman <weizmangal@gmail.com>
Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Co-authored-by: Dhruv <79097544+dhruvv173@users.noreply.github.com>
Co-authored-by: Monte Lai <monte.lai@consensys.net>

* Update LavaMoat policies

* chore: fix webapp policy.json

* feat: add snap label test

* feat: test to disable export private key for snap accounts

* feat: add snap account link test in account-list-menu

* fix: add fence for setSnapsAddSnapAccountModalDismissed

* fix: remove comments

* fix: move routes into snaps fence

* feat: use snap registry

* fix: account snap identification

* chore: add `keyring-snaps` feature flag

* fix: remove unneeded spread

* Disable warn logs in content-script (#19754)

* Use Yarn caching in GitHub Actions (#19662)

GitHub actions that install dependencies will now also cache those
dependencies using the standard strategy for Yarn (which is to hash the
lockfile).

This matches the module template (see MetaMask/metamask-module-template#145
for details).

This should have no functional impact except that this action will run
faster when dependencies are unchanged.

* Fixing misspelling in 10.28.0 changelog notes (#19756)

* Add `tokenId` type validation in `wallet_watchAsset` middleware (#19738)

* Remove unused GitHub Action workflow (#19660)

This GitHub action workflow was disabled, but was still running setup
steps. It has now been removed entirely. We can re-introduce it again
later once the problem that led to it being disabled has been fixed.

The associated npm script and JavaScript module have been removed as
well.

* Fix #847 - Don't show account address on token pages (#19740)

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>

* Deprecating FormField and fixing console error (#19739)

* Deprecating FormField and fixing console error

* Updating snapshots

* updated linea image for token and badge (#19717)

* updated linea image for token and badge

* replaced hardcoded string with constant

* UI updates for contacts Page (#19646)

* updated contacts flow update

* json file updates

* updated contacts edit and view list

* keep contacts tab selected

* lint fix

* replaced hardcoded strings with constant

* updated padding in box

* Replacing deprecated components and fixing prop errors (#19745)

* Use `snaps@0.35.2-flask.1` and `snaps@1.0.0-prerelease.1` (#19734)

* snaps@0.35.0-flask.1

* Update LavaMoat policies

* Update stable snaps packages to 1.0.0-prerelease.1

* Update LavaMoat policies

* Fix lint

* snaps@0.35.2

* Exclude snap_manageAccounts

* Code fencing

* Revert removing endowment:keyring exclusion

* Bump iframe URLs

* UX: Ensure multichain native token name is always shown (#19705)

* UX: Ensure multichain native token name is always shown

* Fix lint

* UX Multichain: fixed padding for edit screen (#19707)

* fixed padding for edit screen

* Use network picker for header trigger

* Fix swaps display

* updated snapshot

---------

Co-authored-by: David Walsh <davidwalsh83@gmail.com>

* Bump @metamask/providers to v11.1.0 (#19762)

* Bump @metamask/providers to v11.1.0

---------

Co-authored-by: Alex <adonesky@gmail.com>

* Fix fallback gas estimation (#19746)

* Fix fallback gas estimation

Our fallback gas estimation was failing due to a bug in the
`@metamask/controller-utils` package. This was causing gas estimation
to fail completely on certain networks (those not supported by our gas
estimation APIs and non EIP-1559 compatibile), and it was causing the
fallback gas estimation operation (in case our API was down) to fail
across all networks.

Fixes #19735

* Add e2e tests

E2E tests have been added to capture gas estimation. Cases are added
for our API, for the fallback estimate, and for non-EIP-1559 estimates.

As part of this work, the legacy gas API had to be disabled. This was
being used in e2e tests but was dead code in production. It needed to
be disabled to ensure the code under test was reachable.

* Fix gas API referenced in e2e test

* Update unit test snapshots

* Update Label component font weight from bold to medium (#19731)

* Update Label component font weight from bold to medium

* update snapshot

* fix snapshots

* fix snapshots 2

* Removeing deprecated constants for enums

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>

* Part of #17670: Replace Typography with Text component in CancelSpeedupPopover (#18638)

* create story

* replace Typography with Text component

* review changes

* replace CSS with props styling
* use `Button` from `component-library`
* tooltip HTML refactor with `component-library` components
* remove whitespace in story

* strong tag support within Text component

* addresses #18651
* taken from #18752 as suggested in #18638 (comment)

* replace `strong` with new `Text as="strong"`

* remove unneccessary css from fa564e3

* add text variant definition

* Updating text variant of button

* restrore proper spacing between elements

* Quick fix for test

* Adding key

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Issue 17670 replace typography with text (#19433)

* Replace Typograph with Text component in numeric-input-component.js

* Replace Typography with Text component in signature-request-message.js

* Replace Typography with Text component in signature-request.component.js

* Replacing deprecating constants and fixing some signature story warnings

* Updating snapshot

* Fixing import

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Part of #18714: Replacing deprecated constants in `confirm-subtitle` folder (#19699)

* repalcing deprecated constants

* resolve issue

* lint fixes

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>

* Part of #17670: Replace Typography with Text component in: callout.js (#18912)

* Part of #17670: Replace Typography with Text component in: callout.js

* Update ui/components/ui/callout/callout.js

Co-authored-by: Danica Shen <zhaodanica@gmail.com>

* Update callout.js

* Updating snapshot and deprecating component

* Updating snapshot and deprecating component

---------

Co-authored-by: Danica Shen <zhaodanica@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* [MMI] Added code fences in whats new popup (#19581)

* added code fences in whats new popup

* Improved code

* Added missing prop

* Update LavaMoat policies

* updated functions by using an options object for the rendering functions in order to bypass possible typsecript issues

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>

* Updated action list in token, NFTs and activity view (#19702)

* updated ui for nft import button

* updated no nft image found in the center

* updated footer for all screens in tabs

* removed no nft state from nft tab

* updated snapshot

* lint fix

* fixed e2e tests

* fixed prep build error

* removed no nfts yet test

* updated tabs

* fixed prod error

* updated no nft screen

* changed button size to md

* fix: change 'M' to '?'

* fix: update fence to keyring-snaps

* chore: rename folder

* fix: typo

* chore: remove logs

* feat: add metamask developer constant

* fix: sass keyring-snap path

* chore: update yarn.lock

* fix: remove alias

* feat: add KEYRING_SNAPS_REGISTRY_URL env

* fix: nested fence

* feat: add snap manageAccount e2e (#19777)

* feat: add snap manageAccount e2e

* feat: update link

* fix: lint

* fix: get values of restrictedMethodPermissionBuilders

* fix: add fence to perferences

* fix: stop shuffle

* fix: remove KEYRING_SNAPS_REGISTRY_URL from metamaskRc

* fix: use permissions to determine account snaps

* fix: remove shuffle

* fix: add comments to fences in excluded snap permission.

* chore: fix policy.json

* fix: fix snap-account-detail test

* fix: lint

* fix: snap accoutn detail page test

* Update LavaMoat policies

* Update ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.test.tsx

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.test.tsx

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* fix: remove fence from isAbleToExportAccount

* chore: remove comment line

* fix: dismiss snap modal

* fix: try catch for scroll

* fix: icon for manageAccount

* fix: update `handleSnapRequest` to make `params` optional and add `id`

* fix: lint for uuid

* fix: remove arg in saveSnapKeyring

* fix: add fence for uuidV4

* chore: bump dep

* fix: permission_manageAccounts message and icon

* chore: update registry link

* chore: convert address to lowercase

* fix: change icon

* chore: bump eth-snap-keyring

* chore: update webapp policy.json

* Update ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.test.tsx

Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>

* fix: update fences

* fix: nested fence

* Update app/_locales/en/messages.json

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update app/_locales/en/messages.json

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update app/_locales/en/messages.json

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update app/_locales/en/messages.json

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update ui/components/multichain/account-details/account-details-display.js

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update ui/pages/keyring-snaps/snap-account-detail-page/header.tsx

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* Update ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.tsx

Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>

* fix: rename and added jsdoc

* fix: add fence to snap label

* fix: remove comment

* fix: change pixel to int and remove unused class

* fix: lint

* fix: create two tests for main and flask restricted methods

* fix: remove fence in test

* fix: lint header

* feat: allow `metamask.github.io` in manifest

* fix: remove comment

* fix: rename isAbleToExportAccount

* chore: use a more restrictive registry URL

* fix: change to && not ||

* fix: remove unused

* fix: move keyring snaps URL to Flask's base manifest

* fix: use fetch instead of fetchWithCache

* fix: lint

---------

Co-authored-by: kumavis <aaron@kumavis.me>
Co-authored-by: Howard Braham <howrad@gmail.com>
Co-authored-by: Daniel Rocha <68558152+danroc@users.noreply.github.com>
Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Gauthier Petetin <gauthierpetetin@hotmail.com>
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Co-authored-by: weizman <weizmangal@gmail.com>
Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Co-authored-by: Dhruv <79097544+dhruvv173@users.noreply.github.com>
Co-authored-by: ryanml <ryanlanese@gmail.com>
Co-authored-by: Alex Donesky <adonesky@gmail.com>
Co-authored-by: David Walsh <davidwalsh83@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
Co-authored-by: jiexi <jiexiluan@gmail.com>
Co-authored-by: jainex <jainexp017@gmail.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Garrett Bear <gwhisten@gmail.com>
Co-authored-by: Ujwal Kumar <ujwalkumar95@gmail.com>
Co-authored-by: rohit kerkar <129620973+rohiiittttt@users.noreply.github.com>
Co-authored-by: Harsh Shukla <125105825+PrgrmrHarshShukla@users.noreply.github.com>
Co-authored-by: Danica Shen <zhaodanica@gmail.com>
Co-authored-by: Albert Olivé <albertolivecorbella@gmail.com>
Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>
  • Loading branch information
1 parent 230c0c6 commit af2c87d
Show file tree
Hide file tree
Showing 62 changed files with 3,323 additions and 236 deletions.
78 changes: 78 additions & 0 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

218 changes: 218 additions & 0 deletions app/images/add-snaps-image.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions app/images/snap-account-page.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { endowmentPermissionBuilders } from '@metamask/snaps-controllers';
import {
restrictedMethodPermissionBuilders,
selectHooks,
} from '@metamask/rpc-methods';
import { endowmentPermissionBuilders } from '@metamask/snaps-controllers';
import {
ExcludedSnapEndowments,
ExcludedSnapPermissions,
Expand Down
24 changes: 24 additions & 0 deletions app/scripts/controllers/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import { IPFS_DEFAULT_GATEWAY_URL } from '../../../shared/constants/network';
import { LedgerTransportTypes } from '../../../shared/constants/hardware-wallets';
import { ThemeType } from '../../../shared/constants/preferences';
import { shouldShowLineaMainnet } from '../../../shared/modules/network.utils';
///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
import { KEYRING_SNAPS_REGISTRY_URL } from '../../../shared/constants/app';
///: END:ONLY_INCLUDE_IN

export default class PreferencesController {
/**
Expand Down Expand Up @@ -65,8 +68,12 @@ export default class PreferencesController {
ledgerTransportType: window.navigator.hid
? LedgerTransportTypes.webhid
: LedgerTransportTypes.u2f,
snapRegistryList: {},
transactionSecurityCheckEnabled: false,
theme: ThemeType.os,
///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
snapsAddSnapAccountModalDismissed: false,
///: END:ONLY_INCLUDE_IN
isLineaMainnetReleased: false,
...opts.initState,
};
Expand Down Expand Up @@ -511,6 +518,23 @@ export default class PreferencesController {
return this.store.getState().disabledRpcMethodPreferences;
}

///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
setSnapsAddSnapAccountModalDismissed(value) {
this.store.updateState({ snapsAddSnapAccountModalDismissed: value });
}

async updateSnapRegistry() {
let snapRegistry;
try {
snapRegistry = await fetch(KEYRING_SNAPS_REGISTRY_URL);
} catch (error) {
console.error(`Failed to fetch registry: `, error);
snapRegistry = {};
}
this.store.updateState({ snapRegistryList: snapRegistry });
}
///: END:ONLY_INCLUDE_IN

//
// PRIVATE METHODS
//
Expand Down
62 changes: 59 additions & 3 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,22 @@ import {
SubjectMetadataController,
SubjectType,
} from '@metamask/subject-metadata-controller';
import SmartTransactionsController from '@metamask/smart-transactions-controller';
///: BEGIN:ONLY_INCLUDE_IN(snaps)
import { encrypt, decrypt } from '@metamask/browser-passworder';
import { RateLimitController } from '@metamask/rate-limit-controller';
import { NotificationController } from '@metamask/notification-controller';
///: END:ONLY_INCLUDE_IN
import SmartTransactionsController from '@metamask/smart-transactions-controller';
///: BEGIN:ONLY_INCLUDE_IN(snaps)

import {
CronjobController,
JsonSnapsRegistry,
SnapController,
IframeExecutionService,
} from '@metamask/snaps-controllers';
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
import { SnapKeyring } from '@metamask/eth-snap-keyring';
///: END:ONLY_INCLUDE_IN

///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
import {
Expand Down Expand Up @@ -772,6 +774,16 @@ export default class MetamaskController extends EventEmitter {
///: END:ONLY_INCLUDE_IN
}

///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
additionalKeyrings.push(
(() => {
const builder = () => new SnapKeyring(this.snapController);
builder.type = SnapKeyring.type;
return builder;
})(),
);
///: END:ONLY_INCLUDE_IN

this.keyringController = new KeyringController({
keyringBuilders: additionalKeyrings,
initState: initState.KeyringController,
Expand Down Expand Up @@ -1679,7 +1691,28 @@ export default class MetamaskController extends EventEmitter {
});
}

///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
/**
* Initialize the snap keyring if it is not present.
*/
async getSnapKeyring() {
if (!this.snapKeyring) {
let [snapKeyring] = this.keyringController.getKeyringsByType(
KeyringType.snap,
);
if (!snapKeyring) {
snapKeyring = await this.keyringController.addNewKeyring(
KeyringType.snap,
);
}
this.snapKeyring = snapKeyring;
}
return this.snapKeyring;
}
///: END:ONLY_INCLUDE_IN

///: BEGIN:ONLY_INCLUDE_IN(snaps)

/**
* Constructor helper for getting Snap permission specifications.
*/
Expand Down Expand Up @@ -1735,6 +1768,16 @@ export default class MetamaskController extends EventEmitter {
this.controllerMessenger,
'SnapController:updateSnapState',
),
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
getSnapKeyring: this.getSnapKeyring.bind(this),
saveSnapKeyring: async () => {
await this.keyringController.persistAllKeyrings();
await this.keyringController._updateMemStoreKeyrings();
await this.keyringController.fullUpdate();
},
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(snaps)
}),
};
}
Expand Down Expand Up @@ -2167,6 +2210,13 @@ export default class MetamaskController extends EventEmitter {
preferencesController.setTransactionSecurityCheckEnabled.bind(
preferencesController,
),
///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
setSnapsAddSnapAccountModalDismissed:
preferencesController.setSnapsAddSnapAccountModalDismissed.bind(
preferencesController,
),
///: END:ONLY_INCLUDE_IN

// AssetsContractController
getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this),

Expand Down Expand Up @@ -2408,6 +2458,11 @@ export default class MetamaskController extends EventEmitter {
dismissNotifications: this.dismissNotifications.bind(this),
markNotificationsAsRead: this.markNotificationsAsRead.bind(this),
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
updateSnapRegistry: this.preferencesController.updateSnapRegistry.bind(
preferencesController,
),
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(desktop)
// Desktop
getDesktopEnabled: this.desktopController.getDesktopEnabled.bind(
Expand Down Expand Up @@ -2771,6 +2826,7 @@ export default class MetamaskController extends EventEmitter {
// set new identities
this.preferencesController.setAddresses(accounts);
this.selectFirstIdentity();

return vault;
} finally {
releaseLock();
Expand Down
7 changes: 7 additions & 0 deletions builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ buildTypes:
- snaps
- desktop
- build-flask
- keyring-snaps
env:
- INFURA_FLASK_PROJECT_ID
- SEGMENT_FLASK_WRITE_KEY
Expand All @@ -64,6 +65,7 @@ buildTypes:
- snaps
- desktop
- build-flask
- keyring-snaps
env:
- INFURA_FLASK_PROJECT_ID
- SEGMENT_FLASK_WRITE_KEY
Expand Down Expand Up @@ -138,6 +140,11 @@ features:
- src: ./app/build-types/flask/images/
dest: images
- ./{app,shared,ui}/**/flask/**
keyring-snaps:
env:
- KEYRING_SNAPS_REGISTRY_URL: https://metamask.github.io/keyring-snaps-registry/prod/registry.json
assets:
- ./{app,shared,ui}/**/keyring-snaps/**

# Env variables that are required for all types of builds
#
Expand Down

0 comments on commit af2c87d

Please sign in to comment.