Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Cleanup snap-account-signature e2e tests. Add permittedChains scenario to wallet_revokePermissions e2e test #29761

Merged
merged 6 commits into from
Jan 16, 2025
+138 −21
Merged

test: Cleanup snap-account-signature e2e tests. Add permittedChains scenario to wallet_revokePermissions e2e test #29761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7cac0a
fix snaps account signatures invalid eth_account fixtures
jiexi Jan 16, 2025
bf507bc
add revoke "endowment:permitted-chains" RPC e2e test
jiexi Jan 16, 2025
fc842e9
use testDapp connect in snap-account-signatures.spec.ts
jiexi Jan 16, 2025
758165d
Merge branch 'main' into jl/cleanup-fix-e2e-tests
jiexi Jan 16, 2025
b199269
Merge branch 'main' into jl/cleanup-fix-e2e-tests
jiexi Jan 16, 2025
3aaa6ca
Update test/e2e/tests/account/snap-account-signatures.spec.ts
adonesky1 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions test/e2e/fixture-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,42 @@ class FixtureBuilder {
});
}

withPermissionControllerConnectedToTestDappWithChain() {
return this.withPermissionController({
subjects: {
[DAPP_URL]: {
origin: DAPP_URL,
permissions: {
eth_accounts: {
id: 'ZaqPEWxyhNCJYACFw93jE',
parentCapability: 'eth_accounts',
invoker: DAPP_URL,
caveats: [
{
type: 'restrictReturnedAccounts',
value: [DEFAULT_FIXTURE_ACCOUNT.toLowerCase()],
},
],
date: 1664388714636,
},
'endowment:permitted-chains': {
id: 'D7cac0a2e3BD8f349506a',
parentCapability: 'endowment:permitted-chains',
invoker: DAPP_URL,
caveats: [
{
type: 'restrictNetworkSwitching',
value: ['0x539'],
},
],
date: 1664388714637,
},
},
},
},
});
}

