@metamask-previews/keyring-api 8.1.0-preview-829a643 → 8.1.0-preview-e65b905

package/dist/index.js

@@ -24,5 +24,4 @@ __exportStar(require("./KeyringClient"), exports);
 __exportStar(require("./KeyringSnapRpcClient"), exports);
 __exportStar(require("./rpc-handler"), exports);
 __exportStar(require("./snap-utils"), exports);
-__exportStar(require("./superstruct"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,wCAAsB;AACtB,6CAA2B;AAC3B,wCAAsB;AACtB,2CAAyB;AACzB,6CAA2B;AAC3B,kDAAgC;AAChC,yDAAuC;AACvC,gDAA8B;AAC9B,+CAA6B;AAC7B,gDAA8B","sourcesContent":["export * from './api';\nexport * from './btc';\nexport * from './contexts';\nexport * from './eth';\nexport * from './events';\nexport * from './internal';\nexport * from './KeyringClient';\nexport * from './KeyringSnapRpcClient';\nexport * from './rpc-handler';\nexport * from './snap-utils';\nexport * from './superstruct';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,wCAAsB;AACtB,6CAA2B;AAC3B,wCAAsB;AACtB,2CAAyB;AACzB,6CAA2B;AAC3B,kDAAgC;AAChC,yDAAuC;AACvC,gDAA8B;AAC9B,+CAA6B","sourcesContent":["export * from './api';\nexport * from './btc';\nexport * from './contexts';\nexport * from './eth';\nexport * from './events';\nexport * from './internal';\nexport * from './KeyringClient';\nexport * from './KeyringSnapRpcClient';\nexport * from './rpc-handler';\nexport * from './snap-utils';\n"]}

package/dist/internal/api.d.ts

@@ -10,14 +10,14 @@ export declare const ListAccountsRequestStruct: import("@metamask/superstruct").
 }>;
 export declare type ListAccountsRequest = Infer<typeof ListAccountsRequestStruct>;
 export declare const ListAccountsResponseStruct: import("@metamask/superstruct").Struct<{
-    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
     id: string;
+    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
 }[], import("@metamask/superstruct").Struct<{
-    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
     id: string;
+    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
@@ -52,8 +52,8 @@ export declare const GetAccountRequestStruct: import("@metamask/superstruct").St
 }>;
 export declare type GetAccountRequest = Infer<typeof GetAccountRequestStruct>;
 export declare const GetAccountResponseStruct: import("@metamask/superstruct").Struct<{
-    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
     id: string;
+    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
@@ -88,8 +88,8 @@ export declare const CreateAccountRequestStruct: import("@metamask/superstruct")
 }>;
 export declare type CreateAccountRequest = Infer<typeof CreateAccountRequestStruct>;
 export declare const CreateAccountResponseStruct: import("@metamask/superstruct").Struct<{
-    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
     id: string;
+    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
@@ -160,8 +160,8 @@ export declare const UpdateAccountRequestStruct: import("@metamask/superstruct")
     method: "keyring_updateAccount";
     params: {
         account: {
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
@@ -171,16 +171,16 @@ export declare const UpdateAccountRequestStruct: import("@metamask/superstruct")
     method: import("@metamask/superstruct").Struct<"keyring_updateAccount", "keyring_updateAccount">;
     params: import("@metamask/superstruct").Struct<{
         account: {
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
         };
     }, {
         account: import("@metamask/superstruct").Struct<{
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
@@ -277,7 +277,7 @@ export declare const ListRequestsResponseStruct: import("@metamask/superstruct")
         params?: import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>;
     }, {
         method: import("@metamask/superstruct").Struct<string, null>;
-        params: import("@metamask/superstruct").Struct<import("../superstruct").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
+        params: import("@metamask/superstruct").Struct<import("@metamask/keyring-utils").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
     }>;
 }>>;
 export declare type ListRequestsResponse = Infer<typeof ListRequestsResponseStruct>;
@@ -316,7 +316,7 @@ export declare const GetRequestResponseStruct: import("@metamask/superstruct").S
         params?: import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>;
     }, {
         method: import("@metamask/superstruct").Struct<string, null>;
-        params: import("@metamask/superstruct").Struct<import("../superstruct").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
+        params: import("@metamask/superstruct").Struct<import("@metamask/keyring-utils").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
     }>;
 }>;
 export declare type GetRequestResponse = Infer<typeof GetRequestResponseStruct>;
@@ -352,7 +352,7 @@ export declare const SubmitRequestRequestStruct: import("@metamask/superstruct")
             params?: import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>;
         }, {
             method: import("@metamask/superstruct").Struct<string, null>;
-            params: import("@metamask/superstruct").Struct<import("../superstruct").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
+            params: import("@metamask/superstruct").Struct<import("@metamask/keyring-utils").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
         }>;
     }>;
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;

