envio 3.3.0-alpha.8 → 3.3.0-rc.0

package/src/sources/HyperSyncSource.res

@@ -1,134 +1,5 @@
 open Source
 
-type selectionConfig = {
-  getLogSelectionOrThrow: (
-    ~addressesByContractName: dict<array<Address.t>>,
-  ) => array<LogSelection.t>,
-  fieldSelection: HyperSyncClient.QueryTypes.fieldSelection,
-}
-
-let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
-  let capitalizedBlockFields = Utils.Set.make()
-  let capitalizedTransactionFields = Utils.Set.make()
-
-  let staticTopicSelectionsByContract = Dict.make()
-  let dynamicEventFiltersByContract = Dict.make()
-  let dynamicWildcardEventFiltersByContract = Dict.make()
-  let noAddressesTopicSelections = []
-  let contractNames = Utils.Set.make()
-
-  selection.onEventRegistrations
-  ->(Utils.magic: array<Internal.onEventRegistration> => array<Internal.evmOnEventRegistration>)
-  ->Array.forEach(reg => {
-    let eventConfig =
-      reg.eventConfig->(Utils.magic: Internal.eventConfig => Internal.evmEventConfig)
-    let contractName = eventConfig.contractName
-    let {selectedBlockFields, selectedTransactionFields} = eventConfig
-    let {dependsOnAddresses, getEventFiltersOrThrow, isWildcard} = reg
-    selectedBlockFields
-    ->Utils.Set.toArray
-    ->Array.forEach(name =>
-      capitalizedBlockFields
-      ->Utils.Set.add((name :> string)->Utils.String.capitalize)
-      ->ignore
-    )
-    selectedTransactionFields
-    ->Utils.Set.toArray
-    ->Array.forEach(name => {
-      // transactionIndex is read off the log (the store key), so it never needs
-      // to be requested as a transaction column — and requesting it alone would
-      // pull the whole transaction table for nothing.
-      let fieldName = (name :> string)
-      if fieldName != "transactionIndex" {
-        capitalizedTransactionFields->Utils.Set.add(fieldName->Utils.String.capitalize)->ignore
-      }
-    })
-
-    let eventFilters = getEventFiltersOrThrow(chain)
-    if dependsOnAddresses {
-      let _ = contractNames->Utils.Set.add(contractName)
-      switch eventFilters {
-      | Static(topicSelections) =>
-        staticTopicSelectionsByContract->Utils.Dict.pushMany(contractName, topicSelections)
-      | Dynamic(fn) =>
-        (
-          isWildcard ? dynamicWildcardEventFiltersByContract : dynamicEventFiltersByContract
-        )->Utils.Dict.push(contractName, fn)
-      }
-    } else {
-      noAddressesTopicSelections
-      ->Array.pushMany(
-        switch eventFilters {
-        | Static(s) => s
-        | Dynamic(fn) => fn([])
-        },
-      )
-      ->ignore
-    }
-  })
-
-  let fieldSelection: HyperSyncClient.QueryTypes.fieldSelection = {
-    log: [Address, Data, LogIndex, Topic0, Topic1, Topic2, Topic3],
-    block: capitalizedBlockFields
-    ->Utils.Set.toArray
-    ->(Utils.magic: array<string> => array<HyperSyncClient.QueryTypes.blockField>),
-    transaction: capitalizedTransactionFields
-    ->Utils.Set.toArray
-    ->(Utils.magic: array<string> => array<HyperSyncClient.QueryTypes.transactionField>),
-  }
-
-  let noAddressesLogSelection = LogSelection.make(
-    ~addresses=[],
-    ~topicSelections=noAddressesTopicSelections,
-  )
-
-  let getLogSelectionOrThrow = (~addressesByContractName): array<LogSelection.t> => {
-    let logSelections = []
-    if noAddressesLogSelection.topicSelections->Utils.Array.isEmpty->not {
-      logSelections->Array.push(noAddressesLogSelection)
-    }
-    contractNames->Utils.Set.forEach(contractName => {
-      switch addressesByContractName->Utils.Dict.dangerouslyGetNonOption(contractName) {
-      | None
-      | Some([]) => ()
-      | Some(addresses) =>
-        switch staticTopicSelectionsByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
-        | None => ()
-        | Some(topicSelections) =>
-          logSelections->Array.push(LogSelection.make(~addresses, ~topicSelections))
-        }
-        switch dynamicEventFiltersByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
-        | None => ()
-        | Some(fns) =>
-          logSelections->Array.push(
-            LogSelection.make(~addresses, ~topicSelections=fns->Array.flatMap(fn => fn(addresses))),
-          )
-        }
-        switch dynamicWildcardEventFiltersByContract->Utils.Dict.dangerouslyGetNonOption(
-          contractName,
-        ) {
-        | None => ()
-        | Some(fns) =>
-          logSelections->Array.push(
-            LogSelection.make(
-              ~addresses=[],
-              ~topicSelections=fns->Array.flatMap(fn => fn(addresses)),
-            ),
-          )
-        }
-      }
-    })
-    logSelections
-  }
-
-  {
-    getLogSelectionOrThrow,
-    fieldSelection,
-  }
-}
-
-let memoGetSelectionConfig = (~chain) =>
-  Utils.WeakMap.memoize(selection => selection->getSelectionConfig(~chain))
 
 // Surfaced by HyperSyncClient.getHeight (Rust) when HyperSync rejects the API
 // token. The corrupted-token test feeds the real server error through this
