Bump @metamask/utils to ^11.7.0

The only change that affects this package is in 11.3.0, where some types
were changed so that if they take a type parameter that `extends Json`,
they default to `Json` itself. Because of our lint rules that forced
some changes in this PR itself. There should be no backward-incompatible
changes, however.

`object` is deprecated, so we do need to adapt to that at some point,
but we can address that in a future PR.

Author: mcmire

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - **BREAKING:** `createFetchMiddleware` no longer takes `fetch`, `btoa`, `rpcUrl`, and `originHttpHeaderKey` ([#402](https://github.com/MetaMask/eth-json-rpc-middleware/pull/402))
   - The existing signature (`rpcService` and `options`) is now the only way to use this function; please use that instead.
+- Bump `@metamask/utils` to `^11.7.0` ([#404](https://github.com/MetaMask/eth-json-rpc-middleware/pull/404))
 
 ### Removed
 

package.json

@@ -35,7 +35,7 @@
     "@metamask/json-rpc-engine": "^10.0.2",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/utils": "^11.1.0",
+    "@metamask/utils": "^11.7.0",
     "@types/bn.js": "^5.1.5",
     "bn.js": "^5.2.1",
     "klona": "^2.0.6",

src/block-tracker-inspector.ts

@@ -39,7 +39,7 @@ function hasProperty<ObjectToCheck, Property extends ValidPropertyType>(
 }
 
 function getResultBlockNumber(
-  response: PendingJsonRpcResponse<Json>,
+  response: PendingJsonRpcResponse,
 ): string | undefined {
   const { result } = response;
   if (

src/inflight-cache.ts

@@ -10,7 +10,7 @@ import { projectLogger, createModuleLogger } from './logging-utils';
 import type { JsonRpcRequestToCache, JsonRpcCacheMiddleware } from './types';
 import { cacheIdentifierForRequest } from './utils/cache';
 
-type RequestHandlers = (handledRes: PendingJsonRpcResponse<Json>) => void;
+type RequestHandlers = (handledRes: PendingJsonRpcResponse) => void;
 interface InflightRequest {
   [cacheId: string]: RequestHandlers[];
 }
@@ -72,11 +72,11 @@ export function createInflightCacheMiddleware(): JsonRpcCacheMiddleware<
   );
 
   async function createActiveRequestHandler(
-    res: PendingJsonRpcResponse<Json>,
+    res: PendingJsonRpcResponse,
     activeRequestHandlers: RequestHandlers[],
   ): Promise<void> {
     const { resolve, promise } = deferredPromise();
-    activeRequestHandlers.push((handledRes: PendingJsonRpcResponse<Json>) => {
+    activeRequestHandlers.push((handledRes: PendingJsonRpcResponse) => {
       // append a copy of the result and error to the response
       res.result = klona(handledRes.result);
       res.error = klona(handledRes.error);
@@ -86,7 +86,7 @@ export function createInflightCacheMiddleware(): JsonRpcCacheMiddleware<
   }
 
   function handleActiveRequest(
-    res: PendingJsonRpcResponse<Json>,
+    res: PendingJsonRpcResponse,
     activeRequestHandlers: RequestHandlers[],
   ): void {
     // use setTimeout so we can resolve our original request first

src/methods/wallet-get-calls-status.ts

@@ -51,7 +51,7 @@ export type GetCallsStatusHook = (
 
 export async function walletGetCallsStatus(
   req: JsonRpcRequest,
-  res: PendingJsonRpcResponse<Json>,
+  res: PendingJsonRpcResponse,
   {
     getCallsStatus,
   }: {

src/methods/wallet-get-capabilities.ts

@@ -30,7 +30,7 @@ export type GetCapabilitiesHook = (
 
 export async function walletGetCapabilities(
   req: JsonRpcRequest,
-  res: PendingJsonRpcResponse<Json>,
+  res: PendingJsonRpcResponse,
   {
     getAccounts,
     getCapabilities,

src/methods/wallet-request-execution-permissions.test.ts

@@ -1,8 +1,4 @@
-import type {
-  Json,
-  JsonRpcRequest,
-  PendingJsonRpcResponse,
-} from '@metamask/utils';
+import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils';
 import { klona } from 'klona';
 
 import type {
@@ -70,7 +66,7 @@ const RESULT_MOCK: RequestExecutionPermissionsResult = [
 describe('wallet_requestExecutionPermissions', () => {
   let request: JsonRpcRequest;
   let params: RequestExecutionPermissionsRequestParams;
-  let response: PendingJsonRpcResponse<Json>;
+  let response: PendingJsonRpcResponse;
   let processRequestExecutionPermissionsMock: jest.MockedFunction<ProcessRequestExecutionPermissionsHook>;
 
   async function callMethod() {
@@ -85,7 +81,7 @@ describe('wallet_requestExecutionPermissions', () => {
 
     request = klona(REQUEST_MOCK);
     params = request.params as RequestExecutionPermissionsRequestParams;
-    response = {} as PendingJsonRpcResponse<Json>;
+    response = {} as PendingJsonRpcResponse;
 
     processRequestExecutionPermissionsMock = jest.fn();
     processRequestExecutionPermissionsMock.mockResolvedValue(RESULT_MOCK);

src/methods/wallet-request-execution-permissions.ts

@@ -68,7 +68,7 @@ export type ProcessRequestExecutionPermissionsHook = (
 
 export async function walletRequestExecutionPermissions(
   req: JsonRpcRequest,
-  res: PendingJsonRpcResponse<Json>,
+  res: PendingJsonRpcResponse,
   {
     processRequestExecutionPermissions,
   }: {

src/methods/wallet-revoke-execution-permission.test.ts

@@ -1,8 +1,4 @@
-import type {
-  Json,
-  JsonRpcRequest,
-  PendingJsonRpcResponse,
-} from '@metamask/utils';
+import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils';
 import { klona } from 'klona';
 
 import type {
@@ -22,7 +18,7 @@ const REQUEST_MOCK = {
 describe('wallet_revokeExecutionPermission', () => {
   let request: JsonRpcRequest<RevokeExecutionPermissionRequestParams>;
   let params: RevokeExecutionPermissionRequestParams;
-  let response: PendingJsonRpcResponse<Json>;
+  let response: PendingJsonRpcResponse;
   let processRevokeExecutionPermissionMock: jest.MockedFunction<ProcessRevokeExecutionPermissionHook>;
 
   async function callMethod() {
@@ -36,7 +32,7 @@ describe('wallet_revokeExecutionPermission', () => {
 
     request = klona(REQUEST_MOCK);
     params = request.params as RevokeExecutionPermissionRequestParams;
-    response = {} as PendingJsonRpcResponse<Json>;
+    response = {} as PendingJsonRpcResponse;
 
     processRevokeExecutionPermissionMock = jest.fn();
     processRevokeExecutionPermissionMock.mockResolvedValue({});

src/methods/wallet-revoke-execution-permission.ts

@@ -1,7 +1,6 @@
 import { rpcErrors } from '@metamask/rpc-errors';
 import type { Infer } from '@metamask/superstruct';
 import {
-  type Json,
   type JsonRpcRequest,
   object,
   type PendingJsonRpcResponse,
@@ -31,7 +30,7 @@ export type ProcessRevokeExecutionPermissionHook = (
 
 export async function walletRevokeExecutionPermission(
   req: JsonRpcRequest,
-  res: PendingJsonRpcResponse<Json>,
+  res: PendingJsonRpcResponse,
   {
     processRevokeExecutionPermission,
   }: {