@metamask/keyring-api 1.0.0 → 2.0.0

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

@@ -0,0 +1,90 @@
+import { type Infer } from 'superstruct';
+/**
+ * Struct of a UserOperation as defined by ERC-4337.
+ * @see https://eips.ethereum.org/EIPS/eip-4337#definitions
+ */
+export declare const EthUserOperationStruct: import("superstruct").Struct<{
+    sender: string;
+    nonce: string;
+    initCode: string;
+    callData: string;
+    callGasLimit: string;
+    verificationGasLimit: string;
+    preVerificationGas: string;
+    maxFeePerGas: string;
+    maxPriorityFeePerGas: string;
+    paymasterAndData: string;
+    signature: string;
+}, {
+    sender: import("superstruct").Struct<string, null>;
+    nonce: import("superstruct").Struct<string, null>;
+    initCode: import("superstruct").Struct<string, null>;
+    callData: import("superstruct").Struct<string, null>;
+    callGasLimit: import("superstruct").Struct<string, null>;
+    verificationGasLimit: import("superstruct").Struct<string, null>;
+    preVerificationGas: import("superstruct").Struct<string, null>;
+    maxFeePerGas: import("superstruct").Struct<string, null>;
+    maxPriorityFeePerGas: import("superstruct").Struct<string, null>;
+    paymasterAndData: import("superstruct").Struct<string, null>;
+    signature: import("superstruct").Struct<string, null>;
+}>;
+export declare type EthUserOperation = Infer<typeof EthUserOperationStruct>;
+/**
+ * Struct containing the most basic transaction information required to
+ * construct a UserOperation.
+ */
+export declare const EthBaseTransactionStruct: import("superstruct").Struct<{
+    value: string;
+    data: string;
+    to: string;
+}, {
+    /**
+     * Address of the transaction recipient.
+     */
+    to: import("superstruct").Struct<string, null>;
+    /**
+     * Amount of wei to transfer to the recipient.
+     */
+    value: import("superstruct").Struct<string, null>;
+    /**
+     * Data to pass to the recipient.
+     */
+    data: import("superstruct").Struct<string, null>;
+}>;
+export declare type EthBaseTransaction = Infer<typeof EthBaseTransactionStruct>;
+export declare const EthBaseUserOperationStruct: import("superstruct").Struct<{
+    nonce: string;
+    initCode: string;
+    callData: string;
+    dummyPaymasterAndData: string;
+    dummySignature: string;
+    bundlerUrl: string;
+    gasLimits?: {
+        callGasLimit: string;
+        verificationGasLimit: string;
+        preVerificationGas: string;
+    };
+}, {
+    nonce: import("superstruct").Struct<string, null>;
+    initCode: import("superstruct").Struct<string, null>;
+    callData: import("superstruct").Struct<string, null>;
+    gasLimits: import("superstruct").Struct<import("../../superstruct").ExactOptionalTag | {
+        callGasLimit: string;
+        verificationGasLimit: string;
+        preVerificationGas: string;
+    }, {
+        callGasLimit: import("superstruct").Struct<string, null>;
+        verificationGasLimit: import("superstruct").Struct<string, null>;
+        preVerificationGas: import("superstruct").Struct<string, null>;
+    }>;
+    dummyPaymasterAndData: import("superstruct").Struct<string, null>;
+    dummySignature: import("superstruct").Struct<string, null>;
+    bundlerUrl: import("superstruct").Struct<string, null>;
+}>;
+export declare type EthBaseUserOperation = Infer<typeof EthBaseUserOperationStruct>;
+export declare const EthUserOperationPatchStruct: import("superstruct").Struct<{
+    paymasterAndData: string;
+}, {
+    paymasterAndData: import("superstruct").Struct<string, null>;
+}>;
+export declare type EthUserOperationPatch = Infer<typeof EthUserOperationPatchStruct>;

