Extract commitment-config crate

Cargo.toml

@@ -109,6 +109,7 @@ members = [
     "sdk/cargo-build-sbf",
     "sdk/cargo-test-sbf",
     "sdk/clock",
+    "sdk/commitment-config",
     "sdk/cpi",
     "sdk/decode-error",
     "sdk/derivation-path",
@@ -407,6 +408,7 @@ solana-cli-config = { path = "cli-config", version = "=2.2.0" }
 solana-cli-output = { path = "cli-output", version = "=2.2.0" }
 solana-client = { path = "client", version = "=2.2.0" }
 solana-clock = { path = "sdk/clock", version = "=2.2.0" }
+solana-commitment-config = { path = "sdk/commitment-config", version = "=2.2.0" }
 solana-compute-budget = { path = "compute-budget", version = "=2.2.0" }
 solana-compute-budget-program = { path = "programs/compute-budget", version = "=2.2.0" }
 solana-config-program = { path = "programs/config", version = "=2.2.0" }

sdk/Cargo.toml

@@ -32,6 +32,7 @@ full = [
     "ed25519-dalek-bip32",
     "libsecp256k1",
     "sha3",
+    "solana-commitment-config",
     "digest",
     "solana-pubkey/rand",
     "dep:solana-precompile-error",
@@ -91,6 +92,7 @@ sha3 = { workspace = true, optional = true }
 siphasher = { workspace = true }
 solana-account = { workspace = true, features = ["bincode"] }
 solana-bn254 = { workspace = true }
+solana-commitment-config = { workspace = true, optional = true, features = ["serde"] }
 solana-decode-error = { workspace = true }
 solana-derivation-path = { workspace = true }
 solana-feature-set = { workspace = true }

sdk/commitment-config/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "solana-commitment-config"
+description = "Solana commitment config."
+documentation = "https://docs.rs/solana-commitment-config"
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+serde = { workspace = true, optional = true }
+serde_derive = { workspace = true, optional = true }
+
+[features]
+serde = ["dep:serde", "dep:serde_derive"]
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]

sdk/src/commitment_config.rs → sdk/commitment-config/src/lib.rs

@@ -1,11 +1,13 @@
 //! Definitions of commitment levels.
 
-#![cfg(feature = "full")]
-
-use {std::str::FromStr, thiserror::Error};
-
-#[derive(Serialize, Deserialize, Default, Clone, Copy, Debug, PartialEq, Eq, Hash)]
-#[serde(rename_all = "camelCase")]
+use core::{fmt, str::FromStr};
+
+#[cfg_attr(
+    feature = "serde",
+    derive(serde_derive::Serialize, serde_derive::Deserialize),
+    serde(rename_all = "camelCase")
+)]
+#[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct CommitmentConfig {
     pub commitment: CommitmentLevel,
 }
@@ -70,8 +72,12 @@ impl FromStr for CommitmentConfig {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Hash)]
-#[serde(rename_all = "camelCase")]
+#[cfg_attr(
+    feature = "serde",
+    derive(serde_derive::Serialize, serde_derive::Deserialize),
+    serde(rename_all = "camelCase")
+)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 /// An attribute of a slot. It describes how finalized a block is at some point in time. For example, a slot
 /// is said to be at the max level immediately after the cluster recognizes the block at that slot as
 /// finalized. When querying the ledger state, use lower levels of commitment to report progress and higher
@@ -123,8 +129,17 @@ impl std::fmt::Display for CommitmentLevel {
     }
 }
 
-#[derive(Error, Debug)]
+#[derive(Debug)]
 pub enum ParseCommitmentLevelError {
-    #[error("invalid variant")]
     Invalid,
 }
+
+impl std::error::Error for ParseCommitmentLevelError {}
+
+impl fmt::Display for ParseCommitmentLevelError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Self::Invalid => f.write_str("invalid variant"),
+        }
+    }
+}

sdk/src/lib.rs

@@ -37,6 +37,8 @@ extern crate self as solana_sdk;
 
 #[cfg(feature = "full")]
 pub use signer::signers;
+#[cfg(feature = "full")]
+pub use solana_commitment_config as commitment_config;
 #[cfg(not(target_os = "solana"))]
 pub use solana_program::program_stubs;
 // These solana_program imports could be *-imported, but that causes a bunch of
@@ -59,7 +61,6 @@ pub use solana_program::{
 #[cfg(feature = "borsh")]
 pub use solana_program::{borsh, borsh0_10, borsh1};
 pub mod client;
-pub mod commitment_config;
 pub mod compute_budget;
 pub mod deserialize_utils;
 pub mod ed25519_instruction;