Skip to content

fix: Remove logic for granting CAIP-25 permissions #3723

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

Merged
Mrtenz merged 3 commits into from
Nov 5, 2025
Merged

fix: Remove logic for granting CAIP-25 permissions #3723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27dda1a
Remove logic for granting CAIP-25 permissions
Mrtenz Nov 5, 2025
3f32d70
Remove unused actions
Mrtenz Nov 5, 2025
9800313
Update tests
Mrtenz Nov 5, 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
273 changes: 2 additions & 271 deletions packages/snaps-controllers/src/snaps/SnapController.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6011,275 +6011,6 @@ describe('SnapController', () => {
snapController.destroy();
});

it('grants the `endowment:caip25` permission to a Snap with `endowment:ethereum-provider`', async () => {
const rootMessenger = getControllerMessenger();
const messenger = getSnapControllerMessenger(rootMessenger);

rootMessenger.registerActionHandler(
'PermissionController:getPermissions',
() => ({}),
);

rootMessenger.registerActionHandler(
'SelectedNetworkController:getNetworkClientIdForDomain',
() => 'mainnet',
);

rootMessenger.registerActionHandler(
'NetworkController:getNetworkClientById',
() => ({
configuration: {
chainId: '0x1',
},
}),
);

const { manifest } = await getMockSnapFilesWithUpdatedChecksum({
manifest: getSnapManifest({
initialPermissions: {
'endowment:page-home': {},
'endowment:ethereum-provider': {},
},
}),
});

const snapController = getSnapController(
getSnapControllerOptions({
messenger,
detectSnapLocation: loopbackDetect({ manifest }),
}),
);

await snapController.installSnaps(MOCK_ORIGIN, {
[MOCK_SNAP_ID]: {},
});

const approvedPermissions = {
'endowment:page-home': {
caveats: null,
},
'endowment:ethereum-provider': {},
'endowment:caip25': {
caveats: [
{
type: 'authorizedScopes',
value: {
requiredScopes: {},
optionalScopes: {
'eip155:1': {
accounts: [],
},
},
sessionProperties: {},
isMultichainOrigin: false,
},
},
],
},
};

expect(messenger.call).toHaveBeenCalledWith(
'PermissionController:grantPermissions',
{
approvedPermissions,
subject: { origin: MOCK_SNAP_ID },
requestData: expect.any(Object),
},
);

snapController.destroy();
});

it('grants the `endowment:caip25` permission when updating a Snap with `endowment:ethereum-provider`', async () => {
const newVersion = '1.0.2';
const newVersionRange = '>=1.0.1';

const rootMessenger = getControllerMessenger();
const messenger = getSnapControllerMessenger(rootMessenger);

rootMessenger.registerActionHandler(
'SelectedNetworkController:getNetworkClientIdForDomain',
() => 'mainnet',
);

rootMessenger.registerActionHandler(
'NetworkController:getNetworkClientById',
() => ({
configuration: {
chainId: '0x1',
},
}),
);

const { manifest: originalManifest } =
await getMockSnapFilesWithUpdatedChecksum({
manifest: getSnapManifest({
initialPermissions: {
'endowment:page-home': {},
},
}),
});

const { manifest: updatedManifest } =
await getMockSnapFilesWithUpdatedChecksum({
manifest: getSnapManifest({
version: newVersion,
initialPermissions: {
'endowment:page-home': {},
'endowment:ethereum-provider': {},
},
}),
});

const detectLocationMock = jest
.fn()
.mockImplementationOnce(
() =>
new LoopbackLocation({
manifest: originalManifest,
}),
)
.mockImplementationOnce(
() =>
new LoopbackLocation({
manifest: updatedManifest,
}),
);

const controller = getSnapController(
getSnapControllerOptions({
messenger,
detectSnapLocation: detectLocationMock,
}),
);

await controller.installSnaps(MOCK_ORIGIN, { [MOCK_SNAP_ID]: {} });
await controller.stopSnap(MOCK_SNAP_ID);

const approvedPermissions = {
'endowment:page-home': {
caveats: null,
},
};

expect(messenger.call).toHaveBeenCalledWith(
'PermissionController:grantPermissions',
{
approvedPermissions,
subject: { origin: MOCK_SNAP_ID },
requestData: expect.any(Object),
},
);

jest.mocked(messenger.call).mockClear();

const result = await controller.installSnaps(MOCK_ORIGIN, {
[MOCK_SNAP_ID]: { version: newVersionRange },
});

const updatedApprovedPermissions = {
'endowment:page-home': {
caveats: null,
},
'endowment:ethereum-provider': {},
'endowment:caip25': {
caveats: [
{
type: 'authorizedScopes',
value: {
requiredScopes: {},
optionalScopes: {
'eip155:1': {
accounts: [],
},
},
sessionProperties: {},
isMultichainOrigin: false,
},
},
],
},
};

expect(messenger.call).toHaveBeenCalledWith(
'PermissionController:grantPermissions',
{
approvedPermissions: updatedApprovedPermissions,
subject: { origin: MOCK_SNAP_ID },
requestData: expect.any(Object),
},
);

expect(result).toStrictEqual({
[MOCK_SNAP_ID]: getTruncatedSnap({
version: newVersion,
initialPermissions: updatedManifest.result.initialPermissions,
}),
});

controller.destroy();
});

it('does not grant the `endowment:caip25` permission if the Snap does not have the `endowment:ethereum-provider` permission', async () => {
const rootMessenger = getControllerMessenger();
const messenger = getSnapControllerMessenger(rootMessenger);

rootMessenger.registerActionHandler(
'PermissionController:getPermissions',
() => ({}),
);

rootMessenger.registerActionHandler(
'SelectedNetworkController:getNetworkClientIdForDomain',
() => {
throw new Error('This should not be called.');
},
);

rootMessenger.registerActionHandler(
'NetworkController:getNetworkClientById',
() => {
throw new Error('This should not be called.');
},
);

const { manifest } = await getMockSnapFilesWithUpdatedChecksum({
manifest: getSnapManifest({
initialPermissions: {
'endowment:page-home': {},
},
}),
});

const snapController = getSnapController(
getSnapControllerOptions({
messenger,
detectSnapLocation: loopbackDetect({ manifest }),
}),
);

await snapController.installSnaps(MOCK_ORIGIN, {
[MOCK_SNAP_ID]: {},
});

const approvedPermissions = {
'endowment:page-home': {
caveats: null,
},
};

expect(messenger.call).toHaveBeenCalledWith(
'PermissionController:grantPermissions',
{
approvedPermissions,
subject: { origin: MOCK_SNAP_ID },
requestData: expect.any(Object),
},
);

snapController.destroy();
});

it('supports preinstalled snaps', async () => {
const rootMessenger = getControllerMessenger();
jest.spyOn(rootMessenger, 'call');
Expand Down Expand Up @@ -11804,12 +11535,12 @@ describe('SnapController', () => {
const callActionSpy = jest.spyOn(messenger, 'call');

messenger.call('SnapController:revokeDynamicPermissions', MOCK_SNAP_ID, [
'eth_accounts',
'endowment:caip25',
]);

expect(callActionSpy).toHaveBeenCalledWith(
'PermissionController:revokePermissions',
{ [MOCK_SNAP_ID]: ['eth_accounts'] },
{ [MOCK_SNAP_ID]: ['endowment:caip25'] },
);

snapController.destroy();
Expand Down
Loading
Loading