Skip to content

feat!: Remove useCaip25Permission feature flag and enable behaviour by default #3413

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
merged 1 commit into from
Oct 1, 2025
Merged

feat!: Remove useCaip25Permission feature flag and enable behaviour by default #3413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 2 additions & 76 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 @@ -5990,7 +5990,7 @@ describe('SnapController', () => {
snapController.destroy();
});

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

Expand Down Expand Up @@ -6026,9 +6026,6 @@ describe('SnapController', () => {
getSnapControllerOptions({
messenger,
detectSnapLocation: loopbackDetect({ manifest }),
featureFlags: {
useCaip25Permission: true,
},
}),
);

Expand Down Expand Up @@ -6072,7 +6069,7 @@ describe('SnapController', () => {
snapController.destroy();
});

it('grants the `endowment:caip25` permission when updating a Snap with `endowment:ethereum-provider` if the `useCaip25Permission` feature flag is enabled', async () => {
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';

Expand Down Expand Up @@ -6132,9 +6129,6 @@ describe('SnapController', () => {
getSnapControllerOptions({
messenger,
detectSnapLocation: detectLocationMock,
featureFlags: {
useCaip25Permission: true,
},
}),
);

Expand Down Expand Up @@ -6205,71 +6199,6 @@ describe('SnapController', () => {
controller.destroy();
});

it('does not grant the `endowment:caip25` permission to a Snap with `endowment:ethereum-provider` if the `useCaip25Permission` feature flag is disabled', 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 }),
featureFlags: {
useCaip25Permission: false,
},
}),
);

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

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

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

snapController.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);
Expand Down Expand Up @@ -6305,9 +6234,6 @@ describe('SnapController', () => {
getSnapControllerOptions({
messenger,
detectSnapLocation: loopbackDetect({ manifest }),
featureFlags: {
useCaip25Permission: true,
},
}),
);

Expand Down
6 changes: 1 addition & 5 deletions packages/snaps-controllers/src/snaps/SnapController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,6 @@ type FeatureFlags = {
allowLocalSnaps?: boolean;
disableSnapInstallation?: boolean;
rejectInvalidPlatformVersion?: boolean;
useCaip25Permission?: boolean;

/**
* Force any local Snap to be treated as a preinstalled Snap.
Expand Down Expand Up @@ -4414,10 +4413,7 @@ export class SnapController extends BaseController<
* @returns The permissions to grant to the Snap.
*/
#getPermissionsToGrant(snapId: SnapId, newPermissions: RequestedPermissions) {
if (
this.#featureFlags.useCaip25Permission &&
Object.keys(newPermissions).includes(SnapEndowments.EthereumProvider)
) {
if (Object.keys(newPermissions).includes(SnapEndowments.EthereumProvider)) {
// This will return the globally selected network if the Snap doesn't have
// one set.
const networkClientId = this.messagingSystem.call(
Expand Down
Loading