svm repo split: rename log collector (#7430)

svm repo split: rename `log-collector` to `svm-log-collector`

Cargo.lock

@@ -244,7 +244,6 @@ dependencies = [
  "solana-keypair",
  "solana-ledger",
  "solana-loader-v3-interface",
- "solana-log-collector",
  "solana-logger 3.0.0",
  "solana-measure",
  "solana-message",
@@ -265,6 +264,7 @@ dependencies = [
  "solana-streamer",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-system-interface",
  "solana-transaction",
  "solana-transaction-context",
@@ -364,7 +364,6 @@ dependencies = [
  "solana-keccak-hasher",
  "solana-last-restart-slot",
  "solana-loader-v3-interface",
- "solana-log-collector",
  "solana-measure",
  "solana-poseidon",
  "solana-program",
@@ -380,6 +379,7 @@ dependencies = [
  "solana-stable-layout",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-timings",
@@ -7286,7 +7286,6 @@ dependencies = [
  "solana-last-restart-slot",
  "solana-loader-v3-interface",
  "solana-loader-v4-interface",
- "solana-log-collector",
  "solana-measure",
  "solana-packet",
  "solana-program",
@@ -7299,6 +7298,7 @@ dependencies = [
  "solana-slot-hashes",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-system-interface",
  "solana-transaction-context",
  "solana-type-overrides",
@@ -9046,13 +9046,13 @@ dependencies = [
  "solana-instruction",
  "solana-loader-v3-interface",
  "solana-loader-v4-interface",
- "solana-log-collector",
  "solana-measure",
  "solana-packet",
  "solana-program-runtime",
  "solana-pubkey",
  "solana-sbpf",
  "solana-sdk-ids",
+ "solana-svm-log-collector",
  "solana-sysvar",
  "solana-transaction-context",
  "solana-type-overrides",
@@ -9136,13 +9136,6 @@ dependencies = [
  "solana-version",
 ]
 
-[[package]]
-name = "solana-log-collector"
-version = "3.0.0"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "solana-logger"
 version = "2.3.1"
@@ -9663,7 +9656,6 @@ dependencies = [
  "solana-instruction",
  "solana-keypair",
  "solana-last-restart-slot",
- "solana-log-collector",
  "solana-measure",
  "solana-metrics",
  "solana-program-entrypoint",
@@ -9676,6 +9668,7 @@ dependencies = [
  "solana-slot-hashes",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-sysvar",
@@ -9718,7 +9711,6 @@ dependencies = [
  "solana-instruction",
  "solana-keypair",
  "solana-loader-v3-interface",
- "solana-log-collector",
  "solana-logger 3.0.0",
  "solana-message",
  "solana-msg",
@@ -9738,6 +9730,7 @@ dependencies = [
  "solana-stake-interface",
  "solana-stake-program",
  "solana-svm",
+ "solana-svm-log-collector",
  "solana-system-interface",
  "solana-sysvar",
  "solana-sysvar-id",
@@ -9972,7 +9965,6 @@ dependencies = [
  "solana-instruction",
  "solana-keypair",
  "solana-ledger",
- "solana-log-collector",
  "solana-measure",
  "solana-message",
  "solana-metrics",
@@ -10005,6 +9997,7 @@ dependencies = [
  "solana-storage-bigtable",
  "solana-streamer",
  "solana-svm",
+ "solana-svm-log-collector",
  "solana-system-interface",
  "solana-system-transaction",
  "solana-sysvar",
@@ -10710,7 +10703,6 @@ dependencies = [
  "solana-epoch-schedule",
  "solana-genesis-config",
  "solana-instruction",
- "solana-log-collector",
  "solana-native-token",
  "solana-packet",
  "solana-program-runtime",
@@ -10720,6 +10712,7 @@ dependencies = [
  "solana-stake-interface",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-transaction-context",
@@ -10910,7 +10903,6 @@ dependencies = [
  "solana-loader-v3-interface",
  "solana-loader-v4-interface",
  "solana-loader-v4-program",
- "solana-log-collector",
  "solana-logger 3.0.0",
  "solana-measure",
  "solana-message",
@@ -10933,6 +10925,7 @@ dependencies = [
  "solana-svm",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-system-program",
@@ -10963,6 +10956,13 @@ dependencies = [
 name = "solana-svm-feature-set"
 version = "3.0.0"
 
+[[package]]
+name = "solana-svm-log-collector"
+version = "3.0.0"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "solana-svm-transaction"
 version = "3.0.0"
@@ -11012,7 +11012,6 @@ dependencies = [
  "solana-fee-calculator",
  "solana-hash",
  "solana-instruction",
- "solana-log-collector",
  "solana-nonce",
  "solana-nonce-account",
  "solana-packet",
@@ -11023,6 +11022,7 @@ dependencies = [
  "solana-sha256-hasher",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-system-interface",
  "solana-sysvar",
  "solana-transaction-context",
@@ -11865,9 +11865,9 @@ dependencies = [
  "num-derive",
  "num-traits",
  "solana-instruction",
- "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk-ids",
+ "solana-svm-log-collector",
  "solana-zk-sdk 3.0.0",
 ]
 
@@ -11992,9 +11992,9 @@ dependencies = [
  "num-derive",
  "num-traits",
  "solana-instruction",
- "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk-ids",
+ "solana-svm-log-collector",
  "solana-zk-token-sdk",
 ]
 

Cargo.toml

@@ -51,7 +51,6 @@ members = [
     "ledger-tool",
     "local-cluster",
     "log-analyzer",
-    "log-collector",
     "measure",
     "memory-management",
     "merkle-tree",
@@ -105,6 +104,7 @@ members = [
     "svm",
     "svm-callback",
     "svm-feature-set",
+    "svm-log-collector",
     "svm-transaction",
     "syscalls",
     "syscalls/gen-syscall-list",
@@ -450,7 +450,6 @@ solana-loader-v3-interface = "5.0.0"
 solana-loader-v4-interface = "2.2.1"
 solana-loader-v4-program = { path = "programs/loader-v4", version = "=3.0.0" }
 solana-local-cluster = { path = "local-cluster", version = "=3.0.0" }
-solana-log-collector = { path = "log-collector", version = "=3.0.0" }
 solana-logger = "3.0.0"
 solana-measure = { path = "measure", version = "=3.0.0" }
 solana-merkle-tree = { path = "merkle-tree", version = "=3.0.0" }
@@ -523,6 +522,7 @@ solana-streamer = { path = "streamer", version = "=3.0.0" }
 solana-svm = { path = "svm", version = "=3.0.0" }
 solana-svm-callback = { path = "svm-callback", version = "=3.0.0" }
 solana-svm-feature-set = { path = "svm-feature-set", version = "=3.0.0" }
+solana-svm-log-collector = { path = "svm-log-collector", version = "=3.0.0" }
 solana-svm-transaction = { path = "svm-transaction", version = "=3.0.0" }
 solana-system-interface = "1.0"
 solana-system-program = { path = "programs/system", version = "=3.0.0" }

ledger-tool/Cargo.toml

@@ -58,7 +58,6 @@ solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }
 solana-ledger = { workspace = true, features = ["dev-context-only-utils"] }
 solana-loader-v3-interface = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-logger = "=3.0.0"
 solana-measure = { workspace = true }
 solana-message = { workspace = true }
@@ -79,6 +78,7 @@ solana-storage-bigtable = { workspace = true }
 solana-streamer = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-context = { workspace = true }

program-runtime/Cargo.toml

@@ -45,7 +45,6 @@ solana-frozen-abi-macro = { workspace = true, optional = true, features = [
 solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-last-restart-slot = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-measure = { workspace = true }
 solana-metrics = { workspace = true, optional = true }
 solana-program-entrypoint = { workspace = true }
@@ -56,6 +55,7 @@ solana-sdk-ids = { workspace = true }
 solana-slot-hashes = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }

program-runtime/src/invoke_context.rs

@@ -13,7 +13,6 @@ use {
     solana_epoch_schedule::EpochSchedule,
     solana_hash::Hash,
     solana_instruction::{error::InstructionError, AccountMeta, Instruction},
-    solana_log_collector::{ic_msg, LogCollector},
     solana_measure::measure::Measure,
     solana_pubkey::Pubkey,
     solana_sbpf::{
@@ -28,6 +27,7 @@ use {
     },
     solana_svm_callback::InvokeContextCallback,
     solana_svm_feature_set::SVMFeatureSet,
+    solana_svm_log_collector::{ic_msg, LogCollector},
     solana_svm_transaction::{instruction::SVMInstruction, svm_message::SVMMessage},
     solana_timings::{ExecuteDetailsTimings, ExecuteTimings},
     solana_transaction_context::{
@@ -785,8 +785,8 @@ macro_rules! with_mock_invoke_context_with_feature_set {
         $transaction_accounts:expr $(,)?
     ) => {
         use {
-            solana_log_collector::LogCollector,
             solana_svm_callback::InvokeContextCallback,
+            solana_svm_log_collector::LogCollector,
             $crate::{
                 __private::{Hash, ReadableAccount, Rent, TransactionContext},
                 execution_budget::{SVMTransactionExecutionBudget, SVMTransactionExecutionCost},

program-runtime/src/stable_log.rs

@@ -5,8 +5,8 @@
 use {
     base64::{prelude::BASE64_STANDARD, Engine},
     itertools::Itertools,
-    solana_log_collector::{ic_logger_msg, LogCollector},
     solana_pubkey::Pubkey,
+    solana_svm_log_collector::{ic_logger_msg, LogCollector},
     std::{cell::RefCell, rc::Rc},
 };
 

program-test/Cargo.toml

@@ -35,7 +35,6 @@ solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }
 solana-loader-v3-interface = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-logger = { workspace = true }
 solana-message = { workspace = true }
 solana-msg = { workspace = true }
@@ -53,6 +52,7 @@ solana-signer = { workspace = true }
 solana-stable-layout = { workspace = true }
 solana-stake-interface = { workspace = true }
 solana-svm = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }

program-test/src/lib.rs

@@ -23,7 +23,6 @@ use {
         Instruction,
     },
     solana_keypair::Keypair,
-    solana_log_collector::ic_msg,
     solana_native_token::sol_to_lamports,
     solana_poh_config::PohConfig,
     solana_program_entrypoint::{deserialize, SUCCESS},
@@ -42,6 +41,7 @@ use {
         runtime_config::RuntimeConfig,
     },
     solana_signer::Signer,
+    solana_svm_log_collector::ic_msg,
     solana_sysvar::Sysvar,
     solana_sysvar_id::SysvarId,
     solana_timings::ExecuteTimings,

programs/bpf_loader/Cargo.toml

@@ -36,7 +36,6 @@ solana-clock = { workspace = true }
 solana-instruction = { workspace = true }
 solana-loader-v3-interface = { workspace = true, features = ["serde"] }
 solana-loader-v4-interface = { workspace = true, features = ["bincode"] }
-solana-log-collector = { workspace = true }
 solana-measure = { workspace = true }
 solana-packet = { workspace = true }
 solana-program-entrypoint = { workspace = true }
@@ -45,6 +44,7 @@ solana-pubkey = { workspace = true }
 solana-sbpf = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }
 solana-type-overrides = { workspace = true }

programs/bpf_loader/src/lib.rs

@@ -10,7 +10,6 @@ use {
     solana_loader_v3_interface::{
         instruction::UpgradeableLoaderInstruction, state::UpgradeableLoaderState,
     },
-    solana_log_collector::{ic_logger_msg, ic_msg, LogCollector},
     solana_measure::measure::Measure,
     solana_program_entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS},
     solana_program_runtime::{
@@ -38,6 +37,7 @@ use {
     solana_sdk_ids::{
         bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4, native_loader,
     },
+    solana_svm_log_collector::{ic_logger_msg, ic_msg, LogCollector},
     solana_system_interface::{instruction as system_instruction, MAX_PERMITTED_DATA_LENGTH},
     solana_transaction_context::{IndexOfAccount, InstructionContext, TransactionContext},
     solana_type_overrides::sync::{atomic::Ordering, Arc},

programs/loader-v4/Cargo.toml

@@ -33,13 +33,13 @@ solana-bpf-loader-program = { workspace = true, features = ["svm-internal"] }
 solana-instruction = { workspace = true }
 solana-loader-v3-interface = { workspace = true }
 solana-loader-v4-interface = { workspace = true, features = ["serde"] }
-solana-log-collector = { workspace = true }
 solana-measure = { workspace = true }
 solana-packet = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sbpf = { workspace = true }
 solana-sdk-ids = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-transaction-context = { workspace = true }
 solana-type-overrides = { workspace = true }
 

programs/loader-v4/src/lib.rs

@@ -10,7 +10,6 @@ use {
         state::{LoaderV4State, LoaderV4Status},
         DEPLOYMENT_COOLDOWN_IN_SLOTS,
     },
-    solana_log_collector::{ic_logger_msg, LogCollector},
     solana_measure::measure::Measure,
     solana_program_runtime::{
         invoke_context::InvokeContext,
@@ -19,6 +18,7 @@ use {
     solana_pubkey::Pubkey,
     solana_sbpf::{declare_builtin_function, memory_region::MemoryMapping},
     solana_sdk_ids::{bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4},
+    solana_svm_log_collector::{ic_logger_msg, LogCollector},
     solana_transaction_context::{BorrowedAccount, InstructionContext},
     solana_type_overrides::sync::Arc,
     std::{cell::RefCell, rc::Rc},

programs/sbf/Cargo.lock

@@ -155,7 +155,6 @@ dependencies = [
  "solana-instruction",
  "solana-keccak-hasher",
  "solana-loader-v3-interface 5.0.0",
- "solana-log-collector",
  "solana-measure",
  "solana-poseidon",
  "solana-program-entrypoint",
@@ -168,6 +167,7 @@ dependencies = [
  "solana-stable-layout",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-timings",
@@ -5837,7 +5837,6 @@ dependencies = [
  "solana-instruction",
  "solana-loader-v3-interface 5.0.0",
  "solana-loader-v4-interface",
- "solana-log-collector",
  "solana-measure",
  "solana-packet",
  "solana-program-entrypoint",
@@ -5846,6 +5845,7 @@ dependencies = [
  "solana-sbpf",
  "solana-sdk-ids",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-system-interface",
  "solana-transaction-context",
  "solana-type-overrides",
@@ -7065,24 +7065,17 @@ dependencies = [
  "solana-instruction",
  "solana-loader-v3-interface 5.0.0",
  "solana-loader-v4-interface",
- "solana-log-collector",
  "solana-measure",
  "solana-packet",
  "solana-program-runtime",
  "solana-pubkey",
  "solana-sbpf",
  "solana-sdk-ids",
+ "solana-svm-log-collector",
  "solana-transaction-context",
  "solana-type-overrides",
 ]
 
-[[package]]
-name = "solana-log-collector"
-version = "3.0.0"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "solana-logger"
 version = "2.3.1"
@@ -7500,7 +7493,6 @@ dependencies = [
  "solana-hash",
  "solana-instruction",
  "solana-last-restart-slot",
- "solana-log-collector",
  "solana-measure",
  "solana-metrics",
  "solana-program-entrypoint",
@@ -7511,6 +7503,7 @@ dependencies = [
  "solana-slot-hashes",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-sysvar",
@@ -7550,7 +7543,6 @@ dependencies = [
  "solana-instruction",
  "solana-keypair",
  "solana-loader-v3-interface 5.0.0",
- "solana-log-collector",
  "solana-logger 3.0.0",
  "solana-message",
  "solana-msg",
@@ -7568,6 +7560,7 @@ dependencies = [
  "solana-stable-layout",
  "solana-stake-interface",
  "solana-svm",
+ "solana-svm-log-collector",
  "solana-system-interface",
  "solana-sysvar",
  "solana-sysvar-id",
@@ -8117,7 +8110,6 @@ dependencies = [
  "solana-ledger",
  "solana-loader-v3-interface 5.0.0",
  "solana-loader-v4-interface",
- "solana-log-collector",
  "solana-logger 2.3.1",
  "solana-measure",
  "solana-message",
@@ -8138,6 +8130,7 @@ dependencies = [
  "solana-svm",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-sysvar",
@@ -9105,7 +9098,6 @@ dependencies = [
  "solana-config-program-client",
  "solana-genesis-config",
  "solana-instruction",
- "solana-log-collector",
  "solana-native-token",
  "solana-packet",
  "solana-program-runtime",
@@ -9113,6 +9105,7 @@ dependencies = [
  "solana-rent",
  "solana-sdk-ids",
  "solana-stake-interface",
+ "solana-svm-log-collector",
  "solana-sysvar",
  "solana-transaction-context",
  "solana-type-overrides",
@@ -9248,7 +9241,6 @@ dependencies = [
  "solana-loader-v3-interface 5.0.0",
  "solana-loader-v4-interface",
  "solana-loader-v4-program",
- "solana-log-collector",
  "solana-measure",
  "solana-message",
  "solana-nonce",
@@ -9262,6 +9254,7 @@ dependencies = [
  "solana-sdk-ids",
  "solana-svm-callback",
  "solana-svm-feature-set",
+ "solana-svm-log-collector",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-sysvar-id",
@@ -9286,6 +9279,13 @@ dependencies = [
 name = "solana-svm-feature-set"
 version = "3.0.0"
 
+[[package]]
+name = "solana-svm-log-collector"
+version = "3.0.0"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "solana-svm-transaction"
 version = "3.0.0"
@@ -9326,13 +9326,13 @@ dependencies = [
  "solana-bincode",
  "solana-fee-calculator",
  "solana-instruction",
- "solana-log-collector",
  "solana-nonce",
  "solana-nonce-account",
  "solana-packet",
  "solana-program-runtime",
  "solana-pubkey",
  "solana-sdk-ids",
+ "solana-svm-log-collector",
  "solana-system-interface",
  "solana-sysvar",
  "solana-transaction-context",
@@ -9921,9 +9921,9 @@ dependencies = [
  "num-derive",
  "num-traits",
  "solana-instruction",
- "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk-ids",
+ "solana-svm-log-collector",
  "solana-zk-sdk 3.0.0",
 ]
 
@@ -10008,9 +10008,9 @@ dependencies = [
  "num-derive",
  "num-traits",
  "solana-instruction",
- "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk-ids",
+ "solana-svm-log-collector",
  "solana-zk-token-sdk",
 ]
 

programs/sbf/Cargo.toml

@@ -131,7 +131,6 @@ solana-instruction = "=2.3.0"
 solana-instructions-sysvar = "=2.2.2"
 solana-keccak-hasher = { version = "=2.2.1", features = ["sha3"] }
 solana-ledger = { path = "../../ledger", version = "=3.0.0" }
-solana-log-collector = { path = "../../log-collector", version = "=3.0.0" }
 solana-logger = "=2.3.1"
 solana-measure = { path = "../../measure", version = "=3.0.0" }
 solana-msg = "=2.2.1"
@@ -160,6 +159,7 @@ solana-stake-interface = { version = "=1.2.1", features = ["bincode"] }
 solana-svm = { path = "../../svm", version = "=3.0.0" }
 solana-svm-callback = { path = "../../svm-callback", version = "=3.0.0" }
 solana-svm-feature-set = { path = "../../svm-feature-set", version = "=3.0.0" }
+solana-svm-log-collector = { path = "../../svm-log-collector", version = "=3.0.0" }
 solana-svm-transaction = { path = "../../svm-transaction", version = "=3.0.0" }
 solana-system-interface = { version = "=1.0", features = ["bincode"] }
 solana-sysvar = "=2.2.2"
@@ -215,7 +215,6 @@ solana-keypair = "2.2.1"
 solana-ledger = { workspace = true }
 solana-loader-v3-interface = "5.0.0"
 solana-loader-v4-interface = "2.2.1"
-solana-log-collector = { workspace = true }
 solana-logger = { workspace = true }
 solana-measure = { workspace = true }
 solana-message = "2.3.0"
@@ -238,6 +237,7 @@ solana-stake-interface = "1.2.1"
 solana-svm = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-system-interface = "1.0"
 solana-sysvar = "2.2.1"

programs/stake/Cargo.toml

@@ -26,7 +26,6 @@ solana-clock = { workspace = true }
 solana-config-program-client = { workspace = true, features = ["serde"] }
 solana-genesis-config = { workspace = true }
 solana-instruction = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-native-token = { workspace = true }
 solana-packet = { workspace = true }
 solana-program-runtime = { workspace = true }
@@ -34,6 +33,7 @@ solana-pubkey = { workspace = true, features = ["sha2"] }
 solana-rent = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-stake-interface = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }
 solana-type-overrides = { workspace = true }

programs/stake/src/stake_state.rs

@@ -12,7 +12,6 @@ use {
     solana_account::{state_traits::StateMut, AccountSharedData, ReadableAccount},
     solana_clock::{Clock, Epoch},
     solana_instruction::error::InstructionError,
-    solana_log_collector::ic_msg,
     solana_program_runtime::invoke_context::InvokeContext,
     solana_pubkey::Pubkey,
     solana_rent::Rent,
@@ -23,6 +22,7 @@ use {
         stake_flags::StakeFlags,
         tools::{acceptable_reference_epoch_credits, eligible_for_deactivate_delinquent},
     },
+    solana_svm_log_collector::ic_msg,
     solana_sysvar::stake_history::{StakeHistory, StakeHistoryEntry},
     solana_transaction_context::{
         BorrowedAccount, IndexOfAccount, InstructionContext, TransactionContext,

programs/system/Cargo.toml

@@ -25,13 +25,13 @@ solana-account = { workspace = true }
 solana-bincode = { workspace = true }
 solana-fee-calculator = { workspace = true }
 solana-instruction = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-nonce = { workspace = true, features = ["serde"] }
 solana-nonce-account = { workspace = true }
 solana-packet = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-pubkey = { workspace = true, features = ["sha2"] }
 solana-sdk-ids = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-system-interface = { workspace = true, features = ["serde"] }
 solana-sysvar = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }

programs/system/src/system_instruction.rs

@@ -1,6 +1,5 @@
 use {
     solana_instruction::error::InstructionError,
-    solana_log_collector::ic_msg,
     solana_nonce::{
         self as nonce,
         state::{DurableNonce, State},
@@ -8,6 +7,7 @@ use {
     },
     solana_program_runtime::invoke_context::InvokeContext,
     solana_pubkey::Pubkey,
+    solana_svm_log_collector::ic_msg,
     solana_system_interface::error::SystemError,
     solana_sysvar::rent::Rent,
     solana_transaction_context::{

programs/system/src/system_processor.rs

@@ -6,7 +6,6 @@ use {
     log::*,
     solana_bincode::limited_deserialize,
     solana_instruction::error::InstructionError,
-    solana_log_collector::ic_msg,
     solana_nonce as nonce,
     solana_program_runtime::{
         declare_process_instruction, invoke_context::InvokeContext,
@@ -14,6 +13,7 @@ use {
     },
     solana_pubkey::Pubkey,
     solana_sdk_ids::system_program,
+    solana_svm_log_collector::ic_msg,
     solana_system_interface::{
         error::SystemError, instruction::SystemInstruction, MAX_PERMITTED_DATA_LENGTH,
     },

programs/zk-elgamal-proof/Cargo.toml

@@ -14,9 +14,9 @@ bytemuck = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 solana-instruction = { workspace = true, features = ["std"] }
-solana-log-collector = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-sdk-ids = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-zk-sdk = { workspace = true }
 
 [dev-dependencies]

programs/zk-elgamal-proof/src/lib.rs

@@ -3,9 +3,9 @@
 use {
     bytemuck::Pod,
     solana_instruction::error::InstructionError,
-    solana_log_collector::ic_msg,
     solana_program_runtime::{declare_process_instruction, invoke_context::InvokeContext},
     solana_sdk_ids::system_program,
+    solana_svm_log_collector::ic_msg,
     solana_zk_sdk::zk_elgamal_proof_program::{
         id,
         instruction::ProofInstruction,

programs/zk-token-proof/Cargo.toml

@@ -14,9 +14,9 @@ bytemuck = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 solana-instruction = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-sdk-ids = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-zk-token-sdk = { workspace = true }
 
 [dev-dependencies]

programs/zk-token-proof/src/lib.rs

@@ -3,9 +3,9 @@
 use {
     bytemuck::Pod,
     solana_instruction::{error::InstructionError, TRANSACTION_LEVEL_STACK_HEIGHT},
-    solana_log_collector::ic_msg,
     solana_program_runtime::{declare_process_instruction, invoke_context::InvokeContext},
     solana_sdk_ids::system_program,
+    solana_svm_log_collector::ic_msg,
     solana_zk_token_sdk::{
         zk_token_proof_instruction::*,
         zk_token_proof_program::id,

rpc/Cargo.toml

@@ -110,7 +110,6 @@ solana-compute-budget-interface = { workspace = true }
 solana-fee-calculator = { workspace = true }
 solana-fee-structure = { workspace = true }
 solana-instruction = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-net-utils = { workspace = true }
 solana-nonce = { workspace = true }
 solana-nonce-account = { workspace = true }
@@ -127,6 +126,7 @@ solana-send-transaction-service = { workspace = true, features = ["dev-context-o
 solana-sha256-hasher = { workspace = true }
 solana-stake-interface = { workspace = true }
 solana-stake-program = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-vote-interface = { workspace = true }
 spl-pod = { workspace = true }
 symlink = { workspace = true }

rpc/src/rpc.rs

@@ -4503,7 +4503,6 @@ pub mod tests {
             genesis_utils::{create_genesis_config, GenesisConfigInfo},
             get_tmp_ledger_path,
         },
-        solana_log_collector::ic_logger_msg,
         solana_message::{
             v0::{self, MessageAddressTableLookup},
             Message, MessageHeader, SimpleAddressLoader, VersionedMessage,
@@ -4536,6 +4535,7 @@ pub mod tests {
         solana_sha256_hasher::hash,
         solana_signer::Signer,
         solana_svm::account_loader::TRANSACTION_ACCOUNT_BASE_SIZE,
+        solana_svm_log_collector::ic_logger_msg,
         solana_system_interface::{instruction as system_instruction, program as system_program},
         solana_system_transaction as system_transaction,
         solana_sysvar::slot_hashes::SlotHashes,

log-collector/Cargo.toml → svm-log-collector/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "solana-log-collector"
+name = "solana-svm-log-collector"
 description = "Solana log collector"
-documentation = "https://docs.rs/solana-log-collector"
+documentation = "https://docs.rs/solana-svm-log-collector"
 version = { workspace = true }
 authors = { workspace = true }
 repository = { workspace = true }

svm/Cargo.toml

@@ -56,7 +56,6 @@ solana-instructions-sysvar = { workspace = true }
 solana-loader-v3-interface = { workspace = true, features = ["bincode"] }
 solana-loader-v4-interface = { workspace = true }
 solana-loader-v4-program = { workspace = true }
-solana-log-collector = { workspace = true }
 solana-measure = { workspace = true }
 solana-message = { workspace = true }
 solana-nonce = { workspace = true }
@@ -70,6 +69,7 @@ solana-rent-collector = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar-id = { workspace = true }

svm/src/transaction_processor.rs

@@ -24,7 +24,6 @@ use {
     solana_clock::{Epoch, Slot},
     solana_hash::Hash,
     solana_instruction::TRANSACTION_LEVEL_STACK_HEIGHT,
-    solana_log_collector::LogCollector,
     solana_measure::{measure::Measure, measure_us},
     solana_message::{
         compiled_instruction::CompiledInstruction,
@@ -49,6 +48,7 @@ use {
     solana_sdk_ids::system_program,
     solana_svm_callback::TransactionProcessingCallback,
     solana_svm_feature_set::SVMFeatureSet,
+    solana_svm_log_collector::LogCollector,
     solana_svm_transaction::{svm_message::SVMMessage, svm_transaction::SVMTransaction},
     solana_timings::{ExecuteTimingType, ExecuteTimings},
     solana_transaction_context::{ExecutionRecord, TransactionContext},

syscalls/Cargo.toml

@@ -38,7 +38,6 @@ solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-keccak-hasher = { workspace = true }
 solana-loader-v3-interface = { workspace = true, features = ["serde"] }
-solana-log-collector = { workspace = true }
 solana-measure = { workspace = true }
 solana-poseidon = { workspace = true }
 solana-program-entrypoint = { workspace = true }
@@ -51,6 +50,7 @@ solana-sha256-hasher = { workspace = true }
 solana-stable-layout = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
+solana-svm-log-collector = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }
 solana-timings = { workspace = true }

syscalls/src/lib.rs

@@ -25,9 +25,7 @@ use {
     solana_cpi::MAX_RETURN_DATA,
     solana_hash::Hash,
     solana_instruction::{error::InstructionError, AccountMeta, ProcessedSiblingInstruction},
-    solana_keccak_hasher as keccak,
-    solana_log_collector::{ic_logger_msg, ic_msg},
-    solana_poseidon as poseidon,
+    solana_keccak_hasher as keccak, solana_poseidon as poseidon,
     solana_program_entrypoint::{BPF_ALIGN_OF_U128, MAX_PERMITTED_DATA_INCREASE, SUCCESS},
     solana_program_runtime::{
         execution_budget::{SVMTransactionExecutionBudget, SVMTransactionExecutionCost},
@@ -47,6 +45,7 @@ use {
     },
     solana_sha256_hasher::Hasher,
     solana_svm_feature_set::SVMFeatureSet,
+    solana_svm_log_collector::{ic_logger_msg, ic_msg},
     solana_sysvar::Sysvar,
     solana_sysvar_id::SysvarId,
     solana_timings::ExecuteTimings,