diff --git a/Cargo.lock b/Cargo.lock index fab3f9b..98adf0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1393,7 +1393,7 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rrr" version = "0.1.0" -source = "git+https://github.com/recursive-record-registry/rrr.git?rev=53f926f711f88337f161123681ec8773aeaa9a4e#53f926f711f88337f161123681ec8773aeaa9a4e" +source = "git+https://github.com/recursive-record-registry/rrr.git?rev=5f11db585aabb6a6feaeb9fcd8ec79b93b9854f9#5f11db585aabb6a6feaeb9fcd8ec79b93b9854f9" dependencies = [ "aes-gcm", "argon2", diff --git a/Cargo.toml b/Cargo.toml index df80560..2daee6a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ color-eyre = "0.6.3" ed25519-dalek = { version = "2.1.1", features = ["rand_core", "pem"] } futures = "0.3.30" include_dir = { version = "0.7.4", features = ["nightly"] } -rrr = { git = "https://github.com/recursive-record-registry/rrr.git", rev = "53f926f711f88337f161123681ec8773aeaa9a4e" } +rrr = { git = "https://github.com/recursive-record-registry/rrr.git", rev = "5f11db585aabb6a6feaeb9fcd8ec79b93b9854f9" } serde = { version = "1.0.203", features = ["derive"] } serde_bytes = "0.11.14" serde_with = "3.8.1" diff --git a/src/lib.rs b/src/lib.rs index 26eafd0..e0bfbd1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,9 +4,9 @@ use record::OwnedRecord; use registry::OwnedRegistry; use rrr::{ crypto::encryption::EncryptionAlgorithm, - record::{Record, RecordKey, RecordMetadata, SuccessionNonce}, + record::{Record, RecordKey, RecordMetadata, RecordName, SuccessionNonce}, registry::{Registry, WriteLock}, - serde_utils::BytesOrAscii, + utils::serde::BytesOrAscii, }; use tokio::io::AsyncReadExt; @@ -51,7 +51,7 @@ pub fn make_recursive<'a>( data: BytesOrAscii(data), }; let key = RecordKey { - record_name: input_record.config.name.to_vec(), + record_name: RecordName::from(input_record.config.name.to_vec()), predecessor_nonce: predecessor_nonce.clone(), }; let hashed_key = key.hash(&input_registry.hash).await?; @@ -61,7 +61,7 @@ pub fn make_recursive<'a>( &input_registry.signing_keys, &hashed_key, &output_record, - 0, // TODO + 0.into(), // TODO 0, // TODO &[], // TODO Some(&EncryptionAlgorithm::A256GCM), // TODO diff --git a/src/owned/registry.rs b/src/owned/registry.rs index 13f25b3..b0d7ffe 100644 --- a/src/owned/registry.rs +++ b/src/owned/registry.rs @@ -9,7 +9,7 @@ use rrr::registry::{ ConfigParam, OutputLengthInBytes, RegistryConfig, RegistryConfigHash, RegistryConfigKdf, SuccessionNonceLengthInBytes, }; -use rrr::serde_utils::Secret; +use rrr::utils::serde::Secret; use rrr::{crypto::encryption::EncryptionAlgorithm, record::RecordKey}; use serde::{Deserialize, Serialize}; use serde_with::serde_as; @@ -44,7 +44,7 @@ pub struct OwnedRegistryConfig { impl OwnedRegistryConfig { pub fn get_root_record_key(&self) -> RecordKey { RecordKey { - record_name: Vec::new(), + record_name: Default::default(), predecessor_nonce: self.kdf.get_root_record_predecessor_nonce(), } }