From 4b65d6471aad52e5a8d4ca968dca3a18d86be54b Mon Sep 17 00:00:00 2001 From: yihau Date: Tue, 20 Feb 2024 02:17:57 +0800 Subject: [PATCH] rename core --- Cargo.lock | 190 +++++++++--------- Cargo.toml | 2 +- README.md | 4 +- accounts-cluster-bench/Cargo.toml | 2 +- accounts-cluster-bench/src/main.rs | 2 +- banking-bench/Cargo.toml | 2 +- banking-bench/src/main.rs | 2 +- bench-tps/Cargo.toml | 2 +- bench-tps/src/send_batch.rs | 2 +- bench-tps/tests/bench_tps.rs | 2 +- ci/test-stable.sh | 4 +- client-test/tests/client.rs | 2 +- ...nd_and_confirm_transactions_in_parallel.rs | 4 +- core/Cargo.toml | 6 +- core/benches/banking_stage.rs | 4 +- core/benches/banking_trace.rs | 2 +- core/benches/consensus.rs | 4 +- core/benches/consumer.rs | 2 +- core/benches/gen_keys.rs | 2 +- core/benches/sigverify_stage.rs | 4 +- core/src/replay_stage.rs | 4 +- core/tests/epoch_accounts_hash.rs | 2 +- core/tests/snapshots.rs | 2 +- docs/src/operations/guides/validator-stake.md | 2 +- dos/Cargo.toml | 2 +- dos/src/main.rs | 4 +- entry/src/entry.rs | 4 +- ledger-tool/Cargo.toml | 2 +- ledger-tool/src/ledger_utils.rs | 2 +- ledger-tool/src/main.rs | 2 +- ledger/src/blockstore.rs | 2 +- local-cluster/Cargo.toml | 2 +- local-cluster/src/cluster.rs | 2 +- local-cluster/src/cluster_tests.rs | 2 +- local-cluster/src/integration_tests.rs | 4 +- local-cluster/src/local_cluster.rs | 2 +- local-cluster/src/validator_configs.rs | 2 +- local-cluster/tests/local_cluster.rs | 6 +- poh/benches/poh.rs | 2 +- programs/sbf/Cargo.lock | 154 +++++++------- .../src/nonblocking/pubsub_client.rs | 2 +- pubsub-client/src/pubsub_client.rs | 2 +- rpc-client-api/src/response.rs | 10 +- rpc-client/src/mock_sender.rs | 2 +- rpc-client/src/nonblocking/rpc_client.rs | 4 +- rpc-client/src/rpc_client.rs | 2 +- rpc/src/rpc.rs | 4 +- rpc/src/rpc_pubsub.rs | 2 +- .../genesis-test/cluster_token_count.sh | 2 +- test-validator/Cargo.toml | 2 +- test-validator/src/lib.rs | 2 +- transaction-dos/Cargo.toml | 2 +- transaction-dos/src/main.rs | 2 +- validator/Cargo.toml | 2 +- validator/src/admin_rpc_service.rs | 6 +- validator/src/bin/solana-test-validator.rs | 4 +- validator/src/bootstrap.rs | 4 +- validator/src/cli.rs | 2 +- validator/src/dashboard.rs | 2 +- validator/src/main.rs | 4 +- 60 files changed, 255 insertions(+), 255 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 069b0e4df8b8c3..fb046962b54750 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,6 +91,92 @@ dependencies = [ "toml 0.8.10", ] +[[package]] +name = "agave-core" +version = "1.18.0" +dependencies = [ + "agave-core", + "agave-geyser-plugin-manager", + "assert_matches", + "base64 0.21.7", + "bincode", + "bs58", + "bytes", + "chrono", + "crossbeam-channel", + "dashmap", + "eager", + "etcd-client", + "fs_extra", + "futures 0.3.30", + "histogram", + "itertools", + "lazy_static", + "log", + "lru", + "min-max-heap", + "num_enum", + "prio-graph", + "quinn", + "rand 0.8.5", + "rand_chacha 0.3.1", + "raptorq", + "rayon", + "rolling-file", + "rustc_version 0.4.0", + "rustls", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "serial_test", + "solana-accounts-db", + "solana-bloom", + "solana-client", + "solana-cost-model", + "solana-entry", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-gossip", + "solana-ledger", + "solana-logger", + "solana-measure", + "solana-metrics", + "solana-net-utils", + "solana-perf", + "solana-poh", + "solana-program-runtime", + "solana-quic-client", + "solana-rayon-threadlimit", + "solana-rpc", + "solana-rpc-client-api", + "solana-runtime", + "solana-sdk", + "solana-send-transaction-service", + "solana-stake-program", + "solana-streamer", + "solana-svm", + "solana-tpu-client", + "solana-transaction-status", + "solana-turbine", + "solana-unified-scheduler-pool", + "solana-version", + "solana-vote", + "solana-vote-program", + "solana-wen-restart", + "static_assertions", + "strum", + "strum_macros", + "sys-info", + "sysctl", + "systemstat", + "tempfile", + "test-case", + "thiserror", + "tokio", + "trees", +] + [[package]] name = "agave-geyser-plugin-interface" version = "1.18.0" @@ -165,6 +251,7 @@ dependencies = [ name = "agave-ledger-tool" version = "1.18.0" dependencies = [ + "agave-core", "agave-geyser-plugin-manager", "assert_cmd", "bs58", @@ -188,7 +275,6 @@ dependencies = [ "solana-bpf-loader-program", "solana-clap-utils", "solana-cli-output", - "solana-core", "solana-cost-model", "solana-entry", "solana-gossip", @@ -217,6 +303,7 @@ dependencies = [ name = "agave-validator" version = "1.18.0" dependencies = [ + "agave-core", "agave-geyser-plugin-interface", "agave-geyser-plugin-manager", "chrono", @@ -247,7 +334,6 @@ dependencies = [ "solana-accounts-db", "solana-clap-utils", "solana-cli-config", - "solana-core", "solana-download-utils", "solana-entry", "solana-faucet", @@ -5402,6 +5488,7 @@ dependencies = [ name = "solana-accounts-cluster-bench" version = "1.18.0" dependencies = [ + "agave-core", "clap 2.33.3", "log", "rand 0.8.5", @@ -5411,7 +5498,6 @@ dependencies = [ "solana-clap-utils", "solana-cli-config", "solana-client", - "solana-core", "solana-faucet", "solana-gossip", "solana-local-cluster", @@ -5530,13 +5616,13 @@ dependencies = [ name = "solana-banking-bench" version = "1.18.0" dependencies = [ + "agave-core", "clap 3.2.23", "crossbeam-channel", "log", "rand 0.8.5", "rayon", "solana-client", - "solana-core", "solana-gossip", "solana-ledger", "solana-logger", @@ -5609,6 +5695,7 @@ dependencies = [ name = "solana-bench-tps" version = "1.18.0" dependencies = [ + "agave-core", "clap 2.33.3", "crossbeam-channel", "log", @@ -5621,7 +5708,6 @@ dependencies = [ "solana-cli-config", "solana-client", "solana-connection-cache", - "solana-core", "solana-faucet", "solana-genesis", "solana-gossip", @@ -5994,92 +6080,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "solana-core" -version = "1.18.0" -dependencies = [ - "agave-geyser-plugin-manager", - "assert_matches", - "base64 0.21.7", - "bincode", - "bs58", - "bytes", - "chrono", - "crossbeam-channel", - "dashmap", - "eager", - "etcd-client", - "fs_extra", - "futures 0.3.30", - "histogram", - "itertools", - "lazy_static", - "log", - "lru", - "min-max-heap", - "num_enum", - "prio-graph", - "quinn", - "rand 0.8.5", - "rand_chacha 0.3.1", - "raptorq", - "rayon", - "rolling-file", - "rustc_version 0.4.0", - "rustls", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "serial_test", - "solana-accounts-db", - "solana-bloom", - "solana-client", - "solana-core", - "solana-cost-model", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-program-runtime", - "solana-quic-client", - "solana-rayon-threadlimit", - "solana-rpc", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-stake-program", - "solana-streamer", - "solana-svm", - "solana-tpu-client", - "solana-transaction-status", - "solana-turbine", - "solana-unified-scheduler-pool", - "solana-version", - "solana-vote", - "solana-vote-program", - "solana-wen-restart", - "static_assertions", - "strum", - "strum_macros", - "sys-info", - "sysctl", - "systemstat", - "tempfile", - "test-case", - "thiserror", - "tokio", - "trees", -] - [[package]] name = "solana-cost-model" version = "1.18.0" @@ -6109,6 +6109,7 @@ dependencies = [ name = "solana-dos" version = "1.18.0" dependencies = [ + "agave-core", "bincode", "clap 3.2.23", "crossbeam-channel", @@ -6118,7 +6119,6 @@ dependencies = [ "serde", "solana-bench-tps", "solana-client", - "solana-core", "solana-faucet", "solana-gossip", "solana-local-cluster", @@ -6427,6 +6427,7 @@ dependencies = [ name = "solana-local-cluster" version = "1.18.0" dependencies = [ + "agave-core", "assert_matches", "crossbeam-channel", "fs_extra", @@ -6439,7 +6440,6 @@ dependencies = [ "solana-accounts-db", "solana-client", "solana-config-program", - "solana-core", "solana-download-utils", "solana-entry", "solana-gossip", @@ -7347,6 +7347,7 @@ dependencies = [ name = "solana-test-validator" version = "1.18.0" dependencies = [ + "agave-core", "agave-geyser-plugin-manager", "base64 0.21.7", "bincode", @@ -7357,7 +7358,6 @@ dependencies = [ "solana-accounts-db", "solana-cli-output", "solana-client", - "solana-core", "solana-gossip", "solana-ledger", "solana-logger", @@ -7447,6 +7447,7 @@ dependencies = [ name = "solana-transaction-dos" version = "1.18.0" dependencies = [ + "agave-core", "bincode", "clap 2.33.3", "log", @@ -7455,7 +7456,6 @@ dependencies = [ "solana-clap-utils", "solana-cli", "solana-client", - "solana-core", "solana-faucet", "solana-gossip", "solana-local-cluster", diff --git a/Cargo.toml b/Cargo.toml index 28fa014c1fdccf..480f69d7a9cf7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -328,7 +328,7 @@ solana-client = { path = "client", version = "=1.18.0" } solana-compute-budget-program = { path = "programs/compute-budget", version = "=1.18.0" } solana-config-program = { path = "programs/config", version = "=1.18.0" } solana-connection-cache = { path = "connection-cache", version = "=1.18.0", default-features = false } -solana-core = { path = "core", version = "=1.18.0" } +agave-core = { path = "core", version = "=1.18.0" } solana-cost-model = { path = "cost-model", version = "=1.18.0" } solana-download-utils = { path = "download-utils", version = "=1.18.0" } solana-entry = { path = "entry", version = "=1.18.0" } diff --git a/README.md b/README.md index bbaeb3d019a658..bf545b7802f0aa 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@

-[![Solana crate](https://img.shields.io/crates/v/solana-core.svg)](https://crates.io/crates/solana-core) -[![Solana documentation](https://docs.rs/solana-core/badge.svg)](https://docs.rs/solana-core) +[![Solana crate](https://img.shields.io/crates/v/agave-core.svg)](https://crates.io/crates/agave-core) +[![Solana documentation](https://docs.rs/agave-core/badge.svg)](https://docs.rs/agave-core) [![Build status](https://badge.buildkite.com/8cc350de251d61483db98bdfc895b9ea0ac8ffa4a32ee850ed.svg?branch=master)](https://buildkite.com/solana-labs/solana/builds?branch=master) [![codecov](https://codecov.io/gh/solana-labs/solana/branch/master/graph/badge.svg)](https://codecov.io/gh/solana-labs/solana) diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml index 54a455753831fd..c13311565331fa 100644 --- a/accounts-cluster-bench/Cargo.toml +++ b/accounts-cluster-bench/Cargo.toml @@ -32,7 +32,7 @@ solana-version = { workspace = true } spl-token = { workspace = true, features = ["no-entrypoint"] } [dev-dependencies] -solana-core = { workspace = true } +agave-core = { workspace = true } solana-local-cluster = { workspace = true } solana-runtime = { workspace = true, features = ["dev-context-only-utils"] } solana-test-validator = { workspace = true } diff --git a/accounts-cluster-bench/src/main.rs b/accounts-cluster-bench/src/main.rs index 1a945090b39777..2c58901e5b802d 100644 --- a/accounts-cluster-bench/src/main.rs +++ b/accounts-cluster-bench/src/main.rs @@ -1059,7 +1059,7 @@ pub mod test { accounts_index::{AccountIndex, AccountSecondaryIndexes}, inline_spl_token, }, - solana_core::validator::ValidatorConfig, + agave_core::validator::ValidatorConfig, solana_faucet::faucet::run_local_faucet, solana_local_cluster::{ local_cluster::{ClusterConfig, LocalCluster}, diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml index ed791d94499a0f..92abd9e6d1fa3d 100644 --- a/banking-bench/Cargo.toml +++ b/banking-bench/Cargo.toml @@ -15,7 +15,7 @@ log = { workspace = true } rand = { workspace = true } rayon = { workspace = true } solana-client = { workspace = true } -solana-core = { workspace = true } +agave-core = { workspace = true } solana-gossip = { workspace = true } solana-ledger = { workspace = true } solana-logger = { workspace = true } diff --git a/banking-bench/src/main.rs b/banking-bench/src/main.rs index 041df5354f9e0f..1b2a63cb85563b 100644 --- a/banking-bench/src/main.rs +++ b/banking-bench/src/main.rs @@ -6,7 +6,7 @@ use { rand::{thread_rng, Rng}, rayon::prelude::*, solana_client::connection_cache::ConnectionCache, - solana_core::{ + agave_core::{ banking_stage::BankingStage, banking_trace::{BankingPacketBatch, BankingTracer, BANKING_TRACE_DIR_DEFAULT_BYTE_LIMIT}, }, diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index cd40eb1c833c1c..245f907cac9ebc 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -20,7 +20,7 @@ solana-clap-utils = { workspace = true } solana-cli-config = { workspace = true } solana-client = { workspace = true } solana-connection-cache = { workspace = true } -solana-core = { workspace = true } +agave-core = { workspace = true } solana-faucet = { workspace = true } solana-genesis = { workspace = true } solana-gossip = { workspace = true } diff --git a/bench-tps/src/send_batch.rs b/bench-tps/src/send_batch.rs index 5ea916530ca23d..0a87a2d7d612f0 100644 --- a/bench-tps/src/send_batch.rs +++ b/bench-tps/src/send_batch.rs @@ -2,7 +2,7 @@ use { crate::bench_tps_client::*, log::*, rayon::prelude::*, - solana_core::gen_keys::GenKeys, + agave_core::gen_keys::GenKeys, solana_measure::measure::Measure, solana_sdk::{ commitment_config::CommitmentConfig, diff --git a/bench-tps/tests/bench_tps.rs b/bench-tps/tests/bench_tps.rs index e7cabdac44baed..080bac8cd54554 100644 --- a/bench-tps/tests/bench_tps.rs +++ b/bench-tps/tests/bench_tps.rs @@ -11,7 +11,7 @@ use { thin_client::ThinClient, tpu_client::{TpuClient, TpuClientConfig}, }, - solana_core::validator::ValidatorConfig, + agave_core::validator::ValidatorConfig, solana_faucet::faucet::run_local_faucet, solana_local_cluster::{ local_cluster::{ClusterConfig, LocalCluster}, diff --git a/ci/test-stable.sh b/ci/test-stable.sh index 40ee0ae2c40a74..05342ee4b17211 100755 --- a/ci/test-stable.sh +++ b/ci/test-stable.sh @@ -124,7 +124,7 @@ test-stable-perf) rm -rf target/perf-libs ./fetch-perf-libs.sh - # Force CUDA for solana-core unit tests + # Force CUDA for agave-core unit tests export TEST_PERF_LIBS_CUDA=1 # Force CUDA in ci/localnet-sanity.sh @@ -132,7 +132,7 @@ test-stable-perf) fi _ cargo build --bins ${V:+--verbose} - _ cargo test --package solana-perf --package solana-ledger --package solana-core --lib ${V:+--verbose} -- --nocapture + _ cargo test --package solana-perf --package solana-ledger --package agave-core --lib ${V:+--verbose} -- --nocapture _ cargo run --manifest-path poh-bench/Cargo.toml ${V:+--verbose} -- --hashes-per-tick 10 ;; test-wasm) diff --git a/client-test/tests/client.rs b/client-test/tests/client.rs index 96c0a8cd82c883..a1cb14897b097d 100644 --- a/client-test/tests/client.rs +++ b/client-test/tests/client.rs @@ -71,7 +71,7 @@ fn test_rpc_client() { let client = RpcClient::new(test_validator.rpc_url()); assert_eq!( - client.get_version().unwrap().solana_core, + client.get_version().unwrap().agave_core, solana_version::semver!() ); diff --git a/client-test/tests/send_and_confirm_transactions_in_parallel.rs b/client-test/tests/send_and_confirm_transactions_in_parallel.rs index 44f8738983bdcb..18f005055d71df 100644 --- a/client-test/tests/send_and_confirm_transactions_in_parallel.rs +++ b/client-test/tests/send_and_confirm_transactions_in_parallel.rs @@ -44,7 +44,7 @@ fn test_send_and_confirm_transactions_in_parallel_without_tpu_client() { let rpc_client = Arc::new(RpcClient::new(test_validator.rpc_url())); assert_eq!( - rpc_client.get_version().unwrap().solana_core, + rpc_client.get_version().unwrap().agave_core, solana_version::semver!() ); @@ -94,7 +94,7 @@ fn test_send_and_confirm_transactions_in_parallel_with_tpu_client() { let rpc_client = Arc::new(RpcClient::new(test_validator.rpc_url())); assert_eq!( - rpc_client.get_version().unwrap().solana_core, + rpc_client.get_version().unwrap().agave_core, solana_version::semver!() ); diff --git a/core/Cargo.toml b/core/Cargo.toml index 9fd9ac95ba5afb..c54df5dd72f8a7 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "solana-core" +name = "agave-core" description = "Blockchain, Rebuilt for Scale" -documentation = "https://docs.rs/solana-core" +documentation = "https://docs.rs/agave-core" readme = "../README.md" version = { workspace = true } authors = { workspace = true } @@ -89,7 +89,7 @@ raptorq = { workspace = true } serde_json = { workspace = true } serial_test = { workspace = true } # See order-crates-for-publishing.py for using this unusual `path = "."` -solana-core = { path = ".", features = ["dev-context-only-utils"] } +agave-core = { path = ".", features = ["dev-context-only-utils"] } solana-logger = { workspace = true } solana-poh = { workspace = true, features = ["dev-context-only-utils"] } solana-program-runtime = { workspace = true } diff --git a/core/benches/banking_stage.rs b/core/benches/banking_stage.rs index 242d3b0ed6b530..f03974cbde7228 100644 --- a/core/benches/banking_stage.rs +++ b/core/benches/banking_stage.rs @@ -1,7 +1,7 @@ #![allow(clippy::arithmetic_side_effects)] #![feature(test)] -use solana_core::validator::BlockProductionMethod; +use agave_core::validator::BlockProductionMethod; extern crate test; @@ -11,7 +11,7 @@ use { rand::{thread_rng, Rng}, rayon::prelude::*, solana_client::connection_cache::ConnectionCache, - solana_core::{ + agave_core::{ banking_stage::{ committer::Committer, consumer::Consumer, diff --git a/core/benches/banking_trace.rs b/core/benches/banking_trace.rs index fb93deebc17ae2..0f21423275b15d 100644 --- a/core/benches/banking_trace.rs +++ b/core/benches/banking_trace.rs @@ -3,7 +3,7 @@ extern crate test; use { - solana_core::banking_trace::{ + agave_core::banking_trace::{ for_test::{ drop_and_clean_temp_dir_unless_suppressed, sample_packet_batch, terminate_tracer, }, diff --git a/core/benches/consensus.rs b/core/benches/consensus.rs index cff71502df977e..4cc92c4c0483f4 100644 --- a/core/benches/consensus.rs +++ b/core/benches/consensus.rs @@ -1,10 +1,10 @@ #![feature(test)] -extern crate solana_core; +extern crate agave_core; extern crate test; use { - solana_core::{ + agave_core::{ consensus::{tower_storage::FileTowerStorage, Tower}, vote_simulator::VoteSimulator, }, diff --git a/core/benches/consumer.rs b/core/benches/consumer.rs index f056fdd0d49a34..175c89945dc200 100644 --- a/core/benches/consumer.rs +++ b/core/benches/consumer.rs @@ -7,7 +7,7 @@ use { iter::IndexedParallelIterator, prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator}, }, - solana_core::banking_stage::{ + agave_core::banking_stage::{ committer::Committer, consumer::Consumer, qos_service::QosService, }, solana_entry::entry::Entry, diff --git a/core/benches/gen_keys.rs b/core/benches/gen_keys.rs index 410ec2b733b1fa..9975e368cf84b2 100644 --- a/core/benches/gen_keys.rs +++ b/core/benches/gen_keys.rs @@ -2,7 +2,7 @@ extern crate test; -use {solana_core::gen_keys::GenKeys, test::Bencher}; +use {agave_core::gen_keys::GenKeys, test::Bencher}; #[bench] fn bench_gen_keys(b: &mut Bencher) { diff --git a/core/benches/sigverify_stage.rs b/core/benches/sigverify_stage.rs index 70f33020dd3e70..898786017d857d 100644 --- a/core/benches/sigverify_stage.rs +++ b/core/benches/sigverify_stage.rs @@ -1,7 +1,7 @@ #![feature(test)] #![allow(clippy::arithmetic_side_effects)] -extern crate solana_core; +extern crate agave_core; extern crate test; use { @@ -11,7 +11,7 @@ use { distributions::{Distribution, Uniform}, thread_rng, Rng, }, - solana_core::{ + agave_core::{ banking_trace::BankingTracer, sigverify::TransactionSigVerifier, sigverify_stage::{SigVerifier, SigVerifyStage}, diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index c5467e316d8d4b..59ef9aa5af7a15 100644 --- a/core/src/replay_stage.rs +++ b/core/src/replay_stage.rs @@ -8450,7 +8450,7 @@ pub(crate) mod tests { #[test] fn test_tower_sync_from_bank_failed_switch() { solana_logger::setup_with_default( - "error,solana_core::replay_stage=info,solana_core::consensus=info", + "error,agave_core::replay_stage=info,agave_core::consensus=info", ); /* Fork structure: @@ -8531,7 +8531,7 @@ pub(crate) mod tests { #[test] fn test_tower_sync_from_bank_failed_lockout() { solana_logger::setup_with_default( - "error,solana_core::replay_stage=info,solana_core::consensus=info", + "error,agave_core::replay_stage=info,agave_core::consensus=info", ); /* Fork structure: diff --git a/core/tests/epoch_accounts_hash.rs b/core/tests/epoch_accounts_hash.rs index b0dd111676af79..b7f8b3528d6701 100755 --- a/core/tests/epoch_accounts_hash.rs +++ b/core/tests/epoch_accounts_hash.rs @@ -10,7 +10,7 @@ use { accounts_index::AccountSecondaryIndexes, epoch_accounts_hash::EpochAccountsHash, }, - solana_core::{ + agave_core::{ accounts_hash_verifier::AccountsHashVerifier, snapshot_packager_service::SnapshotPackagerService, }, diff --git a/core/tests/snapshots.rs b/core/tests/snapshots.rs index 2694f7294a7217..6c44a858f036ff 100644 --- a/core/tests/snapshots.rs +++ b/core/tests/snapshots.rs @@ -12,7 +12,7 @@ use { accounts_index::AccountSecondaryIndexes, epoch_accounts_hash::EpochAccountsHash, }, - solana_core::{ + agave_core::{ accounts_hash_verifier::AccountsHashVerifier, snapshot_packager_service::SnapshotPackagerService, }, diff --git a/docs/src/operations/guides/validator-stake.md b/docs/src/operations/guides/validator-stake.md index da43c3071d4fb7..35de03ec8a261b 100644 --- a/docs/src/operations/guides/validator-stake.md +++ b/docs/src/operations/guides/validator-stake.md @@ -76,7 +76,7 @@ Monitor a validator's stake during warmup by: - `solana stake-history` shows the history of stake warming up and cooling down over recent epochs - Look for log messages on your validator indicating your next leader slot: - `[2019-09-27T20:16:00.319721164Z INFO solana_core::replay_stage] voted and reset PoH at tick height ####. My next leader slot is ####` + `[2019-09-27T20:16:00.319721164Z INFO agave_core::replay_stage] voted and reset PoH at tick height ####. My next leader slot is ####` - Once your stake is warmed up, you will see a stake balance listed for your validator by running `solana validators` diff --git a/dos/Cargo.toml b/dos/Cargo.toml index 179fc40bf84820..82ec7bd9262861 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -19,7 +19,7 @@ rand = { workspace = true } serde = { workspace = true } solana-bench-tps = { workspace = true } solana-client = { workspace = true } -solana-core = { workspace = true } +agave-core = { workspace = true } solana-faucet = { workspace = true } solana-gossip = { workspace = true } solana-logger = { workspace = true } diff --git a/dos/src/main.rs b/dos/src/main.rs index 8e6c3c5b2b11b5..64674c9547a5e5 100644 --- a/dos/src/main.rs +++ b/dos/src/main.rs @@ -46,7 +46,7 @@ use { rand::{thread_rng, Rng}, solana_bench_tps::{bench::generate_and_fund_keypairs, bench_tps_client::BenchTpsClient}, solana_client::{connection_cache::ConnectionCache, tpu_connection::TpuConnection}, - solana_core::repair::serve_repair::{RepairProtocol, RepairRequestHeader, ServeRepair}, + agave_core::repair::serve_repair::{RepairProtocol, RepairRequestHeader, ServeRepair}, solana_dos::cli::*, solana_gossip::{ contact_info::Protocol, @@ -817,7 +817,7 @@ pub mod test { use { super::*, solana_client::thin_client::ThinClient, - solana_core::validator::ValidatorConfig, + agave_core::validator::ValidatorConfig, solana_faucet::faucet::run_local_faucet, solana_gossip::contact_info::LegacyContactInfo, solana_local_cluster::{ diff --git a/entry/src/entry.rs b/entry/src/entry.rs index af3fdca9518e83..e8fe50c251892b 100644 --- a/entry/src/entry.rs +++ b/entry/src/entry.rs @@ -122,8 +122,8 @@ pub struct Api<'a> { /// The solana core protocol currently requires an `Entry` to contain `transactions` that are /// executable in parallel. Implemented in: /// -/// * For TPU: `solana_core::banking_stage::BankingStage::process_and_record_transactions()` -/// * For TVU: `solana_core::replay_stage::ReplayStage::replay_blockstore_into_bank()` +/// * For TPU: `agave_core::banking_stage::BankingStage::process_and_record_transactions()` +/// * For TVU: `agave_core::replay_stage::ReplayStage::replay_blockstore_into_bank()` /// /// All transactions in the `transactions` field have to follow the read/write locking restrictions /// with regard to the accounts they reference. A single account can be either written by a single diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index d43d613fecec46..1c47f679ed7129 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -30,7 +30,7 @@ solana-accounts-db = { workspace = true } solana-bpf-loader-program = { workspace = true } solana-clap-utils = { workspace = true } solana-cli-output = { workspace = true } -solana-core = { workspace = true } +agave-core = { workspace = true } solana-cost-model = { workspace = true } solana-entry = { workspace = true } solana-gossip = { workspace = true } diff --git a/ledger-tool/src/ledger_utils.rs b/ledger-tool/src/ledger_utils.rs index 3503ef3d59e371..1a8b824882a50b 100644 --- a/ledger-tool/src/ledger_utils.rs +++ b/ledger-tool/src/ledger_utils.rs @@ -7,7 +7,7 @@ use { hardened_unpack::open_genesis_config, utils::{create_all_accounts_run_and_snapshot_dirs, move_and_async_delete_path_contents}, }, - solana_core::{ + agave_core::{ accounts_hash_verifier::AccountsHashVerifier, validator::BlockVerificationMethod, }, agave_geyser_plugin_manager::geyser_plugin_service::{ diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index ef3f6515dfcd8f..38c110c6793cc0 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -33,7 +33,7 @@ use { }, }, solana_cli_output::OutputFormat, - solana_core::{ + agave_core::{ system_monitor_service::{SystemMonitorService, SystemMonitorStatsReportConfig}, validator::BlockVerificationMethod, }, diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs index cda801bb296e45..3761add64086ee 100644 --- a/ledger/src/blockstore.rs +++ b/ledger/src/blockstore.rs @@ -191,7 +191,7 @@ pub struct InsertResults { /// these sets by inserting shreds via direct or indirect calls to /// [`Blockstore::insert_shreds_handle_duplicate()`]. /// -/// `solana_core::completed_data_sets_service::CompletedDataSetsService` is the main receiver of +/// `agave_core::completed_data_sets_service::CompletedDataSetsService` is the main receiver of /// `CompletedDataSetInfo`. #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct CompletedDataSetInfo { diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml index 4248fc02945238..d2c923fe6f1b19 100644 --- a/local-cluster/Cargo.toml +++ b/local-cluster/Cargo.toml @@ -18,7 +18,7 @@ rayon = { workspace = true } solana-accounts-db = { workspace = true } solana-client = { workspace = true } solana-config-program = { workspace = true } -solana-core = { workspace = true } +agave-core = { workspace = true } solana-entry = { workspace = true } solana-gossip = { workspace = true } solana-ledger = { workspace = true } diff --git a/local-cluster/src/cluster.rs b/local-cluster/src/cluster.rs index 03ec1b7abe13f2..cb098a2f74ec87 100644 --- a/local-cluster/src/cluster.rs +++ b/local-cluster/src/cluster.rs @@ -1,6 +1,6 @@ use { solana_client::thin_client::ThinClient, - solana_core::validator::{Validator, ValidatorConfig}, + agave_core::validator::{Validator, ValidatorConfig}, solana_gossip::{cluster_info::Node, contact_info::ContactInfo}, solana_ledger::shred::Shred, solana_sdk::{pubkey::Pubkey, signature::Keypair}, diff --git a/local-cluster/src/cluster_tests.rs b/local-cluster/src/cluster_tests.rs index 90337bb272460f..3e879b728a0bf8 100644 --- a/local-cluster/src/cluster_tests.rs +++ b/local-cluster/src/cluster_tests.rs @@ -10,7 +10,7 @@ use { connection_cache::{ConnectionCache, Protocol}, thin_client::ThinClient, }, - solana_core::consensus::VOTE_THRESHOLD_DEPTH, + agave_core::consensus::VOTE_THRESHOLD_DEPTH, solana_entry::entry::{Entry, EntrySlice}, solana_gossip::{ cluster_info::{self, ClusterInfo}, diff --git a/local-cluster/src/integration_tests.rs b/local-cluster/src/integration_tests.rs index db394cd394adbd..7e08ebfbdece33 100644 --- a/local-cluster/src/integration_tests.rs +++ b/local-cluster/src/integration_tests.rs @@ -18,7 +18,7 @@ use { }, log::*, solana_accounts_db::utils::create_accounts_run_and_snapshot_dirs, - solana_core::{ + agave_core::{ consensus::{tower_storage::FileTowerStorage, Tower, SWITCH_FORK_THRESHOLD}, validator::{is_snapshot_config_valid, ValidatorConfig}, }, @@ -61,7 +61,7 @@ use { }; pub const RUST_LOG_FILTER: &str = - "error,solana_core::replay_stage=warn,solana_local_cluster=info,local_cluster=info"; + "error,agave_core::replay_stage=warn,solana_local_cluster=info,local_cluster=info"; pub const DEFAULT_CLUSTER_LAMPORTS: u64 = 10_000_000 * LAMPORTS_PER_SOL; pub const DEFAULT_NODE_STAKE: u64 = 10 * LAMPORTS_PER_SOL; diff --git a/local-cluster/src/local_cluster.rs b/local-cluster/src/local_cluster.rs index 9d1b483d85fdd3..1c13f51e810af1 100644 --- a/local-cluster/src/local_cluster.rs +++ b/local-cluster/src/local_cluster.rs @@ -8,7 +8,7 @@ use { log::*, solana_accounts_db::utils::create_accounts_run_and_snapshot_dirs, solana_client::{connection_cache::ConnectionCache, thin_client::ThinClient}, - solana_core::{ + agave_core::{ consensus::tower_storage::FileTowerStorage, validator::{Validator, ValidatorConfig, ValidatorStartProgress}, }, diff --git a/local-cluster/src/validator_configs.rs b/local-cluster/src/validator_configs.rs index 537dd6495f32e1..93d28d3343c758 100644 --- a/local-cluster/src/validator_configs.rs +++ b/local-cluster/src/validator_configs.rs @@ -1,5 +1,5 @@ use { - solana_core::validator::ValidatorConfig, + agave_core::validator::ValidatorConfig, solana_sdk::exit::Exit, std::sync::{Arc, RwLock}, }; diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs index 71d1f68d604158..1511ccb75adfe6 100644 --- a/local-cluster/tests/local_cluster.rs +++ b/local-cluster/tests/local_cluster.rs @@ -10,7 +10,7 @@ use { hardened_unpack::open_genesis_config, utils::create_accounts_run_and_snapshot_dirs, }, solana_client::thin_client::ThinClient, - solana_core::{ + agave_core::{ consensus::{ tower_storage::FileTowerStorage, Tower, SWITCH_FORK_THRESHOLD, VOTE_THRESHOLD_DEPTH, }, @@ -4547,7 +4547,7 @@ fn test_slot_hash_expiry() { #[serial] fn test_duplicate_with_pruned_ancestor() { solana_logger::setup_with("info,solana_metrics=off"); - solana_core::repair::duplicate_repair_status::set_ancestor_hash_repair_sample_size_for_tests_only(3); + agave_core::repair::duplicate_repair_status::set_ancestor_hash_repair_sample_size_for_tests_only(3); let majority_leader_stake = 10_000_000 * DEFAULT_NODE_STAKE; let minority_leader_stake = 2_000_000 * DEFAULT_NODE_STAKE; @@ -5485,7 +5485,7 @@ fn test_randomly_mixed_block_verification_methods_between_bootstrap_and_not() { // tailored logging just to see two block verification methods are working correctly solana_logger::setup_with_default( "solana_metrics::metrics=warn,\ - solana_core=warn,\ + agave_core=warn,\ solana_runtime::installed_scheduler_pool=trace,\ solana_ledger::blockstore_processor=debug,\ info", diff --git a/poh/benches/poh.rs b/poh/benches/poh.rs index 5ea2d3a9babf35..6d472ac767d6b3 100644 --- a/poh/benches/poh.rs +++ b/poh/benches/poh.rs @@ -1,4 +1,4 @@ -// This bench attempts to justify the value of `solana_core::poh_service::NUM_HASHES_PER_BATCH` +// This bench attempts to justify the value of `agave_core::poh_service::NUM_HASHES_PER_BATCH` #![feature(test)] extern crate test; diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 9f50fa2e18a1ad..d8b3e168bc3a02 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -63,6 +63,81 @@ dependencies = [ "zeroize", ] +[[package]] +name = "agave-core" +version = "1.18.0" +dependencies = [ + "agave-geyser-plugin-manager", + "base64 0.21.7", + "bincode", + "bs58", + "bytes", + "chrono", + "crossbeam-channel", + "dashmap", + "eager", + "etcd-client", + "futures 0.3.30", + "histogram", + "itertools", + "lazy_static", + "log", + "lru", + "min-max-heap", + "num_enum", + "prio-graph", + "quinn", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rayon", + "rolling-file", + "rustc_version", + "rustls", + "serde", + "serde_bytes", + "serde_derive", + "solana-accounts-db", + "solana-bloom", + "solana-client", + "solana-cost-model", + "solana-entry", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-gossip", + "solana-ledger", + "solana-measure", + "solana-metrics", + "solana-net-utils", + "solana-perf", + "solana-poh", + "solana-program-runtime", + "solana-quic-client", + "solana-rayon-threadlimit", + "solana-rpc", + "solana-rpc-client-api", + "solana-runtime", + "solana-sdk", + "solana-send-transaction-service", + "solana-streamer", + "solana-svm", + "solana-tpu-client", + "solana-transaction-status", + "solana-turbine", + "solana-unified-scheduler-pool", + "solana-version", + "solana-vote", + "solana-vote-program", + "solana-wen-restart", + "strum", + "strum_macros", + "sys-info", + "sysctl", + "tempfile", + "thiserror", + "tokio", + "trees", +] + [[package]] name = "agave-geyser-plugin-interface" version = "1.18.0" @@ -102,6 +177,7 @@ dependencies = [ name = "agave-validator" version = "1.18.0" dependencies = [ + "agave-core", "agave-geyser-plugin-interface", "agave-geyser-plugin-manager", "chrono", @@ -131,7 +207,6 @@ dependencies = [ "solana-accounts-db", "solana-clap-utils", "solana-cli-config", - "solana-core", "solana-download-utils", "solana-entry", "solana-faucet", @@ -4974,81 +5049,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "solana-core" -version = "1.18.0" -dependencies = [ - "agave-geyser-plugin-manager", - "base64 0.21.7", - "bincode", - "bs58", - "bytes", - "chrono", - "crossbeam-channel", - "dashmap", - "eager", - "etcd-client", - "futures 0.3.30", - "histogram", - "itertools", - "lazy_static", - "log", - "lru", - "min-max-heap", - "num_enum", - "prio-graph", - "quinn", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "rolling-file", - "rustc_version", - "rustls", - "serde", - "serde_bytes", - "serde_derive", - "solana-accounts-db", - "solana-bloom", - "solana-client", - "solana-cost-model", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-gossip", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-program-runtime", - "solana-quic-client", - "solana-rayon-threadlimit", - "solana-rpc", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-streamer", - "solana-svm", - "solana-tpu-client", - "solana-transaction-status", - "solana-turbine", - "solana-unified-scheduler-pool", - "solana-version", - "solana-vote", - "solana-vote-program", - "solana-wen-restart", - "strum", - "strum_macros", - "sys-info", - "sysctl", - "tempfile", - "thiserror", - "tokio", - "trees", -] - [[package]] name = "solana-cost-model" version = "1.18.0" @@ -6397,6 +6397,7 @@ dependencies = [ name = "solana-test-validator" version = "1.18.0" dependencies = [ + "agave-core", "agave-geyser-plugin-manager", "base64 0.21.7", "bincode", @@ -6407,7 +6408,6 @@ dependencies = [ "solana-accounts-db", "solana-cli-output", "solana-client", - "solana-core", "solana-gossip", "solana-ledger", "solana-logger", diff --git a/pubsub-client/src/nonblocking/pubsub_client.rs b/pubsub-client/src/nonblocking/pubsub_client.rs index b79e91f681b97f..e4e1063791a830 100644 --- a/pubsub-client/src/nonblocking/pubsub_client.rs +++ b/pubsub-client/src/nonblocking/pubsub_client.rs @@ -329,7 +329,7 @@ impl PubsubClient { .await .map_err(|err| PubsubClientError::ConnectionClosed(err.to_string()))??; let node_version: RpcVersionInfo = serde_json::from_value(result)?; - let node_version = semver::Version::parse(&node_version.solana_core).map_err(|e| { + let node_version = semver::Version::parse(&node_version.agave_core).map_err(|e| { PubsubClientError::RequestFailed { reason: format!("failed to parse cluster version: {e}"), message: "getVersion".to_string(), diff --git a/pubsub-client/src/pubsub_client.rs b/pubsub-client/src/pubsub_client.rs index 70769619db1f4d..712991b30020fa 100644 --- a/pubsub-client/src/pubsub_client.rs +++ b/pubsub-client/src/pubsub_client.rs @@ -221,7 +221,7 @@ where if let Ok(json_msg) = serde_json::from_str::>(message_text) { if let Some(Object(version_map)) = json_msg.get("result") { - if let Some(node_version) = version_map.get("solana-core") { + if let Some(node_version) = version_map.get("agave-core") { if let Some(node_version) = node_version.as_str() { if let Ok(parsed) = semver::Version::parse(node_version) { return Ok(parsed); diff --git a/rpc-client-api/src/response.rs b/rpc-client-api/src/response.rs index fa70e89b6b88ee..134828bd77233c 100644 --- a/rpc-client-api/src/response.rs +++ b/rpc-client-api/src/response.rs @@ -331,25 +331,25 @@ pub struct RpcBlockProduction { #[derive(Serialize, Deserialize, Clone, PartialEq, Eq)] #[serde(rename_all = "kebab-case")] pub struct RpcVersionInfo { - /// The current version of solana-core - pub solana_core: String, + /// The current version of agave-core + pub agave_core: String, /// first 4 bytes of the FeatureSet identifier pub feature_set: Option, } impl fmt::Debug for RpcVersionInfo { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "{}", self.solana_core) + write!(f, "{}", self.agave_core) } } impl fmt::Display for RpcVersionInfo { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - if let Some(version) = self.solana_core.split_whitespace().next() { + if let Some(version) = self.agave_core.split_whitespace().next() { // Display just the semver if possible write!(f, "{version}") } else { - write!(f, "{}", self.solana_core) + write!(f, "{}", self.agave_core) } } } diff --git a/rpc-client/src/mock_sender.rs b/rpc-client/src/mock_sender.rs index 44ab26359c3f32..729b07d33a412d 100644 --- a/rpc-client/src/mock_sender.rs +++ b/rpc-client/src/mock_sender.rs @@ -357,7 +357,7 @@ impl RpcSender for MockSender { "getVersion" => { let version = Version::default(); json!(RpcVersionInfo { - solana_core: version.to_string(), + agave_core: version.to_string(), feature_set: Some(version.feature_set), }) } diff --git a/rpc-client/src/nonblocking/rpc_client.rs b/rpc-client/src/nonblocking/rpc_client.rs index 01f9510b68c9f2..2b353b68c77701 100644 --- a/rpc-client/src/nonblocking/rpc_client.rs +++ b/rpc-client/src/nonblocking/rpc_client.rs @@ -531,7 +531,7 @@ impl RpcClient { let node_version = self.get_version().await.map_err(|e| { RpcError::RpcRequestError(format!("cluster version query failed: {e}")) })?; - let node_version = semver::Version::parse(&node_version.solana_core).map_err(|e| { + let node_version = semver::Version::parse(&node_version.agave_core).map_err(|e| { RpcError::RpcRequestError(format!("failed to parse cluster version: {e}")) })?; *w_node_version = Some(node_version.clone()); @@ -3741,7 +3741,7 @@ impl RpcClient { /// # let rpc_client = RpcClient::new_mock("succeeds".to_string()); /// let expected_version = semver::Version::new(1, 7, 0); /// let version = rpc_client.get_version().await?; - /// let version = semver::Version::parse(&version.solana_core)?; + /// let version = semver::Version::parse(&version.agave_core)?; /// assert!(version >= expected_version); /// # Ok::<(), Box>(()) /// # })?; diff --git a/rpc-client/src/rpc_client.rs b/rpc-client/src/rpc_client.rs index 0c5f1fdc4ac549..70b01b550a998e 100644 --- a/rpc-client/src/rpc_client.rs +++ b/rpc-client/src/rpc_client.rs @@ -3072,7 +3072,7 @@ impl RpcClient { /// # let rpc_client = RpcClient::new_mock("succeeds".to_string()); /// let expected_version = semver::Version::new(1, 7, 0); /// let version = rpc_client.get_version()?; - /// let version = semver::Version::parse(&version.solana_core)?; + /// let version = semver::Version::parse(&version.agave_core)?; /// assert!(version >= expected_version); /// # Ok::<(), Box>(()) /// ``` diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs index cad124c7553ea4..3af7a96dda38b8 100644 --- a/rpc/src/rpc.rs +++ b/rpc/src/rpc.rs @@ -2682,7 +2682,7 @@ pub mod rpc_minimal { debug!("get_version rpc request received"); let version = solana_version::Version::default(); Ok(RpcVersionInfo { - solana_core: version.to_string(), + agave_core: version.to_string(), feature_set: Some(version.feature_set), }) } @@ -7055,7 +7055,7 @@ pub mod tests { let expected = { let version = solana_version::Version::default(); json!({ - "solana-core": version.to_string(), + "agave-core": version.to_string(), "feature-set": version.feature_set, }) }; diff --git a/rpc/src/rpc_pubsub.rs b/rpc/src/rpc_pubsub.rs index 19244415bd61ac..a12e7a255b96b7 100644 --- a/rpc/src/rpc_pubsub.rs +++ b/rpc/src/rpc_pubsub.rs @@ -593,7 +593,7 @@ impl RpcSolPubSubInternal for RpcSolPubSubImpl { fn get_version(&self) -> Result { let version = solana_version::Version::default(); Ok(RpcVersionInfo { - solana_core: version.to_string(), + agave_core: version.to_string(), feature_set: Some(version.feature_set), }) } diff --git a/system-test/genesis-test/cluster_token_count.sh b/system-test/genesis-test/cluster_token_count.sh index 0d0fd2507ee60c..d1b748389d6cc6 100755 --- a/system-test/genesis-test/cluster_token_count.sh +++ b/system-test/genesis-test/cluster_token_count.sh @@ -26,7 +26,7 @@ EOF } function get_cluster_version { - clusterVersion="$(curl -s -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVersion"}' "$url" | jq '.result | ."solana-core" ')" + clusterVersion="$(curl -s -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVersion"}' "$url" | jq '.result | ."agave-core" ')" echo Cluster software version: "$clusterVersion" } diff --git a/test-validator/Cargo.toml b/test-validator/Cargo.toml index c9146140f1c00f..885b9d06f2ed19 100644 --- a/test-validator/Cargo.toml +++ b/test-validator/Cargo.toml @@ -20,7 +20,7 @@ serde_json = { workspace = true } solana-accounts-db = { workspace = true } solana-cli-output = { workspace = true } solana-client = { workspace = true } -solana-core = { workspace = true } +agave-core = { workspace = true } solana-gossip = { workspace = true } solana-ledger = { workspace = true } solana-logger = { workspace = true } diff --git a/test-validator/src/lib.rs b/test-validator/src/lib.rs index 4fd47c8b78d5dd..1514dfd377eebc 100644 --- a/test-validator/src/lib.rs +++ b/test-validator/src/lib.rs @@ -10,7 +10,7 @@ use { }, solana_cli_output::CliAccount, solana_client::rpc_request::MAX_MULTIPLE_ACCOUNTS, - solana_core::{ + agave_core::{ admin_rpc_post_init::AdminRpcRequestMetadataPostInit, consensus::tower_storage::TowerStorage, validator::{Validator, ValidatorConfig, ValidatorStartProgress}, diff --git a/transaction-dos/Cargo.toml b/transaction-dos/Cargo.toml index 58821a1b953fc5..c3a9ae375a39f2 100644 --- a/transaction-dos/Cargo.toml +++ b/transaction-dos/Cargo.toml @@ -17,7 +17,7 @@ rayon = { workspace = true } solana-clap-utils = { workspace = true } solana-cli = { workspace = true } solana-client = { workspace = true } -solana-core = { workspace = true } +agave-core = { workspace = true } solana-faucet = { workspace = true } solana-gossip = { workspace = true } solana-logger = { workspace = true } diff --git a/transaction-dos/src/main.rs b/transaction-dos/src/main.rs index 94fecf5e6d5f73..cb6c6173754c2c 100644 --- a/transaction-dos/src/main.rs +++ b/transaction-dos/src/main.rs @@ -636,7 +636,7 @@ fn main() { pub mod test { use { super::*, - solana_core::validator::ValidatorConfig, + agave_core::validator::ValidatorConfig, solana_local_cluster::{ local_cluster::{ClusterConfig, LocalCluster}, validator_configs::make_identical_validator_configs, diff --git a/validator/Cargo.toml b/validator/Cargo.toml index ab49b3ef8b231e..10519dc4260c11 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -38,7 +38,7 @@ serde_yaml = { workspace = true } solana-accounts-db = { workspace = true } solana-clap-utils = { workspace = true } solana-cli-config = { workspace = true } -solana-core = { workspace = true } +agave-core = { workspace = true } solana-download-utils = { workspace = true } solana-entry = { workspace = true } solana-faucet = { workspace = true } diff --git a/validator/src/admin_rpc_service.rs b/validator/src/admin_rpc_service.rs index b21b2ac022d13c..eacea2935e2652 100644 --- a/validator/src/admin_rpc_service.rs +++ b/validator/src/admin_rpc_service.rs @@ -10,7 +10,7 @@ use { log::*, serde::{de::Deserializer, Deserialize, Serialize}, solana_accounts_db::accounts_index::AccountIndex, - solana_core::{ + agave_core::{ admin_rpc_post_init::AdminRpcRequestMetadataPostInit, consensus::{tower_storage::TowerStorage, Tower}, repair::repair_service, @@ -859,7 +859,7 @@ mod tests { super::*, serde_json::Value, solana_accounts_db::{accounts_index::AccountSecondaryIndexes, inline_spl_token}, - solana_core::consensus::tower_storage::NullTowerStorage, + agave_core::consensus::tower_storage::NullTowerStorage, solana_gossip::cluster_info::ClusterInfo, solana_ledger::genesis_utils::{create_genesis_config, GenesisConfigInfo}, solana_rpc::rpc::create_validator_exit, @@ -933,7 +933,7 @@ mod tests { RwLock, >::default(), cluster_slots: Arc::new( - solana_core::cluster_slots_service::cluster_slots::ClusterSlots::default(), + agave_core::cluster_slots_service::cluster_slots::ClusterSlots::default(), ), }))), staked_nodes_overrides: Arc::new(RwLock::new(HashMap::new())), diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs index c00636fd2596a6..9ceb144fafdfbd 100644 --- a/validator/src/bin/solana-test-validator.rs +++ b/validator/src/bin/solana-test-validator.rs @@ -8,7 +8,7 @@ use { input_parsers::{pubkey_of, pubkeys_of, value_of}, input_validators::normalize_to_url_if_moniker, }, - solana_core::consensus::tower_storage::FileTowerStorage, + agave_core::consensus::tower_storage::FileTowerStorage, solana_faucet::faucet::run_local_faucet_with_port, solana_rpc::{ rpc::{JsonRpcConfig, RpcBigtableConfig}, @@ -131,7 +131,7 @@ fn main() { info!("{} {}", crate_name!(), solana_version::version!()); info!("Starting validator with: {:#?}", std::env::args_os()); - solana_core::validator::report_target_features(); + agave_core::validator::report_target_features(); // TODO: Ideally test-validator should *only* allow private addresses. let socket_addr_space = SocketAddrSpace::new(/*allow_private_addr=*/ true); diff --git a/validator/src/bootstrap.rs b/validator/src/bootstrap.rs index 0fe1ae7e6d5eda..6d788d1652aa3d 100644 --- a/validator/src/bootstrap.rs +++ b/validator/src/bootstrap.rs @@ -3,7 +3,7 @@ use { log::*, rand::{seq::SliceRandom, thread_rng, Rng}, rayon::prelude::*, - solana_core::validator::{ValidatorConfig, ValidatorStartProgress}, + agave_core::validator::{ValidatorConfig, ValidatorStartProgress}, solana_download_utils::{download_snapshot_archive, DownloadProgressRecord}, solana_genesis_utils::download_then_check_genesis_hash, solana_gossip::{ @@ -527,7 +527,7 @@ fn get_vetted_rpc_nodes( if let Some(ping_time) = ping_time { info!( "RPC node version: {} Ping: {}ms", - rpc_version.solana_core, + rpc_version.agave_core, ping_time.as_millis() ); true diff --git a/validator/src/cli.rs b/validator/src/cli.rs index 958cdc4ec947de..eb938ffb956ab5 100644 --- a/validator/src/cli.rs +++ b/validator/src/cli.rs @@ -19,7 +19,7 @@ use { }, keypair::SKIP_SEED_PHRASE_VALIDATION_ARG, }, - solana_core::{ + agave_core::{ banking_trace::{DirByteLimit, BANKING_TRACE_DIR_DEFAULT_BYTE_LIMIT}, validator::{BlockProductionMethod, BlockVerificationMethod}, }, diff --git a/validator/src/dashboard.rs b/validator/src/dashboard.rs index 365f02065ebc96..c04fc0411bbf18 100644 --- a/validator/src/dashboard.rs +++ b/validator/src/dashboard.rs @@ -4,7 +4,7 @@ use { ProgressBar, }, console::style, - solana_core::validator::ValidatorStartProgress, + agave_core::validator::ValidatorStartProgress, solana_rpc_client::rpc_client::RpcClient, solana_rpc_client_api::{client_error, request, response::RpcContactInfo}, solana_sdk::{ diff --git a/validator/src/main.rs b/validator/src/main.rs index 033b86c365a299..851adec036296b 100644 --- a/validator/src/main.rs +++ b/validator/src/main.rs @@ -17,7 +17,7 @@ use { utils::{create_all_accounts_run_and_snapshot_dirs, create_and_canonicalize_directories}, }, solana_clap_utils::input_parsers::{keypair_of, keypairs_of, pubkey_of, value_of}, - solana_core::{ + agave_core::{ banking_trace::DISABLED_BAKING_TRACE_DIR, consensus::tower_storage, system_monitor_service::SystemMonitorService, @@ -933,7 +933,7 @@ pub fn main() { enable_recycler_warming(); } - solana_core::validator::report_target_features(); + agave_core::validator::report_target_features(); let authorized_voter_keypairs = keypairs_of(&matches, "authorized_voter_keypairs") .map(|keypairs| keypairs.into_iter().map(Arc::new).collect())