refactor: update agent config and startup

gusinacio · gusinacio · commit 7be8db8a037f · 2024-11-26T18:37:59.000-06:00
Signed-off-by: Gustavo Inacio &lt;gustavo@semiotic.ai&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/monitor/Cargo.toml b/crates/monitor/Cargo.toml
@@ -8,6 +8,7 @@ indexer-query = { path = "../query" }
 indexer-allocation = { path = "../allocation" }
 indexer-attestation = { path = "../attestation" }
 indexer-watcher = { path = "../watcher" }
+indexer-config = { path = "../config" }
 thiserror.workspace = true
 alloy.workspace = true
 anyhow.workspace = true
diff --git a/crates/monitor/src/client/mod.rs b/crates/monitor/src/client/mod.rs
@@ -5,3 +5,30 @@ mod monitor;
 mod subgraph_client;
 
 pub use subgraph_client::{DeploymentDetails, SubgraphClient};
+
+use indexer_config::{GraphNodeConfig, SubgraphConfig};
+
+/// Creates a static reference to a subgraph
+pub async fn create_subgraph_client(
+    http_client: reqwest::Client,
+    graph_node: &GraphNodeConfig,
+    subgraph_config: &SubgraphConfig,
+) -> &'static SubgraphClient {
+    Box::leak(Box::new(
+        SubgraphClient::new(
+            http_client,
+            subgraph_config.deployment_id.map(|deployment| {
+                DeploymentDetails::for_graph_node_url(
+                    graph_node.status_url.clone(),
+                    graph_node.query_url.clone(),
+                    deployment,
+                )
+            }),
+            DeploymentDetails::for_query_url_with_token(
+                subgraph_config.query_url.clone(),
+                subgraph_config.query_auth_token.clone(),
+            ),
+        )
+        .await,
+    ))
+}
diff --git a/crates/monitor/src/lib.rs b/crates/monitor/src/lib.rs
@@ -11,7 +11,7 @@ mod escrow_accounts;
 pub use crate::{
     allocations::{indexer_allocations, AllocationWatcher},
     attestation::{attestation_signers, AttestationWatcher},
-    client::{DeploymentDetails, SubgraphClient},
+    client::{create_subgraph_client, DeploymentDetails, SubgraphClient},
     deployment_to_allocation::{deployment_to_allocation, DeploymentToAllocationWatcher},
     dispute_manager::{dispute_manager, DisputeManagerWatcher},
     escrow_accounts::{
diff --git a/crates/service/src/service.rs b/crates/service/src/service.rs
@@ -5,8 +5,8 @@ use std::time::Duration;
 
 use anyhow::anyhow;
 use axum::{extract::Request, serve, ServiceExt};
-use indexer_config::{Config, GraphNodeConfig, SubgraphConfig};
-use indexer_monitor::{DeploymentDetails, SubgraphClient};
+use indexer_config::Config;
+use indexer_monitor::create_subgraph_client;
 use release::IndexerServiceRelease;
 use reqwest::Url;
 use tap_core::tap_eip712_domain;
@@ -125,30 +125,6 @@ pub async fn run() -> anyhow::Result<()> {
         .await?)
 }
 
-async fn create_subgraph_client(
-    http_client: reqwest::Client,
-    graph_node: &GraphNodeConfig,
-    subgraph_config: &SubgraphConfig,
-) -> &'static SubgraphClient {
-    Box::leak(Box::new(
-        SubgraphClient::new(
-            http_client,
-            subgraph_config.deployment_id.map(|deployment| {
-                DeploymentDetails::for_graph_node_url(
-                    graph_node.status_url.clone(),
-                    graph_node.query_url.clone(),
-                    deployment,
-                )
-            }),
-            DeploymentDetails::for_query_url_with_token(
-                subgraph_config.query_url.clone(),
-                subgraph_config.query_auth_token.clone(),
-            ),
-        )
-        .await,
-    ))
-}
-
 /// Graceful shutdown handler
 async fn shutdown_handler() {
     let ctrl_c = async {
diff --git a/crates/tap-agent/Cargo.toml b/crates/tap-agent/Cargo.toml
@@ -44,6 +44,7 @@ ractor = { version = "0.13", features = [
   "async-trait",
 ], default-features = false }
 tap_aggregator.workspace = true
+typed-builder.workspace = true
 futures = { version = "0.3.30", default-features = false }
 
 [dev-dependencies]
diff --git a/crates/tap-agent/src/agent.rs b/crates/tap-agent/src/agent.rs
@@ -1,133 +1,84 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-use indexer_config::{
-    Config, EscrowSubgraphConfig, GraphNodeConfig, IndexerConfig, NetworkSubgraphConfig,
-    SubgraphConfig, SubgraphsConfig, TapConfig,
-};
-use indexer_monitor::{escrow_accounts, indexer_allocations, DeploymentDetails, SubgraphClient};
-use ractor::concurrency::JoinHandle;
-use ractor::{Actor, ActorRef};
-use sender_account::SenderAccountConfig;
+use indexer_config::{Config, IndexerConfig, SubgraphsConfig, TapConfig};
+use indexer_monitor::{create_subgraph_client, escrow_accounts, indexer_allocations};
+use ractor::{concurrency::JoinHandle, Actor, ActorRef};
+use tap_core::tap_eip712_domain;
 
-use crate::agent::sender_accounts_manager::{
-    SenderAccountsManagerArgs, SenderAccountsManagerMessage,
+use crate::{
+    agent::{
+        sender_account::SenderAccountConfig,
+        sender_accounts_manager::{
+            SenderAccountsManager, SenderAccountsManagerArgs, SenderAccountsManagerMessage,
+        },
+    },
+    database,
 };
-use crate::{database, CONFIG, EIP_712_DOMAIN};
-use sender_accounts_manager::SenderAccountsManager;
 
 mod metrics;
 pub mod sender_account;
 pub mod sender_accounts_manager;
 pub mod sender_allocation;
 pub mod unaggregated_receipts;
 
-pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandle<()>) {
+pub async fn start_agent(
+    config: Config,
+) -> (ActorRef<SenderAccountsManagerMessage>, JoinHandle<()>) {
+    let domain_separator = tap_eip712_domain(
+        config.blockchain.chain_id as u64,
+        config.blockchain.receipts_verifier_address,
+    );
     let Config {
         indexer: IndexerConfig {
             indexer_address, ..
         },
-        graph_node:
-            GraphNodeConfig {
-                status_url: graph_node_status_endpoint,
-                query_url: graph_node_query_endpoint,
-            },
-        database,
-        subgraphs:
-            SubgraphsConfig {
-                network:
-                    NetworkSubgraphConfig {
-                        config:
-                            SubgraphConfig {
-                                query_url: network_query_url,
-                                query_auth_token: network_query_auth_token,
-                                deployment_id: network_deployment_id,
-                                syncing_interval_secs: network_sync_interval,
-                            },
-                        recently_closed_allocation_buffer_secs: recently_closed_allocation_buffer,
-                    },
-                escrow:
-                    EscrowSubgraphConfig {
-                        config:
-                            SubgraphConfig {
-                                query_url: escrow_query_url,
-                                query_auth_token: escrow_query_auth_token,
-                                deployment_id: escrow_deployment_id,
-                                syncing_interval_secs: escrow_sync_interval,
-                            },
-                    },
-            },
+        ref graph_node,
+        ref database,
+        subgraphs: SubgraphsConfig {
+            ref network,
+            ref escrow,
+        },
         tap:
             TapConfig {
                 // TODO: replace with a proper implementation once the gateway registry contract is ready
-                sender_aggregator_endpoints,
+                ref sender_aggregator_endpoints,
                 ..
             },
         ..
-    } = &*CONFIG;
+    } = config;
     let pgpool = database::connect(database.clone()).await;
 
     let http_client = reqwest::Client::new();
 
-    let network_subgraph = Box::leak(Box::new(
-        SubgraphClient::new(
-            http_client.clone(),
-            network_deployment_id.map(|deployment| {
-                DeploymentDetails::for_graph_node_url(
-                    graph_node_status_endpoint.clone(),
-                    graph_node_query_endpoint.clone(),
-                    deployment,
-                )
-            }),
-            DeploymentDetails::for_query_url_with_token(
-                network_query_url.clone(),
-                network_query_auth_token.clone(),
-            ),
-        )
-        .await,
-    ));
+    let network_subgraph =
+        create_subgraph_client(http_client.clone(), graph_node, &network.config).await;
 
     let indexer_allocations = indexer_allocations(
         network_subgraph,
-        *indexer_address,
-        *network_sync_interval,
-        *recently_closed_allocation_buffer,
+        indexer_address,
+        network.config.syncing_interval_secs,
+        network.recently_closed_allocation_buffer_secs,
     )
     .await
     .expect("Failed to initialize indexer_allocations watcher");
 
-    let escrow_subgraph = Box::leak(Box::new(
-        SubgraphClient::new(
-            http_client.clone(),
-            escrow_deployment_id.map(|deployment| {
-                DeploymentDetails::for_graph_node_url(
-                    graph_node_status_endpoint.clone(),
-                    graph_node_query_endpoint.clone(),
-                    deployment,
-                )
-            }),
-            DeploymentDetails::for_query_url_with_token(
-                escrow_query_url.clone(),
-                escrow_query_auth_token.clone(),
-            ),
-        )
-        .await,
-    ));
+    let escrow_subgraph = create_subgraph_client(http_client, graph_node, &escrow.config).await;
 
     let escrow_accounts = escrow_accounts(
         escrow_subgraph,
-        *indexer_address,
-        *escrow_sync_interval,
+        indexer_address,
+        escrow.config.syncing_interval_secs,
         false,
     )
     .await
     .expect("Error creating escrow_accounts channel");
 
-    let config = Box::leak(Box::new(SenderAccountConfig::from_config(&CONFIG)));
+    let config = SenderAccountConfig::from_config(&config);
 
     let args = SenderAccountsManagerArgs {
         config,
-        domain_separator: EIP_712_DOMAIN.clone(),
+        domain_separator,
         pgpool,
         indexer_allocations,
         escrow_accounts,
diff --git a/crates/tap-agent/src/agent/sender_account.rs b/crates/tap-agent/src/agent/sender_account.rs
@@ -102,16 +102,16 @@ pub struct SenderAccountConfig {
 }
 
 impl SenderAccountConfig {
-    pub fn from_config(config: &indexer_config::Config) -> Self {
-        Self {
+    pub fn from_config(config: &indexer_config::Config) -> &'static Self {
+        Box::leak(Box::new(Self {
             rav_request_buffer: config.tap.rav_request.timestamp_buffer_secs,
             rav_request_receipt_limit: config.tap.rav_request.max_receipts_per_request,
             indexer_address: config.indexer.indexer_address,
             escrow_polling_interval: config.subgraphs.escrow.config.syncing_interval_secs,
             max_amount_willing_to_lose_grt: config.tap.max_amount_willing_to_lose_grt.get_value(),
             trigger_value: config.tap.get_trigger_value(),
             rav_request_timeout: config.tap.rav_request.request_timeout_secs,
-        }
+        }))
     }
 }
 
diff --git a/crates/tap-agent/src/agent/sender_accounts_manager.rs b/crates/tap-agent/src/agent/sender_accounts_manager.rs
@@ -55,7 +55,6 @@ pub struct SenderAccountsManagerArgs {
 
     pub prefix: Option<String>,
 }
-
 #[async_trait::async_trait]
 impl Actor for SenderAccountsManager {
     type Msg = SenderAccountsManagerMessage;
diff --git a/crates/tap-agent/src/lib.rs b/crates/tap-agent/src/lib.rs
@@ -1,19 +1,6 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-use alloy::dyn_abi::Eip712Domain;
-use indexer_config::Config;
-use lazy_static::lazy_static;
-use tap_core::tap_eip712_domain;
-
-lazy_static! {
-    pub static ref CONFIG: Config = cli::get_config().expect("Failed to load configuration");
-    pub static ref EIP_712_DOMAIN: Eip712Domain = tap_eip712_domain(
-        CONFIG.blockchain.chain_id as u64,
-        CONFIG.blockchain.receipts_verifier_address,
-    );
-}
-
 pub mod adaptative_concurrency;
 pub mod agent;
 pub mod backoff;
diff --git a/crates/tap-agent/src/main.rs b/crates/tap-agent/src/main.rs
@@ -6,17 +6,19 @@ use ractor::ActorStatus;
 use tokio::signal::unix::{signal, SignalKind};
 use tracing::{debug, error, info};
 
-use indexer_tap_agent::{agent, metrics, CONFIG};
+use indexer_tap_agent::{agent, cli, metrics};
 
 #[tokio::main]
 async fn main() -> Result<()> {
     // Parse basic configurations, also initializes logging.
-    lazy_static::initialize(&CONFIG);
 
-    let (manager, handler) = agent::start_agent().await;
+    let config = cli::get_config().expect("Failed to load configuration");
+    let metrics_port = config.metrics.port;
+
+    let (manager, handler) = agent::start_agent(config).await;
     info!("TAP Agent started.");
 
-    tokio::spawn(metrics::run_server(CONFIG.metrics.port));
+    tokio::spawn(metrics::run_server(metrics_port));
     info!("Metrics port opened");
 
     // Have tokio wait for SIGTERM or SIGINT.

Original file line number	Diff line number	Diff line change
`@@ -102,16 +102,16 @@ pub struct SenderAccountConfig {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`impl SenderAccountConfig {`
`105`		`- pub fn from_config(config: &indexer_config::Config) -> Self {`
`106`		`- Self {`
	`105`	`+ pub fn from_config(config: &indexer_config::Config) -> &'static Self {`
	`106`	`+ Box::leak(Box::new(Self {`
`107`	`107`	`rav_request_buffer: config.tap.rav_request.timestamp_buffer_secs,`
`108`	`108`	`rav_request_receipt_limit: config.tap.rav_request.max_receipts_per_request,`
`109`	`109`	`indexer_address: config.indexer.indexer_address,`
`110`	`110`	`escrow_polling_interval: config.subgraphs.escrow.config.syncing_interval_secs,`
`111`	`111`	`max_amount_willing_to_lose_grt: config.tap.max_amount_willing_to_lose_grt.get_value(),`
`112`	`112`	`trigger_value: config.tap.get_trigger_value(),`
`113`	`113`	`rav_request_timeout: config.tap.rav_request.request_timeout_secs,`
`114`		`- }`
	`114`	`+ }))`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ pub struct SenderAccountsManagerArgs {`
`55`	`55`
`56`	`56`	`pub prefix: Option<String>,`
`57`	`57`	`}`
`58`		`-`
`59`	`58`	`#[async_trait::async_trait]`
`60`	`59`	`impl Actor for SenderAccountsManager {`
`61`	`60`	`type Msg = SenderAccountsManagerMessage;`