adding generate pop to all crypto types

w3f · Nov 14, 2024 · 2334b58 · 2334b58
1 parent 38cb0ff
commit 2334b58
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 9 deletions.
diff --git a/substrate/primitives/application-crypto/src/bandersnatch.rs b/substrate/primitives/application-crypto/src/bandersnatch.rs
@@ -54,6 +54,13 @@ impl RuntimePublic for Public {
 		false
 	}
 
+	fn generate_pop(&mut self, key_type: KeyTypeId) -> Option<Self::Signature> {
+		let pub_key_as_bytes = self.to_raw_vec();
+		let pop_context_tag: &[u8] = b"POP_";
+		let pop_statement = [pop_context_tag, pub_key_as_bytes.as_slice()].concat();
+		sp_io::crypto::bandersnatch_sign(key_type, self, pop_statement.as_slice())
+	}
+
 	fn verify_pop(&self, pop: &Self::Signature) -> bool {
 		let pop = AppSignature::from(pop.clone());
 		let pub_key = AppPublic::from(self.clone());

diff --git a/substrate/primitives/application-crypto/src/bls381.rs b/substrate/primitives/application-crypto/src/bls381.rs
@@ -55,6 +55,13 @@ impl RuntimePublic for Public {
 		false
 	}
 
+	fn generate_pop(&mut self, key_type: KeyTypeId) -> Option<Self::Signature> {
+		let pub_key_as_bytes = self.to_raw_vec();
+		let pop_context_tag: &[u8] = b"POP_";
+		let pop_statement = [pop_context_tag, pub_key_as_bytes.as_slice()].concat();
+		sp_io::crypto::bls381_sign(key_type, self, pop_statement.as_slice())
+	}
+
 	fn verify_pop(&self, pop: &Self::Signature) -> bool {
 		let pop = AppSignature::from(pop.clone());
 		let pub_key = AppPublic::from(self.clone());

diff --git a/substrate/primitives/application-crypto/src/ecdsa.rs b/substrate/primitives/application-crypto/src/ecdsa.rs
@@ -52,6 +52,13 @@ impl RuntimePublic for Public {
 		sp_io::crypto::ecdsa_verify(signature, msg.as_ref(), self)
 	}
 
+	fn generate_pop(&mut self, key_type: KeyTypeId) -> Option<Self::Signature> {
+		let pub_key_as_bytes = self.to_raw_vec();
+		let pop_context_tag: &[u8] = b"POP_";
+		let pop_statement = [pop_context_tag, pub_key_as_bytes.as_slice()].concat();
+		sp_io::crypto::ecdsa_sign(key_type, self, pop_statement.as_slice())
+	}
+
 	fn verify_pop(&self, pop: &Self::Signature) -> bool {
 		let pop = AppSignature::from(pop.clone());
 		let pub_key = AppPublic::from(self.clone());

diff --git a/substrate/primitives/application-crypto/src/ecdsa_bls381.rs b/substrate/primitives/application-crypto/src/ecdsa_bls381.rs
@@ -52,9 +52,16 @@ impl RuntimePublic for Public {
 		false
 	}
 
-	// fn verify_pop(&self, pop: &Self::Signature) -> bool {
-	// 	AppPair::verify_proof_of_possession(pop.as_ptr(), self)
-	// }
+	fn generate_pop(&mut self, key_type: KeyTypeId) -> Option<Self::Signature> {
+		// TODO: Implement Special Case
+		None
+	}
+
+	fn verify_pop(&self, pop: &Self::Signature) -> bool {
+		let pop = AppSignature::from(pop.clone());
+		let pub_key = AppPublic::from(self.clone());
+		AppPair::verify_proof_of_possession(&pop, &pub_key)
+	}
 
 	fn to_raw_vec(&self) -> Vec<u8> {
 		sp_core::crypto::ByteArray::to_raw_vec(self)

diff --git a/substrate/primitives/application-crypto/src/ed25519.rs b/substrate/primitives/application-crypto/src/ed25519.rs
@@ -52,12 +52,12 @@ impl RuntimePublic for Public {
 		sp_io::crypto::ed25519_verify(signature, msg.as_ref(), self)
 	}
 
-	// fn generate_pop(&mut self, key_type: KeyTypeId) -> Option<Self::Signature> {
-	// 	let pub_key_as_bytes = self.public().to_raw_vec();
-	// 	let pop_context_tag: &[u8] = b"POP_";
-	// 	let pop_statement = [pop_context_tag, pub_key_as_bytes.as_slice()].concat();
-	// 	self.sign(key_type, pop_statement.as_slice())
-	// }
+	fn generate_pop(&mut self, key_type: KeyTypeId) -> Option<Self::Signature> {
+		let pub_key_as_bytes = self.to_raw_vec();
+		let pop_context_tag: &[u8] = b"POP_";
+		let pop_statement = [pop_context_tag, pub_key_as_bytes.as_slice()].concat();
+		sp_io::crypto::ed25519_sign(key_type, self, pop_statement.as_slice())
+	}
 
 	fn verify_pop(&self, pop: &Self::Signature) -> bool {
 		let pop = AppSignature::from(pop.clone());

diff --git a/substrate/primitives/application-crypto/src/sr25519.rs b/substrate/primitives/application-crypto/src/sr25519.rs
@@ -52,6 +52,13 @@ impl RuntimePublic for Public {
 		sp_io::crypto::sr25519_verify(signature, msg.as_ref(), self)
 	}
 
+	fn generate_pop(&mut self, key_type: KeyTypeId) -> Option<Self::Signature> {
+		let pub_key_as_bytes = self.to_raw_vec();
+		let pop_context_tag: &[u8] = b"POP_";
+		let pop_statement = [pop_context_tag, pub_key_as_bytes.as_slice()].concat();
+		sp_io::crypto::sr25519_sign(key_type, self, pop_statement.as_slice())
+	}
+
 	fn verify_pop(&self, pop: &Self::Signature) -> bool {
 		let pop = AppSignature::from(pop.clone());
 		let pub_key = AppPublic::from(self.clone());