topic filter

Author: kumaryash90

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/page.tsx

@@ -2,7 +2,6 @@ import { fetchPublishedContractsFromDeploy } from "components/contract-component
 import { notFound } from "next/navigation";
 import {
   type ContractOptions,
-  eth_blockNumber,
   eth_getTransactionByHash,
   eth_getTransactionReceipt,
   getContractEvents,
@@ -111,16 +110,15 @@ export default async function Page(props: {
   let creationBlockNumber: bigint | undefined;
 
   if (twCloneFactoryContract) {
-    const latestBlockNumber = await eth_blockNumber(
-      getRpcClient({
-        client: contract.client,
-        chain: contract.chain,
-      }),
-    );
     const events = await getContractEvents({
       contract: twCloneFactoryContract,
       events: [ProxyDeployedEvent],
-      blockRange: latestBlockNumber < 100000n ? latestBlockNumber : 100000n,
+      insightTopicFilters: [
+        {
+          topic: params.contractAddress as `0x${string}`,
+          index: 2,
+        },
+      ],
     });
     const event = events.find(
       (e) =>

packages/thirdweb/src/event/actions/get-events.ts

@@ -57,8 +57,14 @@ export type GetContractEventsResult<
 
 export type GetLogsParamsExtra = {
   signature?: string;
+  insightTopicFilters?: InsightTopicFilter[];
 } & GetLogsParams;
 
+export type InsightTopicFilter = {
+  topic: Hex;
+  index: 1 | 2 | 3;
+};
+
 /**
  * Retrieves events from a contract based on the provided options.
  * @param options - The options for retrieving events.
@@ -114,7 +120,9 @@ export async function getContractEvents<
   >[],
   const TStrict extends boolean = true,
 >(
-  options: GetContractEventsOptions<abi, abiEvents, TStrict>,
+  options: GetContractEventsOptions<abi, abiEvents, TStrict> & {
+    insightTopicFilters?: InsightTopicFilter[];
+  },
 ): Promise<GetContractEventsResult<abiEvents, TStrict>> {
   const { contract, events, blockRange, ...restParams } = options;
 
@@ -182,6 +190,7 @@ export async function getContractEvents<
           address: getAddress(contract.address),
           topics: e.topics,
           signature: `${e?.abiEvent.name}(${e?.abiEvent.inputs.map((i) => i.type).join(",")})`,
+          insightTopicFilters: options.insightTopicFilters,
         }))
       : // otherwise we want "all" events (aka not pass any topics at all)
         [{ ...restParams, address: getAddress(contract.address) }];
@@ -220,8 +229,9 @@ async function getLogsFromInsight(options: {
   chain: Chain;
   client: ThirdwebClient;
   signature?: string;
+  insightTopicFilters?: InsightTopicFilter[];
 }): Promise<Log[]> {
-  const { params, chain, client } = options;
+  const { params, chain, client, signature, insightTopicFilters } = options;
 
   const chainServices = await getChainServices(chain);
   const insightEnabled = chainServices.some(
@@ -237,8 +247,8 @@ async function getLogsFromInsight(options: {
     let path = "";
     if (params.address) {
       path += `/${params.address}`;
-      if (params.signature) {
-        path += `/${params.signature}`;
+      if (signature) {
+        path += `/${signature}`;
       }
     }
     const url = new URL(path, baseUrl);
@@ -267,6 +277,15 @@ async function getLogsFromInsight(options: {
       }
     }
 
+    if (insightTopicFilters) {
+      for (const topicFilter of insightTopicFilters) {
+        url.searchParams.set(
+          `filter_topic_${topicFilter.index}`,
+          topicFilter.topic,
+        );
+      }
+    }
+
     const clientFetch = getClientFetch(client);
     const result = await clientFetch(url.toString());
     const fetchedEventData = (await result.json()) as {