Merge branch 'main' into obs/add_hash

.github/workflows/deno_test.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Run Tests with Coverage on target branch
         run:
           DEFAULT_BLOCK_GAS_LIMIT=7000000 STARKNET_NETWORK=http://0.0.0.0:1010
-          KAKAROT_ADDRESS=0x11c5faab8a76b3caff6e243b8d13059a7fb723a0ca12bbaadde95fb9e501bda
+          KAKAROT_ADDRESS=0x1d2e513630d8120666fc6e7d52ad0c01479fd99c183baac79fff9135f46e359
           deno test --allow-env --allow-read --coverage=cov_profile
       - name: Generate Coverage Report on target branch
         run: deno coverage cov_profile --html
@@ -38,7 +38,7 @@ jobs:
       - name: Run Tests with Coverage on base branch
         run:
           DEFAULT_BLOCK_GAS_LIMIT=7000000 STARKNET_NETWORK=http://0.0.0.0:1010
-          KAKAROT_ADDRESS=0x11c5faab8a76b3caff6e243b8d13059a7fb723a0ca12bbaadde95fb9e501bda
+          KAKAROT_ADDRESS=0x1d2e513630d8120666fc6e7d52ad0c01479fd99c183baac79fff9135f46e359
           deno test --allow-env --allow-read --coverage=cov_profile_main
       - name: Generate HTML report from for the base branch
         run: deno coverage cov_profile_main --html

.trunk/trunk.yaml

@@ -55,7 +55,7 @@ lint:
 actions:
   disabled:
     - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
   enabled:
     - trunk-upgrade-available
-    - trunk-fmt-pre-commit
-    - trunk-check-pre-push

indexer/src/constants.ts

@@ -2,7 +2,7 @@ import { padString } from "./utils/hex.ts";
 import { hash } from "./deps.ts";
 
 // Get Sink Type or returns "console" if the value is null or undefined
