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

Revert "Bumps solana_rbpf to v0.2.16 (#21492)"

Browse Source 
This reverts commit f04e06e0c2.
This commit is contained in:
Trent Nelson
2021-12-13 08:48:38 -07:00
committed by Tao Zhu
parent e68cd335d5
commit c6141925a9
10 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/Cargo.toml
View File

@@ -40,7 +40,7 @@ solana-config-program = { path = "../programs/config", version = "=1.8.7" }
solana-faucet = { path = "../faucet", version = "=1.8.7" }
solana-logger = { path = "../logger", version = "=1.8.7" }
solana-net-utils = { path = "../net-utils", version = "=1.8.7" }
solana_rbpf = "=0.2.16"
solana_rbpf = "=0.2.15"
solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.7" }
solana-sdk = { path = "../sdk", version = "=1.8.7" }
solana-transaction-status = { path = "../transaction-status", version = "=1.8.7" }

7
cli/src/program.rs
View File

@@ -24,7 +24,10 @@ use {
rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType},
tpu_client::{TpuClient, TpuClientConfig},
},
solana_rbpf::{elf::Executable, verifier, vm::Config},
solana_rbpf::{
verifier,
vm::{Config, Executable},
},
solana_remote_wallet::remote_wallet::RemoteWalletManager,
solana_sdk::{
account::Account,
@@ -1986,7 +1989,7 @@ fn read_and_verify_elf(program_location: &str) -> Result<Vec<u8>, Box<dyn std::e
let mut invoke_context = MockInvokeContext::new(vec![]);
// Verify the program
Executable::<BpfError, ThisInstructionMeter>::from_elf(
<dyn Executable<BpfError, ThisInstructionMeter>>::from_elf(
&program_data,
Some(verifier::check),
Config {