@@ -138,8 +9,8 @@ let isUnauthorizedError = (message: string) => message->String.includes("401 Una
 type options = {
   chain: ChainMap.Chain.t,
   endpointUrl: string,
-  allEventParams: array<HyperSyncClient.Decoder.eventParamsInput>,
-  eventRouter: EventRouter.t<Internal.evmOnEventRegistration>,
+  // The chain's registrations, indexed by their sequential `index`.
+  onEventRegistrations: array<Internal.evmOnEventRegistration>,
   apiToken: option<string>,
   clientTimeoutMillis: int,
   lowercaseAddresses: bool,
@@ -152,8 +23,7 @@ let make = (
   {
     chain,
     endpointUrl,
-    allEventParams,
-    eventRouter,
+    onEventRegistrations,
     apiToken,
     clientTimeoutMillis,
     lowercaseAddresses,
@@ -164,8 +34,6 @@ let make = (
 ): t => {
   let name = "HyperSync"
 
-  let getSelectionConfig = memoGetSelectionConfig(~chain)
-
   let apiToken = switch apiToken {
   | Some(token) => token
   | None =>
@@ -178,7 +46,9 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     ~url=endpointUrl,
     ~apiToken,
     ~httpReqTimeoutMillis=clientTimeoutMillis,
-    ~eventParams=allEventParams,
+    ~eventRegistrations=HyperSyncClient.Registration.fromOnEventRegistrations(
+      onEventRegistrations,
+    ),
     ~enableChecksumAddresses=!lowercaseAddresses,
     ~serializationFormat,
     ~enableQueryCaching,
@@ -191,15 +61,11 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     )
   }
 
-  exception UndefinedValue
-
   let makeEventBatchQueueItem = (
     item: HyperSyncClient.EventItems.item,
-    ~params: Internal.eventParams,
     ~onEventRegistration: Internal.evmOnEventRegistration,
   ): Internal.item => {
     let {transactionIndex, logIndex, srcAddress} = item
-    let chainId = chain->ChainMap.Chain.toChainId
 
     Internal.Event({
       onEventRegistration: (onEventRegistration :> Internal.onEventRegistration),
@@ -212,8 +78,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       payload: {
         contractName: onEventRegistration.eventConfig.contractName,
         eventName: onEventRegistration.eventConfig.name,
-        chainId,
-        params,
+        chainId: chain->ChainMap.Chain.toChainId,
+        params: item.params,
         srcAddress,
         logIndex,
       }->Evm.fromPayload,
@@ -224,23 +90,16 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     ~fromBlock,
     ~toBlock,
     ~addressesByContractName,
-    ~contractNameByAddress,
+    ~contractNameByAddress as _,
     ~knownHeight,
     ~partitionId as _,
-    ~selection,
+    ~selection: FetchState.selection,
     ~itemsTarget,
     ~retry,
-    ~logger,
+    ~logger as _,
   ) => {
     let totalTimeRef = Performance.now()
 
-    let selectionConfig = selection->getSelectionConfig
-
-    let logSelections = try selectionConfig.getLogSelectionOrThrow(~addressesByContractName) catch {
-    | exn =>
-      exn->ErrorHandling.mkLogAndRaise(~logger, ~msg="Failed getting log selection for the query")
-    }
-
     let startFetchingBatchTimeRef = Performance.now()
 
     //fetch batch
@@ -248,9 +107,9 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       ~client,
       ~fromBlock,
       ~toBlock,
-      ~logSelections,
-      ~fieldSelection=selectionConfig.fieldSelection,
       ~maxNumLogs=itemsTarget,
+      ~registrationIndexes=selection.onEventRegistrations->Array.map(reg => reg.index),
+      ~addressesByContractName,
     ) catch {
     | HyperSync.GetLogs.Error(error) =>
       throw(
@@ -320,63 +179,12 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     })
     let getBlock = blockNumber => blocksByNumber->Utils.Map.unsafeGet(blockNumber)
 
-    let handleDecodeFailure = (
-      ~onEventRegistration: Internal.evmOnEventRegistration,
-      ~logIndex,
-      ~blockNumber,
-      ~chainId,
-      ~exn,
-    ) => {
-      if !onEventRegistration.isWildcard {
-        //Wildcard events can be parsed as undefined if the number of topics
-        //don't match the event with the given topic0
-        //Non wildcard events should be expected to be parsed
-        let msg = `Event ${onEventRegistration.eventConfig.name} was unexpectedly parsed as undefined`
-        let logger = Logging.createChildFrom(
-          ~logger,
-          ~params={
-            "chainId": chainId,
-            "blockNumber": blockNumber,
-            "logIndex": logIndex,
-            "decoder": "hypersync-client",
-          },
-        )
-        exn->ErrorHandling.mkLogAndRaise(~msg, ~logger)
-      }
-    }
-
     pageUnsafe.items->Array.forEach(item => {
-      let chainId = chain->ChainMap.Chain.toChainId
-      let maybeEventConfig =
-        eventRouter->EventRouter.get(
-          ~tag=EventRouter.getEvmEventId(
-            ~sighash=item.topic0->EvmTypes.Hex.toString,
-            ~topicCount=item.topicCount,
-          ),
-          ~contractNameByAddress,
-          ~contractAddress=item.srcAddress,
-        )
-
-      switch maybeEventConfig {
-      | None => () //ignore events that aren't registered
-      | Some(onEventRegistration) =>
-        switch item.params
-        ->Nullable.toOption
-        ->Option.flatMap(Dict.get(_, onEventRegistration.eventConfig.contractName)) {
-        | Some(params) =>
-          parsedQueueItems
-          ->Array.push(makeEventBatchQueueItem(item, ~params, ~onEventRegistration))
-          ->ignore
-        | None =>
-          handleDecodeFailure(
-            ~onEventRegistration,
-            ~logIndex=item.logIndex,
-            ~blockNumber=item.blockNumber,
-            ~chainId,
-            ~exn=UndefinedValue,
-          )
-        }
-      }
+      let onEventRegistration =
+        onEventRegistrations->Array.getUnsafe(item.onEventRegistrationIndex)
+      parsedQueueItems
+      ->Array.push(makeEventBatchQueueItem(item, ~onEventRegistration))
+      ->ignore
     })
 
     let parsingTimeElapsed = parsingTimeRef->Performance.secondsSince

package/src/sources/HyperSyncSource.res.mjs

@@ -1,12 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Utils from "../Utils.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as HyperSync from "./HyperSync.res.mjs";
-import * as EventRouter from "./EventRouter.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
-import * as LogSelection from "../LogSelection.res.mjs";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -16,118 +13,27 @@ import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as HyperSyncHeightStream from "./HyperSyncHeightStream.res.mjs";
 
-function getSelectionConfig(selection, chain) {
-  let capitalizedBlockFields = new Set();
-  let capitalizedTransactionFields = new Set();
-  let staticTopicSelectionsByContract = {};
-  let dynamicEventFiltersByContract = {};
-  let dynamicWildcardEventFiltersByContract = {};
-  let noAddressesTopicSelections = [];
-  let contractNames = new Set();
-  selection.onEventRegistrations.forEach(reg => {
-    let eventConfig = reg.eventConfig;
-    let contractName = eventConfig.contractName;
-    Array.from(eventConfig.selectedBlockFields).forEach(name => {
-      capitalizedBlockFields.add(Utils.$$String.capitalize(name));
-    });
-    Array.from(eventConfig.selectedTransactionFields).forEach(name => {
-      if (name !== "transactionIndex") {
-        capitalizedTransactionFields.add(Utils.$$String.capitalize(name));
-        return;
-      }
-    });
-    let eventFilters = reg.getEventFiltersOrThrow(chain);
-    if (reg.dependsOnAddresses) {
-      contractNames.add(contractName);
-      if (eventFilters.TAG === "Static") {
-        return Utils.Dict.pushMany(staticTopicSelectionsByContract, contractName, eventFilters._0);
-      } else {
-        return Utils.Dict.push(reg.isWildcard ? dynamicWildcardEventFiltersByContract : dynamicEventFiltersByContract, contractName, eventFilters._0);
-      }
-    }
-    let tmp;
-    tmp = eventFilters.TAG === "Static" ? eventFilters._0 : eventFilters._0([]);
-    noAddressesTopicSelections.push(...tmp);
-  });
-  let fieldSelection_block = Array.from(capitalizedBlockFields);
-  let fieldSelection_transaction = Array.from(capitalizedTransactionFields);
-  let fieldSelection_log = [
-    "Address",
-    "Data",
-    "LogIndex",
-    "Topic0",
-    "Topic1",
-    "Topic2",
-    "Topic3"
-  ];
-  let fieldSelection = {
-    block: fieldSelection_block,
-    transaction: fieldSelection_transaction,
-    log: fieldSelection_log
-  };
-  let noAddressesLogSelection = LogSelection.make([], noAddressesTopicSelections);
-  let getLogSelectionOrThrow = addressesByContractName => {
-    let logSelections = [];
-    if (!Utils.$$Array.isEmpty(noAddressesLogSelection.topicSelections)) {
-      logSelections.push(noAddressesLogSelection);
-    }
-    contractNames.forEach(contractName => {
-      let addresses = addressesByContractName[contractName];
-      if (addresses === undefined) {
-        return;
-      }
-      if (addresses.length === 0) {
-        return;
-      }
-      let topicSelections = staticTopicSelectionsByContract[contractName];
-      if (topicSelections !== undefined) {
-        logSelections.push(LogSelection.make(addresses, topicSelections));
-      }
-      let fns = dynamicEventFiltersByContract[contractName];
-      if (fns !== undefined) {
-        logSelections.push(LogSelection.make(addresses, fns.flatMap(fn => fn(addresses))));
-      }
-      let fns$1 = dynamicWildcardEventFiltersByContract[contractName];
-      if (fns$1 !== undefined) {
-        logSelections.push(LogSelection.make([], fns$1.flatMap(fn => fn(addresses))));
-        return;
-      }
-    });
-    return logSelections;
-  };
-  return {
-    getLogSelectionOrThrow: getLogSelectionOrThrow,
-    fieldSelection: fieldSelection
-  };
-}
-
-function memoGetSelectionConfig(chain) {
-  return Utils.$$WeakMap.memoize(selection => getSelectionConfig(selection, chain));
-}
-
 function isUnauthorizedError(message) {
   return message.includes("401 Unauthorized");
 }
 
 function make(param) {
   let apiToken = param.apiToken;
-  let eventRouter = param.eventRouter;
+  let onEventRegistrations = param.onEventRegistrations;
   let endpointUrl = param.endpointUrl;
   let chain = param.chain;
   let name = "HyperSync";
-  let getSelectionConfig = memoGetSelectionConfig(chain);
   let apiToken$1 = apiToken !== undefined ? apiToken : Stdlib_JsError.throwWithMessage(`An Envio API token is required for using HyperSync as a data-source.
 Set the ENVIO_API_TOKEN environment variable in your .env file.
 Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
   let client;
   try {
-    client = HyperSyncClient.make(endpointUrl, apiToken$1, param.clientTimeoutMillis, param.allEventParams, !param.lowercaseAddresses, param.serializationFormat, param.enableQueryCaching, undefined, undefined, undefined, param.logLevel);
+    client = HyperSyncClient.make(endpointUrl, apiToken$1, param.clientTimeoutMillis, HyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations), !param.lowercaseAddresses, param.serializationFormat, param.enableQueryCaching, undefined, undefined, undefined, param.logLevel);
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
     client = ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate the hypersync client, please double check your ABI", exn);
   }
-  let UndefinedValue = /* @__PURE__ */Primitive_exceptions.create("UndefinedValue");
-  let makeEventBatchQueueItem = (item, params, onEventRegistration) => {
+  let makeEventBatchQueueItem = (item, onEventRegistration) => {
     let logIndex = item.logIndex;
     return {
       kind: 0,
@@ -139,27 +45,19 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       payload: {
         contractName: onEventRegistration.eventConfig.contractName,
         eventName: onEventRegistration.eventConfig.name,
-        params: params,
+        params: item.params,
         chainId: chain,
         srcAddress: item.srcAddress,
         logIndex: logIndex
       }
     };
   };
-  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, contractNameByAddress, knownHeight, param, selection, itemsTarget, retry, logger) => {
+  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, param, knownHeight, param$1, selection, itemsTarget, retry, param$2) => {
     let totalTimeRef = Performance.now();
-    let selectionConfig = getSelectionConfig(selection);
-    let logSelections;
-    try {
-      logSelections = selectionConfig.getLogSelectionOrThrow(addressesByContractName);
-    } catch (raw_exn) {
-      let exn = Primitive_exceptions.internalToException(raw_exn);
-      logSelections = ErrorHandling.mkLogAndRaise(logger, "Failed getting log selection for the query", exn);
-    }
     let startFetchingBatchTimeRef = Performance.now();
     let pageUnsafe;
     try {
-      pageUnsafe = await HyperSync.GetLogs.query(client, fromBlock, toBlock, logSelections, selectionConfig.fieldSelection, itemsTarget);
+      pageUnsafe = await HyperSync.GetLogs.query(client, fromBlock, toBlock, itemsTarget, selection.onEventRegistrations.map(reg => reg.index), addressesByContractName);
     } catch (raw_error) {
       let error = Primitive_exceptions.internalToException(raw_error);
       if (error.RE_EXN_ID === HyperSync.GetLogs.$$Error) {
@@ -221,32 +119,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       blocksByNumber.set(block.number, block);
     });
     pageUnsafe.items.forEach(item => {
-      let maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(item.topic0, item.topicCount), item.srcAddress, contractNameByAddress);
-      if (maybeEventConfig === undefined) {
-        return;
-      }
-      let params = Stdlib_Option.flatMap(Primitive_option.fromNullable(item.params), __x => __x[maybeEventConfig.eventConfig.contractName]);
-      if (params !== undefined) {
-        parsedQueueItems.push(makeEventBatchQueueItem(item, Primitive_option.valFromOption(params), maybeEventConfig));
-        return;
-      } else {
-        let logIndex = item.logIndex;
-        let blockNumber = item.blockNumber;
-        let exn = {
-          RE_EXN_ID: UndefinedValue
-        };
-        if (maybeEventConfig.isWildcard) {
-          return;
-        }
-        let msg = `Event ` + maybeEventConfig.eventConfig.name + ` was unexpectedly parsed as undefined`;
-        let logger$1 = Logging.createChildFrom(logger, {
-          chainId: chain,
-          blockNumber: blockNumber,
-          logIndex: logIndex,
-          decoder: "hypersync-client"
-        });
-        return ErrorHandling.mkLogAndRaise(logger$1, msg, exn);
-      }
+      let onEventRegistration = onEventRegistrations[item.onEventRegistrationIndex];
+      parsedQueueItems.push(makeEventBatchQueueItem(item, onEventRegistration));
     });
     let parsingTimeElapsed = Performance.secondsSince(parsingTimeRef);
     let blockHashes = [];
@@ -355,9 +229,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
 }
 
 export {
-  getSelectionConfig,
-  memoGetSelectionConfig,
   isUnauthorizedError,
   make,
 }
-/* Utils Not a pure module */
+/* Logging Not a pure module */

package/src/sources/Rpc.res

@@ -82,38 +82,6 @@ let decimalFloatSchema: S.schema<float> = S.string->S.transform(s => {
 })
 
 module GetLogs = {
-  @unboxed
-  type topicFilter = Single(hex) | Multiple(array<hex>) | @as(null) Null
-  type topicQuery = array<topicFilter>
-
-  let makeTopicQuery = (~topic0=[], ~topic1=[], ~topic2=[], ~topic3=[]) => {
-    let topics = [topic0, topic1, topic2, topic3]
-
-    let isLastTopicEmpty = () =>
-      switch topics->Utils.Array.last {
-      | Some([]) => true
-      | _ => false
-      }
-
-    //Remove all empty topics from the end of the array
-    while isLastTopicEmpty() {
-      topics->Array.pop->ignore
-    }
-
-    let toTopicFilter = topic => {
-      switch topic {
-      | [] => Null
-      | [single] => Single(single->EvmTypes.Hex.toString)
-      | multiple => Multiple(multiple->EvmTypes.Hex.toStrings)
-      }
-    }
-
-    topics->Array.map(toTopicFilter)
-  }
-
-  let mapTopicQuery = ({topic0, topic1, topic2, topic3}: Internal.topicSelection): topicQuery =>
-    makeTopicQuery(~topic0, ~topic1, ~topic2, ~topic3)
-
   type log = {
     address: Address.t,
     topics: array<hex>,

package/src/sources/Rpc.res.mjs

@@ -2,7 +2,6 @@
 
 import * as Rest from "../vendored/Rest.res.mjs";
 import * as Viem from "viem";
-import * as Utils from "../Utils.res.mjs";
 import * as Address from "../Address.res.mjs";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_BigInt from "@rescript/runtime/lib/es6/Stdlib_BigInt.js";
@@ -95,51 +94,7 @@ let decimalFloatSchema = S$RescriptSchema.transform(S$RescriptSchema.string, s =
   }
 }));
 
-function makeTopicQuery(topic0Opt, topic1Opt, topic2Opt, topic3Opt) {
-  let topic0 = topic0Opt !== undefined ? topic0Opt : [];
-  let topic1 = topic1Opt !== undefined ? topic1Opt : [];
-  let topic2 = topic2Opt !== undefined ? topic2Opt : [];
-  let topic3 = topic3Opt !== undefined ? topic3Opt : [];
-  let topics = [
-    topic0,
-    topic1,
-    topic2,
-    topic3
-  ];
-  let isLastTopicEmpty = () => {
-    let match = Utils.$$Array.last(topics);
-    if (match !== undefined) {
-      return match.length === 0;
-    } else {
-      return false;
-    }
-  };
-  while (isLastTopicEmpty()) {
-    topics.pop();
-  };
-  let toTopicFilter = topic => {
-    let len = topic.length;
-    if (len !== 1) {
-      if (len !== 0) {
-        return topic;
-      } else {
-        return null;
-      }
-    }
-    let single = topic[0];
-    return single;
-  };
-  return topics.map(toTopicFilter);
-}
-
-function mapTopicQuery(param) {
-  return makeTopicQuery(param.topic0, param.topic1, param.topic2, param.topic3);
-}
-
-let GetLogs = {
-  makeTopicQuery: makeTopicQuery,
-  mapTopicQuery: mapTopicQuery
-};
+let GetLogs = {};
 
 let blockSchema = S$RescriptSchema.object(s => ({
   difficulty: s.f("difficulty", S$RescriptSchema.$$null(hexBigintSchema)),