Remove dependency on safe-regex for regex-lite

Author: romac

Cargo.lock

@@ -33,7 +33,6 @@ serde_json = { version = "1" }
 erased-serde = { version = "0.3" }
 prost = { version = "0.11" }
 bytes = { version = "1.4.0" }
-safe-regex = { version = "0.2.5" }
 subtle-encoding = { version = "0.5" }
 flex-error = { version = "0.4.4" }
 derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
@@ -42,6 +41,7 @@ itertools = { version = "0.10.3" }
 primitive-types = { version = "0.12.1", default-features = false, features = ["serde_no_std"] }
 dyn-clone = "1.0.12"
 num-rational = "0.4.1"
+regex-lite = "0.1.0"
 
 [dependencies.tendermint]
 version = "0.33.0"

crates/relayer-types/Cargo.toml

@@ -1,13 +1,16 @@
-use ibc_proto::cosmos::base::v1beta1::Coin as ProtoCoin;
-use safe_regex::regex;
-use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Error as FmtError, Formatter};
-use std::str::{from_utf8, FromStr};
+use std::str::FromStr;
+
+use regex_lite::Regex;
+use serde::{Deserialize, Serialize};
+
+use ibc_proto::cosmos::base::v1beta1::Coin as ProtoCoin;
+
+use crate::serializers::serde_string;
 
 use super::amount::Amount;
 use super::denom::{BaseDenom, PrefixedDenom};
 use super::error::Error;
-use crate::serializers::serde_string;
 
 /// A `Coin` type with fully qualified `PrefixedDenom`.
 pub type PrefixedCoin = Coin<PrefixedDenom>;
@@ -61,24 +64,21 @@ where
 {
     type Err = Error;
 
-    #[allow(clippy::assign_op_pattern)]
+    // #[allow(clippy::assign_op_pattern)]
     fn from_str(coin_str: &str) -> Result<Self, Error> {
         // Denominations can be 3 ~ 128 characters long and support letters, followed by either
         // a letter, a number or a separator ('/', ':', '.', '_' or '-').
         // Loosely copy the regex from here:
         // https://github.com/cosmos/cosmos-sdk/blob/v0.45.5/types/coin.go#L760-L762
-        let matcher = regex!(br"([0-9]+)([a-zA-Z0-9/:\\._\x2d]+)");
-
-        let (m1, m2) = matcher
-            .match_slices(coin_str.as_bytes())
-            .ok_or_else(|| Error::invalid_coin(coin_str.to_string()))?;
+        let regex = Regex::new(r"(?<amount>[0-9]+)(?<denom>[a-zA-Z0-9/:\\._\x2d]+)")
+            .expect("failed to compile regex");
 
-        let amount = from_utf8(m1).map_err(Error::utf8_decode)?.parse()?;
+        let captures = regex.captures(coin_str).ok_or_else(|| {
+            Error::invalid_coin(format!("{coin_str} (expected format: <amount><denom>)"))
+        })?;
 
-        let denom = from_utf8(m2)
-            .map_err(Error::utf8_decode)?
-            .parse()
-            .map_err(Into::into)?;
+        let amount = captures["amount"].parse()?;
+        let denom = captures["denom"].parse().map_err(Into::into)?;
 
         Ok(Coin { amount, denom })
     }

crates/relayer-types/src/applications/transfer/coin.rs

@@ -135,7 +135,7 @@ define_error! {
 
         InvalidCoin
             { coin: String }
-            | e | { format_args!("invalid coin string: {}", e.coin) },
+            | e | { format_args!("invalid coin: {}", e.coin) },
 
         Utf8Decode
             [ TraceError<Utf8Error> ]

crates/relayer-types/src/applications/transfer/error.rs

@@ -2,6 +2,7 @@ use std::convert::{From, Infallible};
 use std::fmt::{Debug, Display, Error as FmtError, Formatter};
 use std::str::FromStr;
 
+use regex_lite::Regex;
 use serde::{Deserialize, Serialize};
 
 use super::validate::*;
@@ -101,8 +102,8 @@ impl ChainId {
     /// assert_eq!(ChainId::is_epoch_format("chainA-1"), true);
     /// ```
     pub fn is_epoch_format(chain_id: &str) -> bool {
-        let re = safe_regex::regex!(br".+[^-]-{1}[1-9][0-9]*");
-        re.is_match(chain_id.as_bytes())
+        let re = Regex::new(r"^.+[^-]-{1}[1-9][0-9]*$").expect("failed to compile regex");
+        re.is_match(chain_id)
     }
 }
 

crates/relayer-types/src/core/ics24_host/identifier.rs

@@ -56,7 +56,7 @@ signature = "2.1.0"
 anyhow = "1.0"
 semver = "1.0"
 humantime = "2.1.0"
-regex = "1.8.1"
+regex-lite = "0.1.0"
 moka = "0.11.3"
 uuid = { version = "1.4.0", features = ["v4"] }
 bs58 = "0.5.0"

crates/relayer/Cargo.toml

@@ -231,16 +231,16 @@ impl Serialize for ChannelFilters {
     }
 }
 
-/// Newtype wrapper for expressing wildcard patterns compiled to a [`regex::Regex`].
+/// Newtype wrapper for expressing wildcard patterns compiled to a [`regex_lite::Regex`].
 #[derive(Clone, Debug)]
 pub struct Wildcard {
     pattern: String,
-    regex: regex::Regex,
+    regex: regex_lite::Regex,
 }
 
 impl Wildcard {
-    pub fn new(pattern: String) -> Result<Self, regex::Error> {
-        let escaped = regex::escape(&pattern).replace("\\*", "(?:.*)");
+    pub fn new(pattern: String) -> Result<Self, regex_lite::Error> {
+        let escaped = regex_lite::escape(&pattern).replace("\\*", "(?:.*)");
         let regex = format!("^{escaped}$").parse()?;
         Ok(Self { pattern, regex })
     }
@@ -252,7 +252,7 @@ impl Wildcard {
 }
 
 impl FromStr for Wildcard {
-    type Err = regex::Error;
+    type Err = regex_lite::Error;
 
     fn from_str(pattern: &str) -> Result<Self, Self::Err> {
         Self::new(pattern.to_string())

crates/relayer/src/config/filter.rs

@@ -7,7 +7,7 @@ use http::uri::InvalidUri;
 use humantime::format_duration;
 use ibc_proto::protobuf::Error as TendermintProtoError;
 use prost::{DecodeError, EncodeError};
-use regex::Regex;
+use regex_lite::Regex;
 use tendermint::abci;
 use tendermint::Error as TendermintError;
 use tendermint_light_client::builder::error::Error as LightClientBuilderError;