From c0f6509d40b41d92d63ad2698b508f025d28a488 Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Mon, 31 Jan 2022 14:44:04 +0300
Subject: [PATCH] Fix ss58 prefixes of Polkadot, Kusama and Westend used by
 relay (#1298)

* fix ss58 prefixes of Polkadot, Kusama and Westend

* fmt
---
 bridges/relays/bin-substrate/src/chains/kusama.rs   | 5 ++++-
 bridges/relays/bin-substrate/src/chains/polkadot.rs | 5 ++++-
 bridges/relays/bin-substrate/src/chains/westend.rs  | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bridges/relays/bin-substrate/src/chains/kusama.rs b/bridges/relays/bin-substrate/src/chains/kusama.rs
index 10afbdd8a5..5a65426c9d 100644
--- a/bridges/relays/bin-substrate/src/chains/kusama.rs
+++ b/bridges/relays/bin-substrate/src/chains/kusama.rs
@@ -81,7 +81,10 @@ impl CliChain for Kusama {
 	type MessagePayload = ();
 
 	fn ss58_format() -> u16 {
-		42
+		sp_core::crypto::Ss58AddressFormat::from(
+			sp_core::crypto::Ss58AddressFormatRegistry::KusamaAccount,
+		)
+		.into()
 	}
 
 	fn encode_message(
diff --git a/bridges/relays/bin-substrate/src/chains/polkadot.rs b/bridges/relays/bin-substrate/src/chains/polkadot.rs
index 8c31792a54..16d44f4687 100644
--- a/bridges/relays/bin-substrate/src/chains/polkadot.rs
+++ b/bridges/relays/bin-substrate/src/chains/polkadot.rs
@@ -81,7 +81,10 @@ impl CliChain for Polkadot {
 	type MessagePayload = ();
 
 	fn ss58_format() -> u16 {
-		42
+		sp_core::crypto::Ss58AddressFormat::from(
+			sp_core::crypto::Ss58AddressFormatRegistry::PolkadotAccount,
+		)
+		.into()
 	}
 
 	fn encode_message(
diff --git a/bridges/relays/bin-substrate/src/chains/westend.rs b/bridges/relays/bin-substrate/src/chains/westend.rs
index 5a3dd9956d..8d3b5db9ab 100644
--- a/bridges/relays/bin-substrate/src/chains/westend.rs
+++ b/bridges/relays/bin-substrate/src/chains/westend.rs
@@ -28,7 +28,10 @@ impl CliChain for Westend {
 	type MessagePayload = ();
 
 	fn ss58_format() -> u16 {
-		42
+		sp_core::crypto::Ss58AddressFormat::from(
+			sp_core::crypto::Ss58AddressFormatRegistry::SubstrateAccount,
+		)
+		.into()
 	}
 
 	fn encode_message(