package/dist/eth/erc4337/types.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthUserOperationPatchStruct = exports.EthBaseUserOperationStruct = exports.EthBaseTransactionStruct = exports.EthUserOperationStruct = void 0;
+const superstruct_1 = require("superstruct");
+const superstruct_2 = require("../../superstruct");
+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, superstruct_2.object)({
+    sender: types_1.EthAddressStruct,
+    nonce: types_1.EthUint256Struct,
+    initCode: types_1.EthBytesStruct,
+    callData: types_1.EthBytesStruct,
+    callGasLimit: types_1.EthUint256Struct,
+    verificationGasLimit: types_1.EthUint256Struct,
+    preVerificationGas: types_1.EthUint256Struct,
+    maxFeePerGas: types_1.EthUint256Struct,
+    maxPriorityFeePerGas: types_1.EthUint256Struct,
+    paymasterAndData: types_1.EthBytesStruct,
+    signature: types_1.EthBytesStruct,
+});
+/**
+ * Struct containing the most basic transaction information required to
+ * construct a UserOperation.
+ */
+exports.EthBaseTransactionStruct = (0, superstruct_2.object)({
+    /**
+     * Address of the transaction recipient.
+     */
+    to: types_1.EthAddressStruct,
+    /**
+     * Amount of wei to transfer to the recipient.
+     */
+    value: types_1.EthUint256Struct,
+    /**
+     * Data to pass to the recipient.
+     */
+    data: types_1.EthBytesStruct,
+});
+exports.EthBaseUserOperationStruct = (0, superstruct_2.object)({
+    nonce: types_1.EthUint256Struct,
+    initCode: types_1.EthBytesStruct,
+    callData: types_1.EthBytesStruct,
+    gasLimits: (0, superstruct_2.exactOptional)((0, superstruct_2.object)({
+        callGasLimit: types_1.EthUint256Struct,
+        verificationGasLimit: types_1.EthUint256Struct,
+        preVerificationGas: types_1.EthUint256Struct,
+    })),
+    dummyPaymasterAndData: types_1.EthBytesStruct,
+    dummySignature: types_1.EthBytesStruct,
+    bundlerUrl: (0, superstruct_1.string)(),
+});
+exports.EthUserOperationPatchStruct = (0, superstruct_2.object)({
+    paymasterAndData: types_1.EthBytesStruct,
+});
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/eth/erc4337/types.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AAEjD,mDAA0D;AAC1D,oCAA8E;AAE9E;;;GAGG;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,IAAA,oBAAM,GAAE;CACrB,CAAC,CAAC;AAIU,QAAA,2BAA2B,GAAG,IAAA,oBAAM,EAAC;IAChD,gBAAgB,EAAE,sBAAc;CACjC,CAAC,CAAC","sourcesContent":["import { string, type Infer } from 'superstruct';\n\nimport { exactOptional, object } from '../../superstruct';\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: string(),\n});\n\nexport type EthBaseUserOperation = Infer<typeof EthBaseUserOperationStruct>;\n\nexport const EthUserOperationPatchStruct = object({\n  paymasterAndData: EthBytesStruct,\n});\n\nexport type EthUserOperationPatch = Infer<typeof EthUserOperationPatchStruct>;\n"]}

package/dist/eth/index.d.ts

@@ -0,0 +1,2 @@
+export * from './erc4337';
+export * from './types';

package/dist/eth/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./erc4337"), exports);
+__exportStar(require("./types"), exports);
+//# sourceMappingURL=index.js.map

package/dist/eth/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,0CAAwB","sourcesContent":["export * from './erc4337';\nexport * from './types';\n"]}

package/dist/eth/types.d.ts

@@ -0,0 +1,3 @@
+export declare const EthBytesStruct: import("superstruct").Struct<string, null>;
+export declare const EthAddressStruct: import("superstruct").Struct<string, null>;
+export declare const EthUint256Struct: import("superstruct").Struct<string, null>;

