refactor: ampd configs should contain a Vec of handler configs

Cargo.toml

@@ -1,16 +1,13 @@
 [workspace]
-members = [
-  "ampd",
-  "contracts/*",
-  "packages/*"
-]
+members = ["ampd", "contracts/*", "packages/*"]
 
 [workspace.dependencies]
 connection-router = { version = "^0.1.0", path = "contracts/connection-router" }
 error-stack = { version = "0.4.0", features = ["eyre"] }
 events = { version = "^0.1.0", path = "packages/events" }
 events-derive = { version = "^0.1.0", path = "packages/events-derive" }
 axelar-wasm-std = { version = "^0.1.0", path = "packages/axelar-wasm-std" }
+itertools = "0.11.0"
 voting-verifier = { version = "^0.1.0", path = "contracts/voting-verifier" }
 multisig = { version = "^0.1.0", path = "contracts/multisig" }
 service-registry = { version = "^0.1.0", path = "contracts/service-registry" }

ampd/Cargo.toml

@@ -25,6 +25,7 @@ events-derive = { workspace = true }
 futures = "0.3.25"
 hex = { version = "0.4.3", features = ["serde"] }
 humantime-serde = "1.1.1"
+itertools = { workspace = true }
 k256 = { version = "0.13.1", features = ["ecdsa"] }
 mockall = "0.11.3"
 multisig = { workspace = true }
@@ -37,7 +38,9 @@ serde_with = "3.2.0"
 # Can switch back once https://github.com/informalsystems/tendermint-rs/issues/1216 is resolved.
 # The fix for the issue is at https://github.com/axelarnetwork/tendermint-rs/commit/e97033e20e660a7e707ea86db174ec047bbba50d.
 tendermint = { git = "https://github.com/axelarnetwork/tendermint-rs.git", branch = "v0.33.x" }
-tendermint-rpc = { git = "https://github.com/axelarnetwork/tendermint-rs.git", branch = "v0.33.x", features = ["http-client"] }
+tendermint-rpc = { git = "https://github.com/axelarnetwork/tendermint-rs.git", branch = "v0.33.x", features = [
+  "http-client",
+] }
 thiserror = "1.0.37"
 tokio = { version = "1.22.0", features = ["signal"] }
 tokio-stream = { version = "0.1.11", features = ["sync"] }

ampd/src/config.rs

@@ -1,8 +1,7 @@
 use serde::Deserialize;
 
 use crate::broadcaster;
-use crate::evm::{deserialize_evm_chain_configs, EvmChainConfig};
-use crate::handlers::multisig::MultisigConfig;
+use crate::handlers::{self, config::deserialize_handler_configs};
 use crate::tofnd::Config as TofndConfig;
 use crate::url::Url;
 
@@ -12,11 +11,10 @@ pub struct Config {
     pub tm_jsonrpc: Url,
     pub tm_grpc: Url,
     pub broadcast: broadcaster::Config,
-    #[serde(deserialize_with = "deserialize_evm_chain_configs")]
-    pub evm_chains: Vec<EvmChainConfig>,
+    #[serde(deserialize_with = "deserialize_handler_configs")]
+    pub handlers: Vec<handlers::config::Config>,
     pub tofnd_config: TofndConfig,
     pub event_buffer_cap: usize,
-    pub multisig: Option<MultisigConfig>,
 }
 
 impl Default for Config {
@@ -25,10 +23,9 @@ impl Default for Config {
             tm_jsonrpc: "http://localhost:26657".parse().unwrap(),
             tm_grpc: "tcp://localhost:9090".parse().unwrap(),
             broadcast: broadcaster::Config::default(),
-            evm_chains: vec![],
+            handlers: vec![],
             tofnd_config: TofndConfig::default(),
             event_buffer_cap: 100000,
-            multisig: None,
         }
     }
 }
