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

Bumps solana_rbpf to v0.2.16 (#21492)

Browse Source
This commit is contained in:
Alexander Meißner
2021-11-30 16:26:36 +01:00
committed by GitHub
parent e960634909
commit c9aa7ed5ca
11 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/Cargo.toml
View File

@ -36,7 +36,7 @@ solana-config-program = { path = "../programs/config", version = "=1.9.0" }
solana-faucet = { path = "../faucet", version = "=1.9.0" }
solana-logger = { path = "../logger", version = "=1.9.0" }
solana-program-runtime = { path = "../program-runtime", version = "=1.9.0" }
solana_rbpf = "=0.2.15"
solana_rbpf = "=0.2.16"
solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.0" }
solana-sdk = { path = "../sdk", version = "=1.9.0" }
solana-transaction-status = { path = "../transaction-status", version = "=1.9.0" }

7
cli/src/program.rs
View File

@ -25,10 +25,7 @@ use solana_client::{
tpu_client::{TpuClient, TpuClientConfig},
};
use solana_program_runtime::invoke_context::ThisInvokeContext;
use solana_rbpf::{
verifier,
vm::{Config, Executable},
};
use solana_rbpf::{elf::Executable, verifier, vm::Config};
use solana_remote_wallet::remote_wallet::RemoteWalletManager;
use solana_sdk::{
account::Account,
@ -1997,7 +1994,7 @@ fn read_and_verify_elf(program_location: &str) -> Result<Vec<u8>, Box<dyn std::e
let mut invoke_context = ThisInvokeContext::new_mock(&[], &[]);
// Verify the program
<dyn Executable<BpfError, ThisInstructionMeter>>::from_elf(
Executable::<BpfError, ThisInstructionMeter>::from_elf(
&program_data,
Some(verifier::check),
Config {