Skip to content

Commit 70fed4f

Browse files
committed
Remove homepage from kernel snap, only call gator snap to build permission offer registry, derive id for permission offer in kernel snap, improve var naming, drop attenuated term on rpc method
1 parent 30f37ab commit 70fed4f

29 files changed

Lines changed: 452 additions & 856 deletions

packages/gator-permissions-snap/snap.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ const config: SnapConfig = {
5555
},
5656
polyfills: {
5757
buffer: true,
58-
crypto: true,
5958
},
6059
environment: {
6160
SNAP_ENV,

packages/gator-permissions-snap/snap.manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://github.com/MetaMask/snap-7715-permissions.git"
88
},
99
"source": {
10-
"shasum": "rBYfwKftRHT6Ubb97mXlM4mpyS5QuNDEiRnoo7jUpAo=",
10+
"shasum": "cZ2rf30XnvnLd+00V8QM47B50p8hkPsXZZSd53wCU7Y=",
1111
"location": {
1212
"npm": {
1313
"filePath": "dist/bundle.js",

packages/gator-permissions-snap/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ const rpcHandler = createRpcHandler({
135135
const boundRpcHandlers: {
136136
[RpcMethod: string]: (params?: JsonRpcParams) => Promise<Json>;
137137
} = {
138-
[RpcMethod.PermissionProviderGrantAttenuatedPermissions]:
138+
[RpcMethod.PermissionProviderGrantPermissions]:
139139
rpcHandler.grantPermission.bind(rpcHandler),
140140
[RpcMethod.PermissionProviderGetPermissionOffers]:
141141
rpcHandler.getPermissionOffers.bind(rpcHandler),

packages/gator-permissions-snap/src/permissions/permission-offers.ts

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import type { PermissionOffer } from '@metamask/7715-permissions-shared/types';
2+
3+
/**
4+
* The default permission offers that the Gator snap will offer to the kernel snap
5+
*/
6+
export const DEFAULT_GATOR_PERMISSION_TO_OFFER: PermissionOffer[] = [
7+
{
8+
type: 'native-token-stream',
9+
proposedName: 'Native Token Stream',
10+
},
11+
{
12+
type: 'native-token-periodic',
13+
proposedName: 'Native Token Periodic Transfer',
14+
},
15+
];

packages/gator-permissions-snap/src/rpc/permissions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { RpcMethod } from './rpcMethod';
44

55
const allowedPermissionsByOrigin: { [origin: string]: string[] } = {
66
[KERNEL_SNAP_ID]: [
7-
RpcMethod.PermissionProviderGrantAttenuatedPermissions,
7+
RpcMethod.PermissionProviderGrantPermissions,
88
RpcMethod.PermissionProviderGetPermissionOffers,
99
],
1010
};

packages/gator-permissions-snap/src/rpc/rpcHandler.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
import type { PermissionOffer } from '@metamask/7715-permissions-shared/types';
21
import { logger } from '@metamask/7715-permissions-shared/utils';
32
import type { Json } from '@metamask/snaps-sdk';
43

54
import type { PermissionHandlerFactory } from '../core/permissionHandlerFactory';
6-
import {
7-
DEFAULT_GATOR_PERMISSION_TO_OFFER,
8-
getIdFor,
9-
} from '../permissions/permission-offers';
5+
import { DEFAULT_GATOR_PERMISSION_TO_OFFER } from '../permissions/permissionOffers';
106
import type { ProfileSyncManager } from '../profileSync';
117
import { validatePermissionRequestParam } from '../utils/validate';
128

@@ -88,17 +84,7 @@ export function createRpcHandler(config: {
8884
*/
8985
const getPermissionOffers = async (): Promise<Json> => {
9086
logger.debug('getPermissionOffers()');
91-
const gatorSnapDefaultsOffers = await Promise.all(
92-
DEFAULT_GATOR_PERMISSION_TO_OFFER.map(async (per) => {
93-
const id = await getIdFor(per);
94-
return {
95-
type: per.type,
96-
id,
97-
proposedName: per.proposedName,
98-
} as PermissionOffer;
99-
}),
100-
);
101-
return gatorSnapDefaultsOffers;
87+
return DEFAULT_GATOR_PERMISSION_TO_OFFER;
10288
};
10389

10490
return {

packages/gator-permissions-snap/src/rpc/rpcMethod.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ export enum RpcMethod {
1010
/**
1111
* This method is used by the kernel to request a permissions provider to grant attenuated permissions to a site.
1212
*/
13-
PermissionProviderGrantAttenuatedPermissions = 'permissionsProvider_grantAttenuatedPermissions',
13+
PermissionProviderGrantPermissions = 'permissionsProvider_grantPermissions',
1414
}

packages/gator-permissions-snap/test/rpc/rpcHandler.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,12 +357,10 @@ describe('RpcHandler', () => {
357357
const result = await handler.getPermissionOffers();
358358
expect(result).toStrictEqual([
359359
{
360-
id: '8c1697dd46c1e0be7a1627f8efb110612b9ee8510476d78da0f74687afbe0b10',
361360
proposedName: 'Native Token Stream',
362361
type: 'native-token-stream',
363362
},
364363
{
365-
id: '1241bf3c50b7d36d1921a9a5c6af5238a363debc86826f11bab553ceed7744ca',
366364
proposedName: 'Native Token Periodic Transfer',
367365
type: 'native-token-periodic',
368366
},

packages/permissions-kernel-snap/snap.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const config: SnapConfig = {
1717
},
1818
polyfills: {
1919
buffer: true,
20+
crypto: true,
2021
},
2122
environment: {
2223
// eslint-disable-next-line n/no-process-env

0 commit comments

Comments
 (0)