fix: return 32-byte block hash from eth_getFilterChanges to ensure EVM compatibility

Signed-off-by: Javier Roman <[email protected]>

Author: romangzz

packages/relay/src/lib/services/ethService/ethFilterService/FilterService.ts

@@ -3,7 +3,7 @@
 import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
 import { Logger } from 'pino';
 
-import { generateRandomHex } from '../../../../formatters';
+import { generateRandomHex, toHash32 } from '../../../../formatters';
 import { MirrorNodeClient } from '../../../clients';
 import constants from '../../../constants';
 import { JsonRpcError, predefined } from '../../../errors/JsonRpcError';
@@ -278,7 +278,7 @@ export class FilterService implements IFilterService {
         : await this.common.getLatestBlockNumber(requestDetails),
     );
 
-    const result = blockResponse?.blocks?.map((r) => r.hash) || [];
+    const result = blockResponse?.blocks?.map((r) => toHash32(r.hash)) || [];
 
     return { result, latestBlockNumber };
   }

packages/relay/tests/lib/services/eth/filter.spec.ts

@@ -22,7 +22,6 @@ import {
   toHex,
   withOverriddenEnvsInMochaTest,
 } from '../../../helpers';
-import { generateEthTestEnv } from '../../eth/eth-helpers';
 
 const logger = pino({ level: 'silent' });
 const registry = new Registry();
@@ -542,9 +541,21 @@ describe('Filter API Test Suite', async function () {
         200,
         JSON.stringify({
           blocks: [
-            { ...defaultBlock, number: defaultBlock.number + 1, hash: '0x1' },
-            { ...defaultBlock, number: defaultBlock.number + 2, hash: '0x2' },
-            { ...defaultBlock, number: defaultBlock.number + 3, hash: '0x3' },
+            {
+              ...defaultBlock,
+              number: defaultBlock.number + 1,
+              hash: '0x10x1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c',
+            },
+            {
+              ...defaultBlock,
+              number: defaultBlock.number + 2,
+              hash: '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
+            },
+            {
+              ...defaultBlock,
+              number: defaultBlock.number + 3,
+              hash: '0xdeadbeefcafebabedeadbeefcafebabedeadbeefcafebabedeadbeefcafebabedeadbeefcafebabe',
+            },
           ],
         }),
       );
@@ -562,12 +573,14 @@ describe('Filter API Test Suite', async function () {
       );
 
       const result = await filterService.getFilterChanges(existingFilterId, requestDetails);
-
       expect(result).to.exist;
       expect(result.length).to.eq(3, 'returns correct number of blocks');
-      expect(result[0]).to.eq('0x1', 'result is in ascending order');
-      expect(result[1]).to.eq('0x2');
-      expect(result[2]).to.eq('0x3');
+      expect(result[0]).to.eq(
+        '0x10x1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f',
+        'result is in ascending order',
+      );
+      expect(result[1]).to.eq('0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789');
+      expect(result[2]).to.eq('0xdeadbeefcafebabedeadbeefcafebabedeadbeefcafebabedeadbeefcafebab');
 
       const secondResult = await filterService.getFilterChanges(existingFilterId, requestDetails);
       expect(secondResult).to.exist;

packages/server/tests/acceptance/rpc_batch3.spec.ts

@@ -1091,14 +1091,14 @@ describe('@api-batch-3 RPC Server Acceptance Tests', function () {
         expect(result.length).to.gt(0, 'returns the latest block hashes');
 
         result.forEach((hash: string) => {
-          expect(RelayAssertions.validateHash(hash, 96)).to.eq(true);
+          expect(RelayAssertions.validateHash(hash, 64)).to.eq(true);
         });
 
         await new Promise((r) => setTimeout(r, 2000));
         const result2 = await relay.call(RelayCalls.ETH_ENDPOINTS.ETH_GET_FILTER_CHANGES, [filterId], requestId);
         expect(result2).to.exist;
         expect(result2.length).to.be.greaterThanOrEqual(1);
-        expect(RelayAssertions.validateHash(result2[0], 96)).to.eq(true);
+        expect(RelayAssertions.validateHash(result2[0], 64)).to.eq(true);
       });
     });