@metamask/keyring-api 1.0.0-rc.1 → 1.1.0

package/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0]
+
+### Changed
+
+- `UuidStruct` is now a named type ([#159](https://github.com/MetaMask/keyring-api/pull/159))
+- Migrate from `@metamask/rpc-methods` to `@metamask/snaps-rpc-methods` ([#175](https://github.com/MetaMask/keyring-api/pull/175))
+
+### Fixed
+
+- Allow the request ID to be a string, number or null ([#156](https://github.com/MetaMask/keyring-api/pull/156))
+- Documentation fixes ([#160](https://github.com/MetaMask/keyring-api/pull/160)) ([#174](https://github.com/MetaMask/keyring-api/pull/174)) ([#173](https://github.com/MetaMask/keyring-api/pull/173)) ([#172](https://github.com/MetaMask/keyring-api/pull/172))
+- Use `UuidStruct` for IDs in the internal API ([#158](https://github.com/MetaMask/keyring-api/pull/158))
+- Bump `@metamask/json-rpc-engine` from `^7.1.1` to `^7.2.0` ([#164](https://github.com/MetaMask/keyring-api/pull/164))
+
+## [1.0.0]
+
+### Added
+
+- Add migration steps to 1.0.0 ([#149](https://github.com/MetaMask/keyring-api/pull/149)).
+- Add Account Snaps security guidelines ([#143](https://github.com/MetaMask/keyring-api/pull/143)).
+
+### Changed
+
+- Bump @metamask/rpc-errors from 6.0.0 to 6.1.0 ([#151](https://github.com/MetaMask/keyring-api/pull/151)).
+- Bump postcss from 8.4.24 to 8.4.31 ([#150](https://github.com/MetaMask/keyring-api/pull/150)).
+
 ## [1.0.0-rc.1]
 
 ### Added
@@ -136,7 +162,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - SnapController keyring client. It is intended to be used by MetaMask to talk to the snap.
 - Helper functions to create keyring handler in the snap.
 
-[Unreleased]: https://github.com/MetaMask/keyring-api/compare/v1.0.0-rc.1...HEAD
+[Unreleased]: https://github.com/MetaMask/keyring-api/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/MetaMask/keyring-api/compare/v1.0.0...v1.1.0
+[1.0.0]: https://github.com/MetaMask/keyring-api/compare/v1.0.0-rc.1...v1.0.0
 [1.0.0-rc.1]: https://github.com/MetaMask/keyring-api/compare/v0.2.7...v1.0.0-rc.1
 [0.2.7]: https://github.com/MetaMask/keyring-api/compare/v0.2.6...v0.2.7
 [0.2.6]: https://github.com/MetaMask/keyring-api/compare/v0.2.5...v0.2.6

package/README.md

@@ -1,8 +1,6 @@
 # MetaMask Keyring API
 
-> This TypeScript module is maintained in the style of the MetaMask team.
-
-This TypeScript module simplifies the integration of snaps with MetaMask using
+This TypeScript module simplifies the integration of Snaps with MetaMask using
 the Keyring API.
 
 Features:
@@ -12,75 +10,220 @@ Features:
   MetaMask and leverage its functionality.
 
 - **Dapp Client**: The module includes a client that enables dapps to
-  communicate with the Keyring snap. This client allows dapps to send requests
-  to the snap, such as retrieving account information or submitting requests.
+  communicate with the account Snap. This client allows dapps to send requests
+  to the Snap, such as retrieving account information or submitting requests.
 
 - **MetaMask Client**: The module provides a client specifically designed for
   MetaMask integration. This client enables MetaMask to send requests directly
-  to the Keyring snap, facilitating smooth interoperability between the two
+  to the account Snap, facilitating smooth interoperability between the two
   applications.
 
 - **Request Handler Helper Functions**: The module offers a set of helper
   functions to simplify the implementation of the request handler in the
-  Keyring snap. These functions assist in processing incoming requests,
+  account Snap. These functions assist in processing incoming requests,
   validating data, and handling various request types from dapps and MetaMask.
 
 ## Installation
 
-`yarn add @metamask/keyring-api`
+```bash
+yarn add @metamask/keyring-api
+```
 
 or
 
-`npm install @metamask/keyring-api`
+```bash
+npm install @metamask/keyring-api
+```
 
-## Usage
+## Account Snaps
 
-### In a snap
+> **:point_up: Important**: Before implementing your Snap, please make sure to
+> read the [security recommendations](./docs/security.md) and the [architecture
+> document](./docs/architecture.md).
 
-Inside the snap, implement the `Keyring` API:
+Starting with MetaMask 11.4, Snaps can implement the Keyring API. This allows
+users to manage their accounts in a more flexible way, and enables developers
+to build new types of accounts.
 
-```typescript
-class MySnapKeyring implements Keyring {
-  // Implement the required methods.
-}
-```
+> **:pencil: Note:** You can also build MetaMask from [source][extension-repo]
+> from the `develop` branch.
 
-Then create a handler that uses an instance of your keyring:
+Follow these steps to implement the Keyring API in your Snap. Please note that
+these instruction assume that you are already familiar with the process of
+[developing a Snap](https://docs.metamask.io/snaps/).
 
-```typescript
-import { keyringRpcDispatcher } from '@metamask/keyring-api';
+1. **Implement the Keyring API:**
 
-// Create a new MySnapKeyring instance
-keyring = new MySnapKeyring(keyringState);
-// ...
+   Inside your Snap, implement the `Keyring` API:
 
-// And wrap it in a handler
-const keyringHandler: OnRpcRequestHandler = async ({ request }) => {
-  // Load the keyring state if needed
-  // ...
-  return await keyringRpcDispatcher(keyring, request);
-};
-```
+   ```typescript
+   class MySnapKeyring implements Keyring {
+     // Implement the required methods here...
+   }
+   ```
 
-Now expose this handler:
+   > **:point_up: Important**: Ensure that your keyring implements the [methods
+   > called by MetaMask][exposed-methods], otherwise some features may not
+   > work.
 
-```typescript
-export const onRpcRequest: OnRpcRequestHandler = keyringHandler;
-```
+2. **Handle requests submitted by MetaMask:**
 
-Or chain it with other handlers:
+   MetaMask will submit requests through the `submitRequest` method of your the
+   Keyring API (check the supported [EVM methods](./docs/evm_methods.md)). Here
+   is an example of request:
 
-```typescript
-import { chainHandlers } from '@metamask/keyring-api';
+   ```json
+   {
+     "id": "d6e23af6-4bea-48dd-aeb0-7d3c30ea67f9",
+     "scope": "",
+     "account": "69438371-bef3-4957-9f91-c3f22c1d75f3",
+     "request": {
+       "method": "personal_sign",
+       "params": [
+         "0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765",
+         "0x5874174dcf1ab6F7Efd8496f4f09404CD1c5bA84"
+       ]
+     }
+   }
+   ```
 
-export const onRpcRequest: OnRpcRequestHandler = chainHandlers(
-  // Other handlers...
-  keyringHandler,
-  // Other handlers...
-);
-```
+   Where:
+
+   - `id` is unique identifier for the request.
+
+   - `scope` is the CAIP-2 chain ID of the selected chain. Currently, this
+     property is always an empty string. Your Snap should use the chain ID
+     present in the request object instead.
+
+   - `account` is the ID of the account that should handle the request.
+
+   - `request` is the request object.
+
+   Your Snap must respond with either a synchronous result:
+
+   ```typescript
+   return { pending: false, result };
+   ```
+
+   Or an asynchronous result:
+
+   ```typescript
+   return { pending: true, redirect: { message, url } };
+   ```
+
+   The redirect message and URL will be displayed to the user to inform them
+   about how to continue the transaction flow.
+
+3. **Notify MetaMask about events:**
+
+   The following actions must be notified to MetaMask:
+
+   1. When an account is created:
+
+      ```typescript
+      try {
+        emitSnapKeyringEvent(snap, KeyringEvent.AccountCreated, { account });
+        // Update your snap's state...
+      } catch (error) {
+        // Handle the error...
+      }
+      ```
+
+      MetaMask will return an error if the account already exists or if the
+      account object is invalid.
+
+   2. When an account is updated:
+
+      ```typescript
+      try {
+        emitSnapKeyringEvent(snap, KeyringEvent.AccountUpdated, { account });
+        // Update your snap's state...
+      } catch (error) {
+        // Handle the error...
+      }
+      ```
 
-### Migrating from API 0.1.x to 0.2.x
+      MetaMask will return an error if the account does not exist, if the
+      account object is invalid, or if the account address changed.
+
+   3. When an account is deleted:
+
+      ```typescript
+      try {
+        emitSnapKeyringEvent(snap, KeyringEvent.AccountDeleted, {
+          id: account.id,
+        });
+        // Update your snap's state...
+      } catch (error) {
+        // Handle the error...
+      }
+      ```
+
+      The delete event is idempotent, so it is safe to emit it even if the
+      account does not exist.
+
+   4. When a request is approved:
+
+      ```typescript
+      try {
+        emitSnapKeyringEvent(snap, KeyringEvent.RequestApproved, {
+          id: request.id,
+          result,
+        });
+        // Update your snap's state...
+      } catch (error) {
+        // Handle the error...
+      }
+      ```
+
+      MetaMask will return an error if the request does not exist.
+
+      > **:pencil: Note:** This only applies to Snaps that implement the
+      > [asynchronous transaction flow][async-flow].
+
+   5. When a request is rejected:
+
+      ```typescript
+      try {
+        emitSnapKeyringEvent(snap, KeyringEvent.RequestRejected, {
+          id: request.id,
+        });
+        // Update your snap's state...
+      } catch (error) {
+        // Handle the error...
+      }
+      ```
+
+      MetaMask will return an error if the request does not exist.
+
+      > **:pencil: Note:** This only applies to Snaps that implement the
+      > [asynchronous transaction flow][async-flow].
+
+4. **Expose the Keyring API:**
+
+   Then create a handler to expose the keyring methods to MetaMask and your dapp:
+
+   ```typescript
+   export const onKeyringRequest: OnKeyringRequestHandler = async ({
+     origin,
+     request,
+   }) => {
+     // Your custom logic here...
+     return handleKeyringRequest(keyring, request);
+   };
+   ```
+
+5. **Call the keyring methods from your dapp:**
+
+   Now you should be able to call your account Snap from your dapp, for
+   example:
+
+   ```typescript
+   const client = new KeyringSnapRpcClient(snapId, window.ethereum);
+   const accounts = await client.listAccounts();
+   ```
+
+## Migrating from 0.1.x to 0.2.x
 
 The following changes were made to the API, which may require changes to your
 implementation:
@@ -140,15 +283,14 @@ implementation:
   emitSnapKeyringEvent(snap, KeyringEvent.RequestRejected, { id: request.id });
   ```
 
-  > [!IMPORTANT]
-  > For all events above, MetaMask may return an error indicating that the
-  > event was not handled, possibly because it contains invalid arguments.
+  > **:point_up: Important**: For all events above, MetaMask may return an error
+  > indicating that the event was not handled, possibly because it contains
+  > invalid arguments.
 
-- Keyrings that implement the [async transaction
-  flow](./docs/architecture.md#transaction-flow) can now return an optional
-  `redirect` property that contains an URL and a message to be displayed to the
-  user. This will, in a future release of MetaMask, be used to inform the user
-  on how to continue the transaction flow.
+- Keyrings that implement the [asynchronous transaction flow][async-flow] can
+  now return an optional `redirect` property that contains an URL and a message
+  to be displayed to the user. This will, in a future release of MetaMask, be
+  used to inform the user on how to continue the transaction flow.
 
   ```ts
   return {
@@ -180,6 +322,20 @@ implementation:
   };
   ```
 
+## Migrating from 0.2.x to 1.x.x
+
+The following changes were made to the API, which may require changes to your
+implementation:
+
+- Your Snap must expose the Keyring methods through the `onKeyringRequest`
+  export instead of the `onRpcRequest` export.
+
+- Your Snap must request the new `endowment:keyring` endowment, and list any
+  dapp that should be allowed to call the Keyring methods.
+
+For more details about the changes, please refer to the [security
+guidelines](./docs/security.md).
+
 ## API
 
 See our documentation:
@@ -239,3 +395,7 @@ The project follows the same release process as the other libraries in the MetaM
    - Wait for the `publish-release` GitHub Action workflow to finish. This should trigger a second job (`publish-npm`), which will wait for a run approval by the [`npm publishers`](https://github.com/orgs/MetaMask/teams/npm-publishers) team.
    - Approve the `publish-npm` job (or ask somebody on the npm publishers team to approve it for you).
    - Once the `publish-npm` job has finished, check npm to verify that it has been published.
+
+[extension-repo]: https://github.com/MetaMask/metamask-extension
+[exposed-methods]: ./docs/security.md#limit-the-methods-exposed-to-dapps
+[async-flow]: ./docs/architecture.md#asynchronous-transaction-flow

package/dist/KeyringClient.js

@@ -16,7 +16,7 @@ exports.KeyringClient = void 0;
 const superstruct_1 = require("superstruct");
 const uuid_1 = require("uuid");
 const api_1 = require("./internal/api");
-const rpc_handler_1 = require("./rpc-handler");
+const rpc_1 = require("./internal/rpc");
 const utils_1 = require("./utils");
 class KeyringClient {
     /**
@@ -31,71 +31,71 @@ class KeyringClient {
     }
     async listAccounts() {
         return (0, utils_1.strictMask)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.ListAccounts,
+            method: rpc_1.KeyringRpcMethod.ListAccounts,
         }), api_1.ListAccountsResponseStruct);
     }
     async getAccount(id) {
         return (0, utils_1.strictMask)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.GetAccount,
+            method: rpc_1.KeyringRpcMethod.GetAccount,
             params: { id },
         }), api_1.GetAccountResponseStruct);
     }
     async createAccount(options = {}) {
         return (0, utils_1.strictMask)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.CreateAccount,
+            method: rpc_1.KeyringRpcMethod.CreateAccount,
             params: { options },
         }), api_1.CreateAccountResponseStruct);
     }
     async filterAccountChains(id, chains) {
         return (0, utils_1.strictMask)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.FilterAccountChains,
+            method: rpc_1.KeyringRpcMethod.FilterAccountChains,
             params: { id, chains },
         }), api_1.FilterAccountChainsResponseStruct);
     }
     async updateAccount(account) {
         (0, superstruct_1.assert)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.UpdateAccount,
+            method: rpc_1.KeyringRpcMethod.UpdateAccount,
             params: { account },
         }), api_1.UpdateAccountResponseStruct);
     }
     async deleteAccount(id) {
         (0, superstruct_1.assert)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.DeleteAccount,
+            method: rpc_1.KeyringRpcMethod.DeleteAccount,
             params: { id },
         }), api_1.DeleteAccountResponseStruct);
     }
     async exportAccount(id) {
         return (0, utils_1.strictMask)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.ExportAccount,
+            method: rpc_1.KeyringRpcMethod.ExportAccount,
             params: { id },
         }), api_1.ExportAccountResponseStruct);
     }
     async listRequests() {
         return (0, utils_1.strictMask)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.ListRequests,
+            method: rpc_1.KeyringRpcMethod.ListRequests,
         }), api_1.ListRequestsResponseStruct);
     }
     async getRequest(id) {
         return (0, utils_1.strictMask)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.GetRequest,
+            method: rpc_1.KeyringRpcMethod.GetRequest,
             params: { id },
         }), api_1.GetRequestResponseStruct);
     }
     async submitRequest(request) {
         return (0, utils_1.strictMask)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.SubmitRequest,
+            method: rpc_1.KeyringRpcMethod.SubmitRequest,
             params: request,
         }), api_1.SubmitRequestResponseStruct);
     }
     async approveRequest(id, data = {}) {
         (0, superstruct_1.assert)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.ApproveRequest,
+            method: rpc_1.KeyringRpcMethod.ApproveRequest,
             params: { id, data },
         }), api_1.ApproveRequestResponseStruct);
     }
     async rejectRequest(id) {
         (0, superstruct_1.assert)(await __classPrivateFieldGet(this, _KeyringClient_instances, "m", _KeyringClient_send).call(this, {
-            method: rpc_handler_1.KeyringRpcMethod.RejectRequest,
+            method: rpc_1.KeyringRpcMethod.RejectRequest,
             params: { id },
         }), api_1.RejectRequestResponseStruct);
     }

package/dist/KeyringClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"KeyringClient.js","sourceRoot":"","sources":["../src/KeyringClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,6CAAqC;AACrC,+BAAkC;AASlC,wCAawB;AAExB,+CAAiD;AACjD,mCAAqC;AAMrC,MAAa,aAAa;IAGxB;;;;OAIG;IACH,YAAY,MAAc;;QAP1B,wCAAgB;QAQd,uBAAA,IAAI,yBAAW,MAAM,MAAA,CAAC;IACxB,CAAC;IAgBD,KAAK,CAAC,YAAY;QAChB,OAAO,IAAA,kBAAU,EACf,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,YAAY;SACtC,CAAC,EACF,gCAA0B,CAC3B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACzB,OAAO,IAAA,kBAAU,EACf,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,UAAU;YACnC,MAAM,EAAE,EAAE,EAAE,EAAE;SACf,CAAC,EACF,8BAAwB,CACzB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,UAAgC,EAAE;QAElC,OAAO,IAAA,kBAAU,EACf,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,EAAE,OAAO,EAAE;SACpB,CAAC,EACF,iCAA2B,CAC5B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,EAAU,EAAE,MAAgB;QACpD,OAAO,IAAA,kBAAU,EACf,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,mBAAmB;YAC5C,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;SACvB,CAAC,EACF,uCAAiC,CAClC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAuB;QACzC,IAAA,oBAAM,EACJ,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,EAAE,OAAO,EAAE;SACpB,CAAC,EACF,iCAA2B,CAC5B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU;QAC5B,IAAA,oBAAM,EACJ,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,EAAE,EAAE,EAAE;SACf,CAAC,EACF,iCAA2B,CAC5B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU;QAC5B,OAAO,IAAA,kBAAU,EACf,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,EAAE,EAAE,EAAE;SACf,CAAC,EACF,iCAA2B,CAC5B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,IAAA,kBAAU,EACf,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,YAAY;SACtC,CAAC,EACF,gCAA0B,CAC3B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACzB,OAAO,IAAA,kBAAU,EACf,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,UAAU;YACnC,MAAM,EAAE,EAAE,EAAE,EAAE;SACf,CAAC,EACF,8BAAwB,CACzB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAuB;QACzC,OAAO,IAAA,kBAAU,EACf,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,OAAO;SAChB,CAAC,EACF,iCAA2B,CAC5B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,EAAU,EACV,OAA6B,EAAE;QAE/B,IAAA,oBAAM,EACJ,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,cAAc;YACvC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC,EACF,kCAA4B,CAC7B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU;QAC5B,IAAA,oBAAM,EACJ,MAAM,uBAAA,IAAI,qDAAM,MAAV,IAAI,EAAO;YACf,MAAM,EAAE,8BAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,EAAE,EAAE,EAAE;SACf,CAAC,EACF,iCAA2B,CAC5B,CAAC;IACJ,CAAC;CACF;AApJD,sCAoJC;;AAxIC;;;;;GAKG;AACH,KAAK,8BAAO,OAA+C;IACzD,OAAO,uBAAA,IAAI,6BAAQ,CAAC,IAAI,CAAC;QACvB,OAAO,EAAE,KAAK;QACd,EAAE,EAAE,IAAA,SAAI,GAAE;QACV,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { Json } from '@metamask/utils';\nimport { assert } from 'superstruct';\nimport { v4 as uuid } from 'uuid';\n\nimport type {\n  Keyring,\n  KeyringAccount,\n  KeyringRequest,\n  KeyringAccountData,\n  KeyringResponse,\n} from './api';\nimport {\n  ApproveRequestResponseStruct,\n  CreateAccountResponseStruct,\n  DeleteAccountResponseStruct,\n  ExportAccountResponseStruct,\n  FilterAccountChainsResponseStruct,\n  GetAccountResponseStruct,\n  GetRequestResponseStruct,\n  ListAccountsResponseStruct,\n  ListRequestsResponseStruct,\n  RejectRequestResponseStruct,\n  SubmitRequestResponseStruct,\n  UpdateAccountResponseStruct,\n} from './internal/api';\nimport type { JsonRpcRequest } from './JsonRpcRequest';\nimport { KeyringRpcMethod } from './rpc-handler';\nimport { strictMask } from './utils';\n\nexport type Sender = {\n  send(request: JsonRpcRequest): Promise<Json>;\n};\n\nexport class KeyringClient implements Keyring {\n  #sender: Sender;\n\n  /**\n   * Create a new instance of `KeyringClient`.\n   *\n   * @param sender - The `Sender` instance to use to send requests to the snap.\n   */\n  constructor(sender: Sender) {\n    this.#sender = sender;\n  }\n\n  /**\n   * Send a request to the snap and return the response.\n   *\n   * @param partial - A partial JSON-RPC request (method and params).\n   * @returns A promise that resolves to the response to the request.\n   */\n  async #send(partial: Omit<JsonRpcRequest, 'jsonrpc' | 'id'>): Promise<Json> {\n    return this.#sender.send({\n      jsonrpc: '2.0',\n      id: uuid(),\n      ...partial,\n    });\n  }\n\n  async listAccounts(): Promise<KeyringAccount[]> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.ListAccounts,\n      }),\n      ListAccountsResponseStruct,\n    );\n  }\n\n  async getAccount(id: string): Promise<KeyringAccount> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.GetAccount,\n        params: { id },\n      }),\n      GetAccountResponseStruct,\n    );\n  }\n\n  async createAccount(\n    options: Record<string, Json> = {},\n  ): Promise<KeyringAccount> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.CreateAccount,\n        params: { options },\n      }),\n      CreateAccountResponseStruct,\n    );\n  }\n\n  async filterAccountChains(id: string, chains: string[]): Promise<string[]> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.FilterAccountChains,\n        params: { id, chains },\n      }),\n      FilterAccountChainsResponseStruct,\n    );\n  }\n\n  async updateAccount(account: KeyringAccount): Promise<void> {\n    assert(\n      await this.#send({\n        method: KeyringRpcMethod.UpdateAccount,\n        params: { account },\n      }),\n      UpdateAccountResponseStruct,\n    );\n  }\n\n  async deleteAccount(id: string): Promise<void> {\n    assert(\n      await this.#send({\n        method: KeyringRpcMethod.DeleteAccount,\n        params: { id },\n      }),\n      DeleteAccountResponseStruct,\n    );\n  }\n\n  async exportAccount(id: string): Promise<KeyringAccountData> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.ExportAccount,\n        params: { id },\n      }),\n      ExportAccountResponseStruct,\n    );\n  }\n\n  async listRequests(): Promise<KeyringRequest[]> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.ListRequests,\n      }),\n      ListRequestsResponseStruct,\n    );\n  }\n\n  async getRequest(id: string): Promise<KeyringRequest> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.GetRequest,\n        params: { id },\n      }),\n      GetRequestResponseStruct,\n    );\n  }\n\n  async submitRequest(request: KeyringRequest): Promise<KeyringResponse> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.SubmitRequest,\n        params: request,\n      }),\n      SubmitRequestResponseStruct,\n    );\n  }\n\n  async approveRequest(\n    id: string,\n    data: Record<string, Json> = {},\n  ): Promise<void> {\n    assert(\n      await this.#send({\n        method: KeyringRpcMethod.ApproveRequest,\n        params: { id, data },\n      }),\n      ApproveRequestResponseStruct,\n    );\n  }\n\n  async rejectRequest(id: string): Promise<void> {\n    assert(\n      await this.#send({\n        method: KeyringRpcMethod.RejectRequest,\n        params: { id },\n      }),\n      RejectRequestResponseStruct,\n    );\n  }\n}\n"]}
+{"version":3,"file":"KeyringClient.js","sourceRoot":"","sources":["../src/KeyringClient.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Json } from '@metamask/utils';\nimport { assert } from 'superstruct';\nimport { v4 as uuid } from 'uuid';\n\nimport type {\n  Keyring,\n  KeyringAccount,\n  KeyringRequest,\n  KeyringAccountData,\n  KeyringResponse,\n} from './api';\nimport {\n  ApproveRequestResponseStruct,\n  CreateAccountResponseStruct,\n  DeleteAccountResponseStruct,\n  ExportAccountResponseStruct,\n  FilterAccountChainsResponseStruct,\n  GetAccountResponseStruct,\n  GetRequestResponseStruct,\n  ListAccountsResponseStruct,\n  ListRequestsResponseStruct,\n  RejectRequestResponseStruct,\n  SubmitRequestResponseStruct,\n  UpdateAccountResponseStruct,\n} from './internal/api';\nimport { KeyringRpcMethod } from './internal/rpc';\nimport type { JsonRpcRequest } from './JsonRpcRequest';\nimport { strictMask } from './utils';\n\nexport type Sender = {\n  send(request: JsonRpcRequest): Promise<Json>;\n};\n\nexport class KeyringClient implements Keyring {\n  #sender: Sender;\n\n  /**\n   * Create a new instance of `KeyringClient`.\n   *\n   * @param sender - The `Sender` instance to use to send requests to the snap.\n   */\n  constructor(sender: Sender) {\n    this.#sender = sender;\n  }\n\n  /**\n   * Send a request to the snap and return the response.\n   *\n   * @param partial - A partial JSON-RPC request (method and params).\n   * @returns A promise that resolves to the response to the request.\n   */\n  async #send(partial: Omit<JsonRpcRequest, 'jsonrpc' | 'id'>): Promise<Json> {\n    return this.#sender.send({\n      jsonrpc: '2.0',\n      id: uuid(),\n      ...partial,\n    });\n  }\n\n  async listAccounts(): Promise<KeyringAccount[]> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.ListAccounts,\n      }),\n      ListAccountsResponseStruct,\n    );\n  }\n\n  async getAccount(id: string): Promise<KeyringAccount> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.GetAccount,\n        params: { id },\n      }),\n      GetAccountResponseStruct,\n    );\n  }\n\n  async createAccount(\n    options: Record<string, Json> = {},\n  ): Promise<KeyringAccount> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.CreateAccount,\n        params: { options },\n      }),\n      CreateAccountResponseStruct,\n    );\n  }\n\n  async filterAccountChains(id: string, chains: string[]): Promise<string[]> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.FilterAccountChains,\n        params: { id, chains },\n      }),\n      FilterAccountChainsResponseStruct,\n    );\n  }\n\n  async updateAccount(account: KeyringAccount): Promise<void> {\n    assert(\n      await this.#send({\n        method: KeyringRpcMethod.UpdateAccount,\n        params: { account },\n      }),\n      UpdateAccountResponseStruct,\n    );\n  }\n\n  async deleteAccount(id: string): Promise<void> {\n    assert(\n      await this.#send({\n        method: KeyringRpcMethod.DeleteAccount,\n        params: { id },\n      }),\n      DeleteAccountResponseStruct,\n    );\n  }\n\n  async exportAccount(id: string): Promise<KeyringAccountData> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.ExportAccount,\n        params: { id },\n      }),\n      ExportAccountResponseStruct,\n    );\n  }\n\n  async listRequests(): Promise<KeyringRequest[]> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.ListRequests,\n      }),\n      ListRequestsResponseStruct,\n    );\n  }\n\n  async getRequest(id: string): Promise<KeyringRequest> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.GetRequest,\n        params: { id },\n      }),\n      GetRequestResponseStruct,\n    );\n  }\n\n  async submitRequest(request: KeyringRequest): Promise<KeyringResponse> {\n    return strictMask(\n      await this.#send({\n        method: KeyringRpcMethod.SubmitRequest,\n        params: request,\n      }),\n      SubmitRequestResponseStruct,\n    );\n  }\n\n  async approveRequest(\n    id: string,\n    data: Record<string, Json> = {},\n  ): Promise<void> {\n    assert(\n      await this.#send({\n        method: KeyringRpcMethod.ApproveRequest,\n        params: { id, data },\n      }),\n      ApproveRequestResponseStruct,\n    );\n  }\n\n  async rejectRequest(id: string): Promise<void> {\n    assert(\n      await this.#send({\n        method: KeyringRpcMethod.RejectRequest,\n        params: { id },\n      }),\n      RejectRequestResponseStruct,\n    );\n  }\n}\n"]}

package/dist/internal/api.d.ts

@@ -1,12 +1,12 @@
 import type { Infer } from 'superstruct';
 export declare const ListAccountsRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_listAccounts";
 }, {
     method: import("superstruct").Struct<"keyring_listAccounts", "keyring_listAccounts">;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type ListAccountsRequest = Infer<typeof ListAccountsRequestStruct>;
 export declare const ListAccountsResponseStruct: import("superstruct").Struct<{
@@ -41,7 +41,7 @@ export declare const ListAccountsResponseStruct: import("superstruct").Struct<{
 export declare type ListAccountsResponse = Infer<typeof ListAccountsResponseStruct>;
 export declare const GetAccountRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_getAccount";
     params: {
         id: string;
@@ -54,7 +54,7 @@ export declare const GetAccountRequestStruct: import("superstruct").Struct<{
         id: import("superstruct").Struct<string, null>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type GetAccountRequest = Infer<typeof GetAccountRequestStruct>;
 export declare const GetAccountResponseStruct: import("superstruct").Struct<{
@@ -83,7 +83,7 @@ export declare const GetAccountResponseStruct: import("superstruct").Struct<{
 export declare type GetAccountResponse = Infer<typeof GetAccountResponseStruct>;
 export declare const CreateAccountRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_createAccount";
     params: {
         options: Record<string, import("@metamask/utils").Json>;
@@ -96,7 +96,7 @@ export declare const CreateAccountRequestStruct: import("superstruct").Struct<{
         options: import("superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type CreateAccountRequest = Infer<typeof CreateAccountRequestStruct>;
 export declare const CreateAccountResponseStruct: import("superstruct").Struct<{
@@ -125,7 +125,7 @@ export declare const CreateAccountResponseStruct: import("superstruct").Struct<{
 export declare type CreateAccountResponse = Infer<typeof CreateAccountResponseStruct>;
 export declare const FilterAccountChainsStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_filterAccountChains";
     params: {
         id: string;
@@ -141,14 +141,14 @@ export declare const FilterAccountChainsStruct: import("superstruct").Struct<{
         chains: import("superstruct").Struct<string[], import("superstruct").Struct<string, null>>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type FilterAccountChainsRequest = Infer<typeof FilterAccountChainsStruct>;
 export declare const FilterAccountChainsResponseStruct: import("superstruct").Struct<string[], import("superstruct").Struct<string, null>>;
 export declare type FilterAccountChainsResponse = Infer<typeof FilterAccountChainsResponseStruct>;
 export declare const UpdateAccountRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_updateAccount";
     params: {
         account: {
@@ -195,14 +195,14 @@ export declare const UpdateAccountRequestStruct: import("superstruct").Struct<{
         }>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type UpdateAccountRequest = Infer<typeof UpdateAccountRequestStruct>;
 export declare const UpdateAccountResponseStruct: import("superstruct").Struct<null, null>;
 export declare type UpdateAccountResponse = Infer<typeof UpdateAccountResponseStruct>;
 export declare const DeleteAccountRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_deleteAccount";
     params: {
         id: string;
@@ -215,14 +215,14 @@ export declare const DeleteAccountRequestStruct: import("superstruct").Struct<{
         id: import("superstruct").Struct<string, null>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type DeleteAccountRequest = Infer<typeof DeleteAccountRequestStruct>;
 export declare const DeleteAccountResponseStruct: import("superstruct").Struct<null, null>;
 export declare type DeleteAccountResponse = Infer<typeof DeleteAccountResponseStruct>;
 export declare const ExportAccountRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_exportAccount";
     params: {
         id: string;
@@ -235,19 +235,19 @@ export declare const ExportAccountRequestStruct: import("superstruct").Struct<{
         id: import("superstruct").Struct<string, null>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type ExportAccountRequest = Infer<typeof ExportAccountRequestStruct>;
 export declare const ExportAccountResponseStruct: import("superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
 export declare type ExportAccountResponse = Infer<typeof ExportAccountResponseStruct>;
 export declare const ListRequestsRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_listRequests";
 }, {
     method: import("superstruct").Struct<"keyring_listRequests", "keyring_listRequests">;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type ListRequestsRequest = Infer<typeof ListRequestsRequestStruct>;
 export declare const ListRequestsResponseStruct: import("superstruct").Struct<{
@@ -281,7 +281,7 @@ export declare const ListRequestsResponseStruct: import("superstruct").Struct<{
 export declare type ListRequestsResponse = Infer<typeof ListRequestsResponseStruct>;
 export declare const GetRequestRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_getRequest";
     params: {
         id: string;
@@ -294,7 +294,7 @@ export declare const GetRequestRequestStruct: import("superstruct").Struct<{
         id: import("superstruct").Struct<string, null>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type GetRequestRequest = Infer<typeof GetRequestRequestStruct>;
 export declare const GetRequestResponseStruct: import("superstruct").Struct<{
@@ -320,7 +320,7 @@ export declare const GetRequestResponseStruct: import("superstruct").Struct<{
 export declare type GetRequestResponse = Infer<typeof GetRequestResponseStruct>;
 export declare const SubmitRequestRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_submitRequest";
     params: {
         id: string;
@@ -354,7 +354,7 @@ export declare const SubmitRequestRequestStruct: import("superstruct").Struct<{
         }>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type SubmitRequestRequest = Infer<typeof SubmitRequestRequestStruct>;
 export declare const SubmitRequestResponseStruct: import("superstruct").Struct<{
@@ -370,7 +370,7 @@ export declare const SubmitRequestResponseStruct: import("superstruct").Struct<{
 export declare type SubmitRequestResponse = Infer<typeof SubmitRequestResponseStruct>;
 export declare const ApproveRequestRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_approveRequest";
     params: {
         id: string;
@@ -386,14 +386,14 @@ export declare const ApproveRequestRequestStruct: import("superstruct").Struct<{
         data: import("superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type ApproveRequestRequest = Infer<typeof ApproveRequestRequestStruct>;
 export declare const ApproveRequestResponseStruct: import("superstruct").Struct<null, null>;
 export declare type ApproveRequestResponse = Infer<typeof ApproveRequestResponseStruct>;
 export declare const RejectRequestRequestStruct: import("superstruct").Struct<{
     jsonrpc: "2.0";
-    id: string;
+    id: string | number | null;
     method: "keyring_rejectRequest";
     params: {
         id: string;
@@ -406,7 +406,7 @@ export declare const RejectRequestRequestStruct: import("superstruct").Struct<{
         id: import("superstruct").Struct<string, null>;
     }>;
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
-    id: import("superstruct").Struct<string, null>;
+    id: import("superstruct").Struct<string | number | null, null>;
 }>;
 export declare type RejectRequestRequest = Infer<typeof RejectRequestRequestStruct>;
 export declare const RejectRequestResponseStruct: import("superstruct").Struct<null, null>;

package/dist/internal/api.js

@@ -7,7 +7,7 @@ const api_1 = require("../api");
 const utils_2 = require("../utils");
 const CommonHeader = {
     jsonrpc: (0, superstruct_1.literal)('2.0'),
-    id: utils_2.UuidStruct,
+    id: (0, superstruct_1.union)([(0, superstruct_1.string)(), (0, superstruct_1.number)(), (0, superstruct_1.literal)(null)]),
 };
 // ----------------------------------------------------------------------------
 // List accounts
@@ -22,7 +22,7 @@ exports.GetAccountRequestStruct = (0, superstruct_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_getAccount'),
     params: (0, superstruct_1.object)({
-        id: (0, superstruct_1.string)(),
+        id: utils_2.UuidStruct,
     }),
 });
 exports.GetAccountResponseStruct = api_1.KeyringAccountStruct;
@@ -42,7 +42,7 @@ exports.FilterAccountChainsStruct = (0, superstruct_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_filterAccountChains'),
     params: (0, superstruct_1.object)({
-        id: (0, superstruct_1.string)(),
+        id: utils_2.UuidStruct,
         chains: (0, superstruct_1.array)((0, superstruct_1.string)()),
     }),
 });
@@ -63,7 +63,7 @@ exports.DeleteAccountRequestStruct = (0, superstruct_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_deleteAccount'),
     params: (0, superstruct_1.object)({
-        id: (0, superstruct_1.string)(),
+        id: utils_2.UuidStruct,
     }),
 });
 exports.DeleteAccountResponseStruct = (0, superstruct_1.literal)(null);
@@ -73,7 +73,7 @@ exports.ExportAccountRequestStruct = (0, superstruct_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_exportAccount'),
     params: (0, superstruct_1.object)({
-        id: (0, superstruct_1.string)(),
+        id: utils_2.UuidStruct,
     }),
 });
 exports.ExportAccountResponseStruct = api_1.KeyringAccountDataStruct;
@@ -90,7 +90,7 @@ exports.GetRequestRequestStruct = (0, superstruct_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_getRequest'),
     params: (0, superstruct_1.object)({
-        id: (0, superstruct_1.string)(),
+        id: utils_2.UuidStruct,
     }),
 });
 exports.GetRequestResponseStruct = api_1.KeyringRequestStruct;
@@ -108,7 +108,7 @@ exports.ApproveRequestRequestStruct = (0, superstruct_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_approveRequest'),
     params: (0, superstruct_1.object)({
-        id: (0, superstruct_1.string)(),
+        id: utils_2.UuidStruct,
         data: (0, superstruct_1.record)((0, superstruct_1.string)(), utils_1.JsonStruct),
     }),
 });
@@ -119,7 +119,7 @@ exports.RejectRequestRequestStruct = (0, superstruct_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_rejectRequest'),
     params: (0, superstruct_1.object)({
-        id: (0, superstruct_1.string)(),
+        id: utils_2.UuidStruct,
     }),
 });
 exports.RejectRequestResponseStruct = (0, superstruct_1.literal)(null);

package/dist/internal/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/internal/api.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonStruct } from '@metamask/utils';\nimport type { Infer } from 'superstruct';\nimport { array, literal, object, record, string } from 'superstruct';\n\nimport {\n  KeyringAccountDataStruct,\n  KeyringAccountStruct,\n  KeyringRequestStruct,\n  KeyringResponseStruct,\n} from '../api';\nimport { UuidStruct } from '../utils';\n\nconst CommonHeader = {\n  jsonrpc: literal('2.0'),\n  id: UuidStruct,\n};\n\n// ----------------------------------------------------------------------------\n// List accounts\n\nexport const ListAccountsRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_listAccounts'),\n});\n\nexport type ListAccountsRequest = Infer<typeof ListAccountsRequestStruct>;\n\nexport const ListAccountsResponseStruct = array(KeyringAccountStruct);\n\nexport type ListAccountsResponse = Infer<typeof ListAccountsResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Get account\n\nexport const GetAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_getAccount'),\n  params: object({\n    id: string(),\n  }),\n});\n\nexport type GetAccountRequest = Infer<typeof GetAccountRequestStruct>;\n\nexport const GetAccountResponseStruct = KeyringAccountStruct;\n\nexport type GetAccountResponse = Infer<typeof GetAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Create account\n\nexport const CreateAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_createAccount'),\n  params: object({\n    options: record(string(), JsonStruct),\n  }),\n});\n\nexport type CreateAccountRequest = Infer<typeof CreateAccountRequestStruct>;\n\nexport const CreateAccountResponseStruct = KeyringAccountStruct;\n\nexport type CreateAccountResponse = Infer<typeof CreateAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Filter account chains\n\nexport const FilterAccountChainsStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_filterAccountChains'),\n  params: object({\n    id: string(),\n    chains: array(string()),\n  }),\n});\n\nexport type FilterAccountChainsRequest = Infer<\n  typeof FilterAccountChainsStruct\n>;\n\nexport const FilterAccountChainsResponseStruct = array(string());\n\nexport type FilterAccountChainsResponse = Infer<\n  typeof FilterAccountChainsResponseStruct\n>;\n\n// ----------------------------------------------------------------------------\n// Update account\n\nexport const UpdateAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_updateAccount'),\n  params: object({\n    account: KeyringAccountStruct,\n  }),\n});\n\nexport type UpdateAccountRequest = Infer<typeof UpdateAccountRequestStruct>;\n\nexport const UpdateAccountResponseStruct = literal(null);\n\nexport type UpdateAccountResponse = Infer<typeof UpdateAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Delete account\n\nexport const DeleteAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_deleteAccount'),\n  params: object({\n    id: string(),\n  }),\n});\n\nexport type DeleteAccountRequest = Infer<typeof DeleteAccountRequestStruct>;\n\nexport const DeleteAccountResponseStruct = literal(null);\n\nexport type DeleteAccountResponse = Infer<typeof DeleteAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Export account\n\nexport const ExportAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_exportAccount'),\n  params: object({\n    id: string(),\n  }),\n});\n\nexport type ExportAccountRequest = Infer<typeof ExportAccountRequestStruct>;\n\nexport const ExportAccountResponseStruct = KeyringAccountDataStruct;\n\nexport type ExportAccountResponse = Infer<typeof ExportAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// List requests\n\nexport const ListRequestsRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_listRequests'),\n});\n\nexport type ListRequestsRequest = Infer<typeof ListRequestsRequestStruct>;\n\nexport const ListRequestsResponseStruct = array(KeyringRequestStruct);\n\nexport type ListRequestsResponse = Infer<typeof ListRequestsResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Get request\n\nexport const GetRequestRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_getRequest'),\n  params: object({\n    id: string(),\n  }),\n});\n\nexport type GetRequestRequest = Infer<typeof GetRequestRequestStruct>;\n\nexport const GetRequestResponseStruct = KeyringRequestStruct;\n\nexport type GetRequestResponse = Infer<typeof GetRequestResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Submit request\n\nexport const SubmitRequestRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_submitRequest'),\n  params: KeyringRequestStruct,\n});\n\nexport type SubmitRequestRequest = Infer<typeof SubmitRequestRequestStruct>;\n\nexport const SubmitRequestResponseStruct = KeyringResponseStruct;\n\nexport type SubmitRequestResponse = Infer<typeof SubmitRequestResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Approve request\n\nexport const ApproveRequestRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_approveRequest'),\n  params: object({\n    id: string(),\n    data: record(string(), JsonStruct),\n  }),\n});\n\nexport type ApproveRequestRequest = Infer<typeof ApproveRequestRequestStruct>;\n\nexport const ApproveRequestResponseStruct = literal(null);\n\nexport type ApproveRequestResponse = Infer<typeof ApproveRequestResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Reject request\n\nexport const RejectRequestRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_rejectRequest'),\n  params: object({\n    id: string(),\n  }),\n});\n\nexport type RejectRequestRequest = Infer<typeof RejectRequestRequestStruct>;\n\nexport const RejectRequestResponseStruct = literal(null);\n\nexport type RejectRequestResponse = Infer<typeof RejectRequestResponseStruct>;\n"]}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/internal/api.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonStruct } from '@metamask/utils';\nimport type { Infer } from 'superstruct';\nimport {\n  array,\n  literal,\n  number,\n  object,\n  record,\n  string,\n  union,\n} from 'superstruct';\n\nimport {\n  KeyringAccountDataStruct,\n  KeyringAccountStruct,\n  KeyringRequestStruct,\n  KeyringResponseStruct,\n} from '../api';\nimport { UuidStruct } from '../utils';\n\nconst CommonHeader = {\n  jsonrpc: literal('2.0'),\n  id: union([string(), number(), literal(null)]),\n};\n\n// ----------------------------------------------------------------------------\n// List accounts\n\nexport const ListAccountsRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_listAccounts'),\n});\n\nexport type ListAccountsRequest = Infer<typeof ListAccountsRequestStruct>;\n\nexport const ListAccountsResponseStruct = array(KeyringAccountStruct);\n\nexport type ListAccountsResponse = Infer<typeof ListAccountsResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Get account\n\nexport const GetAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_getAccount'),\n  params: object({\n    id: UuidStruct,\n  }),\n});\n\nexport type GetAccountRequest = Infer<typeof GetAccountRequestStruct>;\n\nexport const GetAccountResponseStruct = KeyringAccountStruct;\n\nexport type GetAccountResponse = Infer<typeof GetAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Create account\n\nexport const CreateAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_createAccount'),\n  params: object({\n    options: record(string(), JsonStruct),\n  }),\n});\n\nexport type CreateAccountRequest = Infer<typeof CreateAccountRequestStruct>;\n\nexport const CreateAccountResponseStruct = KeyringAccountStruct;\n\nexport type CreateAccountResponse = Infer<typeof CreateAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Filter account chains\n\nexport const FilterAccountChainsStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_filterAccountChains'),\n  params: object({\n    id: UuidStruct,\n    chains: array(string()),\n  }),\n});\n\nexport type FilterAccountChainsRequest = Infer<\n  typeof FilterAccountChainsStruct\n>;\n\nexport const FilterAccountChainsResponseStruct = array(string());\n\nexport type FilterAccountChainsResponse = Infer<\n  typeof FilterAccountChainsResponseStruct\n>;\n\n// ----------------------------------------------------------------------------\n// Update account\n\nexport const UpdateAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_updateAccount'),\n  params: object({\n    account: KeyringAccountStruct,\n  }),\n});\n\nexport type UpdateAccountRequest = Infer<typeof UpdateAccountRequestStruct>;\n\nexport const UpdateAccountResponseStruct = literal(null);\n\nexport type UpdateAccountResponse = Infer<typeof UpdateAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Delete account\n\nexport const DeleteAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_deleteAccount'),\n  params: object({\n    id: UuidStruct,\n  }),\n});\n\nexport type DeleteAccountRequest = Infer<typeof DeleteAccountRequestStruct>;\n\nexport const DeleteAccountResponseStruct = literal(null);\n\nexport type DeleteAccountResponse = Infer<typeof DeleteAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Export account\n\nexport const ExportAccountRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_exportAccount'),\n  params: object({\n    id: UuidStruct,\n  }),\n});\n\nexport type ExportAccountRequest = Infer<typeof ExportAccountRequestStruct>;\n\nexport const ExportAccountResponseStruct = KeyringAccountDataStruct;\n\nexport type ExportAccountResponse = Infer<typeof ExportAccountResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// List requests\n\nexport const ListRequestsRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_listRequests'),\n});\n\nexport type ListRequestsRequest = Infer<typeof ListRequestsRequestStruct>;\n\nexport const ListRequestsResponseStruct = array(KeyringRequestStruct);\n\nexport type ListRequestsResponse = Infer<typeof ListRequestsResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Get request\n\nexport const GetRequestRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_getRequest'),\n  params: object({\n    id: UuidStruct,\n  }),\n});\n\nexport type GetRequestRequest = Infer<typeof GetRequestRequestStruct>;\n\nexport const GetRequestResponseStruct = KeyringRequestStruct;\n\nexport type GetRequestResponse = Infer<typeof GetRequestResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Submit request\n\nexport const SubmitRequestRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_submitRequest'),\n  params: KeyringRequestStruct,\n});\n\nexport type SubmitRequestRequest = Infer<typeof SubmitRequestRequestStruct>;\n\nexport const SubmitRequestResponseStruct = KeyringResponseStruct;\n\nexport type SubmitRequestResponse = Infer<typeof SubmitRequestResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Approve request\n\nexport const ApproveRequestRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_approveRequest'),\n  params: object({\n    id: UuidStruct,\n    data: record(string(), JsonStruct),\n  }),\n});\n\nexport type ApproveRequestRequest = Infer<typeof ApproveRequestRequestStruct>;\n\nexport const ApproveRequestResponseStruct = literal(null);\n\nexport type ApproveRequestResponse = Infer<typeof ApproveRequestResponseStruct>;\n\n// ----------------------------------------------------------------------------\n// Reject request\n\nexport const RejectRequestRequestStruct = object({\n  ...CommonHeader,\n  method: literal('keyring_rejectRequest'),\n  params: object({\n    id: UuidStruct,\n  }),\n});\n\nexport type RejectRequestRequest = Infer<typeof RejectRequestRequestStruct>;\n\nexport const RejectRequestResponseStruct = literal(null);\n\nexport type RejectRequestResponse = Infer<typeof RejectRequestResponseStruct>;\n"]}

package/dist/internal/index.d.ts

@@ -1,3 +1,4 @@
 export * from './api';
 export * from './events';
+export * from './rpc';
 export * from './types';

package/dist/internal/index.js

@@ -16,5 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
 __exportStar(require("./events"), exports);
+__exportStar(require("./rpc"), exports);
 __exportStar(require("./types"), exports);
 //# sourceMappingURL=index.js.map

package/dist/internal/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/internal/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,0CAAwB","sourcesContent":["export * from './api';\nexport * from './events';\nexport * from './types';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/internal/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,2CAAyB;AACzB,wCAAsB;AACtB,0CAAwB","sourcesContent":["export * from './api';\nexport * from './events';\nexport * from './rpc';\nexport * from './types';\n"]}

package/dist/internal/rpc.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Keyring RPC methods used by the API.
+ */
+export declare enum KeyringRpcMethod {
+    ListAccounts = "keyring_listAccounts",
+    GetAccount = "keyring_getAccount",
+    CreateAccount = "keyring_createAccount",
+    FilterAccountChains = "keyring_filterAccountChains",
+    UpdateAccount = "keyring_updateAccount",
+    DeleteAccount = "keyring_deleteAccount",
+    ExportAccount = "keyring_exportAccount",
+    ListRequests = "keyring_listRequests",
+    GetRequest = "keyring_getRequest",
+    SubmitRequest = "keyring_submitRequest",
+    ApproveRequest = "keyring_approveRequest",
+    RejectRequest = "keyring_rejectRequest"
+}
+/**
+ * Check if a method is a keyring RPC method.
+ *
+ * @param method - Method to check.
+ * @returns Whether the method is a keyring RPC method.
+ */
+export declare function isKeyringRpcMethod(method: string): boolean;

package/dist/internal/rpc.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isKeyringRpcMethod = exports.KeyringRpcMethod = void 0;
+/**
+ * Keyring RPC methods used by the API.
+ */
+var KeyringRpcMethod;
+(function (KeyringRpcMethod) {
+    KeyringRpcMethod["ListAccounts"] = "keyring_listAccounts";
+    KeyringRpcMethod["GetAccount"] = "keyring_getAccount";
+    KeyringRpcMethod["CreateAccount"] = "keyring_createAccount";
+    KeyringRpcMethod["FilterAccountChains"] = "keyring_filterAccountChains";
+    KeyringRpcMethod["UpdateAccount"] = "keyring_updateAccount";
+    KeyringRpcMethod["DeleteAccount"] = "keyring_deleteAccount";
+    KeyringRpcMethod["ExportAccount"] = "keyring_exportAccount";
+    KeyringRpcMethod["ListRequests"] = "keyring_listRequests";
+    KeyringRpcMethod["GetRequest"] = "keyring_getRequest";
+    KeyringRpcMethod["SubmitRequest"] = "keyring_submitRequest";
+    KeyringRpcMethod["ApproveRequest"] = "keyring_approveRequest";
+    KeyringRpcMethod["RejectRequest"] = "keyring_rejectRequest";
+})(KeyringRpcMethod = exports.KeyringRpcMethod || (exports.KeyringRpcMethod = {}));
+/**
+ * Check if a method is a keyring RPC method.
+ *
+ * @param method - Method to check.
+ * @returns Whether the method is a keyring RPC method.
+ */
+function isKeyringRpcMethod(method) {
+    return Object.values(KeyringRpcMethod).includes(method);
+}
+exports.isKeyringRpcMethod = isKeyringRpcMethod;
+//# sourceMappingURL=rpc.js.map

package/dist/internal/rpc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/internal/rpc.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAY,gBAaX;AAbD,WAAY,gBAAgB;IAC1B,yDAAqC,CAAA;IACrC,qDAAiC,CAAA;IACjC,2DAAuC,CAAA;IACvC,uEAAmD,CAAA;IACnD,2DAAuC,CAAA;IACvC,2DAAuC,CAAA;IACvC,2DAAuC,CAAA;IACvC,yDAAqC,CAAA;IACrC,qDAAiC,CAAA;IACjC,2DAAuC,CAAA;IACvC,6DAAyC,CAAA;IACzC,2DAAuC,CAAA;AACzC,CAAC,EAbW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAa3B;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,MAAc;IAC/C,OAAO,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,MAA0B,CAAC,CAAC;AAC9E,CAAC;AAFD,gDAEC","sourcesContent":["/**\n * Keyring RPC methods used by the API.\n */\nexport enum KeyringRpcMethod {\n  ListAccounts = 'keyring_listAccounts',\n  GetAccount = 'keyring_getAccount',\n  CreateAccount = 'keyring_createAccount',\n  FilterAccountChains = 'keyring_filterAccountChains',\n  UpdateAccount = 'keyring_updateAccount',\n  DeleteAccount = 'keyring_deleteAccount',\n  ExportAccount = 'keyring_exportAccount',\n  ListRequests = 'keyring_listRequests',\n  GetRequest = 'keyring_getRequest',\n  SubmitRequest = 'keyring_submitRequest',\n  ApproveRequest = 'keyring_approveRequest',\n  RejectRequest = 'keyring_rejectRequest',\n}\n\n/**\n * Check if a method is a keyring RPC method.\n *\n * @param method - Method to check.\n * @returns Whether the method is a keyring RPC method.\n */\nexport function isKeyringRpcMethod(method: string): boolean {\n  return Object.values(KeyringRpcMethod).includes(method as KeyringRpcMethod);\n}\n"]}

package/dist/rpc-handler.d.ts

@@ -7,20 +7,6 @@ import type { JsonRpcRequest } from './JsonRpcRequest';
 export declare class MethodNotSupportedError extends Error {
     constructor(method: string);
 }
-export declare enum KeyringRpcMethod {
-    ListAccounts = "keyring_listAccounts",
-    GetAccount = "keyring_getAccount",
-    CreateAccount = "keyring_createAccount",
-    FilterAccountChains = "keyring_filterAccountChains",
-    UpdateAccount = "keyring_updateAccount",
-    DeleteAccount = "keyring_deleteAccount",
-    ExportAccount = "keyring_exportAccount",
-    ListRequests = "keyring_listRequests",
-    GetRequest = "keyring_getRequest",
-    SubmitRequest = "keyring_submitRequest",
-    ApproveRequest = "keyring_approveRequest",
-    RejectRequest = "keyring_rejectRequest"
-}
 /**
  * Handles a keyring JSON-RPC request.
  *
@@ -29,10 +15,3 @@ export declare enum KeyringRpcMethod {
  * @returns A promise that resolves to the keyring response.
  */
 export declare function handleKeyringRequest(keyring: Keyring, request: JsonRpcRequest): Promise<Json | void>;
-/**
- * Check if a method is a keyring RPC method.
- *
- * @param method - Method to check.
- * @returns Whether the method is a keyring RPC method.
- */
-export declare function isKeyringRpcMethod(method: string): boolean;

package/dist/rpc-handler.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isKeyringRpcMethod = exports.handleKeyringRequest = exports.KeyringRpcMethod = exports.MethodNotSupportedError = void 0;
+exports.handleKeyringRequest = exports.MethodNotSupportedError = void 0;
 const superstruct_1 = require("superstruct");
 const api_1 = require("./internal/api");
+const rpc_1 = require("./internal/rpc");
 const JsonRpcRequest_1 = require("./JsonRpcRequest");
 /**
  * Error thrown when a keyring JSON-RPC method is not supported.
@@ -13,21 +14,6 @@ class MethodNotSupportedError extends Error {
     }
 }
 exports.MethodNotSupportedError = MethodNotSupportedError;
-var KeyringRpcMethod;
-(function (KeyringRpcMethod) {
-    KeyringRpcMethod["ListAccounts"] = "keyring_listAccounts";
-    KeyringRpcMethod["GetAccount"] = "keyring_getAccount";
-    KeyringRpcMethod["CreateAccount"] = "keyring_createAccount";
-    KeyringRpcMethod["FilterAccountChains"] = "keyring_filterAccountChains";
-    KeyringRpcMethod["UpdateAccount"] = "keyring_updateAccount";
-    KeyringRpcMethod["DeleteAccount"] = "keyring_deleteAccount";
-    KeyringRpcMethod["ExportAccount"] = "keyring_exportAccount";
-    KeyringRpcMethod["ListRequests"] = "keyring_listRequests";
-    KeyringRpcMethod["GetRequest"] = "keyring_getRequest";
-    KeyringRpcMethod["SubmitRequest"] = "keyring_submitRequest";
-    KeyringRpcMethod["ApproveRequest"] = "keyring_approveRequest";
-    KeyringRpcMethod["RejectRequest"] = "keyring_rejectRequest";
-})(KeyringRpcMethod = exports.KeyringRpcMethod || (exports.KeyringRpcMethod = {}));
 /**
  * Handles a keyring JSON-RPC request.
  *
@@ -40,63 +26,63 @@ async function handleKeyringRequest(keyring, request) {
     // we can check its method name.
     (0, superstruct_1.assert)(request, JsonRpcRequest_1.JsonRpcRequestStruct);
     switch (request.method) {
-        case KeyringRpcMethod.ListAccounts: {
+        case rpc_1.KeyringRpcMethod.ListAccounts: {
             (0, superstruct_1.assert)(request, api_1.ListAccountsRequestStruct);
             return keyring.listAccounts();
         }
-        case KeyringRpcMethod.GetAccount: {
+        case rpc_1.KeyringRpcMethod.GetAccount: {
             (0, superstruct_1.assert)(request, api_1.GetAccountRequestStruct);
             return keyring.getAccount(request.params.id);
         }
-        case KeyringRpcMethod.CreateAccount: {
+        case rpc_1.KeyringRpcMethod.CreateAccount: {
             (0, superstruct_1.assert)(request, api_1.CreateAccountRequestStruct);
             return keyring.createAccount(request.params.options);
         }
-        case KeyringRpcMethod.FilterAccountChains: {
+        case rpc_1.KeyringRpcMethod.FilterAccountChains: {
             (0, superstruct_1.assert)(request, api_1.FilterAccountChainsStruct);
             return keyring.filterAccountChains(request.params.id, request.params.chains);
         }
-        case KeyringRpcMethod.UpdateAccount: {
+        case rpc_1.KeyringRpcMethod.UpdateAccount: {
             (0, superstruct_1.assert)(request, api_1.UpdateAccountRequestStruct);
             return keyring.updateAccount(request.params.account);
         }
-        case KeyringRpcMethod.DeleteAccount: {
+        case rpc_1.KeyringRpcMethod.DeleteAccount: {
             (0, superstruct_1.assert)(request, api_1.DeleteAccountRequestStruct);
             return keyring.deleteAccount(request.params.id);
         }
-        case KeyringRpcMethod.ExportAccount: {
+        case rpc_1.KeyringRpcMethod.ExportAccount: {
             if (keyring.exportAccount === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.ExportAccountRequestStruct);
             return keyring.exportAccount(request.params.id);
         }
-        case KeyringRpcMethod.ListRequests: {
+        case rpc_1.KeyringRpcMethod.ListRequests: {
             if (keyring.listRequests === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.ListRequestsRequestStruct);
             return keyring.listRequests();
         }
-        case KeyringRpcMethod.GetRequest: {
+        case rpc_1.KeyringRpcMethod.GetRequest: {
             if (keyring.getRequest === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.GetRequestRequestStruct);
             return keyring.getRequest(request.params.id);
         }
-        case KeyringRpcMethod.SubmitRequest: {
+        case rpc_1.KeyringRpcMethod.SubmitRequest: {
             (0, superstruct_1.assert)(request, api_1.SubmitRequestRequestStruct);
             return keyring.submitRequest(request.params);
         }
-        case KeyringRpcMethod.ApproveRequest: {
+        case rpc_1.KeyringRpcMethod.ApproveRequest: {
             if (keyring.approveRequest === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.ApproveRequestRequestStruct);
             return keyring.approveRequest(request.params.id, request.params.data);
         }
-        case KeyringRpcMethod.RejectRequest: {
+        case rpc_1.KeyringRpcMethod.RejectRequest: {
             if (keyring.rejectRequest === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
@@ -109,14 +95,4 @@ async function handleKeyringRequest(keyring, request) {
     }
 }
 exports.handleKeyringRequest = handleKeyringRequest;
-/**
- * Check if a method is a keyring RPC method.
- *
- * @param method - Method to check.
- * @returns Whether the method is a keyring RPC method.
- */
-function isKeyringRpcMethod(method) {
-    return Object.values(KeyringRpcMethod).includes(method);
-}
-exports.isKeyringRpcMethod = isKeyringRpcMethod;
 //# sourceMappingURL=rpc-handler.js.map

package/dist/rpc-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-handler.js","sourceRoot":"","sources":["../src/rpc-handler.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Json } from '@metamask/utils';\nimport { assert } from 'superstruct';\n\nimport type { Keyring } from './api';\nimport {\n  GetAccountRequestStruct,\n  CreateAccountRequestStruct,\n  ApproveRequestRequestStruct,\n  DeleteAccountRequestStruct,\n  ExportAccountRequestStruct,\n  GetRequestRequestStruct,\n  RejectRequestRequestStruct,\n  SubmitRequestRequestStruct,\n  UpdateAccountRequestStruct,\n  FilterAccountChainsStruct,\n  ListAccountsRequestStruct,\n  ListRequestsRequestStruct,\n} from './internal/api';\nimport type { JsonRpcRequest } from './JsonRpcRequest';\nimport { JsonRpcRequestStruct } from './JsonRpcRequest';\n\n/**\n * Error thrown when a keyring JSON-RPC method is not supported.\n */\nexport class MethodNotSupportedError extends Error {\n  constructor(method: string) {\n    super(`Method not supported: ${method}`);\n  }\n}\n\nexport enum KeyringRpcMethod {\n  ListAccounts = 'keyring_listAccounts',\n  GetAccount = 'keyring_getAccount',\n  CreateAccount = 'keyring_createAccount',\n  FilterAccountChains = 'keyring_filterAccountChains',\n  UpdateAccount = 'keyring_updateAccount',\n  DeleteAccount = 'keyring_deleteAccount',\n  ExportAccount = 'keyring_exportAccount',\n  ListRequests = 'keyring_listRequests',\n  GetRequest = 'keyring_getRequest',\n  SubmitRequest = 'keyring_submitRequest',\n  ApproveRequest = 'keyring_approveRequest',\n  RejectRequest = 'keyring_rejectRequest',\n}\n\n/**\n * Handles a keyring JSON-RPC request.\n *\n * @param keyring - Keyring instance.\n * @param request - Keyring JSON-RPC request.\n * @returns A promise that resolves to the keyring response.\n */\nexport async function handleKeyringRequest(\n  keyring: Keyring,\n  request: JsonRpcRequest,\n): Promise<Json | void> {\n  // We first have to make sure that the request is a valid JSON-RPC request so\n  // we can check its method name.\n  assert(request, JsonRpcRequestStruct);\n\n  switch (request.method) {\n    case KeyringRpcMethod.ListAccounts: {\n      assert(request, ListAccountsRequestStruct);\n      return keyring.listAccounts();\n    }\n\n    case KeyringRpcMethod.GetAccount: {\n      assert(request, GetAccountRequestStruct);\n      return keyring.getAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.CreateAccount: {\n      assert(request, CreateAccountRequestStruct);\n      return keyring.createAccount(request.params.options);\n    }\n\n    case KeyringRpcMethod.FilterAccountChains: {\n      assert(request, FilterAccountChainsStruct);\n      return keyring.filterAccountChains(\n        request.params.id,\n        request.params.chains,\n      );\n    }\n\n    case KeyringRpcMethod.UpdateAccount: {\n      assert(request, UpdateAccountRequestStruct);\n      return keyring.updateAccount(request.params.account);\n    }\n\n    case KeyringRpcMethod.DeleteAccount: {\n      assert(request, DeleteAccountRequestStruct);\n      return keyring.deleteAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.ExportAccount: {\n      if (keyring.exportAccount === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ExportAccountRequestStruct);\n      return keyring.exportAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.ListRequests: {\n      if (keyring.listRequests === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ListRequestsRequestStruct);\n      return keyring.listRequests();\n    }\n\n    case KeyringRpcMethod.GetRequest: {\n      if (keyring.getRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, GetRequestRequestStruct);\n      return keyring.getRequest(request.params.id);\n    }\n\n    case KeyringRpcMethod.SubmitRequest: {\n      assert(request, SubmitRequestRequestStruct);\n      return keyring.submitRequest(request.params);\n    }\n\n    case KeyringRpcMethod.ApproveRequest: {\n      if (keyring.approveRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ApproveRequestRequestStruct);\n      return keyring.approveRequest(request.params.id, request.params.data);\n    }\n\n    case KeyringRpcMethod.RejectRequest: {\n      if (keyring.rejectRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, RejectRequestRequestStruct);\n      return keyring.rejectRequest(request.params.id);\n    }\n\n    default: {\n      throw new MethodNotSupportedError(request.method);\n    }\n  }\n}\n\n/**\n * Check if a method is a keyring RPC method.\n *\n * @param method - Method to check.\n * @returns Whether the method is a keyring RPC method.\n */\nexport function isKeyringRpcMethod(method: string): boolean {\n  return Object.values(KeyringRpcMethod).includes(method as KeyringRpcMethod);\n}\n"]}
+{"version":3,"file":"rpc-handler.js","sourceRoot":"","sources":["../src/rpc-handler.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Json } from '@metamask/utils';\nimport { assert } from 'superstruct';\n\nimport type { Keyring } from './api';\nimport {\n  GetAccountRequestStruct,\n  CreateAccountRequestStruct,\n  ApproveRequestRequestStruct,\n  DeleteAccountRequestStruct,\n  ExportAccountRequestStruct,\n  GetRequestRequestStruct,\n  RejectRequestRequestStruct,\n  SubmitRequestRequestStruct,\n  UpdateAccountRequestStruct,\n  FilterAccountChainsStruct,\n  ListAccountsRequestStruct,\n  ListRequestsRequestStruct,\n} from './internal/api';\nimport { KeyringRpcMethod } from './internal/rpc';\nimport type { JsonRpcRequest } from './JsonRpcRequest';\nimport { JsonRpcRequestStruct } from './JsonRpcRequest';\n\n/**\n * Error thrown when a keyring JSON-RPC method is not supported.\n */\nexport class MethodNotSupportedError extends Error {\n  constructor(method: string) {\n    super(`Method not supported: ${method}`);\n  }\n}\n\n/**\n * Handles a keyring JSON-RPC request.\n *\n * @param keyring - Keyring instance.\n * @param request - Keyring JSON-RPC request.\n * @returns A promise that resolves to the keyring response.\n */\nexport async function handleKeyringRequest(\n  keyring: Keyring,\n  request: JsonRpcRequest,\n): Promise<Json | void> {\n  // We first have to make sure that the request is a valid JSON-RPC request so\n  // we can check its method name.\n  assert(request, JsonRpcRequestStruct);\n\n  switch (request.method) {\n    case KeyringRpcMethod.ListAccounts: {\n      assert(request, ListAccountsRequestStruct);\n      return keyring.listAccounts();\n    }\n\n    case KeyringRpcMethod.GetAccount: {\n      assert(request, GetAccountRequestStruct);\n      return keyring.getAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.CreateAccount: {\n      assert(request, CreateAccountRequestStruct);\n      return keyring.createAccount(request.params.options);\n    }\n\n    case KeyringRpcMethod.FilterAccountChains: {\n      assert(request, FilterAccountChainsStruct);\n      return keyring.filterAccountChains(\n        request.params.id,\n        request.params.chains,\n      );\n    }\n\n    case KeyringRpcMethod.UpdateAccount: {\n      assert(request, UpdateAccountRequestStruct);\n      return keyring.updateAccount(request.params.account);\n    }\n\n    case KeyringRpcMethod.DeleteAccount: {\n      assert(request, DeleteAccountRequestStruct);\n      return keyring.deleteAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.ExportAccount: {\n      if (keyring.exportAccount === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ExportAccountRequestStruct);\n      return keyring.exportAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.ListRequests: {\n      if (keyring.listRequests === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ListRequestsRequestStruct);\n      return keyring.listRequests();\n    }\n\n    case KeyringRpcMethod.GetRequest: {\n      if (keyring.getRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, GetRequestRequestStruct);\n      return keyring.getRequest(request.params.id);\n    }\n\n    case KeyringRpcMethod.SubmitRequest: {\n      assert(request, SubmitRequestRequestStruct);\n      return keyring.submitRequest(request.params);\n    }\n\n    case KeyringRpcMethod.ApproveRequest: {\n      if (keyring.approveRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ApproveRequestRequestStruct);\n      return keyring.approveRequest(request.params.id, request.params.data);\n    }\n\n    case KeyringRpcMethod.RejectRequest: {\n      if (keyring.rejectRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, RejectRequestRequestStruct);\n      return keyring.rejectRequest(request.params.id);\n    }\n\n    default: {\n      throw new MethodNotSupportedError(request.method);\n    }\n  }\n}\n"]}

package/dist/snap-utils.d.ts

@@ -1,4 +1,4 @@
-import type { SnapsGlobalObject } from '@metamask/rpc-methods';
+import type { SnapsGlobalObject } from '@metamask/snaps-rpc-methods';
 import type { Json } from '@metamask/utils';
 import type { KeyringEvent } from './events';
 /**

package/dist/snap-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"snap-utils.js","sourceRoot":"","sources":["../src/snap-utils.ts"],"names":[],"mappings":";;;AAKA;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB,CACxC,IAAuB,EACvB,KAAmB,EACnB,IAA0B;IAE1B,MAAM,IAAI,CAAC,OAAO,CAAC;QACjB,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE;YACN,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE;SACpB;KACF,CAAC,CAAC;AACL,CAAC;AAZD,oDAYC","sourcesContent":["import type { SnapsGlobalObject } from '@metamask/rpc-methods';\nimport type { Json } from '@metamask/utils';\n\nimport type { KeyringEvent } from './events';\n\n/**\n * Emit a keyring event from a snap.\n *\n * @param snap - The global snap object.\n * @param event - The event name.\n * @param data - The event data.\n */\nexport async function emitSnapKeyringEvent(\n  snap: SnapsGlobalObject,\n  event: KeyringEvent,\n  data: Record<string, Json>,\n): Promise<void> {\n  await snap.request({\n    method: 'snap_manageAccounts',\n    params: {\n      method: event,\n      params: { ...data },\n    },\n  });\n}\n"]}
+{"version":3,"file":"snap-utils.js","sourceRoot":"","sources":["../src/snap-utils.ts"],"names":[],"mappings":";;;AAKA;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB,CACxC,IAAuB,EACvB,KAAmB,EACnB,IAA0B;IAE1B,MAAM,IAAI,CAAC,OAAO,CAAC;QACjB,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE;YACN,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE;SACpB;KACF,CAAC,CAAC;AACL,CAAC;AAZD,oDAYC","sourcesContent":["import type { SnapsGlobalObject } from '@metamask/snaps-rpc-methods';\nimport type { Json } from '@metamask/utils';\n\nimport type { KeyringEvent } from './events';\n\n/**\n * Emit a keyring event from a snap.\n *\n * @param snap - The global snap object.\n * @param event - The event name.\n * @param data - The event data.\n */\nexport async function emitSnapKeyringEvent(\n  snap: SnapsGlobalObject,\n  event: KeyringEvent,\n  data: Record<string, Json>,\n): Promise<void> {\n  await snap.request({\n    method: 'snap_manageAccounts',\n    params: {\n      method: event,\n      params: { ...data },\n    },\n  });\n}\n"]}

package/dist/utils.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.strictMask = exports.UuidStruct = void 0;
 const superstruct_1 = require("superstruct");
+const UUID_V4_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;
 /**
  * UUIDv4 struct.
  */
-exports.UuidStruct = (0, superstruct_1.pattern)((0, superstruct_1.string)(), /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu);
+exports.UuidStruct = (0, superstruct_1.define)('UuidV4', (id) => typeof id === 'string' && UUID_V4_REGEX.test(id));
 /**
  * Assert that a value is valid according to a struct.
  *

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,6CAAsD;AAGtD;;GAEG;AACU,QAAA,UAAU,GAAG,IAAA,qBAAO,EAC/B,IAAA,oBAAM,GAAE,EACR,yEAAyE,CAC1E,CAAC;AAcF;;;;;;;;;;GAUG;AACH,SAAgB,UAAU,CACxB,KAAc,EACd,MAA4B,EAC5B,OAAgB;IAEhB,IAAA,oBAAM,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,gCAOC","sourcesContent":["import { assert, pattern, string } from 'superstruct';\nimport type { Struct } from 'superstruct';\n\n/**\n * UUIDv4 struct.\n */\nexport const UuidStruct = pattern(\n  string(),\n  /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu,\n);\n\n/**\n * Omit keys from a union type.\n *\n * The normal `Omit` type does not distribute over unions. So we use this\n * workaround that applies `Omit` to each member of the union.\n *\n * See: <https://github.com/microsoft/TypeScript/issues/31501#issuecomment-1280579305>\n */\nexport type OmitUnion<Type, Key extends keyof any> = Type extends any\n  ? Omit<Type, Key>\n  : never;\n\n/**\n * Assert that a value is valid according to a struct.\n *\n * It is similar to superstruct's mask function, but it does not ignore extra\n * properties.\n *\n * @param value - Value to check.\n * @param struct - Struct to validate the value against.\n * @param message - Error message to throw if the value is not valid.\n * @returns The value if it is valid.\n */\nexport function strictMask<Type, Schema>(\n  value: unknown,\n  struct: Struct<Type, Schema>,\n  message?: string,\n): Type {\n  assert(value, struct, message);\n  return value;\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAG7C,MAAM,aAAa,GACjB,yEAAyE,CAAC;AAE5E;;GAEG;AACU,QAAA,UAAU,GAAG,IAAA,oBAAM,EAC9B,QAAQ,EACR,CAAC,EAAW,EAAW,EAAE,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAC3E,CAAC;AAcF;;;;;;;;;;GAUG;AACH,SAAgB,UAAU,CACxB,KAAc,EACd,MAA4B,EAC5B,OAAgB;IAEhB,IAAA,oBAAM,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,gCAOC","sourcesContent":["import { assert, define } from 'superstruct';\nimport type { Struct } from 'superstruct';\n\nconst UUID_V4_REGEX =\n  /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;\n\n/**\n * UUIDv4 struct.\n */\nexport const UuidStruct = define<string>(\n  'UuidV4',\n  (id: unknown): boolean => typeof id === 'string' && UUID_V4_REGEX.test(id),\n);\n\n/**\n * Omit keys from a union type.\n *\n * The normal `Omit` type does not distribute over unions. So we use this\n * workaround that applies `Omit` to each member of the union.\n *\n * See: <https://github.com/microsoft/TypeScript/issues/31501#issuecomment-1280579305>\n */\nexport type OmitUnion<Type, Key extends keyof any> = Type extends any\n  ? Omit<Type, Key>\n  : never;\n\n/**\n * Assert that a value is valid according to a struct.\n *\n * It is similar to superstruct's mask function, but it does not ignore extra\n * properties.\n *\n * @param value - Value to check.\n * @param struct - Struct to validate the value against.\n * @param message - Error message to throw if the value is not valid.\n * @returns The value if it is valid.\n */\nexport function strictMask<Type, Schema>(\n  value: unknown,\n  struct: Struct<Type, Schema>,\n  message?: string,\n): Type {\n  assert(value, struct, message);\n  return value;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/keyring-api",
-  "version": "1.0.0-rc.1",
+  "version": "1.1.0",
   "description": "MetaMask Keyring API",
   "keywords": [
     "metamask",
@@ -39,8 +39,8 @@
   },
   "dependencies": {
     "@metamask/providers": "^13.0.0",
-    "@metamask/rpc-methods": "^3.0.0",
-    "@metamask/snaps-controllers": "^3.0.0",
+    "@metamask/snaps-controllers": "^3.1.0",
+    "@metamask/snaps-rpc-methods": "^3.1.0",
     "@metamask/snaps-utils": "^3.0.0",
     "@metamask/utils": "^8.1.0",
     "@types/uuid": "^9.0.1",
@@ -90,8 +90,8 @@
   "lavamoat": {
     "allowScripts": {
       "@lavamoat/preinstall-always-fail": false,
-      "@metamask/rpc-methods>@metamask/permission-controller>@metamask/controller-utils>ethereumjs-util>ethereum-cryptography>keccak": false,
-      "@metamask/rpc-methods>@metamask/permission-controller>@metamask/controller-utils>ethereumjs-util>ethereum-cryptography>secp256k1": false
+      "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils>ethereumjs-util>ethereum-cryptography>keccak": false,
+      "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils>ethereumjs-util>ethereum-cryptography>secp256k1": false
     }
   },
   "tsd": {