chore(batcher): add disabled verifiers to the batcher config (#2169)

Co-authored-by: JuArce <[email protected]>

Author: maximopalopoli

config-files/config-batcher-docker.yaml

@@ -28,6 +28,9 @@ batcher:
   pre_verification_is_enabled: true
   metrics_port: 9093
   telemetry_ip_port_address: localhost:4001
+  # The specific name for each verifier should match the ProvingSystemId string representation
+  # Possible values: GnarkPlonkBls12_381, GnarkPlonkBn254, GnarkGroth16Bn254, SP1, Risc0, CircomGroth16Bn256, Mina, MinaAccount
+  disabled_verifiers: []
   non_paying:
     address: '0xa0Ee7A142d267C1f36714E4a8F75612F20a79720' # Anvil address 9
     replacement_private_key: ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 # Anvil address 1

config-files/config-batcher-ethereum-package.yaml

@@ -26,6 +26,9 @@ batcher:
   pre_verification_is_enabled: true
   metrics_port: 9093
   telemetry_ip_port_address: localhost:4001
+  # The specific name for each verifier should match the ProvingSystemId string representation
+  # Possible values: GnarkPlonkBls12_381, GnarkPlonkBn254, GnarkGroth16Bn254, SP1, Risc0, CircomGroth16Bn256, Mina, MinaAccount
+  disabled_verifiers: []
   non_paying:
     address: '0xa0Ee7A142d267C1f36714E4a8F75612F20a79720' # Anvil address 9
     replacement_private_key: ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 # Anvil address 1

config-files/config-batcher.yaml

@@ -28,6 +28,9 @@ batcher:
   pre_verification_is_enabled: true
   metrics_port: 9093
   telemetry_ip_port_address: localhost:4001
+  # The specific name for each verifier should match the ProvingSystemId string representation
+  # Possible values: GnarkPlonkBls12_381, GnarkPlonkBn254, GnarkGroth16Bn254, SP1, Risc0, CircomGroth16Bn256, Mina, MinaAccount
+  disabled_verifiers: []
   non_paying:
     address: '0xa0Ee7A142d267C1f36714E4a8F75612F20a79720' # Anvil address 9
     replacement_private_key: ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 # Anvil address 1

crates/batcher/src/config/mod.rs

@@ -1,3 +1,4 @@
+use aligned_sdk::common::types::ProvingSystemId;
 use ethers::{core::k256::ecdsa::SigningKey, signers::Wallet, types::Address};
 use serde::Deserialize;
 
@@ -54,6 +55,7 @@ pub struct BatcherConfigFromYaml {
     pub amount_of_proofs_for_min_max_fee: usize,
     pub min_bump_percentage: u64,
     pub balance_unlock_polling_interval_seconds: u64,
+    pub disabled_verifiers: Vec<ProvingSystemId>,
 }
 
 #[derive(Debug, Deserialize)]

crates/batcher/src/lib.rs

@@ -134,6 +134,10 @@ pub struct Batcher {
 
     disabled_verifiers: Mutex<U256>,
 
+    // The list of disabled verifiers from the config file. Note that this is separate from the
+    // contract's disabled verifiers, and is updated only when the batcher is restarted.
+    config_disabled_verifiers: Vec<ProvingSystemId>,
+
     // Observability and monitoring
     pub metrics: metrics::BatcherMetrics,
     pub telemetry: TelemetrySender,
@@ -298,12 +302,18 @@ impl Batcher {
             None
         };
 
-        let disabled_verifiers = match service_manager.disabled_verifiers().call().await {
-            Ok(disabled_verifiers) => Ok(disabled_verifiers),
+        let contract_disabled_verifiers = match service_manager.disabled_verifiers().call().await {
+            Ok(contract_disabled_verifiers) => Ok(contract_disabled_verifiers),
             Err(_) => service_manager_fallback.disabled_verifiers().call().await,
         }
         .expect("Failed to get disabled verifiers");
 
+        let config_disabled_verifiers = config.batcher.disabled_verifiers.clone();
+        info!(
+            "Disabled verifiers from config: {:?}",
+            config_disabled_verifiers
+        );
+
         let telemetry = TelemetrySender::new(format!(
             "http://{}",
             config.batcher.telemetry_ip_port_address
@@ -347,7 +357,8 @@ impl Batcher {
             posting_batch: Mutex::new(false),
             batch_state: Mutex::new(batch_state),
             user_states,
-            disabled_verifiers: Mutex::new(disabled_verifiers),
+            disabled_verifiers: Mutex::new(contract_disabled_verifiers),
+            config_disabled_verifiers,
             current_min_max_fee: RwLock::new(U256::zero()),
             metrics,
             telemetry,
@@ -1484,6 +1495,10 @@ impl Batcher {
     }
 
     async fn is_verifier_disabled(&self, verifier: ProvingSystemId) -> bool {
+        // Check if the verifier is disabled in the configuration first
+        if self.config_disabled_verifiers.contains(&verifier) {
+            return true;
+        }
         let disabled_verifiers = self.disabled_verifiers.lock().await;
         zk_utils::is_verifier_disabled(*disabled_verifiers, verifier)
     }

crates/sdk/src/common/types.rs

@@ -70,6 +70,24 @@ impl Display for ProvingSystemId {
     }
 }
 
+impl FromStr for ProvingSystemId {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "GnarkPlonkBls12_381" => Ok(ProvingSystemId::GnarkPlonkBls12_381),
+            "GnarkPlonkBn254" => Ok(ProvingSystemId::GnarkPlonkBn254),
+            "GnarkGroth16Bn254" => Ok(ProvingSystemId::GnarkGroth16Bn254),
+            "SP1" => Ok(ProvingSystemId::SP1),
+            "Risc0" => Ok(ProvingSystemId::Risc0),
+            "CircomGroth16Bn256" => Ok(ProvingSystemId::CircomGroth16Bn256),
+            "Mina" => Ok(ProvingSystemId::Mina),
+            "MinaAccount" => Ok(ProvingSystemId::MinaAccount),
+            _ => Err(format!("Invalid ProvingSystemId: {}", s)),
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct VerificationData {
     pub proving_system: ProvingSystemId,