remove solana-program from solana-feature-set (#3140)

* remove solana-program from solana-feature-set * fix log-analyzer deps which this PR somehow breaks * add back Slot and Epoch aliases
anza-xyz · Oct 15, 2024 · cc1873f · cc1873f
1 parent c234605
commit cc1873f
Show file tree

Hide file tree

Showing 6 changed files with 234 additions and 222 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml
@@ -13,6 +13,7 @@ edition = { workspace = true }
 byte-unit = { workspace = true }
 clap = { version = "3.1.5", features = ["cargo"] }
 serde = { workspace = true }
+serde_derive = { workspace = true }
 serde_json = { workspace = true }
 solana-logger = { workspace = true }
 solana-version = { workspace = true }

diff --git a/log-analyzer/src/main.rs b/log-analyzer/src/main.rs
@@ -4,7 +4,7 @@ extern crate byte_unit;
 use {
     byte_unit::Byte,
     clap::{crate_description, crate_name, Arg, ArgMatches, Command},
-    serde::{Deserialize, Serialize},
+    serde_derive::{Deserialize, Serialize},
     std::{collections::HashMap, fs, ops::Sub, path::PathBuf},
 };
 

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/sdk/feature-set/Cargo.toml b/sdk/feature-set/Cargo.toml
@@ -11,13 +11,17 @@ edition = { workspace = true }
 
 [dependencies]
 lazy_static = { workspace = true }
+solana-clock = { workspace = true }
+solana-epoch-schedule = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }
 solana-frozen-abi-macro = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }
-solana-program = { workspace = true }
+solana-hash = { workspace = true }
+solana-pubkey = { workspace = true }
+solana-sha256-hasher = { workspace = true }
 
 [features]
 frozen-abi = [