chore: release v2.2.3

Author: DylanVerstraete

substrate-node/pallets/pallet-tfgrid/src/node.rs

@@ -9,7 +9,7 @@ use sp_std::marker::PhantomData;
 // 1: Y
 pub const MIN_CITY_NAME_LENGTH: u32 = 1;
 // 85: Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch
-pub const MAX_CITY_NAME_LENGTH: u32 = 58;
+pub const MAX_CITY_NAME_LENGTH: u32 = 100;
 pub const DEFAULT_CITY_NAME: &[u8] = b"Unknown";
 
 /// A city name in ASCI Characters.
@@ -36,7 +36,6 @@ impl<T: Config> TryFrom<CityNameInput> for CityName<T> {
             value.len() <= MAX_CITY_NAME_LENGTH.saturated_into(),
             Self::Error::CityNameTooLong
         );
-        ensure!(validate_city_name(&value), Self::Error::InvalidCityName);
 
         Ok(Self(value, PhantomData))
     }
@@ -65,22 +64,10 @@ impl<T: Config> Clone for CityName<T> {
     }
 }
 
-pub fn validate_city_name(input: &[u8]) -> bool {
-    input == DEFAULT_CITY_NAME
-        || match core::str::from_utf8(input) {
-            Ok(val) => val
-                .chars()
-                .all(|c| c.is_alphabetic() || matches!(c, '-' | '.' | ' ')),
-            Err(_) => false,
-        }
-    // we convert to &str and then to chars to handle
-    // special alphabetic characters thanks to is_alphabetic()
-}
-
 // 2: Allow country code like BE, FR, BR, ...
 pub const MIN_COUNTRY_NAME_LENGTH: u32 = 2;
 // 56: The United Kingdom of Great Britain and Northern Ireland
-pub const MAX_COUNTRY_NAME_LENGTH: u32 = 56;
+pub const MAX_COUNTRY_NAME_LENGTH: u32 = 100;
 pub const DEFAULT_COUNTRY_NAME: &[u8] = b"Unknown";
 
 /// A city name in ASCI Characters.
@@ -107,10 +94,6 @@ impl<T: Config> TryFrom<CountryNameInput> for CountryName<T> {
             value.len() <= MAX_COUNTRY_NAME_LENGTH.saturated_into(),
             Self::Error::CountryNameTooLong
         );
-        ensure!(
-            validate_country_name(&value),
-            Self::Error::InvalidCountryName
-        );
 
         Ok(Self(value, PhantomData))
     }
@@ -139,18 +122,6 @@ impl<T: Config> Clone for CountryName<T> {
     }
 }
 
-pub fn validate_country_name(input: &[u8]) -> bool {
-    input == DEFAULT_COUNTRY_NAME
-        || match core::str::from_utf8(input) {
-            Ok(val) => val
-                .chars()
-                .all(|c| c.is_alphabetic() || matches!(c, '-' | '.' | ' ')),
-            Err(_) => false,
-        }
-    // we convert to &str and then to chars to handle
-    // special alphabetic characters thanks to is_alphabetic()
-}
-
 pub const MIN_LATITUDE_LENGTH: u32 = 1;
 pub const MAX_LATITUDE_LENGTH: u32 = 50;
 pub const DEFAULT_LATITUDE: &[u8] = b"Unknown";
@@ -354,29 +325,6 @@ pub fn validate_serial_number(input: &[u8]) -> bool {
         })
 }
 
-#[test]
-fn test_validate_city_name_works() {
-    assert_eq!(validate_city_name(b"Rio de Janeiro"), true);
-    assert_eq!(validate_city_name(b"Ghent"), true);
-    assert_eq!(validate_city_name(b"Cairo"), true);
-    assert_eq!(
-        validate_city_name(&vec![76, 105, 195, 168, 103, 101]), // b"Liège"
-        true
-    );
-
-    assert_eq!(validate_city_name(b"Los_Angeles"), false);
-}
-
-#[test]
-fn test_validate_country_name_works() {
-    assert_eq!(validate_country_name(b"Brazil"), true);
-    assert_eq!(validate_country_name(b"Belgium"), true);
-    assert_eq!(validate_country_name(b"Egypt"), true);
-    assert_eq!(validate_country_name(b"U.S.A"), true);
-
-    assert_eq!(validate_country_name(b"Costa_Rica"), false);
-}
-
 #[test]
 fn test_validate_latitude_input_works() {
     assert_eq!(validate_latitude_input(b"90.0"), true);

substrate-node/runtime/Cargo.toml

@@ -5,7 +5,7 @@ homepage = 'https://substrate.dev'
 license = 'Unlicense'
 name = 'tfchain-runtime'
 repository = 'https://github.com/substrate-developer-hub/substrate-node-template/'
-version = '2.2.2'
+version = '2.2.3'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

substrate-node/runtime/src/lib.rs

@@ -145,7 +145,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("substrate-threefold"),
     impl_name: create_runtime_str!("substrate-threefold"),
     authoring_version: 1,
-    spec_version: 125,
+    spec_version: 126,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,