package/dist/eth/types.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthUint256Struct = exports.EthAddressStruct = exports.EthBytesStruct = void 0;
+const superstruct_1 = require("../superstruct");
+exports.EthBytesStruct = (0, superstruct_1.definePattern)('EthBytes', /^0x[0-9a-f]*$/iu);
+exports.EthAddressStruct = (0, superstruct_1.definePattern)('EthAddress', /^0x[0-9a-f]{40}$/iu);
+exports.EthUint256Struct = (0, superstruct_1.definePattern)('EthUint256', /^0x([1-9a-f][0-9a-f]*|0)$/iu);
+//# sourceMappingURL=types.js.map

package/dist/eth/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/eth/types.ts"],"names":[],"mappings":";;;AAAA,gDAA+C;AAElC,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","sourcesContent":["import { 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"]}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './api';
+export * from './eth';
 export * from './events';
 export * from './internal';
 export * from './KeyringClient';

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
+__exportStar(require("./eth"), exports);
 __exportStar(require("./events"), exports);
 __exportStar(require("./internal"), exports);
 __exportStar(require("./KeyringClient"), exports);

package/dist/index.js.map

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

package/dist/internal/api.d.ts

@@ -1,47 +1,50 @@
 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<{
-    type: "eip155:eoa" | "eip155:eip4337";
+    type: "eip155:eoa" | "eip155:erc4337";
     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")[];
+    methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
 }[], import("superstruct").Struct<{
-    type: "eip155:eoa" | "eip155:eip4337";
+    type: "eip155:eoa" | "eip155:erc4337";
     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")[];
+    methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
 }, {
     id: import("superstruct").Struct<string, null>;
     address: import("superstruct").Struct<string, null>;
     options: import("superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
-    methods: import("superstruct").Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4")[], import("superstruct").Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4", {
+    methods: import("superstruct").Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[], import("superstruct").Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation", {
         personal_sign: "personal_sign";
         eth_sign: "eth_sign";
         eth_signTransaction: "eth_signTransaction";
         eth_signTypedData_v1: "eth_signTypedData_v1";
         eth_signTypedData_v3: "eth_signTypedData_v3";
         eth_signTypedData_v4: "eth_signTypedData_v4";
+        eth_prepareUserOperation: "eth_prepareUserOperation";
+        eth_patchUserOperation: "eth_patchUserOperation";
+        eth_signUserOperation: "eth_signUserOperation";
     }>>;
-    type: import("superstruct").Struct<"eip155:eoa" | "eip155:eip4337", {
+    type: import("superstruct").Struct<"eip155:eoa" | "eip155:erc4337", {
         "eip155:eoa": "eip155:eoa";
-        "eip155:eip4337": "eip155:eip4337";
+        "eip155:erc4337": "eip155:erc4337";
     }>;
 }>>;
 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,36 +57,39 @@ 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<{
-    type: "eip155:eoa" | "eip155:eip4337";
+    type: "eip155:eoa" | "eip155:erc4337";
     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")[];
+    methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
 }, {
     id: import("superstruct").Struct<string, null>;
     address: import("superstruct").Struct<string, null>;
     options: import("superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
-    methods: import("superstruct").Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4")[], import("superstruct").Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4", {
+    methods: import("superstruct").Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[], import("superstruct").Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation", {
         personal_sign: "personal_sign";
         eth_sign: "eth_sign";
         eth_signTransaction: "eth_signTransaction";
         eth_signTypedData_v1: "eth_signTypedData_v1";
         eth_signTypedData_v3: "eth_signTypedData_v3";
         eth_signTypedData_v4: "eth_signTypedData_v4";
+        eth_prepareUserOperation: "eth_prepareUserOperation";
+        eth_patchUserOperation: "eth_patchUserOperation";
+        eth_signUserOperation: "eth_signUserOperation";
     }>>;
-    type: import("superstruct").Struct<"eip155:eoa" | "eip155:eip4337", {
+    type: import("superstruct").Struct<"eip155:eoa" | "eip155:erc4337", {
         "eip155:eoa": "eip155:eoa";
-        "eip155:eip4337": "eip155:eip4337";
+        "eip155:erc4337": "eip155:erc4337";
     }>;
 }>;
 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,36 +102,39 @@ 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<{
-    type: "eip155:eoa" | "eip155:eip4337";
+    type: "eip155:eoa" | "eip155:erc4337";
     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")[];
+    methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
 }, {
     id: import("superstruct").Struct<string, null>;
     address: import("superstruct").Struct<string, null>;
     options: import("superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
-    methods: import("superstruct").Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4")[], import("superstruct").Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4", {
+    methods: import("superstruct").Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[], import("superstruct").Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation", {
         personal_sign: "personal_sign";
         eth_sign: "eth_sign";
         eth_signTransaction: "eth_signTransaction";
         eth_signTypedData_v1: "eth_signTypedData_v1";
         eth_signTypedData_v3: "eth_signTypedData_v3";
         eth_signTypedData_v4: "eth_signTypedData_v4";
+        eth_prepareUserOperation: "eth_prepareUserOperation";
+        eth_patchUserOperation: "eth_patchUserOperation";
+        eth_signUserOperation: "eth_signUserOperation";
     }>>;
-    type: import("superstruct").Struct<"eip155:eoa" | "eip155:eip4337", {
+    type: import("superstruct").Struct<"eip155:eoa" | "eip155:erc4337", {
         "eip155:eoa": "eip155:eoa";
-        "eip155:eip4337": "eip155:eip4337";
+        "eip155:erc4337": "eip155:erc4337";
     }>;
 }>;
 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,68 +150,71 @@ 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: {
-            type: "eip155:eoa" | "eip155:eip4337";
+            type: "eip155:eoa" | "eip155:erc4337";
             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")[];
+            methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
         };
     };
 }, {
     method: import("superstruct").Struct<"keyring_updateAccount", "keyring_updateAccount">;
     params: import("superstruct").Struct<{
         account: {
-            type: "eip155:eoa" | "eip155:eip4337";
+            type: "eip155:eoa" | "eip155:erc4337";
             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")[];
+            methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
         };
     }, {
         account: import("superstruct").Struct<{
-            type: "eip155:eoa" | "eip155:eip4337";
+            type: "eip155:eoa" | "eip155:erc4337";
             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")[];
+            methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
         }, {
             id: import("superstruct").Struct<string, null>;
             address: import("superstruct").Struct<string, null>;
             options: import("superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
-            methods: import("superstruct").Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4")[], import("superstruct").Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4", {
+            methods: import("superstruct").Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[], import("superstruct").Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation", {
                 personal_sign: "personal_sign";
                 eth_sign: "eth_sign";
                 eth_signTransaction: "eth_signTransaction";
                 eth_signTypedData_v1: "eth_signTypedData_v1";
                 eth_signTypedData_v3: "eth_signTypedData_v3";
                 eth_signTypedData_v4: "eth_signTypedData_v4";
+                eth_prepareUserOperation: "eth_prepareUserOperation";
+                eth_patchUserOperation: "eth_patchUserOperation";
+                eth_signUserOperation: "eth_signUserOperation";
             }>>;
-            type: import("superstruct").Struct<"eip155:eoa" | "eip155:eip4337", {
+            type: import("superstruct").Struct<"eip155:eoa" | "eip155:erc4337", {
                 "eip155:eoa": "eip155:eoa";
-                "eip155:eip4337": "eip155:eip4337";
+                "eip155:erc4337": "eip155:erc4337";
             }>;
         }>;
     }>;
     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 +227,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 +247,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 +293,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 +306,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 +332,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 +366,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 +382,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 +398,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 +418,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>;