diff --git a/Cargo.lock b/Cargo.lock index 78eee9369..b5394925a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5931,13 +5931,9 @@ dependencies = [ name = "solana-frozen-abi" version = "1.18.0" dependencies = [ - "ahash 0.8.3", - "blake3", "block-buffer 0.10.4", "bs58", "bv", - "byteorder", - "cc", "either", "generic-array 0.14.7", "im", @@ -5948,7 +5944,6 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.7", "solana-frozen-abi-macro", "solana-logger", diff --git a/ci/test-stable.sh b/ci/test-stable.sh index e5f8b6532..f521a6c17 100755 --- a/ci/test-stable.sh +++ b/ci/test-stable.sh @@ -93,7 +93,7 @@ test-stable-sbf) # latest mainbeta release version. solana_program_count=$(grep -c 'solana-program v' cargo.log) rm -f cargo.log - if ((solana_program_count > 18)); then + if ((solana_program_count > 20)); then echo "Regression of build redundancy ${solana_program_count}." echo "Review dependency features that trigger redundant rebuilds of solana-program." exit 1 diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml index 3121b6968..2965dd17a 100644 --- a/frozen-abi/Cargo.toml +++ b/frozen-abi/Cargo.toml @@ -17,25 +17,18 @@ log = { workspace = true, features = ["std"] } serde = { workspace = true, features = ["derive", "rc"] } serde_bytes = { workspace = true } serde_derive = { workspace = true } -serde_json = { workspace = true } sha2 = { workspace = true } solana-frozen-abi-macro = { workspace = true } thiserror = { workspace = true } [target.'cfg(not(target_os = "solana"))'.dependencies] -ahash = { workspace = true } -blake3 = { workspace = true, features = ["digest", "traits-preview"] } block-buffer = { workspace = true } -byteorder = { workspace = true, features = ["i128"] } either = { workspace = true, features = ["use_std"] } generic-array = { workspace = true, features = ["serde", "more_lengths"] } im = { workspace = true, features = ["rayon", "serde"] } memmap2 = { workspace = true } subtle = { workspace = true } -[target.'cfg(any(unix, windows))'.dependencies] -cc = { workspace = true, features = ["jobserver", "parallel"] } - [target.'cfg(not(target_os = "solana"))'.dev-dependencies] solana-logger = { workspace = true } diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index fa80a2be2..3e749d426 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -4921,13 +4921,9 @@ dependencies = [ name = "solana-frozen-abi" version = "1.18.0" dependencies = [ - "ahash 0.8.3", - "blake3", "block-buffer 0.10.4", "bs58", "bv", - "byteorder 1.4.3", - "cc", "either", "generic-array 0.14.7", "im", @@ -4938,7 +4934,6 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.7", "solana-frozen-abi-macro", "subtle",