support custom ss58addressformat in from_ss58check_with_version

primitives/core/src/crypto.rs

@@ -281,7 +281,10 @@ pub trait Ss58Codec: Sized + AsMut<[u8]> + AsRef<[u8]> + Default {
 			// Invalid length.
 			return Err(PublicError::BadLength);
 		}
-		let ver = d[0].try_into().map_err(|_: ()| PublicError::UnknownVersion)?;
+		let ver = d[0]
+			.try_into()
+			.or_else(|_| d[0].to_string().as_str().try_into())
+			.map_err(|_: ()| PublicError::UnknownVersion)?;
 
 		if d[len + 1..len + 3] != ss58hash(&d[0..len + 1]).as_bytes()[0..2] {
 			// Invalid checksum.

primitives/core/src/ecdsa.rs

@@ -524,7 +524,7 @@ impl CryptoType for Pair {
 mod test {
 	use super::*;
 	use hex_literal::hex;
-	use crate::crypto::DEV_PHRASE;
+	use crate::crypto::{DEV_PHRASE, set_default_ss58_version};
 	use serde_json;
 
 	#[test]
@@ -648,6 +648,20 @@ mod test {
 		assert_eq!(cmp, public);
 	}
 
+	#[test]
+	fn ss58check_custom_format_works() {
+		use crate::crypto::Ss58AddressFormat;
+		let default_format = Ss58AddressFormat::default();
+		set_default_ss58_version(Ss58AddressFormat::try_from("200").expect(""));
+		// custom
+		let addr = "2X64kMNEWAW5KLZMSKcGKEc96MyuaRsRUku7vomuYxKgqjVCRj";
+		let _ = Public::from_ss58check(&addr).unwrap();
+		set_default_ss58_version(default_format);
+		// normal
+		let addr = "KWAfgC2aRG5UVD6CpbPQXCx4YZZUhvWqqAJE6qcYc9Rtr6g5C";
+		let _ = Public::from_ss58check(&addr).unwrap();
+	}
+
 	#[test]
 	fn signature_serialization_works() {
 		let pair = Pair::from_seed(b"12345678901234567890123456789012");