package/dist/internal/api.js

@@ -4,8 +4,7 @@ exports.RejectRequestResponseStruct = exports.RejectRequestRequestStruct = expor
 const superstruct_1 = require("@metamask/superstruct");
 const utils_1 = require("@metamask/utils");
 const api_1 = require("../api");
-const superstruct_2 = require("../superstruct");
-const utils_2 = require("../utils");
+const keyring_utils_1 = require("@metamask/keyring-utils");
 const rpc_1 = require("./rpc");
 const CommonHeader = {
     jsonrpc: (0, superstruct_1.literal)('2.0'),
@@ -13,103 +12,103 @@ const CommonHeader = {
 };
 // ----------------------------------------------------------------------------
 // List accounts
-exports.ListAccountsRequestStruct = (0, superstruct_2.object)({
+exports.ListAccountsRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_listAccounts'),
 });
 exports.ListAccountsResponseStruct = (0, superstruct_1.array)(api_1.KeyringAccountStruct);
 // ----------------------------------------------------------------------------
 // Get account
-exports.GetAccountRequestStruct = (0, superstruct_2.object)({
+exports.GetAccountRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_getAccount'),
-    params: (0, superstruct_2.object)({
-        id: utils_2.UuidStruct,
+    params: (0, keyring_utils_1.object)({
+        id: keyring_utils_1.UuidStruct,
     }),
 });
 exports.GetAccountResponseStruct = api_1.KeyringAccountStruct;
 // ----------------------------------------------------------------------------
 // Create account
-exports.CreateAccountRequestStruct = (0, superstruct_2.object)({
+exports.CreateAccountRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_createAccount'),
-    params: (0, superstruct_2.object)({
+    params: (0, keyring_utils_1.object)({
         options: (0, superstruct_1.record)((0, superstruct_1.string)(), utils_1.JsonStruct),
     }),
 });
 exports.CreateAccountResponseStruct = api_1.KeyringAccountStruct;
 // ----------------------------------------------------------------------------
 // Get account balances
-exports.GetAccountBalancesRequestStruct = (0, superstruct_2.object)({
+exports.GetAccountBalancesRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)(`${rpc_1.KeyringRpcMethod.GetAccountBalances}`),
-    params: (0, superstruct_2.object)({
-        id: utils_2.UuidStruct,
+    params: (0, keyring_utils_1.object)({
+        id: keyring_utils_1.UuidStruct,
         assets: (0, superstruct_1.array)(api_1.CaipAssetTypeStruct),
     }),
 });
 exports.GetAccountBalancesResponseStruct = (0, superstruct_1.record)(api_1.CaipAssetTypeStruct, api_1.BalanceStruct);
 // ----------------------------------------------------------------------------
 // Filter account chains
-exports.FilterAccountChainsStruct = (0, superstruct_2.object)({
+exports.FilterAccountChainsStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_filterAccountChains'),
-    params: (0, superstruct_2.object)({
-        id: utils_2.UuidStruct,
+    params: (0, keyring_utils_1.object)({
+        id: keyring_utils_1.UuidStruct,
         chains: (0, superstruct_1.array)((0, superstruct_1.string)()),
     }),
 });
 exports.FilterAccountChainsResponseStruct = (0, superstruct_1.array)((0, superstruct_1.string)());
 // ----------------------------------------------------------------------------
 // Update account
-exports.UpdateAccountRequestStruct = (0, superstruct_2.object)({
+exports.UpdateAccountRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_updateAccount'),
-    params: (0, superstruct_2.object)({
+    params: (0, keyring_utils_1.object)({
         account: api_1.KeyringAccountStruct,
     }),
 });
 exports.UpdateAccountResponseStruct = (0, superstruct_1.literal)(null);
 // ----------------------------------------------------------------------------
 // Delete account
-exports.DeleteAccountRequestStruct = (0, superstruct_2.object)({
+exports.DeleteAccountRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_deleteAccount'),
-    params: (0, superstruct_2.object)({
-        id: utils_2.UuidStruct,
+    params: (0, keyring_utils_1.object)({
+        id: keyring_utils_1.UuidStruct,
     }),
 });
 exports.DeleteAccountResponseStruct = (0, superstruct_1.literal)(null);
 // ----------------------------------------------------------------------------
 // Export account
-exports.ExportAccountRequestStruct = (0, superstruct_2.object)({
+exports.ExportAccountRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_exportAccount'),
-    params: (0, superstruct_2.object)({
-        id: utils_2.UuidStruct,
+    params: (0, keyring_utils_1.object)({
+        id: keyring_utils_1.UuidStruct,
     }),
 });
 exports.ExportAccountResponseStruct = api_1.KeyringAccountDataStruct;
 // ----------------------------------------------------------------------------
 // List requests
-exports.ListRequestsRequestStruct = (0, superstruct_2.object)({
+exports.ListRequestsRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_listRequests'),
 });
 exports.ListRequestsResponseStruct = (0, superstruct_1.array)(api_1.KeyringRequestStruct);
 // ----------------------------------------------------------------------------
 // Get request
-exports.GetRequestRequestStruct = (0, superstruct_2.object)({
+exports.GetRequestRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_getRequest'),
-    params: (0, superstruct_2.object)({
-        id: utils_2.UuidStruct,
+    params: (0, keyring_utils_1.object)({
+        id: keyring_utils_1.UuidStruct,
     }),
 });
 exports.GetRequestResponseStruct = api_1.KeyringRequestStruct;
 // ----------------------------------------------------------------------------
 // Submit request
-exports.SubmitRequestRequestStruct = (0, superstruct_2.object)({
+exports.SubmitRequestRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_submitRequest'),
     params: api_1.KeyringRequestStruct,
@@ -117,22 +116,22 @@ exports.SubmitRequestRequestStruct = (0, superstruct_2.object)({
 exports.SubmitRequestResponseStruct = api_1.KeyringResponseStruct;
 // ----------------------------------------------------------------------------
 // Approve request
-exports.ApproveRequestRequestStruct = (0, superstruct_2.object)({
+exports.ApproveRequestRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_approveRequest'),
-    params: (0, superstruct_2.object)({
-        id: utils_2.UuidStruct,
+    params: (0, keyring_utils_1.object)({
+        id: keyring_utils_1.UuidStruct,
         data: (0, superstruct_1.record)((0, superstruct_1.string)(), utils_1.JsonStruct),
     }),
 });
 exports.ApproveRequestResponseStruct = (0, superstruct_1.literal)(null);
 // ----------------------------------------------------------------------------
 // Reject request
-exports.RejectRequestRequestStruct = (0, superstruct_2.object)({
+exports.RejectRequestRequestStruct = (0, keyring_utils_1.object)({
     ...CommonHeader,
     method: (0, superstruct_1.literal)('keyring_rejectRequest'),
-    params: (0, superstruct_2.object)({
-        id: utils_2.UuidStruct,
+    params: (0, keyring_utils_1.object)({
+        id: keyring_utils_1.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 type { Infer } from '@metamask/superstruct';\nimport {\n  array,\n  literal,\n  number,\n  record,\n  string,\n  union,\n} from '@metamask/superstruct';\nimport { JsonStruct } from '@metamask/utils';\n\nimport {\n  BalanceStruct,\n  CaipAssetTypeStruct,\n  KeyringAccountDataStruct,\n  KeyringAccountStruct,\n  KeyringRequestStruct,\n  KeyringResponseStruct,\n} from '../api';\nimport { object } from '../superstruct';\nimport { UuidStruct } from '../utils';\nimport { KeyringRpcMethod } from './rpc';\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// Get account balances\n\nexport const GetAccountBalancesRequestStruct = object({\n  ...CommonHeader,\n  method: literal(`${KeyringRpcMethod.GetAccountBalances}`),\n  params: object({\n    id: UuidStruct,\n    assets: array(CaipAssetTypeStruct),\n  }),\n});\n\nexport type GetAccountBalancesRequest = Infer<\n  typeof GetAccountBalancesRequestStruct\n>;\n\nexport const GetAccountBalancesResponseStruct = record(\n  CaipAssetTypeStruct,\n  BalanceStruct,\n);\n\nexport type GetAccountBalancesResponse = Infer<\n  typeof GetAccountBalancesResponseStruct\n>;\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"]}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/internal/api.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Infer } from '@metamask/superstruct';\nimport {\n  array,\n  literal,\n  number,\n  record,\n  string,\n  union,\n} from '@metamask/superstruct';\nimport { JsonStruct } from '@metamask/utils';\n\nimport {\n  BalanceStruct,\n  CaipAssetTypeStruct,\n  KeyringAccountDataStruct,\n  KeyringAccountStruct,\n  KeyringRequestStruct,\n  KeyringResponseStruct,\n} from '../api';\nimport { object, UuidStruct } from '@metamask/keyring-utils';\nimport { KeyringRpcMethod } from './rpc';\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// Get account balances\n\nexport const GetAccountBalancesRequestStruct = object({\n  ...CommonHeader,\n  method: literal(`${KeyringRpcMethod.GetAccountBalances}`),\n  params: object({\n    id: UuidStruct,\n    assets: array(CaipAssetTypeStruct),\n  }),\n});\n\nexport type GetAccountBalancesRequest = Infer<\n  typeof GetAccountBalancesRequestStruct\n>;\n\nexport const GetAccountBalancesResponseStruct = record(\n  CaipAssetTypeStruct,\n  BalanceStruct,\n);\n\nexport type GetAccountBalancesResponse = Infer<\n  typeof GetAccountBalancesResponseStruct\n>;\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/events.d.ts

@@ -2,8 +2,8 @@ export declare const AccountCreatedEventStruct: import("@metamask/superstruct").
     method: "notify:accountCreated";
     params: {
         account: {
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
@@ -15,8 +15,8 @@ export declare const AccountCreatedEventStruct: import("@metamask/superstruct").
     method: import("@metamask/superstruct").Struct<"notify:accountCreated", "notify:accountCreated">;
     params: import("@metamask/superstruct").Struct<{
         account: {
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
@@ -28,8 +28,8 @@ export declare const AccountCreatedEventStruct: import("@metamask/superstruct").
          * New account object.
          */
         account: import("@metamask/superstruct").Struct<{
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
@@ -51,20 +51,20 @@ export declare const AccountCreatedEventStruct: import("@metamask/superstruct").
          * client to decide whether to use it. The keyring won't be informed if the
          * client decides to use a different name.
          */
-        accountNameSuggestion: import("@metamask/superstruct").Struct<string | import("../superstruct").ExactOptionalTag, null>;
+        accountNameSuggestion: import("@metamask/superstruct").Struct<string | import("@metamask/keyring-utils").ExactOptionalTag, null>;
         /**
          * Instructs MetaMask to display the add account confirmation dialog in the UI.
          * **Note:** This is not guaranteed to be honored by the MetaMask client.
          */
-        displayConfirmation: import("@metamask/superstruct").Struct<boolean | import("../superstruct").ExactOptionalTag, null>;
+        displayConfirmation: import("@metamask/superstruct").Struct<boolean | import("@metamask/keyring-utils").ExactOptionalTag, null>;
     }>;
 }>;
 export declare const AccountUpdatedEventStruct: import("@metamask/superstruct").Struct<{
     method: "notify:accountUpdated";
     params: {
         account: {
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
@@ -74,8 +74,8 @@ export declare const AccountUpdatedEventStruct: import("@metamask/superstruct").
     method: import("@metamask/superstruct").Struct<"notify:accountUpdated", "notify:accountUpdated">;
     params: import("@metamask/superstruct").Struct<{
         account: {
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
@@ -85,8 +85,8 @@ export declare const AccountUpdatedEventStruct: import("@metamask/superstruct").
          * Updated account object.
          */
         account: import("@metamask/superstruct").Struct<{
-            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             id: string;
+            type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];

package/dist/internal/events.js

@@ -5,11 +5,10 @@ const superstruct_1 = require("@metamask/superstruct");
 const utils_1 = require("@metamask/utils");
 const api_1 = require("../api");
 const events_1 = require("../events");
-const superstruct_2 = require("../superstruct");
-const utils_2 = require("../utils");
-exports.AccountCreatedEventStruct = (0, superstruct_2.object)({
+const keyring_utils_1 = require("@metamask/keyring-utils");
+exports.AccountCreatedEventStruct = (0, keyring_utils_1.object)({
     method: (0, superstruct_1.literal)(`${events_1.KeyringEvent.AccountCreated}`),
-    params: (0, superstruct_2.object)({
+    params: (0, keyring_utils_1.object)({
         /**
          * New account object.
          */
@@ -21,52 +20,52 @@ exports.AccountCreatedEventStruct = (0, superstruct_2.object)({
          * client to decide whether to use it. The keyring won't be informed if the
          * client decides to use a different name.
          */
-        accountNameSuggestion: (0, superstruct_2.exactOptional)((0, superstruct_1.string)()),
+        accountNameSuggestion: (0, keyring_utils_1.exactOptional)((0, superstruct_1.string)()),
         /**
          * Instructs MetaMask to display the add account confirmation dialog in the UI.
          * **Note:** This is not guaranteed to be honored by the MetaMask client.
          */
-        displayConfirmation: (0, superstruct_2.exactOptional)((0, superstruct_1.boolean)()),
+        displayConfirmation: (0, keyring_utils_1.exactOptional)((0, superstruct_1.boolean)()),
     }),
 });
-exports.AccountUpdatedEventStruct = (0, superstruct_2.object)({
+exports.AccountUpdatedEventStruct = (0, keyring_utils_1.object)({
     method: (0, superstruct_1.literal)(`${events_1.KeyringEvent.AccountUpdated}`),
-    params: (0, superstruct_2.object)({
+    params: (0, keyring_utils_1.object)({
         /**
          * Updated account object.
          */
         account: api_1.KeyringAccountStruct,
     }),
 });
-exports.AccountDeletedEventStruct = (0, superstruct_2.object)({
+exports.AccountDeletedEventStruct = (0, keyring_utils_1.object)({
     method: (0, superstruct_1.literal)(`${events_1.KeyringEvent.AccountDeleted}`),
-    params: (0, superstruct_2.object)({
+    params: (0, keyring_utils_1.object)({
         /**
          * Deleted account ID.
          */
-        id: utils_2.UuidStruct,
+        id: keyring_utils_1.UuidStruct,
     }),
 });
-exports.RequestApprovedEventStruct = (0, superstruct_2.object)({
+exports.RequestApprovedEventStruct = (0, keyring_utils_1.object)({
     method: (0, superstruct_1.literal)(`${events_1.KeyringEvent.RequestApproved}`),
-    params: (0, superstruct_2.object)({
+    params: (0, keyring_utils_1.object)({
         /**
          * Request ID.
          */
-        id: utils_2.UuidStruct,
+        id: keyring_utils_1.UuidStruct,
         /**
          * Request result.
          */
         result: utils_1.JsonStruct,
     }),
 });
-exports.RequestRejectedEventStruct = (0, superstruct_2.object)({
+exports.RequestRejectedEventStruct = (0, keyring_utils_1.object)({
     method: (0, superstruct_1.literal)(`${events_1.KeyringEvent.RequestRejected}`),
-    params: (0, superstruct_2.object)({
+    params: (0, keyring_utils_1.object)({
         /**
          * Request ID.
          */
-        id: utils_2.UuidStruct,
+        id: keyring_utils_1.UuidStruct,
     }),
 });
 //# sourceMappingURL=events.js.map

package/dist/internal/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/internal/events.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AACjE,2CAA6C;AAE7C,gCAA8C;AAC9C,sCAAyC;AACzC,gDAAuD;AACvD,oCAAsC;AAEzB,QAAA,yBAAyB,GAAG,IAAA,oBAAM,EAAC;IAC9C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,cAAc,EAAE,CAAC;IACjD,MAAM,EAAE,IAAA,oBAAM,EAAC;QACb;;WAEG;QACH,OAAO,EAAE,0BAAoB;QAE7B;;;;;;WAMG;QACH,qBAAqB,EAAE,IAAA,2BAAa,EAAC,IAAA,oBAAM,GAAE,CAAC;QAE9C;;;WAGG;QACH,mBAAmB,EAAE,IAAA,2BAAa,EAAC,IAAA,qBAAO,GAAE,CAAC;KAC9C,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAA,oBAAM,EAAC;IAC9C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,cAAc,EAAE,CAAC;IACjD,MAAM,EAAE,IAAA,oBAAM,EAAC;QACb;;WAEG;QACH,OAAO,EAAE,0BAAoB;KAC9B,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAA,oBAAM,EAAC;IAC9C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,cAAc,EAAE,CAAC;IACjD,MAAM,EAAE,IAAA,oBAAM,EAAC;QACb;;WAEG;QACH,EAAE,EAAE,kBAAU;KACf,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,0BAA0B,GAAG,IAAA,oBAAM,EAAC;IAC/C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,eAAe,EAAE,CAAC;IAClD,MAAM,EAAE,IAAA,oBAAM,EAAC;QACb;;WAEG;QACH,EAAE,EAAE,kBAAU;QAEd;;WAEG;QACH,MAAM,EAAE,kBAAU;KACnB,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,0BAA0B,GAAG,IAAA,oBAAM,EAAC;IAC/C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,eAAe,EAAE,CAAC;IAClD,MAAM,EAAE,IAAA,oBAAM,EAAC;QACb;;WAEG;QACH,EAAE,EAAE,kBAAU;KACf,CAAC;CACH,CAAC,CAAC","sourcesContent":["import { boolean, literal, string } from '@metamask/superstruct';\nimport { JsonStruct } from '@metamask/utils';\n\nimport { KeyringAccountStruct } from '../api';\nimport { KeyringEvent } from '../events';\nimport { exactOptional, object } from '../superstruct';\nimport { UuidStruct } from '../utils';\n\nexport const AccountCreatedEventStruct = object({\n  method: literal(`${KeyringEvent.AccountCreated}`),\n  params: object({\n    /**\n     * New account object.\n     */\n    account: KeyringAccountStruct,\n\n    /**\n     * Account name suggestion provided to the MetaMask client.\n     *\n     * The keyring can suggest a name for the account, but it's up to the\n     * client to decide whether to use it. The keyring won't be informed if the\n     * client decides to use a different name.\n     */\n    accountNameSuggestion: exactOptional(string()),\n\n    /**\n     * Instructs MetaMask to display the add account confirmation dialog in the UI.\n     * **Note:** This is not guaranteed to be honored by the MetaMask client.\n     */\n    displayConfirmation: exactOptional(boolean()),\n  }),\n});\n\nexport const AccountUpdatedEventStruct = object({\n  method: literal(`${KeyringEvent.AccountUpdated}`),\n  params: object({\n    /**\n     * Updated account object.\n     */\n    account: KeyringAccountStruct,\n  }),\n});\n\nexport const AccountDeletedEventStruct = object({\n  method: literal(`${KeyringEvent.AccountDeleted}`),\n  params: object({\n    /**\n     * Deleted account ID.\n     */\n    id: UuidStruct,\n  }),\n});\n\nexport const RequestApprovedEventStruct = object({\n  method: literal(`${KeyringEvent.RequestApproved}`),\n  params: object({\n    /**\n     * Request ID.\n     */\n    id: UuidStruct,\n\n    /**\n     * Request result.\n     */\n    result: JsonStruct,\n  }),\n});\n\nexport const RequestRejectedEventStruct = object({\n  method: literal(`${KeyringEvent.RequestRejected}`),\n  params: object({\n    /**\n     * Request ID.\n     */\n    id: UuidStruct,\n  }),\n});\n"]}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/internal/events.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AACjE,2CAA6C;AAE7C,gCAA8C;AAC9C,sCAAyC;AACzC,2DAA4E;AAE/D,QAAA,yBAAyB,GAAG,IAAA,sBAAM,EAAC;IAC9C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,cAAc,EAAE,CAAC;IACjD,MAAM,EAAE,IAAA,sBAAM,EAAC;QACb;;WAEG;QACH,OAAO,EAAE,0BAAoB;QAE7B;;;;;;WAMG;QACH,qBAAqB,EAAE,IAAA,6BAAa,EAAC,IAAA,oBAAM,GAAE,CAAC;QAE9C;;;WAGG;QACH,mBAAmB,EAAE,IAAA,6BAAa,EAAC,IAAA,qBAAO,GAAE,CAAC;KAC9C,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAA,sBAAM,EAAC;IAC9C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,cAAc,EAAE,CAAC;IACjD,MAAM,EAAE,IAAA,sBAAM,EAAC;QACb;;WAEG;QACH,OAAO,EAAE,0BAAoB;KAC9B,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,IAAA,sBAAM,EAAC;IAC9C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,cAAc,EAAE,CAAC;IACjD,MAAM,EAAE,IAAA,sBAAM,EAAC;QACb;;WAEG;QACH,EAAE,EAAE,0BAAU;KACf,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,0BAA0B,GAAG,IAAA,sBAAM,EAAC;IAC/C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,eAAe,EAAE,CAAC;IAClD,MAAM,EAAE,IAAA,sBAAM,EAAC;QACb;;WAEG;QACH,EAAE,EAAE,0BAAU;QAEd;;WAEG;QACH,MAAM,EAAE,kBAAU;KACnB,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,0BAA0B,GAAG,IAAA,sBAAM,EAAC;IAC/C,MAAM,EAAE,IAAA,qBAAO,EAAC,GAAG,qBAAY,CAAC,eAAe,EAAE,CAAC;IAClD,MAAM,EAAE,IAAA,sBAAM,EAAC;QACb;;WAEG;QACH,EAAE,EAAE,0BAAU;KACf,CAAC;CACH,CAAC,CAAC","sourcesContent":["import { boolean, literal, string } from '@metamask/superstruct';\nimport { JsonStruct } from '@metamask/utils';\n\nimport { KeyringAccountStruct } from '../api';\nimport { KeyringEvent } from '../events';\nimport { exactOptional, object, UuidStruct } from '@metamask/keyring-utils';\n\nexport const AccountCreatedEventStruct = object({\n  method: literal(`${KeyringEvent.AccountCreated}`),\n  params: object({\n    /**\n     * New account object.\n     */\n    account: KeyringAccountStruct,\n\n    /**\n     * Account name suggestion provided to the MetaMask client.\n     *\n     * The keyring can suggest a name for the account, but it's up to the\n     * client to decide whether to use it. The keyring won't be informed if the\n     * client decides to use a different name.\n     */\n    accountNameSuggestion: exactOptional(string()),\n\n    /**\n     * Instructs MetaMask to display the add account confirmation dialog in the UI.\n     * **Note:** This is not guaranteed to be honored by the MetaMask client.\n     */\n    displayConfirmation: exactOptional(boolean()),\n  }),\n});\n\nexport const AccountUpdatedEventStruct = object({\n  method: literal(`${KeyringEvent.AccountUpdated}`),\n  params: object({\n    /**\n     * Updated account object.\n     */\n    account: KeyringAccountStruct,\n  }),\n});\n\nexport const AccountDeletedEventStruct = object({\n  method: literal(`${KeyringEvent.AccountDeleted}`),\n  params: object({\n    /**\n     * Deleted account ID.\n     */\n    id: UuidStruct,\n  }),\n});\n\nexport const RequestApprovedEventStruct = object({\n  method: literal(`${KeyringEvent.RequestApproved}`),\n  params: object({\n    /**\n     * Request ID.\n     */\n    id: UuidStruct,\n\n    /**\n     * Request result.\n     */\n    result: JsonStruct,\n  }),\n});\n\nexport const RequestRejectedEventStruct = object({\n  method: literal(`${KeyringEvent.RequestRejected}`),\n  params: object({\n    /**\n     * Request ID.\n     */\n    id: UuidStruct,\n  }),\n});\n"]}