Update size

Author: OGPoyraz

packages/eth-json-rpc-middleware/src/utils/validation.test.ts

@@ -350,7 +350,7 @@ describe('Validation Utils', () => {
           to: VALID_TO,
           extraKey: 'unexpected',
         }),
-      ).toThrow(/Invalid params/u);
+      ).toThrow('Invalid input.');
     });
 
     it('throws for the incident repro payload (deeply-nested junk field)', () => {
@@ -367,7 +367,37 @@ describe('Validation Utils', () => {
           data: '0x095ea7b3',
           test: junk,
         }),
-      ).toThrow(/Invalid params|Invalid input/u);
+      ).toThrow('Invalid input.');
+    });
+
+    it('rejects an extraneous top-level key without walking its value (no JSON.stringify, no Superstruct)', () => {
+      const stringifySpy = jest.spyOn(JSON, 'stringify');
+      validateMock.mockClear();
+
+      const params = {
+        from: VALID_FROM,
+        to: VALID_TO,
+        test: {
+          get b(): never {
+            throw new Error('subtree must not be walked');
+          },
+        },
+      };
+
+      let thrown: unknown;
+      try {
+        validateTransactionParams(params);
+      } catch (error) {
+        thrown = error;
+      }
+      const stringifyCallsAtRejection = stringifySpy.mock.calls.length;
+      const validateCallsAtRejection = validateMock.mock.calls.length;
+      stringifySpy.mockRestore();
+
+      expect(thrown).toBeInstanceOf(Error);
+      expect((thrown as Error).message).toBe('Invalid input.');
+      expect(stringifyCallsAtRejection).toBe(0);
+      expect(validateCallsAtRejection).toBe(0);
     });
 
     it('throws when a typed field has the wrong type', () => {

packages/eth-json-rpc-middleware/src/utils/validation.ts

@@ -267,31 +267,60 @@ export const TransactionParamsStruct = object({
   value: optional(StrictHexStruct),
 });
 
+const ALLOWED_TRANSACTION_PARAM_KEYS = new Set<string>(
+  Object.keys(TransactionParamsStruct.schema as Record<string, unknown>),
+);
+
 export const MAX_TRANSACTION_PARAMS_SIZE_BYTES = 128 * 1024;
 
 /**
  * Validates `eth_sendTransaction` / `eth_signTransaction` params against the
  * standard transaction schema and rejects payloads whose serialized size
  * exceeds `MAX_TRANSACTION_PARAMS_SIZE_BYTES`.
  *
- * Guards against two attack shapes:
- * 1. Structural: extraneous top-level keys or ill-typed nested values
- *    (e.g. `{ from, to, data, test: { b: { b: ... } } }`) that would crash
- *    downstream normalization / PPOM WASM with `RangeError: Maximum call
- *    stack size exceeded`, silently bypassing security checks.
- * 2. Size: valid-shaped but oversized payloads (e.g. `data` padded with
- *    millions of hex zeros, or `accessList` with millions of entries) that
- *    exhaust memory / stack in the same downstream code.
+ * Checks run in this order to guarantee we never recurse into hostile
+ * subtrees:
+ *
+ * 1. Top-level shape: params must be a plain object whose top-level keys
+ *    are all in the schema. Runs in O(top-level-keys) without visiting
+ *    nested values, so a deeply-nested subtree under an extraneous key
+ *    (e.g. `{ from, to, test: { b: { b: ... × 1200 } } }`) is rejected
+ *    before any recursive walk can `RangeError`.
+ * 2. Serialized size: `JSON.stringify(params).length` must be
+ *    `<= MAX_TRANSACTION_PARAMS_SIZE_BYTES`. Safe to walk at this point
+ *    because step 1 guarantees the only nested values live under
+ *    schema-declared fields (`accessList`, `authorizationList`) which are
+ *    shallow arrays of flat objects.
+ * 3. Full schema validation: per-field types (hex strings, addresses,
+ *    `accessList` / `authorizationList` entry shapes).
+ *
+ * Together these guard against:
+ * - Structural attacks: extraneous top-level keys or ill-typed nested
+ *   values that would crash downstream normalization / PPOM WASM with
+ *   `RangeError: Maximum call stack size exceeded`, silently bypassing
+ *   security checks.
+ * - Size attacks: valid-shaped but oversized payloads (e.g. `data` padded
+ *   with millions of hex zeros) that exhaust memory / stack in the same
+ *   downstream code.
  *
  * @param params - The transaction params object supplied by the dapp.
- * @throws rpcErrors.invalidInput() if params does not match the schema or
- * exceeds the size limit.
+ * @throws rpcErrors.invalidInput() if params is not a plain object,
+ * contains an extraneous top-level key, or exceeds the size limit.
  * @throws rpcErrors.invalidParams() with a Superstruct failure summary if
  * the schema mismatch is on a typed field.
  */
 export function validateTransactionParams(params: unknown): void {
-  const serializedSize = JSON.stringify(params ?? null).length;
-  if (serializedSize > MAX_TRANSACTION_PARAMS_SIZE_BYTES) {
+  if (params === null || typeof params !== 'object' || Array.isArray(params)) {
+    throw rpcErrors.invalidInput();
+  }
+
+  for (const key of Object.keys(params)) {
+    if (!ALLOWED_TRANSACTION_PARAM_KEYS.has(key)) {
+      throw rpcErrors.invalidInput();
+    }
+  }
+
+  if (JSON.stringify(params).length > MAX_TRANSACTION_PARAMS_SIZE_BYTES) {
     throw rpcErrors.invalidInput();
   }
 

packages/eth-json-rpc-middleware/src/wallet.test.ts

@@ -171,7 +171,7 @@ describe('wallet', () => {
 
       await expect(
         engine.handle(...createHandleParams(payload)),
-      ).rejects.toThrow(/Invalid params/u);
+      ).rejects.toThrow('Invalid input.');
     });
 
     it('throws for the incident repro payload with deeply-nested junk', async () => {
@@ -204,7 +204,7 @@ describe('wallet', () => {
 
       await expect(
         engine.handle(...createHandleParams(payload)),
-      ).rejects.toThrow(/Invalid params|Invalid input/u);
+      ).rejects.toThrow('Invalid input.');
     });
 
     it('should not override other request params', async () => {
@@ -365,7 +365,7 @@ describe('wallet', () => {
 
       await expect(
         engine.handle(...createHandleParams(payload)),
-      ).rejects.toThrow(/Invalid params/u);
+      ).rejects.toThrow('Invalid input.');
     });
 
     it('throws for the incident repro payload with deeply-nested junk', async () => {
@@ -398,7 +398,7 @@ describe('wallet', () => {
 
       await expect(
         engine.handle(...createHandleParams(payload)),
-      ).rejects.toThrow(/Invalid params|Invalid input/u);
+      ).rejects.toThrow('Invalid input.');
     });
   });