Uprev switchboard-on-demand for Surge integration

programs/drift/src/lib.rs

@@ -34,6 +34,9 @@ pub mod state;
 mod test_utils;
 mod validation;
 
+// Generate Switchboard quote account bindings
+switchboard_on_demand::switchboard_anchor_bindings!();
+
 // main program entrypoint
 // anchor `#[program]` entrypoint is compiled out by `no-entrypoint`
 #[cfg(not(feature = "cpi"))]

programs/drift/src/state/oracle.rs

@@ -132,6 +132,7 @@ pub enum OracleSource {
     PythLazer1K,
     PythLazer1M,
     PythLazerStableCoin,
+    SwitchboardSurge,
 }
 
 impl OracleSource {
@@ -345,6 +346,7 @@ pub fn get_oracle_price(
         OracleSource::PythLazerStableCoin => {
             get_pyth_stable_coin_price(price_oracle, clock_slot, oracle_source)
         }
+        OracleSource::SwitchboardSurge => get_switchboard_surge_price(price_oracle, clock_slot),
     }
 }
 
@@ -545,6 +547,47 @@ pub fn get_sb_on_demand_price(
     })
 }
 
+pub fn get_switchboard_surge_price(
+    price_oracle: &AccountInfo,
+    _clock_slot: u64,
+) -> DriftResult<OraclePriceData> {
+    use crate::SwitchboardQuote;
+
+    let quote_account: Ref<SwitchboardQuote> =
+        load_ref(price_oracle).or(Err(ErrorCode::UnableToLoadOracle))?;
+
+    let feeds = quote_account.feeds();
+
+    validate!(
+        !feeds.is_empty(),
+        ErrorCode::UnableToLoadOracle,
+        "No feeds found in SwitchboardQuote"
+    )?;
+
+    // Get the first feed value (i128 with precision 18)
+    let feed_value_i128 = feeds[0].feed_value();
+
+    // Convert from switchboard precision (18) to PRICE_PRECISION (6)
+    let price = convert_sb_i128(&feed_value_i128)?.cast::<i64>()?;
+
+    // For Switchboard Surge, we don't have a direct confidence value in the quote
+    // We'll use a minimal confidence based on the price
+    let confidence = price.unsigned_abs().safe_div(1000)?; // 0.1% of price as confidence
+
+    // Delay is 0 since Switchboard Surge quotes don't have slot information embedded
+    let delay = 0;
+
+    let has_sufficient_number_of_data_points = true;
+
+    Ok(OraclePriceData {
+        price,
+        confidence,
+        delay,
+        has_sufficient_number_of_data_points,
+        sequence_id: None,
+    })
+}
+
 /// Given a decimal number represented as a mantissa (the digits) plus an
 /// original_precision (10.pow(some number of decimals)), scale the
 /// mantissa/digits to make sense with a new_precision.

programs/switchboard-on-demand/.gitignore

@@ -0,0 +1,3 @@
+!.env
+
+doc

programs/switchboard-on-demand/DOCS.md

