Skip to content

refactor: remove crates moved to magicblock engine #1394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bmuddha wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

refactor: remove crates moved to magicblock engine #1394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 18 additions & 59 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ split-debuginfo = "packed"

[workspace]
members = [
"magicblock-account-cloner",
"magicblock-accounts",
"magicblock-accounts-db",
"magicblock-aml",
"magicblock-aperture",
"magicblock-api",
Expand All @@ -16,7 +13,6 @@ members = [
"magicblock-committor-service",
"magicblock-config",
"magicblock-core",
"magicblock-ledger",
"magicblock-magic-program-api",
"magicblock-metrics",
"magicblock-processor",
Expand All @@ -29,12 +25,7 @@ members = [
"magicblock-validator-admin",
"magicblock-version",
"programs/guinea",
"programs/magicblock",
"test-kit",
"tools/genx",
"tools/keypair-base58",
"tools/ledger-stats",
"tools/magicblock-tui-client",
"programs/magicblock"
]

# This prevents a Travis CI error when building for Windows.
Expand All @@ -43,7 +34,7 @@ resolver = "2"
[workspace.package]
# Solana 4.x versions
authors = ["MagicBlock Maintainers <maintainers@magicblock.xyz>"]
edition = "2021"
edition = "2024"
homepage = "https://www.magicblock.xyz"
license = "Business Source License 1.1"
repository = "https://github.com/magicblock-labs/ephemeral-validator"
Expand Down Expand Up @@ -107,11 +98,9 @@ magicblock-accounts-db = { path = "./magicblock-accounts-db" }
magicblock-aml = { path = "./magicblock-aml" }
magicblock-aperture = { path = "./magicblock-aperture" }
magicblock-api = { path = "./magicblock-api" }
magicblock-chainlink = { path = "./magicblock-chainlink", features = [
"dev-context",
] }
magicblock-chainlink = { path = "./magicblock-chainlink", features = ["dev-context"] }
magicblock-committor-program = { path = "./magicblock-committor-program", features = [
"no-entrypoint",
"no-entrypoint"
] }
magicblock-committor-service = { path = "./magicblock-committor-service" }
magicblock-config = { path = "./magicblock-config" }
Expand All @@ -138,18 +127,14 @@ num_cpus = "1.16.0"
parking_lot = "0.12"
paste = "1.0"
prometheus = "0.13.4"
# Keep in sync with `solana-storage-proto` codegen.


solana-transaction-context = { git = "https://github.com/magicblock-labs/magicblock-svm.git", rev = "190146af2ac0890848b50e8fc9d6c926c8205b5e", features = [
"dev-context-only-utils",
"dev-context-only-utils"
] }
solana-transaction-error = { version = "3.0" }
solana-transaction-status = { version = "4.0" }
solana-transaction-status-client-types = "4.0"
solana-zk-elgamal-proof-program = { version = "=4.0.0", features = [
"agave-unstable-api",
] }
solana-zk-elgamal-proof-program = { version = "=4.0.0", features = ["agave-unstable-api"] }
static_assertions = "1.1.0"
tempfile = "3.10.1"
test-kit = { path = "./test-kit" }
Expand All @@ -163,10 +148,7 @@ tonic-prost-build = "0.14"
tracing = "0.1"
tracing-log = { version = "0.2", features = ["log-tracer"] }
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
twox-hash = { version = "2.1", default-features = false, features = [
"alloc",
"xxhash3_64",
] }
twox-hash = { version = "2.1", default-features = false, features = ["alloc", "xxhash3_64"] }
url = "2.5.0"

# SPL Token crates used across the workspace
Expand All @@ -179,14 +161,10 @@ prost = "0.14"
protobuf-src = "1.1"
rand = "0.9"
reqwest = "0.12"
rocksdb = { git = "https://github.com/magicblock-labs/rust-rocksdb.git", rev = "6d975197" }
rusqlite = { version = "0.37.0", features = ["bundled"] } # bundled sqlite 3.44
rustc-hash = "2.1"
rustc_version = "0.4"
rustls = { version = "0.23", default-features = false, features = [
"aws_lc_rs",
"std",
] }
rustls = { version = "0.23", default-features = false, features = ["aws_lc_rs", "std"] }
Comment on lines 164 to +167

@coderabbitai coderabbitai Bot Jul 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
echo "Workspace/root rocksdb declarations:"
rg -n '^\s*rocksdb\s*=|package\s*=\s*"rocksdb"' Cargo.toml Cargo.lock

echo "Per-crate rocksdb dependency declarations:"
fd -HI '^Cargo\.toml$' . -x sh -c '
  echo "--- $1"
  rg -n "rocksdb\s*=|package\s*=\s*\"rocksdb\"" "$1" || true
' sh {}

echo "Rust source imports/usages:"
rg -n 'use\s+rocksdb\b|rocksdb::' --glob '*.rs' .

Repository: magicblock-labs/magicblock-validator

Length of output: 3917

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "Root Cargo.toml rocksdb-related lines:"
rg -n 'rocksdb|workspace\.dependencies|^\[workspace\]|\[dependencies\]' Cargo.toml

echo
echo "magicblock-ledger/Cargo.toml rocksdb-related lines:"
rg -n 'rocksdb|workspace\.dependencies|^\[dependencies\]' magicblock-ledger/Cargo.toml

echo
echo "test-integration/Cargo.toml rocksdb-related lines:"
rg -n 'rocksdb|workspace\.dependencies|^\[dependencies\]' test-integration/Cargo.toml

Repository: magicblock-labs/magicblock-validator

Length of output: 658

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "Root Cargo.toml around workspace dependencies:"
sed -n '43,90p' Cargo.toml | cat -n

echo
echo "Root Cargo.toml around the edited lines:"
sed -n '155,172p' Cargo.toml | cat -n

echo
echo "magicblock-ledger/Cargo.toml around rocksdb dependency:"
sed -n '34,48p' magicblock-ledger/Cargo.toml | cat -n

Repository: magicblock-labs/magicblock-validator

Length of output: 3458

Restore the workspace rocksdb dependency
magicblock-ledger/Cargo.toml still uses rocksdb = { workspace = true }, but Cargo.toml no longer defines rocksdb under [workspace.dependencies]. Re-add the workspace entry or switch this crate to an explicit dependency.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Cargo.toml` around lines 164 - 167, The workspace is missing the shared
rocksdb dependency entry, while magicblock-ledger still references rocksdb
through the workspace. Update the root Cargo.toml to either restore rocksdb
under [workspace.dependencies] or change the affected crate’s dependency
declaration to an explicit versioned dependency, and verify the crates using
rocksdb still resolve through the intended symbol.

scc = "2.4"
semver = "1.0.22"
serde = "1.0.217"
Expand All @@ -199,22 +177,14 @@ solana-account-decoder = { version = "4.0" }
solana-account-decoder-client-types = { version = "4.0" }
solana-account-info = { version = "3.1" }
solana-address-lookup-table-interface = { version = "3.0" }
solana-bpf-loader-program = { version = "=4.0.0", features = [
"agave-unstable-api",
] }
solana-bpf-loader-program = { version = "=4.0.0", features = ["agave-unstable-api"] }
solana-clock = { version = "3.0" }
solana-cluster-type = { version = "3.1" }
solana-commitment-config = { version = "3.1" }
solana-compute-budget = { version = "=4.0.0", features = [
"agave-unstable-api",
] }
solana-compute-budget-instruction = { version = "=4.0.0", features = [
"agave-unstable-api",
] }
solana-compute-budget = { version = "=4.0.0", features = ["agave-unstable-api"] }
solana-compute-budget-instruction = { version = "=4.0.0", features = ["agave-unstable-api"] }
solana-compute-budget-interface = { version = "3.0" }
solana-compute-budget-program = { version = "=4.0.0", features = [
"agave-unstable-api",
] }
solana-compute-budget-program = { version = "=4.0.0", features = ["agave-unstable-api"] }
solana-cpi = { version = "3.1" }
solana-feature-gate-interface = { version = "3.1" }
solana-feature-set = { package = "agave-feature-set", version = "4.0" }
Expand All @@ -228,14 +198,12 @@ solana-instructions-sysvar = { version = "3.0" }
solana-keypair = { version = "=3.1.0" }
solana-loader-v3-interface = { version = "6.1.0" }
solana-loader-v4-interface = { version = "3.1" }
solana-loader-v4-program = { version = "=4.0.0", features = [
"agave-unstable-api",
] }
solana-loader-v4-program = { version = "=4.0.0", features = ["agave-unstable-api"] }
solana-log-collector = { package = "solana-svm-log-collector", version = "=4.0.0", features = [
"agave-unstable-api",
"agave-unstable-api"
] }
solana-measure = { package = "solana-svm-measure", version = "=4.0.0", features = [
"agave-unstable-api",
"agave-unstable-api"
] }
solana-message = { version = "3.0" }
solana-metrics = { version = "4.0", features = ["agave-unstable-api"] }
Expand All @@ -259,19 +227,14 @@ solana-sha256-hasher = { version = "3.1" }
solana-signature = { version = "3.1" }
solana-signer = { version = "3.0" }
solana-slot-hashes = { version = "3.0" }
solana-storage-proto = { path = "storage-proto" }
solana-svm-callback = { version = "=4.0.0", features = ["agave-unstable-api"] }
solana-svm-transaction = { version = "=4.0.0", features = [
"agave-unstable-api",
] }
solana-svm-transaction = { version = "=4.0.0", features = ["agave-unstable-api"] }
solana-system-interface = { version = "3.1" }
solana-system-program = { version = "=4.0.0", features = [
"agave-unstable-api",
] }
solana-system-program = { version = "=4.0.0", features = ["agave-unstable-api"] }
solana-system-transaction = { version = "3.0" }
solana-sysvar = { version = "3.0" }
solana-timings = { package = "solana-svm-timings", version = "=4.0.0", features = [
"agave-unstable-api",
"agave-unstable-api"
] }
solana-transaction = { version = "3.0" }

Expand All @@ -283,11 +246,7 @@ rev = "190146af2ac0890848b50e8fc9d6c926c8205b5e"
[patch.crates-io]
solana-account = { git = "https://github.com/magicblock-labs/magicblock-svm.git", rev = "190146af2ac0890848b50e8fc9d6c926c8205b5e" }
solana-program-runtime = { git = "https://github.com/magicblock-labs/magicblock-svm.git", rev = "190146af2ac0890848b50e8fc9d6c926c8205b5e" }
solana-storage-proto = { path = "storage-proto" }
solana-svm = { git = "https://github.com/magicblock-labs/magicblock-svm.git", rev = "190146af2ac0890848b50e8fc9d6c926c8205b5e" }
solana-transaction-context = { git = "https://github.com/magicblock-labs/magicblock-svm.git", rev = "190146af2ac0890848b50e8fc9d6c926c8205b5e" }
# Fork is used to enable `disable_manual_compaction` usage
# Fork is based on commit d4e9e16 of rocksdb (parent commit of 0.23.0 release)
# without patching update isn't possible due to conflict with solana deps
libsodium-rs = { git = "https://github.com/jedisct1/libsodium-rs.git", rev = "0397a6c5785233f9f2ac91f3eedc3cceb74e0060" }
rocksdb = { git = "https://github.com/magicblock-labs/rust-rocksdb.git", rev = "6d975197" }
31 changes: 0 additions & 31 deletions magicblock-account-cloner/Cargo.toml
View file
Open in desktop

This file was deleted.

101 changes: 0 additions & 101 deletions magicblock-account-cloner/README.md
View file
Open in desktop

This file was deleted.

Loading
Loading