Change config schema to use version strings for the connection protocolw

src/config/validator.rs

@@ -5,7 +5,7 @@ use crate::{
     keyring::SecretKeyEncoding,
     prelude::*,
 };
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use signatory::{
     ed25519,
     encoding::{Decode, Encode},
@@ -37,8 +37,20 @@ pub struct ValidatorConfig {
     pub max_height: Option<tendermint::block::Height>,
 
     /// Use Tendermint v0.33 handshake
-    #[serde(default = "handshake_default")]
-    pub v0_33_handshake: bool,
+    #[serde(default = "protocol_default")]
+    pub protocol_version: TendermintVersion,
+}
+
+/// Tendermint secure connection protocol version
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub enum TendermintVersion {
+    /// Legacy V1 SecretConnection Handshake
+    #[serde(rename = "legacy")]
+    Legacy,
+
+    /// Tendermint v0.33+ SecretConnection Handshake
+    #[serde(rename = "v0.33")]
+    V0_33,
 }
 
 impl ValidatorConfig {
@@ -81,6 +93,6 @@ fn reconnect_default() -> bool {
 }
 
 /// Default value for the `ValidatorConfig` reconnect field
-fn handshake_default() -> bool {
-    false
+fn protocol_default() -> TendermintVersion {
+    TendermintVersion::Legacy
 }

src/session.rs

@@ -2,7 +2,7 @@
 
 use crate::{
     chain::{self, state::StateErrorKind},
-    config::ValidatorConfig,
+    config::{TendermintVersion, ValidatorConfig},
     connection::{tcp, unix::UnixConnection, Connection},
     error::{Error, ErrorKind::*},
     prelude::*,
@@ -39,13 +39,18 @@ impl Session {
                 debug!("{}: Connecting to {}...", &config.chain_id, &config.addr);
 
                 let seed = config.load_secret_key()?;
+                let v0_33_handshake = match config.protocol_version {
+                    TendermintVersion::V0_33 => true,
+                    TendermintVersion::Legacy => false,
+                };
+
                 let conn = tcp::open_secret_connection(
                     host,
                     *port,
                     &seed,
                     peer_id,
                     config.timeout,
-                    config.v0_33_handshake,
+                    v0_33_handshake,
                 )?;
 
                 info!(

tmkms.toml.example

@@ -29,7 +29,7 @@ chain_id = "cosmoshub-1"
 reconnect = true # true is the default
 secret_key = "path/to/secret_connection.key"
 # max_height = "500000"
-v0_33_handshake = false # false is the default
+protocol_version = "v0.33" # "legacy" is the default
 
 ## Signing provider configuration