feat: migrate to new keyring-api version (0.2.x) (#64)

* feat: migrate snap to API 0.2.2 * chore: run `yarn dedupe` * chore: remove old comment * chore: use sync flow by default * chore: update UI and `personal_sign` to match new API
MetaMask · Sep 12, 2023 · 89e2444 · 89e2444
1 parent 2807968
commit 89e2444
Show file tree

Hide file tree

Showing 9 changed files with 254 additions and 301 deletions.
diff --git a/packages/site/package.json b/packages/site/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@metamask/keyring-api": "^0.1.3",
+    "@metamask/keyring-api": "^0.2.3",
     "@metamask/providers": "^11.0.0",
     "@mui/icons-material": "^5.14.0",
     "@mui/material": "^5.14.0",

diff --git a/packages/site/src/components/Account.tsx b/packages/site/src/components/Account.tsx
@@ -20,7 +20,7 @@ export const Account = ({ account }: { account: KeyringAccount }) => {
   return (
     <AccountContainer>
       <AccountTitleContainer>
-        <AccountTitle>{account.name}</AccountTitle>
+        <AccountTitle>{account.address}</AccountTitle>
         <AccountTitleIconContainer>
           {isCollapsed ? (
             <ExpandMoreIcon
@@ -52,7 +52,7 @@ export const Account = ({ account }: { account: KeyringAccount }) => {
           <AccountRow>
             <AccountRowTitle>Account Supported Methods</AccountRowTitle>
             <ul style={{ padding: '0px 0px 0px 16px' }}>
-              {account.supportedMethods.map((method, methodIndex) => (
+              {account.methods.map((method, methodIndex) => (
                 <AccountRowValue
                   key={`account-${account.id}-method-${methodIndex}`}
                 >

diff --git a/packages/site/src/pages/index.tsx b/packages/site/src/pages/index.tsx
@@ -87,7 +87,7 @@ const Index = () => {
   // );
 
   const sendCreateAccount = async () => {
-    const newAccount = await client.createAccount(accountName as string);
+    const newAccount = await client.createAccount();
     const accounts = await client.listAccounts();
     setSnapState({
       ...snapState,
@@ -97,7 +97,7 @@ const Index = () => {
   };
 
   const importAccount = async () => {
-    const newAccount = await client.createAccount(accountName as string, {
+    const newAccount = await client.createAccount({
       privateKey: privateKey as string,
     });
     const accounts = await client.listAccounts();

diff --git a/packages/snap/package.json b/packages/snap/package.json
@@ -39,9 +39,9 @@
     "@ethereumjs/tx": "^4.1.2",
     "@ethereumjs/util": "^8.0.5",
     "@metamask/eth-sig-util": "^5.0.2",
-    "@metamask/keyring-api": "^0.1.3",
-    "@metamask/snaps-types": "^0.35.2-flask.1",
-    "@metamask/snaps-ui": "^0.35.2-flask.1",
+    "@metamask/keyring-api": "^0.2.3",
+    "@metamask/snaps-types": "^0.38.2-flask.1",
+    "@metamask/snaps-ui": "^0.37.4-flask.1",
     "@metamask/utils": "^5.0.2",
     "browserify": "^17.0.0",
     "buffer": "^6.0.3",

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "git+https://github.com/MetaMask/snap-simple-keyring.git"
   },
   "source": {
-    "shasum": "y1noKFUs5Et72OXnaaK+vDb7yHwqy7mz7Njahok/yD8=",
+    "shasum": "sWdabX/am+xwLsafCPEmovWw6Mc+4kJ2KJiYmkQwWk0=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/snap/src/index.ts b/packages/snap/src/index.ts
@@ -5,6 +5,7 @@ import {
 } from '@metamask/keyring-api';
 import type { OnRpcRequestHandler } from '@metamask/snaps-types';
 import { panel, heading, text } from '@metamask/snaps-ui';
+import { Json } from '@metamask/utils';
 
 import { SimpleKeyring } from './keyring';
 import { InternalMethod, PERMISSIONS } from './permissions';
@@ -66,7 +67,9 @@ const permissionsHandler: OnRpcRequestHandler = async ({
  * @param args.request - Request to execute.
  * @returns The execution result.
  */
-const keyringHandler: OnRpcRequestHandler = async ({ request }) => {
+const keyringHandler: OnRpcRequestHandler<
+  Json[] | Record<string, Json>
+> = async ({ request }) => {
   if (!keyring) {
     const keyringState = await getState();
     if (!keyring) {