merge main into multicast-e2e

Author: zeeshanlakhani

Cargo.lock

@@ -76,6 +76,7 @@ members = [
     "ipcc",
     "key-manager",
     "key-manager/types",
+    "ledger",
     "live-tests",
     "live-tests/macros",
     "nexus",
@@ -253,6 +254,7 @@ default-members = [
     "ipcc",
     "key-manager",
     "key-manager/types",
+    "ledger",
     "live-tests",
     "live-tests/macros",
     "nexus",
@@ -471,8 +473,8 @@ derive-where = "1.5.0"
 dev-tools-common = { path = "dev-tools/common" }
 dice-verifier = { git = "https://github.com/oxidecomputer/dice-util", branch = "main", default-features = false }
 # Having the i-implement-... feature here makes diesel go away from the workspace-hack
-diesel = { version = "2.2.12", features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes", "postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
-diesel-dtrace = "0.4.2"
+diesel = { version = "2.3.7", features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes", "postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
+diesel-dtrace = "0.5.0"
 digest = "0.10.7"
 dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
@@ -584,8 +586,8 @@ ntp-admin-api = { path = "ntp-admin/api" }
 ntp-admin-client = { path = "clients/ntp-admin-client" }
 ntp-admin-types = { path = "ntp-admin/types" }
 ntp-admin-types-versions = { path = "ntp-admin/types/versions" }
-mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "8f5527da3c53398c95c50b1af088637e7b6c5718" }
-ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "8f5527da3c53398c95c50b1af088637e7b6c5718" }
+mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "b603c9f3dccefcf1d3e941c04505ff6bdd1826b6" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "b603c9f3dccefcf1d3e941c04505ff6bdd1826b6" }
 multimap = "0.10.1"
 nexus-auth = { path = "nexus/auth" }
 nexus-background-task-interface = { path = "nexus/background-task-interface" }
@@ -619,7 +621,7 @@ nexus-test-utils-macros = { path = "nexus/test-utils-macros" }
 nexus-test-utils = { path = "nexus/test-utils" }
 nexus-types = { path = "nexus/types" }
 nexus-types-versions = { path = "nexus/types/versions" }
-nix = { version = "0.30", features = ["fs", "net"] }
+nix = { version = "0.31", features = ["fs", "net"] }
 nom = "7.1.3"
 nonempty = "0.12.0"
 num-integer = "0.1.46"
@@ -630,6 +632,7 @@ omicron-cockroach-admin = { path = "cockroach-admin" }
 omicron-cockroach-metrics = { path = "cockroach-metrics" }
 omicron-common = { path = "common" }
 omicron-dev-lib = { path = "dev-tools/omicron-dev-lib" }
+omicron-ledger = { path = "ledger" }
 omicron-gateway = { path = "gateway" }
 omicron-nexus = { path = "nexus" }
 omicron-ntp-admin = { path = "ntp-admin" }
@@ -718,7 +721,7 @@ rats-corim = { git = "https://github.com/oxidecomputer/rats-corim.git", rev = "f
 raw-cpuid = { git = "https://github.com/oxidecomputer/rust-cpuid.git", rev = "a4cf01df76f35430ff5d39dc2fe470bcb953503b" }
 rayon = "1.10"
 rcgen = "0.12.1"
-rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "8f5527da3c53398c95c50b1af088637e7b6c5718" }
+rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "b603c9f3dccefcf1d3e941c04505ff6bdd1826b6" }
 reconfigurator-cli = { path = "dev-tools/reconfigurator-cli" }
 reedline = "0.40.0"
 ref-cast = "1.0"

Cargo.toml

@@ -16,7 +16,7 @@ ciborium.workspace = true
 derive_more.workspace = true
 hex.workspace = true
 hkdf.workspace = true
-omicron-common.workspace = true
+omicron-ledger.workspace = true
 omicron-workspace-hack.workspace = true
 # vsss-rs requires rand 0.8
 rand08 = { workspace = true, features = ["getrandom"] }

bootstore/Cargo.toml

@@ -63,14 +63,6 @@ pub enum NodeRequestError {
     },
 }
 
-impl From<NodeRequestError> for omicron_common::api::external::Error {
-    fn from(error: NodeRequestError) -> Self {
-        omicron_common::api::external::Error::internal_error(
-            &InlineErrorChain::new(&error).to_string(),
-        )
-    }
-}
-
 /// A request sent to the `Node` task from the `NodeHandle`
 pub enum NodeApiRequest {
     /// Initialize a rack at the behest of RSS running on the same scrimlet as

bootstore/src/schemes/v0/peer.rs

@@ -5,7 +5,7 @@
 //! Storage for the v0 bootstore scheme
 //!
 //! We write two pieces of data to M.2 devices in production via
-//! [`omicron_common::ledger::Ledger`]:
+//! [`omicron_ledger::Ledger`]:
 //!
 //!    1. [`super::State`] for bootstore state itself
 //!    2. A network config blob required for pre-rack-unlock configuration
@@ -15,7 +15,7 @@ use crate::schemes::v0::SharePkgCommon;
 
 use super::{Fsm, FsmConfig, State};
 use camino::Utf8PathBuf;
-use omicron_common::ledger::{Ledger, Ledgerable};
+use omicron_ledger::{Ledger, Ledgerable};
 use serde::{Deserialize, Serialize};
 use sled_hardware_types::Baseboard;
 use slog::{Logger, info, warn};

bootstore/src/schemes/v0/storage.rs

@@ -12,7 +12,6 @@ either.workspace = true
 oxnet.workspace = true
 progenitor-client.workspace = true
 reqwest = { workspace = true, features = ["json", "stream", "rustls"] }
-reqwest012 = { workspace = true }
 serde.workspace = true
 slog.workspace = true
 thiserror.workspace = true