diff --git a/Cargo.lock b/Cargo.lock index 643b396dede4eb..47afcf6910ae91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7699,6 +7699,7 @@ dependencies = [ "solana-nonce", "solana-nonce-account", "solana-packet", + "solana-patches", "solana-perf", "solana-poh", "solana-poh-config", diff --git a/core/Cargo.toml b/core/Cargo.toml index 85a0b12fcee584..f645a94f7cd8bd 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -119,6 +119,7 @@ solana-net-utils = { workspace = true } solana-nonce = { workspace = true } solana-nonce-account = { workspace = true } solana-packet = { workspace = true } +solana-patches = { workspace = true } solana-perf = { workspace = true } solana-poh = { workspace = true } solana-poh-config = { workspace = true } diff --git a/core/src/banking_stage/qos_service.rs b/core/src/banking_stage/qos_service.rs index aeb037b3cb5ed7..4833e9fd34f8b7 100644 --- a/core/src/banking_stage/qos_service.rs +++ b/core/src/banking_stage/qos_service.rs @@ -193,23 +193,6 @@ impl QosService { // checked for update if let Ok(tx_cost) = tx_cost { num_included += 1; - match transaction_committed_details { - CommitTransactionDetails::Committed { - compute_units, - loaded_accounts_data_size, - } => { - cost_tracker.update_execution_cost( - tx_cost, - *compute_units, - CostModel::calculate_loaded_accounts_data_size_cost( - *loaded_accounts_data_size, - &bank.feature_set, - ), - ); - } - CommitTransactionDetails::NotCommitted => { - cost_tracker.remove(tx_cost); - } match transaction_committed_details { CommitTransactionDetails::Committed { compute_units, diff --git a/core/src/banking_stage/read_write_account_set.rs b/core/src/banking_stage/read_write_account_set.rs index 16e36cfe5f248f..bd0aec8ce6d356 100644 --- a/core/src/banking_stage/read_write_account_set.rs +++ b/core/src/banking_stage/read_write_account_set.rs @@ -171,7 +171,6 @@ mod tests { ) } - fn create_test_bank() -> (Arc, Arc>) { fn create_test_bank() -> (Arc, Arc>) { let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(10_000); Bank::new_no_wallclock_throttle_for_tests(&genesis_config) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index f13ea3b53600cd..2502702beb7e22 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -2005,17 +2005,17 @@ fn main() { let snapshot_archive_format = { let archive_format_str = value_t_or_exit!(arg_matches, "snapshot_archive_format", String); - let mut archive_format = ArchiveFormat::from_cli_arg(&archive_format_str) + let archive_format = ArchiveFormat::from_cli_arg(&archive_format_str) .unwrap_or_else(|| { panic!("Archive format not recognized: {archive_format_str}") }); - if let ArchiveFormat::TarZstd { config } = &mut archive_format { - config.compression_level = value_t_or_exit!( - arg_matches, - "snapshot_zstd_compression_level", - i32 - ); - } + // if let ArchiveFormat::TarZstd { config } = &mut archive_format { + // config.compression_level = value_t_or_exit!( + // arg_matches, + // "snapshot_zstd_compression_level", + // i32 + // ); + // } archive_format }; diff --git a/ledger-tool/src/output.rs b/ledger-tool/src/output.rs index 12127b79d29c22..85abfcf0d6bb8c 100644 --- a/ledger-tool/src/output.rs +++ b/ledger-tool/src/output.rs @@ -124,22 +124,6 @@ impl Display for SlotBankHash { } } -#[derive(Serialize, Debug, Default)] -#[serde(rename_all = "camelCase")] -pub struct SlotBankHash { - pub slot: Slot, - pub hash: String, -} - -impl VerboseDisplay for SlotBankHash {} -impl QuietDisplay for SlotBankHash {} - -impl Display for SlotBankHash { - fn fmt(&self, f: &mut Formatter) -> fmt::Result { - writeln!(f, "Bank hash for slot {}: {}", self.slot, self.hash) - } -} - fn writeln_entry(f: &mut dyn fmt::Write, i: usize, entry: &CliEntry, prefix: &str) -> fmt::Result { writeln!( f, diff --git a/precompiles/src/secp256k1.rs b/precompiles/src/secp256k1.rs index f6b3e89ccfd63e..ef6846c176c49b 100644 --- a/precompiles/src/secp256k1.rs +++ b/precompiles/src/secp256k1.rs @@ -3,7 +3,7 @@ use { digest::Digest, solana_precompile_error::PrecompileError, solana_secp256k1_program::{ - construct_eth_pubkey, SecpSignatureOffsets, HASHED_PUBKEY_SERIALIZED_SIZE, + eth_address_from_pubkey, SecpSignatureOffsets, HASHED_PUBKEY_SERIALIZED_SIZE, SIGNATURE_OFFSETS_SERIALIZED_SIZE, SIGNATURE_SERIALIZED_SIZE, }, }; @@ -97,7 +97,7 @@ pub fn verify( &recovery_id, ) .map_err(|_| PrecompileError::InvalidSignature)?; - let eth_address = construct_eth_pubkey(&pubkey); + let eth_address = eth_address_from_pubkey(&pubkey.serialize()[1..].try_into().unwrap()); if eth_address_slice != eth_address { return Err(PrecompileError::InvalidSignature); diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs index 9440bde86334ab..492bb983bad38f 100644 --- a/programs/bpf_loader/src/syscalls/mod.rs +++ b/programs/bpf_loader/src/syscalls/mod.rs @@ -21,7 +21,6 @@ use { ALT_BN128_MULTIPLICATION_OUTPUT_LEN, ALT_BN128_PAIRING_ELEMENT_LEN, ALT_BN128_PAIRING_OUTPUT_LEN, }, - solana_clock::Epoch, solana_cpi::MAX_RETURN_DATA, solana_hash::Hash, solana_instruction::{error::InstructionError, AccountMeta, ProcessedSiblingInstruction}, diff --git a/runtime/src/snapshot_utils/archive_format.rs b/runtime/src/snapshot_utils/archive_format.rs index 9ffe3423ba8df0..d190caed45905d 100644 --- a/runtime/src/snapshot_utils/archive_format.rs +++ b/runtime/src/snapshot_utils/archive_format.rs @@ -21,10 +21,10 @@ pub const TAR_EXTENSION: &str = "tar"; /// The different archive formats used for snapshots #[derive(Copy, Clone, Debug, Eq, PartialEq, Display)] pub enum ArchiveFormat { - // TarBzip2, // Unsupproted in svm-rollup + // TarBzip2, // Unsupported in svm-rollup TarGzip, - // TarZstd { config: ZstdConfig }, // Unsupproted in svm-rollup - // TarLz4, // Unsupproted in svm-rollup + // TarZstd { config: ZstdConfig }, // Unsupported in svm-rollup + // TarLz4, // Unsupported in svm-rollup Tar, } diff --git a/validator/src/commands/run/execute.rs b/validator/src/commands/run/execute.rs index d74ccba9f2ef56..701d0d0e708277 100644 --- a/validator/src/commands/run/execute.rs +++ b/validator/src/commands/run/execute.rs @@ -914,12 +914,12 @@ pub fn execute( let archive_format = { let archive_format_str = value_t_or_exit!(matches, "snapshot_archive_format", String); - let mut archive_format = ArchiveFormat::from_cli_arg(&archive_format_str) + let archive_format = ArchiveFormat::from_cli_arg(&archive_format_str) .unwrap_or_else(|| panic!("Archive format not recognized: {archive_format_str}")); - if let ArchiveFormat::TarZstd { config } = &mut archive_format { - config.compression_level = - value_t_or_exit!(matches, "snapshot_zstd_compression_level", i32); - } + // if let ArchiveFormat::TarZstd { config } = &mut archive_format { + // config.compression_level = + // value_t_or_exit!(matches, "snapshot_zstd_compression_level", i32); + // } archive_format };