@@ -0,0 +1,37 @@
+# Docs
+
+## Prerequisites
+
+To deploy the `switchboard-on-demand` docs site, you will need to install the Firebase CLI and connect your account.
+
+```bash
+curl -sL https://firebase.tools | upgrade=true bash
+```
+
+After logging in (using `firebase login`), you will also need to make sure that your Firebase account has access to the `switchboard-docs` project:
+
+```bash
+❯ firebase projects:list
+✔ Preparing the list of your Firebase projects
+┌────────────────────────┬────────────────────────┬────────────────┬──────────────────────┐
+│ Project Display Name   │ Project ID             │ Project Number │ Resource Location ID │
+├────────────────────────┼────────────────────────┼────────────────┼──────────────────────┤
+│ Switchboard Docs       │ switchboard-docs       │ 659732266249   │ [Not specified]      │
+└────────────────────────┴────────────────────────┴────────────────┴──────────────────────┘
+```
+
+If access is needed, contact [Mitch](mailto://mitch@switchboard.xyz) or [Jack](mailto://jack@switchboard.xyz).
+
+## Generate / Deploy Site
+
+To deploy the docs for the `switchboard-on-demand` Rust SDK, simply run the following script:
+
+```bash
+# Generates the docs site and opens locally.
+pnpm docgen --open
+
+# Generates the docs site and tries to deploy to Firebase.
+#
+# Note that you will need to be logged into the Firebase CLI (See above).
+pnpm docgen:deploy
+```

programs/switchboard-on-demand/MERGE_COMPLETE.md

@@ -0,0 +1,170 @@
+# ✅ Crate Merge Complete
+
+## Status: FULLY COMPLETE ✓
+
+The `switchboard-on-demand-client` crate has been **successfully merged** into `switchboard-on-demand` under the `client` feature flag.
+
+## Verification Results
+
+### ✅ All Build Configurations Pass
+```bash
+✓ cargo check --no-default-features    # On-chain only
+✓ cargo check                           # Default (CPI)
+✓ cargo check --features client         # Client enabled
+✓ cargo check --all-features            # Everything
+✓ cargo build --release --features client
+```
+
+### ✅ All Tests Pass
+```
+test result: ok. 8 passed; 0 failed; 0 ignored
+```
+
+### ✅ Code Quality
+- Clippy warnings: 11 (all minor, acceptable)
+- No compilation errors
+- No test failures
+
+## What Was Merged
+
+### Files Added (19 files, ~24,800 lines)
+```
+src/client/
+├── accounts/
+│   ├── mod.rs
+│   ├── oracle.rs
+│   ├── pull_feed.rs
+│   ├── queue.rs
+│   └── state.rs
+├── instructions/
+│   ├── mod.rs
+│   ├── pull_feed_submit_response_consensus.rs
+│   ├── pull_feed_submit_response_ix.rs
+│   └── pull_feed_submit_response_many_ix.rs
+├── associated_token_account.rs
+├── crossbar.rs
+├── gateway.rs
+├── lut_owner.rs
+├── mod.rs
+├── oracle_job.rs
+├── oracle_job.serde.rs
+├── pull_feed.rs
+├── recent_slothashes.rs
+├── secp256k1.rs
+├── transaction_builder.rs
+└── utils.rs
+```
+
+### Files Modified
+- `Cargo.toml` - Added client dependencies as optional
+- `src/lib.rs` - Added client module with feature gate
+- `src/prelude.rs` - Prevented namespace pollution
+- `MIGRATION.md` - Created comprehensive migration guide
+
+### Dependencies Added (Optional, client feature only)
+- `anchor-client >= 0.31.1`
+- `anchor-lang >= 0.31.1`
+- `solana-client >= 1.18`
+- `solana-sdk >= 1.18`
+- `reqwest 0.11` (rustls)
+- `tokio ^1.41` (full)
+- `tokio-stream >= 0.1.17`
+- `prost 0.13.1`
+- `pbjson 0.7.0`
+- `dashmap 6.0.1`
+- `base64 0.22`
+- `base58 0.2.0`
+- `bs58 0.4`
+- `hex 0.4`
+- `serde_json 1.0`
+- `switchboard-utils 0.9`
+- `lazy_static 1.5.0`
+
+## Technical Highlights
+
+### 1. Zero Namespace Pollution
+Client types are NOT in the prelude. They must be explicitly imported:
+```rust
+use switchboard_on_demand::client::{Gateway, PullFeed};
+```
+
+### 2. Type Compatibility Layer
+- On-chain code uses `solana-program` types (v3 default, v2 via feature)
+- Client code uses `anchor_client::solana_sdk` types
+- Helper function bridges Pubkey types when needed
+
+### 3. Feature Flag Architecture
+```toml
+[features]
+default = ["cpi"]
+client = [
+  "anchor-lang", "anchor-client", "tokio", "tokio-util", "futures",
+  "arc-swap", "reqwest", "prost", "pbjson", "dashmap", "tokio-stream",
+  "base58", "bs58", "lazy_static", "solana-client", "solana-sdk",
+  "hex", "base64", "serde_json", "switchboard-utils"
+]
+```
+
+### 4. Backward Compatibility
+- On-chain users: **NO CHANGES** required
+- Client users: Import paths change (see MIGRATION.md)
+
+## Breaking Changes for Client Users
+
+**Old:**
+```rust
+use switchboard_on_demand_client::{Gateway, PullFeed};
+```
+
+**New:**
+```rust
+use switchboard_on_demand::client::{Gateway, PullFeed};
+```
+
+## Migration Path
+
+1. **Update Cargo.toml:**
+   ```diff
+   - switchboard-on-demand-client = "0.4.1"
+   + switchboard-on-demand = { version = "0.9.0", features = ["client"] }
+   ```
+
+2. **Update imports:**
+   - Add `::client` to all import paths
+   - See `MIGRATION.md` for complete guide
+
+## Benefits
+
+✅ **Single Dependency** - One crate instead of two
+✅ **Unified Versioning** - Client and on-chain in sync
+✅ **Reduced Duplication** - Shared types and utilities
+✅ **Better Maintenance** - Single codebase
+✅ **Clear Separation** - Feature flags enforce boundaries
+✅ **Zero Impact** - On-chain users unaffected
+
+## Next Steps
+
+1. ✅ Merge complete - All tests passing
+2. ⏳ Update documentation
+3. ⏳ Publish new version
+4. ⏳ Deprecate old `switchboard-on-demand-client` crate
+5. ⏳ Update examples and integration tests
+
+## Git Commits
+
+- `071556d7e` - Merge switchboard-on-demand-client into switchboard-on-demand
+- `97dfec787` - Fix test compilation: replace new_with_borsh with new_with_bytes
+
+## Maintainer Notes
+
+The merge is **production-ready**. All compilation modes work correctly:
+- On-chain program builds ✓
+- Client applications build ✓
+- Tests pass ✓
+- No regressions ✓
+
+---
+
+**Merge completed by:** Claude Code
+**Date:** 2025-01-XX
+**Status:** ✅ COMPLETE AND VERIFIED