From b95cc7cf524dffc57f6da18f8248ec237af845eb Mon Sep 17 00:00:00 2001 From: taco-paco Date: Wed, 17 Dec 2025 12:31:06 +0700 Subject: [PATCH 1/2] wip: checking compilation without libclang --- .github/actions/setup-build-env/action.yml | 6 +- test-integration/Cargo.lock | 75 +++++++++++----------- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index a4a516080..79362c285 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -30,11 +30,7 @@ runs: - name: Install system deps (libudev, LLVM/Clang) if: runner.os == 'Linux' shell: "bash" - run: | - sudo apt-get update - sudo apt-get install -y \ - libudev-dev \ - libclang-dev + run: sudo apt-get update && sudo apt-get install -y libudev-dev - uses: Swatinem/rust-cache@v2 with: diff --git a/test-integration/Cargo.lock b/test-integration/Cargo.lock index f2720c8d7..6297805fc 100644 --- a/test-integration/Cargo.lock +++ b/test-integration/Cargo.lock @@ -558,7 +558,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", "regex", @@ -2049,10 +2049,10 @@ dependencies = [ [[package]] name = "guinea" -version = "0.4.1" +version = "0.4.2" dependencies = [ "bincode", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "serde", "solana-program", ] @@ -3009,7 +3009,7 @@ dependencies = [ [[package]] name = "magicblock-account-cloner" -version = "0.4.1" +version = "0.4.2" dependencies = [ "async-trait", "bincode", @@ -3020,10 +3020,10 @@ dependencies = [ "magicblock-config", "magicblock-core", "magicblock-ledger", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "magicblock-program", "magicblock-rpc-client", - "rand 0.8.5", + "rand 0.9.1", "solana-account", "solana-hash", "solana-instruction", @@ -3041,7 +3041,7 @@ dependencies = [ [[package]] name = "magicblock-accounts" -version = "0.4.1" +version = "0.4.2" dependencies = [ "async-trait", "log", @@ -3063,7 +3063,7 @@ dependencies = [ [[package]] name = "magicblock-accounts-db" -version = "0.4.1" +version = "0.4.2" dependencies = [ "lmdb-rkv", "log", @@ -3079,7 +3079,7 @@ dependencies = [ [[package]] name = "magicblock-aperture" -version = "0.4.1" +version = "0.4.2" dependencies = [ "arc-swap", "base64 0.21.7", @@ -3124,7 +3124,7 @@ dependencies = [ [[package]] name = "magicblock-api" -version = "0.4.1" +version = "0.4.2" dependencies = [ "anyhow", "borsh 1.5.7", @@ -3140,7 +3140,7 @@ dependencies = [ "magicblock-config", "magicblock-core", "magicblock-ledger", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "magicblock-metrics", "magicblock-processor", "magicblock-program", @@ -3179,7 +3179,7 @@ dependencies = [ [[package]] name = "magicblock-chainlink" -version = "0.4.1" +version = "0.4.2" dependencies = [ "arc-swap", "async-trait", @@ -3191,7 +3191,7 @@ dependencies = [ "magicblock-config", "magicblock-core", "magicblock-delegation-program", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "magicblock-metrics", "solana-account", "solana-account-decoder", @@ -3226,7 +3226,7 @@ dependencies = [ [[package]] name = "magicblock-committor-program" -version = "0.4.1" +version = "0.4.2" dependencies = [ "borsh 1.5.7", "paste", @@ -3238,7 +3238,7 @@ dependencies = [ [[package]] name = "magicblock-committor-service" -version = "0.4.1" +version = "0.4.2" dependencies = [ "async-trait", "base64 0.21.7", @@ -3281,7 +3281,7 @@ dependencies = [ [[package]] name = "magicblock-config" -version = "0.4.1" +version = "0.4.2" dependencies = [ "clap", "derive_more", @@ -3299,10 +3299,10 @@ dependencies = [ [[package]] name = "magicblock-core" -version = "0.4.1" +version = "0.4.2" dependencies = [ "flume", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "solana-account", "solana-account-decoder", "solana-hash", @@ -3337,7 +3337,7 @@ dependencies = [ [[package]] name = "magicblock-ledger" -version = "0.4.1" +version = "0.4.2" dependencies = [ "arc-swap", "bincode", @@ -3387,7 +3387,7 @@ dependencies = [ [[package]] name = "magicblock-magic-program-api" -version = "0.4.1" +version = "0.4.2" dependencies = [ "bincode", "serde", @@ -3396,7 +3396,7 @@ dependencies = [ [[package]] name = "magicblock-metrics" -version = "0.4.1" +version = "0.4.2" dependencies = [ "http-body-util", "hyper 1.6.0", @@ -3410,7 +3410,7 @@ dependencies = [ [[package]] name = "magicblock-processor" -version = "0.4.1" +version = "0.4.2" dependencies = [ "bincode", "log", @@ -3420,6 +3420,7 @@ dependencies = [ "magicblock-metrics", "magicblock-program", "parking_lot", + "rustc-hash 2.1.1", "solana-account", "solana-bpf-loader-program", "solana-compute-budget-program", @@ -3443,12 +3444,12 @@ dependencies = [ [[package]] name = "magicblock-program" -version = "0.4.1" +version = "0.4.2" dependencies = [ "bincode", "lazy_static", "magicblock-core", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "num-derive", "num-traits", "parking_lot", @@ -3475,7 +3476,7 @@ dependencies = [ [[package]] name = "magicblock-rpc-client" -version = "0.4.1" +version = "0.4.2" dependencies = [ "log", "solana-account", @@ -3496,13 +3497,13 @@ dependencies = [ [[package]] name = "magicblock-table-mania" -version = "0.4.1" +version = "0.4.2" dependencies = [ "ed25519-dalek", "log", "magicblock-metrics", "magicblock-rpc-client", - "rand 0.8.5", + "rand 0.9.1", "sha3", "solana-address-lookup-table-interface", "solana-clock", @@ -3522,7 +3523,7 @@ dependencies = [ [[package]] name = "magicblock-task-scheduler" -version = "0.4.1" +version = "0.4.2" dependencies = [ "bincode", "chrono", @@ -3549,7 +3550,7 @@ dependencies = [ [[package]] name = "magicblock-validator-admin" -version = "0.4.1" +version = "0.4.2" dependencies = [ "log", "magicblock-delegation-program", @@ -3566,7 +3567,7 @@ dependencies = [ [[package]] name = "magicblock-version" -version = "0.4.1" +version = "0.4.2" dependencies = [ "git-version", "rustc_version", @@ -4402,7 +4403,7 @@ dependencies = [ "bincode", "borsh 1.5.7", "ephemeral-rollups-sdk", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "serde", "solana-program", ] @@ -4426,7 +4427,7 @@ dependencies = [ "borsh 1.5.7", "ephemeral-rollups-sdk", "magicblock-delegation-program", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "solana-program", ] @@ -5276,7 +5277,7 @@ dependencies = [ "integration-test-tools", "log", "magicblock-core", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "program-schedulecommit", "schedulecommit-client", "solana-program", @@ -5292,7 +5293,7 @@ version = "0.0.0" dependencies = [ "integration-test-tools", "magicblock-core", - "magicblock-magic-program-api 0.4.1", + "magicblock-magic-program-api 0.4.2", "program-schedulecommit", "program-schedulecommit-security", "schedulecommit-client", @@ -5657,7 +5658,7 @@ dependencies = [ [[package]] name = "solana-account" version = "2.2.1" -source = "git+https://github.com/magicblock-labs/solana-account.git?rev=1beed4c#1beed4c0bc368bc0bed819fbdf551d1a4bf00001" +source = "git+https://github.com/magicblock-labs/solana-account.git?rev=57158728#571587284a525b66666291aee5174783139a1595" dependencies = [ "bincode", "qualifier_attr", @@ -7972,7 +7973,7 @@ dependencies = [ [[package]] name = "solana-storage-proto" -version = "0.4.1" +version = "0.4.2" dependencies = [ "bincode", "bs58", @@ -9439,7 +9440,7 @@ dependencies = [ [[package]] name = "test-kit" -version = "0.4.1" +version = "0.4.2" dependencies = [ "env_logger 0.11.8", "guinea", From a63298b616010d121570a6468271729b3b4b72b7 Mon Sep 17 00:00:00 2001 From: taco-paco Date: Wed, 17 Dec 2025 13:04:33 +0700 Subject: [PATCH 2/2] fix: add back lz4 support --- Cargo.toml | 3 +-- test-integration/Cargo.lock | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6c5a3839d..0fc50df81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -210,8 +210,7 @@ features = ["dev-context-only-utils"] # Avoid the vendored bzip2 within rocksdb-sys that can cause linker conflicts # when also using the bzip2 crate version = "0.22.0" -# default-features = false -# features = ["lz4"] +features = ["lz4"] [patch.crates-io] # some solana dependencies have solana-storage-proto as dependency diff --git a/test-integration/Cargo.lock b/test-integration/Cargo.lock index 6297805fc..072b84451 100644 --- a/test-integration/Cargo.lock +++ b/test-integration/Cargo.lock @@ -558,7 +558,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.10.5", "proc-macro2", "quote", "regex",