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

Ryos compat fixes 1.3 (#12762)

Browse Source 
* Fix various ledger-tool error due to no builtins

* Add missing file...

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
This commit is contained in:
Trent Nelson
2020-10-09 11:49:15 -06:00
committed by GitHub
parent fea6e4d39d
commit 41b99b96c0
12 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -3708,7 +3708,6 @@ dependencies = [
"serial_test_derive", "serial_test_derive",
"solana-account-decoder", "solana-account-decoder",
"solana-banks-server", "solana-banks-server",
"solana-bpf-loader-program",
"solana-budget-program", "solana-budget-program",
"solana-clap-utils", "solana-clap-utils",
"solana-client", "solana-client",
@ -3985,6 +3984,7 @@ dependencies = [
"serde", "serde",
"serde_bytes", "serde_bytes",
"sha2", "sha2",
"solana-bpf-loader-program",
"solana-budget-program", "solana-budget-program",
"solana-logger 1.3.16", "solana-logger 1.3.16",
"solana-measure", "solana-measure",

1
core/Cargo.toml
View File

@ -46,7 +46,6 @@ serde_derive = "1.0.103"
serde_json = "1.0.56" serde_json = "1.0.56"
solana-account-decoder = { path = "../account-decoder", version = "1.3.16" } solana-account-decoder = { path = "../account-decoder", version = "1.3.16" }
solana-banks-server = { path = "../banks-server", version = "1.3.16" } solana-banks-server = { path = "../banks-server", version = "1.3.16" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.3.16" }
solana-budget-program = { path = "../programs/budget", version = "1.3.16" } solana-budget-program = { path = "../programs/budget", version = "1.3.16" }
solana-clap-utils = { path = "../clap-utils", version = "1.3.16" } solana-clap-utils = { path = "../clap-utils", version = "1.3.16" }
solana-client = { path = "../client", version = "1.3.16" } solana-client = { path = "../client", version = "1.3.16" }

4
core/src/lib.rs
View File

@ -6,15 +6,11 @@
//! command-line tools to spin up validators and a Rust library //! command-line tools to spin up validators and a Rust library
//! //!
#[macro_use]
extern crate solana_bpf_loader_program;
pub mod accounts_background_service; pub mod accounts_background_service;
pub mod accounts_hash_verifier; pub mod accounts_hash_verifier;
pub mod banking_stage; pub mod banking_stage;
pub mod bigtable_upload_service; pub mod bigtable_upload_service;
pub mod broadcast_stage; pub mod broadcast_stage;
mod builtins;
pub mod cache_block_time_service; pub mod cache_block_time_service;
pub mod cluster_info_vote_listener; pub mod cluster_info_vote_listener;
pub mod commitment_service; pub mod commitment_service;

2
core/src/validator.rs
View File

@ -2,7 +2,6 @@
use crate::{ use crate::{
broadcast_stage::BroadcastStageType, broadcast_stage::BroadcastStageType,
builtins,
cache_block_time_service::{CacheBlockTimeSender, CacheBlockTimeService}, cache_block_time_service::{CacheBlockTimeSender, CacheBlockTimeService},
cluster_info::{ClusterInfo, Node}, cluster_info::{ClusterInfo, Node},
cluster_info_vote_listener::VoteTracker, cluster_info_vote_listener::VoteTracker,
@ -742,7 +741,6 @@ fn new_banks_from_ledger(
new_hard_forks: config.new_hard_forks.clone(), new_hard_forks: config.new_hard_forks.clone(),
frozen_accounts: config.frozen_accounts.clone(), frozen_accounts: config.frozen_accounts.clone(),
debug_keys: config.debug_keys.clone(), debug_keys: config.debug_keys.clone(),
additional_builtins: Some(builtins::get(genesis_config.cluster_type)),
..blockstore_processor::ProcessOptions::default() ..blockstore_processor::ProcessOptions::default()
}; };

2
explorer/wasm/Cargo.lock generated
View File

@ -98,7 +98,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-sdk-wasm" name = "solana-sdk-wasm"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bincode", "bincode",
"bs58", "bs58",

1
ledger/Cargo.toml
View File

@ -31,6 +31,7 @@ reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] }
serde = "1.0.112" serde = "1.0.112"
serde_bytes = "0.11.4" serde_bytes = "0.11.4"
sha2 = "0.8.2" sha2 = "0.8.2"
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.3.16" }
solana-transaction-status = { path = "../transaction-status", version = "1.3.16" } solana-transaction-status = { path = "../transaction-status", version = "1.3.16" }
solana-logger = { path = "../logger", version = "1.3.16" } solana-logger = { path = "../logger", version = "1.3.16" }
solana-measure = { path = "../measure", version = "1.3.16" } solana-measure = { path = "../measure", version = "1.3.16" }

2
ledger/src/bank_forks_utils.rs
View File

@ -66,7 +66,7 @@ pub fn load(
compression, compression,
genesis_config, genesis_config,
process_options.debug_keys.clone(), process_options.debug_keys.clone(),
process_options.additional_builtins.as_ref(), Some(&crate::builtins::get(genesis_config.cluster_type)),
) )
.expect("Load from snapshot failed"); .expect("Load from snapshot failed");

5
ledger/src/blockstore_processor.rs
View File

@ -16,7 +16,7 @@ use solana_metrics::{datapoint_error, inc_new_counter_debug};
use solana_rayon_threadlimit::get_thread_count; use solana_rayon_threadlimit::get_thread_count;
use solana_runtime::{ use solana_runtime::{
bank::{ bank::{
Bank, Builtins, InnerInstructionsList, TransactionBalancesSet, TransactionProcessResult, Bank, InnerInstructionsList, TransactionBalancesSet, TransactionProcessResult,
TransactionResults, TransactionResults,
}, },
bank_forks::BankForks, bank_forks::BankForks,
@ -318,7 +318,6 @@ pub struct ProcessOptions {
pub new_hard_forks: Option<Vec<Slot>>, pub new_hard_forks: Option<Vec<Slot>>,
pub frozen_accounts: Vec<Pubkey>, pub frozen_accounts: Vec<Pubkey>,
pub debug_keys: Option<Arc<HashSet<Pubkey>>>, pub debug_keys: Option<Arc<HashSet<Pubkey>>>,
pub additional_builtins: Option<Builtins>,
} }
pub fn process_blockstore( pub fn process_blockstore(
@ -342,7 +341,7 @@ pub fn process_blockstore(
account_paths, account_paths,
&opts.frozen_accounts, &opts.frozen_accounts,
opts.debug_keys.clone(), opts.debug_keys.clone(),
opts.additional_builtins.as_ref(), Some(&crate::builtins::get(genesis_config.cluster_type)),
); );
let bank0 = Arc::new(bank0); let bank0 = Arc::new(bank0);
info!("processing ledger for slot 0..."); info!("processing ledger for slot 0...");

0
core/src/builtins.rs → ledger/src/builtins.rs
View File

4
ledger/src/lib.rs
View File

@ -1,3 +1,6 @@
#[macro_use]
extern crate solana_bpf_loader_program;
pub mod bank_forks_utils; pub mod bank_forks_utils;
pub mod bigtable_upload; pub mod bigtable_upload;
pub mod block_error; pub mod block_error;
@ -7,6 +10,7 @@ pub mod ancestor_iterator;
pub mod blockstore_db; pub mod blockstore_db;
pub mod blockstore_meta; pub mod blockstore_meta;
pub mod blockstore_processor; pub mod blockstore_processor;
pub mod builtins;
pub mod entry; pub mod entry;
pub mod erasure; pub mod erasure;
pub mod genesis_utils; pub mod genesis_utils;

70
programs/bpf/Cargo.lock generated
View File

@ -1734,7 +1734,7 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
[[package]] [[package]]
name = "solana-bpf-loader-program" name = "solana-bpf-loader-program"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bincode", "bincode",
"byteorder 1.3.4", "byteorder 1.3.4",
@ -1748,7 +1748,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-bpf-programs" name = "solana-bpf-programs"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bincode", "bincode",
"byteorder 1.3.4", "byteorder 1.3.4",
@ -1764,7 +1764,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-bpf-rust-128bit" name = "solana-bpf-rust-128bit"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-bpf-rust-128bit-dep", "solana-bpf-rust-128bit-dep",
"solana-sdk", "solana-sdk",
@ -1772,21 +1772,21 @@ dependencies = [
[[package]] [[package]]
name = "solana-bpf-rust-128bit-dep" name = "solana-bpf-rust-128bit-dep"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-alloc" name = "solana-bpf-rust-alloc"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-dep-crate" name = "solana-bpf-rust-dep-crate"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"byteorder 1.3.4", "byteorder 1.3.4",
"solana-sdk", "solana-sdk",
@ -1794,21 +1794,21 @@ dependencies = [
[[package]] [[package]]
name = "solana-bpf-rust-deprecated_loader" name = "solana-bpf-rust-deprecated_loader"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-dup-accounts" name = "solana-bpf-rust-dup-accounts"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-error-handling" name = "solana-bpf-rust-error-handling"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"num-derive 0.2.5", "num-derive 0.2.5",
"num-traits", "num-traits",
@ -1818,21 +1818,21 @@ dependencies = [
[[package]] [[package]]
name = "solana-bpf-rust-external-spend" name = "solana-bpf-rust-external-spend"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-instruction-introspection" name = "solana-bpf-rust-instruction-introspection"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-invoke" name = "solana-bpf-rust-invoke"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-bpf-rust-invoked", "solana-bpf-rust-invoked",
"solana-sdk", "solana-sdk",
@ -1840,21 +1840,21 @@ dependencies = [
[[package]] [[package]]
name = "solana-bpf-rust-invoked" name = "solana-bpf-rust-invoked"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-iter" name = "solana-bpf-rust-iter"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-many-args" name = "solana-bpf-rust-many-args"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-bpf-rust-many-args-dep", "solana-bpf-rust-many-args-dep",
"solana-sdk", "solana-sdk",
@ -1862,28 +1862,28 @@ dependencies = [
[[package]] [[package]]
name = "solana-bpf-rust-many-args-dep" name = "solana-bpf-rust-many-args-dep"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-noop" name = "solana-bpf-rust-noop"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-panic" name = "solana-bpf-rust-panic"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-param-passing" name = "solana-bpf-rust-param-passing"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-bpf-rust-param-passing-dep", "solana-bpf-rust-param-passing-dep",
"solana-sdk", "solana-sdk",
@ -1891,28 +1891,28 @@ dependencies = [
[[package]] [[package]]
name = "solana-bpf-rust-param-passing-dep" name = "solana-bpf-rust-param-passing-dep"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-sanity" name = "solana-bpf-rust-sanity"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-bpf-rust-sysval" name = "solana-bpf-rust-sysval"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"solana-sdk", "solana-sdk",
] ]
[[package]] [[package]]
name = "solana-config-program" name = "solana-config-program"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bincode", "bincode",
"chrono", "chrono",
@ -1924,7 +1924,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-crate-features" name = "solana-crate-features"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes 0.4.12", "bytes 0.4.12",
@ -1947,7 +1947,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-logger" name = "solana-logger"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"env_logger", "env_logger",
"lazy_static", "lazy_static",
@ -1956,7 +1956,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-measure" name = "solana-measure"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"jemalloc-ctl", "jemalloc-ctl",
"jemallocator", "jemallocator",
@ -1967,7 +1967,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-metrics" name = "solana-metrics"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"env_logger", "env_logger",
"gethostname", "gethostname",
@ -1979,7 +1979,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-rayon-threadlimit" name = "solana-rayon-threadlimit"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"num_cpus", "num_cpus",
@ -1987,7 +1987,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-runtime" name = "solana-runtime"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bincode", "bincode",
"blake3", "blake3",
@ -2033,7 +2033,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-sdk" name = "solana-sdk"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"bincode", "bincode",
@ -2073,7 +2073,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-sdk-macro" name = "solana-sdk-macro"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bs58", "bs58",
"proc-macro2 1.0.19", "proc-macro2 1.0.19",
@ -2084,7 +2084,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-sdk-macro-frozen-abi" name = "solana-sdk-macro-frozen-abi"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"proc-macro2 1.0.19", "proc-macro2 1.0.19",
@ -2095,7 +2095,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-secp256k1-program" name = "solana-secp256k1-program"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bincode", "bincode",
"digest 0.9.0", "digest 0.9.0",
@ -2108,7 +2108,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-stake-program" name = "solana-stake-program"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bincode", "bincode",
"log", "log",
@ -2127,7 +2127,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-vote-program" name = "solana-vote-program"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"bincode", "bincode",
"log", "log",

2
storage-bigtable/build-proto/Cargo.lock generated
View File

@ -183,7 +183,7 @@ dependencies = [
[[package]] [[package]]
name = "proto" name = "proto"
version = "1.3.15" version = "1.3.16"
dependencies = [ dependencies = [
"tonic-build", "tonic-build",
] ]