withPermissionControllerConnectedToTestDappWithTwoAccounts() {
const subjects = {
[DAPP_URL]: {
Expand Down
100 changes: 91 additions & 9 deletions test/e2e/json-rpc/wallet_revokePermissions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,40 @@
import { strict as assert } from 'assert';
import { ACCOUNT_1, withFixtures } from '../helpers';
import { PermissionConstraint } from '@metamask/permission-controller';
import { withFixtures } from '../helpers';
import FixtureBuilder from '../fixture-builder';
import TestDapp from '../page-objects/pages/test-dapp';
import { loginWithBalanceValidation } from '../page-objects/flows/login.flow';

describe('Revoke Dapp Permissions', function () {
it('should revoke dapp permissions ', async function () {
it('should revoke dapp permissions for "eth_accounts"', async function () {
await withFixtures(
{
dapp: true,
fixtures: new FixtureBuilder()
.withPermissionControllerConnectedToTestDapp()
.withPermissionControllerConnectedToTestDappWithChain()
.build(),
title: this.test?.fullTitle(),
},
async ({ driver }) => {
await loginWithBalanceValidation(driver);
const testDapp = new TestDapp(driver);
await testDapp.openTestDappPage();
await testDapp.check_connectedAccounts(ACCOUNT_1);

// wallet_revokePermissions request
const beforeGetPermissionsRequest = JSON.stringify({
jsonrpc: '2.0',
method: 'wallet_getPermissions',
});
const beforeGetPermissionsResult = await driver.executeScript(
`return window.ethereum.request(${beforeGetPermissionsRequest})`,
);
const beforeGetPermissionsNames = beforeGetPermissionsResult.map(
(permission: PermissionConstraint) => permission.parentCapability,
);
assert.deepEqual(beforeGetPermissionsNames, [
'eth_accounts',
'endowment:permitted-chains',
]);

const revokePermissionsRequest = JSON.stringify({
jsonrpc: '2.0',
method: 'wallet_revokePermissions',
Expand All @@ -30,14 +44,82 @@ describe('Revoke Dapp Permissions', function () {
},
],
});
const revokePermissionsResult = await driver.executeScript(
`return window.ethereum.request(${revokePermissionsRequest})`,
);
assert.deepEqual(revokePermissionsResult, null);

const afterGetPermissionsRequest = JSON.stringify({
jsonrpc: '2.0',
method: 'wallet_getPermissions',
});
const afterGetPermissionsResult = await driver.executeScript(
`return window.ethereum.request(${afterGetPermissionsRequest})`,
);
const afterGetPermissionsNames = afterGetPermissionsResult.map(
(permission: PermissionConstraint) => permission.parentCapability,
);
assert.deepEqual(afterGetPermissionsNames, [
'endowment:permitted-chains',
]);
},
);
});

it('should revoke dapp permissions for "endowment:permitted-chains"', async function () {
await withFixtures(
{
dapp: true,
fixtures: new FixtureBuilder()
.withPermissionControllerConnectedToTestDappWithChain()
.build(),
title: this.test?.fullTitle(),
},
async ({ driver }) => {
await loginWithBalanceValidation(driver);
const testDapp = new TestDapp(driver);
await testDapp.openTestDappPage();

const beforeGetPermissionsRequest = JSON.stringify({
jsonrpc: '2.0',
method: 'wallet_getPermissions',
});
const beforeGetPermissionsResult = await driver.executeScript(
`return window.ethereum.request(${beforeGetPermissionsRequest})`,
);
const beforeGetPermissionsNames = beforeGetPermissionsResult.map(
(permission: PermissionConstraint) => permission.parentCapability,
);
assert.deepEqual(beforeGetPermissionsNames, [
'eth_accounts',
'endowment:permitted-chains',
]);

const result = await driver.executeScript(
const revokePermissionsRequest = JSON.stringify({
jsonrpc: '2.0',
method: 'wallet_revokePermissions',
params: [
{
'endowment:permitted-chains': {},
},
],
});
const revokePermissionsResult = await driver.executeScript(
`return window.ethereum.request(${revokePermissionsRequest})`,
);
// Response of method call
assert.deepEqual(result, null);
assert.deepEqual(revokePermissionsResult, null);

await testDapp.check_connectedAccounts(ACCOUNT_1, false);
const afterGetPermissionsRequest = JSON.stringify({
jsonrpc: '2.0',
method: 'wallet_getPermissions',
});
const afterGetPermissionsResult = await driver.executeScript(
`return window.ethereum.request(${afterGetPermissionsRequest})`,
);
const afterGetPermissionsNames = afterGetPermissionsResult.map(
(permission: PermissionConstraint) => permission.parentCapability,
);
assert.deepEqual(afterGetPermissionsNames, ['eth_accounts']);
},
);
});
Expand Down
11 changes: 5 additions & 6 deletions test/e2e/tests/account/snap-account-signatures-and-disconnects.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ describe('Snap Account Signatures and Disconnects @no-mmi', function (this: Suit
await withFixtures(
{
dapp: true,
fixtures: new FixtureBuilder()
.withPermissionControllerConnectedToTestDapp({
restrictReturnedAccounts: false,
})
.build(),
fixtures: new FixtureBuilder().build(),
title: this.test?.fullTitle(),
},
async ({ driver }: { driver: Driver }) => {
Expand All @@ -49,9 +45,12 @@ describe('Snap Account Signatures and Disconnects @no-mmi', function (this: Suit
await experimentalSettings.check_pageIsLoaded();
await experimentalSettings.toggleRedesignedSignature();

// Open the Test Dapp and signTypedDataV3
// Open the Test Dapp and connect
const testDapp = new TestDapp(driver);
await testDapp.openTestDappPage();
await testDapp.connectAccount({ publicAddress: newPublicKey });

// SignedTypedDataV3 with Test Dapp
await signTypedDataV3WithSnapAccount(driver, newPublicKey, false, true);

// Disconnect from Test Dapp and reconnect to Test Dapp
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/tests/account/snap-account-signatures.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ describe('Snap Account Signatures @no-mmi', function (this: Suite) {
await withFixtures(
{
dapp: true,
fixtures: new FixtureBuilder()
.withPermissionControllerConnectedToTestDapp({
restrictReturnedAccounts: false,
})
.build(),
fixtures: new FixtureBuilder().build(),
title,
},
async ({ driver }: { driver: Driver }) => {
Expand Down Expand Up @@ -62,8 +58,12 @@ describe('Snap Account Signatures @no-mmi', function (this: Suite) {
await experimentalSettings.check_pageIsLoaded();
await experimentalSettings.toggleRedesignedSignature();

// Connect the SSK account
const testDapp = new TestDapp(driver);
await testDapp.openTestDappPage();
await testDapp.connectAccount({ publicAddress: newPublicKey });

// Run all 5 signature types
await new TestDapp(driver).openTestDappPage();
await personalSignWithSnapAccount(
driver,
newPublicKey,
Expand Down
Loading