Revert "Socket updates: on-demand contract verification fix, indexing event rename (blockscout#2629)"

This reverts commit a4fc2ac.

Author: carlomigueldy

lib/socket/types.ts

@@ -49,13 +49,13 @@ interface SocketMessageParamsGeneric<Event extends string | undefined, Payload e
 
 export namespace SocketMessage {
   export type NewBlock = SocketMessageParamsGeneric<'new_block', NewBlockSocketResponse>;
-  export type BlocksIndexStatus = SocketMessageParamsGeneric<'index_status', { finished: boolean; ratio: string }>;
-  export type InternalTxsIndexStatus = SocketMessageParamsGeneric<'index_status', { finished: boolean; ratio: string }>;
+  export type BlocksIndexStatus = SocketMessageParamsGeneric<'block_index_status', { finished: boolean; ratio: string }>;
+  export type InternalTxsIndexStatus = SocketMessageParamsGeneric<'internal_txs_index_status', { finished: boolean; ratio: string }>;
   export type TxStatusUpdate = SocketMessageParamsGeneric<'collated', NewBlockSocketResponse>;
   export type TxRawTrace = SocketMessageParamsGeneric<'raw_trace', RawTracesResponse>;
   export type NewTx = SocketMessageParamsGeneric<'transaction', { transaction: number }>;
   export type NewPendingTx = SocketMessageParamsGeneric<'pending_transaction', { pending_transaction: number }>;
-  export type NewOptimisticDeposits = SocketMessageParamsGeneric<'new_optimism_deposits', { deposits: number }>;
+  export type NewOptimisticDeposits = SocketMessageParamsGeneric<'deposits', { deposits: number }>;
   export type NewArbitrumDeposits = SocketMessageParamsGeneric<'new_messages_to_rollup_amount', { new_messages_to_rollup_amount: number }>;
   export type AddressBalance = SocketMessageParamsGeneric<'balance', { balance: string; block_number: number; exchange_rate: string }>;
   export type AddressCurrentCoinBalance =

lib/socket/useSocketChannel.tsx

@@ -3,7 +3,7 @@ import { useEffect, useRef, useState } from 'react';
 
 import { useSocket } from './context';
 
-const CHANNEL_REGISTRY: Record<string, { channel: Channel; subscribers: number }> = {};
+const CHANNEL_REGISTRY: Record<string, Channel> = {};
 
 interface Params {
   topic: string | undefined;
@@ -53,12 +53,11 @@ export default function useSocketChannel({ topic, params, isDisabled, onJoin, on
 
     let ch: Channel;
     if (CHANNEL_REGISTRY[topic]) {
-      ch = CHANNEL_REGISTRY[topic].channel;
-      CHANNEL_REGISTRY[topic].subscribers++;
+      ch = CHANNEL_REGISTRY[topic];
       onJoinRef.current?.(ch, '');
     } else {
       ch = socket.channel(topic);
-      CHANNEL_REGISTRY[topic] = { channel: ch, subscribers: 1 };
+      CHANNEL_REGISTRY[topic] = ch;
       ch.join()
         .receive('ok', (message) => onJoinRef.current?.(ch, message))
         .receive('error', () => {
@@ -69,14 +68,8 @@ export default function useSocketChannel({ topic, params, isDisabled, onJoin, on
     setChannel(ch);
 
     return () => {
-      if (CHANNEL_REGISTRY[topic]) {
-        CHANNEL_REGISTRY[topic].subscribers > 0 && CHANNEL_REGISTRY[topic].subscribers--;
-        if (CHANNEL_REGISTRY[topic].subscribers === 0) {
-          ch.leave();
-          delete CHANNEL_REGISTRY[topic];
-        }
-      }
-
+      ch.leave();
+      delete CHANNEL_REGISTRY[topic];
       setChannel(undefined);
     };
   }, [ socket, topic, params, isDisabled, onSocketError ]);

ui/address/contract/ContractDetails.pw.tsx

@@ -40,8 +40,7 @@ test.describe('full view', () => {
       },
     };
     const component = await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
-    const socket = await createSocket();
-    await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
+    await createSocket();
     await expect(component).toHaveScreenshot();
   });
 
@@ -52,8 +51,7 @@ test.describe('full view', () => {
       },
     };
     const component = await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
-    const socket = await createSocket();
-    await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
+    await createSocket();
     await expect(component).toHaveScreenshot();
   });
 
@@ -64,8 +62,7 @@ test.describe('full view', () => {
       },
     };
     const component = await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
-    const socket = await createSocket();
-    await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
+    await createSocket();
     await expect(component).toHaveScreenshot();
   });
 
@@ -76,8 +73,7 @@ test.describe('full view', () => {
       },
     };
     const component = await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
-    const socket = await createSocket();
-    await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
+    await createSocket();
     await expect(component).toHaveScreenshot();
   });
 });
