keep only MessageIdFormat. Make a generic bech32m MessageIdFormat

Cargo.toml

@@ -13,7 +13,6 @@ rust-version = "1.78.0" # be sure there is an optimizer release supporting this
 edition = "2021"
 
 [workspace.dependencies]
-aleo-types = { path = "packages/aleo-types" }
 alloy-primitives = { version = "0.7.6", default-features = false, features = ["std"] }
 alloy-sol-types = { version = "0.7.6", default-features = false, features = ["std"] }
 anyhow = "1.0.89"

ampd/Cargo.toml

@@ -6,7 +6,6 @@ rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aleo-types = { workspace = true }
 async-trait = "0.1.59"
 axelar-wasm-std = { workspace = true }
 axum = "0.7.5"

contracts/voting-verifier/Cargo.toml

@@ -32,7 +32,6 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-aleo-types = { workspace = true }
 axelar-wasm-std = { workspace = true, features = ["derive"] }
 client = { workspace = true }
 cosmwasm-schema = { workspace = true }
@@ -54,6 +53,7 @@ thiserror = { workspace = true }
 [dev-dependencies]
 alloy-primitives = { version = "0.7.7", features = ["getrandom"] }
 assert_ok = { workspace = true }
+bech32 = { workspace = true }
 cw-multi-test = "0.15.1"
 goldie = { workspace = true }
 integration-tests = { workspace = true }

contracts/voting-verifier/src/contract.rs

@@ -129,6 +129,7 @@ mod test {
         assert_err_contains, err_contains, nonempty, MajorityThreshold, Threshold,
         VerificationStatus,
     };
+    use bech32::{Bech32m, Hrp};
     use cosmwasm_std::testing::{
         mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage,
     };
@@ -263,7 +264,16 @@ mod test {
             .to_string()
             .parse()
             .unwrap(),
-            MessageIdFormat::AleoTransaction => unreachable!(),
+            MessageIdFormat::Bech32m => {
+                let data = format!("{id}-{index}");
+                let prefix = "bech32m";
+                let hrp = Hrp::parse(prefix).expect("valid hrp");
+                bech32::encode::<Bech32m>(hrp, data.as_bytes())
+                    .unwrap()
+                    .to_string()
+                    .parse()
+                    .unwrap()
+            }
         }
     }
 

contracts/voting-verifier/src/events.rs

@@ -2,7 +2,7 @@ use std::str::FromStr;
 use std::vec::Vec;
 
 use axelar_wasm_std::msg_id::{
-    AleoMessageId, Base58SolanaTxSignatureAndEventIndex, Base58TxDigestAndEventIndex, HexTxHash,
+    Base58SolanaTxSignatureAndEventIndex, Base58TxDigestAndEventIndex, Bech32mFormat, HexTxHash,
     HexTxHashAndEventIndex, MessageIdFormat,
 };
 use axelar_wasm_std::voting::{PollId, Vote};
@@ -186,10 +186,10 @@ fn parse_message_id(
 
             Ok((id.tx_hash_as_hex(), 0))
         }
-        MessageIdFormat::AleoTransaction => {
-            let aleo_message_id = AleoMessageId::from_str(message_id)
+        MessageIdFormat::Bech32m => {
+            let bech32m_message_id = Bech32mFormat::from_str(message_id)
                 .map_err(|_| ContractError::InvalidMessageID(message_id.into()))?;
-            Ok((aleo_message_id.to_string().try_into()?, 0))
+            Ok((bech32m_message_id.to_string().try_into()?, 0))
         }
     }
 }