Sync changes from Agave master (Feb 23)

Cargo.toml

@@ -55,6 +55,7 @@ level = "warn"
 check-cfg = [
     'cfg(target_os, values("solana"))',
     'cfg(feature, values("frozen-abi", "no-entrypoint"))',
+    'cfg(target_arch, values("sbf"))',
 ]
 
 # Clippy lint configuration that can not be applied in clippy.toml
@@ -65,12 +66,12 @@ manual_let_else = "deny"
 used_underscore_binding = "deny"
 
 [workspace.dependencies]
-agave-feature-set = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
-agave-logger = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
-agave-precompiles = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
-agave-reserved-account-keys = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
-agave-syscalls = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
-agave-validator = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+agave-feature-set = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
+agave-logger = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
+agave-precompiles = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
+agave-reserved-account-keys = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
+agave-syscalls = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
+agave-validator = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 ahash = "0.8.12"
 anyhow = "1.0.100"
 arbitrary = "1.4.2"
@@ -105,10 +106,7 @@ hex = "0.4.3"
 hmac = "0.12.1"
 itertools = "0.14.0"
 libc = "0.2.180"
-libsecp256k1 = { version = "0.6.0", default-features = false, features = [
-    "std",
-    "static-context",
-] }
+libsecp256k1 = { version = "0.6.0", default-features = false, features = ["std", "static-context"] }
 log = "0.4.29"
 memmap2 = "0.9.9"
 num-derive = "0.4"
@@ -131,19 +129,19 @@ sha2 = "0.10.9"
 sha3 = "0.10.8"
 shuttle = "0.7.1"
 solana-account = "3.4.0"
-solana-account-decoder = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-account-decoder = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-account-info = "3.1.0"
-solana-accounts-db = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-accounts-db = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-big-mod-exp = "3.0.0"
 solana-bincode = "3.1.0"
 solana-bn254 = "3.2.1"
 solana-borsh = "3.0.0"
 solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=4.0.0-alpha.0", features = ["agave-unstable-api"] }
-solana-builtins = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
-solana-cli-output = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-builtins = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
+solana-cli-output = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-clock = "3.0.0"
 solana-compute-budget = { path = "compute-budget", version = "=4.0.0-alpha.0", features = ["agave-unstable-api"] }
-solana-compute-budget-instruction = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-compute-budget-instruction = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-compute-budget-interface = "3.0.0"
 solana-compute-budget-program = { path = "programs/compute-budget", version = "=4.0.0-alpha.0", features = ["agave-unstable-api"] }
 solana-curve25519 = "4.0.0"
@@ -163,11 +161,11 @@ solana-instruction-error = "2.1.0"
 solana-instructions-sysvar = "3.0.0"
 solana-keypair = "3.1.0"
 solana-last-restart-slot = "3.0.0"
-solana-ledger = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-ledger = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-loader-v3-interface = "6.1.0"
 solana-loader-v4-interface = "3.1.0"
-solana-loader-v4-program = { path = "programs/loader-v4", version = "=4.0.0-alpha.0", features = ["agave-unstable-api"] }
-solana-measure = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-loader-v4-program = { path = "programs/loader-v4", version = "=4.0.0-alpha.0", default-features = false, features = ["agave-unstable-api"] }
+solana-measure = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-message = "3.0.1"
 solana-native-token = "3.0.0"
 solana-nonce = "3.0.0"
@@ -185,8 +183,8 @@ solana-program-pack = "3.0.0"
 solana-program-runtime = { path = "program-runtime", version = "=4.0.0-alpha.0", features = ["agave-unstable-api"] }
 solana-pubkey = "4.0.0"
 solana-rent = "3.0.0"
-solana-runtime = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
-solana-runtime-transaction = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-runtime = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
+solana-runtime-transaction = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-sanitize = "3.0.1"
 solana-sbpf = "0.14.1"
 solana-sdk-ids = "3.1.0"
@@ -221,11 +219,11 @@ solana-sysvar-id = "3.1.0"
 solana-transaction = "3.0.2"
 solana-transaction-context = { path = "transaction-context", version = "=4.0.0-alpha.0", features = ["agave-unstable-api", "bincode"] }
 solana-transaction-error = "3.0.0"
