Pr/ocms bd v2

clap-utils/src/input_validators.rs

@@ -9,6 +9,8 @@ use {
     },
     std::{fmt::Display, ops::RangeBounds, str::FromStr},
 };
+use solana_sdk::bs58;
+use solana_sdk::offchain_message::Version as OffchainMessageVersion;
 
 fn is_parsable_generic<U, T>(string: T) -> Result<(), String>
 where
@@ -278,7 +280,8 @@ pub fn is_amount<T>(amount: T) -> Result<(), String>
 where
     T: AsRef<str> + Display,
 {
-    if amount.as_ref().parse::<u64>().is_ok() || amount.as_ref().parse::<f64>().is_ok() {
+    let amount = amount.as_ref();
+    if amount.parse::<u64>().is_ok() || amount.parse::<f64>().is_ok() {
         Ok(())
     } else {
         Err(format!(
@@ -379,6 +382,25 @@ where
     }
 }
 
+pub fn is_valid_offchain_message_version<T>(value: T) -> Result<(), String>
+where T: AsRef<str> + Display {
+    let value = value.as_ref();
+    match value.parse::<OffchainMessageVersion>() {
+        Err(_) => Err("Must be valid header version (unsigned integer)".to_string()),
+        Ok(_) => { Ok(()) }
+    }
+}
+
+pub fn is_base_58_string<T>(value: T) -> Result<(), String>
+where T: AsRef<str> + Display {
+    let value = value.as_ref();
+    if bs58::decode(value).into_vec().is_err() {
+        Err("Application domain must be valid Base58 string".to_string())
+    } else {
+        Ok(())
+    }
+}
+
 pub fn is_derived_address_seed<T>(value: T) -> Result<(), String>
 where
     T: AsRef<str> + Display,
@@ -425,6 +447,17 @@ where
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_is_base_58(){
+        assert_eq!(is_base_58_string("6sBFcNXUTq9GY3"), Ok(()));
+        assert_eq!(is_base_58_string(""), Ok(()));
+
+        assert!(is_base_58_string("invalid").is_err());
+        assert!(is_base_58_string(" ").is_err());
+        assert!(is_base_58_string("012345").is_err());
+    }
+
+
     #[test]
     fn test_is_derivation() {
         assert_eq!(is_derivation("2"), Ok(()));

cli/src/cli.rs

@@ -1752,6 +1752,7 @@ mod tests {
         },
         solana_transaction_status::TransactionConfirmationStatus,
     };
+    use solana_sdk::offchain_message::{ApplicationDomain, Version};
 
     fn make_tmp_path(name: &str) -> String {
         let out_dir = std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string());
@@ -2013,14 +2014,18 @@ mod tests {
             "sign-offchain-message",
             "Test Message",
         ]);
-        let message = OffchainMessage::new(0, b"Test Message").unwrap();
+
+        let keypair_signers = read_keypair_file(&keypair_file).unwrap();
+
+        let message = OffchainMessage::new(Version::V0, b"Test Message", vec![keypair_signers.pubkey()], ApplicationDomain::default()).unwrap();
+
         assert_eq!(
             parse_command(&test_sign_offchain, &default_signer, &mut None).unwrap(),
             CliCommandInfo {
                 command: CliCommand::SignOffchainMessage {
                     message: message.clone()
                 },
-                signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
+                signers: vec![keypair_signers.into()],
             }
         );
 
@@ -2403,7 +2408,8 @@ mod tests {
         config.command = CliCommand::GetTransactionCount;
         assert!(process_command(&config).is_err());
 
-        let message = OffchainMessage::new(0, b"Test Message").unwrap();
+        let message = OffchainMessage::new(Version::V0, b"Test Message", vec![keypair.pubkey()], ApplicationDomain::default()).unwrap();
+
         config.command = CliCommand::SignOffchainMessage {
             message: message.clone(),
         };

cli/src/main.rs

@@ -1,14 +1,14 @@
 use {
-    clap::{crate_description, crate_name, value_t_or_exit, ArgMatches},
+    clap::{ArgMatches, crate_description, crate_name, value_t_or_exit},
     console::style,
     solana_clap_utils::{
+        DisplayError,
         input_validators::normalize_to_url_if_moniker,
         keypair::{CliSigners, DefaultSigner},
-        DisplayError,
     },
     solana_cli::{
         clap_app::get_clap_app,
-        cli::{parse_command, process_command, CliCommandInfo, CliConfig},
+        cli::{CliCommandInfo, CliConfig, parse_command, process_command},
     },
     solana_cli_config::{Config, ConfigInput},
     solana_cli_output::{