gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bail on all CPI errors (bp #14500) (#14506)

Browse Source 
* Bail on all CPI errors (#14500)

* Bail on all CPI errors

* whitespace

(cherry picked from commit ec48631fc5)

* resolve conflicts

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2021-01-10 06:27:27 +00:00
committed by GitHub
parent ac86d6ede4
commit 667402531f
9 changed files with 132 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
programs/bpf/rust/invoked/src/processor.rs
View File

@@ -27,7 +27,7 @@ fn process_instruction(
}
match instruction_data[0] {
TEST_VERIFY_TRANSLATIONS => {
VERIFY_TRANSLATIONS => {
msg!("verify data translations");
const ARGUMENT_INDEX: usize = 0;
@@ -105,11 +105,15 @@ fn process_instruction(
msg!(data[0], 0, 0, 0, 0);
}
}
TEST_RETURN_ERROR => {
RETURN_OK => {
msg!("Ok");
return Ok(());
}
RETURN_ERROR => {
msg!("return error");
return Err(ProgramError::Custom(42));
}
TEST_DERIVED_SIGNERS => {
DERIVED_SIGNERS => {
msg!("verify derived signers");
const INVOKED_PROGRAM_INDEX: usize = 0;
const DERIVED_KEY1_INDEX: usize = 1;
@@ -129,7 +133,7 @@ fn process_instruction(
(accounts[DERIVED_KEY2_INDEX].key, true, true),
(accounts[DERIVED_KEY3_INDEX].key, false, true),
],
vec![TEST_VERIFY_NESTED_SIGNERS],
vec![VERIFY_NESTED_SIGNERS],
);
invoke_signed(
&invoked_instruction,
@@ -140,7 +144,7 @@ fn process_instruction(
],
)?;
}
TEST_VERIFY_NESTED_SIGNERS => {
VERIFY_NESTED_SIGNERS => {
msg!("verify nested derived signers");
const DERIVED_KEY1_INDEX: usize = 0;
const DERIVED_KEY2_INDEX: usize = 1;
@@ -150,16 +154,16 @@ fn process_instruction(
assert!(accounts[DERIVED_KEY2_INDEX].is_signer);
assert!(accounts[DERIVED_KEY3_INDEX].is_signer);
}
TEST_VERIFY_WRITER => {
VERIFY_WRITER => {
msg!("verify writable");
const ARGUMENT_INDEX: usize = 0;
assert!(!accounts[ARGUMENT_INDEX].is_writable);
}
TEST_VERIFY_PRIVILEGE_ESCALATION => {
VERIFY_PRIVILEGE_ESCALATION => {
msg!("Success");
}
TEST_NESTED_INVOKE => {
NESTED_INVOKE => {
msg!("nested invoke");
const ARGUMENT_INDEX: usize = 0;
@@ -178,7 +182,7 @@ fn process_instruction(
(accounts[ARGUMENT_INDEX].key, true, true),
(accounts[INVOKED_ARGUMENT_INDEX].key, true, true),
],
vec![TEST_NESTED_INVOKE],
vec![NESTED_INVOKE],
);
invoke(&invoked_instruction, accounts)?;
} else {