fix(hubble): improve reorg handling

unionlabs · Sep 17, 2024 · 4acbfa8 · 4acbfa8
1 parent 0ddbf5a
commit 4acbfa8
Show file tree

Hide file tree

Showing 40 changed files with 2,403 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/hubble/.sqlx/query-01c82e1e1eb476c1285d3c24347115e794f29318aaca341c04261f81bcd1a903.json b/hubble/.sqlx/query-01c82e1e1eb476c1285d3c24347115e794f29318aaca341c04261f81bcd1a903.json
diff --git a/hubble/.sqlx/query-28002e29c0654545286e0c1aff7fefc27655e8c4f347b5ab79a33f6739b6f31d.json b/hubble/.sqlx/query-28002e29c0654545286e0c1aff7fefc27655e8c4f347b5ab79a33f6739b6f31d.json
diff --git a/hubble/.sqlx/query-2b8671fae8d787b0815d58fac90c8cc344b4d2d666acba2ee980b3d7fce6b2f1.json b/hubble/.sqlx/query-2b8671fae8d787b0815d58fac90c8cc344b4d2d666acba2ee980b3d7fce6b2f1.json
diff --git a/hubble/.sqlx/query-449af1f5d6d35ac5ec7600bc85fc0fdd9786d09a13fde5de6b525ceb47eecd11.json b/hubble/.sqlx/query-449af1f5d6d35ac5ec7600bc85fc0fdd9786d09a13fde5de6b525ceb47eecd11.json
diff --git a/hubble/.sqlx/query-5456a84ffdf5ebecc099b99333561c6999c4dbebb73e39d6532d03951dad244a.json b/hubble/.sqlx/query-5456a84ffdf5ebecc099b99333561c6999c4dbebb73e39d6532d03951dad244a.json
diff --git a/hubble/.sqlx/query-59bfa1ad1e07273027c8569988beef9f0b0d3eafb44d987130d06a38c034fef6.json b/hubble/.sqlx/query-59bfa1ad1e07273027c8569988beef9f0b0d3eafb44d987130d06a38c034fef6.json
diff --git a/hubble/.sqlx/query-64266fb4ad7fa4dfe3489573740897685c23f7ffdb423457747f6e38c984035a.json b/hubble/.sqlx/query-64266fb4ad7fa4dfe3489573740897685c23f7ffdb423457747f6e38c984035a.json
diff --git a/hubble/.sqlx/query-66098f24ec521e0b7ae5baed7273767a0acbcaccb4907ea358b1417fcdfb9f1a.json b/hubble/.sqlx/query-66098f24ec521e0b7ae5baed7273767a0acbcaccb4907ea358b1417fcdfb9f1a.json
diff --git a/hubble/.sqlx/query-6b41e53bdcfd1235f3cdc46a8d4ed6627f1d79b682ba4c0f5f47732df3bf2b0c.json b/hubble/.sqlx/query-6b41e53bdcfd1235f3cdc46a8d4ed6627f1d79b682ba4c0f5f47732df3bf2b0c.json
diff --git a/hubble/.sqlx/query-8720e0b358cd12588bcf09347a506229f032457d0159324bc7d9f476ffa9e4b9.json b/hubble/.sqlx/query-8720e0b358cd12588bcf09347a506229f032457d0159324bc7d9f476ffa9e4b9.json
diff --git a/hubble/.sqlx/query-8b2d541673102e4e7010d5ed81c6f9f30476642596872a2d1abe1d13a7fde266.json b/hubble/.sqlx/query-8b2d541673102e4e7010d5ed81c6f9f30476642596872a2d1abe1d13a7fde266.json
diff --git a/hubble/.sqlx/query-c6e7eceed358235902b07e91e149c29178aa7ba7c4bbd704cb9c4080240be4c4.json b/hubble/.sqlx/query-c6e7eceed358235902b07e91e149c29178aa7ba7c4bbd704cb9c4080240be4c4.json
diff --git a/hubble/.sqlx/query-d63f763014520aa4298d9602c36964f44613152ce4a06a204c17a7987bcde776.json b/hubble/.sqlx/query-d63f763014520aa4298d9602c36964f44613152ce4a06a204c17a7987bcde776.json
diff --git a/hubble/.sqlx/query-d7bd3a8550dd532755fedb002f87be7bd2ff363f1b76794094690c6e022bec1c.json b/hubble/.sqlx/query-d7bd3a8550dd532755fedb002f87be7bd2ff363f1b76794094690c6e022bec1c.json
diff --git a/hubble/Cargo.toml b/hubble/Cargo.toml
@@ -19,6 +19,7 @@ path = "src/main.rs"
 
 [dependencies]
 alloy              = { version = "0.1", features = ["full"] }
+async-trait        = "0.1.82"
 axum               = { workspace = true, features = ["macros", "tokio"] }
 backon             = "0.4.4"
 base64             = { workspace = true }

diff --git a/hubble/hubble.nix b/hubble/hubble.nix
@@ -55,6 +55,24 @@
         indexers = mkOption {
           type = types.listOf (
             types.submodule {
+              options.indexer_id = mkOption {
+                type = types.nullOr types.str;
+                description = "Id of the indexer which is used by the internal administration of Hubble. Should never change.";
+                example = "amazing-testnet";
+                default = null;
+              };
+              options.internal_chain_id = mkOption {
+                type = types.nullOr types.number;
+                description = "Hubble internal chain id, used to fetch the current height when migrating to fetchers.";
+                example = "4";
+                default = null;
+              };
+              options.new_chain_override = mkOption {
+                type = types.nullOr types.bool;
+                description = "Indicator that this is a new chain, so the current height must not be used when migrating to fetchers.";
+                example = "false";
+                default = null;
+              };
               options.label = mkOption { type = types.str; example = "something-custom"; };
               options.filter = mkOption {
                 type = types.nullOr types.str;
@@ -97,7 +115,7 @@
 
               options.chain_id = mkOption { type = types.nullOr types.str; example = "union-testnet-8"; default = null; };
               options.grpc_url = mkOption { type = types.nullOr types.str; example = "https://grpc.example.com"; default = null; };
-              options.type = mkOption { type = types.enum [ "tendermint" "ethereum" "beacon" "bera" "ethereum-fork" "arb" "scroll" ]; };
+              options.type = mkOption { type = types.enum [ "tendermint" "ethereum" "beacon" "bera" "ethereum-fork" "arb" "scroll" "eth-fetcher" ]; };
               options.start_height = mkOption { type = types.int; example = 1; default = 0; };
               options.chunk_size = mkOption { type = types.int; example = 1; default = 200; };
               options.until = mkOption { type = types.int; example = 1; default = 1000000000000; };

diff --git a/hubble/src/chain_id_query.rs b/hubble/src/chain_id_query.rs
@@ -41,6 +41,8 @@ pub async fn tx(db: PgPool, indexers: Indexers) {
 
     for indexer in indexers {
         match indexer {
+            IndexerConfig::DummyFetcher(_) => {}
+            IndexerConfig::EthFetcher(_) => {}
             IndexerConfig::Scroll(_) => {}
             IndexerConfig::Arb(_) => {}
             IndexerConfig::Beacon(_) => {}