*: Refactor authority discovery (key mngmt, runtime API)

core/authority-discovery/Cargo.toml

@@ -15,14 +15,15 @@ client = { package = "substrate-client", path = "../../core/client" }
 codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
 derive_more = "0.15.0"
 futures-preview = "0.3.0-alpha.19"
+futures-timer = "0.4"
+keystore = { package = "substrate-keystore", path = "../keystore" }
 libp2p = { version = "0.13.0", default-features = false, features = ["secp256k1", "libp2p-websocket"] }
 log = "0.4.8"
 network = { package = "substrate-network", path = "../../core/network" }
 primitives = { package = "substrate-primitives", path = "../primitives" }
 prost = "0.5.0"
 serde_json = "1.0.41"
 sr-primitives = { path = "../../core/sr-primitives" }
-futures-timer = "0.4"
 
 [dev-dependencies]
 parking_lot = "0.9.0"

core/authority-discovery/primitives/Cargo.toml

@@ -6,16 +6,18 @@ description = "Authority discovery primitives"
 edition = "2018"
 
 [dependencies]
-codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
+app-crypto = { package = "substrate-application-crypto", path = "../../application-crypto", default-features = false }
 client = { package = "substrate-client", path = "../../client", default-features = false }
-sr-primitives = { path = "../../sr-primitives", default-features = false }
+codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
 rstd = { package = "sr-std", path = "../../sr-std", default-features = false }
+sr-primitives = { path = "../../sr-primitives", default-features = false }
 
 [features]
 default = ["std"]
 std = [
- "rstd/std",
- "client/std",
- "codec/std",
- "sr-primitives/std"
+ "app-crypto/std",
+ "client/std",
+ "codec/std",
+ "rstd/std",
+ "sr-primitives/std"
 ]

core/authority-discovery/primitives/src/lib.rs

@@ -20,31 +20,28 @@
 
 use client::decl_runtime_apis;
 use rstd::vec::Vec;
-use sr_primitives::RuntimeDebug;
 
-#[derive(codec::Encode, codec::Decode, Eq, PartialEq, Clone, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Hash))]
-pub struct Signature(pub Vec<u8>);
-#[derive(codec::Encode, codec::Decode, Eq, PartialEq, Clone, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Hash))]
-pub struct AuthorityId(pub Vec<u8>);
+mod app {
+ use app_crypto::{app_crypto, key_types::AUTHORITY_DISCOVERY, sr25519};
+ app_crypto!(sr25519, AUTHORITY_DISCOVERY);
+}
+
+/// An authority discovery authority keypair.
+#[cfg(feature = "std")]
+pub type AuthorityPair = app::Pair;
+
+/// An authority discovery authority identifier.
+pub type AuthorityId = app::Public;
+
+/// An authority discovery authority signature.
+pub type AuthoritySignature = app::Signature;
 
 decl_runtime_apis! {
  /// The authority discovery api.
  ///
- /// This api is used by the `core/authority-discovery` module to retrieve our
- /// own authority identifier, to retrieve identifiers of the current authority
- /// set, as well as sign and verify Kademlia Dht external address payloads
- /// from and to other authorities.
+ /// This api is used by the `core/authority-discovery` module to retrieve identifiers of the current authority set.
  pub trait AuthorityDiscoveryApi {
  /// Retrieve authority identifiers of the current authority set.
  fn authorities() -> Vec<AuthorityId>;
-
- /// Sign the given payload with the private key corresponding to the given authority id.
- fn sign(payload: &Vec<u8>) -> Option<(Signature, AuthorityId)>;
-
- /// Verify the given signature for the given payload with the given
- /// authority identifier.
- fn verify(payload: &Vec<u8>, signature: &Signature, authority_id: &AuthorityId) -> bool;
  }
 }

core/authority-discovery/src/error.rs

@@ -28,18 +28,18 @@ pub enum Error {
  HashingAuthorityId(libp2p::core::multiaddr::multihash::EncodeError),
  /// Failed calling into the Substrate runtime.
  CallingRuntime(client::error::Error),
- /// Failed signing the dht payload via the Substrate runtime.
- SigningDhtPayload,
  /// From the Dht we only get the hashed authority id. In order to retrieve the actual authority id and to ensure it
  /// is actually an authority, we match the hash against the hash of the authority id of all other authorities. This
  /// error is the result of the above failing.
  MatchingHashedAuthorityIdWithAuthorityId,
  /// Failed to set the authority discovery peerset priority group in the peerset module.
  SettingPeersetPriorityGroup(String),
- /// Failed to encode a dht payload.
- Encoding(prost::EncodeError),
- /// Failed to decode a dht payload.
- Decoding(prost::DecodeError),
+ /// Failed to encode a protobuf payload.
+ EncodingProto(prost::EncodeError),
+ /// Failed to decode a protobuf payload.
+ DecodingProto(prost::DecodeError),
+ /// Failed to encode or decode scale payload
+ EncodingDecodingScale(codec::Error),
  /// Failed to parse a libp2p multi address.
  ParsingMultiaddress(libp2p::core::multiaddr::Error),
 }