Add sysvar support (#5838)

programs/bpf/build.rs

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

programs/bpf/rust/clock/Cargo.toml

@@ -2,9 +2,9 @@
 # Note: This crate must be built using build.sh
 
 [package]
-name = "solana-bpf-rust-tick-height"
+name = "solana-bpf-rust-clock"
 version = "0.19.0-pre0"
-description = "Solana BPF noop program written in Rust"
+description = "Solana BPF clock sysvar test"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
@@ -12,7 +12,6 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-byteorder = { version = "1", default-features = false }
 solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
 
 [features]
@@ -24,4 +23,4 @@ members = []
 
 [lib]
 crate-type = ["cdylib"]
-name = "solana_bpf_rust_tick_height"
+name = "solana_bpf_rust_clock"

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

@@ -0,0 +1,28 @@
+//! @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(&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/tick_height/src/lib.rs

@@ -1,16 +0,0 @@
-//! @brief Example Rust-based BPF program that prints out the parameters passed to it
-
-extern crate solana_sdk;
-use byteorder::{ByteOrder, LittleEndian};
-use solana_sdk::{
-    account_info::AccountInfo, entrypoint, entrypoint::SUCCESS, info, pubkey::Pubkey,
-};
-
-entrypoint!(process_instruction);
-fn process_instruction(_program_id: &Pubkey, accounts: &mut [AccountInfo], _data: &[u8]) -> u32 {
-    let tick_height = LittleEndian::read_u64(accounts[2].data);
-    assert_eq!(10u64, tick_height);
-
-    info!("Success");
-    SUCCESS
-}

programs/bpf/tests/programs.rs

@@ -79,10 +79,12 @@ mod bpf {
         use super::*;
         use solana_sdk::bpf_loader;
         use solana_sdk::client::SyncClient;
-        use solana_sdk::hash;
         use solana_sdk::instruction::{AccountMeta, Instruction};
+        use solana_sdk::pubkey::Pubkey;
         use solana_sdk::signature::{Keypair, KeypairUtil};
+        use solana_sdk::sysvar::clock;
         use std::io::Read;
+        use std::sync::Arc;
 
         #[test]
         fn test_program_bpf_rust() {
@@ -91,10 +93,11 @@ 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),
                 ("solana_bpf_rust_many_args", true),
-                ("solana_bpf_rust_external_spend", false),
                 ("solana_bpf_rust_noop", true),
                 ("solana_bpf_rust_panic", false),
                 ("solana_bpf_rust_param_passing", true),
@@ -111,12 +114,9 @@ mod bpf {
                     mint_keypair,
                     ..
                 } = create_genesis_block(50);
-                let bank = Bank::new(&genesis_block);
-
-                // register some ticks, used by solana_bpf_rust_tick_height
-                for i in 0..10 {
-                    bank.register_tick(&hash::hash(format!("hashing {}", i).as_bytes()));
-                }
+                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);
                 let bank_client = BankClient::new(bank);
 
                 // Call user program
@@ -124,6 +124,7 @@ mod bpf {
                 let account_metas = vec![
                     AccountMeta::new(mint_keypair.pubkey(), true),
                     AccountMeta::new(Keypair::new().pubkey(), false),
+                    AccountMeta::new(clock::id(), false),
                 ];
                 let instruction = Instruction::new(program_id, &1u8, account_metas);
                 let result = bank_client.send_instruction(&mint_keypair, instruction);