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

package/src/sources/RpcSource.res.mjs

@@ -9,23 +9,21 @@ import * as Address from "../Address.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as Internal from "../Internal.res.mjs";
 import * as LazyLoader from "../LazyLoader.res.mjs";
-import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
-import * as EventRouter from "./EventRouter.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
+import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as EvmRpcClient from "./EvmRpcClient.res.mjs";
-import * as LogSelection from "../LogSelection.res.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
+import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
+import * as HyperSyncClient from "./HyperSyncClient.res.mjs";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as RpcWebSocketHeightStream from "./RpcWebSocketHeightStream.res.mjs";
 
-let QueryTimout = /* @__PURE__ */Primitive_exceptions.create("RpcSource.QueryTimout");
-
 let TransactionDataNotFound = /* @__PURE__ */Primitive_exceptions.create("RpcSource.TransactionDataNotFound");
 
 async function getKnownRawBlock(client, blockNumber) {
@@ -84,352 +82,114 @@ function getErrorMessage(exn) {
   if (exn.RE_EXN_ID !== "JsExn") {
     return;
   }
+  let msg = Stdlib_JsExn.message(exn._1);
+  if (msg === undefined) {
+    return;
+  }
+  let obj;
   try {
-    let message = exn._1.error.message;
-    S$RescriptSchema.assertOrThrow(message, S$RescriptSchema.string);
-    return message;
+    obj = Stdlib_JSON.Decode.object(JSON.parse(msg));
   } catch (exn$1) {
     return;
   }
-}
-
-let patterns = [
-  /more than \d+ logs/i,
-  /\d+ logs returned/i,
-  /too many logs/i,
-  /query returned more than \d+ results/i,
-  /query exceeds max results/i,
-  /response size should not/i,
-  /(backend )?response too large/i,
-  /logs matched by query exceeds limit/i,
-  /block range is too wide/i
-];
-
-function isResponseTooLargeError(exn) {
-  let message = getErrorMessage(exn);
-  if (message !== undefined) {
-    return patterns.some(re => re.test(message));
-  } else {
-    return false;
+  if (obj === undefined) {
+    return;
   }
-}
-
-let suggestedRangeRegExp = /retry with the range (\d+)-(\d+)/;
-
-let blockRangeLimitRegExp = /limited to a (\d+) blocks range/;
-
-let alchemyRangeRegExp = /up to a (\d+) block range/;
-
-let cloudflareRangeRegExp = /Max range: (\d+)/;
-
-let thirdwebRangeRegExp = /Maximum allowed number of requested blocks is (\d+)/;
-
-let blockpiRangeRegExp = /limited to (\d+) block/;
-
-let baseRangeRegExp = /block range too large/;
-
-let maxAllowedBlocksRegExp = /maximum allowed is (\d+) blocks/;
-
-let blastPaidRegExp = /exceeds the range allowed for your plan \(\d+ > (\d+)\)/;
-
-let chainstackRegExp = /Block range limit exceeded./;
-
-let coinbaseRegExp = /please limit the query to at most (\d+) blocks/;
-
-let publicNodeRegExp = /maximum block range: (\d+)/;
-
-let hyperliquidRegExp = /query exceeds max block range (\d+)/;
-
-function getSuggestedBlockIntervalFromExn(exn) {
-  let message = getErrorMessage(exn);
-  if (message !== undefined) {
-    let extractBlockRange = (execResult, isMaxRange) => {
-      let match = execResult.slice(1);
-      if (match.length !== 1) {
-        return;
-      }
-      let blockRangeLimit = match[0];
-      if (blockRangeLimit === undefined) {
-        return;
-      }
-      let blockRangeLimit$1 = Stdlib_Int.fromString(blockRangeLimit, undefined);
-      if (blockRangeLimit$1 !== undefined && blockRangeLimit$1 > 0) {
-        return [
-          blockRangeLimit$1,
-          isMaxRange
-        ];
-      }
-    };
-    let execResult = suggestedRangeRegExp.exec(message);
-    if (execResult == null) {
-      let execResult$1 = blockRangeLimitRegExp.exec(message);
-      if (!(execResult$1 == null)) {
-        return extractBlockRange(execResult$1, true);
-      }
-      let execResult$2 = alchemyRangeRegExp.exec(message);
-      if (!(execResult$2 == null)) {
-        return extractBlockRange(execResult$2, true);
-      }
-      let execResult$3 = cloudflareRangeRegExp.exec(message);
-      if (!(execResult$3 == null)) {
-        return extractBlockRange(execResult$3, true);
-      }
-      let execResult$4 = thirdwebRangeRegExp.exec(message);
-      if (!(execResult$4 == null)) {
-        return extractBlockRange(execResult$4, true);
-      }
-      let execResult$5 = blockpiRangeRegExp.exec(message);
-      if (!(execResult$5 == null)) {
-        return extractBlockRange(execResult$5, true);
-      }
-      let execResult$6 = maxAllowedBlocksRegExp.exec(message);
-      if (!(execResult$6 == null)) {
-        return extractBlockRange(execResult$6, true);
-      }
-      let match = baseRangeRegExp.exec(message);
-      if (!(match == null)) {
-        return [
-          2000,
-          true
-        ];
-      }
-      let execResult$7 = blastPaidRegExp.exec(message);
-      if (!(execResult$7 == null)) {
-        return extractBlockRange(execResult$7, true);
-      }
-      let match$1 = chainstackRegExp.exec(message);
-      if (!(match$1 == null)) {
-        return [
-          10000,
-          true
-        ];
-      }
-      let execResult$8 = coinbaseRegExp.exec(message);
-      if (!(execResult$8 == null)) {
-        return extractBlockRange(execResult$8, true);
-      }
-      let execResult$9 = publicNodeRegExp.exec(message);
-      if (!(execResult$9 == null)) {
-        return extractBlockRange(execResult$9, true);
-      }
-      let execResult$10 = hyperliquidRegExp.exec(message);
-      if (!(execResult$10 == null)) {
-        return extractBlockRange(execResult$10, true);
-      } else {
-        return;
-      }
-    }
-    let match$2 = execResult.slice(1);
-    if (match$2.length !== 2) {
-      return;
-    }
-    let fromBlock = match$2[0];
-    if (fromBlock === undefined) {
-      return;
-    }
-    let toBlock = match$2[1];
-    if (toBlock === undefined) {
-      return;
-    }
-    let match$3 = Stdlib_Int.fromString(fromBlock, undefined);
-    let match$4 = Stdlib_Int.fromString(toBlock, undefined);
-    if (match$3 !== undefined && match$4 !== undefined && match$4 >= match$3) {
-      return [
-        (match$4 - match$3 | 0) + 1 | 0,
-        false
-      ];
-    } else {
-      return;
-    }
+  let match = obj["errorMessage"];
+  if (typeof match === "string") {
+    return match;
   }
 }
 
-let maxSuggestedBlockIntervalKey = "max";
-
-function getSourceMaxBlockInterval(mutSuggestedBlockIntervals, intervalCeiling) {
-  return Stdlib_Option.getOr(mutSuggestedBlockIntervals[maxSuggestedBlockIntervalKey], intervalCeiling);
-}
-
-function mergeAndDedupItems(itemsPerSelection) {
-  let seen = new Set();
-  let merged = [];
-  itemsPerSelection.forEach(items => {
-    items.forEach(item => {
-      let key = item.log.blockNumber.toString() + `-` + item.log.logIndex.toString();
-      if (!seen.has(key)) {
-        seen.add(key);
-        merged.push(item);
-        return;
-      }
-    });
-  });
-  return merged;
-}
-
-function getNextPage(fromBlock, toBlock, logSelections, loadBlock, sc, rpcClient, mutSuggestedBlockIntervals, partitionId, recordRequest) {
-  let queryTimoutPromise = Time.resolvePromiseAfterDelay(sc.queryTimeoutMillis).then(() => Promise.reject({
-    RE_EXN_ID: QueryTimout,
-    _1: `Query took longer than ` + (sc.queryTimeoutMillis / 1000 | 0).toString() + ` seconds`
-  }));
-  let latestFetchedBlockPromise = loadBlock(toBlock);
-  let queryLogs = param => {
-    let timerRef = Performance.now();
-    return rpcClient.getLogs({
-      fromBlock: fromBlock,
-      toBlock: toBlock,
-      addresses: param.addresses,
-      topics: param.topicQuery.map(filter => {
-        if (filter === null) {
-          return null;
-        } else if (typeof filter === "string") {
-          return [filter];
-        } else {
-          return filter;
-        }
-      })
-    }).then(items => {
-      recordRequest("eth_getLogs", Performance.secondsSince(timerRef));
-      return items;
-    });
-  };
-  let len = logSelections.length;
-  let logsPromise;
-  if (len !== 1) {
-    logsPromise = len !== 0 ? Promise.all(logSelections.map(queryLogs)).then(async itemsPerSelection => ({
-        items: mergeAndDedupItems(itemsPerSelection),
-        latestFetchedBlockInfo: await latestFetchedBlockPromise
-      })) : latestFetchedBlockPromise.then(latestFetchedBlockInfo => ({
-        items: [],
-        latestFetchedBlockInfo: latestFetchedBlockInfo
-      }));
-  } else {
-    let logSelection = logSelections[0];
-    logsPromise = queryLogs(logSelection).then(async items => ({
-      items: items,
-      latestFetchedBlockInfo: await latestFetchedBlockPromise
-    }));
+function parseGetNextPageRetryError(exn) {
+  if (exn.RE_EXN_ID !== "JsExn") {
+    return;
   }
-  return Stdlib_Promise.$$catch(Promise.race([
-    queryTimoutPromise,
-    logsPromise
-  ]), err => {
-    let executedBlockInterval = (toBlock - fromBlock | 0) + 1 | 0;
-    let shrunkBlockInterval = Primitive_int.max(1, executedBlockInterval * sc.backoffMultiplicative | 0);
-    let throwFailedGettingItems = retry => {
-      throw {
-        RE_EXN_ID: Source.GetItemsError,
-        _1: {
-          TAG: "FailedGettingItems",
-          exn: err,
-          attemptedToBlock: toBlock,
-          retry: retry
-        },
-        Error: new Error()
-      };
-    };
-    let throwResize = interval => throwFailedGettingItems({
-      TAG: "WithSuggestedToBlock",
-      toBlock: (fromBlock + interval | 0) - 1 | 0
-    });
-    let match = getSuggestedBlockIntervalFromExn(err);
-    if (match === undefined) {
-      if (executedBlockInterval > 1 && isResponseTooLargeError(err)) {
-        mutSuggestedBlockIntervals[partitionId] = shrunkBlockInterval;
-        return throwResize(shrunkBlockInterval);
-      } else {
-        mutSuggestedBlockIntervals[partitionId] = shrunkBlockInterval;
-        return throwFailedGettingItems({
-          TAG: "WithBackoff",
-          message: `Failed getting data for the block range. Will try smaller block range for the next attempt.`,
-          backoffMillis: sc.backoffMillis
-        });
-      }
-    }
-    let interval = match[0];
-    if (match[1]) {
-      let capped = Primitive_int.min(getSourceMaxBlockInterval(mutSuggestedBlockIntervals, sc.intervalCeiling), interval);
-      mutSuggestedBlockIntervals[maxSuggestedBlockIntervalKey] = capped;
-      return throwResize(capped);
-    }
-    mutSuggestedBlockIntervals[partitionId] = interval;
-    return throwResize(interval);
-  });
-}
-
-function getSelectionConfig(selection, chain) {
-  let evmOnEventRegistrations = selection.onEventRegistrations;
-  if (Utils.$$Array.isEmpty(evmOnEventRegistrations)) {
-    throw {
-      RE_EXN_ID: Source.GetItemsError,
-      _1: {
-        TAG: "UnsupportedSelection",
-        message: "Invalid events configuration for the partition. Nothing to fetch. Please, report to the Envio team."
-      },
-      Error: new Error()
-    };
+  let msg = Stdlib_JsExn.message(exn._1);
+  if (msg === undefined) {
+    return;
   }
-  let noAddressTopicSelections = [];
-  let staticByContract = {};
-  let dynamicByContract = {};
-  let dynamicWildcardByContract = {};
-  let contractNames = new Set();
-  evmOnEventRegistrations.forEach(reg => {
-    let contractName = reg.eventConfig.contractName;
-    let eventFilters = reg.getEventFiltersOrThrow(chain);
-    if (reg.dependsOnAddresses) {
-      contractNames.add(contractName);
-      if (eventFilters.TAG === "Static") {
-        return Utils.Dict.pushMany(staticByContract, contractName, eventFilters._0);
-      } else {
-        return Utils.Dict.push(reg.isWildcard ? dynamicWildcardByContract : dynamicByContract, contractName, eventFilters._0);
-      }
+  let obj;
+  try {
+    obj = Stdlib_JSON.Decode.object(JSON.parse(msg));
+  } catch (exn$1) {
+    return;
+  }
+  if (obj === undefined) {
+    return;
+  }
+  let match = obj["kind"];
+  let match$1 = obj["attemptedToBlock"];
+  let match$2 = obj["retry"];
+  if (match === undefined) {
+    return;
+  }
+  if (typeof match !== "string") {
+    return;
+  }
+  if (match !== "Retry") {
+    return;
+  }
+  if (match$1 === undefined) {
+    return;
+  }
+  if (typeof match$1 !== "number") {
+    return;
+  }
+  if (match$2 === undefined) {
+    return;
+  }
+  if (typeof match$2 !== "object" || match$2 === null || Array.isArray(match$2)) {
+    return;
+  }
+  let match$3 = obj["requestStats"];
+  let requestStats = match$3 !== undefined ? (
+      Array.isArray(match$3) ? Stdlib_Array.filterMap(match$3, s => {
+          let o = Stdlib_JSON.Decode.object(s);
+          if (o === undefined) {
+            return;
+          }
+          let match = o["method"];
+          let match$1 = o["seconds"];
+          if (typeof match === "string" && typeof match$1 === "number") {
+            return {
+              method: match,
+              seconds: match$1
+            };
+          }
+        }) : []
+    ) : [];
+  let match$4 = match$2["tag"];
+  let retry;
+  if (typeof match$4 === "string") {
+    switch (match$4) {
+      case "WithBackoff" :
+        let match$5 = match$2["message"];
+        let match$6 = match$2["backoffMillis"];
+        retry = typeof match$5 === "string" && typeof match$6 === "number" ? ({
+            TAG: "WithBackoff",
+            message: match$5,
+            backoffMillis: match$6 | 0
+          }) : undefined;
+        break;
+      case "WithSuggestedToBlock" :
+        let match$7 = match$2["toBlock"];
+        retry = typeof match$7 === "number" ? ({
+            TAG: "WithSuggestedToBlock",
+            toBlock: match$7 | 0
+          }) : undefined;
+        break;
+      default:
+        retry = undefined;
     }
-    let tmp;
-    tmp = eventFilters.TAG === "Static" ? eventFilters._0 : eventFilters._0([]);
-    noAddressTopicSelections.push(...tmp);
-  });
-  let toLogSelections = (addresses, topicSelections) => LogSelection.compressTopicSelections(topicSelections).map(topicSelection => ({
-    addresses: addresses,
-    topicQuery: Rpc.GetLogs.mapTopicQuery(topicSelection)
-  }));
-  let noAddressLogSelections = toLogSelections(undefined, noAddressTopicSelections);
-  let getLogSelectionsOrThrow = contractNames.size === 0 ? param => noAddressLogSelections : addressesByContractName => {
-      let logSelections = noAddressLogSelections.slice();
-      contractNames.forEach(contractName => {
-        let addresses = addressesByContractName[contractName];
-        if (addresses === undefined) {
-          return;
-        }
-        if (addresses.length === 0) {
-          return;
-        }
-        let addressedTopicSelections = [];
-        let s = staticByContract[contractName];
-        if (s !== undefined) {
-          addressedTopicSelections.push(...s);
-        }
-        let fns = dynamicByContract[contractName];
-        if (fns !== undefined) {
-          fns.forEach(fn => {
-            addressedTopicSelections.push(...fn(addresses));
-          });
-        }
-        logSelections.push(...toLogSelections(addresses, addressedTopicSelections));
-        let fns$1 = dynamicWildcardByContract[contractName];
-        if (fns$1 !== undefined) {
-          logSelections.push(...toLogSelections(undefined, fns$1.flatMap(fn => fn(addresses))));
-          return;
-        }
-      });
-      return logSelections;
-    };
-  return {
-    getLogSelectionsOrThrow: getLogSelectionsOrThrow
-  };
-}
-
-function memoGetSelectionConfig(chain) {
-  return Utils.$$WeakMap.memoize(selection => getSelectionConfig(selection, chain));
+  } else {
+    retry = undefined;
+  }
+  return Stdlib_Option.map(retry, retry => [
+    match$1 | 0,
+    retry,
+    requestStats
+  ]);
 }
 
 let lowercaseAddressSchema = S$RescriptSchema.transform(S$RescriptSchema.string, param => ({
@@ -966,17 +726,15 @@ function makeThrowingGetEventTransaction(getTransactionJson, getReceiptJson, low
 function make(param) {
   let headers = param.headers;
   let lowercaseAddresses = param.lowercaseAddresses;
-  let eventRouter = param.eventRouter;
+  let onEventRegistrations = param.onEventRegistrations;
   let chain = param.chain;
   let url = param.url;
   let syncConfig = param.syncConfig;
   let host = Utils.Url.getHostFromUrl(url);
   let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + chain.toString() + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
   let name = `RPC (` + urlHost + `)`;
-  let getSelectionConfig = memoGetSelectionConfig(chain);
-  let mutSuggestedBlockIntervals = {};
   let client = Rpc.makeClient(url, headers);
-  let rpcClient = EvmRpcClient.make(url, !lowercaseAddresses, undefined, headers, param.allEventParams);
+  let rpcClient = EvmRpcClient.make(url, !lowercaseAddresses, syncConfig, undefined, headers, HyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations));
   let pendingRequestStats = [];
   let recordRequest = (method, seconds) => {
     pendingRequestStats.push({
@@ -1062,36 +820,68 @@ function make(param) {
       Error: new Error()
     };
   }, lowercaseAddresses);
-  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, contractNameByAddress, knownHeight, partitionId, selection, param, retry, param$1) => {
+  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, param, knownHeight, partitionId, selection, param$1, retry, param$2) => {
     let startFetchingBatchTimeRef = Performance.now();
-    let sourceMaxBlockInterval = getSourceMaxBlockInterval(mutSuggestedBlockIntervals, syncConfig.intervalCeiling);
-    let suggestedBlockInterval = Primitive_int.min(Stdlib_Option.getOr(mutSuggestedBlockIntervals[partitionId], syncConfig.initialBlockInterval), sourceMaxBlockInterval);
     let toBlock$1 = toBlock !== undefined ? Primitive_int.min(toBlock, knownHeight) : knownHeight;
-    let suggestedToBlock = Primitive_int.max(Primitive_int.min((fromBlock + suggestedBlockInterval | 0) - 1 | 0, toBlock$1), fromBlock);
     let firstBlockParentPromise = fromBlock > 0 ? LazyLoader.get(blockLoader.contents, fromBlock - 1 | 0).then(json => parseBlockInfo(json)) : Promise.resolve(undefined);
-    let match = getSelectionConfig(selection);
-    let logSelections = match.getLogSelectionsOrThrow(addressesByContractName);
-    let match$1 = await getNextPage(fromBlock, suggestedToBlock, logSelections, blockNumber => LazyLoader.get(blockLoader.contents, blockNumber).then(parseBlockInfo), syncConfig, rpcClient, mutSuggestedBlockIntervals, partitionId, recordRequest);
-    let latestFetchedBlockInfo = match$1.latestFetchedBlockInfo;
-    let items = match$1.items;
-    let executedBlockInterval = (suggestedToBlock - fromBlock | 0) + 1 | 0;
-    if (executedBlockInterval >= suggestedBlockInterval) {
-      mutSuggestedBlockIntervals[partitionId] = Primitive_int.min(executedBlockInterval + syncConfig.accelerationAdditive | 0, sourceMaxBlockInterval);
+    if (Utils.$$Array.isEmpty(selection.onEventRegistrations)) {
+      throw {
+        RE_EXN_ID: Source.GetItemsError,
+        _1: {
+          TAG: "UnsupportedSelection",
+          message: "Invalid events configuration for the partition. Nothing to fetch. Please, report to the Envio team."
+        },
+        Error: new Error()
+      };
     }
-    let parsedQueueItems = await Promise.all(Stdlib_Array.filterMap(items, param => {
-      let log = param.log;
-      let topic0 = Stdlib_Option.getOr(log.topics[0], "0x0");
-      let routedAddress = lowercaseAddresses ? Address.Evm.fromAddressLowercaseOrThrow(log.address) : Address.Evm.fromAddressOrThrow(log.address);
-      let onEventRegistration = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), routedAddress, contractNameByAddress);
-      if (onEventRegistration === undefined) {
-        return;
+    let match;
+    try {
+      match = await rpcClient.getNextPage({
+        fromBlock: fromBlock,
+        toBlockCeiling: toBlock$1,
+        partitionId: partitionId,
+        registrationIndexes: selection.onEventRegistrations.map(reg => reg.index),
+        addressesByContractName: addressesByContractName
+      });
+    } catch (raw_exn) {
+      let exn = Primitive_exceptions.internalToException(raw_exn);
+      let match$1 = parseGetNextPageRetryError(exn);
+      if (match$1 !== undefined) {
+        match$1[2].forEach(stat => recordRequest(stat.method, stat.seconds));
+        throw {
+          RE_EXN_ID: Source.GetItemsError,
+          _1: {
+            TAG: "FailedGettingItems",
+            exn: exn,
+            attemptedToBlock: match$1[0],
+            retry: match$1[1]
+          },
+          Error: new Error()
+        };
       }
+      throw {
+        RE_EXN_ID: Source.GetItemsError,
+        _1: {
+          TAG: "FailedGettingItems",
+          exn: exn,
+          attemptedToBlock: toBlock$1,
+          retry: {
+            TAG: "WithBackoff",
+            message: "Unexpected issue while fetching events from the RPC client. Attempt a retry.",
+            backoffMillis: retry !== 0 ? 1000 * retry | 0 : 500
+          }
+        },
+        Error: new Error()
+      };
+    }
+    let items = match.items;
+    match.requestStats.forEach(stat => recordRequest(stat.method, stat.seconds));
+    let latestFetchedBlockInfo = await LazyLoader.get(blockLoader.contents, match.toBlock).then(parseBlockInfo);
+    let parsedQueueItems = await Promise.all(items.map(param => {
+      let decoded = param.params;
+      let log = param.log;
+      let onEventRegistration = onEventRegistrations[param.onEventRegistrationIndex];
       let eventConfig = onEventRegistration.eventConfig;
-      let decoded = Stdlib_Option.flatMap(Primitive_option.fromNullable(param.params), __x => __x[eventConfig.contractName]);
-      if (decoded === undefined) {
-        return;
-      }
-      let decoded$1 = Primitive_option.valFromOption(decoded);
       return (async () => {
         let match;
         try {
@@ -1141,9 +931,9 @@ function make(param) {
           payload: {
             contractName: eventConfig.contractName,
             eventName: eventConfig.name,
-            params: decoded$1,
+            params: decoded,
             chainId: chain,
-            srcAddress: routedAddress,
+            srcAddress: log.address,
             logIndex: log.logIndex,
             transaction: Primitive_option.some(match[1]),
             block: Primitive_option.some(block)
@@ -1251,20 +1041,12 @@ function make(param) {
 }
 
 export {
-  QueryTimout,
   TransactionDataNotFound,
   getKnownRawBlock,
   parseBlockInfo,
   getKnownRawBlockWithBackoff,
   getErrorMessage,
-  isResponseTooLargeError,
-  getSuggestedBlockIntervalFromExn,
-  maxSuggestedBlockIntervalKey,
-  getSourceMaxBlockInterval,
-  mergeAndDedupItems,
-  getNextPage,
-  getSelectionConfig,
-  memoGetSelectionConfig,
+  parseGetNextPageRetryError,
   lowercaseAddressSchema,
   checksumAddressSchema,
   makeBlockFieldRegistry,