Merge pull request #10 from xmtp/upgrade-xmtp-js

Upgrade xmtp-js
xmtp · Sep 4, 2023 · 6fa7a57 · 6fa7a57
2 parents 20185c8 + b48be59
commit 6fa7a57
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/site/package.json b/packages/site/package.json
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@metamask/providers": "^9.0.0",
-    "@xmtp/proto": "^3.26.0",
-    "@xmtp/xmtp-js": "9.3.0-snap.1",
+    "@xmtp/proto": "^3.28.0-beta.1",
+    "@xmtp/xmtp-js": "^11.0.0-beta.7",
     "buffer": "^6.0.3",
     "ethers": "^6.6.2",
     "react": "^18.2.0",

diff --git a/packages/snap/package.json b/packages/snap/package.json
@@ -38,8 +38,8 @@
     ]
   },
   "dependencies": {
-    "@xmtp/proto": "^3.26.0",
-    "@xmtp/xmtp-js": "9.3.0-snap.1",
+    "@xmtp/proto": "^3.28.0-beta.1",
+    "@xmtp/xmtp-js": "^11.0.0-beta.7",
     "async-mutex": "^0.4.0",
     "buffer": "^6.0.3",
     "protobufjs": "^7.2.4"

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/xmtp/snap.git"
   },
   "source": {
-    "shasum": "b5JxstM+SUDmu8WPTXRfDaXA5QZx9BNW2fQX/GC17/g=",
+    "shasum": "mBnXwLylK6madz+uBk4DIMjHM8Yg1ygRNcz6PMyzLMc=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/snap/src/handlers.ts b/packages/snap/src/handlers.ts
@@ -1,6 +1,7 @@
 /* eslint-disable jsdoc/require-jsdoc */
 import {
   InMemoryKeystore,
+  Keystore,
   PrivateKeyBundleV1,
   keystoreApiDefs,
 } from '@xmtp/xmtp-js';
@@ -161,13 +162,16 @@ export function KeystoreHandler(backingKeystore: InMemoryKeystore) {
       throw new Error('no method found in keystore');
     }
 
+    // eslint-disable-next-line no-loop-func
     out[method] = async (req: SnapRequest): Promise<SnapResponse> => {
+      const backingMethod = backingKeystore[method as keyof Keystore];
+      if (typeof backingMethod !== 'function') {
+        throw new Error('not a function');
+      }
       return processProtoRequest(
         apiDef,
         req,
-        backingKeystore[method as keyof InMemoryKeystore].bind(
-          backingKeystore,
-        ) as any,
+        backingMethod.bind(backingKeystore) as any,
       );
     };
   }