-solana-transaction-status = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-transaction-status = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-version = "3.1.0"
-solana-vote = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", features = ["agave-unstable-api"] }
+solana-vote = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", features = ["agave-unstable-api"] }
 solana-vote-interface = "3.0.0"
-solana-vote-program = { git = "https://github.com/anza-xyz/agave", rev = "a48940a24d", default-features = false, features = ["agave-unstable-api"] }
+solana-vote-program = { git = "https://github.com/anza-xyz/agave", rev = "cc74332e59", default-features = false, features = ["agave-unstable-api"] }
 solana-zk-elgamal-proof-program = "3.0.0"
 solana-zk-sdk = "5.0.0"
 solana-zk-token-proof-program = "3.0.0"
@@ -244,3 +242,5 @@ solana-svm-measure = { path = "measure" }
 solana-program-runtime = { path = "program-runtime" }
 solana-transaction-context = { path = "transaction-context" }
 solana-svm-type-overrides = { path = "type-overrides" }
+solana-bpf-loader-program = { path = "programs/bpf_loader" }
+solana-loader-v4-program = { path = "programs/loader-v4" }

compute-budget/Cargo.toml

@@ -20,9 +20,7 @@ frozen-abi = ["dep:solana-frozen-abi", "solana-fee-structure/frozen-abi"]
 [dependencies]
 qualifier_attr = { workspace = true, optional = true }
 solana-fee-structure = { workspace = true }
-solana-frozen-abi = { workspace = true, optional = true, features = [
-    "frozen-abi",
-] }
+solana-frozen-abi = { workspace = true, optional = true, features = ["frozen-abi"] }
 solana-program-runtime = { workspace = true }
 
 [lints]

compute-budget/src/compute_budget.rs

@@ -1,6 +1,6 @@
 pub use solana_program_runtime::execution_budget::{
-    SVMTransactionExecutionBudget, SVMTransactionExecutionCost, MAX_CALL_DEPTH,
-    MAX_INSTRUCTION_STACK_DEPTH, STACK_FRAME_SIZE,
+    MAX_CALL_DEPTH, MAX_INSTRUCTION_STACK_DEPTH, STACK_FRAME_SIZE, SVMTransactionExecutionBudget,
+    SVMTransactionExecutionCost,
 };
 use {
     solana_fee_structure::FeeDetails,

feature-set/src/lib.rs

@@ -51,6 +51,7 @@ pub struct SVMFeatureSet {
     pub custom_commission_collector: bool,
     pub enable_bls12_381_syscall: bool,
     pub block_revenue_sharing: bool,
+    pub vote_account_initialize_v2: bool,
 }
 
 impl SVMFeatureSet {
@@ -106,6 +107,7 @@ impl SVMFeatureSet {
             custom_commission_collector: true,
             enable_bls12_381_syscall: true,
             block_revenue_sharing: true,
+            vote_account_initialize_v2: true,
         }
     }
 }

program-runtime/Cargo.toml

@@ -42,12 +42,8 @@ solana-clock = { workspace = true }
 solana-epoch-rewards = { workspace = true }
 solana-epoch-schedule = { workspace = true }
 solana-fee-structure = { workspace = true }
-solana-frozen-abi = { workspace = true, optional = true, features = [
-    "frozen-abi",
-] }
-solana-frozen-abi-macro = { workspace = true, optional = true, features = [
-    "frozen-abi",
-] }
+solana-frozen-abi = { workspace = true, optional = true, features = ["frozen-abi"] }
+solana-frozen-abi-macro = { workspace = true, optional = true, features = ["frozen-abi"] }
 solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-last-restart-slot = { workspace = true }
@@ -83,9 +79,7 @@ solana-program-runtime = { path = ".", features = ["dev-context-only-utils"] }
 solana-pubkey = { workspace = true, features = ["rand"] }
 solana-signer = { workspace = true }
 solana-transaction = { workspace = true, features = ["dev-context-only-utils"] }
-solana-transaction-context = { workspace = true, features = [
-    "dev-context-only-utils",
-] }
+solana-transaction-context = { workspace = true, features = ["dev-context-only-utils"] }
 test-case = { workspace = true }
 
 [lints]

