introduce syscalls (#4373)
This commit is contained in:
parent
f6c7812fcc
commit
58295b825d
|
@ -6,8 +6,8 @@
|
||||||
use crate::id;
|
use crate::id;
|
||||||
use serde_derive::{Deserialize, Serialize};
|
use serde_derive::{Deserialize, Serialize};
|
||||||
use solana_sdk::account::{Account, KeyedAccount};
|
use solana_sdk::account::{Account, KeyedAccount};
|
||||||
|
use solana_sdk::account_utils::State;
|
||||||
use solana_sdk::instruction::InstructionError;
|
use solana_sdk::instruction::InstructionError;
|
||||||
use solana_sdk::instruction_processor_utils::State;
|
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use solana_sdk::pubkey::Pubkey;
|
||||||
use solana_vote_api::vote_state::VoteState;
|
use solana_vote_api::vote_state::VoteState;
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,9 @@ use crate::get_segment_from_slot;
|
||||||
use log::*;
|
use log::*;
|
||||||
use serde_derive::{Deserialize, Serialize};
|
use serde_derive::{Deserialize, Serialize};
|
||||||
use solana_sdk::account::Account;
|
use solana_sdk::account::Account;
|
||||||
|
use solana_sdk::account_utils::State;
|
||||||
use solana_sdk::hash::Hash;
|
use solana_sdk::hash::Hash;
|
||||||
use solana_sdk::instruction::InstructionError;
|
use solana_sdk::instruction::InstructionError;
|
||||||
use solana_sdk::instruction_processor_utils::State;
|
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use solana_sdk::pubkey::Pubkey;
|
||||||
use solana_sdk::signature::Signature;
|
use solana_sdk::signature::Signature;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
|
@ -4,8 +4,8 @@ use crate::id;
|
||||||
use bincode::{deserialize, serialize_into, serialized_size, ErrorKind};
|
use bincode::{deserialize, serialize_into, serialized_size, ErrorKind};
|
||||||
use serde_derive::{Deserialize, Serialize};
|
use serde_derive::{Deserialize, Serialize};
|
||||||
use solana_sdk::account::{Account, KeyedAccount};
|
use solana_sdk::account::{Account, KeyedAccount};
|
||||||
|
use solana_sdk::account_utils::State;
|
||||||
use solana_sdk::instruction::InstructionError;
|
use solana_sdk::instruction::InstructionError;
|
||||||
use solana_sdk::instruction_processor_utils::State;
|
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use solana_sdk::pubkey::Pubkey;
|
||||||
use std::collections::VecDeque;
|
use std::collections::VecDeque;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,61 @@
|
||||||
|
//! useful extras for Account state
|
||||||
|
use crate::account::{Account, KeyedAccount};
|
||||||
|
use crate::instruction::InstructionError;
|
||||||
|
use bincode::ErrorKind;
|
||||||
|
|
||||||
|
/// Conveinence trait to covert bincode errors to instruction errors.
|
||||||
|
pub trait State<T> {
|
||||||
|
fn state(&self) -> Result<T, InstructionError>;
|
||||||
|
fn set_state(&mut self, state: &T) -> Result<(), InstructionError>;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> State<T> for Account
|
||||||
|
where
|
||||||
|
T: serde::Serialize + serde::de::DeserializeOwned,
|
||||||
|
{
|
||||||
|
fn state(&self) -> Result<T, InstructionError> {
|
||||||
|
self.deserialize_data()
|
||||||
|
.map_err(|_| InstructionError::InvalidAccountData)
|
||||||
|
}
|
||||||
|
fn set_state(&mut self, state: &T) -> Result<(), InstructionError> {
|
||||||
|
self.serialize_data(state).map_err(|err| match *err {
|
||||||
|
ErrorKind::SizeLimit => InstructionError::AccountDataTooSmall,
|
||||||
|
_ => InstructionError::GenericError,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a, T> State<T> for KeyedAccount<'a>
|
||||||
|
where
|
||||||
|
T: serde::Serialize + serde::de::DeserializeOwned,
|
||||||
|
{
|
||||||
|
fn state(&self) -> Result<T, InstructionError> {
|
||||||
|
self.account.state()
|
||||||
|
}
|
||||||
|
fn set_state(&mut self, state: &T) -> Result<(), InstructionError> {
|
||||||
|
self.account.set_state(state)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::account::Account;
|
||||||
|
use crate::pubkey::Pubkey;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_account_state() {
|
||||||
|
let state = 42u64;
|
||||||
|
|
||||||
|
assert!(Account::default().set_state(&state).is_err());
|
||||||
|
let res = Account::default().state() as Result<u64, InstructionError>;
|
||||||
|
assert!(res.is_err());
|
||||||
|
|
||||||
|
let mut account = Account::new(0, std::mem::size_of::<u64>(), &Pubkey::default());
|
||||||
|
|
||||||
|
assert!(account.set_state(&state).is_ok());
|
||||||
|
let stored_state: u64 = account.state().unwrap();
|
||||||
|
assert_eq!(stored_state, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,7 +1,6 @@
|
||||||
use crate::account::{Account, KeyedAccount};
|
use crate::account::KeyedAccount;
|
||||||
use crate::instruction::InstructionError;
|
use crate::instruction::InstructionError;
|
||||||
use crate::pubkey::Pubkey;
|
use crate::pubkey::Pubkey;
|
||||||
use bincode::ErrorKind;
|
|
||||||
use num_traits::FromPrimitive;
|
use num_traits::FromPrimitive;
|
||||||
|
|
||||||
// All native programs export a symbol named process()
|
// All native programs export a symbol named process()
|
||||||
|
@ -52,40 +51,6 @@ macro_rules! solana_program_id(
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
/// Conveinence trait to covert bincode errors to instruction errors.
|
|
||||||
pub trait State<T> {
|
|
||||||
fn state(&self) -> Result<T, InstructionError>;
|
|
||||||
fn set_state(&mut self, state: &T) -> Result<(), InstructionError>;
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<T> State<T> for Account
|
|
||||||
where
|
|
||||||
T: serde::Serialize + serde::de::DeserializeOwned,
|
|
||||||
{
|
|
||||||
fn state(&self) -> Result<T, InstructionError> {
|
|
||||||
self.deserialize_data()
|
|
||||||
.map_err(|_| InstructionError::InvalidAccountData)
|
|
||||||
}
|
|
||||||
fn set_state(&mut self, state: &T) -> Result<(), InstructionError> {
|
|
||||||
self.serialize_data(state).map_err(|err| match *err {
|
|
||||||
ErrorKind::SizeLimit => InstructionError::AccountDataTooSmall,
|
|
||||||
_ => InstructionError::GenericError,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a, T> State<T> for KeyedAccount<'a>
|
|
||||||
where
|
|
||||||
T: serde::Serialize + serde::de::DeserializeOwned,
|
|
||||||
{
|
|
||||||
fn state(&self) -> Result<T, InstructionError> {
|
|
||||||
self.account.state()
|
|
||||||
}
|
|
||||||
fn set_state(&mut self, state: &T) -> Result<(), InstructionError> {
|
|
||||||
self.account.set_state(state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub trait DecodeError<E> {
|
pub trait DecodeError<E> {
|
||||||
fn decode_custom_error_to_enum(int: u32) -> Option<E>
|
fn decode_custom_error_to_enum(int: u32) -> Option<E>
|
||||||
where
|
where
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
pub mod account;
|
pub mod account;
|
||||||
|
pub mod account_utils;
|
||||||
pub mod bpf_loader;
|
pub mod bpf_loader;
|
||||||
pub mod client;
|
pub mod client;
|
||||||
pub mod fee_calculator;
|
pub mod fee_calculator;
|
||||||
|
@ -15,6 +16,7 @@ pub mod pubkey;
|
||||||
pub mod rpc_port;
|
pub mod rpc_port;
|
||||||
pub mod short_vec;
|
pub mod short_vec;
|
||||||
pub mod signature;
|
pub mod signature;
|
||||||
|
pub mod syscall;
|
||||||
pub mod system_instruction;
|
pub mod system_instruction;
|
||||||
pub mod system_program;
|
pub mod system_program;
|
||||||
pub mod system_transaction;
|
pub mod system_transaction;
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
//! named accounts for synthesized data accounts for bank state, etc.
|
||||||
|
//!
|
||||||
|
use crate::pubkey::Pubkey;
|
||||||
|
|
||||||
|
pub mod slothashes;
|
||||||
|
|
||||||
|
/// "Sysca11111111111111111111111111111111111111"
|
||||||
|
/// owner pubkey for syscall accounts
|
||||||
|
const SYSCALL_PROGRAM_ID: [u8; 32] = [
|
||||||
|
6, 167, 211, 138, 69, 216, 137, 185, 198, 189, 33, 204, 111, 12, 217, 220, 229, 201, 34, 52,
|
||||||
|
253, 202, 87, 144, 232, 16, 195, 192, 0, 0, 0, 0,
|
||||||
|
];
|
||||||
|
|
||||||
|
pub fn id() -> Pubkey {
|
||||||
|
Pubkey::new(&SYSCALL_PROGRAM_ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn test_syscall_ids() {
|
||||||
|
let ids = [("Sysca11111111111111111111111111111111111111", id())];
|
||||||
|
// to get the bytes above:
|
||||||
|
// ids.iter().for_each(|(name, _)| {
|
||||||
|
// dbg!((name, bs58::decode(name).into_vec().unwrap()));
|
||||||
|
// });
|
||||||
|
assert!(ids.iter().all(|(name, id)| *name == id.to_string()));
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,54 @@
|
||||||
|
//! named accounts for synthesized data accounts for bank state, etc.
|
||||||
|
//!
|
||||||
|
//! this account carries the Bank's most recent blockhashes for some N parents
|
||||||
|
//!
|
||||||
|
use crate::account::Account;
|
||||||
|
use crate::hash::Hash;
|
||||||
|
use crate::pubkey::Pubkey;
|
||||||
|
|
||||||
|
/// "Sysca11SlotHashes11111111111111111111111111"
|
||||||
|
/// slot hashes account pubkey
|
||||||
|
const SYSCALL_SLOT_HASHES_ID: [u8; 32] = [
|
||||||
|
6, 167, 211, 138, 69, 219, 186, 157, 48, 170, 46, 66, 2, 146, 193, 59, 39, 59, 245, 188, 30,
|
||||||
|
60, 130, 78, 86, 27, 113, 191, 208, 0, 0, 0,
|
||||||
|
];
|
||||||
|
|
||||||
|
pub fn id() -> Pubkey {
|
||||||
|
Pubkey::new(&SYSCALL_SLOT_HASHES_ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
use crate::account_utils::State;
|
||||||
|
use std::ops::{Deref, DerefMut};
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub struct SlotHashes(Vec<(u64, Hash)>);
|
||||||
|
|
||||||
|
impl SlotHashes {
|
||||||
|
pub fn from(account: &Account) -> Option<Self> {
|
||||||
|
account.state().ok()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl Deref for SlotHashes {
|
||||||
|
type Target = Vec<(u64, Hash)>;
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl DerefMut for SlotHashes {
|
||||||
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||||
|
&mut self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn test_syscall_ids() {
|
||||||
|
let ids = [("Sysca11S1otHashes11111111111111111111111111", id())];
|
||||||
|
// to get the bytes above:
|
||||||
|
// ids.iter().for_each(|(name, _)| {
|
||||||
|
// dbg!((name, bs58::decode(name).into_vec().unwrap()));
|
||||||
|
// });
|
||||||
|
assert!(ids.iter().all(|(name, id)| *name == id.to_string()));
|
||||||
|
}
|
||||||
|
}
|
|
@ -14,10 +14,11 @@ use solana_drone::drone::request_airdrop_transaction;
|
||||||
use solana_drone::drone::DRONE_PORT;
|
use solana_drone::drone::DRONE_PORT;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
use solana_drone::drone_mock::request_airdrop_transaction;
|
use solana_drone::drone_mock::request_airdrop_transaction;
|
||||||
|
use solana_sdk::account_utils::State;
|
||||||
use solana_sdk::bpf_loader;
|
use solana_sdk::bpf_loader;
|
||||||
use solana_sdk::hash::Hash;
|
use solana_sdk::hash::Hash;
|
||||||
use solana_sdk::instruction::InstructionError;
|
use solana_sdk::instruction::InstructionError;
|
||||||
use solana_sdk::instruction_processor_utils::{DecodeError, State};
|
use solana_sdk::instruction_processor_utils::DecodeError;
|
||||||
use solana_sdk::loader_instruction;
|
use solana_sdk::loader_instruction;
|
||||||
use solana_sdk::message::Message;
|
use solana_sdk::message::Message;
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use solana_sdk::pubkey::Pubkey;
|
||||||
|
|
Loading…
Reference in New Issue