rhi

Coordinated trade for connected markets
git clone https://radroots.dev/git/rhi.git
Log | Files | Refs | README | LICENSE

commit 7140e87b01e5f51fdc8db193ec19a863be563d7b
parent 973a47120ab94e29bafe1a73ee50e1687883b702
Author: triesap <tyson@radroots.org>
Date:   Mon, 12 Oct 2026 10:30:11 +0000

rhi: Preserve numeric job kinds and pin patched Rustls

- Preserve named and custom wire kinds through both public job adapter traits.
- Exercise signed feedback through owned and borrowed interfaces while retaining field, timestamp, redaction and wrong-kind controls.
- Replace three bounded hex chunking expressions and remove two unused test imports for warnings-denied Rust 1.99 verification.
- Pin Rustls 0.23.45, bind the exact lock digest and retain explicit vet review debt; pass standalone native, API and supply-chain checks.

Diffstat:
MCargo.lock | 4++--
Mradroots.service.source-lock.v3.toml | 2+-
Msrc/adapters/nostr/event.rs | 94+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
Msrc/presence_publication.rs | 2+-
Msrc/process_v1.rs | 2+-
Msrc/reconciliation_reducer.rs | 2+-
Msrc/runtime_admin.rs | 2+-
Msrc/transport_nostr_adapter.rs | 2--
Msupply-chain/config.toml | 3++-
9 files changed, 84 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock @@ -2120,9 +2120,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.43" +version = "0.23.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0283386ce02abc0151e1761d08802dfe86c173b0b494af5cbc086574e453da06" +checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" dependencies = [ "once_cell", "ring", diff --git a/radroots.service.source-lock.v3.toml b/radroots.service.source-lock.v3.toml @@ -7,7 +7,7 @@ architecture = "radroots.crates.release.v2" workspace_catalog_sha256 = "deca0c080deae187ff8186c0708903e42f41ea57f77c5f91581e23aa561164a4" version = "0.1.0-alpha" source_archive_sha256 = "89b8ace3f61167df43aca89917405d58b2aaf2ddea8fadfb21d351d76f184e68" -cargo_lock_sha256 = "9d2ee2d488b002b5f0ca7795f1c75600a5a684d1f492a0fc8d7352ef23c261ae" +cargo_lock_sha256 = "fd08a93aac7c5a7c7c8ae1bbbe7ff613918a1a3c1fb3b05f5aebbadfa121f86d" rust_version = "1.97.1" host_feature_profile = "service-host" diff --git a/src/adapters/nostr/event.rs b/src/adapters/nostr/event.rs @@ -1,6 +1,6 @@ use core::fmt; -use nostr::{Event, Kind}; +use nostr::Event; use radroots_event_codec::decode::job::{JobEventBorrow, JobEventLike}; #[derive(Clone)] @@ -51,10 +51,7 @@ impl<'a> JobEventBorrow<'a> for NostrEventAdapter<'a> { } #[inline] fn raw_kind(&'a self) -> u32 { - match self.evt.kind { - Kind::Custom(v) => v as u32, - _ => 0, - } + u32::from(self.evt.kind.as_u16()) } } @@ -69,10 +66,7 @@ impl JobEventLike for NostrEventAdapter<'_> { self.evt.created_at.as_secs() } fn raw_kind(&self) -> u32 { - match self.evt.kind { - Kind::Custom(v) => v as u32, - _ => 0, - } + u32::from(self.evt.kind.as_u16()) } fn raw_content(&self) -> String { self.evt.content.clone() @@ -89,8 +83,10 @@ impl JobEventLike for NostrEventAdapter<'_> { #[cfg_attr(coverage_nightly, coverage(off))] mod tests { use super::NostrEventAdapter; - use nostr::{Event, Keys, Kind, Tag, TagKind}; - use radroots_event_codec::decode::job::{JobEventBorrow, JobEventLike}; + use nostr::{Event, EventBuilder, Keys, Kind, Tag, TagKind, Timestamp}; + use radroots_event_codec::decode::job::{ + BorrowedEventAdapter, JobEventBorrow, JobEventLike, JobParseError, + }; use radroots_nostr::event::GenericBuilder; fn build_event(keys: &Keys, kind: Kind, tags: Vec<Tag>) -> Event { @@ -130,16 +126,76 @@ mod tests { } #[test] - fn adapter_maps_non_custom_kind_to_zero() { + fn adapter_preserves_named_and_custom_wire_kinds() { let keys = Keys::generate(); - let event = build_event(&keys, Kind::Repost, Vec::new()); - let adapter = NostrEventAdapter::new(&event); + for wire_kind in [0_u16, 1, 6, 5_001, 6_001, 7_000, u16::MAX] { + let event = EventBuilder::new(Kind::from(wire_kind), "synthetic kind fixture") + .custom_created_at(Timestamp::from(1_700_000_000)) + .sign_with_keys(&keys) + .expect("signed synthetic event"); + let adapter = NostrEventAdapter::new(&event); + assert_eq!(JobEventBorrow::raw_kind(&adapter), u32::from(wire_kind)); + assert_eq!(JobEventLike::raw_kind(&adapter), u32::from(wire_kind)); + assert_eq!( + JobEventLike::raw_published_at(&adapter), + event.created_at.as_secs() + ); + if wire_kind != 7_000 { + assert!(matches!( + adapter.to_job_feedback_metadata(), + Err(JobParseError::InvalidTag("kind (expected 7000)")) + )); + } + } + } - assert_eq!(JobEventBorrow::raw_kind(&adapter), 0); - assert_eq!(JobEventLike::raw_kind(&adapter), 0); - assert_eq!( - JobEventLike::raw_published_at(&adapter), - event.created_at.as_secs() + #[test] + fn adapter_decodes_signed_named_feedback_through_both_traits() { + let keys = Keys::generate(); + let customer = Keys::generate(); + let request = build_event(&customer, Kind::Custom(5_001), Vec::new()); + let feedback = build_event( + &keys, + Kind::JobFeedback, + vec![ + Tag::custom(TagKind::e(), vec![request.id.to_hex()]), + Tag::custom(TagKind::p(), vec![request.pubkey.to_hex()]), + Tag::parse(["status", "processing"]).expect("synthetic status tag"), + ], + ); + feedback.verify().expect("valid signed synthetic feedback"); + assert_eq!(feedback.kind, Kind::JobFeedback); + let adapter = NostrEventAdapter::new(&feedback); + let tags = JobEventLike::raw_tags(&adapter); + let borrowed = BorrowedEventAdapter::new( + &adapter, + feedback.created_at.as_secs(), + &tags, + feedback.sig.to_string(), ); + + for metadata in [ + adapter.to_job_feedback_metadata().expect("owned feedback"), + borrowed + .to_job_feedback_metadata() + .expect("borrowed feedback"), + ] { + assert_eq!(metadata.kind, 7_000); + assert_eq!(metadata.data.kind, 7_000); + assert_eq!(metadata.data.request_event.id, request.id.to_hex()); + assert_eq!(metadata.data.customer_pubkey, Some(request.pubkey.to_hex())); + assert_eq!(metadata.id, feedback.id.to_hex()); + } + for parsed in [ + adapter.to_job_feedback_event_index().expect("owned index"), + borrowed + .to_job_feedback_event_index() + .expect("borrowed index"), + ] { + assert_eq!(parsed.data.kind, 7_000); + assert_eq!(parsed.data.data.request_event.id, request.id.to_hex()); + assert_eq!(parsed.event.kind_u32(), 7_000); + assert_eq!(parsed.event.id_hex(), feedback.id.to_hex()); + } } } diff --git a/src/presence_publication.rs b/src/presence_publication.rs @@ -2967,7 +2967,7 @@ const fn failure(kind: RhiPresencePublicationErrorKind) -> RhiPresencePublicatio #[cfg(test)] mod tests { - use std::{collections::BTreeSet, error::Error as _}; + use std::collections::BTreeSet; use super::*; diff --git a/src/process_v1.rs b/src/process_v1.rs @@ -665,7 +665,7 @@ fn decode_hex_32(value: &str) -> ProcessResult<[u8; 32]> { return Err(input_failure()); } let mut output = [0_u8; 32]; - for (index, pair) in value.as_bytes().chunks_exact(2).enumerate() { + for (index, pair) in value.as_bytes().as_chunks::<2>().0.iter().enumerate() { output[index] = (hex_nibble(pair[0])? << 4) | hex_nibble(pair[1])?; } Ok(output) diff --git a/src/reconciliation_reducer.rs b/src/reconciliation_reducer.rs @@ -503,7 +503,7 @@ fn decode_lower_hex_32(value: &str) -> Option<[u8; 32]> { return None; } let mut output = [0_u8; 32]; - for (index, pair) in value.as_bytes().chunks_exact(2).enumerate() { + for (index, pair) in value.as_bytes().as_chunks::<2>().0.iter().enumerate() { output[index] = decode_lower_hex(pair[0])? .checked_mul(16)? .checked_add(decode_lower_hex(pair[1])?)?; diff --git a/src/runtime_admin.rs b/src/runtime_admin.rs @@ -615,7 +615,7 @@ fn parse_digest(value: &str) -> Result<[u8; 32], RhiAdminHandlerError> { return Err(failure(RhiAdminHandlerErrorKind::Internal)); } let mut bytes = [0_u8; 32]; - for (index, chunk) in value.as_bytes().chunks_exact(2).enumerate() { + for (index, chunk) in value.as_bytes().as_chunks::<2>().0.iter().enumerate() { let high = hex_nibble(chunk[0]).ok_or_else(|| failure(RhiAdminHandlerErrorKind::Internal))?; let low = diff --git a/src/transport_nostr_adapter.rs b/src/transport_nostr_adapter.rs @@ -605,8 +605,6 @@ fn configuration_integer( #[cfg(test)] mod tests { - use std::error::Error as _; - use super::*; use crate::{RhiConfigProfile, parse_rhi_config_v1}; diff --git a/supply-chain/config.toml b/supply-chain/config.toml @@ -789,8 +789,9 @@ version = "1.1.4" criteria = "safe-to-deploy" [[exemptions.rustls]] -version = "0.23.43" +version = "0.23.45" criteria = "safe-to-deploy" +notes = "Existing full-crate review debt retained. The 0.23.43 to 0.23.45 package delta was reviewed while applying the upstream patch for RUSTSEC-2026-0285; this is not an independent full-crate audit. No advisory exception was added." [[exemptions.rustls-pki-types]] version = "1.15.1"