v0.2.2-pre.002

crates/ksp-onchain-transport-lib/src/rpc_canary.rs

@@ -1,30 +1,7 @@
 // file: crates/ksp-onchain-transport-lib/src/rpc_canary.rs
-// version: 1
+// version: 2
 
-/// Commitment level accepted by the initial typed Solana HTTP canary adapters.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum SolanaCommitment {
-    /// Query the most recent processed bank.
-    Processed,
-    /// Query a bank confirmed by cluster vote.
-    Confirmed,
-    /// Query a finalized bank.
-    Finalized,
-}
-
-impl SolanaCommitment {
-    /// Returns the Solana JSON-RPC commitment string.
-    #[must_use]
-    pub const fn as_str(self) -> &'static str {
-        return match self {
-            Self::Processed => "processed",
-            Self::Confirmed => "confirmed",
-            Self::Finalized => "finalized",
-        };
-    }
-}
-
-/// Optional typed configuration for `getBalance`.
+/// Optional typed configuration for `getBalance` retained for the `0.2.1` public canary contract.
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
 pub struct GetBalanceConfig {
     commitment: std::option::Option<crate::SolanaCommitment>,
@@ -55,14 +32,7 @@ impl GetBalanceConfig {
     }
 
     fn to_json_value(&self) -> serde_json::Value {
-        let mut object = serde_json::Map::new();
-        if let std::option::Option::Some(commitment) = self.commitment {
-            object.insert("commitment".to_owned(), serde_json::Value::String(commitment.as_str().to_owned()));
-        }
-        if let std::option::Option::Some(min_context_slot) = self.min_context_slot {
-            object.insert("minContextSlot".to_owned(), serde_json::Value::Number(min_context_slot.into()));
-        }
-        return serde_json::Value::Object(object);
+        return crate::SolanaContextConfig::new(self.commitment, self.min_context_slot).to_json_value();
     }
 }
 
@@ -108,30 +78,6 @@ impl SolanaNodeVersion {
     }
 }
 
-/// Typed Solana RPC context used by the initial account canary.
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct SolanaRpcContext {
-    slot: u64,
-    api_version: std::option::Option<std::string::String>,
-}
-
-impl SolanaRpcContext {
-    /// Returns the context slot reported by the RPC node.
-    #[must_use]
-    pub const fn slot(&self) -> u64 {
-        return self.slot;
-    }
-
-    /// Returns the optional RPC API version reported by the node.
-    #[must_use]
-    pub fn api_version(&self) -> std::option::Option<&str> {
-        return match self.api_version.as_ref() {
-            std::option::Option::Some(value) => std::option::Option::Some(value.as_str()),
-            std::option::Option::None => std::option::Option::None,
-        };
-    }
-}
-
 /// Typed lamport balance returned by the `getBalance` canary.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct GetBalanceResult {
@@ -245,10 +191,12 @@ impl crate::HttpTransportPool {
             std::result::Result::Ok(decoded) => decoded,
             std::result::Result::Err(error) => return invalid_canary_decode("getBalance", error),
         };
-        return std::result::Result::Ok(crate::GetBalanceResult {
-            context: crate::SolanaRpcContext { slot: decoded.context.slot, api_version: decoded.context.api_version },
-            value: decoded.value,
-        });
+        let context = crate::SolanaRpcContext::decode_wire("getBalance", decoded.context);
+        let context = match context {
+            std::result::Result::Ok(context) => context,
+            std::result::Result::Err(error) => return std::result::Result::Err(error),
+        };
+        return std::result::Result::Ok(crate::GetBalanceResult { context, value: decoded.value });
     }
 }
 
@@ -260,16 +208,9 @@ struct WireNodeVersion {
     feature_set: std::option::Option<u32>,
 }
 
-#[derive(serde::Deserialize)]
-struct WireRpcContext {
-    slot: u64,
-    #[serde(rename = "apiVersion", default)]
-    api_version: std::option::Option<std::string::String>,
-}
-
 #[derive(serde::Deserialize)]
 struct WireBalanceResult {
-    context: WireRpcContext,
+    context: serde_json::Value,
     value: u64,
 }