envio 3.3.0-alpha.1 → 3.3.0-alpha.10

package/src/sources/HyperSyncSource.res.mjs

@@ -1,12 +1,11 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Utils from "../Utils.res.mjs";
-import * as Hrtime from "../bindings/Hrtime.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 Prometheus from "../Prometheus.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";
@@ -17,34 +16,33 @@ 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) {
+function getSelectionConfig(selection) {
   let capitalizedBlockFields = new Set();
   let capitalizedTransactionFields = new Set();
-  let staticTopicSelectionsByContract = {};
-  let dynamicEventFiltersByContract = {};
-  let dynamicWildcardEventFiltersByContract = {};
+  let topicSelectionsByContract = {};
+  let wildcardTopicSelectionsByContract = {};
   let noAddressesTopicSelections = [];
   let contractNames = new Set();
-  selection.eventConfigs.forEach(param => {
-    let contractName = param.contractName;
-    Array.from(param.selectedBlockFields).forEach(name => {
+  selection.onEventRegistrations.forEach(reg => {
+    let eventConfig = reg.eventConfig;
+    let contractName = eventConfig.contractName;
+    let resolvedWhere = reg.resolvedWhere;
+    Array.from(eventConfig.selectedBlockFields).forEach(name => {
       capitalizedBlockFields.add(Utils.$$String.capitalize(name));
     });
-    Array.from(param.selectedTransactionFields).forEach(name => {
-      capitalizedTransactionFields.add(Utils.$$String.capitalize(name));
+    Array.from(eventConfig.selectedTransactionFields).forEach(name => {
+      if (name !== "transactionIndex") {
+        capitalizedTransactionFields.add(Utils.$$String.capitalize(name));
+        return;
+      }
     });
-    let eventFilters = param.getEventFiltersOrThrow(chain);
-    if (param.dependsOnAddresses) {
+    if (reg.dependsOnAddresses) {
       contractNames.add(contractName);
-      if (eventFilters.TAG === "Static") {
-        return Utils.Dict.pushMany(staticTopicSelectionsByContract, contractName, eventFilters._0);
-      } else {
-        return Utils.Dict.push(param.isWildcard ? dynamicWildcardEventFiltersByContract : dynamicEventFiltersByContract, contractName, eventFilters._0);
-      }
+      return Utils.Dict.pushMany(reg.isWildcard ? wildcardTopicSelectionsByContract : topicSelectionsByContract, contractName, resolvedWhere.topicSelections);
+    } else {
+      noAddressesTopicSelections.push(...LogSelection.materializeTopicSelections(resolvedWhere.topicSelections, []));
+      return;
     }
-    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);
@@ -76,17 +74,13 @@ function getSelectionConfig(selection, chain) {
       if (addresses.length === 0) {
         return;
       }
-      let topicSelections = staticTopicSelectionsByContract[contractName];
+      let topicSelections = topicSelectionsByContract[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))));
+        logSelections.push(LogSelection.make(addresses, LogSelection.materializeTopicSelections(topicSelections, addresses)));
       }
-      let fns$1 = dynamicWildcardEventFiltersByContract[contractName];
-      if (fns$1 !== undefined) {
-        logSelections.push(LogSelection.make([], fns$1.flatMap(fn => fn(addresses))));
+      let topicSelections$1 = wildcardTopicSelectionsByContract[contractName];
+      if (topicSelections$1 !== undefined) {
+        logSelections.push(LogSelection.make([], LogSelection.materializeTopicSelections(topicSelections$1, addresses)));
         return;
       }
     });
@@ -98,8 +92,8 @@ function getSelectionConfig(selection, chain) {
   };
 }
 
-function memoGetSelectionConfig(chain) {
-  return Utils.$$WeakMap.memoize(selection => getSelectionConfig(selection, chain));
+function memoGetSelectionConfig() {
+  return Utils.$$WeakMap.memoize(getSelectionConfig);
 }
 
 function isUnauthorizedError(message) {
@@ -112,7 +106,7 @@ function make(param) {
   let endpointUrl = param.endpointUrl;
   let chain = param.chain;
   let name = "HyperSync";
-  let getSelectionConfig = memoGetSelectionConfig(chain);
+  let getSelectionConfig$1 = Utils.$$WeakMap.memoize(getSelectionConfig);
   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`);
@@ -124,32 +118,28 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     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, eventConfig) => {
-    let block = item.block;
+  let makeEventBatchQueueItem = (item, params, onEventRegistration) => {
     let logIndex = item.logIndex;
     return {
       kind: 0,
-      eventConfig: eventConfig,
-      timestamp: block.timestamp,
+      onEventRegistration: onEventRegistration,
       chain: chain,
-      blockNumber: block.number,
-      blockHash: block.hash,
+      blockNumber: item.blockNumber,
       logIndex: logIndex,
+      transactionIndex: item.transactionIndex,
       payload: {
-        contractName: eventConfig.contractName,
-        eventName: eventConfig.name,
+        contractName: onEventRegistration.eventConfig.contractName,
+        eventName: onEventRegistration.eventConfig.name,
         params: params,
         chainId: chain,
         srcAddress: item.srcAddress,
-        logIndex: logIndex,
-        transaction: item.transaction,
-        block: block
+        logIndex: logIndex
       }
     };
   };
-  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, indexingAddresses, knownHeight, param, selection, retry, logger) => {
-    let totalTimeRef = Hrtime.makeTimer();
-    let selectionConfig = getSelectionConfig(selection);
+  let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, contractNameByAddress, knownHeight, param, selection, itemsTarget, retry, logger) => {
+    let totalTimeRef = Performance.now();
+    let selectionConfig = getSelectionConfig$1(selection);
     let logSelections;
     try {
       logSelections = selectionConfig.getLogSelectionOrThrow(addressesByContractName);
@@ -157,11 +147,10 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       let exn = Primitive_exceptions.internalToException(raw_exn);
       logSelections = ErrorHandling.mkLogAndRaise(logger, "Failed getting log selection for the query", exn);
     }
-    let startFetchingBatchTimeRef = Hrtime.makeTimer();
-    Prometheus.SourceRequestCount.increment(name, chain, "getLogs");
+    let startFetchingBatchTimeRef = Performance.now();
     let pageUnsafe;
     try {
-      pageUnsafe = await HyperSync.GetLogs.query(client, fromBlock, toBlock, logSelections, selectionConfig.fieldSelection);
+      pageUnsafe = await HyperSync.GetLogs.query(client, fromBlock, toBlock, logSelections, selectionConfig.fieldSelection, itemsTarget);
     } catch (raw_error) {
       let error = Primitive_exceptions.internalToException(raw_error);
       if (error.RE_EXN_ID === HyperSync.GetLogs.$$Error) {
@@ -209,30 +198,38 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         Error: new Error()
       };
     }
-    let pageFetchTime = Hrtime.toSecondsFloat(Hrtime.timeSince(startFetchingBatchTimeRef));
+    let pageFetchTime = Performance.secondsSince(startFetchingBatchTimeRef);
+    let requestStats = [{
+        method: "getLogs",
+        seconds: pageFetchTime
+      }];
     let knownHeight$1 = pageUnsafe.archiveHeight;
     let heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
-    let parsingTimeRef = Hrtime.makeTimer();
+    let parsingTimeRef = Performance.now();
     let parsedQueueItems = [];
+    let blocksByNumber = new Map();
+    pageUnsafe.blocks.forEach(block => {
+      blocksByNumber.set(block.number, block);
+    });
     pageUnsafe.items.forEach(item => {
-      let maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(item.topic0, item.topicCount), item.srcAddress, item.block.number, indexingAddresses);
+      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.contractName]);
+      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.block.number;
+        let blockNumber = item.blockNumber;
         let exn = {
           RE_EXN_ID: UndefinedValue
         };
         if (maybeEventConfig.isWildcard) {
           return;
         }
-        let msg = `Event ` + maybeEventConfig.name + ` was unexpectedly parsed as undefined`;
+        let msg = `Event ` + maybeEventConfig.eventConfig.name + ` was unexpectedly parsed as undefined`;
         let logger$1 = Logging.createChildFrom(logger, {
           chainId: chain,
           blockNumber: blockNumber,
@@ -242,19 +239,13 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         return ErrorHandling.mkLogAndRaise(logger$1, msg, exn);
       }
     });
-    let parsingTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(parsingTimeRef));
+    let parsingTimeElapsed = Performance.secondsSince(parsingTimeRef);
     let blockHashes = [];
-    pageUnsafe.items.forEach(param => {
-      let block = param.block;
-      let match = block.number;
-      let match$1 = block.hash;
-      if (match !== undefined && match$1 !== undefined) {
-        blockHashes.push({
-          blockHash: match$1,
-          blockNumber: match
-        });
-        return;
-      }
+    pageUnsafe.blocks.forEach(block => {
+      blockHashes.push({
+        blockHash: block.hash,
+        blockNumber: block.number
+      });
     });
     let match = pageUnsafe.rollbackGuard;
     if (match !== undefined) {
@@ -272,15 +263,10 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     if (match$1 !== undefined) {
       latestFetchedBlockTimestamp = match$1.timestamp;
     } else {
-      let match$2 = pageUnsafe.items[pageUnsafe.items.length - 1 | 0];
-      if (match$2 !== undefined) {
-        let block = match$2.block;
-        latestFetchedBlockTimestamp = block.number === heighestBlockQueried ? block.timestamp : 0;
-      } else {
-        latestFetchedBlockTimestamp = 0;
-      }
+      let item = pageUnsafe.items[pageUnsafe.items.length - 1 | 0];
+      latestFetchedBlockTimestamp = item !== undefined && item.blockNumber === heighestBlockQueried ? blocksByNumber.get(item.blockNumber).timestamp : 0;
     }
-    let totalTimeElapsed = Hrtime.toSecondsFloat(Hrtime.timeSince(totalTimeRef));
+    let totalTimeElapsed = Performance.secondsSince(totalTimeRef);
     let stats_parsing$unknowntime$unknown$lpars$rpar = parsingTimeElapsed;
     let stats_page$unknownfetch$unknowntime$unknown$lpars$rpar = pageFetchTime;
     let stats = {
@@ -292,13 +278,19 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       knownHeight: knownHeight$1,
       blockHashes: blockHashes,
       parsedQueueItems: parsedQueueItems,
+      transactionStore: Primitive_option.some(pageUnsafe.transactionStore),
+      blockStore: Primitive_option.some(pageUnsafe.blockStore),
       fromBlockQueried: fromBlock,
       latestFetchedBlockNumber: heighestBlockQueried,
       latestFetchedBlockTimestamp: latestFetchedBlockTimestamp,
-      stats: stats
+      stats: stats,
+      requestStats: requestStats
     };
   };
-  let getBlockHashes = (blockNumbers, logger) => HyperSync.queryBlockDataMulti(client, blockNumbers, name, chain, logger).then(HyperSync.mapExn);
+  let getBlockHashes = (blockNumbers, logger) => HyperSync.queryBlockDataMulti(client, blockNumbers, name, chain, logger).then(param => ({
+    result: HyperSync.mapExn(param[0]),
+    requestStats: param[1]
+  }));
   return {
     name: name,
     sourceFor: "Sync",
@@ -307,10 +299,10 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
     pollingInterval: 100,
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
-      let timerRef = Hrtime.makeTimer();
-      let result;
+      let timerRef = Performance.now();
+      let height;
       try {
-        result = await client.getHeight();
+        height = await client.getHeight();
       } catch (raw_e) {
         let e = Primitive_exceptions.internalToException(raw_e);
         if (e.RE_EXN_ID === "JsExn") {
@@ -320,7 +312,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
             if (message.includes("401 Unauthorized")) {
               Logging.error(`Your ENVIO_API_TOKEN was rejected by HyperSync (401 Unauthorized). The indexer will not be able to fetch events. Update the token and try again using 'envio start' or 'envio dev'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens`);
               await new Promise((param, param$1) => {});
-              result = 0;
+              height = 0;
             } else {
               throw {
                 RE_EXN_ID: "JsExn",
@@ -339,10 +331,14 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
           throw e;
         }
       }
-      let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
-      Prometheus.SourceRequestCount.increment(name, chain, "getHeight");
-      Prometheus.SourceRequestCount.addSeconds(name, chain, "getHeight", seconds);
-      return result;
+      let seconds = Performance.secondsSince(timerRef);
+      return {
+        height: height,
+        requestStats: [{
+            method: "getHeight",
+            seconds: seconds
+          }]
+      };
     },
     getItemsOrThrow: getItemsOrThrow,
     createHeightSubscription: onHeight => HyperSyncHeightStream.subscribe(endpointUrl, apiToken$1, chain, onHeight)

package/src/sources/Rpc.res

@@ -38,7 +38,21 @@ let jsonRpcFetcher: Rest.ApiFetcher.t = async args => {
   }
 }
 
-let makeClient = url => Rest.client(url, ~fetcher=jsonRpcFetcher)
+let makeClient = (url, ~headers=?) => {
+  let fetcher: Rest.ApiFetcher.t = switch headers {
+  | None => jsonRpcFetcher
+  | Some(customHeaders) =>
+    async args => {
+      let headers = switch args.headers {
+      | Some(headers) => headers
+      | None => Dict.make()
+      }
+      customHeaders->Dict.forEachWithKey((value, key) => headers->Dict.set(key, value->Obj.magic))
+      await jsonRpcFetcher({...args, headers: Some(headers)})
+    }
+  }
+  Rest.client(url, ~fetcher)
+}
 
 type hex = string
 let makeHexSchema = fromStr =>
@@ -70,13 +84,7 @@ let decimalFloatSchema: S.schema<float> = S.string->S.transform(s => {
 module GetLogs = {
   @unboxed
   type topicFilter = Single(hex) | Multiple(array<hex>) | @as(null) Null
-  let topicFilterSchema = S.union([
-    S.literal(Null),
-    S.schema(s => Multiple(s.matches(S.array(S.string)))),
-    S.schema(s => Single(s.matches(S.string))),
-  ])
   type topicQuery = array<topicFilter>
-  let topicQuerySchema = S.array(topicFilterSchema)
 
   let makeTopicQuery = (~topic0=[], ~topic1=[], ~topic2=[], ~topic3=[]) => {
     let topics = [topic0, topic1, topic2, topic3]
@@ -106,51 +114,15 @@ module GetLogs = {
   let mapTopicQuery = ({topic0, topic1, topic2, topic3}: Internal.topicSelection): topicQuery =>
     makeTopicQuery(~topic0, ~topic1, ~topic2, ~topic3)
 
-  type param = {
-    fromBlock: int,
-    toBlock: int,
-    address?: array<Address.t>,
-    topics: topicQuery,
-    // blockHash?: string,
-  }
-
-  let paramsSchema = S.object((s): param => {
-    fromBlock: s.field("fromBlock", hexIntSchema),
-    toBlock: s.field("toBlock", hexIntSchema),
-    address: ?s.field("address", S.option(S.array(Address.schema))),
-    topics: s.field("topics", topicQuerySchema),
-    // blockHash: ?s.field("blockHash", S.option(S.string)),
-  })
-
-  let fullParamsSchema = S.tuple1(paramsSchema)
-
   type log = {
     address: Address.t,
     topics: array<hex>,
-    data: hex,
     blockNumber: int,
     transactionHash: hex,
     transactionIndex: int,
     blockHash: hex,
     logIndex: int,
-    removed: bool,
   }
-
-  let logSchema = S.object((s): log => {
-    address: s.field("address", Address.schema),
-    topics: s.field("topics", S.array(S.string)),
-    data: s.field("data", S.string),
-    blockNumber: s.field("blockNumber", hexIntSchema),
-    transactionHash: s.field("transactionHash", S.string),
-    transactionIndex: s.field("transactionIndex", hexIntSchema),
-    blockHash: s.field("blockHash", S.string),
-    logIndex: s.field("logIndex", hexIntSchema),
-    removed: s.field("removed", S.bool),
-  })
-
-  let resultSchema = S.array(logSchema)
-
-  let route = makeRpcRoute("eth_getLogs", fullParamsSchema, resultSchema)
 }
 
 module GetBlockByNumber = {
@@ -230,10 +202,6 @@ module GetTransactionReceipt = {
   )
 }
 
-let getLogs = async (~client: Rest.client, ~param: GetLogs.param) => {
-  await GetLogs.route->Rest.fetch(param, ~client)
-}
-
 let getBlock = async (~client: Rest.client, ~blockNumber: int) => {
   await GetBlockByNumber.route->Rest.fetch(
     {"blockNumber": blockNumber, "includeTransactions": false},

package/src/sources/Rpc.res.mjs

@@ -4,6 +4,7 @@ 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";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
@@ -48,8 +49,21 @@ async function jsonRpcFetcher(args) {
   return response;
 }
 
-function makeClient(url) {
-  return Rest.client(url, jsonRpcFetcher);
+function makeClient(url, headers) {
+  let fetcher = headers !== undefined ? async args => {
+      let headers$1 = args.headers;
+      let headers$2 = headers$1 !== undefined ? headers$1 : ({});
+      Stdlib_Dict.forEachWithKey(headers, (value, key) => {
+        headers$2[key] = value;
+      });
+      return await jsonRpcFetcher({
+        body: args.body,
+        headers: headers$2,
+        method: args.method,
+        path: args.path
+      });
+    } : jsonRpcFetcher;
+  return Rest.client(url, fetcher);
 }
 
 function makeHexSchema(fromStr) {
@@ -81,14 +95,6 @@ let decimalFloatSchema = S$RescriptSchema.transform(S$RescriptSchema.string, s =
   }
 }));
 
-let topicFilterSchema = S$RescriptSchema.union([
-  S$RescriptSchema.literal(null),
-  S$RescriptSchema.schema(s => (s.m(S$RescriptSchema.array(S$RescriptSchema.string)))),
-  S$RescriptSchema.schema(s => (s.m(S$RescriptSchema.string)))
-]);
-
-let topicQuerySchema = S$RescriptSchema.array(topicFilterSchema);
-
 function makeTopicQuery(topic0Opt, topic1Opt, topic2Opt, topic3Opt) {
   let topic0 = topic0Opt !== undefined ? topic0Opt : [];
   let topic1 = topic1Opt !== undefined ? topic1Opt : [];
@@ -130,41 +136,9 @@ function mapTopicQuery(param) {
   return makeTopicQuery(param.topic0, param.topic1, param.topic2, param.topic3);
 }
 
-let paramsSchema = S$RescriptSchema.object(s => ({
-  fromBlock: s.f("fromBlock", hexIntSchema),
-  toBlock: s.f("toBlock", hexIntSchema),
-  address: s.f("address", S$RescriptSchema.option(S$RescriptSchema.array(Address.schema))),
-  topics: s.f("topics", topicQuerySchema)
-}));
-
-let fullParamsSchema = S$RescriptSchema.tuple1(paramsSchema);
-
-let logSchema = S$RescriptSchema.object(s => ({
-  address: s.f("address", Address.schema),
-  topics: s.f("topics", S$RescriptSchema.array(S$RescriptSchema.string)),
-  data: s.f("data", S$RescriptSchema.string),
-  blockNumber: s.f("blockNumber", hexIntSchema),
-  transactionHash: s.f("transactionHash", S$RescriptSchema.string),
-  transactionIndex: s.f("transactionIndex", hexIntSchema),
-  blockHash: s.f("blockHash", S$RescriptSchema.string),
-  logIndex: s.f("logIndex", hexIntSchema),
-  removed: s.f("removed", S$RescriptSchema.bool)
-}));
-
-let resultSchema = S$RescriptSchema.array(logSchema);
-
-let route = makeRpcRoute("eth_getLogs", fullParamsSchema, resultSchema);
-
 let GetLogs = {
-  topicFilterSchema: topicFilterSchema,
-  topicQuerySchema: topicQuerySchema,
   makeTopicQuery: makeTopicQuery,
-  mapTopicQuery: mapTopicQuery,
-  paramsSchema: paramsSchema,
-  fullParamsSchema: fullParamsSchema,
-  logSchema: logSchema,
-  resultSchema: resultSchema,
-  route: route
+  mapTopicQuery: mapTopicQuery
 };
 
 let blockSchema = S$RescriptSchema.object(s => ({
@@ -190,22 +164,22 @@ let blockSchema = S$RescriptSchema.object(s => ({
   uncles: s.f("uncles", S$RescriptSchema.$$null(S$RescriptSchema.array(S$RescriptSchema.string)))
 }));
 
-let paramsSchema$1 = S$RescriptSchema.tuple(s => ({
+let paramsSchema = S$RescriptSchema.tuple(s => ({
   blockNumber: s.item(0, hexIntSchema),
   includeTransactions: s.item(1, S$RescriptSchema.bool)
 }));
 
-let resultSchema$1 = S$RescriptSchema.$$null(blockSchema);
+let resultSchema = S$RescriptSchema.$$null(blockSchema);
 
-let route$1 = makeRpcRoute("eth_getBlockByNumber", paramsSchema$1, resultSchema$1);
+let route = makeRpcRoute("eth_getBlockByNumber", paramsSchema, resultSchema);
 
-let rawRoute = makeRpcRoute("eth_getBlockByNumber", paramsSchema$1, S$RescriptSchema.$$null(S$RescriptSchema.json(false)));
+let rawRoute = makeRpcRoute("eth_getBlockByNumber", paramsSchema, S$RescriptSchema.$$null(S$RescriptSchema.json(false)));
 
 let GetBlockByNumber = {
   blockSchema: blockSchema,
-  paramsSchema: paramsSchema$1,
-  resultSchema: resultSchema$1,
-  route: route$1,
+  paramsSchema: paramsSchema,
+  resultSchema: resultSchema,
+  route: route,
   rawRoute: rawRoute
 };
 
@@ -221,12 +195,8 @@ let GetTransactionReceipt = {
   rawRoute: rawRoute$2
 };
 
-async function getLogs(client, param) {
-  return await Rest.fetch(route, param, client);
-}
-
 async function getBlock(client, blockNumber) {
-  return await Rest.fetch(route$1, {
+  return await Rest.fetch(route, {
     blockNumber: blockNumber,
     includeTransactions: false
   }, client);
@@ -252,7 +222,6 @@ export {
   GetBlockByNumber,
   GetTransactionByHash,
   GetTransactionReceipt,
-  getLogs,
   getBlock,
   getRawBlock,
 }