Merge branch 'master' into tung_ss58address

primitives/core/src/crypto.rs

@@ -580,6 +580,10 @@ ss58_address_format!(
 		(67, "equilibrium", "Equilibrium Network, standard account (*25519).")
 	SoraAccount =>
 		(69, "sora", "SORA Network, standard account (*25519).")
+	MantaAccount =>
+		(77, "manta", "Manta Network, standard account (*25519).")
+	CalamariAccount =>
+		(78, "calamari", "Manta Canary Network, standard account (*25519).")
 	PolkaSmith =>
 		(98, "polkasmith", "PolkaSmith Canary Network, standard account (*25519).")
 	PolkaFoundry =>

ss58-registry.json

@@ -488,7 +488,25 @@
 			"website": "https://sora.org"
 		},
 		{
-			"prefix": 98,
+			"prefix": 77,
+			"network": "manta",
+			"displayName": "Manta network",
+			"symbols": ["MA"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://manta.network"
+		},
+		{
+			"prefix": 78,
+			"network": "calamari",
+			"displayName": "Calamari: Manta Canary Network",
+			"symbols": ["KMA"],
+			"decimals": [12],
+			"standardAccount": "*25519",
+			"website": "https://manta.network"
+		},
+    {
+      "prefix": 98,
 			"network": "polkasmith",
 			"displayName": "PolkaSmith Canary Network",
 			"symbols": ["PKS"],
@@ -504,7 +522,7 @@
 			"decimals": [18],
 			"standardAccount": "*25519",
 			"website": "https://polkafoundry.com"
-		},
+    },
 		{
 			"prefix": 252,
 			"network": "social-network",