-export const SINK_TYPE = (() => {
+export const SINK_TYPE: "console" | "mongo" = (() => {
   const addr = Deno.env.get("SINK_TYPE") ?? "console";
   if (addr !== "console" && addr !== "mongo") {
     throw new Error("Invalid SINK_TYPE");
@@ -11,17 +11,23 @@ export const SINK_TYPE = (() => {
 })();
 
 // Get the sink options from the sink type
-export const SINK_OPTIONS = SINK_TYPE === "mongo"
+export const SINK_OPTIONS: {
+  connectionString?: string;
+  database?: string;
+  collectionNames: string[];
+} = SINK_TYPE === "mongo"
   ? {
     connectionString: Deno.env.get("MONGO_CONNECTION_STRING") ??
       "mongodb://mongo:mongo@mongo:27017",
     database: Deno.env.get("MONGO_DATABASE_NAME") ?? "kakarot-test-db",
     collectionNames: ["headers", "transactions", "receipts", "logs"],
   }
-  : {};
+  : {
+    collectionNames: [],
+  };
 
 // Get the starting block or returns 0 if the value is null or undefined
-export const STARTING_BLOCK = (() => {
+export const STARTING_BLOCK: number = (() => {
   const startingBlock = Number(Deno.env.get("STARTING_BLOCK") ?? 0);
   return Number.isSafeInteger(startingBlock) && startingBlock >= 0
     ? startingBlock
@@ -31,16 +37,17 @@ export const STARTING_BLOCK = (() => {
 })();
 
 // Get authentication token from Apibara or returns an empty string if the value is null or undefined
-export const AUTH_TOKEN = Deno.env.get("APIBARA_AUTH_TOKEN") ?? "";
+export const AUTH_TOKEN: string = Deno.env.get("APIBARA_AUTH_TOKEN") ?? "";
 
 // Get stream URL or returns "http://localhost:7171" if the value is null or undefined
-export const STREAM_URL = Deno.env.get("STREAM_URL") ?? "http://localhost:7171";
+export const STREAM_URL: string = Deno.env.get("STREAM_URL") ??
+  "http://localhost:7171";
 
 // Creates string that starts with "0x" and is padded to a total length of 64 chars
-export const NULL_HASH = padString("0x", 32);
+export const NULL_HASH: string = padString("0x", 32);
 
 // Get the hash selector from the transaction executed
-export const TRANSACTION_EXECUTED = hash.getSelectorFromName(
+export const TRANSACTION_EXECUTED: string = hash.getSelectorFromName(
   "transaction_executed",
 );
 
@@ -50,3 +57,22 @@ export const KAKAROT_ADDRESS: string = (() => {
   if (!kakarotAddress) throw new Error("ENV: KAKAROT_ADDRESS is not set");
   return kakarotAddress;
 })();
+
+// A default block gas limit in case the call to get_block_gas_limit fails.
+export const DEFAULT_BLOCK_GAS_LIMIT: string = (() => {
+  const defaultBlockGasLimitStr = Deno.env.get("DEFAULT_BLOCK_GAS_LIMIT");
+  if (!defaultBlockGasLimitStr) {
+    throw new Error("ENV: DEFAULT_BLOCK_GAS_LIMIT is not set");
+  }
+  return defaultBlockGasLimitStr;
+})();
+
+// Events containing these keys are not
+// ETH logs and should be ignored.
+export const IGNORED_KEYS: bigint[] = [
+  BigInt(hash.getSelectorFromName("transaction_executed")),
+  BigInt(hash.getSelectorFromName("evm_contract_deployed")),
+  BigInt(hash.getSelectorFromName("Transfer")),
+  BigInt(hash.getSelectorFromName("Approval")),
+  BigInt(hash.getSelectorFromName("OwnershipTransferred")),
+];

indexer/src/types/header.ts

@@ -10,16 +10,7 @@ import { JsonRpcBlock } from "./types.ts";
 import { KAKAROT } from "../provider.ts";
 
 // Constant
-import { NULL_HASH } from "../constants.ts";
-
-// A default block gas limit in case the call to get_block_gas_limit fails.
-export const DEFAULT_BLOCK_GAS_LIMIT = (() => {
-  const defaultBlockGasLimitStr = Deno.env.get("DEFAULT_BLOCK_GAS_LIMIT");
-  if (!defaultBlockGasLimitStr) {
-    throw new Error("ENV: DEFAULT_BLOCK_GAS_LIMIT is not set");
-  }
-  return defaultBlockGasLimitStr;
-})();
+import { DEFAULT_BLOCK_GAS_LIMIT, NULL_HASH } from "../constants.ts";
 
 /**
  * Converts a Starknet block header to an Ethereum block header in JSON RPC format.

indexer/src/types/log.ts

@@ -2,7 +2,10 @@
 import { padBigint } from "../utils/hex.ts";
 
 // Constants
-import { KAKAROT_ADDRESS, NULL_HASH } from "../constants.ts";
+import { IGNORED_KEYS, KAKAROT_ADDRESS, NULL_HASH } from "../constants.ts";
+
+// Types
+import { JsonRpcLog } from "./types.ts";
 
 // Starknet
 import { Event, hash } from "../deps.ts";
@@ -16,18 +19,6 @@ import {
   PrefixedHexString,
 } from "../deps.ts";
 
-import { JsonRpcLog } from "./types.ts";
-
-// Events containing these keys are not
-// ETH logs and should be ignored.
-export const IGNORED_KEYS = [
-  BigInt(hash.getSelectorFromName("transaction_executed")),
-  BigInt(hash.getSelectorFromName("evm_contract_deployed")),
-  BigInt(hash.getSelectorFromName("Transfer")),
-  BigInt(hash.getSelectorFromName("Approval")),
-  BigInt(hash.getSelectorFromName("OwnershipTransferred")),
-];
-
 /**
  * @param transaction - A Ethereum transaction.
  * @param event - A Starknet event.

indexer/tests/filter.test.ts

@@ -227,7 +227,7 @@ Deno.test(
       "0x0",
       "0x0",
       "0x0",
-      "0x11c5faab8a76b3caff6e243b8d13059a7fb723a0ca12bbaadde95fb9e501bda",
+      "0x1d2e513630d8120666fc6e7d52ad0c01479fd99c183baac79fff9135f46e359",
     ];
     const transaction: Transaction = {
       invokeV1: {

indexer/tests/header.test.ts

@@ -6,8 +6,9 @@ import {
   PrefixedHexString,
 } from "../src/deps.ts";
 import { assertEquals } from "https://deno.land/[email protected]/assert/assert_equals.ts";
-import { DEFAULT_BLOCK_GAS_LIMIT, toEthHeader } from "../src/types/header.ts";
+import { toEthHeader } from "../src/types/header.ts";
 import { JsonRpcBlock } from "../src/types/types.ts";
+import { DEFAULT_BLOCK_GAS_LIMIT } from "../src/constants.ts";
 import { padString } from "../src/utils/hex.ts";
 import sinon from "npm:sinon";
 import { KAKAROT } from "../src/provider.ts";

indexer/tests/log.test.ts

@@ -1,8 +1,8 @@
 import { assertEquals } from "https://deno.land/[email protected]/assert/mod.ts";
-import { fromJsonRpcLog, IGNORED_KEYS, toEthLog } from "../src/types/log.ts";
+import { fromJsonRpcLog, toEthLog } from "../src/types/log.ts";
 import { JsonRpcLog } from "../src/types/types.ts";
 import { bigIntToHex, Event, JsonRpcTx } from "../src/deps.ts";
-import { KAKAROT_ADDRESS } from "../src/constants.ts";
+import { IGNORED_KEYS, KAKAROT_ADDRESS } from "../src/constants.ts";
 
 // Mock for hexToBytes
 const mockHexToBytes = (hex: string): Uint8Array => {