Skip deserialization of readonly accounts (#15813)
This commit is contained in:
parent
4bbeb9c033
commit
cc38ae72e7
|
@ -17,7 +17,6 @@ static const uint8_t TEST_INSTRUCTION_META_TOO_LARGE = 10;
|
||||||
static const uint8_t TEST_RETURN_ERROR = 11;
|
static const uint8_t TEST_RETURN_ERROR = 11;
|
||||||
static const uint8_t TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER = 12;
|
static const uint8_t TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER = 12;
|
||||||
static const uint8_t TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE = 13;
|
static const uint8_t TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE = 13;
|
||||||
static const uint8_t TEST_WRITE_DEESCALATION = 14;
|
|
||||||
|
|
||||||
static const int MINT_INDEX = 0;
|
static const int MINT_INDEX = 0;
|
||||||
static const int ARGUMENT_INDEX = 1;
|
static const int ARGUMENT_INDEX = 1;
|
||||||
|
@ -272,6 +271,24 @@ extern uint64_t entrypoint(const uint8_t *input) {
|
||||||
sol_assert(accounts[ARGUMENT_INDEX].data[i] == 0);
|
sol_assert(accounts[ARGUMENT_INDEX].data[i] == 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
sol_log("Test writable deescalation");
|
||||||
|
{
|
||||||
|
uint8_t buffer[10];
|
||||||
|
for (int i = 0; i < 10; i++) {
|
||||||
|
buffer[i] = accounts[INVOKED_ARGUMENT_INDEX].data[i];
|
||||||
|
}
|
||||||
|
SolAccountMeta arguments[] = {
|
||||||
|
{accounts[INVOKED_ARGUMENT_INDEX].key, false, false}};
|
||||||
|
uint8_t data[] = {WRITE_ACCOUNT, 10};
|
||||||
|
const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
|
||||||
|
arguments, SOL_ARRAY_SIZE(arguments),
|
||||||
|
data, SOL_ARRAY_SIZE(data)};
|
||||||
|
sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
|
||||||
|
|
||||||
|
for (int i = 0; i < 10; i++) {
|
||||||
|
sol_assert(buffer[i] == accounts[INVOKED_ARGUMENT_INDEX].data[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TEST_PRIVILEGE_ESCALATION_SIGNER: {
|
case TEST_PRIVILEGE_ESCALATION_SIGNER: {
|
||||||
|
@ -474,7 +491,6 @@ extern uint64_t entrypoint(const uint8_t *input) {
|
||||||
sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
|
sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: {
|
case TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: {
|
||||||
sol_log("Test privilege deescalation escalation signer");
|
sol_log("Test privilege deescalation escalation signer");
|
||||||
sol_assert(true == accounts[INVOKED_ARGUMENT_INDEX].is_signer);
|
sol_assert(true == accounts[INVOKED_ARGUMENT_INDEX].is_signer);
|
||||||
|
@ -505,19 +521,6 @@ extern uint64_t entrypoint(const uint8_t *input) {
|
||||||
sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts)));
|
sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case TEST_WRITE_DEESCALATION: {
|
|
||||||
sol_log("Test writable deescalation");
|
|
||||||
|
|
||||||
SolAccountMeta arguments[] = {
|
|
||||||
{accounts[INVOKED_ARGUMENT_INDEX].key, false, false}};
|
|
||||||
uint8_t data[] = {WRITE_ACCOUNT, 10};
|
|
||||||
const SolInstruction instruction = {accounts[INVOKED_PROGRAM_INDEX].key,
|
|
||||||
arguments, SOL_ARRAY_SIZE(arguments),
|
|
||||||
data, SOL_ARRAY_SIZE(data)};
|
|
||||||
sol_invoke(&instruction, accounts, SOL_ARRAY_SIZE(accounts));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
default:
|
||||||
sol_panic();
|
sol_panic();
|
||||||
}
|
}
|
||||||
|
|
|
@ -160,7 +160,7 @@ extern uint64_t entrypoint(const uint8_t *input) {
|
||||||
}
|
}
|
||||||
|
|
||||||
case VERIFY_PRIVILEGE_ESCALATION: {
|
case VERIFY_PRIVILEGE_ESCALATION: {
|
||||||
sol_log("Should never get here!");
|
sol_log("Verify privilege escalation");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@ const TEST_INSTRUCTION_META_TOO_LARGE: u8 = 10;
|
||||||
const TEST_RETURN_ERROR: u8 = 11;
|
const TEST_RETURN_ERROR: u8 = 11;
|
||||||
const TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: u8 = 12;
|
const TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: u8 = 12;
|
||||||
const TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE: u8 = 13;
|
const TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE: u8 = 13;
|
||||||
const TEST_WRITE_DEESCALATION: u8 = 14;
|
|
||||||
|
|
||||||
// const MINT_INDEX: usize = 0;
|
// const MINT_INDEX: usize = 0;
|
||||||
const ARGUMENT_INDEX: usize = 1;
|
const ARGUMENT_INDEX: usize = 1;
|
||||||
|
@ -354,6 +353,27 @@ fn process_instruction(
|
||||||
assert_eq!(data[i as usize], 42);
|
assert_eq!(data[i as usize], 42);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
msg!("Test writable deescalation");
|
||||||
|
{
|
||||||
|
const NUM_BYTES: usize = 10;
|
||||||
|
let mut buffer = [0; NUM_BYTES];
|
||||||
|
buffer.copy_from_slice(
|
||||||
|
&accounts[INVOKED_ARGUMENT_INDEX].data.borrow_mut()[..NUM_BYTES],
|
||||||
|
);
|
||||||
|
|
||||||
|
let instruction = create_instruction(
|
||||||
|
*accounts[INVOKED_PROGRAM_INDEX].key,
|
||||||
|
&[(accounts[INVOKED_ARGUMENT_INDEX].key, false, false)],
|
||||||
|
vec![WRITE_ACCOUNT, NUM_BYTES as u8],
|
||||||
|
);
|
||||||
|
let _ = invoke(&instruction, accounts);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
buffer,
|
||||||
|
accounts[INVOKED_ARGUMENT_INDEX].data.borrow_mut()[..NUM_BYTES]
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
TEST_PRIVILEGE_ESCALATION_SIGNER => {
|
TEST_PRIVILEGE_ESCALATION_SIGNER => {
|
||||||
msg!("Test privilege escalation signer");
|
msg!("Test privilege escalation signer");
|
||||||
|
@ -557,15 +577,6 @@ fn process_instruction(
|
||||||
);
|
);
|
||||||
invoke(&invoked_instruction, accounts)?;
|
invoke(&invoked_instruction, accounts)?;
|
||||||
}
|
}
|
||||||
TEST_WRITE_DEESCALATION => {
|
|
||||||
msg!("Test writable deescalation");
|
|
||||||
let instruction = create_instruction(
|
|
||||||
*accounts[INVOKED_PROGRAM_INDEX].key,
|
|
||||||
&[(accounts[INVOKED_ARGUMENT_INDEX].key, false, false)],
|
|
||||||
vec![WRITE_ACCOUNT, 10],
|
|
||||||
);
|
|
||||||
let _ = invoke(&instruction, accounts);
|
|
||||||
}
|
|
||||||
_ => panic!(),
|
_ => panic!(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -199,7 +199,6 @@ fn process_instruction(
|
||||||
}
|
}
|
||||||
NESTED_INVOKE => {
|
NESTED_INVOKE => {
|
||||||
msg!("nested invoke");
|
msg!("nested invoke");
|
||||||
|
|
||||||
const ARGUMENT_INDEX: usize = 0;
|
const ARGUMENT_INDEX: usize = 0;
|
||||||
const INVOKED_ARGUMENT_INDEX: usize = 1;
|
const INVOKED_ARGUMENT_INDEX: usize = 1;
|
||||||
const INVOKED_PROGRAM_INDEX: usize = 3;
|
const INVOKED_PROGRAM_INDEX: usize = 3;
|
||||||
|
@ -231,8 +230,10 @@ fn process_instruction(
|
||||||
}
|
}
|
||||||
WRITE_ACCOUNT => {
|
WRITE_ACCOUNT => {
|
||||||
msg!("write account");
|
msg!("write account");
|
||||||
|
const ARGUMENT_INDEX: usize = 0;
|
||||||
|
|
||||||
for i in 0..instruction_data[1] {
|
for i in 0..instruction_data[1] {
|
||||||
accounts[0].data.borrow_mut()[i as usize] = instruction_data[1];
|
accounts[ARGUMENT_INDEX].data.borrow_mut()[i as usize] = instruction_data[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => panic!(),
|
_ => panic!(),
|
||||||
|
|
|
@ -227,7 +227,13 @@ fn run_program(
|
||||||
vm.execute_program_jit(&mut instruction_meter)
|
vm.execute_program_jit(&mut instruction_meter)
|
||||||
};
|
};
|
||||||
assert_eq!(SUCCESS, result.unwrap());
|
assert_eq!(SUCCESS, result.unwrap());
|
||||||
deserialize_parameters(&bpf_loader::id(), parameter_accounts, ¶meter_bytes).unwrap();
|
deserialize_parameters(
|
||||||
|
&bpf_loader::id(),
|
||||||
|
parameter_accounts,
|
||||||
|
¶meter_bytes,
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
if i == 1 {
|
if i == 1 {
|
||||||
assert_eq!(instruction_count, vm.get_total_instruction_count());
|
assert_eq!(instruction_count, vm.get_total_instruction_count());
|
||||||
}
|
}
|
||||||
|
@ -736,7 +742,6 @@ fn test_program_bpf_invoke_sanity() {
|
||||||
const TEST_RETURN_ERROR: u8 = 11;
|
const TEST_RETURN_ERROR: u8 = 11;
|
||||||
const TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: u8 = 12;
|
const TEST_PRIVILEGE_DEESCALATION_ESCALATION_SIGNER: u8 = 12;
|
||||||
const TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE: u8 = 13;
|
const TEST_PRIVILEGE_DEESCALATION_ESCALATION_WRITABLE: u8 = 13;
|
||||||
const TEST_WRITE_DEESCALATION: u8 = 14;
|
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
@ -854,6 +859,7 @@ fn test_program_bpf_invoke_sanity() {
|
||||||
invoked_program_id.clone(),
|
invoked_program_id.clone(),
|
||||||
invoked_program_id.clone(),
|
invoked_program_id.clone(),
|
||||||
invoked_program_id.clone(),
|
invoked_program_id.clone(),
|
||||||
|
invoked_program_id.clone(),
|
||||||
],
|
],
|
||||||
Languages::Rust => vec![
|
Languages::Rust => vec![
|
||||||
solana_sdk::system_program::id(),
|
solana_sdk::system_program::id(),
|
||||||
|
@ -872,6 +878,7 @@ fn test_program_bpf_invoke_sanity() {
|
||||||
invoked_program_id.clone(),
|
invoked_program_id.clone(),
|
||||||
invoked_program_id.clone(),
|
invoked_program_id.clone(),
|
||||||
invoked_program_id.clone(),
|
invoked_program_id.clone(),
|
||||||
|
invoked_program_id.clone(),
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
assert_eq!(invoked_programs.len(), expected_invoked_programs.len());
|
assert_eq!(invoked_programs.len(), expected_invoked_programs.len());
|
||||||
|
@ -976,12 +983,6 @@ fn test_program_bpf_invoke_sanity() {
|
||||||
&[invoked_program_id.clone()],
|
&[invoked_program_id.clone()],
|
||||||
);
|
);
|
||||||
|
|
||||||
do_invoke_failure_test_local(
|
|
||||||
TEST_WRITE_DEESCALATION,
|
|
||||||
TransactionError::InstructionError(0, InstructionError::ReadonlyDataModified),
|
|
||||||
&[invoked_program_id.clone()],
|
|
||||||
);
|
|
||||||
|
|
||||||
// Check resulting state
|
// Check resulting state
|
||||||
|
|
||||||
assert_eq!(43, bank.get_balance(&derived_key1));
|
assert_eq!(43, bank.get_balance(&derived_key1));
|
||||||
|
|
|
@ -30,6 +30,7 @@ use solana_sdk::{
|
||||||
bpf_loader_upgradeable::{self, UpgradeableLoaderState},
|
bpf_loader_upgradeable::{self, UpgradeableLoaderState},
|
||||||
clock::Clock,
|
clock::Clock,
|
||||||
entrypoint::SUCCESS,
|
entrypoint::SUCCESS,
|
||||||
|
feature_set::skip_ro_deserialization,
|
||||||
ic_logger_msg, ic_msg,
|
ic_logger_msg, ic_msg,
|
||||||
instruction::InstructionError,
|
instruction::InstructionError,
|
||||||
keyed_account::{from_keyed_account, next_keyed_account, KeyedAccount},
|
keyed_account::{from_keyed_account, next_keyed_account, KeyedAccount},
|
||||||
|
@ -818,7 +819,12 @@ impl Executor for BpfExecutor {
|
||||||
execute_time.stop();
|
execute_time.stop();
|
||||||
}
|
}
|
||||||
let mut deserialize_time = Measure::start("deserialize");
|
let mut deserialize_time = Measure::start("deserialize");
|
||||||
deserialize_parameters(loader_id, parameter_accounts, ¶meter_bytes)?;
|
deserialize_parameters(
|
||||||
|
loader_id,
|
||||||
|
parameter_accounts,
|
||||||
|
¶meter_bytes,
|
||||||
|
invoke_context.is_feature_active(&skip_ro_deserialization::id()),
|
||||||
|
)?;
|
||||||
deserialize_time.stop();
|
deserialize_time.stop();
|
||||||
invoke_context.update_timing(
|
invoke_context.update_timing(
|
||||||
serialize_time.as_us(),
|
serialize_time.as_us(),
|
||||||
|
|
|
@ -39,14 +39,32 @@ pub fn deserialize_parameters(
|
||||||
loader_id: &Pubkey,
|
loader_id: &Pubkey,
|
||||||
keyed_accounts: &[KeyedAccount],
|
keyed_accounts: &[KeyedAccount],
|
||||||
buffer: &[u8],
|
buffer: &[u8],
|
||||||
|
skip_ro_deserialization: bool,
|
||||||
) -> Result<(), InstructionError> {
|
) -> Result<(), InstructionError> {
|
||||||
if *loader_id == bpf_loader_deprecated::id() {
|
if *loader_id == bpf_loader_deprecated::id() {
|
||||||
deserialize_parameters_unaligned(keyed_accounts, buffer)
|
deserialize_parameters_unaligned(keyed_accounts, buffer, skip_ro_deserialization)
|
||||||
} else {
|
} else {
|
||||||
deserialize_parameters_aligned(keyed_accounts, buffer)
|
deserialize_parameters_aligned(keyed_accounts, buffer, skip_ro_deserialization)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_serialized_account_size_unaligned(
|
||||||
|
keyed_account: &KeyedAccount,
|
||||||
|
) -> Result<usize, InstructionError> {
|
||||||
|
let data_len = keyed_account.data_len()?;
|
||||||
|
Ok(
|
||||||
|
size_of::<u8>() // is_signer
|
||||||
|
+ size_of::<u8>() // is_writable
|
||||||
|
+ size_of::<Pubkey>() // key
|
||||||
|
+ size_of::<u64>() // lamports
|
||||||
|
+ size_of::<u64>() // data len
|
||||||
|
+ data_len // data
|
||||||
|
+ size_of::<Pubkey>() // owner
|
||||||
|
+ size_of::<u8>() // executable
|
||||||
|
+ size_of::<u64>(), // rent_epoch
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn serialize_parameters_unaligned(
|
pub fn serialize_parameters_unaligned(
|
||||||
program_id: &Pubkey,
|
program_id: &Pubkey,
|
||||||
keyed_accounts: &[KeyedAccount],
|
keyed_accounts: &[KeyedAccount],
|
||||||
|
@ -56,22 +74,14 @@ pub fn serialize_parameters_unaligned(
|
||||||
let mut size = size_of::<u64>();
|
let mut size = size_of::<u64>();
|
||||||
for (i, keyed_account) in keyed_accounts.iter().enumerate() {
|
for (i, keyed_account) in keyed_accounts.iter().enumerate() {
|
||||||
let (is_dup, _) = is_dup(&keyed_accounts[..i], keyed_account);
|
let (is_dup, _) = is_dup(&keyed_accounts[..i], keyed_account);
|
||||||
size += 1; // dup, signer, writable, executable
|
size += 1; // dup
|
||||||
if !is_dup {
|
if !is_dup {
|
||||||
let data_len = keyed_account.data_len()?;
|
size += get_serialized_account_size_unaligned(keyed_account)?;
|
||||||
size += size_of::<Pubkey>() // key
|
|
||||||
+ size_of::<Pubkey>() // owner
|
|
||||||
+ size_of::<u64>() // lamports
|
|
||||||
+ size_of::<u64>() // data len
|
|
||||||
+ data_len
|
|
||||||
+ MAX_PERMITTED_DATA_INCREASE
|
|
||||||
+ (data_len as *const u8).align_offset(align_of::<u128>())
|
|
||||||
+ size_of::<u64>(); // rent epoch;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
size += size_of::<u64>() // data len
|
size += size_of::<u64>() // instruction data len
|
||||||
+ instruction_data.len()
|
+ instruction_data.len() // instruction data
|
||||||
+ size_of::<Pubkey>(); // program id;
|
+ size_of::<Pubkey>(); // program id
|
||||||
let mut v: Vec<u8> = Vec::with_capacity(size);
|
let mut v: Vec<u8> = Vec::with_capacity(size);
|
||||||
|
|
||||||
v.write_u64::<LittleEndian>(keyed_accounts.len() as u64)
|
v.write_u64::<LittleEndian>(keyed_accounts.len() as u64)
|
||||||
|
@ -108,33 +118,58 @@ pub fn serialize_parameters_unaligned(
|
||||||
pub fn deserialize_parameters_unaligned(
|
pub fn deserialize_parameters_unaligned(
|
||||||
keyed_accounts: &[KeyedAccount],
|
keyed_accounts: &[KeyedAccount],
|
||||||
buffer: &[u8],
|
buffer: &[u8],
|
||||||
|
skip_ro_deserialization: bool,
|
||||||
) -> Result<(), InstructionError> {
|
) -> Result<(), InstructionError> {
|
||||||
let mut start = size_of::<u64>(); // number of accounts
|
let mut start = size_of::<u64>(); // number of accounts
|
||||||
for (i, keyed_account) in keyed_accounts.iter().enumerate() {
|
for (i, keyed_account) in keyed_accounts.iter().enumerate() {
|
||||||
let (is_dup, _) = is_dup(&keyed_accounts[..i], keyed_account);
|
let (is_dup, _) = is_dup(&keyed_accounts[..i], keyed_account);
|
||||||
start += 1; // is_dup
|
start += 1; // is_dup
|
||||||
if !is_dup {
|
if !is_dup {
|
||||||
start += size_of::<u8>(); // is_signer
|
if keyed_account.is_writable() || !skip_ro_deserialization {
|
||||||
start += size_of::<u8>(); // is_writable
|
start += size_of::<u8>(); // is_signer
|
||||||
start += size_of::<Pubkey>(); // pubkey
|
start += size_of::<u8>(); // is_writable
|
||||||
keyed_account.try_account_ref_mut()?.lamports =
|
start += size_of::<Pubkey>(); // key
|
||||||
LittleEndian::read_u64(&buffer[start..]);
|
keyed_account.try_account_ref_mut()?.lamports =
|
||||||
start += size_of::<u64>() // lamports
|
LittleEndian::read_u64(&buffer[start..]);
|
||||||
|
start += size_of::<u64>() // lamports
|
||||||
+ size_of::<u64>(); // data length
|
+ size_of::<u64>(); // data length
|
||||||
let end = start + keyed_account.data_len()?;
|
let end = start + keyed_account.data_len()?;
|
||||||
keyed_account
|
keyed_account
|
||||||
.try_account_ref_mut()?
|
.try_account_ref_mut()?
|
||||||
.data_as_mut_slice()
|
.data_as_mut_slice()
|
||||||
.clone_from_slice(&buffer[start..end]);
|
.clone_from_slice(&buffer[start..end]);
|
||||||
start += keyed_account.data_len()? // data
|
start += keyed_account.data_len()? // data
|
||||||
+ size_of::<Pubkey>() // owner
|
+ size_of::<Pubkey>() // owner
|
||||||
+ size_of::<u8>() // executable
|
+ size_of::<u8>() // executable
|
||||||
+ size_of::<u64>(); // rent_epoch
|
+ size_of::<u64>(); // rent_epoch
|
||||||
|
} else {
|
||||||
|
start += get_serialized_account_size_unaligned(keyed_account)?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_serialized_account_size_aligned(
|
||||||
|
keyed_account: &KeyedAccount,
|
||||||
|
) -> Result<usize, InstructionError> {
|
||||||
|
let data_len = keyed_account.data_len()?;
|
||||||
|
Ok(
|
||||||
|
size_of::<u8>() // is_signer
|
||||||
|
+ size_of::<u8>() // is_writable
|
||||||
|
+ size_of::<u8>() // executable
|
||||||
|
+ 4 // padding to 128-bit aligned
|
||||||
|
+ size_of::<Pubkey>() // key
|
||||||
|
+ size_of::<Pubkey>() // owner
|
||||||
|
+ size_of::<u64>() // lamports
|
||||||
|
+ size_of::<u64>() // data len
|
||||||
|
+ data_len
|
||||||
|
+ MAX_PERMITTED_DATA_INCREASE
|
||||||
|
+ (data_len as *const u8).align_offset(align_of::<u128>())
|
||||||
|
+ size_of::<u64>(), // rent epoch
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn serialize_parameters_aligned(
|
pub fn serialize_parameters_aligned(
|
||||||
program_id: &Pubkey,
|
program_id: &Pubkey,
|
||||||
keyed_accounts: &[KeyedAccount],
|
keyed_accounts: &[KeyedAccount],
|
||||||
|
@ -144,17 +179,11 @@ pub fn serialize_parameters_aligned(
|
||||||
let mut size = size_of::<u64>();
|
let mut size = size_of::<u64>();
|
||||||
for (i, keyed_account) in keyed_accounts.iter().enumerate() {
|
for (i, keyed_account) in keyed_accounts.iter().enumerate() {
|
||||||
let (is_dup, _) = is_dup(&keyed_accounts[..i], keyed_account);
|
let (is_dup, _) = is_dup(&keyed_accounts[..i], keyed_account);
|
||||||
size += 8; // dup, signer, writable, executable
|
size += 1; // dup
|
||||||
if !is_dup {
|
if is_dup {
|
||||||
let data_len = keyed_account.data_len()?;
|
size += 7; // padding to 64-bit aligned
|
||||||
size += size_of::<Pubkey>() // key
|
} else {
|
||||||
+ size_of::<Pubkey>() // owner
|
size += get_serialized_account_size_aligned(keyed_account)?;
|
||||||
+ size_of::<u64>() // lamports
|
|
||||||
+ size_of::<u64>() // data len
|
|
||||||
+ data_len
|
|
||||||
+ MAX_PERMITTED_DATA_INCREASE
|
|
||||||
+ (data_len as *const u8).align_offset(align_of::<u128>())
|
|
||||||
+ size_of::<u64>(); // rent epoch;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
size += size_of::<u64>() // data len
|
size += size_of::<u64>() // data len
|
||||||
|
@ -208,6 +237,7 @@ pub fn serialize_parameters_aligned(
|
||||||
pub fn deserialize_parameters_aligned(
|
pub fn deserialize_parameters_aligned(
|
||||||
keyed_accounts: &[KeyedAccount],
|
keyed_accounts: &[KeyedAccount],
|
||||||
buffer: &[u8],
|
buffer: &[u8],
|
||||||
|
skip_ro_deserialization: bool,
|
||||||
) -> Result<(), InstructionError> {
|
) -> Result<(), InstructionError> {
|
||||||
let mut start = size_of::<u64>(); // number of accounts
|
let mut start = size_of::<u64>(); // number of accounts
|
||||||
for (i, keyed_account) in keyed_accounts.iter().enumerate() {
|
for (i, keyed_account) in keyed_accounts.iter().enumerate() {
|
||||||
|
@ -215,7 +245,7 @@ pub fn deserialize_parameters_aligned(
|
||||||
start += size_of::<u8>(); // position
|
start += size_of::<u8>(); // position
|
||||||
if is_dup {
|
if is_dup {
|
||||||
start += 7; // padding to 64-bit aligned
|
start += 7; // padding to 64-bit aligned
|
||||||
} else {
|
} else if keyed_account.is_writable() || !skip_ro_deserialization {
|
||||||
let mut account = keyed_account.try_account_ref_mut()?;
|
let mut account = keyed_account.try_account_ref_mut()?;
|
||||||
start += size_of::<u8>() // is_signer
|
start += size_of::<u8>() // is_signer
|
||||||
+ size_of::<u8>() // is_writable
|
+ size_of::<u8>() // is_writable
|
||||||
|
@ -242,6 +272,8 @@ pub fn deserialize_parameters_aligned(
|
||||||
start += pre_len + MAX_PERMITTED_DATA_INCREASE; // data
|
start += pre_len + MAX_PERMITTED_DATA_INCREASE; // data
|
||||||
start += (start as *const u8).align_offset(align_of::<u128>());
|
start += (start as *const u8).align_offset(align_of::<u128>());
|
||||||
start += size_of::<u64>(); // rent_epoch
|
start += size_of::<u64>(); // rent_epoch
|
||||||
|
} else {
|
||||||
|
start += get_serialized_account_size_aligned(keyed_account)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
@ -267,11 +299,16 @@ mod tests {
|
||||||
fn test_serialize_parameters() {
|
fn test_serialize_parameters() {
|
||||||
let program_id = solana_sdk::pubkey::new_rand();
|
let program_id = solana_sdk::pubkey::new_rand();
|
||||||
let dup_key = solana_sdk::pubkey::new_rand();
|
let dup_key = solana_sdk::pubkey::new_rand();
|
||||||
|
let dup_key2 = solana_sdk::pubkey::new_rand();
|
||||||
let keys = vec![
|
let keys = vec![
|
||||||
dup_key,
|
dup_key,
|
||||||
dup_key,
|
dup_key,
|
||||||
solana_sdk::pubkey::new_rand(),
|
solana_sdk::pubkey::new_rand(),
|
||||||
solana_sdk::pubkey::new_rand(),
|
solana_sdk::pubkey::new_rand(),
|
||||||
|
dup_key2,
|
||||||
|
dup_key2,
|
||||||
|
solana_sdk::pubkey::new_rand(),
|
||||||
|
solana_sdk::pubkey::new_rand(),
|
||||||
];
|
];
|
||||||
let accounts = [
|
let accounts = [
|
||||||
RefCell::new(AccountSharedData::from(Account {
|
RefCell::new(AccountSharedData::from(Account {
|
||||||
|
@ -281,7 +318,7 @@ mod tests {
|
||||||
executable: false,
|
executable: false,
|
||||||
rent_epoch: 100,
|
rent_epoch: 100,
|
||||||
})),
|
})),
|
||||||
// dup of first
|
// dup
|
||||||
RefCell::new(AccountSharedData::from(Account {
|
RefCell::new(AccountSharedData::from(Account {
|
||||||
lamports: 1,
|
lamports: 1,
|
||||||
data: vec![1u8, 2, 3, 4, 5],
|
data: vec![1u8, 2, 3, 4, 5],
|
||||||
|
@ -303,12 +340,48 @@ mod tests {
|
||||||
executable: false,
|
executable: false,
|
||||||
rent_epoch: 3100,
|
rent_epoch: 3100,
|
||||||
})),
|
})),
|
||||||
|
RefCell::new(AccountSharedData::from(Account {
|
||||||
|
lamports: 4,
|
||||||
|
data: vec![1u8, 2, 3, 4, 5],
|
||||||
|
owner: bpf_loader::id(),
|
||||||
|
executable: false,
|
||||||
|
rent_epoch: 100,
|
||||||
|
})),
|
||||||
|
// dup
|
||||||
|
RefCell::new(AccountSharedData::from(Account {
|
||||||
|
lamports: 4,
|
||||||
|
data: vec![1u8, 2, 3, 4, 5],
|
||||||
|
owner: bpf_loader::id(),
|
||||||
|
executable: false,
|
||||||
|
rent_epoch: 100,
|
||||||
|
})),
|
||||||
|
RefCell::new(AccountSharedData::from(Account {
|
||||||
|
lamports: 5,
|
||||||
|
data: vec![11u8, 12, 13, 14, 15, 16, 17, 18, 19],
|
||||||
|
owner: bpf_loader::id(),
|
||||||
|
executable: true,
|
||||||
|
rent_epoch: 200,
|
||||||
|
})),
|
||||||
|
RefCell::new(AccountSharedData::from(Account {
|
||||||
|
lamports: 6,
|
||||||
|
data: vec![],
|
||||||
|
owner: bpf_loader::id(),
|
||||||
|
executable: false,
|
||||||
|
rent_epoch: 3100,
|
||||||
|
})),
|
||||||
];
|
];
|
||||||
|
|
||||||
let keyed_accounts: Vec<_> = keys
|
let keyed_accounts: Vec<_> = keys
|
||||||
.iter()
|
.iter()
|
||||||
.zip(&accounts)
|
.zip(&accounts)
|
||||||
.map(|(key, account)| KeyedAccount::new(&key, false, &account))
|
.enumerate()
|
||||||
|
.map(|(i, (key, account))| {
|
||||||
|
if i <= accounts.len() / 2 {
|
||||||
|
KeyedAccount::new_readonly(&key, false, &account)
|
||||||
|
} else {
|
||||||
|
KeyedAccount::new(&key, false, &account)
|
||||||
|
}
|
||||||
|
})
|
||||||
.collect();
|
.collect();
|
||||||
let instruction_data = vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
|
let instruction_data = vec![1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
|
||||||
|
|
||||||
|
@ -321,9 +394,9 @@ mod tests {
|
||||||
&instruction_data,
|
&instruction_data,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let (de_program_id, de_accounts, de_instruction_data) =
|
let (de_program_id, de_accounts, de_instruction_data) =
|
||||||
unsafe { deserialize(&mut serialized[0] as *mut u8) };
|
unsafe { deserialize(&mut serialized[0] as *mut u8) };
|
||||||
|
|
||||||
assert_eq!(&program_id, de_program_id);
|
assert_eq!(&program_id, de_program_id);
|
||||||
assert_eq!(instruction_data, de_instruction_data);
|
assert_eq!(instruction_data, de_instruction_data);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
@ -353,6 +426,35 @@ mod tests {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let de_accounts = accounts.clone();
|
||||||
|
let de_keyed_accounts: Vec<_> = keys
|
||||||
|
.iter()
|
||||||
|
.zip(&de_accounts)
|
||||||
|
.enumerate()
|
||||||
|
.map(|(i, (key, account))| {
|
||||||
|
if i <= accounts.len() / 2 {
|
||||||
|
KeyedAccount::new_readonly(&key, false, &account)
|
||||||
|
} else {
|
||||||
|
KeyedAccount::new(&key, false, &account)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
deserialize_parameters(&bpf_loader::id(), &de_keyed_accounts, &serialized, true).unwrap();
|
||||||
|
for ((account, de_keyed_account), key) in
|
||||||
|
accounts.iter().zip(de_keyed_accounts).zip(keys.clone())
|
||||||
|
{
|
||||||
|
assert_eq!(key, *de_keyed_account.unsigned_key());
|
||||||
|
let account = account.borrow();
|
||||||
|
assert_eq!(account.lamports, de_keyed_account.lamports().unwrap());
|
||||||
|
assert_eq!(
|
||||||
|
&account.data()[..],
|
||||||
|
&de_keyed_account.try_account_ref().unwrap().data[..]
|
||||||
|
);
|
||||||
|
assert_eq!(account.owner, de_keyed_account.owner().unwrap());
|
||||||
|
assert_eq!(account.executable, de_keyed_account.executable().unwrap());
|
||||||
|
assert_eq!(account.rent_epoch, de_keyed_account.rent_epoch().unwrap());
|
||||||
|
}
|
||||||
|
|
||||||
// check serialize_parameters_unaligned
|
// check serialize_parameters_unaligned
|
||||||
|
|
||||||
let mut serialized = serialize_parameters(
|
let mut serialized = serialize_parameters(
|
||||||
|
@ -362,12 +464,12 @@ mod tests {
|
||||||
&instruction_data,
|
&instruction_data,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let (de_program_id, de_accounts, de_instruction_data) =
|
let (de_program_id, de_accounts, de_instruction_data) =
|
||||||
unsafe { deserialize_unaligned(&mut serialized[0] as *mut u8) };
|
unsafe { deserialize_unaligned(&mut serialized[0] as *mut u8) };
|
||||||
|
|
||||||
assert_eq!(&program_id, de_program_id);
|
assert_eq!(&program_id, de_program_id);
|
||||||
assert_eq!(instruction_data, de_instruction_data);
|
assert_eq!(instruction_data, de_instruction_data);
|
||||||
for ((account, account_info), key) in accounts.iter().zip(de_accounts).zip(keys) {
|
for ((account, account_info), key) in accounts.iter().zip(de_accounts).zip(keys.clone()) {
|
||||||
assert_eq!(key, *account_info.key);
|
assert_eq!(key, *account_info.key);
|
||||||
let account = account.borrow();
|
let account = account.borrow();
|
||||||
assert_eq!(account.lamports, account_info.lamports());
|
assert_eq!(account.lamports, account_info.lamports());
|
||||||
|
@ -376,6 +478,41 @@ mod tests {
|
||||||
assert_eq!(account.executable, account_info.executable);
|
assert_eq!(account.executable, account_info.executable);
|
||||||
assert_eq!(account.rent_epoch, account_info.rent_epoch);
|
assert_eq!(account.rent_epoch, account_info.rent_epoch);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let de_accounts = accounts.clone();
|
||||||
|
let de_keyed_accounts: Vec<_> = keys
|
||||||
|
.iter()
|
||||||
|
.zip(&de_accounts)
|
||||||
|
.enumerate()
|
||||||
|
.map(|(i, (key, account))| {
|
||||||
|
if i < accounts.len() / 2 {
|
||||||
|
KeyedAccount::new_readonly(&key, false, &account)
|
||||||
|
} else {
|
||||||
|
KeyedAccount::new(&key, false, &account)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
deserialize_parameters(
|
||||||
|
&bpf_loader_deprecated::id(),
|
||||||
|
&de_keyed_accounts,
|
||||||
|
&serialized,
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
for ((account, de_keyed_account), key) in
|
||||||
|
accounts.iter().zip(de_keyed_accounts).zip(keys.clone())
|
||||||
|
{
|
||||||
|
assert_eq!(key, *de_keyed_account.unsigned_key());
|
||||||
|
let account = account.borrow();
|
||||||
|
assert_eq!(account.lamports, de_keyed_account.lamports().unwrap());
|
||||||
|
assert_eq!(
|
||||||
|
&account.data()[..],
|
||||||
|
&de_keyed_account.try_account_ref().unwrap().data[..]
|
||||||
|
);
|
||||||
|
assert_eq!(account.owner, de_keyed_account.owner().unwrap());
|
||||||
|
assert_eq!(account.executable, de_keyed_account.executable().unwrap());
|
||||||
|
assert_eq!(account.rent_epoch, de_keyed_account.rent_epoch().unwrap());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// the old bpf_loader in-program deserializer bpf_loader::id()
|
// the old bpf_loader in-program deserializer bpf_loader::id()
|
||||||
|
|
|
@ -107,6 +107,10 @@ pub mod cpi_share_ro_and_exec_accounts {
|
||||||
solana_sdk::declare_id!("6VgVBi3uRVqp56TtEwNou8idgdmhCD1aYqX8FaJ1fnJb");
|
solana_sdk::declare_id!("6VgVBi3uRVqp56TtEwNou8idgdmhCD1aYqX8FaJ1fnJb");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub mod skip_ro_deserialization {
|
||||||
|
solana_sdk::declare_id!("6Sw5JV84f7QkDe8gvRxpcPWFnPpfpgEnNziiy8sELaCp");
|
||||||
|
}
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
/// Map of feature identifiers to user-visible description
|
/// Map of feature identifiers to user-visible description
|
||||||
pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
|
pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
|
||||||
|
@ -134,6 +138,7 @@ lazy_static! {
|
||||||
(check_init_vote_data::id(), "check initialized Vote data"),
|
(check_init_vote_data::id(), "check initialized Vote data"),
|
||||||
(check_program_owner::id(), "limit programs to operating on accounts owned by itself"),
|
(check_program_owner::id(), "limit programs to operating on accounts owned by itself"),
|
||||||
(cpi_share_ro_and_exec_accounts::id(), "Share RO and Executable accounts during cross-program invocations"),
|
(cpi_share_ro_and_exec_accounts::id(), "Share RO and Executable accounts during cross-program invocations"),
|
||||||
|
(skip_ro_deserialization::id(), "Skip deserialization of read-only accounts"),
|
||||||
/*************** ADD NEW FEATURES HERE ***************/
|
/*************** ADD NEW FEATURES HERE ***************/
|
||||||
]
|
]
|
||||||
.iter()
|
.iter()
|
||||||
|
|
Loading…
Reference in New Issue