Merge branch 'main' into feat/account-api-v2

Author: mj-kiwi

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

@@ -33,7 +33,6 @@ const manifest: SnapManifest = {
     'endowment:ethereum-provider': {},
     'endowment:network-access': {},
     snap_dialog: {},
-    'endowment:lifecycle-hooks': {},
     snap_getPreferences: {},
   },
   platformVersion: '8.1.0',

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

@@ -1,5 +1,4 @@
 /* eslint-disable no-restricted-globals */
-import type { GetSnapsResponse } from '@metamask/7715-permissions-shared/types';
 import { logger } from '@metamask/7715-permissions-shared/utils';
 import {
   AuthType,
@@ -8,7 +7,6 @@ import {
   UserStorage,
 } from '@metamask/profile-sync-controller/sdk';
 import {
-  type OnInstallHandler,
   type Json,
   type JsonRpcParams,
   type OnRpcRequestHandler,
@@ -230,30 +228,3 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
  */
 export const onUserInput: OnUserInputHandler =
   userEventDispatcher.createUserInputEventHandler();
-
-export const onInstall: OnInstallHandler = async () => {
-  /**
-   * Local Development Only
-   *
-   * The message signing snap must be installed and the gator permissions snap must
-   * have permission to communicate with the message signing snap, or the request is rejected.
-   *
-   * Since the message signing snap is preinstalled in production, and has
-   * initialConnections configured to automatically connect to the gator snap, this is not needed in production.
-   */
-  // eslint-disable-next-line no-restricted-globals
-  if (snapEnv === 'local' && isStorePermissionsFeatureEnabled) {
-    const installedSnaps = (await snap.request({
-      method: 'wallet_getSnaps',
-    })) as unknown as GetSnapsResponse;
-    if (!installedSnaps[messageSigningSnapId]) {
-      logger.debug('Installing local message signing snap');
-      await snap.request({
-        method: 'wallet_requestSnaps',
-        params: {
-          [messageSigningSnapId]: {},
-        },
-      });
-    }
-  }
-};

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

@@ -1,8 +1,6 @@
 /* eslint-disable no-restricted-globals */
 import type { SnapManifest } from '@metamask/7715-permissions-shared/types';
 
-const gatorSnapId = process.env.GATOR_PERMISSIONS_PROVIDER_SNAP_ID;
-
 const manifest: SnapManifest = {
   version: '0.2.0',
   description: 'Manage onchain 7715 permissions',
@@ -25,16 +23,11 @@ const manifest: SnapManifest = {
   initialPermissions: {
     'endowment:rpc': {
       dapps: true,
-      snaps: true,
+      snaps: false,
     },
   },
   platformVersion: '8.1.0',
   manifestVersion: '0.1',
 };
 
-if (gatorSnapId) {
-  manifest.initialConnections = {
-    [gatorSnapId]: {},
-  };
-}
 export default manifest;

packages/site/package.json

@@ -8,7 +8,7 @@
     "build": "GATSBY_TELEMETRY_DISABLED=1 gatsby build",
     "clean": "rimraf public",
     "lint": "yarn lint:eslint && yarn lint:misc --check",
-    "lint:eslint": "npx eslint . --cache --ext js,ts",
+    "lint:eslint": "yarn eslint . --cache --ext js,ts",
     "lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write",
     "lint:misc": "prettier '**/*.json' '**/*.md' '!CHANGELOG.md' --ignore-path .gitignore",
     "start": "GATSBY_TELEMETRY_DISABLED=1 gatsby develop"

packages/site/src/components/Buttons.tsx

@@ -94,6 +94,17 @@ export const ConnectButton = (
   );
 };
 
+export const InstallButton = (
+  props: ComponentProps<typeof Button> & { $isInstalled?: boolean },
+) => {
+  return (
+    <Button {...props}>
+      <FlaskFox />
+      <ButtonText>{props.$isInstalled ? 'Installed' : 'Install'}</ButtonText>
+    </Button>
+  );
+};
+
 export const CustomMessageButton = (
   props: ComponentProps<typeof Button> & { $text?: string },
 ) => {

packages/site/src/pages/index.tsx

@@ -18,6 +18,7 @@ import * as chains from 'viem/chains';
 
 import {
   ConnectButton,
+  InstallButton,
   InstallFlaskButton,
   CustomMessageButton,
   Card,
@@ -29,6 +30,11 @@ import {
   NativeTokenPeriodicForm,
   ERC20TokenPeriodicForm,
 } from '../components/permissions';
+import {
+  kernelSnapOrigin,
+  gatorSnapOrigin,
+  messageSigningSnapOrigin,
+} from '../config';
 import {
   Container,
   Heading,
@@ -41,7 +47,6 @@ import {
   ResponseContainer,
   CopyButton,
 } from '../styles';
-import { kernelSnapOrigin, gatorSnapOrigin } from '../config';
 import {
   useMetaMask,
   useMetaMaskContext,
@@ -97,6 +102,8 @@ const Index = () => {
   const { isFlask, snapsDetected, installedSnaps, provider } = useMetaMask();
   const requestKernelSnap = useRequestSnap(kernelSnapOrigin);
   const requestPermissionSnap = useRequestSnap(gatorSnapOrigin);
+  const requestMessageSigningSnap = useRequestSnap(messageSigningSnapOrigin);
+
   const { delegateAccount } = useDelegateAccount({ chain: selectedChain });
   const { bundlerClient, getFeePerGas } = useBundlerClient({
     chain: selectedChain,
@@ -124,6 +131,9 @@ const Index = () => {
 
   const isKernelSnapReady = Boolean(installedSnaps[kernelSnapOrigin]);
   const isGatorSnapReady = Boolean(installedSnaps[gatorSnapOrigin]);
+  const isMessageSigningSnapReady = Boolean(
+    installedSnaps[messageSigningSnapOrigin],
+  );
 
   const chainId = selectedChain.id;
   const [permissionType, setPermissionType] = useState('native-token-stream');
@@ -175,13 +185,13 @@ const Index = () => {
     if (!delegateAccount) {
       throw new Error('Delegate account not found');
     }
-    
+
     // Generate a unique identifier for this redemption request
     const requestId = `redeem-${Date.now()}-${Math.random()}`;
-    
+
     // Add this request to pending requests
     setPendingPermissionRequests(prev => new Set(prev).add(requestId));
-    
+
     setReceipt(null);
     setPermissionResponseError(null);
 
@@ -267,10 +277,10 @@ const Index = () => {
 
     // Generate a unique identifier for this permission request
     const requestId = `${type}-${Date.now()}-${Math.random()}`;
-    
+
     // Add this request to pending requests
     setPendingPermissionRequests(prev => new Set(prev).add(requestId));
-    
+
     setPermissionResponse(null);
     setReceipt(null);
     setPermissionResponseError(null);
@@ -497,6 +507,23 @@ const Index = () => {
           />
         )}
 
+        <Card
+          content={{
+            title: 'Message Signing Snap',
+            description:
+              'Set up by installing and authorizing the message signing snap.',
+            button: (
+              <InstallButton
+                onClick={requestMessageSigningSnap}
+                disabled={!isMetaMaskReady || isMessageSigningSnapReady}
+                $isInstalled={isMessageSigningSnapReady}
+              />
+            ),
+          }}
+          fullWidth
+          disabled={!isMetaMaskReady}
+        />
+
         <Card
           content={{
             title: `${isKernelSnapReady ? 'Reconnect' : 'Connect'}(kernel)`,

yarn.lock

@@ -7204,13 +7204,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.6.4":
-  version: 1.11.0
-  resolution: "axios@npm:1.11.0"
+  version: 1.12.1
+  resolution: "axios@npm:1.12.1"
   dependencies:
     follow-redirects: ^1.15.6
     form-data: ^4.0.4
     proxy-from-env: ^1.1.0
-  checksum: 0a33dc600b588bfd3111b198d5985527ed89f722817455d7cdb66c1d055e5f8859cc2bebb7320888957fc8458ebe77d5f83af02af9cd260217c91c4e92b6dfb6
+  checksum: 5160cf4e319ecd22de2bc4ad263881b5fb4cea1dfd9b8032ce349609fff041e0434f14e72bf2571b37ea88d1860f3456a95f3f40f2c14e84edfb6e81e5f27c4d
   languageName: node
   linkType: hard