@@ -39,56 +36,85 @@ mod tests {
     use rand::rngs::OsRng;
 
     use super::Config;
-    use crate::evm::ChainName;
-    use crate::types::PublicKey;
+    use crate::types::{PublicKey, TMAddress};
 
     #[test]
-    fn deserialize_evm_configs() {
-        let rpc_url = "http://localhost:7545/";
-        let voting_verifier = PublicKey::from(SigningKey::random(&mut OsRng).verifying_key())
-            .account_id("axelar")
-            .unwrap()
-            .into();
-
+    fn deserialize_handlers() {
         let config_str = format!(
             "
-            [[evm_chains]]
+            [[handlers]]
+            type = 'EvmMsgVerifier'
+            cosmwasm_contract = '{}'
+
+            [handlers.chain]
             name = 'Ethereum'
-            rpc_url = '{rpc_url}'
-            voting_verifier = '{voting_verifier}'
+            rpc_url = 'http://localhost:7545/'
+
+            [[handlers]]
+            type = 'EvmMsgVerifier'
+            cosmwasm_contract = '{}'
 
-            [[evm_chains]]
+            [handlers.chain]
             name = 'Polygon'
-            rpc_url = '{rpc_url}'
-            voting_verifier = '{voting_verifier}'
-
-            [[evm_chains]]
-            name = 'Optimism'
-            rpc_url = '{rpc_url}'
-            voting_verifier = '{voting_verifier}'
-            l1_chain_name = 'Ethereum'
+            rpc_url = 'http://localhost:7546/'
+
+            [[handlers]]
+            type = 'MultisigSigner'
+            cosmwasm_contract = '{}'
             ",
+            rand_tm_address(),
+            rand_tm_address(),
+            rand_tm_address(),
         );
+
         let cfg: Config = toml::from_str(config_str.as_str()).unwrap();
-        assert_eq!(cfg.evm_chains.len(), 3);
-
-        let actual = cfg.evm_chains.get(0).unwrap();
-        assert_eq!(actual.name, ChainName::Ethereum);
-        assert_eq!(actual.rpc_url.as_str(), rpc_url);
-        assert_eq!(actual.l1_chain_name, None);
-        assert_eq!(actual.voting_verifier, voting_verifier);
-
-        let actual = cfg.evm_chains.get(1).unwrap();
-        assert_eq!(actual.name, ChainName::Other("Polygon".into()));
-        assert_eq!(actual.rpc_url.as_str(), rpc_url);
-        assert_eq!(actual.l1_chain_name, None);
-        assert_eq!(actual.voting_verifier, voting_verifier);
-
-        let actual = cfg.evm_chains.get(2).unwrap();
-        assert_eq!(actual.name, ChainName::Other("Optimism".into()));
-        assert_eq!(actual.rpc_url.as_str(), rpc_url);
-        assert_eq!(actual.l1_chain_name, Some(ChainName::Ethereum));
-        assert_eq!(actual.voting_verifier, voting_verifier);
+        assert_eq!(cfg.handlers.len(), 3);
+    }
+
+    #[test]
+    fn deserialize_handlers_evm_msg_verifiers_with_the_same_chain_name() {
+        let config_str = format!(
+            "
+            [[handlers]]
+            type = 'EvmMsgVerifier'
+            cosmwasm_contract = '{}'
+
+            [handlers.chain]
+            name = 'Ethereum'
+            rpc_url = 'http://localhost:7545/'
+
+            [[handlers]]
+            type = 'EvmMsgVerifier'
+            cosmwasm_contract = '{}'
+
+            [handlers.chain]
+            name = 'Ethereum'
+            rpc_url = 'http://localhost:7546/'
+            ",
+            rand_tm_address(),
+            rand_tm_address(),
+        );
+
+        assert!(toml::from_str::<Config>(config_str.as_str()).is_err());
+    }
+
+    #[test]
+    fn deserialize_handlers_more_then_one_for_mulsitig_signer() {
+        let config_str = format!(
+            "
+            [[handlers]]
+            type = 'MultisigSigner'
+            cosmwasm_contract = '{}'
+
+            [[handlers]]
+            type = 'MultisigSigner'
+            cosmwasm_contract = '{}'
+            ",
+            rand_tm_address(),
+            rand_tm_address(),
+        );
+
+        assert!(toml::from_str::<Config>(config_str.as_str()).is_err());
     }
 
     #[test]
@@ -130,4 +156,11 @@ mod tests {
         assert_eq!(cfg.tofnd_config.party_uid.as_str(), party_uid);
         assert_eq!(cfg.tofnd_config.key_uid.as_str(), key_uid);
     }
+
+    fn rand_tm_address() -> TMAddress {
+        PublicKey::from(SigningKey::random(&mut OsRng).verifying_key())
+            .account_id("axelar")
+            .unwrap()
+            .into()
+    }
 }

ampd/src/evm/mod.rs

@@ -1,14 +1,9 @@
-use std::collections::HashSet;
 use std::fmt::Display;
 
 use enum_display_derive::Display;
 use ethers::types::U64;
-use serde::de::{self, Deserializer};
 use serde::Deserialize;
 
-use crate::types::TMAddress;
-use crate::url::Url;
-
 pub mod error;
 pub mod finalizer;
 pub mod json_rpc;
@@ -47,53 +42,6 @@ impl ChainName {
     }
 }
 
-#[derive(Debug, Deserialize)]
-pub struct EvmChainConfig {
-    pub name: ChainName,
-    pub rpc_url: Url,
-    pub l1_chain_name: Option<ChainName>,
-    pub voting_verifier: TMAddress,
-}
-
-pub fn deserialize_evm_chain_configs<'de, D>(
-    deserializer: D,
-) -> core::result::Result<Vec<EvmChainConfig>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let evm_configs: Vec<EvmChainConfig> = Deserialize::deserialize(deserializer)?;
-
-    // validate name being unique
-    let chain_names: HashSet<&ChainName> = evm_configs
-        .iter()
-        .map(|evm_config| &evm_config.name)
-        .collect();
-    if evm_configs.len() != chain_names.len() {
-        return Err(de::Error::custom(
-            "the evm_chain_configs must be unique by name",
-        ));
-    }
-
-    for config in &evm_configs {
-        match &config.l1_chain_name {
-            None => continue,
-            Some(l1_chain_name) => {
-                if !chain_names.contains(&l1_chain_name) {
-                    return Err(de::Error::custom(
-                        "l1_chain_name must be one of the evm_chain_configs if set",
-                    ));
-                }
-
-                if *l1_chain_name == config.name {
-                    return Err(de::Error::custom("l1_chain_name must not equal to name"));
-                }
-            }
-        }
-    }
-
-    Ok(evm_configs)
-}
-
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;