Add support for SDK sysvar types (#5876)

programs/bpf/Cargo.toml

@@ -26,7 +26,7 @@ solana-bpf-loader-api = { path = "../bpf_loader_api", version = "0.19.0-pre0" }
 solana-logger = { path = "../../logger", version = "0.19.0-pre0" }
 solana-runtime = { path = "../../runtime", version = "0.19.0-pre0" }
 solana-sdk = { path = "../../sdk", version = "0.19.0-pre0" }
-solana_rbpf = "=0.1.15"
+solana_rbpf = "=0.1.16"
 
 [[bench]]
 name = "bpf_loader"

programs/bpf/build.rs

@@ -70,7 +70,6 @@ fn main() {
         let rust_programs = [
             "128bit",
             "alloc",
-            "clock",
             "dep_crate",
             "iter",
             "many_args",
@@ -78,6 +77,7 @@ fn main() {
             "noop",
             "panic",
             "param_passing",
+            "sysval",
         ];
         for program in rust_programs.iter() {
             println!(

programs/bpf/rust/clock/src/lib.rs

@@ -1,28 +0,0 @@
-//! @brief Example Rust-based BPF program that prints out the parameters passed to it
-
-extern crate solana_sdk;
-use solana_sdk::{
-    account_info::AccountInfo, entrypoint, entrypoint::SUCCESS, info, pubkey::Pubkey,
-    sysvar::clock::Clock,
-};
-
-entrypoint!(process_instruction);
-fn process_instruction(_program_id: &Pubkey, accounts: &mut [AccountInfo], _data: &[u8]) -> u32 {
-    match Clock::from_account_info(&accounts[2]) {
-        Some(clock) => {
-            info!("slot, segment, epoch, stakers_epoch");
-            info!(
-                clock.slot,
-                clock.segment, clock.epoch, clock.stakers_epoch, 0
-            );
-            assert_eq!(clock.slot, 42);
-        }
-        None => {
-            info!("Failed to get clock from account 2");
-            panic!();
-        }
-    }
-
-    info!("Success");
-    SUCCESS
-}

programs/bpf/rust/sysval/Cargo.toml

@@ -2,9 +2,9 @@
 # Note: This crate must be built using build.sh
 
 [package]
-name = "solana-bpf-rust-clock"
+name = "solana-bpf-rust-sysval"
 version = "0.19.0-pre0"
-description = "Solana BPF clock sysvar test"
+description = "Solana BPF sysvar test"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
@@ -23,4 +23,4 @@ members = []
 
 [lib]
 crate-type = ["cdylib"]
-name = "solana_bpf_rust_clock"
+name = "solana_bpf_rust_sysval"

programs/bpf/rust/sysval/src/lib.rs

@@ -0,0 +1,43 @@
+//! @brief Example Rust-based BPF program that tests sysval use
+
+extern crate solana_sdk;
+use solana_sdk::{
+    account_info::AccountInfo,
+    clock::{get_segment_from_slot, DEFAULT_SLOTS_PER_EPOCH, DEFAULT_SLOTS_PER_SEGMENT},
+    entrypoint,
+    entrypoint::SUCCESS,
+    pubkey::Pubkey,
+    sysvar::{
+        clock::Clock, fees::Fees, rewards::Rewards, slot_hashes::SlotHashes,
+        stake_history::StakeHistory,
+    },
+};
+
+entrypoint!(process_instruction);
+fn process_instruction(_program_id: &Pubkey, accounts: &mut [AccountInfo], _data: &[u8]) -> u32 {
+    // Clock
+    let clock = Clock::from_account_info(&accounts[2]).unwrap();
+    assert_eq!(clock.slot, DEFAULT_SLOTS_PER_EPOCH + 1);
+    assert_eq!(
+        clock.segment,
+        get_segment_from_slot(clock.slot, DEFAULT_SLOTS_PER_SEGMENT)
+    );
+
+    // Fees
+    let fees = Fees::from_account_info(&accounts[3]).unwrap();
+    let burn = fees.fee_calculator.burn(42);
+    assert_eq!(burn, (21, 21));
+
+    // Rewards
+    let _ = Rewards::from_account_info(&accounts[4]).unwrap();
+
+    // Slot Hashes
+    let slot_hashes = SlotHashes::from_account_info(&accounts[5]).unwrap();
+    assert_eq!(slot_hashes.len(), 1);
+
+    // Stake History
+    let stake_history = StakeHistory::from_account_info(&accounts[6]).unwrap();
+    assert_eq!(stake_history.len(), 1);
+
+    SUCCESS
+}

programs/bpf/tests/programs.rs

@@ -79,10 +79,11 @@ mod bpf {
         use super::*;
         use solana_sdk::bpf_loader;
         use solana_sdk::client::SyncClient;
+        use solana_sdk::clock::DEFAULT_SLOTS_PER_EPOCH;
         use solana_sdk::instruction::{AccountMeta, Instruction};
         use solana_sdk::pubkey::Pubkey;
         use solana_sdk::signature::{Keypair, KeypairUtil};
-        use solana_sdk::sysvar::clock;
+        use solana_sdk::sysvar::{clock, fees, rewards, slot_hashes, stake_history};
         use std::io::Read;
         use std::sync::Arc;
 
@@ -93,7 +94,6 @@ mod bpf {
             let programs = [
                 ("solana_bpf_rust_128bit", true),
                 ("solana_bpf_rust_alloc", true),
-                ("solana_bpf_rust_clock", true),
                 ("solana_bpf_rust_dep_crate", true),
                 ("solana_bpf_rust_external_spend", false),
                 ("solana_bpf_rust_iter", true),
@@ -101,6 +101,7 @@ mod bpf {
                 ("solana_bpf_rust_noop", true),
                 ("solana_bpf_rust_panic", false),
                 ("solana_bpf_rust_param_passing", true),
+                ("solana_bpf_rust_sysval", true),
             ];
             for program in programs.iter() {
                 let filename = create_bpf_path(program.0);
@@ -110,13 +111,15 @@ mod bpf {
                 file.read_to_end(&mut elf).unwrap();
 
                 let GenesisBlockInfo {
-                    genesis_block,
+                    mut genesis_block,
                     mint_keypair,
                     ..
                 } = create_genesis_block(50);
+                genesis_block.epoch_warmup = false;
                 let bank = Arc::new(Bank::new(&genesis_block));
-                // Create bank with specific slot, used by solana_bpf_rust_clock test
-                let bank = Bank::new_from_parent(&bank, &Pubkey::default(), 42);
+                // Create bank with specific slot, used by solana_bpf_rust_sysvar test
+                let bank =
+                    Bank::new_from_parent(&bank, &Pubkey::default(), DEFAULT_SLOTS_PER_EPOCH + 1);
                 let bank_client = BankClient::new(bank);
 
                 // Call user program
@@ -125,6 +128,10 @@ mod bpf {
                     AccountMeta::new(mint_keypair.pubkey(), true),
                     AccountMeta::new(Keypair::new().pubkey(), false),
                     AccountMeta::new(clock::id(), false),
+                    AccountMeta::new(fees::id(), false),
+                    AccountMeta::new(rewards::id(), false),
+                    AccountMeta::new(slot_hashes::id(), false),
+                    AccountMeta::new(stake_history::id(), false),
                 ];
                 let instruction = Instruction::new(program_id, &1u8, account_metas);
                 let result = bank_client.send_instruction(&mint_keypair, instruction);