Please note that the snap.manifest.json and{' '}
diff --git a/packages/site/src/polyfills.ts b/packages/site/src/polyfills.ts
index bc106d4..441ee1e 100644
--- a/packages/site/src/polyfills.ts
+++ b/packages/site/src/polyfills.ts
@@ -1,5 +1,8 @@
+// eslint-disable-next-line import/no-nodejs-modules
import { Buffer } from 'buffer';
+// eslint-disable-next-line no-restricted-globals
if (typeof window !== 'undefined') {
+ // eslint-disable-next-line no-restricted-globals
window.Buffer = window.Buffer ?? Buffer;
}
diff --git a/packages/site/src/utils/button.ts b/packages/site/src/utils/button.ts
index 1c7912d..165b76c 100644
--- a/packages/site/src/utils/button.ts
+++ b/packages/site/src/utils/button.ts
@@ -1,4 +1,4 @@
-import { Snap } from '../types';
+import type { Snap } from '../types';
import { isLocalSnap } from './snap';
export const shouldDisplayReconnectButton = (installedSnap?: Snap) =>
diff --git a/packages/site/src/utils/localStorage.ts b/packages/site/src/utils/localStorage.ts
index f5b6482..390c4dc 100644
--- a/packages/site/src/utils/localStorage.ts
+++ b/packages/site/src/utils/localStorage.ts
@@ -1,10 +1,10 @@
/**
* Get a local storage key.
- *
* @param key - The local storage key to access.
* @returns The value stored at the key provided if the key exists.
*/
export const getLocalStorage = (key: string) => {
+ // eslint-disable-next-line no-restricted-globals
const { localStorage: ls } = window;
if (ls !== null) {
@@ -17,11 +17,11 @@ export const getLocalStorage = (key: string) => {
/**
* Set a value to local storage at a certain key.
- *
* @param key - The local storage key to set.
* @param value - The value to set.
*/
export const setLocalStorage = (key: string, value: string) => {
+ // eslint-disable-next-line no-restricted-globals
const { localStorage: ls } = window;
if (ls !== null) {
diff --git a/packages/site/src/utils/metamask.ts b/packages/site/src/utils/metamask.ts
index d18c176..0eefe01 100644
--- a/packages/site/src/utils/metamask.ts
+++ b/packages/site/src/utils/metamask.ts
@@ -1,10 +1,10 @@
import { ethers } from 'ethers';
/**
* Detect if the wallet injecting the ethereum object is Flask.
- *
* @returns True if the MetaMask version is Flask, false otherwise.
*/
export const isFlask = async () => {
+ // eslint-disable-next-line no-restricted-globals
const provider = window.ethereum;
try {
const clientVersion = await provider?.request({
@@ -20,9 +20,11 @@ export const isFlask = async () => {
};
export const getSigner = async () => {
+ // eslint-disable-next-line no-restricted-globals
const provider = new ethers.BrowserProvider(window.ethereum);
// Request account access if needed
+ // eslint-disable-next-line no-restricted-globals
await window.ethereum.request({ method: 'eth_requestAccounts' });
// Getting the signer from provider
diff --git a/packages/site/src/utils/snap.ts b/packages/site/src/utils/snap.ts
index cb9ab02..5554c21 100644
--- a/packages/site/src/utils/snap.ts
+++ b/packages/site/src/utils/snap.ts
@@ -1,13 +1,13 @@
import { defaultSnapOrigin } from '../config';
import { getSnapParams } from '../config/snap';
-import { GetSnapsResponse, Snap } from '../types';
+import type { GetSnapsResponse, Snap } from '../types';
/**
* Get the installed snaps in MetaMask.
- *
* @returns The snaps installed in MetaMask.
*/
export const getSnaps = async (): Promise => {
+ // eslint-disable-next-line no-restricted-globals
return (await window.ethereum.request({
method: 'wallet_getSnaps',
})) as unknown as GetSnapsResponse;
@@ -15,7 +15,6 @@ export const getSnaps = async (): Promise => {
/**
* Connect a snap to MetaMask.
- *
* @param snapId - The ID of the snap.
* @param params - The params to pass with the snap to connect.
*/
@@ -23,6 +22,7 @@ export const connectSnap = async (
snapId: string = defaultSnapOrigin,
params: Record<'version' | string, unknown> = {},
) => {
+ // eslint-disable-next-line no-restricted-globals
await window.ethereum.request({
method: 'wallet_requestSnaps',
params: {
@@ -33,7 +33,6 @@ export const connectSnap = async (
/**
* Get the snap from MetaMask.
- *
* @param version - The version of the snap to install (optional).
* @returns The snap object returned by the extension.
*/
@@ -45,8 +44,8 @@ export const getSnap = async (version?: string): Promise => {
(snap) =>
snap.id === defaultSnapOrigin && (!version || snap.version === version),
);
- } catch (e) {
- console.log('Failed to obtain installed snap', e);
+ } catch (error) {
+ console.log('Failed to obtain installed snap', error);
return undefined;
}
};
diff --git a/packages/site/src/utils/theme.ts b/packages/site/src/utils/theme.ts
index a5b6a85..b4d761a 100644
--- a/packages/site/src/utils/theme.ts
+++ b/packages/site/src/utils/theme.ts
@@ -3,14 +3,15 @@ import { getLocalStorage, setLocalStorage } from './localStorage';
/**
* Get the user's preferred theme in local storage.
* Will default to the browser's preferred theme if there is no value in local storage.
- *
* @returns True if the theme is "dark" otherwise, false.
*/
export const getThemePreference = () => {
+ // eslint-disable-next-line no-restricted-globals
if (typeof window === 'undefined') {
return false;
}
+ // eslint-disable-next-line no-restricted-globals
const darkModeSystem = window?.matchMedia(
'(prefers-color-scheme: dark)',
).matches;
diff --git a/packages/site/src/vite-env.d.ts b/packages/site/src/vite-env.d.ts
new file mode 100644
index 0000000..11f02fe
--- /dev/null
+++ b/packages/site/src/vite-env.d.ts
@@ -0,0 +1 @@
+///
diff --git a/packages/site/static/robots.txt b/packages/site/static/robots.txt
deleted file mode 100644
index e9e57dc..0000000
--- a/packages/site/static/robots.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:
diff --git a/packages/site/tsconfig.eslint.json b/packages/site/tsconfig.eslint.json
new file mode 100644
index 0000000..ec845b8
--- /dev/null
+++ b/packages/site/tsconfig.eslint.json
@@ -0,0 +1,5 @@
+{
+ "extends": "./tsconfig.json",
+ "include": [".", ".eslintrc.js"],
+ "exclude": ["public", "node_modules"]
+}
diff --git a/packages/site/tsconfig.json b/packages/site/tsconfig.json
index 64b7842..c493494 100644
--- a/packages/site/tsconfig.json
+++ b/packages/site/tsconfig.json
@@ -1,11 +1,13 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
+ "moduleResolution": "bundler",
"module": "esnext",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
- "jsx": "preserve"
+ "jsx": "react-jsx"
},
- "include": ["src"]
+ "include": ["src"],
+ "references": [{ "path": "./tsconfig.node.json" }]
}
diff --git a/packages/site/tsconfig.node.json b/packages/site/tsconfig.node.json
new file mode 100644
index 0000000..42872c5
--- /dev/null
+++ b/packages/site/tsconfig.node.json
@@ -0,0 +1,10 @@
+{
+ "compilerOptions": {
+ "composite": true,
+ "skipLibCheck": true,
+ "module": "ESNext",
+ "moduleResolution": "bundler",
+ "allowSyntheticDefaultImports": true
+ },
+ "include": ["vite.config.ts"]
+}
diff --git a/packages/site/vite.config.ts b/packages/site/vite.config.ts
new file mode 100644
index 0000000..f046bd9
--- /dev/null
+++ b/packages/site/vite.config.ts
@@ -0,0 +1,11 @@
+import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
+import wasm from 'vite-plugin-wasm';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+ build: {
+ target: 'esnext',
+ },
+ plugins: [react(), wasm()],
+});
diff --git a/packages/snap/.eslintrc.js b/packages/snap/.eslintrc.js
index 73938b6..a8937d0 100644
--- a/packages/snap/.eslintrc.js
+++ b/packages/snap/.eslintrc.js
@@ -1,5 +1,7 @@
module.exports = {
extends: ['../../.eslintrc.js'],
-
ignorePatterns: ['!.eslintrc.js', 'dist/'],
+ parserOptions: {
+ project: './tsconfig.eslint.json',
+ },
};
diff --git a/packages/snap/package.json b/packages/snap/package.json
index d6f3b47..553b15c 100644
--- a/packages/snap/package.json
+++ b/packages/snap/package.json
@@ -20,13 +20,13 @@
"clean": "rimraf dist",
"lint": "npm run lint:eslint && npm run lint:misc --check",
"lint:eslint": "eslint . --cache --ext js,ts",
- "lint:fix": "npm run lint:eslint --fix && npm run lint:misc --write",
+ "lint:fix": "npm run lint:eslint -- --fix && npm run lint:misc -- --write",
"lint:misc": "prettier '**/*.json' '**/*.md' '!CHANGELOG.md' --ignore-path .gitignore",
"prepublishOnly": "npm run build:clean",
"serve": "mm-snap serve",
"start": "mm-snap watch --transpilationMode=localAndDeps",
"pretest": "npm run build",
- "test": "jest"
+ "test": "jest --runInBand"
},
"release": {
"branches": [
@@ -38,37 +38,36 @@
]
},
"dependencies": {
- "@xmtp/proto": "^3.28.0-beta.1",
- "@xmtp/xmtp-js": "^11.0.0-beta.8",
+ "@xmtp/proto": "^3.34.0",
+ "@xmtp/xmtp-js": "^11.3.0-beta.13",
"async-mutex": "^0.4.0",
"buffer": "^6.0.3",
"protobufjs": "^7.2.4"
},
"devDependencies": {
"@lavamoat/allow-scripts": "^2.0.3",
- "@metamask/eslint-config": "^10.0.0",
- "@metamask/eslint-config-jest": "^10.0.0",
- "@metamask/eslint-config-nodejs": "^10.0.0",
- "@metamask/eslint-config-typescript": "^10.0.0",
- "@metamask/snaps-cli": "^0.32.2",
- "@metamask/snaps-jest": "^0.35.2-flask.1",
- "@metamask/snaps-types": "^0.32.2",
- "@metamask/snaps-ui": "^0.32.2",
+ "@metamask/eslint-config": "^12.2.0",
+ "@metamask/eslint-config-jest": "^12.1.0",
+ "@metamask/eslint-config-nodejs": "^12.1.0",
+ "@metamask/eslint-config-typescript": "^12.1.0",
+ "@metamask/snaps-cli": "^4.0.0",
+ "@metamask/snaps-jest": "^4.0.1",
+ "@metamask/snaps-sdk": "^1.2.0",
"@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0",
- "eslint": "^8.21.0",
- "eslint-config-prettier": "^8.1.0",
+ "eslint": "^8.55.0",
+ "eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
- "eslint-plugin-jest": "^26.8.2",
- "eslint-plugin-jsdoc": "^39.2.9",
+ "eslint-plugin-jest": "^27.6.0",
+ "eslint-plugin-jsdoc": "^43.0.7",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"ethers": "^6.6.2",
"jest": "^29.6.0",
- "prettier": "^2.2.1",
+ "prettier": "^2.7.1",
"rimraf": "^3.0.2",
"ts-jest": "^29.1.1",
- "typescript": "^4.7.4"
+ "typescript": "^5.1.0"
},
"engines": {
"node": ">=16.0.0"
diff --git a/packages/snap/snap.config.js b/packages/snap/snap.config.js
deleted file mode 100644
index 75b27c0..0000000
--- a/packages/snap/snap.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
- cliOptions: {
- src: './src/index.ts',
- port: 8080,
- },
-};
diff --git a/packages/snap/snap.config.ts b/packages/snap/snap.config.ts
new file mode 100644
index 0000000..04ebbf3
--- /dev/null
+++ b/packages/snap/snap.config.ts
@@ -0,0 +1,16 @@
+import type { SnapConfig } from '@metamask/snaps-cli';
+
+const config: SnapConfig = {
+ input: './src/index.ts',
+ server: {
+ enabled: true,
+ port: 8080,
+ },
+ polyfills: true,
+ bundler: 'webpack',
+ experimental: {
+ wasm: true,
+ },
+};
+
+export default config;
diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
index 4b2c610..4d214ed 100644
--- a/packages/snap/snap.manifest.json
+++ b/packages/snap/snap.manifest.json
@@ -1,5 +1,5 @@
{
- "version": "1.2.2",
+ "version": "0.2.1",
"description": "A Snap that securely stores your XMTP keys across apps",
"proposedName": "Sign in with XMTP",
"repository": {
@@ -7,7 +7,7 @@
"url": "https://github.com/xmtp/snap.git"
},
"source": {
- "shasum": "bhbRFrJRYENE1jtoUeHmApIy+67nA0544SQojLwbtwc=",
+ "shasum": "LpjIZral3c0MjqEcc4mp6eQ8o3pvR1CyVvrkqgRwSXc=",
"location": {
"npm": {
"filePath": "dist/bundle.js",
@@ -23,7 +23,8 @@
"endowment:rpc": {
"dapps": true,
"snaps": false
- }
+ },
+ "endowment:webassembly": {}
},
"manifestVersion": "0.1"
}
diff --git a/packages/snap/src/authorizer.test.ts b/packages/snap/src/authorizer.test.ts
index f096d14..ece5c36 100644
--- a/packages/snap/src/authorizer.test.ts
+++ b/packages/snap/src/authorizer.test.ts
@@ -1,7 +1,8 @@
-import { XmtpEnv } from '@xmtp/xmtp-js';
+import type { XmtpEnv } from '@xmtp/xmtp-js';
+
import { Authorizer } from './authorizer';
-import { sleep } from './testHelpers';
import { AUTHORIZATION_EXPIRY_MS } from './config';
+import { sleep } from './testHelpers';
const WALLET_ADDRESS = '0x1234';
const ENV = 'dev' as XmtpEnv;
@@ -32,6 +33,7 @@ describe('Authorizer', () => {
throw new Error('unknown operation');
});
+ // eslint-disable-next-line no-restricted-globals
(global as any).snap = {
request: mockRequest,
};
diff --git a/packages/snap/src/authorizer.ts b/packages/snap/src/authorizer.ts
index d33bb2b..7e9f291 100644
--- a/packages/snap/src/authorizer.ts
+++ b/packages/snap/src/authorizer.ts
@@ -1,5 +1,6 @@
/* eslint-disable jsdoc/require-jsdoc */
-import { XmtpEnv } from '@xmtp/xmtp-js';
+import type { XmtpEnv } from '@xmtp/xmtp-js';
+
import { AUTHORIZATION_EXPIRY_MS } from './config';
import storage from './storage';
@@ -33,11 +34,7 @@ export class Authorizer {
this.cache = noCache ? undefined : new Map();
}
- private async getAuthRecord(
- walletAddress: string,
- env: XmtpEnv,
- origin: string,
- ) {
+ async getAuthRecord(walletAddress: string, env: XmtpEnv, origin: string) {
const key = buildKey(walletAddress, env, origin);
// If the record exists in the cache, return it
if (this.cache?.has(key)) {
diff --git a/packages/snap/src/handlers.test.ts b/packages/snap/src/handlers.test.ts
index 4023c3f..c5f0254 100644
--- a/packages/snap/src/handlers.test.ts
+++ b/packages/snap/src/handlers.test.ts
@@ -1,8 +1,10 @@
-import { PrivateKeyBundleV1, XmtpEnv } from '@xmtp/xmtp-js';
-import { keystore } from '@xmtp/proto';
import { installSnap } from '@metamask/snaps-jest';
+import { keystore } from '@xmtp/proto';
+import type { XmtpEnv } from '@xmtp/xmtp-js';
+import { PrivateKeyBundleV1 } from '@xmtp/xmtp-js';
+
import { buildRpcRequest, newWallet } from './testHelpers';
-import { base64Encode } from './utils';
+import { base64Decode, base64Encode } from './utils';
const {
InitKeystoreRequest,
@@ -29,6 +31,7 @@ describe('onRPCRequest', () => {
env: ENV,
};
+ // eslint-disable-next-line @typescript-eslint/unbound-method
const { request } = await installSnap();
// Check the status of a fresh instance
@@ -105,6 +108,7 @@ describe('onRPCRequest', () => {
it('can return the public key', async () => {
const wallet = newWallet();
const bundle = await PrivateKeyBundleV1.generate(wallet);
+ // eslint-disable-next-line @typescript-eslint/unbound-method
const { request } = await installSnap();
await initKeystore(bundle, request);
const meta = {
@@ -123,6 +127,7 @@ describe('onRPCRequest', () => {
it('returns an error if unknown handler is called', async () => {
const wallet = newWallet();
const bundle = await PrivateKeyBundleV1.generate(wallet);
+ // eslint-disable-next-line @typescript-eslint/unbound-method
const { request } = await installSnap();
await initKeystore(bundle, request);
const meta = {
@@ -139,6 +144,7 @@ describe('onRPCRequest', () => {
it('prompts for authorization', async () => {
const wallet = newWallet();
const bundle = await PrivateKeyBundleV1.generate(wallet);
+ // eslint-disable-next-line @typescript-eslint/unbound-method
const { request } = await installSnap();
await initKeystore(bundle, request);
const meta = {
@@ -165,6 +171,7 @@ describe('onRPCRequest', () => {
it('throws errors on rejected authorization', async () => {
const wallet = newWallet();
const bundle = await PrivateKeyBundleV1.generate(wallet);
+ // eslint-disable-next-line @typescript-eslint/unbound-method
const { request } = await installSnap();
await initKeystore(bundle, request);
const meta = {
@@ -187,5 +194,60 @@ describe('onRPCRequest', () => {
expect((result.response as any).result).toBeUndefined();
expect((result.response as any).error).toBeDefined();
});
+
+ it('talks to wasm', async () => {
+ const wallet = newWallet();
+ const bundle = await PrivateKeyBundleV1.generate(wallet);
+ // eslint-disable-next-line @typescript-eslint/unbound-method
+ const { request } = await installSnap();
+ await initKeystore(bundle, request);
+ const meta = {
+ walletAddress: bundle.identityKey.publicKey.walletSignatureAddress(),
+ env: ENV,
+ };
+
+ const originalData = new Uint8Array([1, 2, 3, 4]);
+
+ const encryptRequest = keystore.SelfEncryptRequest.encode({
+ requests: [
+ {
+ payload: originalData,
+ },
+ ],
+ }).finish();
+
+ const encryptResponse = request({
+ ...buildRpcRequest('selfEncrypt', base64Encode(encryptRequest), meta),
+ });
+
+ const resultPayload = ((await encryptResponse) as any).response.result
+ .res;
+ const decodedEncryptResponse = keystore.SelfEncryptResponse.decode(
+ base64Decode(resultPayload),
+ );
+
+ const decryptRequest = keystore.SelfDecryptRequest.encode({
+ requests: [
+ {
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ payload: decodedEncryptResponse.responses[0].result!.encrypted,
+ },
+ ],
+ }).finish();
+
+ const decryptResponse = request({
+ ...buildRpcRequest('selfDecrypt', base64Encode(decryptRequest), meta),
+ });
+
+ const decryptResultPayload = ((await decryptResponse) as any).response
+ ?.result.res;
+ const decryptResultProto = keystore.DecryptResponse.decode(
+ base64Decode(decryptResultPayload),
+ );
+ // eslint-disable-next-line jest/prefer-strict-equal
+ expect(decryptResultProto.responses[0].result?.decrypted).toEqual(
+ originalData,
+ );
+ });
});
});
diff --git a/packages/snap/src/handlers.ts b/packages/snap/src/handlers.ts
index a2c9061..b76542e 100644
--- a/packages/snap/src/handlers.ts
+++ b/packages/snap/src/handlers.ts
@@ -1,22 +1,19 @@
/* eslint-disable jsdoc/require-jsdoc */
-import {
- InMemoryKeystore,
- Keystore,
- PrivateKeyBundleV1,
- keystoreApiDefs,
-} from '@xmtp/xmtp-js';
import { fetcher, keystore as keystoreProto } from '@xmtp/proto';
-import { Reader, Writer } from 'protobufjs/minimal';
-import {
+import type {
InitKeystoreRequest as InitKeystoreRequestType,
InitKeystoreResponse as InitKeystoreResponseType,
GetKeystoreStatusRequest as GetKeystoreStatusRequestType,
GetKeystoreStatusResponse as GetKeystoreStatusResponseType,
// eslint-disable-next-line import/extensions
} from '@xmtp/proto/ts/dist/types/keystore_api/v1/keystore.pb';
-import { getKeys, getPersistence, setKeys } from './utils';
+import type { InMemoryKeystore, Keystore } from '@xmtp/xmtp-js';
+import { PrivateKeyBundleV1, keystoreApiDefs } from '@xmtp/xmtp-js';
+import type { Reader, Writer } from 'protobufjs/minimal';
+
+import type { SnapMeta } from '.';
import { KeyNotFoundError } from './errors';
-import { SnapMeta } from '.';
+import { getKeys, getPersistence, setKeys } from './utils';
const {
GetKeystoreStatusResponse_KeystoreStatus: KeystoreStatus,
@@ -36,9 +33,9 @@ export type SnapResponse = {
res: string | string[];
};
-type Codec = {
- decode(input: Reader | Uint8Array, length?: number): T;
- encode(message: T, writer?: Writer): Writer;
+type Codec = {
+ decode(input: Reader | Uint8Array, length?: number): MessageType;
+ encode(message: MessageType, writer?: Writer): Writer;
};
export type SnapRPC = {
@@ -57,7 +54,7 @@ export async function processProtoRequest(
}
if (typeof request.req !== 'string') {
- throw new Error(`Expected string request. Got: ${request.req}`);
+ throw new Error(`Expected string request. Got: ${typeof request.req}`);
}
const decodedRequest = rpc.req.decode(b64Decode(request.req));
@@ -65,7 +62,10 @@ export async function processProtoRequest(
return serializeResponse(rpc.res, result);
}
-function serializeResponse(codec: Codec, res: T) {
+function serializeResponse(
+ codec: Codec,
+ res: MessageType,
+) {
const responseBytes = codec.encode(res).finish();
return { res: b64Encode(responseBytes, 0, responseBytes.length) };
}
@@ -142,10 +142,10 @@ export async function getKeystoreStatus(
return {
status: KeystoreStatus.KEYSTORE_STATUS_INITIALIZED,
};
- } catch (e) {
+ } catch (error) {
// Only swallow KeyNotFoundError and turn into a negative response
- if (!(e instanceof KeyNotFoundError)) {
- throw e;
+ if (!(error instanceof KeyNotFoundError)) {
+ throw error;
}
return {
status: KeystoreStatus.KEYSTORE_STATUS_UNINITIALIZED,
@@ -155,7 +155,7 @@ export async function getKeystoreStatus(
);
}
-export function KeystoreHandler(backingKeystore: InMemoryKeystore) {
+export function keystoreHandler(backingKeystore: InMemoryKeystore) {
const out: any = {};
for (const [method, apiDef] of Object.entries(keystoreApiDefs)) {
if (!(method in backingKeystore)) {
diff --git a/packages/snap/src/index.ts b/packages/snap/src/index.ts
index a49a3cb..67c0442 100644
--- a/packages/snap/src/index.ts
+++ b/packages/snap/src/index.ts
@@ -1,12 +1,16 @@
/* eslint-disable jsdoc/require-jsdoc */
-import './polyfills'; // eslint-disable-line import/no-unassigned-import
-import { OnRpcRequestHandler } from '@metamask/snaps-types';
+import {
+ heading,
+ panel,
+ text,
+ type OnRpcRequestHandler,
+} from '@metamask/snaps-sdk';
import { type XmtpEnv } from '@xmtp/xmtp-js';
-import { heading, panel, text } from '@metamask/snaps-ui';
-import { getHandler, isSnapRequest, prettyWalletAddress } from './utils';
-import { initKeystore, getKeystoreStatus } from './handlers';
+
import authorizer from './authorizer';
import { GET_KEYSTORE_STATUS_METHOD, INIT_KEYSTORE_METHOD } from './config';
+import { initKeystore, getKeystoreStatus } from './handlers';
+import { getHandler, isSnapRequest, prettyWalletAddress } from './utils';
export type SnapMeta = {
walletAddress: string;
diff --git a/packages/snap/src/polyfills.ts b/packages/snap/src/polyfills.ts
deleted file mode 100644
index e3f8479..0000000
--- a/packages/snap/src/polyfills.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Buffer } from 'buffer';
-
-global.Buffer = Buffer;
-globalThis.Buffer = Buffer;
diff --git a/packages/snap/src/snapPersistence.ts b/packages/snap/src/snapPersistence.ts
index 7126e8f..b5308d8 100644
--- a/packages/snap/src/snapPersistence.ts
+++ b/packages/snap/src/snapPersistence.ts
@@ -1,10 +1,11 @@
import type { Persistence } from '@xmtp/xmtp-js';
+
import storage from './storage';
const ENCODING = 'binary';
// Wraps the snap storage in an interface compatible with the XMTP persistence interface
-// Main difference is that XMTP persistence asssumes all values are Uint8Arrays
+// Main difference is that XMTP persistence assumes all values are Uint8Arrays
// and expects implementations to handle serialization
export default class SnapPersistence implements Persistence {
async getItem(key: string): Promise {
@@ -12,10 +13,12 @@ export default class SnapPersistence implements Persistence {
if (typeof value !== 'string') {
return null;
}
+ // eslint-disable-next-line no-restricted-globals
return value ? Uint8Array.from(Buffer.from(value, ENCODING)) : null;
}
async setItem(key: string, value: Uint8Array): Promise {
+ // eslint-disable-next-line no-restricted-globals
await storage.setItem(key, Buffer.from(value).toString(ENCODING));
}
}
diff --git a/packages/snap/src/storage.ts b/packages/snap/src/storage.ts
index 8dc1e63..afd523e 100644
--- a/packages/snap/src/storage.ts
+++ b/packages/snap/src/storage.ts
@@ -1,4 +1,4 @@
-import { Json } from '@metamask/snaps-types';
+import type { Json } from '@metamask/snaps-sdk';
import { Mutex } from 'async-mutex';
export type StorageProvider = {
diff --git a/packages/snap/src/testHelpers.ts b/packages/snap/src/testHelpers.ts
index 455b1e9..23a1524 100644
--- a/packages/snap/src/testHelpers.ts
+++ b/packages/snap/src/testHelpers.ts
@@ -1,6 +1,7 @@
/* eslint-disable jsdoc/require-jsdoc */
import { Wallet } from 'ethers';
-import { SnapMeta } from '.';
+
+import type { SnapMeta } from '.';
export function newWallet() {
return Wallet.createRandom();
diff --git a/packages/snap/src/utils.ts b/packages/snap/src/utils.ts
index 9650a1d..6d2ab7d 100644
--- a/packages/snap/src/utils.ts
+++ b/packages/snap/src/utils.ts
@@ -1,20 +1,20 @@
/* eslint-disable jsdoc/require-jsdoc */
+import { privateKey, fetcher } from '@xmtp/proto';
import {
InMemoryKeystore,
- Persistence,
PrefixedPersistence,
PrivateKeyBundleV1,
} from '@xmtp/xmtp-js';
-import { privateKey, fetcher } from '@xmtp/proto';
-import type { XmtpEnv } from '@xmtp/xmtp-js';
-import SnapPersistence from './snapPersistence';
-import { type SnapRequest, KeystoreHandler } from './handlers';
+import type { XmtpEnv, Persistence } from '@xmtp/xmtp-js';
+
import { KeyNotFoundError } from './errors';
+import { type SnapRequest, keystoreHandler } from './handlers';
+import SnapPersistence from './snapPersistence';
-const { b64Encode } = fetcher;
+const { b64Encode, b64Decode } = fetcher;
// Mapping of keystore identifiers ($walletAddress/$env) to handlers
-const handlers = new Map>();
+const handlers = new Map>();
// Gets the keys from provided persistence and converts to a class
export async function getKeys(persistence: Persistence) {
@@ -32,7 +32,10 @@ export async function getKeys(persistence: Persistence) {
}
// Store the keys in the provided persistence
-export function setKeys(persistence: Persistence, keys: PrivateKeyBundleV1) {
+export async function setKeys(
+ persistence: Persistence,
+ keys: PrivateKeyBundleV1,
+) {
return persistence.setItem(`keys`, keys.encode());
}
@@ -44,7 +47,7 @@ export async function getHandler(address: string, env: XmtpEnv) {
// This will throw if keys do not exist
const keys = await getKeys(persistence);
const keyStore = await InMemoryKeystore.create(keys, persistence);
- handlers.set(key, KeystoreHandler(keyStore));
+ handlers.set(key, keystoreHandler(keyStore));
}
return handlers.get(key);
@@ -78,6 +81,10 @@ export function base64Encode(data: Uint8Array) {
return b64Encode(data, 0, data.length);
}
+export function base64Decode(data: string): Uint8Array {
+ return b64Decode(data);
+}
+
// Joins the address and env with a slash
function buildKey(address: string, env: XmtpEnv) {
return `${address}/${env}`;
diff --git a/packages/snap/tsconfig.eslint.json b/packages/snap/tsconfig.eslint.json
new file mode 100644
index 0000000..52f8922
--- /dev/null
+++ b/packages/snap/tsconfig.eslint.json
@@ -0,0 +1,5 @@
+{
+ "extends": "./tsconfig.json",
+ "include": [".", ".eslintrc.js"],
+ "exclude": ["dist", "node_modules"]
+}
diff --git a/packages/snap/tsconfig.json b/packages/snap/tsconfig.json
index 596e2cf..73bfee2 100644
--- a/packages/snap/tsconfig.json
+++ b/packages/snap/tsconfig.json
@@ -1,4 +1,4 @@
{
"extends": "../../tsconfig.json",
- "include": ["src"]
+ "include": ["src", "snap.config.ts"]
}