@metamask/eip-5792-middleware 1.0.0 → 1.2.0

package/dist/types.d.cts

@@ -2,8 +2,90 @@ import type { AccountsControllerGetSelectedAccountAction, AccountsControllerGetS
 import type { Messenger } from "@metamask/base-controller";
 import type { NetworkControllerGetNetworkClientByIdAction, NetworkControllerGetStateAction } from "@metamask/network-controller";
 import type { PreferencesControllerGetStateAction } from "@metamask/preferences-controller";
+import type { Infer } from "@metamask/superstruct";
 import type { TransactionControllerGetStateAction } from "@metamask/transaction-controller";
+import type { Hex, Json, JsonRpcRequest } from "@metamask/utils";
 type Actions = AccountsControllerGetStateAction | AccountsControllerGetSelectedAccountAction | NetworkControllerGetNetworkClientByIdAction | TransactionControllerGetStateAction | PreferencesControllerGetStateAction | NetworkControllerGetStateAction;
 export type EIP5792Messenger = Messenger<Actions, never>;
+export type GetCallsStatusParams = Infer<typeof GetCallsStatusStruct>;
+export type GetCallsStatusResult = {
+    version: string;
+    id: Hex;
+    chainId: Hex;
+    status: number;
+    atomic: boolean;
+    receipts?: {
+        logs: {
+            address: Hex;
+            data: Hex;
+            topics: Hex[];
+        }[];
+        status: '0x0' | '0x1';
+        blockHash: Hex;
+        blockNumber: Hex;
+        gasUsed: Hex;
+        transactionHash: Hex;
+    }[];
+    capabilities?: Record<string, Json>;
+};
+export type GetCallsStatusHook = (id: GetCallsStatusParams[0], req: JsonRpcRequest) => Promise<GetCallsStatusResult>;
+export type GetCapabilitiesParams = Infer<typeof GetCapabilitiesStruct>;
+export type GetCapabilitiesResult = Record<Hex, Record<string, Json>>;
+export type GetCapabilitiesHook = (address: GetCapabilitiesParams[0], chainIds: GetCapabilitiesParams[1], req: JsonRpcRequest) => Promise<GetCapabilitiesResult>;
+export type SendCallsParams = Infer<typeof SendCallsStruct>;
+export type SendCallsPayload = SendCallsParams[0];
+export type SendCallsRequiredAssetsParam = Infer<typeof RequiredAssetStruct>;
+export type SendCallsResult = {
+    id: Hex;
+    capabilities?: Record<string, Json>;
+};
+export type ProcessSendCallsHook = (sendCalls: SendCallsPayload, req: JsonRpcRequest) => Promise<SendCallsResult>;
+export declare const GetCallsStatusStruct: import("@metamask/superstruct").Struct<[`0x${string}`], null>;
+export declare const GetCapabilitiesStruct: import("@metamask/superstruct").Struct<[`0x${string}`, `0x${string}`[] | undefined], null>;
+declare const RequiredAssetStruct: import("@metamask/superstruct").Struct<{
+    address: `0x${string}`;
+    standard: string;
+    amount: `0x${string}`;
+}, {
+    address: import("@metamask/superstruct").Struct<`0x${string}`, null>;
+    amount: import("@metamask/superstruct").Struct<`0x${string}`, null>;
+    standard: import("@metamask/superstruct").Struct<string, null>;
+}>;
+export declare const CapabilitiesStruct: import("@metamask/superstruct").Struct<Record<string, {
+    optional?: boolean | undefined;
+    requiredAssets?: {
+        address: `0x${string}`;
+        standard: string;
+        amount: `0x${string}`;
+    }[] | undefined;
+}>, null>;
+export declare const SendCallsStruct: import("@metamask/superstruct").Struct<[{
+    version: string;
+    chainId: `0x${string}`;
+    atomicRequired: boolean;
+    calls: {
+        data?: `0x${string}` | undefined;
+        value?: `0x${string}` | undefined;
+        to?: `0x${string}` | undefined;
+        capabilities?: Record<string, {
+            optional?: boolean | undefined;
+            requiredAssets?: {
+                address: `0x${string}`;
+                standard: string;
+                amount: `0x${string}`;
+            }[] | undefined;
+        }> | undefined;
+    }[];
+    id?: `0x${string}` | undefined;
+    from?: `0x${string}` | undefined;
+    capabilities?: Record<string, {
+        optional?: boolean | undefined;
+        requiredAssets?: {
+            address: `0x${string}`;
+            standard: string;
+            amount: `0x${string}`;
+        }[] | undefined;
+    }> | undefined;
+}], null>;
 export {};
 //# sourceMappingURL=types.d.cts.map

package/dist/types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,0CAA0C,EAC1C,gCAAgC,EACjC,sCAAsC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,kCAAkC;AAC3D,OAAO,KAAK,EACV,2CAA2C,EAC3C,+BAA+B,EAChC,qCAAqC;AACtC,OAAO,KAAK,EAAE,mCAAmC,EAAE,yCAAyC;AAC5F,OAAO,KAAK,EAAE,mCAAmC,EAAE,yCAAyC;AAE5F,KAAK,OAAO,GACR,gCAAgC,GAChC,0CAA0C,GAC1C,2CAA2C,GAC3C,mCAAmC,GACnC,mCAAmC,GACnC,+BAA+B,CAAC;AAEpC,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC"}
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.d.mts

@@ -2,8 +2,90 @@ import type { AccountsControllerGetSelectedAccountAction, AccountsControllerGetS
 import type { Messenger } from "@metamask/base-controller";
 import type { NetworkControllerGetNetworkClientByIdAction, NetworkControllerGetStateAction } from "@metamask/network-controller";
 import type { PreferencesControllerGetStateAction } from "@metamask/preferences-controller";
+import type { Infer } from "@metamask/superstruct";
 import type { TransactionControllerGetStateAction } from "@metamask/transaction-controller";
+import type { Hex, Json, JsonRpcRequest } from "@metamask/utils";
 type Actions = AccountsControllerGetStateAction | AccountsControllerGetSelectedAccountAction | NetworkControllerGetNetworkClientByIdAction | TransactionControllerGetStateAction | PreferencesControllerGetStateAction | NetworkControllerGetStateAction;
 export type EIP5792Messenger = Messenger<Actions, never>;
+export type GetCallsStatusParams = Infer<typeof GetCallsStatusStruct>;
+export type GetCallsStatusResult = {
+    version: string;
+    id: Hex;
+    chainId: Hex;
+    status: number;
+    atomic: boolean;
+    receipts?: {
+        logs: {
+            address: Hex;
+            data: Hex;
+            topics: Hex[];
+        }[];
+        status: '0x0' | '0x1';
+        blockHash: Hex;
+        blockNumber: Hex;
+        gasUsed: Hex;
+        transactionHash: Hex;
+    }[];
+    capabilities?: Record<string, Json>;
+};
+export type GetCallsStatusHook = (id: GetCallsStatusParams[0], req: JsonRpcRequest) => Promise<GetCallsStatusResult>;
+export type GetCapabilitiesParams = Infer<typeof GetCapabilitiesStruct>;
+export type GetCapabilitiesResult = Record<Hex, Record<string, Json>>;
+export type GetCapabilitiesHook = (address: GetCapabilitiesParams[0], chainIds: GetCapabilitiesParams[1], req: JsonRpcRequest) => Promise<GetCapabilitiesResult>;
+export type SendCallsParams = Infer<typeof SendCallsStruct>;
+export type SendCallsPayload = SendCallsParams[0];
+export type SendCallsRequiredAssetsParam = Infer<typeof RequiredAssetStruct>;
+export type SendCallsResult = {
+    id: Hex;
+    capabilities?: Record<string, Json>;
+};
+export type ProcessSendCallsHook = (sendCalls: SendCallsPayload, req: JsonRpcRequest) => Promise<SendCallsResult>;
+export declare const GetCallsStatusStruct: import("@metamask/superstruct").Struct<[`0x${string}`], null>;
+export declare const GetCapabilitiesStruct: import("@metamask/superstruct").Struct<[`0x${string}`, `0x${string}`[] | undefined], null>;
+declare const RequiredAssetStruct: import("@metamask/superstruct").Struct<{
+    address: `0x${string}`;
+    standard: string;
+    amount: `0x${string}`;
+}, {
+    address: import("@metamask/superstruct").Struct<`0x${string}`, null>;
+    amount: import("@metamask/superstruct").Struct<`0x${string}`, null>;
+    standard: import("@metamask/superstruct").Struct<string, null>;
+}>;
+export declare const CapabilitiesStruct: import("@metamask/superstruct").Struct<Record<string, {
+    optional?: boolean | undefined;
+    requiredAssets?: {
+        address: `0x${string}`;
+        standard: string;
+        amount: `0x${string}`;
+    }[] | undefined;
+}>, null>;
+export declare const SendCallsStruct: import("@metamask/superstruct").Struct<[{
+    version: string;
+    chainId: `0x${string}`;
+    atomicRequired: boolean;
+    calls: {
+        data?: `0x${string}` | undefined;
+        value?: `0x${string}` | undefined;
+        to?: `0x${string}` | undefined;
+        capabilities?: Record<string, {
+            optional?: boolean | undefined;
+            requiredAssets?: {
+                address: `0x${string}`;
+                standard: string;
+                amount: `0x${string}`;
+            }[] | undefined;
+        }> | undefined;
+    }[];
+    id?: `0x${string}` | undefined;
+    from?: `0x${string}` | undefined;
+    capabilities?: Record<string, {
+        optional?: boolean | undefined;
+        requiredAssets?: {
+            address: `0x${string}`;
+            standard: string;
+            amount: `0x${string}`;
+        }[] | undefined;
+    }> | undefined;
+}], null>;
 export {};
 //# sourceMappingURL=types.d.mts.map

package/dist/types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,0CAA0C,EAC1C,gCAAgC,EACjC,sCAAsC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,kCAAkC;AAC3D,OAAO,KAAK,EACV,2CAA2C,EAC3C,+BAA+B,EAChC,qCAAqC;AACtC,OAAO,KAAK,EAAE,mCAAmC,EAAE,yCAAyC;AAC5F,OAAO,KAAK,EAAE,mCAAmC,EAAE,yCAAyC;AAE5F,KAAK,OAAO,GACR,gCAAgC,GAChC,0CAA0C,GAC1C,2CAA2C,GAC3C,mCAAmC,GACnC,mCAAmC,GACnC,+BAA+B,CAAC;AAEpC,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC"}
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,0CAA0C,EAC1C,gCAAgC,EACjC,sCAAsC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,kCAAkC;AAC3D,OAAO,KAAK,EACV,2CAA2C,EAC3C,+BAA+B,EAChC,qCAAqC;AACtC,OAAO,KAAK,EAAE,mCAAmC,EAAE,yCAAyC;AAC5F,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAYnD,OAAO,KAAK,EAAE,mCAAmC,EAAE,yCAAyC;AAC5F,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,wBAAwB;AAGjE,KAAK,OAAO,GACR,gCAAgC,GAChC,0CAA0C,GAC1C,2CAA2C,GAC3C,mCAAmC,GACnC,mCAAmC,GACnC,+BAA+B,CAAC;AAEpC,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAGzD,MAAM,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,GAAG,CAAC;IACR,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE;YACJ,OAAO,EAAE,GAAG,CAAC;YACb,IAAI,EAAE,GAAG,CAAC;YACV,MAAM,EAAE,GAAG,EAAE,CAAC;SACf,EAAE,CAAC;QACJ,MAAM,EAAE,KAAK,GAAG,KAAK,CAAC;QACtB,SAAS,EAAE,GAAG,CAAC;QACf,WAAW,EAAE,GAAG,CAAC;QACjB,OAAO,EAAE,GAAG,CAAC;QACb,eAAe,EAAE,GAAG,CAAC;KACtB,EAAE,CAAC;IACJ,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAC/B,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAGnC,MAAM,MAAM,qBAAqB,GAAG,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACxE,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;AAEtE,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,EACjC,QAAQ,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAClC,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAGpC,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAC5D,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;AAElD,MAAM,MAAM,4BAA4B,GAAG,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAE7E,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,GAAG,CAAC;IACR,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,CACjC,SAAS,EAAE,gBAAgB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,eAAe,CAAC,CAAC;AAK9B,eAAO,MAAM,oBAAoB,+DAA2B,CAAC;AAE7D,eAAO,MAAM,qBAAqB,4FAGhC,CAAC;AAEH,QAAA,MAAM,mBAAmB;;;;;;;;EAIvB,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;SAM9B,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;SAiB1B,CAAC"}

package/dist/types.mjs

@@ -1,2 +1,36 @@
-export {};
+import { array, boolean, nonempty, object, optional, record, string, tuple, type } from "@metamask/superstruct";
+import { HexChecksumAddressStruct, StrictHexStruct } from "@metamask/utils";
+// /** Structs **/
+// Even though these aren't actually typescript types, these structs essentially represent
+// runtime types, so we keep them in this file.
+export const GetCallsStatusStruct = tuple([StrictHexStruct]);
+export const GetCapabilitiesStruct = tuple([
+    HexChecksumAddressStruct,
+    optional(array(StrictHexStruct)),
+]);
+const RequiredAssetStruct = type({
+    address: nonempty(HexChecksumAddressStruct),
+    amount: nonempty(StrictHexStruct),
+    standard: nonempty(string()),
+});
+export const CapabilitiesStruct = record(string(), type({
+    optional: optional(boolean()),
+    requiredAssets: optional(array(RequiredAssetStruct)),
+}));
+export const SendCallsStruct = tuple([
+    object({
+        version: nonempty(string()),
+        id: optional(StrictHexStruct),
+        from: optional(HexChecksumAddressStruct),
+        chainId: StrictHexStruct,
+        atomicRequired: boolean(),
+        calls: array(object({
+            to: optional(HexChecksumAddressStruct),
+            data: optional(StrictHexStruct),
+            value: optional(StrictHexStruct),
+            capabilities: optional(CapabilitiesStruct),
+        })),
+        capabilities: optional(CapabilitiesStruct),
+    }),
+]);
 //# sourceMappingURL=types.mjs.map

package/dist/types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  AccountsControllerGetSelectedAccountAction,\n  AccountsControllerGetStateAction,\n} from '@metamask/accounts-controller';\nimport type { Messenger } from '@metamask/base-controller';\nimport type {\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n} from '@metamask/network-controller';\nimport type { PreferencesControllerGetStateAction } from '@metamask/preferences-controller';\nimport type { TransactionControllerGetStateAction } from '@metamask/transaction-controller';\n\ntype Actions =\n  | AccountsControllerGetStateAction\n  | AccountsControllerGetSelectedAccountAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | TransactionControllerGetStateAction\n  | PreferencesControllerGetStateAction\n  | NetworkControllerGetStateAction;\n\nexport type EIP5792Messenger = Messenger<Actions, never>;\n"]}
+{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,KAAK,EACL,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,MAAM,EACN,MAAM,EACN,KAAK,EACL,IAAI,EACL,8BAA8B;AAG/B,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,wBAAwB;AAmE5E,kBAAkB;AAClB,0FAA0F;AAC1F,+CAA+C;AAC/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC;IACzC,wBAAwB;IACxB,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,IAAI,CAAC;IAC/B,OAAO,EAAE,QAAQ,CAAC,wBAAwB,CAAC;IAC3C,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;IACjC,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CACtC,MAAM,EAAE,EACR,IAAI,CAAC;IACH,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;IAC7B,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;CACrD,CAAC,CACH,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC;QACL,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC3B,EAAE,EAAE,QAAQ,CAAC,eAAe,CAAC;QAC7B,IAAI,EAAE,QAAQ,CAAC,wBAAwB,CAAC;QACxC,OAAO,EAAE,eAAe;QACxB,cAAc,EAAE,OAAO,EAAE;QACzB,KAAK,EAAE,KAAK,CACV,MAAM,CAAC;YACL,EAAE,EAAE,QAAQ,CAAC,wBAAwB,CAAC;YACtC,IAAI,EAAE,QAAQ,CAAC,eAAe,CAAC;YAC/B,KAAK,EAAE,QAAQ,CAAC,eAAe,CAAC;YAChC,YAAY,EAAE,QAAQ,CAAC,kBAAkB,CAAC;SAC3C,CAAC,CACH;QACD,YAAY,EAAE,QAAQ,CAAC,kBAAkB,CAAC;KAC3C,CAAC;CACH,CAAC,CAAC","sourcesContent":["import type {\n  AccountsControllerGetSelectedAccountAction,\n  AccountsControllerGetStateAction,\n} from '@metamask/accounts-controller';\nimport type { Messenger } from '@metamask/base-controller';\nimport type {\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n} from '@metamask/network-controller';\nimport type { PreferencesControllerGetStateAction } from '@metamask/preferences-controller';\nimport type { Infer } from '@metamask/superstruct';\nimport {\n  array,\n  boolean,\n  nonempty,\n  object,\n  optional,\n  record,\n  string,\n  tuple,\n  type,\n} from '@metamask/superstruct';\nimport type { TransactionControllerGetStateAction } from '@metamask/transaction-controller';\nimport type { Hex, Json, JsonRpcRequest } from '@metamask/utils';\nimport { HexChecksumAddressStruct, StrictHexStruct } from '@metamask/utils';\n\ntype Actions =\n  | AccountsControllerGetStateAction\n  | AccountsControllerGetSelectedAccountAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | TransactionControllerGetStateAction\n  | PreferencesControllerGetStateAction\n  | NetworkControllerGetStateAction;\n\nexport type EIP5792Messenger = Messenger<Actions, never>;\n\n// wallet_getCallStatus\nexport type GetCallsStatusParams = Infer<typeof GetCallsStatusStruct>;\n\nexport type GetCallsStatusResult = {\n  version: string;\n  id: Hex;\n  chainId: Hex;\n  status: number;\n  atomic: boolean;\n  receipts?: {\n    logs: {\n      address: Hex;\n      data: Hex;\n      topics: Hex[];\n    }[];\n    status: '0x0' | '0x1';\n    blockHash: Hex;\n    blockNumber: Hex;\n    gasUsed: Hex;\n    transactionHash: Hex;\n  }[];\n  capabilities?: Record<string, Json>;\n};\n\nexport type GetCallsStatusHook = (\n  id: GetCallsStatusParams[0],\n  req: JsonRpcRequest,\n) => Promise<GetCallsStatusResult>;\n\n// wallet_getCapabilities\nexport type GetCapabilitiesParams = Infer<typeof GetCapabilitiesStruct>;\nexport type GetCapabilitiesResult = Record<Hex, Record<string, Json>>;\n\nexport type GetCapabilitiesHook = (\n  address: GetCapabilitiesParams[0],\n  chainIds: GetCapabilitiesParams[1],\n  req: JsonRpcRequest,\n) => Promise<GetCapabilitiesResult>;\n\n// wallet_sendCalls\nexport type SendCallsParams = Infer<typeof SendCallsStruct>;\nexport type SendCallsPayload = SendCallsParams[0];\n\nexport type SendCallsRequiredAssetsParam = Infer<typeof RequiredAssetStruct>;\n\nexport type SendCallsResult = {\n  id: Hex;\n  capabilities?: Record<string, Json>;\n};\n\nexport type ProcessSendCallsHook = (\n  sendCalls: SendCallsPayload,\n  req: JsonRpcRequest,\n) => Promise<SendCallsResult>;\n\n// /** Structs **/\n// Even though these aren't actually typescript types, these structs essentially represent\n// runtime types, so we keep them in this file.\nexport const GetCallsStatusStruct = tuple([StrictHexStruct]);\n\nexport const GetCapabilitiesStruct = tuple([\n  HexChecksumAddressStruct,\n  optional(array(StrictHexStruct)),\n]);\n\nconst RequiredAssetStruct = type({\n  address: nonempty(HexChecksumAddressStruct),\n  amount: nonempty(StrictHexStruct),\n  standard: nonempty(string()),\n});\n\nexport const CapabilitiesStruct = record(\n  string(),\n  type({\n    optional: optional(boolean()),\n    requiredAssets: optional(array(RequiredAssetStruct)),\n  }),\n);\n\nexport const SendCallsStruct = tuple([\n  object({\n    version: nonempty(string()),\n    id: optional(StrictHexStruct),\n    from: optional(HexChecksumAddressStruct),\n    chainId: StrictHexStruct,\n    atomicRequired: boolean(),\n    calls: array(\n      object({\n        to: optional(HexChecksumAddressStruct),\n        data: optional(StrictHexStruct),\n        value: optional(StrictHexStruct),\n        capabilities: optional(CapabilitiesStruct),\n      }),\n    ),\n    capabilities: optional(CapabilitiesStruct),\n  }),\n]);\n"]}

package/dist/utils.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountKeyringType = void 0;
+exports.resemblesAddress = exports.validateParams = exports.validateAndNormalizeKeyholder = exports.getAccountKeyringType = void 0;
 const rpc_errors_1 = require("@metamask/rpc-errors");
+const superstruct_1 = require("@metamask/superstruct");
 const constants_1 = require("./constants.cjs");
 /**
  * Retrieves the keyring type for a given account address.
@@ -21,4 +22,72 @@ function getAccountKeyringType(accountAddress, messenger) {
     return keyringType;
 }
 exports.getAccountKeyringType = getAccountKeyringType;
+/**
+ * Validates and normalizes a keyholder address for EIP-5792 operations.
+ *
+ * @param address - The Ethereum address to validate and normalize.
+ * @param req - The JSON-RPC request object for permission checking.
+ * @param options - Configuration object containing the getAccounts function.
+ * @param options.getAccounts - Function to retrieve accounts for the requester.
+ * @returns A normalized (lowercase) hex address if valid and authorized.
+ * @throws JsonRpcError with unauthorized error if the requester doesn't have      permission to access the address.
+ * @throws JsonRpcError with invalid params if the address format is invalid.
+ */
+async function validateAndNormalizeKeyholder(address, req, { getAccounts }) {
+    if (typeof address === 'string' &&
+        address.length > 0 &&
+        resemblesAddress(address)) {
+        // Ensure that an "unauthorized" error is thrown if the requester
+        // does not have the `eth_accounts` permission.
+        const accounts = await getAccounts(req);
+        const normalizedAccounts = accounts.map((_address) => _address.toLowerCase());
+        const normalizedAddress = address.toLowerCase();
+        if (normalizedAccounts.includes(normalizedAddress)) {
+            return normalizedAddress;
+        }
+        throw rpc_errors_1.providerErrors.unauthorized();
+    }
+    throw rpc_errors_1.rpcErrors.invalidParams({
+        message: `Invalid parameters: must provide an Ethereum address.`,
+    });
+}
+exports.validateAndNormalizeKeyholder = validateAndNormalizeKeyholder;
+/**
+ * Validates parameters against a Superstruct schema and throws an error if validation fails.
+ *
+ * @param value - The value to validate against the struct schema.
+ * @param struct - The Superstruct schema to validate against.
+ * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.
+ */
+function validateParams(value, struct) {
+    const [error] = (0, superstruct_1.validate)(value, struct);
+    if (error) {
+        throw rpc_errors_1.rpcErrors.invalidParams(formatValidationError(error, `Invalid params`));
+    }
+}
+exports.validateParams = validateParams;
+/**
+ * Checks if a string resembles an Ethereum address format.
+ *
+ * @param str - The string to check for address-like format.
+ * @returns True if the string has the correct length for an Ethereum address.
+ */
+function resemblesAddress(str) {
+    // hex prefix 2 + 20 bytes
+    return str.length === 2 + 20 * 2;
+}
+exports.resemblesAddress = resemblesAddress;
+/**
+ * Formats a Superstruct validation error into a human-readable string.
+ *
+ * @param error - The Superstruct validation error to format.
+ * @param message - The base error message to prepend to the formatted details.
+ * @returns A formatted error message string with validation failure details.
+ */
+function formatValidationError(error, message) {
+    return `${message}\n\n${error
+        .failures()
+        .map((f) => `${f.path.join(' > ')}${f.path.length ? ' - ' : ''}${f.message}`)
+        .join('\n')}`;
+}
 //# sourceMappingURL=utils.cjs.map

package/dist/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AACA,qDAAoD;AAGpD,+CAA+C;AAG/C;;;;;;;GAOG;AACH,SAAgB,qBAAqB,CACnC,cAAmB,EACnB,SAA2B;IAE3B,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CACjC,6BAA6B,CAC9B,CAAC,gBAAgB,CAAC;IAEnB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC1C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,WAAW,EAAE,CACpE,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC;IAErD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,yBAAY,CACpB,4BAAgB,CAAC,eAAe,EAChC,2DAA2D,CAC5D,CAAC;KACH;IAED,OAAO,WAA2B,CAAC;AACrC,CAAC;AAtBD,sDAsBC","sourcesContent":["import type { KeyringTypes } from '@metamask/keyring-controller';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\n\nimport { EIP5792ErrorCode } from './constants';\nimport type { EIP5792Messenger } from './types';\n\n/**\n * Retrieves the keyring type for a given account address.\n *\n * @param accountAddress - The account address to look up.\n * @param messenger - Messenger instance for controller communication.\n * @returns The keyring type associated with the account.\n * @throws JsonRpcError if the account type is unknown or not found.\n */\nexport function getAccountKeyringType(\n  accountAddress: Hex,\n  messenger: EIP5792Messenger,\n): KeyringTypes {\n  const { accounts } = messenger.call(\n    'AccountsController:getState',\n  ).internalAccounts;\n\n  const account = Object.values(accounts).find(\n    (acc) => acc.address.toLowerCase() === accountAddress.toLowerCase(),\n  );\n\n  const keyringType = account?.metadata?.keyring?.type;\n\n  if (!keyringType) {\n    throw new JsonRpcError(\n      EIP5792ErrorCode.RejectedUpgrade,\n      'EIP-7702 upgrade not supported as account type is unknown',\n    );\n  }\n\n  return keyringType as KeyringTypes;\n}\n"]}
+{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AACA,qDAA+E;AAE/E,uDAAiD;AAGjD,+CAA+C;AAG/C;;;;;;;GAOG;AACH,SAAgB,qBAAqB,CACnC,cAAmB,EACnB,SAA2B;IAE3B,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CACjC,6BAA6B,CAC9B,CAAC,gBAAgB,CAAC;IAEnB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC1C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,WAAW,EAAE,CACpE,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC;IAErD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,yBAAY,CACpB,4BAAgB,CAAC,eAAe,EAChC,2DAA2D,CAC5D,CAAC;KACH;IAED,OAAO,WAA2B,CAAC;AACrC,CAAC;AAtBD,sDAsBC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,6BAA6B,CACjD,OAAY,EACZ,GAAmB,EACnB,EAAE,WAAW,EAA+D;IAE5E,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,GAAG,CAAC;QAClB,gBAAgB,CAAC,OAAO,CAAC,EACzB;QACA,iEAAiE;QACjE,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC;QAExC,MAAM,kBAAkB,GAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC7D,QAAQ,CAAC,WAAW,EAAE,CACvB,CAAC;QAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAS,CAAC;QAEvD,IAAI,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YAClD,OAAO,iBAAiB,CAAC;SAC1B;QAED,MAAM,2BAAc,CAAC,YAAY,EAAE,CAAC;KACrC;IAED,MAAM,sBAAS,CAAC,aAAa,CAAC;QAC5B,OAAO,EAAE,uDAAuD;KACjE,CAAC,CAAC;AACL,CAAC;AA9BD,sEA8BC;AAED;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,KAA2B,EAC3B,MAA0B;IAE1B,MAAM,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAQ,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAExC,IAAI,KAAK,EAAE;QACT,MAAM,sBAAS,CAAC,aAAa,CAC3B,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAC/C,CAAC;KACH;AACH,CAAC;AAXD,wCAWC;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,0BAA0B;IAC1B,OAAO,GAAG,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAHD,4CAGC;AAED;;;;;;GAMG;AACH,SAAS,qBAAqB,CAAC,KAAkB,EAAE,OAAe;IAChE,OAAO,GAAG,OAAO,OAAO,KAAK;SAC1B,QAAQ,EAAE;SACV,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAClB,CAAC","sourcesContent":["import type { KeyringTypes } from '@metamask/keyring-controller';\nimport { JsonRpcError, providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type { Struct, StructError } from '@metamask/superstruct';\nimport { validate } from '@metamask/superstruct';\nimport type { Hex, JsonRpcRequest } from '@metamask/utils';\n\nimport { EIP5792ErrorCode } from './constants';\nimport type { EIP5792Messenger } from './types';\n\n/**\n * Retrieves the keyring type for a given account address.\n *\n * @param accountAddress - The account address to look up.\n * @param messenger - Messenger instance for controller communication.\n * @returns The keyring type associated with the account.\n * @throws JsonRpcError if the account type is unknown or not found.\n */\nexport function getAccountKeyringType(\n  accountAddress: Hex,\n  messenger: EIP5792Messenger,\n): KeyringTypes {\n  const { accounts } = messenger.call(\n    'AccountsController:getState',\n  ).internalAccounts;\n\n  const account = Object.values(accounts).find(\n    (acc) => acc.address.toLowerCase() === accountAddress.toLowerCase(),\n  );\n\n  const keyringType = account?.metadata?.keyring?.type;\n\n  if (!keyringType) {\n    throw new JsonRpcError(\n      EIP5792ErrorCode.RejectedUpgrade,\n      'EIP-7702 upgrade not supported as account type is unknown',\n    );\n  }\n\n  return keyringType as KeyringTypes;\n}\n\n/**\n * Validates and normalizes a keyholder address for EIP-5792 operations.\n *\n * @param address - The Ethereum address to validate and normalize.\n * @param req - The JSON-RPC request object for permission checking.\n * @param options - Configuration object containing the getAccounts function.\n * @param options.getAccounts - Function to retrieve accounts for the requester.\n * @returns A normalized (lowercase) hex address if valid and authorized.\n * @throws JsonRpcError with unauthorized error if the requester doesn't have      permission to access the address.\n * @throws JsonRpcError with invalid params if the address format is invalid.\n */\nexport async function validateAndNormalizeKeyholder(\n  address: Hex,\n  req: JsonRpcRequest,\n  { getAccounts }: { getAccounts: (req: JsonRpcRequest) => Promise<string[]> },\n): Promise<Hex> {\n  if (\n    typeof address === 'string' &&\n    address.length > 0 &&\n    resemblesAddress(address)\n  ) {\n    // Ensure that an \"unauthorized\" error is thrown if the requester\n    // does not have the `eth_accounts` permission.\n    const accounts = await getAccounts(req);\n\n    const normalizedAccounts: string[] = accounts.map((_address) =>\n      _address.toLowerCase(),\n    );\n\n    const normalizedAddress = address.toLowerCase() as Hex;\n\n    if (normalizedAccounts.includes(normalizedAddress)) {\n      return normalizedAddress;\n    }\n\n    throw providerErrors.unauthorized();\n  }\n\n  throw rpcErrors.invalidParams({\n    message: `Invalid parameters: must provide an Ethereum address.`,\n  });\n}\n\n/**\n * Validates parameters against a Superstruct schema and throws an error if validation fails.\n *\n * @param value - The value to validate against the struct schema.\n * @param struct - The Superstruct schema to validate against.\n * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.\n */\nexport function validateParams<ParamsType>(\n  value: unknown | ParamsType,\n  struct: Struct<ParamsType>,\n): asserts value is ParamsType {\n  const [error] = validate(value, struct);\n\n  if (error) {\n    throw rpcErrors.invalidParams(\n      formatValidationError(error, `Invalid params`),\n    );\n  }\n}\n\n/**\n * Checks if a string resembles an Ethereum address format.\n *\n * @param str - The string to check for address-like format.\n * @returns True if the string has the correct length for an Ethereum address.\n */\nexport function resemblesAddress(str: string): boolean {\n  // hex prefix 2 + 20 bytes\n  return str.length === 2 + 20 * 2;\n}\n\n/**\n * Formats a Superstruct validation error into a human-readable string.\n *\n * @param error - The Superstruct validation error to format.\n * @param message - The base error message to prepend to the formatted details.\n * @returns A formatted error message string with validation failure details.\n */\nfunction formatValidationError(error: StructError, message: string): string {\n  return `${message}\\n\\n${error\n    .failures()\n    .map(\n      (f) => `${f.path.join(' > ')}${f.path.length ? ' - ' : ''}${f.message}`,\n    )\n    .join('\\n')}`;\n}\n"]}

package/dist/utils.d.cts

@@ -1,5 +1,6 @@
 import type { KeyringTypes } from "@metamask/keyring-controller";
-import type { Hex } from "@metamask/utils";
+import type { Struct } from "@metamask/superstruct";
+import type { Hex, JsonRpcRequest } from "@metamask/utils";
 import type { EIP5792Messenger } from "./types.cjs";
 /**
  * Retrieves the keyring type for a given account address.
@@ -10,4 +11,33 @@ import type { EIP5792Messenger } from "./types.cjs";
  * @throws JsonRpcError if the account type is unknown or not found.
  */
 export declare function getAccountKeyringType(accountAddress: Hex, messenger: EIP5792Messenger): KeyringTypes;
+/**
+ * Validates and normalizes a keyholder address for EIP-5792 operations.
+ *
+ * @param address - The Ethereum address to validate and normalize.
+ * @param req - The JSON-RPC request object for permission checking.
+ * @param options - Configuration object containing the getAccounts function.
+ * @param options.getAccounts - Function to retrieve accounts for the requester.
+ * @returns A normalized (lowercase) hex address if valid and authorized.
+ * @throws JsonRpcError with unauthorized error if the requester doesn't have      permission to access the address.
+ * @throws JsonRpcError with invalid params if the address format is invalid.
+ */
+export declare function validateAndNormalizeKeyholder(address: Hex, req: JsonRpcRequest, { getAccounts }: {
+    getAccounts: (req: JsonRpcRequest) => Promise<string[]>;
+}): Promise<Hex>;
+/**
+ * Validates parameters against a Superstruct schema and throws an error if validation fails.
+ *
+ * @param value - The value to validate against the struct schema.
+ * @param struct - The Superstruct schema to validate against.
+ * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.
+ */
+export declare function validateParams<ParamsType>(value: unknown | ParamsType, struct: Struct<ParamsType>): asserts value is ParamsType;
+/**
+ * Checks if a string resembles an Ethereum address format.
+ *
+ * @param str - The string to check for address-like format.
+ * @returns True if the string has the correct length for an Ethereum address.
+ */
+export declare function resemblesAddress(str: string): boolean;
 //# sourceMappingURL=utils.d.cts.map

package/dist/utils.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.cts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,qCAAqC;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAgB;AAEhD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,GAAG,EACnB,SAAS,EAAE,gBAAgB,GAC1B,YAAY,CAmBd"}
+{"version":3,"file":"utils.d.cts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,qCAAqC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAe,8BAA8B;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,wBAAwB;AAG3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAgB;AAEhD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,GAAG,EACnB,SAAS,EAAE,gBAAgB,GAC1B,YAAY,CAmBd;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,cAAc,EACnB,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GAC3E,OAAO,CAAC,GAAG,CAAC,CA0Bd;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EACvC,KAAK,EAAE,OAAO,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GACzB,OAAO,CAAC,KAAK,IAAI,UAAU,CAQ7B;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGrD"}

package/dist/utils.d.mts

@@ -1,5 +1,6 @@
 import type { KeyringTypes } from "@metamask/keyring-controller";
-import type { Hex } from "@metamask/utils";
+import type { Struct } from "@metamask/superstruct";
+import type { Hex, JsonRpcRequest } from "@metamask/utils";
 import type { EIP5792Messenger } from "./types.mjs";
 /**
  * Retrieves the keyring type for a given account address.
@@ -10,4 +11,33 @@ import type { EIP5792Messenger } from "./types.mjs";
  * @throws JsonRpcError if the account type is unknown or not found.
  */
 export declare function getAccountKeyringType(accountAddress: Hex, messenger: EIP5792Messenger): KeyringTypes;
+/**
+ * Validates and normalizes a keyholder address for EIP-5792 operations.
+ *
+ * @param address - The Ethereum address to validate and normalize.
+ * @param req - The JSON-RPC request object for permission checking.
+ * @param options - Configuration object containing the getAccounts function.
+ * @param options.getAccounts - Function to retrieve accounts for the requester.
+ * @returns A normalized (lowercase) hex address if valid and authorized.
+ * @throws JsonRpcError with unauthorized error if the requester doesn't have      permission to access the address.
+ * @throws JsonRpcError with invalid params if the address format is invalid.
+ */
+export declare function validateAndNormalizeKeyholder(address: Hex, req: JsonRpcRequest, { getAccounts }: {
+    getAccounts: (req: JsonRpcRequest) => Promise<string[]>;
+}): Promise<Hex>;
+/**
+ * Validates parameters against a Superstruct schema and throws an error if validation fails.
+ *
+ * @param value - The value to validate against the struct schema.
+ * @param struct - The Superstruct schema to validate against.
+ * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.
+ */
+export declare function validateParams<ParamsType>(value: unknown | ParamsType, struct: Struct<ParamsType>): asserts value is ParamsType;
+/**
+ * Checks if a string resembles an Ethereum address format.
+ *
+ * @param str - The string to check for address-like format.
+ * @returns True if the string has the correct length for an Ethereum address.
+ */
+export declare function resemblesAddress(str: string): boolean;
 //# sourceMappingURL=utils.d.mts.map

package/dist/utils.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.mts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,qCAAqC;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAgB;AAEhD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,GAAG,EACnB,SAAS,EAAE,gBAAgB,GAC1B,YAAY,CAmBd"}
+{"version":3,"file":"utils.d.mts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,qCAAqC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAe,8BAA8B;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,wBAAwB;AAG3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAgB;AAEhD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,GAAG,EACnB,SAAS,EAAE,gBAAgB,GAC1B,YAAY,CAmBd;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,cAAc,EACnB,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GAC3E,OAAO,CAAC,GAAG,CAAC,CA0Bd;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EACvC,KAAK,EAAE,OAAO,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GACzB,OAAO,CAAC,KAAK,IAAI,UAAU,CAQ7B;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGrD"}

package/dist/utils.mjs

@@ -1,4 +1,5 @@
-import { JsonRpcError } from "@metamask/rpc-errors";
+import { JsonRpcError, providerErrors, rpcErrors } from "@metamask/rpc-errors";
+import { validate } from "@metamask/superstruct";
 import { EIP5792ErrorCode } from "./constants.mjs";
 /**
  * Retrieves the keyring type for a given account address.
@@ -17,4 +18,69 @@ export function getAccountKeyringType(accountAddress, messenger) {
     }
     return keyringType;
 }
+/**
+ * Validates and normalizes a keyholder address for EIP-5792 operations.
+ *
+ * @param address - The Ethereum address to validate and normalize.
+ * @param req - The JSON-RPC request object for permission checking.
+ * @param options - Configuration object containing the getAccounts function.
+ * @param options.getAccounts - Function to retrieve accounts for the requester.
+ * @returns A normalized (lowercase) hex address if valid and authorized.
+ * @throws JsonRpcError with unauthorized error if the requester doesn't have      permission to access the address.
+ * @throws JsonRpcError with invalid params if the address format is invalid.
+ */
+export async function validateAndNormalizeKeyholder(address, req, { getAccounts }) {
+    if (typeof address === 'string' &&
+        address.length > 0 &&
+        resemblesAddress(address)) {
+        // Ensure that an "unauthorized" error is thrown if the requester
+        // does not have the `eth_accounts` permission.
+        const accounts = await getAccounts(req);
+        const normalizedAccounts = accounts.map((_address) => _address.toLowerCase());
+        const normalizedAddress = address.toLowerCase();
+        if (normalizedAccounts.includes(normalizedAddress)) {
+            return normalizedAddress;
+        }
+        throw providerErrors.unauthorized();
+    }
+    throw rpcErrors.invalidParams({
+        message: `Invalid parameters: must provide an Ethereum address.`,
+    });
+}
+/**
+ * Validates parameters against a Superstruct schema and throws an error if validation fails.
+ *
+ * @param value - The value to validate against the struct schema.
+ * @param struct - The Superstruct schema to validate against.
+ * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.
+ */
+export function validateParams(value, struct) {
+    const [error] = validate(value, struct);
+    if (error) {
+        throw rpcErrors.invalidParams(formatValidationError(error, `Invalid params`));
+    }
+}
+/**
+ * Checks if a string resembles an Ethereum address format.
+ *
+ * @param str - The string to check for address-like format.
+ * @returns True if the string has the correct length for an Ethereum address.
+ */
+export function resemblesAddress(str) {
+    // hex prefix 2 + 20 bytes
+    return str.length === 2 + 20 * 2;
+}
+/**
+ * Formats a Superstruct validation error into a human-readable string.
+ *
+ * @param error - The Superstruct validation error to format.
+ * @param message - The base error message to prepend to the formatted details.
+ * @returns A formatted error message string with validation failure details.
+ */
+function formatValidationError(error, message) {
+    return `${message}\n\n${error
+        .failures()
+        .map((f) => `${f.path.join(' > ')}${f.path.length ? ' - ' : ''}${f.message}`)
+        .join('\n')}`;
+}
 //# sourceMappingURL=utils.mjs.map

package/dist/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,6BAA6B;AAGpD,OAAO,EAAE,gBAAgB,EAAE,wBAAoB;AAG/C;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACnC,cAAmB,EACnB,SAA2B;IAE3B,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CACjC,6BAA6B,CAC9B,CAAC,gBAAgB,CAAC;IAEnB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC1C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,WAAW,EAAE,CACpE,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC;IAErD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,YAAY,CACpB,gBAAgB,CAAC,eAAe,EAChC,2DAA2D,CAC5D,CAAC;KACH;IAED,OAAO,WAA2B,CAAC;AACrC,CAAC","sourcesContent":["import type { KeyringTypes } from '@metamask/keyring-controller';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\n\nimport { EIP5792ErrorCode } from './constants';\nimport type { EIP5792Messenger } from './types';\n\n/**\n * Retrieves the keyring type for a given account address.\n *\n * @param accountAddress - The account address to look up.\n * @param messenger - Messenger instance for controller communication.\n * @returns The keyring type associated with the account.\n * @throws JsonRpcError if the account type is unknown or not found.\n */\nexport function getAccountKeyringType(\n  accountAddress: Hex,\n  messenger: EIP5792Messenger,\n): KeyringTypes {\n  const { accounts } = messenger.call(\n    'AccountsController:getState',\n  ).internalAccounts;\n\n  const account = Object.values(accounts).find(\n    (acc) => acc.address.toLowerCase() === accountAddress.toLowerCase(),\n  );\n\n  const keyringType = account?.metadata?.keyring?.type;\n\n  if (!keyringType) {\n    throw new JsonRpcError(\n      EIP5792ErrorCode.RejectedUpgrade,\n      'EIP-7702 upgrade not supported as account type is unknown',\n    );\n  }\n\n  return keyringType as KeyringTypes;\n}\n"]}
+{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,6BAA6B;AAE/E,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AAGjD,OAAO,EAAE,gBAAgB,EAAE,wBAAoB;AAG/C;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACnC,cAAmB,EACnB,SAA2B;IAE3B,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CACjC,6BAA6B,CAC9B,CAAC,gBAAgB,CAAC;IAEnB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC1C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,WAAW,EAAE,CACpE,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC;IAErD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,YAAY,CACpB,gBAAgB,CAAC,eAAe,EAChC,2DAA2D,CAC5D,CAAC;KACH;IAED,OAAO,WAA2B,CAAC;AACrC,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,OAAY,EACZ,GAAmB,EACnB,EAAE,WAAW,EAA+D;IAE5E,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,GAAG,CAAC;QAClB,gBAAgB,CAAC,OAAO,CAAC,EACzB;QACA,iEAAiE;QACjE,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC;QAExC,MAAM,kBAAkB,GAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC7D,QAAQ,CAAC,WAAW,EAAE,CACvB,CAAC;QAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAS,CAAC;QAEvD,IAAI,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YAClD,OAAO,iBAAiB,CAAC;SAC1B;QAED,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;KACrC;IAED,MAAM,SAAS,CAAC,aAAa,CAAC;QAC5B,OAAO,EAAE,uDAAuD;KACjE,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,KAA2B,EAC3B,MAA0B;IAE1B,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAExC,IAAI,KAAK,EAAE;QACT,MAAM,SAAS,CAAC,aAAa,CAC3B,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAC/C,CAAC;KACH;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,0BAA0B;IAC1B,OAAO,GAAG,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAED;;;;;;GAMG;AACH,SAAS,qBAAqB,CAAC,KAAkB,EAAE,OAAe;IAChE,OAAO,GAAG,OAAO,OAAO,KAAK;SAC1B,QAAQ,EAAE;SACV,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAClB,CAAC","sourcesContent":["import type { KeyringTypes } from '@metamask/keyring-controller';\nimport { JsonRpcError, providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type { Struct, StructError } from '@metamask/superstruct';\nimport { validate } from '@metamask/superstruct';\nimport type { Hex, JsonRpcRequest } from '@metamask/utils';\n\nimport { EIP5792ErrorCode } from './constants';\nimport type { EIP5792Messenger } from './types';\n\n/**\n * Retrieves the keyring type for a given account address.\n *\n * @param accountAddress - The account address to look up.\n * @param messenger - Messenger instance for controller communication.\n * @returns The keyring type associated with the account.\n * @throws JsonRpcError if the account type is unknown or not found.\n */\nexport function getAccountKeyringType(\n  accountAddress: Hex,\n  messenger: EIP5792Messenger,\n): KeyringTypes {\n  const { accounts } = messenger.call(\n    'AccountsController:getState',\n  ).internalAccounts;\n\n  const account = Object.values(accounts).find(\n    (acc) => acc.address.toLowerCase() === accountAddress.toLowerCase(),\n  );\n\n  const keyringType = account?.metadata?.keyring?.type;\n\n  if (!keyringType) {\n    throw new JsonRpcError(\n      EIP5792ErrorCode.RejectedUpgrade,\n      'EIP-7702 upgrade not supported as account type is unknown',\n    );\n  }\n\n  return keyringType as KeyringTypes;\n}\n\n/**\n * Validates and normalizes a keyholder address for EIP-5792 operations.\n *\n * @param address - The Ethereum address to validate and normalize.\n * @param req - The JSON-RPC request object for permission checking.\n * @param options - Configuration object containing the getAccounts function.\n * @param options.getAccounts - Function to retrieve accounts for the requester.\n * @returns A normalized (lowercase) hex address if valid and authorized.\n * @throws JsonRpcError with unauthorized error if the requester doesn't have      permission to access the address.\n * @throws JsonRpcError with invalid params if the address format is invalid.\n */\nexport async function validateAndNormalizeKeyholder(\n  address: Hex,\n  req: JsonRpcRequest,\n  { getAccounts }: { getAccounts: (req: JsonRpcRequest) => Promise<string[]> },\n): Promise<Hex> {\n  if (\n    typeof address === 'string' &&\n    address.length > 0 &&\n    resemblesAddress(address)\n  ) {\n    // Ensure that an \"unauthorized\" error is thrown if the requester\n    // does not have the `eth_accounts` permission.\n    const accounts = await getAccounts(req);\n\n    const normalizedAccounts: string[] = accounts.map((_address) =>\n      _address.toLowerCase(),\n    );\n\n    const normalizedAddress = address.toLowerCase() as Hex;\n\n    if (normalizedAccounts.includes(normalizedAddress)) {\n      return normalizedAddress;\n    }\n\n    throw providerErrors.unauthorized();\n  }\n\n  throw rpcErrors.invalidParams({\n    message: `Invalid parameters: must provide an Ethereum address.`,\n  });\n}\n\n/**\n * Validates parameters against a Superstruct schema and throws an error if validation fails.\n *\n * @param value - The value to validate against the struct schema.\n * @param struct - The Superstruct schema to validate against.\n * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.\n */\nexport function validateParams<ParamsType>(\n  value: unknown | ParamsType,\n  struct: Struct<ParamsType>,\n): asserts value is ParamsType {\n  const [error] = validate(value, struct);\n\n  if (error) {\n    throw rpcErrors.invalidParams(\n      formatValidationError(error, `Invalid params`),\n    );\n  }\n}\n\n/**\n * Checks if a string resembles an Ethereum address format.\n *\n * @param str - The string to check for address-like format.\n * @returns True if the string has the correct length for an Ethereum address.\n */\nexport function resemblesAddress(str: string): boolean {\n  // hex prefix 2 + 20 bytes\n  return str.length === 2 + 20 * 2;\n}\n\n/**\n * Formats a Superstruct validation error into a human-readable string.\n *\n * @param error - The Superstruct validation error to format.\n * @param message - The base error message to prepend to the formatted details.\n * @returns A formatted error message string with validation failure details.\n */\nfunction formatValidationError(error: StructError, message: string): string {\n  return `${message}\\n\\n${error\n    .failures()\n    .map(\n      (f) => `${f.path.join(' > ')}${f.path.length ? ' - ' : ''}${f.message}`,\n    )\n    .join('\\n')}`;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/eip-5792-middleware",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Implements the JSON-RPC methods for sending multiple calls from the user's wallet, and checking their status, as referenced in EIP-5792",
   "keywords": [
     "MetaMask",
@@ -48,17 +48,20 @@
   },
   "dependencies": {
     "@metamask/eth-json-rpc-middleware": "^17.0.1",
-    "@metamask/transaction-controller": "^60.2.0",
-    "@metamask/utils": "^11.4.2",
+    "@metamask/superstruct": "^3.1.0",
+    "@metamask/transaction-controller": "^60.4.0",
+    "@metamask/utils": "^11.8.0",
+    "lodash": "^4.17.21",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/keyring-controller": "^23.0.0",
+    "@metamask/keyring-controller": "^23.1.0",
     "@metamask/rpc-errors": "^7.0.2",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
+    "klona": "^2.0.6",
     "ts-jest": "^27.1.4",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",

package/dist/methods/getCallsStatus.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCallsStatus.cjs","sourceRoot":"","sources":["../../src/methods/getCallsStatus.ts"],"names":[],"mappings":";;;AACA,+EAAuE;AACvE,qDAAoD;AAMpD,6EAAqE;AAGrE,gDAAyD;AAGzD;;;;;;;GAOG;AACH,SAAgB,cAAc,CAC5B,SAA2B,EAC3B,EAAO;IAEP,MAAM,YAAY,GAAG,SAAS;SAC3B,IAAI,CAAC,gCAAgC,CAAC;SACtC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QACzB,MAAM,IAAI,yBAAY,CACpB,4BAAgB,CAAC,eAAe,EAChC,0BAA0B,CAC3B,CAAC;KACH;IAED,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,YAAwD,CAAC;IAC3E,MAAM,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAoB,CAAC;IAExD,MAAM,QAAQ,GAAqC,SAAS,IAAI;QAC9D;YACE,SAAS,EAAE,SAAS,CAAC,SAAgB;YACrC,WAAW,EAAE,SAAS,CAAC,WAAkB;YACzC,OAAO,EAAE,SAAS,CAAC,OAAc;YACjC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAkC,EAAE,EAAE,CAAC,CAAC;gBACtD,OAAO,EAAE,GAAG,CAAC,OAAc;gBAC3B,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,MAAM,EAAE,GAAG,CAAC,MAA0B;aACvC,CAAC,CAAC;YACH,MAAM,EAAE,SAAS,CAAC,MAAuB;YACzC,eAAe,EAAE,SAAS,CAAC,eAAe;SAC3C;KACF,CAAC;IAEF,OAAO;QACL,OAAO,EAAE,mBAAO;QAChB,EAAE;QACF,OAAO;QACP,MAAM,EAAE,IAAI;QACZ,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC;AA5CD,wCA4CC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,eAAgC;IACrD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC;IAEzC,IAAI,MAAM,KAAK,0CAAiB,CAAC,SAAS,EAAE;QAC1C,OAAO,4CAAkB,CAAC,SAAS,CAAC;KACrC;IAED,IAAI,MAAM,KAAK,0CAAiB,CAAC,MAAM,EAAE;QACvC,OAAO,IAAI;YACT,CAAC,CAAC,4CAAkB,CAAC,QAAQ;YAC7B,CAAC,CAAC,4CAAkB,CAAC,eAAe,CAAC;KACxC;IAED,IAAI,MAAM,KAAK,0CAAiB,CAAC,OAAO,EAAE;QACxC,OAAO,4CAAkB,CAAC,QAAQ,CAAC;KACpC;IAED,OAAO,4CAAkB,CAAC,OAAO,CAAC;AACpC,CAAC","sourcesContent":["import type { GetCallsStatusResult } from '@metamask/eth-json-rpc-middleware';\nimport { GetCallsStatusCode } from '@metamask/eth-json-rpc-middleware';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type {\n  Log,\n  TransactionMeta,\n  TransactionReceipt,\n} from '@metamask/transaction-controller';\nimport { TransactionStatus } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport { EIP5792ErrorCode, VERSION } from '../constants';\nimport type { EIP5792Messenger } from '../types';\n\n/**\n * Retrieves the status of a transaction batch by its ID.\n *\n * @param messenger - Messenger instance for controller communication.\n * @param id - The batch ID to look up (hexadecimal string).\n * @returns GetCallsStatusResult containing the batch status, receipts, and metadata.\n * @throws JsonRpcError with EIP5792ErrorCode.UnknownBundleId if no matching bundle is found.\n */\nexport function getCallsStatus(\n  messenger: EIP5792Messenger,\n  id: Hex,\n): GetCallsStatusResult {\n  const transactions = messenger\n    .call('TransactionController:getState')\n    .transactions.filter((tx) => tx.batchId === id);\n\n  if (!transactions?.length) {\n    throw new JsonRpcError(\n      EIP5792ErrorCode.UnknownBundleId,\n      `No matching bundle found`,\n    );\n  }\n\n  const transaction = transactions[0];\n  const { chainId, txReceipt: rawTxReceipt } = transaction;\n  const status = getStatusCode(transaction);\n  const txReceipt = rawTxReceipt as Required<TransactionReceipt> | undefined;\n  const logs = (txReceipt?.logs ?? []) as Required<Log>[];\n\n  const receipts: GetCallsStatusResult['receipts'] = txReceipt && [\n    {\n      blockHash: txReceipt.blockHash as Hex,\n      blockNumber: txReceipt.blockNumber as Hex,\n      gasUsed: txReceipt.gasUsed as Hex,\n      logs: logs.map((log: Required<Log> & { data: Hex }) => ({\n        address: log.address as Hex,\n        data: log.data,\n        topics: log.topics as unknown as Hex[],\n      })),\n      status: txReceipt.status as '0x0' | '0x1',\n      transactionHash: txReceipt.transactionHash,\n    },\n  ];\n\n  return {\n    version: VERSION,\n    id,\n    chainId,\n    atomic: true, // Always atomic as we currently only support EIP-7702 batches\n    status,\n    receipts,\n  };\n}\n\n/**\n * Maps transaction status to EIP-5792 call status codes.\n *\n * @param transactionMeta - The transaction metadata containing status and hash information.\n * @returns GetCallsStatusCode representing the current status of the transaction.\n */\nfunction getStatusCode(transactionMeta: TransactionMeta) {\n  const { hash, status } = transactionMeta;\n\n  if (status === TransactionStatus.confirmed) {\n    return GetCallsStatusCode.CONFIRMED;\n  }\n\n  if (status === TransactionStatus.failed) {\n    return hash\n      ? GetCallsStatusCode.REVERTED\n      : GetCallsStatusCode.FAILED_OFFCHAIN;\n  }\n\n  if (status === TransactionStatus.dropped) {\n    return GetCallsStatusCode.REVERTED;\n  }\n\n  return GetCallsStatusCode.PENDING;\n}\n"]}

package/dist/methods/getCallsStatus.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCallsStatus.d.cts","sourceRoot":"","sources":["../../src/methods/getCallsStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,0CAA0C;AAS9E,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAiB;AAEjD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,gBAAgB,EAC3B,EAAE,EAAE,GAAG,GACN,oBAAoB,CAyCtB"}

package/dist/methods/getCallsStatus.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCallsStatus.d.mts","sourceRoot":"","sources":["../../src/methods/getCallsStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,0CAA0C;AAS9E,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAiB;AAEjD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,gBAAgB,EAC3B,EAAE,EAAE,GAAG,GACN,oBAAoB,CAyCtB"}

package/dist/methods/getCallsStatus.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCallsStatus.mjs","sourceRoot":"","sources":["../../src/methods/getCallsStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,0CAA0C;AACvE,OAAO,EAAE,YAAY,EAAE,6BAA6B;AAMpD,OAAO,EAAE,iBAAiB,EAAE,yCAAyC;AAGrE,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,yBAAqB;AAGzD;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAC5B,SAA2B,EAC3B,EAAO;IAEP,MAAM,YAAY,GAAG,SAAS;SAC3B,IAAI,CAAC,gCAAgC,CAAC;SACtC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QACzB,MAAM,IAAI,YAAY,CACpB,gBAAgB,CAAC,eAAe,EAChC,0BAA0B,CAC3B,CAAC;KACH;IAED,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,YAAwD,CAAC;IAC3E,MAAM,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAoB,CAAC;IAExD,MAAM,QAAQ,GAAqC,SAAS,IAAI;QAC9D;YACE,SAAS,EAAE,SAAS,CAAC,SAAgB;YACrC,WAAW,EAAE,SAAS,CAAC,WAAkB;YACzC,OAAO,EAAE,SAAS,CAAC,OAAc;YACjC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAkC,EAAE,EAAE,CAAC,CAAC;gBACtD,OAAO,EAAE,GAAG,CAAC,OAAc;gBAC3B,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,MAAM,EAAE,GAAG,CAAC,MAA0B;aACvC,CAAC,CAAC;YACH,MAAM,EAAE,SAAS,CAAC,MAAuB;YACzC,eAAe,EAAE,SAAS,CAAC,eAAe;SAC3C;KACF,CAAC;IAEF,OAAO;QACL,OAAO,EAAE,OAAO;QAChB,EAAE;QACF,OAAO;QACP,MAAM,EAAE,IAAI;QACZ,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,eAAgC;IACrD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC;IAEzC,IAAI,MAAM,KAAK,iBAAiB,CAAC,SAAS,EAAE;QAC1C,OAAO,kBAAkB,CAAC,SAAS,CAAC;KACrC;IAED,IAAI,MAAM,KAAK,iBAAiB,CAAC,MAAM,EAAE;QACvC,OAAO,IAAI;YACT,CAAC,CAAC,kBAAkB,CAAC,QAAQ;YAC7B,CAAC,CAAC,kBAAkB,CAAC,eAAe,CAAC;KACxC;IAED,IAAI,MAAM,KAAK,iBAAiB,CAAC,OAAO,EAAE;QACxC,OAAO,kBAAkB,CAAC,QAAQ,CAAC;KACpC;IAED,OAAO,kBAAkB,CAAC,OAAO,CAAC;AACpC,CAAC","sourcesContent":["import type { GetCallsStatusResult } from '@metamask/eth-json-rpc-middleware';\nimport { GetCallsStatusCode } from '@metamask/eth-json-rpc-middleware';\nimport { JsonRpcError } from '@metamask/rpc-errors';\nimport type {\n  Log,\n  TransactionMeta,\n  TransactionReceipt,\n} from '@metamask/transaction-controller';\nimport { TransactionStatus } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport { EIP5792ErrorCode, VERSION } from '../constants';\nimport type { EIP5792Messenger } from '../types';\n\n/**\n * Retrieves the status of a transaction batch by its ID.\n *\n * @param messenger - Messenger instance for controller communication.\n * @param id - The batch ID to look up (hexadecimal string).\n * @returns GetCallsStatusResult containing the batch status, receipts, and metadata.\n * @throws JsonRpcError with EIP5792ErrorCode.UnknownBundleId if no matching bundle is found.\n */\nexport function getCallsStatus(\n  messenger: EIP5792Messenger,\n  id: Hex,\n): GetCallsStatusResult {\n  const transactions = messenger\n    .call('TransactionController:getState')\n    .transactions.filter((tx) => tx.batchId === id);\n\n  if (!transactions?.length) {\n    throw new JsonRpcError(\n      EIP5792ErrorCode.UnknownBundleId,\n      `No matching bundle found`,\n    );\n  }\n\n  const transaction = transactions[0];\n  const { chainId, txReceipt: rawTxReceipt } = transaction;\n  const status = getStatusCode(transaction);\n  const txReceipt = rawTxReceipt as Required<TransactionReceipt> | undefined;\n  const logs = (txReceipt?.logs ?? []) as Required<Log>[];\n\n  const receipts: GetCallsStatusResult['receipts'] = txReceipt && [\n    {\n      blockHash: txReceipt.blockHash as Hex,\n      blockNumber: txReceipt.blockNumber as Hex,\n      gasUsed: txReceipt.gasUsed as Hex,\n      logs: logs.map((log: Required<Log> & { data: Hex }) => ({\n        address: log.address as Hex,\n        data: log.data,\n        topics: log.topics as unknown as Hex[],\n      })),\n      status: txReceipt.status as '0x0' | '0x1',\n      transactionHash: txReceipt.transactionHash,\n    },\n  ];\n\n  return {\n    version: VERSION,\n    id,\n    chainId,\n    atomic: true, // Always atomic as we currently only support EIP-7702 batches\n    status,\n    receipts,\n  };\n}\n\n/**\n * Maps transaction status to EIP-5792 call status codes.\n *\n * @param transactionMeta - The transaction metadata containing status and hash information.\n * @returns GetCallsStatusCode representing the current status of the transaction.\n */\nfunction getStatusCode(transactionMeta: TransactionMeta) {\n  const { hash, status } = transactionMeta;\n\n  if (status === TransactionStatus.confirmed) {\n    return GetCallsStatusCode.CONFIRMED;\n  }\n\n  if (status === TransactionStatus.failed) {\n    return hash\n      ? GetCallsStatusCode.REVERTED\n      : GetCallsStatusCode.FAILED_OFFCHAIN;\n  }\n\n  if (status === TransactionStatus.dropped) {\n    return GetCallsStatusCode.REVERTED;\n  }\n\n  return GetCallsStatusCode.PENDING;\n}\n"]}