Don't use stale executor cache (#13966)
This commit is contained in:
parent
51d8f36dae
commit
882d033233
|
@ -1984,6 +1984,20 @@ dependencies = [
|
||||||
"solana-program",
|
"solana-program",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "solana-bpf-rust-invoke-and-error"
|
||||||
|
version = "1.5.0"
|
||||||
|
dependencies = [
|
||||||
|
"solana-program",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "solana-bpf-rust-invoke-and-ok"
|
||||||
|
version = "1.5.0"
|
||||||
|
dependencies = [
|
||||||
|
"solana-program",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solana-bpf-rust-invoked"
|
name = "solana-bpf-rust-invoked"
|
||||||
version = "1.5.0"
|
version = "1.5.0"
|
||||||
|
|
|
@ -47,6 +47,8 @@ members = [
|
||||||
"rust/external_spend",
|
"rust/external_spend",
|
||||||
"rust/instruction_introspection",
|
"rust/instruction_introspection",
|
||||||
"rust/invoke",
|
"rust/invoke",
|
||||||
|
"rust/invoke_and_error",
|
||||||
|
"rust/invoke_and_ok",
|
||||||
"rust/invoked",
|
"rust/invoked",
|
||||||
"rust/iter",
|
"rust/iter",
|
||||||
"rust/many_args",
|
"rust/many_args",
|
||||||
|
|
|
@ -37,17 +37,17 @@ fn rerun_if_changed(files: &[&str], directories: &[&str], excludes: &[&str]) {
|
||||||
fn main() {
|
fn main() {
|
||||||
let bpf_c = env::var("CARGO_FEATURE_BPF_C").is_ok();
|
let bpf_c = env::var("CARGO_FEATURE_BPF_C").is_ok();
|
||||||
if bpf_c {
|
if bpf_c {
|
||||||
let install_dir =
|
let install_dir =
|
||||||
"OUT_DIR=../target/".to_string() + &env::var("PROFILE").unwrap() + &"/bpf".to_string();
|
"OUT_DIR=../target/".to_string() + &env::var("PROFILE").unwrap() + &"/bpf".to_string();
|
||||||
|
|
||||||
println!("cargo:warning=(not a warning) Building C-based BPF programs");
|
println!("cargo:warning=(not a warning) Building C-based BPF programs");
|
||||||
assert!(Command::new("make")
|
assert!(Command::new("make")
|
||||||
.current_dir("c")
|
.current_dir("c")
|
||||||
.arg("programs")
|
.arg("programs")
|
||||||
.arg(&install_dir)
|
.arg(&install_dir)
|
||||||
.status()
|
.status()
|
||||||
.expect("Failed to build C-based BPF programs")
|
.expect("Failed to build C-based BPF programs")
|
||||||
.success());
|
.success());
|
||||||
|
|
||||||
rerun_if_changed(&["c/makefile"], &["c/src", "../../sdk"], &["/target/"]);
|
rerun_if_changed(&["c/makefile"], &["c/src", "../../sdk"], &["/target/"]);
|
||||||
}
|
}
|
||||||
|
@ -70,6 +70,8 @@ fn main() {
|
||||||
"external_spend",
|
"external_spend",
|
||||||
"instruction_introspection",
|
"instruction_introspection",
|
||||||
"invoke",
|
"invoke",
|
||||||
|
"invoke_and_error",
|
||||||
|
"invoke_and_ok",
|
||||||
"invoked",
|
"invoked",
|
||||||
"iter",
|
"iter",
|
||||||
"many_args",
|
"many_args",
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
[package]
|
||||||
|
name = "solana-bpf-rust-invoke-and-error"
|
||||||
|
version = "1.5.0"
|
||||||
|
description = "Solana BPF test program written in Rust"
|
||||||
|
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||||
|
repository = "https://github.com/solana-labs/solana"
|
||||||
|
license = "Apache-2.0"
|
||||||
|
homepage = "https://solana.com/"
|
||||||
|
edition = "2018"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
crate-type = ["cdylib"]
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
targets = ["x86_64-unknown-linux-gnu"]
|
|
@ -0,0 +1,2 @@
|
||||||
|
[target.bpfel-unknown-unknown.dependencies.std]
|
||||||
|
features = []
|
|
@ -0,0 +1,32 @@
|
||||||
|
//! @brief Invokes an instruction and returns an error, the instruction invoked
|
||||||
|
//! uses the instruction data provided and all the accounts
|
||||||
|
|
||||||
|
use solana_program::{
|
||||||
|
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, instruction::AccountMeta,
|
||||||
|
instruction::Instruction, program::invoke, pubkey::Pubkey,
|
||||||
|
};
|
||||||
|
|
||||||
|
entrypoint!(process_instruction);
|
||||||
|
fn process_instruction(
|
||||||
|
_program_id: &Pubkey,
|
||||||
|
accounts: &[AccountInfo],
|
||||||
|
instruction_data: &[u8],
|
||||||
|
) -> ProgramResult {
|
||||||
|
let to_call = accounts[0].key;
|
||||||
|
let infos = accounts;
|
||||||
|
let instruction = Instruction {
|
||||||
|
accounts: accounts[1..]
|
||||||
|
.iter()
|
||||||
|
.map(|acc| AccountMeta {
|
||||||
|
pubkey: *acc.key,
|
||||||
|
is_signer: acc.is_signer,
|
||||||
|
is_writable: acc.is_writable,
|
||||||
|
})
|
||||||
|
.collect(),
|
||||||
|
data: instruction_data.to_owned(),
|
||||||
|
program_id: *to_call,
|
||||||
|
};
|
||||||
|
let _ = invoke(&instruction, &infos);
|
||||||
|
|
||||||
|
Err(42.into())
|
||||||
|
}
|
|
@ -0,0 +1,18 @@
|
||||||
|
[package]
|
||||||
|
name = "solana-bpf-rust-invoke-and-ok"
|
||||||
|
version = "1.5.0"
|
||||||
|
description = "Solana BPF test program written in Rust"
|
||||||
|
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
|
||||||
|
repository = "https://github.com/solana-labs/solana"
|
||||||
|
license = "Apache-2.0"
|
||||||
|
homepage = "https://solana.com/"
|
||||||
|
edition = "2018"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
crate-type = ["cdylib"]
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
targets = ["x86_64-unknown-linux-gnu"]
|
|
@ -0,0 +1,2 @@
|
||||||
|
[target.bpfel-unknown-unknown.dependencies.std]
|
||||||
|
features = []
|
|
@ -0,0 +1,32 @@
|
||||||
|
//! @brief Invokes an instruction and returns an error, the instruction invoked
|
||||||
|
//! uses the instruction data provided and all the accounts
|
||||||
|
|
||||||
|
use solana_program::{
|
||||||
|
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, instruction::AccountMeta,
|
||||||
|
instruction::Instruction, program::invoke, pubkey::Pubkey,
|
||||||
|
};
|
||||||
|
|
||||||
|
entrypoint!(process_instruction);
|
||||||
|
fn process_instruction(
|
||||||
|
_program_id: &Pubkey,
|
||||||
|
accounts: &[AccountInfo],
|
||||||
|
instruction_data: &[u8],
|
||||||
|
) -> ProgramResult {
|
||||||
|
let to_call = accounts[0].key;
|
||||||
|
let infos = accounts;
|
||||||
|
let instruction = Instruction {
|
||||||
|
accounts: accounts[1..]
|
||||||
|
.iter()
|
||||||
|
.map(|acc| AccountMeta {
|
||||||
|
pubkey: *acc.key,
|
||||||
|
is_signer: acc.is_signer,
|
||||||
|
is_writable: acc.is_writable,
|
||||||
|
})
|
||||||
|
.collect(),
|
||||||
|
data: instruction_data.to_owned(),
|
||||||
|
program_id: *to_call,
|
||||||
|
};
|
||||||
|
let _ = invoke(&instruction, &infos);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
|
@ -24,10 +24,12 @@ use solana_sdk::{
|
||||||
entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS},
|
entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS},
|
||||||
instruction::{AccountMeta, CompiledInstruction, Instruction, InstructionError},
|
instruction::{AccountMeta, CompiledInstruction, Instruction, InstructionError},
|
||||||
keyed_account::KeyedAccount,
|
keyed_account::KeyedAccount,
|
||||||
|
loader_instruction,
|
||||||
message::Message,
|
message::Message,
|
||||||
process_instruction::{BpfComputeBudget, InvokeContext, MockInvokeContext},
|
process_instruction::{BpfComputeBudget, InvokeContext, MockInvokeContext},
|
||||||
pubkey::Pubkey,
|
pubkey::Pubkey,
|
||||||
signature::{Keypair, Signer},
|
signature::{Keypair, Signer},
|
||||||
|
system_instruction,
|
||||||
sysvar::{clock, fees, rent, slot_hashes, stake_history},
|
sysvar::{clock, fees, rent, slot_hashes, stake_history},
|
||||||
transaction::{Transaction, TransactionError},
|
transaction::{Transaction, TransactionError},
|
||||||
};
|
};
|
||||||
|
@ -54,13 +56,41 @@ fn load_bpf_program(
|
||||||
payer_keypair: &Keypair,
|
payer_keypair: &Keypair,
|
||||||
name: &str,
|
name: &str,
|
||||||
) -> Pubkey {
|
) -> Pubkey {
|
||||||
|
let elf = read_bpf_program(name);
|
||||||
|
load_program(bank_client, payer_keypair, loader_id, elf)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_bpf_program(name: &str) -> Vec<u8> {
|
||||||
let path = create_bpf_path(name);
|
let path = create_bpf_path(name);
|
||||||
let mut file = File::open(&path).unwrap_or_else(|err| {
|
let mut file = File::open(&path).unwrap_or_else(|err| {
|
||||||
panic!("Failed to open {}: {}", path.display(), err);
|
panic!("Failed to open {}: {}", path.display(), err);
|
||||||
});
|
});
|
||||||
let mut elf = Vec::new();
|
let mut elf = Vec::new();
|
||||||
file.read_to_end(&mut elf).unwrap();
|
file.read_to_end(&mut elf).unwrap();
|
||||||
load_program(bank_client, payer_keypair, loader_id, elf)
|
|
||||||
|
elf
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_bpf_program(
|
||||||
|
bank_client: &BankClient,
|
||||||
|
loader_id: &Pubkey,
|
||||||
|
payer_keypair: &Keypair,
|
||||||
|
program_keypair: &Keypair,
|
||||||
|
elf: &[u8],
|
||||||
|
) {
|
||||||
|
let chunk_size = 256; // Size of chunk just needs to fit into tx
|
||||||
|
let mut offset = 0;
|
||||||
|
for chunk in elf.chunks(chunk_size) {
|
||||||
|
let instruction =
|
||||||
|
loader_instruction::write(&program_keypair.pubkey(), loader_id, offset, chunk.to_vec());
|
||||||
|
let message = Message::new(&[instruction], Some(&payer_keypair.pubkey()));
|
||||||
|
|
||||||
|
bank_client
|
||||||
|
.send_and_confirm_message(&[payer_keypair, &program_keypair], message)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
offset += chunk_size as u32;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run_program(
|
fn run_program(
|
||||||
|
@ -931,7 +961,6 @@ fn test_program_bpf_ro_modify() {
|
||||||
let instruction = Instruction::new(program_pubkey, &[1_u8], account_metas.clone());
|
let instruction = Instruction::new(program_pubkey, &[1_u8], account_metas.clone());
|
||||||
let message = Message::new(&[instruction], Some(&mint_keypair.pubkey()));
|
let message = Message::new(&[instruction], Some(&mint_keypair.pubkey()));
|
||||||
let result = bank_client.send_and_confirm_message(&[&mint_keypair, &test_keypair], message);
|
let result = bank_client.send_and_confirm_message(&[&mint_keypair, &test_keypair], message);
|
||||||
println!("result {:?}", result);
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
result.unwrap_err().unwrap(),
|
result.unwrap_err().unwrap(),
|
||||||
TransactionError::InstructionError(0, InstructionError::Custom(0xb9f0002))
|
TransactionError::InstructionError(0, InstructionError::Custom(0xb9f0002))
|
||||||
|
@ -940,7 +969,6 @@ fn test_program_bpf_ro_modify() {
|
||||||
let instruction = Instruction::new(program_pubkey, &[3_u8], account_metas.clone());
|
let instruction = Instruction::new(program_pubkey, &[3_u8], account_metas.clone());
|
||||||
let message = Message::new(&[instruction], Some(&mint_keypair.pubkey()));
|
let message = Message::new(&[instruction], Some(&mint_keypair.pubkey()));
|
||||||
let result = bank_client.send_and_confirm_message(&[&mint_keypair, &test_keypair], message);
|
let result = bank_client.send_and_confirm_message(&[&mint_keypair, &test_keypair], message);
|
||||||
println!("result {:?}", result);
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
result.unwrap_err().unwrap(),
|
result.unwrap_err().unwrap(),
|
||||||
TransactionError::InstructionError(0, InstructionError::Custom(0xb9f0002))
|
TransactionError::InstructionError(0, InstructionError::Custom(0xb9f0002))
|
||||||
|
@ -1107,3 +1135,215 @@ fn test_program_bpf_instruction_introspection() {
|
||||||
.get_account(&solana_sdk::sysvar::instructions::id())
|
.get_account(&solana_sdk::sysvar::instructions::id())
|
||||||
.is_none());
|
.is_none());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "bpf_rust")]
|
||||||
|
#[test]
|
||||||
|
fn test_program_bpf_test_use_latest_executor() {
|
||||||
|
solana_logger::setup();
|
||||||
|
|
||||||
|
let GenesisConfigInfo {
|
||||||
|
genesis_config,
|
||||||
|
mint_keypair,
|
||||||
|
..
|
||||||
|
} = create_genesis_config(50);
|
||||||
|
let mut bank = Bank::new(&genesis_config);
|
||||||
|
let (name, id, entrypoint) = solana_bpf_loader_program!();
|
||||||
|
bank.add_builtin(&name, id, entrypoint);
|
||||||
|
let bank_client = BankClient::new(bank);
|
||||||
|
let panic_id = load_bpf_program(
|
||||||
|
&bank_client,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
&mint_keypair,
|
||||||
|
"solana_bpf_rust_panic",
|
||||||
|
);
|
||||||
|
|
||||||
|
let program_keypair = Keypair::new();
|
||||||
|
|
||||||
|
// Write the panic program into the program account
|
||||||
|
let elf = read_bpf_program("solana_bpf_rust_panic");
|
||||||
|
let message = Message::new(
|
||||||
|
&[system_instruction::create_account(
|
||||||
|
&mint_keypair.pubkey(),
|
||||||
|
&program_keypair.pubkey(),
|
||||||
|
1,
|
||||||
|
elf.len() as u64 * 2,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
)],
|
||||||
|
Some(&mint_keypair.pubkey()),
|
||||||
|
);
|
||||||
|
assert!(bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair, &program_keypair], message)
|
||||||
|
.is_ok());
|
||||||
|
write_bpf_program(
|
||||||
|
&bank_client,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
&mint_keypair,
|
||||||
|
&program_keypair,
|
||||||
|
&elf,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Finalize the panic program, but fail the tx
|
||||||
|
let message = Message::new(
|
||||||
|
&[
|
||||||
|
loader_instruction::finalize(&program_keypair.pubkey(), &bpf_loader::id()),
|
||||||
|
Instruction::new(panic_id, &0u8, vec![]),
|
||||||
|
],
|
||||||
|
Some(&mint_keypair.pubkey()),
|
||||||
|
);
|
||||||
|
assert!(bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair, &program_keypair], message)
|
||||||
|
.is_err());
|
||||||
|
|
||||||
|
// Write the noop program into the same program account
|
||||||
|
let elf = read_bpf_program("solana_bpf_rust_noop");
|
||||||
|
write_bpf_program(
|
||||||
|
&bank_client,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
&mint_keypair,
|
||||||
|
&program_keypair,
|
||||||
|
&elf,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Finalize the noop program
|
||||||
|
let message = Message::new(
|
||||||
|
&[loader_instruction::finalize(
|
||||||
|
&program_keypair.pubkey(),
|
||||||
|
&bpf_loader::id(),
|
||||||
|
)],
|
||||||
|
Some(&mint_keypair.pubkey()),
|
||||||
|
);
|
||||||
|
assert!(bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair, &program_keypair], message)
|
||||||
|
.is_ok());
|
||||||
|
|
||||||
|
// Call the noop program, should get noop not panic
|
||||||
|
let message = Message::new(
|
||||||
|
&[Instruction::new(program_keypair.pubkey(), &0u8, vec![])],
|
||||||
|
Some(&mint_keypair.pubkey()),
|
||||||
|
);
|
||||||
|
assert!(bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair], message)
|
||||||
|
.is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "bpf_rust")]
|
||||||
|
#[test]
|
||||||
|
fn test_program_bpf_test_use_latest_executor2() {
|
||||||
|
solana_logger::setup();
|
||||||
|
|
||||||
|
let GenesisConfigInfo {
|
||||||
|
genesis_config,
|
||||||
|
mint_keypair,
|
||||||
|
..
|
||||||
|
} = create_genesis_config(50);
|
||||||
|
let mut bank = Bank::new(&genesis_config);
|
||||||
|
let (name, id, entrypoint) = solana_bpf_loader_program!();
|
||||||
|
bank.add_builtin(&name, id, entrypoint);
|
||||||
|
let bank_client = BankClient::new(bank);
|
||||||
|
let invoke_and_error = load_bpf_program(
|
||||||
|
&bank_client,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
&mint_keypair,
|
||||||
|
"solana_bpf_rust_invoke_and_error",
|
||||||
|
);
|
||||||
|
let invoke_and_ok = load_bpf_program(
|
||||||
|
&bank_client,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
&mint_keypair,
|
||||||
|
"solana_bpf_rust_invoke_and_ok",
|
||||||
|
);
|
||||||
|
|
||||||
|
let program_keypair = Keypair::new();
|
||||||
|
|
||||||
|
// Write the panic program into the program account
|
||||||
|
let elf = read_bpf_program("solana_bpf_rust_panic");
|
||||||
|
let message = Message::new(
|
||||||
|
&[system_instruction::create_account(
|
||||||
|
&mint_keypair.pubkey(),
|
||||||
|
&program_keypair.pubkey(),
|
||||||
|
1,
|
||||||
|
elf.len() as u64 * 2,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
)],
|
||||||
|
Some(&mint_keypair.pubkey()),
|
||||||
|
);
|
||||||
|
assert!(bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair, &program_keypair], message)
|
||||||
|
.is_ok());
|
||||||
|
write_bpf_program(
|
||||||
|
&bank_client,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
&mint_keypair,
|
||||||
|
&program_keypair,
|
||||||
|
&elf,
|
||||||
|
);
|
||||||
|
|
||||||
|
// - invoke finalize and return error, swallow error
|
||||||
|
let mut instruction =
|
||||||
|
loader_instruction::finalize(&program_keypair.pubkey(), &bpf_loader::id());
|
||||||
|
instruction.accounts.insert(
|
||||||
|
0,
|
||||||
|
AccountMeta {
|
||||||
|
is_signer: false,
|
||||||
|
is_writable: false,
|
||||||
|
pubkey: instruction.program_id,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
instruction.program_id = invoke_and_ok;
|
||||||
|
instruction.accounts.insert(
|
||||||
|
0,
|
||||||
|
AccountMeta {
|
||||||
|
is_signer: false,
|
||||||
|
is_writable: false,
|
||||||
|
pubkey: invoke_and_error,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let message = Message::new(&[instruction], Some(&mint_keypair.pubkey()));
|
||||||
|
assert!(bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair, &program_keypair], message)
|
||||||
|
.is_ok());
|
||||||
|
|
||||||
|
// invoke program, verify not found
|
||||||
|
let message = Message::new(
|
||||||
|
&[Instruction::new(program_keypair.pubkey(), &0u8, vec![])],
|
||||||
|
Some(&mint_keypair.pubkey()),
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair], message)
|
||||||
|
.unwrap_err()
|
||||||
|
.unwrap(),
|
||||||
|
TransactionError::InvalidProgramForExecution
|
||||||
|
);
|
||||||
|
|
||||||
|
// Write the noop program into the same program account
|
||||||
|
let elf = read_bpf_program("solana_bpf_rust_noop");
|
||||||
|
write_bpf_program(
|
||||||
|
&bank_client,
|
||||||
|
&bpf_loader::id(),
|
||||||
|
&mint_keypair,
|
||||||
|
&program_keypair,
|
||||||
|
&elf,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Finalize the noop program
|
||||||
|
let message = Message::new(
|
||||||
|
&[loader_instruction::finalize(
|
||||||
|
&program_keypair.pubkey(),
|
||||||
|
&bpf_loader::id(),
|
||||||
|
)],
|
||||||
|
Some(&mint_keypair.pubkey()),
|
||||||
|
);
|
||||||
|
assert!(bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair, &program_keypair], message)
|
||||||
|
.is_ok());
|
||||||
|
|
||||||
|
// Call the program, should get noop, not panic
|
||||||
|
let message = Message::new(
|
||||||
|
&[Instruction::new(program_keypair.pubkey(), &0u8, vec![])],
|
||||||
|
Some(&mint_keypair.pubkey()),
|
||||||
|
);
|
||||||
|
assert!(bank_client
|
||||||
|
.send_and_confirm_message(&[&mint_keypair], message)
|
||||||
|
.is_ok());
|
||||||
|
}
|
||||||
|
|
|
@ -273,25 +273,23 @@ impl CachedExecutors {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
fn put(&mut self, pubkey: &Pubkey, executor: Arc<dyn Executor>) {
|
fn put(&mut self, pubkey: &Pubkey, executor: Arc<dyn Executor>) {
|
||||||
if !self.executors.contains_key(pubkey) {
|
if !self.executors.contains_key(pubkey) && self.executors.len() >= self.max {
|
||||||
if self.executors.len() >= self.max {
|
let mut least = u64::MAX;
|
||||||
let mut least = u64::MAX;
|
let default_key = Pubkey::default();
|
||||||
let default_key = Pubkey::default();
|
let mut least_key = &default_key;
|
||||||
let mut least_key = &default_key;
|
for (key, (count, _)) in self.executors.iter() {
|
||||||
for (key, (count, _)) in self.executors.iter() {
|
let count = count.load(Relaxed);
|
||||||
let count = count.load(Relaxed);
|
if count < least {
|
||||||
if count < least {
|
least = count;
|
||||||
least = count;
|
least_key = key;
|
||||||
least_key = key;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
let least_key = *least_key;
|
|
||||||
let _ = self.executors.remove(&least_key);
|
|
||||||
}
|
}
|
||||||
let _ = self
|
let least_key = *least_key;
|
||||||
.executors
|
let _ = self.executors.remove(&least_key);
|
||||||
.insert(*pubkey, (AtomicU64::new(0), executor));
|
|
||||||
}
|
}
|
||||||
|
let _ = self
|
||||||
|
.executors
|
||||||
|
.insert(*pubkey, (AtomicU64::new(0), executor));
|
||||||
}
|
}
|
||||||
fn remove(&mut self, pubkey: &Pubkey) {
|
fn remove(&mut self, pubkey: &Pubkey) {
|
||||||
let _ = self.executors.remove(pubkey);
|
let _ = self.executors.remove(pubkey);
|
||||||
|
@ -2786,7 +2784,9 @@ impl Bank {
|
||||||
loader_refcells,
|
loader_refcells,
|
||||||
);
|
);
|
||||||
|
|
||||||
self.update_executors(executors);
|
if process_result.is_ok() {
|
||||||
|
self.update_executors(executors);
|
||||||
|
}
|
||||||
|
|
||||||
let nonce_rollback =
|
let nonce_rollback =
|
||||||
if let Err(TransactionError::InstructionError(_, _)) = &process_result {
|
if let Err(TransactionError::InstructionError(_, _)) = &process_result {
|
||||||
|
|
Loading…
Reference in New Issue