program-runtime/src/cpi.rs

@@ -880,7 +880,7 @@ pub fn cpi_common<S: SyscallInvokeSigned>(
         check_aligned,
     )?;
     check_authorized_program(&instruction.program_id, &instruction.data, invoke_context)?;
-    invoke_context.prepare_next_instruction(instruction, &signers)?;
+    invoke_context.prepare_next_cpi_instruction(instruction, &signers)?;
 
     let mut accounts = S::translate_accounts(
         account_infos_addr,
@@ -1454,7 +1454,7 @@ mod tests {
             );
             $invoke_context
                 .transaction_context
-                .configure_next_instruction_for_tests(
+                .configure_top_level_instruction_for_tests(
                     $program_account,
                     instruction_accounts,
                     instruction_data.to_vec(),
@@ -1968,7 +1968,7 @@ mod tests {
 
         invoke_context
             .transaction_context
-            .configure_next_instruction_for_tests(
+            .configure_next_cpi_for_tests(
                 0,
                 vec![
                     InstructionAccount::new(1, false, true),

program-runtime/src/deploy.rs

@@ -45,51 +45,6 @@ fn morph_into_deployment_environment_v1<'a>(
     Ok(result)
 }
 
-#[allow(clippy::too_many_arguments)]
-pub fn load_program_from_bytes(
-    log_collector: Option<Rc<RefCell<LogCollector>>>,
-    #[cfg(feature = "metrics")] load_program_metrics: &mut LoadProgramMetrics,
-    programdata: &[u8],
-    loader_key: &Pubkey,
-    account_size: usize,
-    deployment_slot: Slot,
-    program_runtime_environment: Arc<BuiltinProgram<InvokeContext<'static, 'static>>>,
-    reloading: bool,
-) -> Result<ProgramCacheEntry, InstructionError> {
-    let effective_slot = deployment_slot.saturating_add(DELAY_VISIBILITY_SLOT_OFFSET);
-    let loaded_program = if reloading {
-        // Safety: this is safe because the program is being reloaded in the cache.
-        unsafe {
-            ProgramCacheEntry::reload(
-                loader_key,
-                program_runtime_environment,
-                deployment_slot,
-                effective_slot,
-                programdata,
-                account_size,
-                #[cfg(feature = "metrics")]
-                load_program_metrics,
-            )
-        }
-    } else {
-        ProgramCacheEntry::new(
-            loader_key,
-            program_runtime_environment,
-            deployment_slot,
-            effective_slot,
-            programdata,
-            account_size,
-            #[cfg(feature = "metrics")]
-            load_program_metrics,
-        )
-    }
-    .map_err(|err| {
-        ic_logger_msg!(log_collector, "{}", err);
-        InstructionError::InvalidAccountData
-    })?;
-    Ok(loaded_program)
-}
-
 /// Directly deploy a program using a provided invoke context.
 /// This function should only be invoked from the runtime, since it does not
 /// provide any account loads or checks.
@@ -145,17 +100,23 @@ pub fn deploy_program(
         load_program_metrics.verify_code_us = verify_code_time.as_us();
     }
     // Reload but with program_runtime_environment
-    let executor = load_program_from_bytes(
-        log_collector,
-        #[cfg(feature = "metrics")]
-        load_program_metrics,
-        programdata,
-        loader_key,
-        account_size,
-        deployment_slot,
-        program_runtime_environment,
-        true,
-    )?;
+    let executor = unsafe {
+        // SAFETY: The executable has been verified just above.
+        ProgramCacheEntry::reload(
+            loader_key,
+            program_runtime_environment,
+            deployment_slot,
+            deployment_slot.saturating_add(DELAY_VISIBILITY_SLOT_OFFSET),
+            programdata,
+            account_size,
+            #[cfg(feature = "metrics")]
+            load_program_metrics,
+        )
+    }
+    .map_err(|err| {
+        ic_logger_msg!(log_collector, "{}", err);
+        InstructionError::InvalidAccountData
+    })?;
     if let Some(old_entry) = program_cache_for_tx_batch.find(program_id) {
         executor.tx_usage_counter.store(
             old_entry.tx_usage_counter.load(Ordering::Relaxed),