@metamask-previews/keyring-api 8.1.0-preview-e65b905 → 8.1.3-84e4c35

package/dist/contexts.d.ts

@@ -1,7 +1,7 @@
 /**
  * Context used by a Keyring implementation.
  */
-export declare type KeyringExecutionContext = {
+export type KeyringExecutionContext = {
     /** The chain ID. */
     chainId: string;
 };

package/dist/eth/erc4337/types.d.ts

@@ -1,6 +1,7 @@
 import { type Infer } from '@metamask/superstruct';
 /**
  * Struct of a UserOperation as defined by ERC-4337.
+ *
  * @see https://eips.ethereum.org/EIPS/eip-4337#definitions
  */
 export declare const EthUserOperationStruct: import("@metamask/superstruct").Struct<{
@@ -28,14 +29,14 @@ export declare const EthUserOperationStruct: import("@metamask/superstruct").Str
     paymasterAndData: import("@metamask/superstruct").Struct<string, null>;
     signature: import("@metamask/superstruct").Struct<string, null>;
 }>;
-export declare type EthUserOperation = Infer<typeof EthUserOperationStruct>;
+export type EthUserOperation = Infer<typeof EthUserOperationStruct>;
 /**
  * Struct containing the most basic transaction information required to
  * construct a UserOperation.
  */
 export declare const EthBaseTransactionStruct: import("@metamask/superstruct").Struct<{
-    data: string;
     value: string;
+    data: string;
     to: string;
 }, {
     /**
@@ -51,7 +52,7 @@ export declare const EthBaseTransactionStruct: import("@metamask/superstruct").S
      */
     data: import("@metamask/superstruct").Struct<string, null>;
 }>;
-export declare type EthBaseTransaction = Infer<typeof EthBaseTransactionStruct>;
+export type EthBaseTransaction = Infer<typeof EthBaseTransactionStruct>;
 export declare const EthBaseUserOperationStruct: import("@metamask/superstruct").Struct<{
     nonce: string;
     initCode: string;
@@ -68,7 +69,7 @@ export declare const EthBaseUserOperationStruct: import("@metamask/superstruct")
     nonce: import("@metamask/superstruct").Struct<string, null>;
     initCode: import("@metamask/superstruct").Struct<string, null>;
     callData: import("@metamask/superstruct").Struct<string, null>;
-    gasLimits: import("@metamask/superstruct").Struct<import("@metamask/keyring-utils").ExactOptionalTag | {
+    gasLimits: import("@metamask/superstruct").Struct<import("../../superstruct").ExactOptionalTag | {
         callGasLimit: string;
         verificationGasLimit: string;
         preVerificationGas: string;
@@ -81,7 +82,7 @@ export declare const EthBaseUserOperationStruct: import("@metamask/superstruct")
     dummySignature: import("@metamask/superstruct").Struct<string, null>;
     bundlerUrl: import("@metamask/superstruct").Struct<string, null>;
 }>;
-export declare type EthBaseUserOperation = Infer<typeof EthBaseUserOperationStruct>;
+export type EthBaseUserOperation = Infer<typeof EthBaseUserOperationStruct>;
 export declare const EthUserOperationPatchStruct: import("@metamask/superstruct").Struct<{
     paymasterAndData: string;
     callGasLimit?: string;
@@ -89,8 +90,8 @@ export declare const EthUserOperationPatchStruct: import("@metamask/superstruct"
     preVerificationGas?: string;
 }, {
     paymasterAndData: import("@metamask/superstruct").Struct<string, null>;
-    callGasLimit: import("@metamask/superstruct").Struct<string | import("@metamask/keyring-utils").ExactOptionalTag, null>;
-    verificationGasLimit: import("@metamask/superstruct").Struct<string | import("@metamask/keyring-utils").ExactOptionalTag, null>;
-    preVerificationGas: import("@metamask/superstruct").Struct<string | import("@metamask/keyring-utils").ExactOptionalTag, null>;
+    callGasLimit: import("@metamask/superstruct").Struct<string | import("../../superstruct").ExactOptionalTag, null>;
+    verificationGasLimit: import("@metamask/superstruct").Struct<string | import("../../superstruct").ExactOptionalTag, null>;
+    preVerificationGas: import("@metamask/superstruct").Struct<string | import("../../superstruct").ExactOptionalTag, null>;
 }>;
-export declare type EthUserOperationPatch = Infer<typeof EthUserOperationPatchStruct>;
+export type EthUserOperationPatch = Infer<typeof EthUserOperationPatchStruct>;

package/dist/eth/erc4337/types.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthUserOperationPatchStruct = exports.EthBaseUserOperationStruct = exports.EthBaseTransactionStruct = exports.EthUserOperationStruct = void 0;
-const keyring_utils_1 = require("@metamask/keyring-utils");
+const superstruct_1 = require("../../superstruct");
+const utils_1 = require("../../utils");
 const types_1 = require("../types");
 /**
  * Struct of a UserOperation as defined by ERC-4337.
+ *
  * @see https://eips.ethereum.org/EIPS/eip-4337#definitions
  */
-exports.EthUserOperationStruct = (0, keyring_utils_1.object)({
+exports.EthUserOperationStruct = (0, superstruct_1.object)({
     sender: types_1.EthAddressStruct,
     nonce: types_1.EthUint256Struct,
     initCode: types_1.EthBytesStruct,
@@ -24,7 +26,7 @@ exports.EthUserOperationStruct = (0, keyring_utils_1.object)({
  * Struct containing the most basic transaction information required to
  * construct a UserOperation.
  */
-exports.EthBaseTransactionStruct = (0, keyring_utils_1.object)({
+exports.EthBaseTransactionStruct = (0, superstruct_1.object)({
     /**
      * Address of the transaction recipient.
      */
@@ -38,23 +40,23 @@ exports.EthBaseTransactionStruct = (0, keyring_utils_1.object)({
      */
     data: types_1.EthBytesStruct,
 });
-exports.EthBaseUserOperationStruct = (0, keyring_utils_1.object)({
+exports.EthBaseUserOperationStruct = (0, superstruct_1.object)({
     nonce: types_1.EthUint256Struct,
     initCode: types_1.EthBytesStruct,
     callData: types_1.EthBytesStruct,
-    gasLimits: (0, keyring_utils_1.exactOptional)((0, keyring_utils_1.object)({
+    gasLimits: (0, superstruct_1.exactOptional)((0, superstruct_1.object)({
         callGasLimit: types_1.EthUint256Struct,
         verificationGasLimit: types_1.EthUint256Struct,
         preVerificationGas: types_1.EthUint256Struct,
     })),
     dummyPaymasterAndData: types_1.EthBytesStruct,
     dummySignature: types_1.EthBytesStruct,
-    bundlerUrl: keyring_utils_1.UrlStruct,
+    bundlerUrl: utils_1.UrlStruct,
 });
-exports.EthUserOperationPatchStruct = (0, keyring_utils_1.object)({
+exports.EthUserOperationPatchStruct = (0, superstruct_1.object)({
     paymasterAndData: types_1.EthBytesStruct,
-    callGasLimit: (0, keyring_utils_1.exactOptional)(types_1.EthUint256Struct),
-    verificationGasLimit: (0, keyring_utils_1.exactOptional)(types_1.EthUint256Struct),
-    preVerificationGas: (0, keyring_utils_1.exactOptional)(types_1.EthUint256Struct),
+    callGasLimit: (0, superstruct_1.exactOptional)(types_1.EthUint256Struct),
+    verificationGasLimit: (0, superstruct_1.exactOptional)(types_1.EthUint256Struct),
+    preVerificationGas: (0, superstruct_1.exactOptional)(types_1.EthUint256Struct),
 });
 //# sourceMappingURL=types.js.map

package/dist/eth/erc4337/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/eth/erc4337/types.ts"],"names":[],"mappings":";;;AAEA,2DAA2E;AAC3E,oCAA8E;AAE9E;;;GAGG;AACU,QAAA,sBAAsB,GAAG,IAAA,sBAAM,EAAC;IAC3C,MAAM,EAAE,wBAAgB;IACxB,KAAK,EAAE,wBAAgB;IACvB,QAAQ,EAAE,sBAAc;IACxB,QAAQ,EAAE,sBAAc;IACxB,YAAY,EAAE,wBAAgB;IAC9B,oBAAoB,EAAE,wBAAgB;IACtC,kBAAkB,EAAE,wBAAgB;IACpC,YAAY,EAAE,wBAAgB;IAC9B,oBAAoB,EAAE,wBAAgB;IACtC,gBAAgB,EAAE,sBAAc;IAChC,SAAS,EAAE,sBAAc;CAC1B,CAAC,CAAC;AAIH;;;GAGG;AACU,QAAA,wBAAwB,GAAG,IAAA,sBAAM,EAAC;IAC7C;;OAEG;IACH,EAAE,EAAE,wBAAgB;IAEpB;;OAEG;IACH,KAAK,EAAE,wBAAgB;IAEvB;;OAEG;IACH,IAAI,EAAE,sBAAc;CACrB,CAAC,CAAC;AAIU,QAAA,0BAA0B,GAAG,IAAA,sBAAM,EAAC;IAC/C,KAAK,EAAE,wBAAgB;IACvB,QAAQ,EAAE,sBAAc;IACxB,QAAQ,EAAE,sBAAc;IACxB,SAAS,EAAE,IAAA,6BAAa,EACtB,IAAA,sBAAM,EAAC;QACL,YAAY,EAAE,wBAAgB;QAC9B,oBAAoB,EAAE,wBAAgB;QACtC,kBAAkB,EAAE,wBAAgB;KACrC,CAAC,CACH;IACD,qBAAqB,EAAE,sBAAc;IACrC,cAAc,EAAE,sBAAc;IAC9B,UAAU,EAAE,yBAAS;CACtB,CAAC,CAAC;AAIU,QAAA,2BAA2B,GAAG,IAAA,sBAAM,EAAC;IAChD,gBAAgB,EAAE,sBAAc;IAChC,YAAY,EAAE,IAAA,6BAAa,EAAC,wBAAgB,CAAC;IAC7C,oBAAoB,EAAE,IAAA,6BAAa,EAAC,wBAAgB,CAAC;IACrD,kBAAkB,EAAE,IAAA,6BAAa,EAAC,wBAAgB,CAAC;CACpD,CAAC,CAAC","sourcesContent":["import { type Infer } from '@metamask/superstruct';\n\nimport { exactOptional, object, UrlStruct } from '@metamask/keyring-utils';\nimport { EthAddressStruct, EthBytesStruct, EthUint256Struct } from '../types';\n\n/**\n * Struct of a UserOperation as defined by ERC-4337.\n * @see https://eips.ethereum.org/EIPS/eip-4337#definitions\n */\nexport const EthUserOperationStruct = object({\n  sender: EthAddressStruct,\n  nonce: EthUint256Struct,\n  initCode: EthBytesStruct,\n  callData: EthBytesStruct,\n  callGasLimit: EthUint256Struct,\n  verificationGasLimit: EthUint256Struct,\n  preVerificationGas: EthUint256Struct,\n  maxFeePerGas: EthUint256Struct,\n  maxPriorityFeePerGas: EthUint256Struct,\n  paymasterAndData: EthBytesStruct,\n  signature: EthBytesStruct,\n});\n\nexport type EthUserOperation = Infer<typeof EthUserOperationStruct>;\n\n/**\n * Struct containing the most basic transaction information required to\n * construct a UserOperation.\n */\nexport const EthBaseTransactionStruct = object({\n  /**\n   * Address of the transaction recipient.\n   */\n  to: EthAddressStruct,\n\n  /**\n   * Amount of wei to transfer to the recipient.\n   */\n  value: EthUint256Struct,\n\n  /**\n   * Data to pass to the recipient.\n   */\n  data: EthBytesStruct,\n});\n\nexport type EthBaseTransaction = Infer<typeof EthBaseTransactionStruct>;\n\nexport const EthBaseUserOperationStruct = object({\n  nonce: EthUint256Struct,\n  initCode: EthBytesStruct,\n  callData: EthBytesStruct,\n  gasLimits: exactOptional(\n    object({\n      callGasLimit: EthUint256Struct,\n      verificationGasLimit: EthUint256Struct,\n      preVerificationGas: EthUint256Struct,\n    }),\n  ),\n  dummyPaymasterAndData: EthBytesStruct,\n  dummySignature: EthBytesStruct,\n  bundlerUrl: UrlStruct,\n});\n\nexport type EthBaseUserOperation = Infer<typeof EthBaseUserOperationStruct>;\n\nexport const EthUserOperationPatchStruct = object({\n  paymasterAndData: EthBytesStruct,\n  callGasLimit: exactOptional(EthUint256Struct),\n  verificationGasLimit: exactOptional(EthUint256Struct),\n  preVerificationGas: exactOptional(EthUint256Struct),\n});\n\nexport type EthUserOperationPatch = Infer<typeof EthUserOperationPatchStruct>;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/eth/erc4337/types.ts"],"names":[],"mappings":";;;AAEA,mDAA0D;AAC1D,uCAAwC;AACxC,oCAA8E;AAE9E;;;;GAIG;AACU,QAAA,sBAAsB,GAAG,IAAA,oBAAM,EAAC;IAC3C,MAAM,EAAE,wBAAgB;IACxB,KAAK,EAAE,wBAAgB;IACvB,QAAQ,EAAE,sBAAc;IACxB,QAAQ,EAAE,sBAAc;IACxB,YAAY,EAAE,wBAAgB;IAC9B,oBAAoB,EAAE,wBAAgB;IACtC,kBAAkB,EAAE,wBAAgB;IACpC,YAAY,EAAE,wBAAgB;IAC9B,oBAAoB,EAAE,wBAAgB;IACtC,gBAAgB,EAAE,sBAAc;IAChC,SAAS,EAAE,sBAAc;CAC1B,CAAC,CAAC;AAIH;;;GAGG;AACU,QAAA,wBAAwB,GAAG,IAAA,oBAAM,EAAC;IAC7C;;OAEG;IACH,EAAE,EAAE,wBAAgB;IAEpB;;OAEG;IACH,KAAK,EAAE,wBAAgB;IAEvB;;OAEG;IACH,IAAI,EAAE,sBAAc;CACrB,CAAC,CAAC;AAIU,QAAA,0BAA0B,GAAG,IAAA,oBAAM,EAAC;IAC/C,KAAK,EAAE,wBAAgB;IACvB,QAAQ,EAAE,sBAAc;IACxB,QAAQ,EAAE,sBAAc;IACxB,SAAS,EAAE,IAAA,2BAAa,EACtB,IAAA,oBAAM,EAAC;QACL,YAAY,EAAE,wBAAgB;QAC9B,oBAAoB,EAAE,wBAAgB;QACtC,kBAAkB,EAAE,wBAAgB;KACrC,CAAC,CACH;IACD,qBAAqB,EAAE,sBAAc;IACrC,cAAc,EAAE,sBAAc;IAC9B,UAAU,EAAE,iBAAS;CACtB,CAAC,CAAC;AAIU,QAAA,2BAA2B,GAAG,IAAA,oBAAM,EAAC;IAChD,gBAAgB,EAAE,sBAAc;IAChC,YAAY,EAAE,IAAA,2BAAa,EAAC,wBAAgB,CAAC;IAC7C,oBAAoB,EAAE,IAAA,2BAAa,EAAC,wBAAgB,CAAC;IACrD,kBAAkB,EAAE,IAAA,2BAAa,EAAC,wBAAgB,CAAC;CACpD,CAAC,CAAC","sourcesContent":["import { type Infer } from '@metamask/superstruct';\n\nimport { exactOptional, object } from '../../superstruct';\nimport { UrlStruct } from '../../utils';\nimport { EthAddressStruct, EthBytesStruct, EthUint256Struct } from '../types';\n\n/**\n * Struct of a UserOperation as defined by ERC-4337.\n *\n * @see https://eips.ethereum.org/EIPS/eip-4337#definitions\n */\nexport const EthUserOperationStruct = object({\n  sender: EthAddressStruct,\n  nonce: EthUint256Struct,\n  initCode: EthBytesStruct,\n  callData: EthBytesStruct,\n  callGasLimit: EthUint256Struct,\n  verificationGasLimit: EthUint256Struct,\n  preVerificationGas: EthUint256Struct,\n  maxFeePerGas: EthUint256Struct,\n  maxPriorityFeePerGas: EthUint256Struct,\n  paymasterAndData: EthBytesStruct,\n  signature: EthBytesStruct,\n});\n\nexport type EthUserOperation = Infer<typeof EthUserOperationStruct>;\n\n/**\n * Struct containing the most basic transaction information required to\n * construct a UserOperation.\n */\nexport const EthBaseTransactionStruct = object({\n  /**\n   * Address of the transaction recipient.\n   */\n  to: EthAddressStruct,\n\n  /**\n   * Amount of wei to transfer to the recipient.\n   */\n  value: EthUint256Struct,\n\n  /**\n   * Data to pass to the recipient.\n   */\n  data: EthBytesStruct,\n});\n\nexport type EthBaseTransaction = Infer<typeof EthBaseTransactionStruct>;\n\nexport const EthBaseUserOperationStruct = object({\n  nonce: EthUint256Struct,\n  initCode: EthBytesStruct,\n  callData: EthBytesStruct,\n  gasLimits: exactOptional(\n    object({\n      callGasLimit: EthUint256Struct,\n      verificationGasLimit: EthUint256Struct,\n      preVerificationGas: EthUint256Struct,\n    }),\n  ),\n  dummyPaymasterAndData: EthBytesStruct,\n  dummySignature: EthBytesStruct,\n  bundlerUrl: UrlStruct,\n});\n\nexport type EthBaseUserOperation = Infer<typeof EthBaseUserOperationStruct>;\n\nexport const EthUserOperationPatchStruct = object({\n  paymasterAndData: EthBytesStruct,\n  callGasLimit: exactOptional(EthUint256Struct),\n  verificationGasLimit: exactOptional(EthUint256Struct),\n  preVerificationGas: exactOptional(EthUint256Struct),\n});\n\nexport type EthUserOperationPatch = Infer<typeof EthUserOperationPatchStruct>;\n"]}

package/dist/eth/types.d.ts

@@ -17,8 +17,8 @@ export declare enum EthMethod {
     SignUserOperation = "eth_signUserOperation"
 }
 export declare const EthEoaAccountStruct: import("@metamask/superstruct").Struct<{
-    id: string;
     type: "eip155:eoa";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4")[];
@@ -45,10 +45,10 @@ export declare const EthEoaAccountStruct: import("@metamask/superstruct").Struct
     id: import("@metamask/superstruct").Struct<string, null>;
     options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
 }>;
-export declare type EthEoaAccount = Infer<typeof EthEoaAccountStruct>;
+export type EthEoaAccount = Infer<typeof EthEoaAccountStruct>;
 export declare const EthErc4337AccountStruct: import("@metamask/superstruct").Struct<{
-    id: string;
     type: "eip155:erc4337";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: ("personal_sign" | "eth_sign" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
@@ -77,4 +77,4 @@ export declare const EthErc4337AccountStruct: import("@metamask/superstruct").St
     id: import("@metamask/superstruct").Struct<string, null>;
     options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
 }>;
-export declare type EthErc4337Account = Infer<typeof EthErc4337AccountStruct>;
+export type EthErc4337Account = Infer<typeof EthErc4337AccountStruct>;

package/dist/eth/types.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthErc4337AccountStruct = exports.EthEoaAccountStruct = exports.EthMethod = exports.EthUint256Struct = exports.EthAddressStruct = exports.EthBytesStruct = void 0;
 const superstruct_1 = require("@metamask/superstruct");
 const api_1 = require("../api");
-const keyring_utils_1 = require("@metamask/keyring-utils");
-exports.EthBytesStruct = (0, keyring_utils_1.definePattern)('EthBytes', /^0x[0-9a-f]*$/iu);
-exports.EthAddressStruct = (0, keyring_utils_1.definePattern)('EthAddress', /^0x[0-9a-f]{40}$/iu);
-exports.EthUint256Struct = (0, keyring_utils_1.definePattern)('EthUint256', /^0x([1-9a-f][0-9a-f]*|0)$/iu);
+const superstruct_2 = require("../superstruct");
+exports.EthBytesStruct = (0, superstruct_2.definePattern)('EthBytes', /^0x[0-9a-f]*$/iu);
+exports.EthAddressStruct = (0, superstruct_2.definePattern)('EthAddress', /^0x[0-9a-f]{40}$/iu);
+exports.EthUint256Struct = (0, superstruct_2.definePattern)('EthUint256', /^0x([1-9a-f][0-9a-f]*|0)$/iu);
 /**
  * Supported Ethereum methods.
  */
@@ -23,8 +23,8 @@ var EthMethod;
     EthMethod["PrepareUserOperation"] = "eth_prepareUserOperation";
     EthMethod["PatchUserOperation"] = "eth_patchUserOperation";
     EthMethod["SignUserOperation"] = "eth_signUserOperation";
-})(EthMethod = exports.EthMethod || (exports.EthMethod = {}));
-exports.EthEoaAccountStruct = (0, keyring_utils_1.object)({
+})(EthMethod || (exports.EthMethod = EthMethod = {}));
+exports.EthEoaAccountStruct = (0, superstruct_2.object)({
     ...api_1.KeyringAccountStruct.schema,
     /**
      * Account address.
@@ -46,7 +46,7 @@ exports.EthEoaAccountStruct = (0, keyring_utils_1.object)({
         `${EthMethod.SignTypedDataV4}`,
     ])),
 });
-exports.EthErc4337AccountStruct = (0, keyring_utils_1.object)({
+exports.EthErc4337AccountStruct = (0, superstruct_2.object)({
     ...api_1.KeyringAccountStruct.schema,
     /**
      * Account address.

package/dist/eth/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/eth/types.ts"],"names":[],"mappings":";;;AACA,uDAA8D;AAE9D,gCAA8D;AAC9D,2DAAgE;AAEnD,QAAA,cAAc,GAAG,IAAA,6BAAa,EAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAE9D,QAAA,gBAAgB,GAAG,IAAA,6BAAa,EAC3C,YAAY,EACZ,oBAAoB,CACrB,CAAC;AAEW,QAAA,gBAAgB,GAAG,IAAA,6BAAa,EAC3C,YAAY,EACZ,6BAA6B,CAC9B,CAAC;AAEF;;GAEG;AACH,IAAY,SAYX;AAZD,WAAY,SAAS;IACnB,0BAA0B;IAC1B,2CAA8B,CAAA;IAC9B,8BAAiB,CAAA;IACjB,oDAAuC,CAAA;IACvC,qDAAwC,CAAA;IACxC,qDAAwC,CAAA;IACxC,qDAAwC,CAAA;IACxC,mBAAmB;IACnB,8DAAiD,CAAA;IACjD,0DAA6C,CAAA;IAC7C,wDAA2C,CAAA;AAC7C,CAAC,EAZW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAYpB;AAEY,QAAA,mBAAmB,GAAG,IAAA,sBAAM,EAAC;IACxC,GAAG,0BAAoB,CAAC,MAAM;IAE9B;;OAEG;IACH,OAAO,EAAE,wBAAgB;IAEzB;;OAEG;IACH,IAAI,EAAE,IAAA,qBAAO,EAAC,GAAG,oBAAc,CAAC,GAAG,EAAE,CAAC;IAEtC;;OAEG;IACH,OAAO,EAAE,IAAA,mBAAK,EACZ,IAAA,mBAAK,EAAC;QACJ,GAAG,SAAS,CAAC,YAAY,EAAE;QAC3B,GAAG,SAAS,CAAC,IAAI,EAAE;QACnB,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;KAC/B,CAAC,CACH;CACF,CAAC,CAAC;AAIU,QAAA,uBAAuB,GAAG,IAAA,sBAAM,EAAC;IAC5C,GAAG,0BAAoB,CAAC,MAAM;IAE9B;;OAEG;IACH,OAAO,EAAE,wBAAgB;IAEzB;;OAEG;IACH,IAAI,EAAE,IAAA,qBAAO,EAAC,GAAG,oBAAc,CAAC,OAAO,EAAE,CAAC;IAE1C;;OAEG;IACH,OAAO,EAAE,IAAA,mBAAK,EACZ,IAAA,mBAAK,EAAC;QACJ,GAAG,SAAS,CAAC,YAAY,EAAE;QAC3B,GAAG,SAAS,CAAC,IAAI,EAAE;QACnB,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,oBAAoB,EAAE;QACnC,GAAG,SAAS,CAAC,kBAAkB,EAAE;QACjC,GAAG,SAAS,CAAC,iBAAiB,EAAE;KACjC,CAAC,CACH;CACF,CAAC,CAAC","sourcesContent":["import type { Infer } from '@metamask/superstruct';\nimport { array, enums, literal } from '@metamask/superstruct';\n\nimport { EthAccountType, KeyringAccountStruct } from '../api';\nimport { object, definePattern } from '@metamask/keyring-utils';\n\nexport const EthBytesStruct = definePattern('EthBytes', /^0x[0-9a-f]*$/iu);\n\nexport const EthAddressStruct = definePattern(\n  'EthAddress',\n  /^0x[0-9a-f]{40}$/iu,\n);\n\nexport const EthUint256Struct = definePattern(\n  'EthUint256',\n  /^0x([1-9a-f][0-9a-f]*|0)$/iu,\n);\n\n/**\n * Supported Ethereum methods.\n */\nexport enum EthMethod {\n  // General signing methods\n  PersonalSign = 'personal_sign',\n  Sign = 'eth_sign',\n  SignTransaction = 'eth_signTransaction',\n  SignTypedDataV1 = 'eth_signTypedData_v1',\n  SignTypedDataV3 = 'eth_signTypedData_v3',\n  SignTypedDataV4 = 'eth_signTypedData_v4',\n  // ERC-4337 methods\n  PrepareUserOperation = 'eth_prepareUserOperation',\n  PatchUserOperation = 'eth_patchUserOperation',\n  SignUserOperation = 'eth_signUserOperation',\n}\n\nexport const EthEoaAccountStruct = object({\n  ...KeyringAccountStruct.schema,\n\n  /**\n   * Account address.\n   */\n  address: EthAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${EthAccountType.Eoa}`),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(\n    enums([\n      `${EthMethod.PersonalSign}`,\n      `${EthMethod.Sign}`,\n      `${EthMethod.SignTransaction}`,\n      `${EthMethod.SignTypedDataV1}`,\n      `${EthMethod.SignTypedDataV3}`,\n      `${EthMethod.SignTypedDataV4}`,\n    ]),\n  ),\n});\n\nexport type EthEoaAccount = Infer<typeof EthEoaAccountStruct>;\n\nexport const EthErc4337AccountStruct = object({\n  ...KeyringAccountStruct.schema,\n\n  /**\n   * Account address.\n   */\n  address: EthAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${EthAccountType.Erc4337}`),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(\n    enums([\n      `${EthMethod.PersonalSign}`,\n      `${EthMethod.Sign}`,\n      `${EthMethod.SignTypedDataV1}`,\n      `${EthMethod.SignTypedDataV3}`,\n      `${EthMethod.SignTypedDataV4}`,\n      `${EthMethod.PrepareUserOperation}`,\n      `${EthMethod.PatchUserOperation}`,\n      `${EthMethod.SignUserOperation}`,\n    ]),\n  ),\n});\n\nexport type EthErc4337Account = Infer<typeof EthErc4337AccountStruct>;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/eth/types.ts"],"names":[],"mappings":";;;AACA,uDAA8D;AAE9D,gCAA8D;AAC9D,gDAAuD;AAE1C,QAAA,cAAc,GAAG,IAAA,2BAAa,EAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAE9D,QAAA,gBAAgB,GAAG,IAAA,2BAAa,EAC3C,YAAY,EACZ,oBAAoB,CACrB,CAAC;AAEW,QAAA,gBAAgB,GAAG,IAAA,2BAAa,EAC3C,YAAY,EACZ,6BAA6B,CAC9B,CAAC;AAEF;;GAEG;AACH,IAAY,SAYX;AAZD,WAAY,SAAS;IACnB,0BAA0B;IAC1B,2CAA8B,CAAA;IAC9B,8BAAiB,CAAA;IACjB,oDAAuC,CAAA;IACvC,qDAAwC,CAAA;IACxC,qDAAwC,CAAA;IACxC,qDAAwC,CAAA;IACxC,mBAAmB;IACnB,8DAAiD,CAAA;IACjD,0DAA6C,CAAA;IAC7C,wDAA2C,CAAA;AAC7C,CAAC,EAZW,SAAS,yBAAT,SAAS,QAYpB;AAEY,QAAA,mBAAmB,GAAG,IAAA,oBAAM,EAAC;IACxC,GAAG,0BAAoB,CAAC,MAAM;IAE9B;;OAEG;IACH,OAAO,EAAE,wBAAgB;IAEzB;;OAEG;IACH,IAAI,EAAE,IAAA,qBAAO,EAAC,GAAG,oBAAc,CAAC,GAAG,EAAE,CAAC;IAEtC;;OAEG;IACH,OAAO,EAAE,IAAA,mBAAK,EACZ,IAAA,mBAAK,EAAC;QACJ,GAAG,SAAS,CAAC,YAAY,EAAE;QAC3B,GAAG,SAAS,CAAC,IAAI,EAAE;QACnB,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;KAC/B,CAAC,CACH;CACF,CAAC,CAAC;AAIU,QAAA,uBAAuB,GAAG,IAAA,oBAAM,EAAC;IAC5C,GAAG,0BAAoB,CAAC,MAAM;IAE9B;;OAEG;IACH,OAAO,EAAE,wBAAgB;IAEzB;;OAEG;IACH,IAAI,EAAE,IAAA,qBAAO,EAAC,GAAG,oBAAc,CAAC,OAAO,EAAE,CAAC;IAE1C;;OAEG;IACH,OAAO,EAAE,IAAA,mBAAK,EACZ,IAAA,mBAAK,EAAC;QACJ,GAAG,SAAS,CAAC,YAAY,EAAE;QAC3B,GAAG,SAAS,CAAC,IAAI,EAAE;QACnB,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9B,GAAG,SAAS,CAAC,oBAAoB,EAAE;QACnC,GAAG,SAAS,CAAC,kBAAkB,EAAE;QACjC,GAAG,SAAS,CAAC,iBAAiB,EAAE;KACjC,CAAC,CACH;CACF,CAAC,CAAC","sourcesContent":["import type { Infer } from '@metamask/superstruct';\nimport { array, enums, literal } from '@metamask/superstruct';\n\nimport { EthAccountType, KeyringAccountStruct } from '../api';\nimport { object, definePattern } from '../superstruct';\n\nexport const EthBytesStruct = definePattern('EthBytes', /^0x[0-9a-f]*$/iu);\n\nexport const EthAddressStruct = definePattern(\n  'EthAddress',\n  /^0x[0-9a-f]{40}$/iu,\n);\n\nexport const EthUint256Struct = definePattern(\n  'EthUint256',\n  /^0x([1-9a-f][0-9a-f]*|0)$/iu,\n);\n\n/**\n * Supported Ethereum methods.\n */\nexport enum EthMethod {\n  // General signing methods\n  PersonalSign = 'personal_sign',\n  Sign = 'eth_sign',\n  SignTransaction = 'eth_signTransaction',\n  SignTypedDataV1 = 'eth_signTypedData_v1',\n  SignTypedDataV3 = 'eth_signTypedData_v3',\n  SignTypedDataV4 = 'eth_signTypedData_v4',\n  // ERC-4337 methods\n  PrepareUserOperation = 'eth_prepareUserOperation',\n  PatchUserOperation = 'eth_patchUserOperation',\n  SignUserOperation = 'eth_signUserOperation',\n}\n\nexport const EthEoaAccountStruct = object({\n  ...KeyringAccountStruct.schema,\n\n  /**\n   * Account address.\n   */\n  address: EthAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${EthAccountType.Eoa}`),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(\n    enums([\n      `${EthMethod.PersonalSign}`,\n      `${EthMethod.Sign}`,\n      `${EthMethod.SignTransaction}`,\n      `${EthMethod.SignTypedDataV1}`,\n      `${EthMethod.SignTypedDataV3}`,\n      `${EthMethod.SignTypedDataV4}`,\n    ]),\n  ),\n});\n\nexport type EthEoaAccount = Infer<typeof EthEoaAccountStruct>;\n\nexport const EthErc4337AccountStruct = object({\n  ...KeyringAccountStruct.schema,\n\n  /**\n   * Account address.\n   */\n  address: EthAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${EthAccountType.Erc4337}`),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(\n    enums([\n      `${EthMethod.PersonalSign}`,\n      `${EthMethod.Sign}`,\n      `${EthMethod.SignTypedDataV1}`,\n      `${EthMethod.SignTypedDataV3}`,\n      `${EthMethod.SignTypedDataV4}`,\n      `${EthMethod.PrepareUserOperation}`,\n      `${EthMethod.PatchUserOperation}`,\n      `${EthMethod.SignUserOperation}`,\n    ]),\n  ),\n});\n\nexport type EthErc4337Account = Infer<typeof EthErc4337AccountStruct>;\n"]}

package/dist/events.js

@@ -13,5 +13,5 @@ var KeyringEvent;
     // Request events
     KeyringEvent["RequestApproved"] = "notify:requestApproved";
     KeyringEvent["RequestRejected"] = "notify:requestRejected";
-})(KeyringEvent = exports.KeyringEvent || (exports.KeyringEvent = {}));
+})(KeyringEvent || (exports.KeyringEvent = KeyringEvent = {}));
 //# sourceMappingURL=events.js.map

package/dist/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAY,YASX;AATD,WAAY,YAAY;IACtB,iBAAiB;IACjB,wDAAwC,CAAA;IACxC,wDAAwC,CAAA;IACxC,wDAAwC,CAAA;IAExC,iBAAiB;IACjB,0DAA0C,CAAA;IAC1C,0DAA0C,CAAA;AAC5C,CAAC,EATW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QASvB","sourcesContent":["/**\n * Supported keyring events.\n */\nexport enum KeyringEvent {\n  // Account events\n  AccountCreated = 'notify:accountCreated',\n  AccountUpdated = 'notify:accountUpdated',\n  AccountDeleted = 'notify:accountDeleted',\n\n  // Request events\n  RequestApproved = 'notify:requestApproved',\n  RequestRejected = 'notify:requestRejected',\n}\n"]}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAY,YASX;AATD,WAAY,YAAY;IACtB,iBAAiB;IACjB,wDAAwC,CAAA;IACxC,wDAAwC,CAAA;IACxC,wDAAwC,CAAA;IAExC,iBAAiB;IACjB,0DAA0C,CAAA;IAC1C,0DAA0C,CAAA;AAC5C,CAAC,EATW,YAAY,4BAAZ,YAAY,QASvB","sourcesContent":["/**\n * Supported keyring events.\n */\nexport enum KeyringEvent {\n  // Account events\n  AccountCreated = 'notify:accountCreated',\n  AccountUpdated = 'notify:accountUpdated',\n  AccountDeleted = 'notify:accountDeleted',\n\n  // Request events\n  RequestApproved = 'notify:requestApproved',\n  RequestRejected = 'notify:requestRejected',\n}\n"]}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export * from './api';
 export * from './btc';
-export * from './contexts';
+export type * from './contexts';
 export * from './eth';
 export * from './events';
 export * from './internal';
@@ -8,3 +8,4 @@ export * from './KeyringClient';
 export * from './KeyringSnapRpcClient';
 export * from './rpc-handler';
 export * from './snap-utils';
+export * from './superstruct';

package/dist/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
 __exportStar(require("./btc"), exports);
-__exportStar(require("./contexts"), exports);
 __exportStar(require("./eth"), exports);
 __exportStar(require("./events"), exports);
 __exportStar(require("./internal"), exports);
@@ -24,4 +23,5 @@ __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","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"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,wCAAsB;AAEtB,wCAAsB;AACtB,2CAAyB;AACzB,6CAA2B;AAC3B,kDAAgC;AAChC,yDAAuC;AACvC,gDAA8B;AAC9B,+CAA6B;AAC7B,gDAA8B","sourcesContent":["export * from './api';\nexport * from './btc';\nexport type * 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"]}

package/dist/internal/api.d.ts

@@ -8,16 +8,16 @@ export declare const ListAccountsRequestStruct: import("@metamask/superstruct").
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type ListAccountsRequest = Infer<typeof ListAccountsRequestStruct>;
+export type ListAccountsRequest = Infer<typeof ListAccountsRequestStruct>;
 export declare const ListAccountsResponseStruct: import("@metamask/superstruct").Struct<{
-    id: string;
     type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
 }[], import("@metamask/superstruct").Struct<{
-    id: string;
     type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
@@ -32,7 +32,7 @@ export declare const ListAccountsResponseStruct: import("@metamask/superstruct")
     options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
     methods: import("@metamask/superstruct").Struct<string[], import("@metamask/superstruct").Struct<string, null>>;
 }>>;
-export declare type ListAccountsResponse = Infer<typeof ListAccountsResponseStruct>;
+export type ListAccountsResponse = Infer<typeof ListAccountsResponseStruct>;
 export declare const GetAccountRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -50,10 +50,10 @@ export declare const GetAccountRequestStruct: import("@metamask/superstruct").St
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type GetAccountRequest = Infer<typeof GetAccountRequestStruct>;
+export type GetAccountRequest = Infer<typeof GetAccountRequestStruct>;
 export declare const GetAccountResponseStruct: import("@metamask/superstruct").Struct<{
-    id: string;
     type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
@@ -68,7 +68,7 @@ export declare const GetAccountResponseStruct: import("@metamask/superstruct").S
     options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
     methods: import("@metamask/superstruct").Struct<string[], import("@metamask/superstruct").Struct<string, null>>;
 }>;
-export declare type GetAccountResponse = Infer<typeof GetAccountResponseStruct>;
+export type GetAccountResponse = Infer<typeof GetAccountResponseStruct>;
 export declare const CreateAccountRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -86,10 +86,10 @@ export declare const CreateAccountRequestStruct: import("@metamask/superstruct")
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type CreateAccountRequest = Infer<typeof CreateAccountRequestStruct>;
+export type CreateAccountRequest = Infer<typeof CreateAccountRequestStruct>;
 export declare const CreateAccountResponseStruct: import("@metamask/superstruct").Struct<{
-    id: string;
     type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
@@ -104,7 +104,7 @@ export declare const CreateAccountResponseStruct: import("@metamask/superstruct"
     options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
     methods: import("@metamask/superstruct").Struct<string[], import("@metamask/superstruct").Struct<string, null>>;
 }>;
-export declare type CreateAccountResponse = Infer<typeof CreateAccountResponseStruct>;
+export type CreateAccountResponse = Infer<typeof CreateAccountResponseStruct>;
 export declare const GetAccountBalancesRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -125,12 +125,12 @@ export declare const GetAccountBalancesRequestStruct: import("@metamask/superstr
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type GetAccountBalancesRequest = Infer<typeof GetAccountBalancesRequestStruct>;
+export type GetAccountBalancesRequest = Infer<typeof GetAccountBalancesRequestStruct>;
 export declare const GetAccountBalancesResponseStruct: import("@metamask/superstruct").Struct<Record<string, {
     amount: string;
     unit: string;
 }>, null>;
-export declare type GetAccountBalancesResponse = Infer<typeof GetAccountBalancesResponseStruct>;
+export type GetAccountBalancesResponse = Infer<typeof GetAccountBalancesResponseStruct>;
 export declare const FilterAccountChainsStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -151,17 +151,17 @@ export declare const FilterAccountChainsStruct: import("@metamask/superstruct").
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type FilterAccountChainsRequest = Infer<typeof FilterAccountChainsStruct>;
+export type FilterAccountChainsRequest = Infer<typeof FilterAccountChainsStruct>;
 export declare const FilterAccountChainsResponseStruct: import("@metamask/superstruct").Struct<string[], import("@metamask/superstruct").Struct<string, null>>;
-export declare type FilterAccountChainsResponse = Infer<typeof FilterAccountChainsResponseStruct>;
+export type FilterAccountChainsResponse = Infer<typeof FilterAccountChainsResponseStruct>;
 export declare const UpdateAccountRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
     method: "keyring_updateAccount";
     params: {
         account: {
-            id: string;
             type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
+            id: string;
             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: {
-            id: string;
             type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
+            id: string;
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
         };
     }, {
         account: import("@metamask/superstruct").Struct<{
-            id: string;
             type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
+            id: string;
             address: string;
             options: Record<string, import("@metamask/utils").Json>;
             methods: string[];
@@ -199,9 +199,9 @@ export declare const UpdateAccountRequestStruct: import("@metamask/superstruct")
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type UpdateAccountRequest = Infer<typeof UpdateAccountRequestStruct>;
+export type UpdateAccountRequest = Infer<typeof UpdateAccountRequestStruct>;
 export declare const UpdateAccountResponseStruct: import("@metamask/superstruct").Struct<null, null>;
-export declare type UpdateAccountResponse = Infer<typeof UpdateAccountResponseStruct>;
+export type UpdateAccountResponse = Infer<typeof UpdateAccountResponseStruct>;
 export declare const DeleteAccountRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -219,9 +219,9 @@ export declare const DeleteAccountRequestStruct: import("@metamask/superstruct")
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type DeleteAccountRequest = Infer<typeof DeleteAccountRequestStruct>;
+export type DeleteAccountRequest = Infer<typeof DeleteAccountRequestStruct>;
 export declare const DeleteAccountResponseStruct: import("@metamask/superstruct").Struct<null, null>;
-export declare type DeleteAccountResponse = Infer<typeof DeleteAccountResponseStruct>;
+export type DeleteAccountResponse = Infer<typeof DeleteAccountResponseStruct>;
 export declare const ExportAccountRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -239,9 +239,9 @@ export declare const ExportAccountRequestStruct: import("@metamask/superstruct")
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type ExportAccountRequest = Infer<typeof ExportAccountRequestStruct>;
+export type ExportAccountRequest = Infer<typeof ExportAccountRequestStruct>;
 export declare const ExportAccountResponseStruct: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
-export declare type ExportAccountResponse = Infer<typeof ExportAccountResponseStruct>;
+export type ExportAccountResponse = Infer<typeof ExportAccountResponseStruct>;
 export declare const ListRequestsRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -251,7 +251,7 @@ export declare const ListRequestsRequestStruct: import("@metamask/superstruct").
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type ListRequestsRequest = Infer<typeof ListRequestsRequestStruct>;
+export type ListRequestsRequest = Infer<typeof ListRequestsRequestStruct>;
 export declare const ListRequestsResponseStruct: import("@metamask/superstruct").Struct<{
     id: string;
     scope: string;
@@ -277,10 +277,10 @@ 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("@metamask/keyring-utils").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
+        params: import("@metamask/superstruct").Struct<import("../superstruct").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
     }>;
 }>>;
-export declare type ListRequestsResponse = Infer<typeof ListRequestsResponseStruct>;
+export type ListRequestsResponse = Infer<typeof ListRequestsResponseStruct>;
 export declare const GetRequestRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -298,7 +298,7 @@ export declare const GetRequestRequestStruct: import("@metamask/superstruct").St
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type GetRequestRequest = Infer<typeof GetRequestRequestStruct>;
+export type GetRequestRequest = Infer<typeof GetRequestRequestStruct>;
 export declare const GetRequestResponseStruct: import("@metamask/superstruct").Struct<{
     id: string;
     scope: string;
@@ -316,10 +316,10 @@ 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("@metamask/keyring-utils").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
+        params: import("@metamask/superstruct").Struct<import("../superstruct").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
     }>;
 }>;
-export declare type GetRequestResponse = Infer<typeof GetRequestResponseStruct>;
+export type GetRequestResponse = Infer<typeof GetRequestResponseStruct>;
 export declare const SubmitRequestRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -352,13 +352,13 @@ 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("@metamask/keyring-utils").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
+            params: import("@metamask/superstruct").Struct<import("../superstruct").ExactOptionalTag | import("@metamask/utils").Json[] | Record<string, import("@metamask/utils").Json>, null>;
         }>;
     }>;
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type SubmitRequestRequest = Infer<typeof SubmitRequestRequestStruct>;
+export type SubmitRequestRequest = Infer<typeof SubmitRequestRequestStruct>;
 export declare const SubmitRequestResponseStruct: import("@metamask/superstruct").Struct<{
     pending: true;
     redirect?: {
@@ -369,7 +369,7 @@ export declare const SubmitRequestResponseStruct: import("@metamask/superstruct"
     pending: false;
     result: import("@metamask/utils").Json;
 }, null>;
-export declare type SubmitRequestResponse = Infer<typeof SubmitRequestResponseStruct>;
+export type SubmitRequestResponse = Infer<typeof SubmitRequestResponseStruct>;
 export declare const ApproveRequestRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -390,9 +390,9 @@ export declare const ApproveRequestRequestStruct: import("@metamask/superstruct"
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type ApproveRequestRequest = Infer<typeof ApproveRequestRequestStruct>;
+export type ApproveRequestRequest = Infer<typeof ApproveRequestRequestStruct>;
 export declare const ApproveRequestResponseStruct: import("@metamask/superstruct").Struct<null, null>;
-export declare type ApproveRequestResponse = Infer<typeof ApproveRequestResponseStruct>;
+export type ApproveRequestResponse = Infer<typeof ApproveRequestResponseStruct>;
 export declare const RejectRequestRequestStruct: import("@metamask/superstruct").Struct<{
     jsonrpc: "2.0";
     id: string | number | null;
@@ -410,6 +410,6 @@ export declare const RejectRequestRequestStruct: import("@metamask/superstruct")
     jsonrpc: import("@metamask/superstruct").Struct<"2.0", "2.0">;
     id: import("@metamask/superstruct").Struct<string | number | null, null>;
 }>;
-export declare type RejectRequestRequest = Infer<typeof RejectRequestRequestStruct>;
+export type RejectRequestRequest = Infer<typeof RejectRequestRequestStruct>;
 export declare const RejectRequestResponseStruct: import("@metamask/superstruct").Struct<null, null>;
-export declare type RejectRequestResponse = Infer<typeof RejectRequestResponseStruct>;
+export type RejectRequestResponse = Infer<typeof RejectRequestResponseStruct>;