@@ -89,8 +85,7 @@ test.describe('mobile view', () => {
     await mockApiResponse('contract', contractMock.withChangedByteCode, { pathParams: { hash: addressMock.contract.hash } });
     await mockApiResponse('contract', contractMock.withChangedByteCode, { pathParams: { hash: addressMock.contract.implementations?.[0].address as string } });
     const component = await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
-    const socket = await createSocket();
-    await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
+    await createSocket();
     await expect(component).toHaveScreenshot();
   });
 });
@@ -100,19 +95,17 @@ test('verified via lookup in eth_bytecode_db', async({ render, mockApiResponse,
   await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
 
   const socket = await createSocket();
-  const channel = await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
+  const channel = await socketServer.joinChannel(socket, 'addresses:' + addressMock.contract.hash.toLowerCase());
   await page.waitForResponse(contractApiUrl);
   socketServer.sendMessage(socket, channel, 'smart_contract_was_verified', {});
   const request = await page.waitForRequest(addressApiUrl);
 
   expect(request).toBeTruthy();
 });
 
-test('verified with multiple sources', async({ render, page, mockApiResponse, createSocket }) => {
+test('verified with multiple sources', async({ render, page, mockApiResponse }) => {
   await mockApiResponse('contract', contractMock.withMultiplePaths, { pathParams: { hash: addressMock.contract.hash } });
   await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
-  const socket = await createSocket();
-  await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
 
   const section = page.locator('section', { hasText: 'Contract source code' });
   await expect(section).toHaveScreenshot();
@@ -124,27 +117,23 @@ test('verified with multiple sources', async({ render, page, mockApiResponse, cr
   await expect(section).toHaveScreenshot();
 });
 
-test('self destructed', async({ render, mockApiResponse, page, createSocket }) => {
+test('self destructed', async({ render, mockApiResponse, page }) => {
   const hooksConfig = {
     router: {
       query: { hash: addressMock.contract.hash, tab: 'contract_bytecode' },
     },
   };
   await mockApiResponse('contract', contractMock.selfDestructed, { pathParams: { hash: addressMock.contract.hash } });
   await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
-  const socket = await createSocket();
-  await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
 
   const section = page.locator('section', { hasText: 'Contract creation code' });
   await expect(section).toHaveScreenshot();
 });
 
-test('non verified', async({ render, mockApiResponse, createSocket }) => {
+test('non verified', async({ render, mockApiResponse }) => {
   await mockApiResponse('address', { ...addressMock.contract, name: null }, { pathParams: { hash: addressMock.contract.hash } });
   await mockApiResponse('contract', contractMock.nonVerified, { pathParams: { hash: addressMock.contract.hash } });
   const component = await render(<ContractDetails/>, { hooksConfig }, { withSocket: true });
-  const socket = await createSocket();
-  await socketServer.joinChannel(socket, `addresses:${ addressMock.contract.hash.toLowerCase() }`);
 
   await expect(component).toHaveScreenshot();
 });

ui/address/contract/ContractDetails.tsx

@@ -57,7 +57,7 @@ const ContractDetails = ({ addressHash, channel, mainContractQuery }: Props) =>
   const contractQuery = useApiQuery('contract', {
     pathParams: { hash: selectedItem?.address },
     queryOptions: {
-      enabled: Boolean(selectedItem?.address && !mainContractQuery.isPlaceholderData),
+      enabled: Boolean(selectedItem?.address),
       refetchOnMount: false,
       placeholderData: addressInfo?.is_verified ? stubs.CONTRACT_CODE_VERIFIED : stubs.CONTRACT_CODE_UNVERIFIED,
     },

ui/home/latestDeposits/LatestOptimisticDeposits.tsx

@@ -37,15 +37,15 @@ const LatestOptimisticDeposits = () => {
   }, [ setNum ]);
 
   const channel = useSocketChannel({
-    topic: 'optimism:new_deposits',
+    topic: 'optimism_deposits:new_deposits',
     onSocketClose: handleSocketClose,
     onSocketError: handleSocketError,
     isDisabled: false,
   });
 
   useSocketMessage({
     channel,
-    event: 'new_optimism_deposits',
+    event: 'deposits',
     handler: handleNewDepositMessage,
   });
 

ui/snippets/footer/IntTxsIndexingStatus.tsx

@@ -39,7 +39,7 @@ const IntTxsIndexingStatus = () => {
 
   useSocketMessage({
     channel: internalTxsIndexingChannel,
-    event: 'index_status',
+    event: 'internal_txs_index_status',
     handler: handleInternalTxsIndexStatus,
   });
 

ui/snippets/header/alerts/IndexingBlocksAlert.tsx

@@ -51,7 +51,7 @@ const IndexingBlocksAlert = () => {
 
   useSocketMessage({
     channel: blockIndexingChannel,
-    event: 'index_status',
+    event: 'block_index_status',
     handler: handleBlocksIndexStatus,
   });