feat: add support for solana message id's

eigerco · Jul 8, 2024 · addfec5 · addfec5
1 parent b37114e
commit addfec5
Show file tree

Hide file tree

Showing 5 changed files with 388 additions and 2 deletions.
diff --git a/contracts/voting-verifier/src/contract.rs b/contracts/voting-verifier/src/contract.rs
@@ -106,6 +106,7 @@ mod test {
     use axelar_wasm_std::{
         msg_id::{
             base_58_event_index::Base58TxDigestAndEventIndex,
+            base_58_solana_event_index::Base58SolanaTxDigestAndEventIndex,
             tx_hash_event_index::HexTxHashAndEventIndex, MessageIdFormat,
         },
         nonempty,
@@ -224,6 +225,15 @@ mod test {
             .to_string()
             .parse()
             .unwrap(),
+            MessageIdFormat::Base58SolanaTxDigestAndEventIndex => {
+                Base58SolanaTxDigestAndEventIndex::new_from_b58_encoded_signature_and_index(
+                    id, index,
+                )
+                .unwrap()
+                .to_string()
+                .parse()
+                .unwrap()
+            }
         }
     }
 

diff --git a/contracts/voting-verifier/src/events.rs b/contracts/voting-verifier/src/events.rs
@@ -2,6 +2,7 @@ use std::str::FromStr;
 use std::vec::Vec;
 
 use axelar_wasm_std::msg_id::base_58_event_index::Base58TxDigestAndEventIndex;
+use axelar_wasm_std::msg_id::base_58_solana_event_index::Base58SolanaTxDigestAndEventIndex;
 use axelar_wasm_std::msg_id::tx_hash_event_index::HexTxHashAndEventIndex;
 use axelar_wasm_std::msg_id::MessageIdFormat;
 use cosmwasm_schema::cw_serde;
@@ -137,6 +138,12 @@ fn parse_message_id(
 
             Ok((id.tx_hash_as_hex(), id.event_index))
         }
+        MessageIdFormat::Base58SolanaTxDigestAndEventIndex => {
+            let id = Base58SolanaTxDigestAndEventIndex::from_str(&message_id)
+                .map_err(|_| ContractError::InvalidMessageID(message_id.into()))?;
+
+            Ok((id.tx_digest_as_base58(), id.event_index))
+        }
     }
 }
 

diff --git a/packages/axelar-wasm-std/src/hash.rs b/packages/axelar-wasm-std/src/hash.rs
@@ -1 +1 @@
-pub type Hash = [u8; 32];
+pub type Hash = [u8; 32];
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub type Hash = [u8; 32];
		pub type Hash = [u8; 32];