fix: compilation fixes after Agave update-and-merge

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 }

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,

core/src/banking_stage/read_write_account_set.rs

@@ -171,7 +171,6 @@ mod tests {
         )
     }
 
-    fn create_test_bank() -> (Arc<Bank>, Arc<RwLock<BankForks>>) {
     fn create_test_bank() -> (Arc<Bank>, Arc<RwLock<BankForks>>) {
         let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(10_000);
         Bank::new_no_wallclock_throttle_for_tests(&genesis_config)

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
                     };
 

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,

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);

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},

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,
 }
 

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
     };