-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: filter eth request to non-EVM accounts (#25003)
## **Description** This pr filters eth requests that goes to non evm accounts and also disables the selection of non evm accounts in the permission connect page. ## **Related issues** Fixes MetaMask/accounts-planning#462 ## **Manual testing steps** - Affects the accounts list during the dapp connection flow - Connection to dapps with an evm account stays the same. ## **Screenshots/Recordings** Not applicable ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
- Loading branch information
1 parent
48bc2f0
commit 97edb9a
Showing
9 changed files
with
207 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
import { | ||
BtcAccountType, | ||
BtcMethod, | ||
InternalAccount, | ||
} from '@metamask/keyring-api'; | ||
import { createMockInternalAccount } from '../../../test/jest/mocks'; | ||
import { containsEthPermissionsAndNonEvmAccount } from './permissions'; | ||
|
||
const mockAccount = createMockInternalAccount(); | ||
const mockNonEvmAccount = { | ||
...mockAccount, | ||
id: '4b94987c-165c-4287-bbc6-bee9c440e82a', | ||
type: BtcAccountType.P2wpkh, | ||
methods: [BtcMethod.SendMany], | ||
address: 'bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq', | ||
}; | ||
|
||
describe('containsEthPermissionsAndNonEvmAccount', () => { | ||
it('return false if accounts array is empty', () => { | ||
const accounts: InternalAccount[] = []; | ||
const permissions = { eth_accounts: '' }; | ||
|
||
const result = containsEthPermissionsAndNonEvmAccount( | ||
accounts, | ||
permissions, | ||
); | ||
|
||
expect(result).toBe(false); | ||
}); | ||
|
||
it('return false if accounts array contains only EVM accounts', () => { | ||
const accounts: InternalAccount[] = [mockAccount, mockAccount]; | ||
const permissions = { eth_accounts: '' }; | ||
|
||
const result = containsEthPermissionsAndNonEvmAccount( | ||
accounts, | ||
permissions, | ||
); | ||
|
||
expect(result).toBe(false); | ||
}); | ||
|
||
it('return false if permissions object does not contain eth_accounts permission', () => { | ||
const accounts: InternalAccount[] = [mockAccount, mockNonEvmAccount]; | ||
const permissions = { some_other_permission: '' }; | ||
|
||
const result = containsEthPermissionsAndNonEvmAccount( | ||
accounts, | ||
permissions, | ||
); | ||
|
||
expect(result).toBe(false); | ||
}); | ||
|
||
it('return true if accounts array contains non-EVM account and permissions object contains eth_accounts permission', () => { | ||
const accounts: InternalAccount[] = [mockAccount, mockNonEvmAccount]; | ||
const permissions = { eth_accounts: '' }; | ||
|
||
const result = containsEthPermissionsAndNonEvmAccount( | ||
accounts, | ||
permissions, | ||
); | ||
|
||
expect(result).toBe(true); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api'; | ||
import { RestrictedEthMethods } from '../../../shared/constants/permissions'; | ||
|
||
export const containsEthPermissionsAndNonEvmAccount = ( | ||
accounts: InternalAccount[], | ||
permissions: { [key: string]: string }, | ||
) => { | ||
const restrictedEthMethods = Object.keys(RestrictedEthMethods); | ||
const containsEthPermissions = Object.keys(permissions).some((permission) => | ||
restrictedEthMethods.includes(permission), | ||
); | ||
const containsNonEvmAccount = accounts.some( | ||
(account) => !isEvmAccountType(account.type), | ||
); | ||
|
||
return containsEthPermissions && containsNonEvmAccount; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters