Merge pull request #481 from lidofinance/develop

Merge develop to main
lidofinance · Sep 20, 2024 · 4a8275e · 4a8275e
2 parents 66c44aa + 725be9a
commit 4a8275e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 50 deletions.
diff --git a/pages/api/rpc.ts b/pages/api/rpc.ts
@@ -76,7 +76,7 @@ const rpc = rpcFactory({
   allowedCallAddresses,
   allowedLogsAddresses,
   maxBatchCount: config.PROVIDER_MAX_BATCH,
-  disallowEmptyAddressGetLogs: false,
+  disallowEmptyAddressGetLogs: true,
 });
 
 export default wrapNextRequest([

diff --git a/server.mjs b/server.mjs
@@ -46,9 +46,7 @@ app.prepare().then(() => {
     })
     .listen(port, () => {
       console.debug(`> Ready on http://${hostname}:${port}`);
-    })
-    // hanging socket timeout
-    .setTimeout(10_000);
+    });
   // prevents malicious client from slowly sending headers and rest of request
   server.headersTimeout = 10_000;
   server.requestTimeout = 30_000;

diff --git a/shared/hooks/use-balance.ts b/shared/hooks/use-balance.ts
@@ -135,7 +135,7 @@ export const useTokenTransferSubscription = () => {
     [queryClient, subscriptions],
   );
 
-  const shouldWatch = address && tokens.length > 0;
+  const shouldWatch = !!(address && tokens.length > 0);
 
   useWatchContractEvent({
     abi: Erc20EventsAbi,

diff --git a/utils/use-web3-transport.ts b/utils/use-web3-transport.ts
@@ -60,8 +60,13 @@ const runtimeMutableTransport = (
             if (
               requestParams.method === 'eth_getLogs' &&
               Array.isArray(requestParams?.params) &&
-              requestParams.params[0]?.address?.length < 0
+              // works for empty array, empty string and all falsish values
+              !requestParams.params[0]?.address?.length
             ) {
+              console.warn(
+                '[runtimeMutableTransport] Invalid empty getLogs',
+                requestParams,
+              );
               const error = new InvalidParamsRpcError(
                 new Error(`Empty address for eth_getLogs is not supported`),
               );

diff --git a/utilsApi/rpcFactory.ts b/utilsApi/rpcFactory.ts
@@ -1,4 +1,4 @@
-import { Readable, Transform } from 'node:stream';
+import { Readable } from 'node:stream';
 import { ReadableStream } from 'node:stream/web';
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { Counter, Registry } from 'prom-client';
@@ -38,28 +38,6 @@ export class SizeTooLargeError extends ClientError {
   }
 }
 
-const createSizeLogger = (MAX_SIZE: number) => {
-  let bytesWritten = 0;
-  const logSizeStream = new Transform({
-    transform(chunk, _encoding, callback) {
-      bytesWritten += chunk.length;
-      if (bytesWritten > MAX_SIZE) {
-        // Emit an error if size exceeds MAX_SIZE
-        return callback(
-          new SizeTooLargeError(
-            `Stream size exceeds the maximum limit of ${MAX_SIZE} bytes`,
-          ),
-        );
-      }
-      return callback(null, chunk); // Pass the chunk through
-    },
-    flush(callback) {
-      callback();
-    },
-  });
-  return logSizeStream;
-};
-
 export type RPCFactoryParams = {
   metrics: {
     prefix: string;
@@ -89,7 +67,6 @@ export const rpcFactory = ({
   allowedCallAddresses = {},
   allowedLogsAddresses = {},
   maxBatchCount,
-  maxResponseSize = 1_000_000, // ~1MB,
   disallowEmptyAddressGetLogs = false,
 }: RPCFactoryParams) => {
   const rpcRequestBlocked = new Counter({
@@ -214,26 +191,7 @@ export const rpcFactory = ({
         requested.headers.get('Content-Type') ?? 'application/json',
       );
       if (requested.body) {
-        const sizeLimit = createSizeLogger(maxResponseSize);
-        const readableStream = Readable.fromWeb(
-          requested.body as ReadableStream,
-        );
-        readableStream
-          .pipe(sizeLimit)
-          .on('error', (error) => {
-            if (error instanceof SizeTooLargeError) {
-              console.warn(
-                `[rpcFactory] RPC response too large: ${JSON.stringify(requests)}`,
-              );
-              // Payload Too Large
-              res.status(413).end();
-            } else {
-              res.statusCode = 500;
-              res.end(DEFAULT_API_ERROR_MESSAGE);
-            }
-            readableStream.destroy();
-          })
-          .pipe(res);
+        Readable.fromWeb(requested.body as ReadableStream).pipe(res);
       } else {
         res
           .status(requested.status)