fix: make indexer behind and running threshold parametrizable (#789)

* Make indexer behind and running threshold parameterizable

* Fix tests

chain-signatures/node/src/indexer.rs

@@ -45,6 +45,14 @@ pub struct Options {
         default_value = "145964826"
     )]
     pub start_block_height: u64,
+
+    /// The amount of time before we should that our indexer is behind.
+    #[clap(long, env("MPC_INDEXER_BEHIND_THRESHOLD"), default_value = "180")]
+    pub behind_threshold: u64,
+
+    /// The threshold in seconds to check if the indexer needs to be restarted due to it stalling.
+    #[clap(long, env("MPC_INDEXER_RUNNING_THRESHOLD"), default_value = "300")]
+    pub running_threshold: u64,
 }
 
 impl Options {
@@ -56,6 +64,10 @@ impl Options {
             self.s3_region,
             "--start-block-height".to_string(),
             self.start_block_height.to_string(),
+            "--behind-threshold".to_string(),
+            self.behind_threshold.to_string(),
+            "--running-threshold".to_string(),
+            self.running_threshold.to_string(),
         ];
 
         if let Some(s3_url) = self.s3_url {
@@ -91,16 +103,17 @@ pub struct ContractSignRequest {
 pub struct Indexer {
     latest_block_height: Arc<RwLock<LatestBlockHeight>>,
     last_updated_timestamp: Arc<RwLock<Instant>>,
+    running_threshold: Duration,
+    behind_threshold: Duration,
 }
 
 impl Indexer {
-    const BEHIND_THRESHOLD: Duration = Duration::from_secs(60);
-    const RUNNING_THRESHOLD: Duration = Duration::from_secs(5 * 60);
-
-    fn new(latest_block_height: LatestBlockHeight) -> Self {
+    fn new(latest_block_height: LatestBlockHeight, options: &Options) -> Self {
         Self {
             latest_block_height: Arc::new(RwLock::new(latest_block_height)),
             last_updated_timestamp: Arc::new(RwLock::new(Instant::now())),
+            running_threshold: Duration::from_secs(options.running_threshold),
+            behind_threshold: Duration::from_secs(options.behind_threshold),
         }
     }
 
@@ -111,17 +124,17 @@ impl Indexer {
 
     /// Check whether the indexer is on track with the latest block height from the chain.
     pub async fn is_on_track(&self) -> bool {
-        self.last_updated_timestamp.read().await.elapsed() <= Self::BEHIND_THRESHOLD
+        self.last_updated_timestamp.read().await.elapsed() <= self.behind_threshold
     }
 
     /// Check whether the indexer is on track with the latest block height from the chain.
     pub async fn is_running(&self) -> bool {
-        self.last_updated_timestamp.read().await.elapsed() <= Self::RUNNING_THRESHOLD
+        self.last_updated_timestamp.read().await.elapsed() <= self.running_threshold
     }
 
     /// Check whether the indexer is behind with the latest block height from the chain.
     pub async fn is_behind(&self) -> bool {
-        self.last_updated_timestamp.read().await.elapsed() > Self::BEHIND_THRESHOLD
+        self.last_updated_timestamp.read().await.elapsed() > self.behind_threshold
     }
 
     async fn update_block_height(
@@ -283,7 +296,7 @@ pub fn run(
         }
     });
 
-    let indexer = Indexer::new(latest_block_height);
+    let indexer = Indexer::new(latest_block_height, options);
     let context = Context {
         mpc_contract_id: mpc_contract_id.clone(),
         node_account_id: node_account_id.clone(),

integration-tests/chain-signatures/src/containers.rs

@@ -71,6 +71,8 @@ impl<'a> Node<'a> {
             s3_region: ctx.localstack.s3_region.clone(),
             s3_url: Some(ctx.localstack.s3_host_address.clone()),
             start_block_height: 0,
+            running_threshold: 120,
+            behind_threshold: 120,
         };
         let args = mpc_node::cli::Cli::Start {
             near_rpc: rpc_address_proxied.clone(),
@@ -156,6 +158,8 @@ impl<'a> Node<'a> {
             s3_region: ctx.localstack.s3_region.clone(),
             s3_url: Some(ctx.localstack.s3_host_address.clone()),
             start_block_height: 0,
+            running_threshold: 120,
+            behind_threshold: 120,
         };
         let sign_sk =
             near_crypto::SecretKey::from_seed(near_crypto::KeyType::ED25519, "integration-test");

integration-tests/chain-signatures/src/local.rs

@@ -50,6 +50,8 @@ impl Node {
             s3_region: ctx.localstack.s3_region.clone(),
             s3_url: Some(ctx.localstack.s3_host_address.clone()),
             start_block_height: 0,
+            running_threshold: 120,
+            behind_threshold: 120,
         };
 
         let near_rpc = ctx.lake_indexer.rpc_host_address.clone();
@@ -117,6 +119,8 @@ impl Node {
             s3_region: ctx.localstack.s3_region.clone(),
             s3_url: Some(ctx.localstack.s3_host_address.clone()),
             start_block_height: 0,
+            running_threshold: 120,
+            behind_threshold: 120,
         };
         let sign_sk =
             near_crypto::SecretKey::from_seed(near_crypto::KeyType::ED25519, "integration-test");