Merge pull request #76 from pubky/feat/drop-z32

feat(pkarr): replace z32 with base32

Author: Nuhvi

Cargo.lock

@@ -9,14 +9,14 @@ repository = "https://git.pkarr.org"
 keywords = ["mainline", "dht", "dns", "decentralized", "identity"]
 
 [dependencies]
+base32 = "0.5.0"
 bytes = "1.7.1"
 document-features = "0.2.8"
 ed25519-dalek = "2.0.0"
 self_cell = "1.0.2"
 simple-dns = "0.6.1"
 thiserror = "1.0.49"
 tracing = "0.1.40"
-z32 = "1.1.1"
 rand = { version = "0.8.5", optional = true }
 lru = { version = "0.12.3", default-features = false }
 flume = { version = "0.11.0", features = ["select", "eventual-fairness"], default-features = false }

pkarr/Cargo.toml

@@ -25,8 +25,8 @@ pub enum Error {
     #[error("Invalid Ed25519 signature")]
     InvalidEd25519Signature,
 
-    #[error(transparent)]
-    InvalidPublicKeyEncoding(#[from] z32::Z32Error),
+    #[error("Invalid PublicKey encoding")]
+    InvalidPublicKeyEncoding,
 
     // === Packets errors ===
     #[error(transparent)]

pkarr/src/error.rs

@@ -59,12 +59,12 @@ impl Keypair {
 
 /// Ed25519 public key to verify a signature over dns [Packet](crate::SignedPacket)s.
 ///
-/// It can formatted to and parsed from a [zbase32](z32) string.
+/// It can formatted to and parsed from a z-base32 string.
 #[derive(Clone, Eq, PartialEq, Hash)]
 pub struct PublicKey(VerifyingKey);
 
 impl PublicKey {
-    /// Format the public key as [zbase32](z32) string.
+    /// Format the public key as z-base32 string.
     pub fn to_z32(&self) -> String {
         self.to_string()
     }
@@ -185,7 +185,11 @@ impl TryFrom<&str> for PublicKey {
             }
         }
 
-        let bytes = z32::decode(s.as_bytes())?;
+        let bytes = if let Some(v) = base32::decode(base32::Alphabet::Z, s) {
+            Ok(v)
+        } else {
+            Err(Error::InvalidPublicKeyEncoding)
+        }?;
 
         let verifying_key = VerifyingKey::try_from(bytes.as_slice())
             .map_err(|_| Error::InvalidPublicKeyLength(bytes.len()))?;
@@ -204,7 +208,11 @@ impl TryFrom<String> for PublicKey {
 
 impl Display for PublicKey {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", z32::encode(self.0.as_bytes()))
+        write!(
+            f,
+            "{}",
+            base32::encode(base32::Alphabet::Z, self.0.as_bytes())
+        )
     }
 }
 

pkarr/src/keys.rs

@@ -133,7 +133,7 @@ impl SignedPacket {
     /// Creates a new [SignedPacket] from a [Keypair] and a DNS [Packet].
     ///
     /// It will also normalize the names of the [ResourceRecord]s to be relative to the origin,
-    /// which would be the [zbase32](z32) encoded [PublicKey] of the [Keypair] used to sign the Packet.
+    /// which would be the z-base32 encoded [PublicKey] of the [Keypair] used to sign the Packet.
     ///
     /// # Errors
     /// - Returns [crate::Error::DnsError] if the packet is invalid or it failed to compress or encode it.