envio 3.0.0-alpha.3 → 3.0.0-alpha.4

package/README.md

@@ -14,11 +14,11 @@ HyperIndex is a fast, developer-friendly multichain indexer, optimized for both
 - **[Indexer auto-generation](https://docs.envio.dev/docs/HyperIndex/contract-import)** – Generate Indexers directly from smart contract addresses
 - **High performance** – Historical backfills at over 10,000+ events per second ([fastest in market](https://docs.envio.dev/blog/indexer-benchmarking-results))
 - **Local development** – Full-featured local environment with Docker
-- **[Multichain indexing](https://docs.envio.dev/docs/HyperIndex/multichain-indexing)** – Index any EVM-compatible blockchain and Fuel (simultaneously)
+- **[Multichain indexing](https://docs.envio.dev/docs/HyperIndex/multichain-indexing)** – Index any EVM-, SVM-, or Fuel-compatible blockchain
 - **Real-time indexing** – Instantly track blockchain events
 - **[Reorg support](https://docs.envio.dev/docs/HyperIndex/reorgs-support)** – Graceful handling of blockchain reorganizations
 - **GraphQL API** – Easy-to-query indexed data
-- **Flexible language support** – JavaScript, TypeScript, and ReScript
+- **Flexible language support** – TypeScript, JavaScript, and ReScript
 - **Factory contract support** – Index data from 1M+ dynamically registered contracts seamlessly
 - **On-chain & off-chain data integration** – Easily combine multiple data sources
 - **[Self-hosted & managed options](https://docs.envio.dev/docs/HyperIndex/hosted-service)** – Run your own setup or use HyperIndex hosted services

package/evm.schema.json

@@ -268,7 +268,6 @@
         "root",
         "status",
         "yParity",
-        "chainId",
         "accessList",
         "maxFeePerBlobGas",
         "blobVersionedHashes",

package/index.d.ts

@@ -8,11 +8,12 @@ export type {
   rateLimit as RateLimit,
   blockEvent as BlockEvent,
   fuelBlockEvent as FuelBlockEvent,
-  solanaOnBlockArgs as SolanaOnBlockArgs,
+  svmOnBlockArgs as SvmOnBlockArgs,
   onBlockArgs as OnBlockArgs,
   onBlockOptions as OnBlockOptions,
 } from "./src/Envio.gen.ts";
-export type { EffectCaller } from "./src/Types.ts";
+import type { Address } from "./src/Types.ts";
+export type { EffectCaller, Address } from "./src/Types.ts";
 
 import type {
   effect as Effect,
@@ -109,6 +110,7 @@ export declare namespace S {
   export type Input<T> = Sury.Input<T>;
   export type Schema<Output, Input = unknown> = Sury.Schema<Output, Input>;
   export const string: typeof Sury.string;
+  export const address: Sury.Schema<Address, Address>;
   export const jsonString: typeof Sury.jsonString;
   export const boolean: typeof Sury.boolean;
   export const int32: typeof Sury.int32;

package/index.js

@@ -12,6 +12,7 @@ export * from "./src/Envio.res.mjs";
 // Important! Should match the index.d.ts file
 export const S = {
   string: Sury.string,
+  address: Sury.string,
   jsonString: Sury.jsonString,
   boolean: Sury.boolean,
   int32: Sury.int32,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v3.0.0-alpha.3",
+  "version": "v3.0.0-alpha.4",
   "type": "module",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
@@ -29,10 +29,10 @@
     "node": ">=22.0.0"
   },
   "optionalDependencies": {
-    "envio-linux-x64": "v3.0.0-alpha.3",
-    "envio-linux-arm64": "v3.0.0-alpha.3",
-    "envio-darwin-x64": "v3.0.0-alpha.3",
-    "envio-darwin-arm64": "v3.0.0-alpha.3"
+    "envio-linux-x64": "v3.0.0-alpha.4",
+    "envio-linux-arm64": "v3.0.0-alpha.4",
+    "envio-darwin-x64": "v3.0.0-alpha.4",
+    "envio-darwin-arm64": "v3.0.0-alpha.4"
   },
   "dependencies": {
     "@clickhouse/client": "1.12.1",

package/src/Config.res

@@ -93,7 +93,7 @@ let make = (
   let ecosystem = switch ecosystem {
   | Ecosystem.Evm => Evm.ecosystem
   | Ecosystem.Fuel => Fuel.ecosystem
-  | Ecosystem.Solana => Solana.ecosystem
+  | Ecosystem.Svm => Svm.ecosystem
   }
 
   let userEntitiesByName =

package/src/Config.res.mjs

@@ -1,10 +1,10 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Evm from "./sources/Evm.res.mjs";
+import * as Svm from "./sources/Svm.res.mjs";
 import * as Fuel from "./sources/Fuel.res.mjs";
 import * as Utils from "./Utils.res.mjs";
 import * as Js_exn from "rescript/lib/es6/js_exn.js";
-import * as Solana from "./sources/Solana.res.mjs";
 import * as Js_dict from "rescript/lib/es6/js_dict.js";
 import * as ChainMap from "./ChainMap.res.mjs";
 import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
@@ -45,8 +45,8 @@ function make(shouldRollbackOnReorgOpt, shouldSaveFullHistoryOpt, chainsOpt, ena
     case "fuel" :
         ecosystem$1 = Fuel.ecosystem;
         break;
-    case "solana" :
-        ecosystem$1 = Solana.ecosystem;
+    case "svm" :
+        ecosystem$1 = Svm.ecosystem;
         break;
     
   }
@@ -105,4 +105,4 @@ export {
   shouldPruneHistory ,
   getChain ,
 }
-/* Utils Not a pure module */
+/* Svm Not a pure module */

package/src/Ecosystem.res

@@ -1,4 +1,4 @@
-type name = | @as("evm") Evm | @as("fuel") Fuel | @as("solana") Solana
+type name = | @as("evm") Evm | @as("fuel") Fuel | @as("svm") Svm
 
 type t = {
   name: name,
@@ -15,7 +15,7 @@ type t = {
 
 let makeOnBlockArgs = (~blockNumber: int, ~ecosystem: t, ~context): Internal.onBlockArgs => {
   switch ecosystem.name {
-  | Solana => {slot: blockNumber, context}
+  | Svm => {slot: blockNumber, context}
   | _ => {
       let blockEvent = Js.Dict.empty()
       blockEvent->Js.Dict.set(ecosystem.blockNumberName, blockNumber->Utils.magic)

package/src/Ecosystem.res.mjs

@@ -8,7 +8,7 @@ function makeOnBlockArgs(blockNumber, ecosystem, context) {
     case "evm" :
     case "fuel" :
         break;
-    case "solana" :
+    case "svm" :
         return {
                 slot: blockNumber,
                 context: context

package/src/Envio.gen.ts

@@ -15,7 +15,7 @@ export type blockEvent = { readonly number: number };
 
 export type fuelBlockEvent = { readonly height: number };
 
-export type solanaOnBlockArgs<context> = { readonly slot: number; readonly context: context };
+export type svmOnBlockArgs<context> = { readonly slot: number; readonly context: context };
 
 export type onBlockArgs<block,context> = { readonly block: block; readonly context: context };
 

package/src/Envio.res

@@ -9,7 +9,7 @@ type blockEvent = {number: int}
 type fuelBlockEvent = {height: int}
 
 @genType
-type solanaOnBlockArgs<'context> = {slot: int, context: 'context}
+type svmOnBlockArgs<'context> = {slot: int, context: 'context}
 
 @genType
 type onBlockArgs<'block, 'context> = {

package/src/Internal.res

@@ -2,6 +2,47 @@ type eventParams
 type eventBlock
 type eventTransaction
 
+// Shared EVM transaction fields type used by both RPC and HyperSync sources
+// Field names match HyperSyncClient.ResponseTypes.transaction for consistency
+type evmTransactionFields = {
+  from?: Address.t,
+  to?: Address.t,
+  gas?: bigint,
+  gasPrice?: bigint,
+  hash?: string,
+  input?: string,
+  nonce?: bigint,
+  transactionIndex?: int,
+  value?: bigint,
+  // Signature fields - optional for ZKSync EIP-712 compatibility
+  v?: string,
+  r?: string,
+  s?: string,
+  yParity?: string,
+  // EIP-1559 fields
+  maxPriorityFeePerGas?: bigint,
+  maxFeePerGas?: bigint,
+  // EIP-4844 blob fields
+  maxFeePerBlobGas?: bigint,
+  blobVersionedHashes?: array<string>,
+  // Receipt fields (from joined transaction receipts)
+  cumulativeGasUsed?: bigint,
+  effectiveGasPrice?: bigint,
+  gasUsed?: bigint,
+  contractAddress?: string,
+  logsBloom?: string,
+  @as("type")
+  type_?: int,
+  root?: string,
+  status?: int,
+  // L2 specific fields (Optimism, Arbitrum, etc.)
+  l1Fee?: bigint,
+  l1GasPrice?: bigint,
+  l1GasUsed?: bigint,
+  l1FeeScalar?: int,
+  gasUsedForL1?: bigint,
+}
+
 @genType
 type genericEvent<'params, 'block, 'transaction> = {
   params: 'params,

package/src/Types.ts

@@ -1,6 +1,6 @@
 export type Invalid = never;
 
-export type Address = string;
+export type Address = `0x${string}`;
 
 export type Logger = {
   readonly debug: (

package/src/Utils.res

@@ -175,6 +175,15 @@ module Dict = {
     }
   `)
 
+  let unsafeDeleteUndefinedFieldsInPlace: 'a => unit = %raw(`(dict) => {
+      for (var key in dict) {
+        if (dict[key] === undefined) {
+          delete dict[key];
+        }
+      }
+    }
+  `)
+
   let updateImmutable: (
     dict<'a>,
     string,
@@ -472,6 +481,12 @@ module Schema = {
     ->(magic: S.t<Js.Json.t> => S.t<Js.Date.t>)
     ->S.preprocess(_ => {serializer: date => date->magic->Js.Date.toISOString})
 
+  // ClickHouse expects timestamps as numbers (milliseconds), not ISO strings
+  let clickHouseDate =
+    S.json(~validate=false)
+    ->(magic: S.t<Js.Json.t> => S.t<Js.Date.t>)
+    ->S.preprocess(_ => {serializer: date => date->magic->Js.Date.getTime})
+
   // When trying to serialize data to Json pg type, it will fail with
   // PostgresError: column "params" is of type json but expression is of type boolean
   // If there's bool or null on the root level. It works fine as object field values.

package/src/Utils.res.mjs

@@ -151,6 +151,14 @@ var deleteInPlace = ((dict, key) => {
       delete dict[key];
     });
 
+var unsafeDeleteUndefinedFieldsInPlace = ((dict) => {
+      for (var key in dict) {
+        if (dict[key] === undefined) {
+          delete dict[key];
+        }
+      }
+    });
+
 var updateImmutable = ((dict, key, value) => ({...dict, [key]: value}));
 
 var shallowCopy = ((dict) => ({...dict}));
@@ -172,6 +180,7 @@ var Dict = {
   size: size,
   isEmpty: isEmpty,
   deleteInPlace: deleteInPlace,
+  unsafeDeleteUndefinedFieldsInPlace: unsafeDeleteUndefinedFieldsInPlace,
   updateImmutable: updateImmutable,
   shallowCopy: shallowCopy,
   incrementByInt: incrementByInt
@@ -449,6 +458,14 @@ var dbDate = S$RescriptSchema.preprocess(S$RescriptSchema.json(false), (function
               };
       }));
 
+var clickHouseDate = S$RescriptSchema.preprocess(S$RescriptSchema.json(false), (function (param) {
+        return {
+                s: (function (date) {
+                    return date.getTime();
+                  })
+              };
+      }));
+
 function coerceToJsonPgType(schema) {
   return S$RescriptSchema.preprocess(schema, (function (s) {
                 var match = s.schema.t;
@@ -485,6 +502,7 @@ var Schema = {
   getNonOptionalFieldNames: getNonOptionalFieldNames,
   getCapitalizedFieldNames: getCapitalizedFieldNames,
   dbDate: dbDate,
+  clickHouseDate: clickHouseDate,
   coerceToJsonPgType: coerceToJsonPgType
 };
 

package/src/bindings/ClickHouse.res

@@ -98,6 +98,36 @@ let getClickHouseFieldType = (
   isNullable ? `Nullable(${baseType})` : baseType
 }
 
+// Creates an entity schema from table definition, using clickHouseDate for Date fields
+let makeClickHouseEntitySchema = (table: Table.table): S.t<Internal.entity> => {
+  S.schema(s => {
+    let dict = Js.Dict.empty()
+    table.fields->Belt.Array.forEach(field => {
+      switch field {
+      | Field(f) => {
+          let fieldName = f->Table.getDbFieldName
+          let fieldSchema = switch f.fieldType {
+          | Date => {
+              let dateSchema = Utils.Schema.clickHouseDate->S.toUnknown
+              if f.isNullable {
+                S.null(dateSchema)->S.toUnknown
+              } else if f.isArray {
+                S.array(dateSchema)->S.toUnknown
+              } else {
+                dateSchema
+              }
+            }
+          | _ => f.fieldSchema
+          }
+          dict->Js.Dict.set(fieldName, s.matches(fieldSchema))
+        }
+      | DerivedFrom(_) => () // Skip derived fields
+      }
+    })
+    dict->Utils.magic
+  })
+}
+
 let setCheckpointsOrThrow = async (client, ~batch: Batch.t, ~database: string) => {
   let checkpointsCount = batch.checkpointIds->Array.length
   if checkpointsCount === 0 {
@@ -154,7 +184,7 @@ let setUpdatesOrThrow = async (
           )}\``,
         convertOrThrow: S.compile(
           S.union([
-            EntityHistory.makeSetUpdateSchema(entityConfig.schema),
+            EntityHistory.makeSetUpdateSchema(makeClickHouseEntitySchema(entityConfig.table)),
             S.object(s => {
               s.tag(EntityHistory.changeFieldName, EntityHistory.RowAction.DELETE)
               Change.Delete({

package/src/bindings/ClickHouse.res.mjs

@@ -76,6 +76,31 @@ function getClickHouseFieldType(fieldType, isNullable, isArray) {
   }
 }
 
+function makeClickHouseEntitySchema(table) {
+  return S$RescriptSchema.schema(function (s) {
+              var dict = {};
+              Belt_Array.forEach(table.fields, (function (field) {
+                      if (field.TAG !== "Field") {
+                        return ;
+                      }
+                      var f = field._0;
+                      var fieldName = Table.getDbFieldName(f);
+                      var match = f.fieldType;
+                      var fieldSchema;
+                      if (typeof match !== "object" && match === "Date") {
+                        var dateSchema = Utils.Schema.clickHouseDate;
+                        fieldSchema = f.isNullable ? S$RescriptSchema.$$null(dateSchema) : (
+                            f.isArray ? S$RescriptSchema.array(dateSchema) : dateSchema
+                          );
+                      } else {
+                        fieldSchema = f.fieldSchema;
+                      }
+                      dict[fieldName] = s.m(fieldSchema);
+                    }));
+              return dict;
+            });
+}
+
 async function setCheckpointsOrThrow(client, batch, database) {
   var checkpointsCount = batch.checkpointIds.length;
   if (checkpointsCount === 0) {
@@ -120,7 +145,7 @@ async function setUpdatesOrThrow(client, updates, entityConfig, database) {
   } else {
     var cache_tableName = database + ".\`" + EntityHistory.historyTableName(entityConfig.name, entityConfig.index) + "\`";
     var cache_convertOrThrow = S$RescriptSchema.compile(S$RescriptSchema.union([
-              EntityHistory.makeSetUpdateSchema(entityConfig.schema),
+              EntityHistory.makeSetUpdateSchema(makeClickHouseEntitySchema(entityConfig.table)),
               S$RescriptSchema.object(function (s) {
                     s.tag(EntityHistory.changeFieldName, "DELETE");
                     return {
@@ -264,6 +289,7 @@ async function resume(client, database, checkpointId) {
 
 export {
   getClickHouseFieldType ,
+  makeClickHouseEntitySchema ,
   setCheckpointsOrThrow ,
   setUpdatesOrThrow ,
   makeCreateHistoryTableQuery ,

package/src/bindings/Ethers.res

@@ -2,15 +2,6 @@ type abi = EvmTypes.Abi.t
 
 let makeAbi = (abi: Js.Json.t): abi => abi->Utils.magic
 
-@deprecated("Use Address.t instead. The type will be removed in v3")
-type ethAddress = Address.t
-@deprecated("Use Address.Evm.fromStringOrThrow instead. The function will be removed in v3")
-let getAddressFromStringUnsafe = Address.Evm.fromStringOrThrow
-@deprecated("Use Address.toString instead. The function will be removed in v3")
-let ethAddressToString = Address.toString
-@deprecated("Use Address.schema instead. The function will be removed in v3")
-let ethAddressSchema = Address.schema
-
 type txHash = string
 
 module Constants = {
@@ -18,35 +9,6 @@ module Constants = {
   @module("ethers") @scope("ethers") external zeroAddress: Address.t = "ZeroAddress"
 }
 
-module Addresses = {
-  @genType
-  let mockAddresses = [
-    "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-    "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-    "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-    "0x90F79bf6EB2c4f870365E785982E1f101E93b906",
-    "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
-    "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-    "0x976EA74026E726554dB657fA54763abd0C3a0aa9",
-    "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
-    "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
-    "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-    "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
-    "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
-    "0xFABB0ac9d68B0B445fB7357272Ff202C5651694a",
-    "0x1CBd3b2770909D4e10f157cABC84C7264073C9Ec",
-    "0xdF3e18d64BC6A983f673Ab319CCaE4f1a57C7097",
-    "0xcd3B766CCDd6AE721141F452C550Ca635964ce71",
-    "0x2546BcD3c84621e976D8185a91A922aE77ECEc30",
-    "0xbDA5747bFD65F08deb54cb465eB87D40e51B197E",
-    "0xdD2FD4581271e230360230F9337D5c0430Bf44C0",
-    "0x8626f6940E2eb28930eFb4CeF49B2d1F2C9C1199",
-  ]->Belt.Array.map(getAddressFromStringUnsafe)
-  @genType
-  let defaultAddress =
-    mockAddresses[0]
-}
-
 module Filter = {
   type t
 }
@@ -144,41 +106,43 @@ module JsonRpcProvider = {
   @send
   external getLogs: (t, ~filter: Filter.t) => promise<array<log>> = "getLogs"
 
-  @send
-  external getTransaction: (t, ~transactionHash: string) => promise<transaction> = "getTransaction"
-
   let makeGetTransactionFields = (~getTransactionByHash, ~lowercaseAddresses: bool) => async (
     log: log,
-  ): promise<unknown> => {
-    let transaction = await getTransactionByHash(log.transactionHash)
+  ): promise<Internal.evmTransactionFields> => {
+    let transaction: Internal.evmTransactionFields = await getTransactionByHash(log.transactionHash)
     // Mutating should be fine, since the transaction isn't used anywhere else outside the function
     let fields: {..} = transaction->Obj.magic
 
-    // Make it compatible with HyperSync transaction fields
+    // RPC may return null for transactionIndex on pending transactions
     fields["transactionIndex"] = log.transactionIndex
-    fields["input"] = fields["data"]
 
     // NOTE: this is wasteful if these fields are not selected in the users config.
     //       There might be a better way to do this in the `makeThrowingGetEventTransaction` function rather based on the schema.
     //       However this is not extremely expensive and good enough for now (only on rpc sync also).
-    if lowercaseAddresses {
-      open Js.Nullable
-      switch fields["from"] {
-      | Value(from) => fields["from"] = from->Js.String2.toLowerCase
-      | Undefined => ()
-      | Null => ()
-      }
-      switch fields["to"] {
-      | Value(to) => fields["to"] = to->Js.String2.toLowerCase
-      | Undefined => ()
-      | Null => ()
-      }
-      switch fields["contractAddress"] {
-      | Value(contractAddress) =>
-        fields["contractAddress"] = contractAddress->Js.String2.toLowerCase
-      | Undefined => ()
-      | Null => ()
-      }
+    open Js.Nullable
+    switch fields["from"] {
+    | Value(from) =>
+      fields["from"] = lowercaseAddresses
+        ? from->Js.String2.toLowerCase->Address.unsafeFromString
+        : from->Address.Evm.fromStringOrThrow
+    | Undefined => ()
+    | Null => ()
+    }
+    switch fields["to"] {
+    | Value(to) =>
+      fields["to"] = lowercaseAddresses
+        ? to->Js.String2.toLowerCase->Address.unsafeFromString
+        : to->Address.Evm.fromStringOrThrow
+    | Undefined => ()
+    | Null => ()
+    }
+    switch fields["contractAddress"] {
+    | Value(contractAddress) =>
+      fields["contractAddress"] = lowercaseAddresses
+        ? contractAddress->Js.String2.toLowerCase->Address.unsafeFromString
+        : contractAddress->Address.Evm.fromStringOrThrow
+    | Undefined => ()
+    | Null => ()
     }
 
     fields->Obj.magic

package/src/bindings/Ethers.res.mjs

@@ -2,52 +2,14 @@
 
 import * as Ethers from "ethers";
 import * as Address from "../Address.res.mjs";
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-import * as Caml_array from "rescript/lib/es6/caml_array.js";
 import * as Caml_option from "rescript/lib/es6/caml_option.js";
 
 function makeAbi(abi) {
   return abi;
 }
 
-var getAddressFromStringUnsafe = Address.Evm.fromStringOrThrow;
-
-function ethAddressToString(prim) {
-  return prim;
-}
-
 var Constants = {};
 
-var mockAddresses = Belt_Array.map([
-      "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-      "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-      "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-      "0x90F79bf6EB2c4f870365E785982E1f101E93b906",
-      "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
-      "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-      "0x976EA74026E726554dB657fA54763abd0C3a0aa9",
-      "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
-      "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
-      "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-      "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
-      "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
-      "0xFABB0ac9d68B0B445fB7357272Ff202C5651694a",
-      "0x1CBd3b2770909D4e10f157cABC84C7264073C9Ec",
-      "0xdF3e18d64BC6A983f673Ab319CCaE4f1a57C7097",
-      "0xcd3B766CCDd6AE721141F452C550Ca635964ce71",
-      "0x2546BcD3c84621e976D8185a91A922aE77ECEc30",
-      "0xbDA5747bFD65F08deb54cb465eB87D40e51B197E",
-      "0xdD2FD4581271e230360230F9337D5c0430Bf44C0",
-      "0x8626f6940E2eb28930eFb4CeF49B2d1F2C9C1199"
-    ], getAddressFromStringUnsafe);
-
-var defaultAddress = Caml_array.get(mockAddresses, 0);
-
-var Addresses = {
-  mockAddresses: mockAddresses,
-  defaultAddress: defaultAddress
-};
-
 var Filter = {};
 
 function toFilter(combinedFilter) {
@@ -81,26 +43,23 @@ function makeGetTransactionFields(getTransactionByHash, lowercaseAddresses) {
   return async function (log) {
     var transaction = await getTransactionByHash(log.transactionHash);
     transaction.transactionIndex = log.transactionIndex;
-    transaction.input = transaction.data;
-    if (lowercaseAddresses) {
-      var from = transaction.from;
-      if (from === null || from === undefined) {
-        from === null;
-      } else {
-        transaction.from = from.toLowerCase();
-      }
-      var to = transaction.to;
-      if (to === null || to === undefined) {
-        to === null;
-      } else {
-        transaction.to = to.toLowerCase();
-      }
-      var contractAddress = transaction.contractAddress;
-      if (contractAddress === null || contractAddress === undefined) {
-        contractAddress === null;
-      } else {
-        transaction.contractAddress = contractAddress.toLowerCase();
-      }
+    var from = transaction.from;
+    if (from === null || from === undefined) {
+      from === null;
+    } else {
+      transaction.from = lowercaseAddresses ? from.toLowerCase() : Address.Evm.fromStringOrThrow(from);
+    }
+    var to = transaction.to;
+    if (to === null || to === undefined) {
+      to === null;
+    } else {
+      transaction.to = lowercaseAddresses ? to.toLowerCase() : Address.Evm.fromStringOrThrow(to);
+    }
+    var contractAddress = transaction.contractAddress;
+    if (contractAddress === null || contractAddress === undefined) {
+      contractAddress === null;
+    } else {
+      transaction.contractAddress = lowercaseAddresses ? contractAddress.toLowerCase() : Address.Evm.fromStringOrThrow(contractAddress);
     }
     return transaction;
   };
@@ -112,19 +71,13 @@ var JsonRpcProvider = {
   makeGetTransactionFields: makeGetTransactionFields
 };
 
-var ethAddressSchema = Address.schema;
-
 export {
   makeAbi ,
-  getAddressFromStringUnsafe ,
-  ethAddressToString ,
-  ethAddressSchema ,
   Constants ,
-  Addresses ,
   Filter ,
   CombinedFilter ,
   logToMinimumParseableLogData ,
   Network ,
   JsonRpcProvider ,
 }
-/* mockAddresses Not a pure module */
+/* ethers Not a pure module */