Sort address types and mark reserved. (#5189)

* Sort address types and mark reserved.

* Typos

* Fix warning
This commit is contained in:
Gavin Wood
2020-03-10 14:08:29 +01:00
committed by GitHub
parent d56c374b47
commit d1cac6cd19
+39 -30
View File
@@ -345,7 +345,7 @@ fn ss58hash(data: &[u8]) -> blake2_rfc::blake2b::Blake2bResult {
#[cfg(feature = "std")] #[cfg(feature = "std")]
lazy_static::lazy_static! { lazy_static::lazy_static! {
static ref DEFAULT_VERSION: Mutex<Ss58AddressFormat> static ref DEFAULT_VERSION: Mutex<Ss58AddressFormat>
= Mutex::new(Ss58AddressFormat::SubstrateAccountDirect); = Mutex::new(Ss58AddressFormat::SubstrateAccount);
} }
#[cfg(feature = "full_crypto")] #[cfg(feature = "full_crypto")]
@@ -430,36 +430,45 @@ macro_rules! ss58_address_format {
#[cfg(feature = "full_crypto")] #[cfg(feature = "full_crypto")]
ss58_address_format!( ss58_address_format!(
SubstrateAccountDirect => PolkadotAccount =>
(42, "substrate", "Any Substrate network, direct checksum, standard account (*25519).") (0, "polkadot", "Polkadot Relay-chain, standard account (*25519).")
PolkadotAccountDirect => Reserved1 =>
(0, "polkadot", "Polkadot Relay-chain, direct checksum, standard account (*25519).") (1, "reserved1", "Reserved for future use (1).")
KusamaAccountDirect => KusamaAccount =>
(2, "kusama", "Kusama Relay-chain, direct checksum, standard account (*25519).") (2, "kusama", "Kusama Relay-chain, standard account (*25519).")
PlasmAccountDirect => Reserved3 =>
(5, "plasm", "Plasm Network, direct checksum, standard account (*25519).") (3, "reserved3", "Reserved for future use (3).")
BifrostAccountDirect => PlasmAccount =>
(5, "plasm", "Plasm Network, standard account (*25519).")
BifrostAccount =>
(6, "bifrost", "Bifrost mainnet, direct checksum, standard account (*25519).") (6, "bifrost", "Bifrost mainnet, direct checksum, standard account (*25519).")
EdgewareAccountDirect => EdgewareAccount =>
(7, "edgeware", "Edgeware mainnet, direct checksum, standard account (*25519).") (7, "edgeware", "Edgeware mainnet, standard account (*25519).")
KaruraAccountDirect => KaruraAccount =>
(8, "karura", "Acala Karura canary network, direct checksum, standard account (*25519).") (8, "karura", "Acala Karura canary network, standard account (*25519).")
ReynoldsAccountDirect => ReynoldsAccount =>
(9, "reynolds", "Laminar Reynolds canary network, direct checksum, standard account (*25519).") (9, "reynolds", "Laminar Reynolds canary network, standard account (*25519).")
AcalaAccountDirect => AcalaAccount =>
(10, "acala", "Acala mainnet, direct checksum, standard account (*25519).") (10, "acala", "Acala mainnet, standard account (*25519).")
LaminarAccountDirect => LaminarAccount =>
(11, "laminar", "Laminar mainnet, direct checksum, standard account (*25519).") (11, "laminar", "Laminar mainnet, standard account (*25519).")
KulupuAccountDirect => KulupuAccount =>
(16, "kulupu", "Kulupu mainnet, direct checksum, standard account (*25519).") (16, "kulupu", "Kulupu mainnet, standard account (*25519).")
DothereumAccountDirect => DarwiniaAccount =>
(20, "dothereum", "Dothereum Para-chain, direct checksum, standard account (*25519).") (18, "darwinia", "Darwinia Chain mainnet, standard account (*25519).")
CentrifugeAccountDirect => CentrifugeAccount =>
(36, "centrifuge", "Centrifuge Chain mainnet, direct checksum, standard account (*25519).") (36, "centrifuge", "Centrifuge Chain mainnet, standard account (*25519).")
SubstraTeeAccountDirect => SubstrateAccount =>
(44, "substratee", "Any SubstraTEE off-chain network private account, direct checksum, standard account (*25519).") (42, "substrate", "Any Substrate network, standard account (*25519).")
DarwiniaAccountDirect => Reserved43 =>
(18, "darwinia", "Darwinia Chain mainnet, direct checksum, standard account (*25519).") (43, "reserved43", "Reserved for future use (43).")
SubstraTeeAccount =>
(44, "substratee", "Any SubstraTEE off-chain network private account (*25519).")
Reserved46 =>
(46, "reserved46", "Reserved for future use (46).")
Reserved47 =>
(47, "reserved47", "Reserved for future use (47).")
// Note: 48 and above are reserved.
); );
/// Set the default "version" (actually, this is a bit of a misnomer and the version byte is /// Set the default "version" (actually, this is a bit of a misnomer and the version byte is