Revert "Bump solana_rbpf to version 0.2.12 (#17585)"
This reverts commit 231a3bda8e
.
This commit is contained in:
@@ -10,7 +10,7 @@ use {
|
||||
clap::{App, AppSettings, Arg, ArgMatches, SubCommand},
|
||||
log::*,
|
||||
solana_account_decoder::{UiAccountEncoding, UiDataSliceConfig},
|
||||
solana_bpf_loader_program::{BpfError, ThisInstructionMeter},
|
||||
solana_bpf_loader_program::{bpf_verifier, BpfError, ThisInstructionMeter},
|
||||
solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*},
|
||||
solana_cli_output::{
|
||||
CliProgram, CliProgramAccountType, CliProgramAuthority, CliProgramBuffer, CliProgramId,
|
||||
@@ -24,10 +24,7 @@ use {
|
||||
rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType},
|
||||
tpu_client::{TpuClient, TpuClientConfig},
|
||||
},
|
||||
solana_rbpf::{
|
||||
verifier,
|
||||
vm::{Config, Executable},
|
||||
},
|
||||
solana_rbpf::vm::{Config, Executable},
|
||||
solana_remote_wallet::remote_wallet::RemoteWalletManager,
|
||||
solana_sdk::{
|
||||
account::Account,
|
||||
@@ -1989,7 +1986,7 @@ fn read_and_verify_elf(program_location: &str) -> Result<Vec<u8>, Box<dyn std::e
|
||||
// Verify the program
|
||||
<dyn Executable<BpfError, ThisInstructionMeter>>::from_elf(
|
||||
&program_data,
|
||||
Some(|x| verifier::check(x)),
|
||||
Some(|x| bpf_verifier::check(x)),
|
||||
Config::default(),
|
||||
)
|
||||
.map_err(|err| format!("ELF error: {}", err))?;
|
||||
|
Reference in New Issue
Block a user