From 41b99b96c0978bf68efc9e9042821dc01651b96e Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Fri, 9 Oct 2020 11:49:15 -0600 Subject: [PATCH] Ryos compat fixes 1.3 (#12762) * Fix various ledger-tool error due to no builtins * Add missing file... Co-authored-by: Ryo Onodera --- Cargo.lock | 2 +- core/Cargo.toml | 1 - core/src/lib.rs | 4 -- core/src/validator.rs | 2 - explorer/wasm/Cargo.lock | 2 +- ledger/Cargo.toml | 1 + ledger/src/bank_forks_utils.rs | 2 +- ledger/src/blockstore_processor.rs | 5 +- {core => ledger}/src/builtins.rs | 0 ledger/src/lib.rs | 4 ++ programs/bpf/Cargo.lock | 70 ++++++++++++------------- storage-bigtable/build-proto/Cargo.lock | 2 +- 12 files changed, 46 insertions(+), 49 deletions(-) rename {core => ledger}/src/builtins.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 07e510377d..0eedeca160 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3708,7 +3708,6 @@ dependencies = [ "serial_test_derive", "solana-account-decoder", "solana-banks-server", - "solana-bpf-loader-program", "solana-budget-program", "solana-clap-utils", "solana-client", @@ -3985,6 +3984,7 @@ dependencies = [ "serde", "serde_bytes", "sha2", + "solana-bpf-loader-program", "solana-budget-program", "solana-logger 1.3.16", "solana-measure", diff --git a/core/Cargo.toml b/core/Cargo.toml index bb12fc137e..235ef96b00 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -46,7 +46,6 @@ serde_derive = "1.0.103" serde_json = "1.0.56" solana-account-decoder = { path = "../account-decoder", 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-clap-utils = { path = "../clap-utils", version = "1.3.16" } solana-client = { path = "../client", version = "1.3.16" } diff --git a/core/src/lib.rs b/core/src/lib.rs index 45f72178a0..eb6c217fba 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -6,15 +6,11 @@ //! 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_hash_verifier; pub mod banking_stage; pub mod bigtable_upload_service; pub mod broadcast_stage; -mod builtins; pub mod cache_block_time_service; pub mod cluster_info_vote_listener; pub mod commitment_service; diff --git a/core/src/validator.rs b/core/src/validator.rs index 0fc49a2f9d..39b0f73cd5 100644 --- a/core/src/validator.rs +++ b/core/src/validator.rs @@ -2,7 +2,6 @@ use crate::{ broadcast_stage::BroadcastStageType, - builtins, cache_block_time_service::{CacheBlockTimeSender, CacheBlockTimeService}, cluster_info::{ClusterInfo, Node}, cluster_info_vote_listener::VoteTracker, @@ -742,7 +741,6 @@ fn new_banks_from_ledger( new_hard_forks: config.new_hard_forks.clone(), frozen_accounts: config.frozen_accounts.clone(), debug_keys: config.debug_keys.clone(), - additional_builtins: Some(builtins::get(genesis_config.cluster_type)), ..blockstore_processor::ProcessOptions::default() }; diff --git a/explorer/wasm/Cargo.lock b/explorer/wasm/Cargo.lock index 499c7f878d..9740aea81b 100644 --- a/explorer/wasm/Cargo.lock +++ b/explorer/wasm/Cargo.lock @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "solana-sdk-wasm" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bincode", "bs58", diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index b44ab02428..346806c881 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -31,6 +31,7 @@ reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] } serde = "1.0.112" serde_bytes = "0.11.4" 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-logger = { path = "../logger", version = "1.3.16" } solana-measure = { path = "../measure", version = "1.3.16" } diff --git a/ledger/src/bank_forks_utils.rs b/ledger/src/bank_forks_utils.rs index d9b58d6b19..7c9bc131cf 100644 --- a/ledger/src/bank_forks_utils.rs +++ b/ledger/src/bank_forks_utils.rs @@ -66,7 +66,7 @@ pub fn load( compression, genesis_config, process_options.debug_keys.clone(), - process_options.additional_builtins.as_ref(), + Some(&crate::builtins::get(genesis_config.cluster_type)), ) .expect("Load from snapshot failed"); diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs index 514e08f6fd..8b64342e2a 100644 --- a/ledger/src/blockstore_processor.rs +++ b/ledger/src/blockstore_processor.rs @@ -16,7 +16,7 @@ use solana_metrics::{datapoint_error, inc_new_counter_debug}; use solana_rayon_threadlimit::get_thread_count; use solana_runtime::{ bank::{ - Bank, Builtins, InnerInstructionsList, TransactionBalancesSet, TransactionProcessResult, + Bank, InnerInstructionsList, TransactionBalancesSet, TransactionProcessResult, TransactionResults, }, bank_forks::BankForks, @@ -318,7 +318,6 @@ pub struct ProcessOptions { pub new_hard_forks: Option>, pub frozen_accounts: Vec, pub debug_keys: Option>>, - pub additional_builtins: Option, } pub fn process_blockstore( @@ -342,7 +341,7 @@ pub fn process_blockstore( account_paths, &opts.frozen_accounts, opts.debug_keys.clone(), - opts.additional_builtins.as_ref(), + Some(&crate::builtins::get(genesis_config.cluster_type)), ); let bank0 = Arc::new(bank0); info!("processing ledger for slot 0..."); diff --git a/core/src/builtins.rs b/ledger/src/builtins.rs similarity index 100% rename from core/src/builtins.rs rename to ledger/src/builtins.rs diff --git a/ledger/src/lib.rs b/ledger/src/lib.rs index 0178e9b6f4..98a8b5aac3 100644 --- a/ledger/src/lib.rs +++ b/ledger/src/lib.rs @@ -1,3 +1,6 @@ +#[macro_use] +extern crate solana_bpf_loader_program; + pub mod bank_forks_utils; pub mod bigtable_upload; pub mod block_error; @@ -7,6 +10,7 @@ pub mod ancestor_iterator; pub mod blockstore_db; pub mod blockstore_meta; pub mod blockstore_processor; +pub mod builtins; pub mod entry; pub mod erasure; pub mod genesis_utils; diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 1afeb76142..54d96c5c33 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1734,7 +1734,7 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" [[package]] name = "solana-bpf-loader-program" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bincode", "byteorder 1.3.4", @@ -1748,7 +1748,7 @@ dependencies = [ [[package]] name = "solana-bpf-programs" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bincode", "byteorder 1.3.4", @@ -1764,7 +1764,7 @@ dependencies = [ [[package]] name = "solana-bpf-rust-128bit" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-bpf-rust-128bit-dep", "solana-sdk", @@ -1772,21 +1772,21 @@ dependencies = [ [[package]] name = "solana-bpf-rust-128bit-dep" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-alloc" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-dep-crate" -version = "1.3.15" +version = "1.3.16" dependencies = [ "byteorder 1.3.4", "solana-sdk", @@ -1794,21 +1794,21 @@ dependencies = [ [[package]] name = "solana-bpf-rust-deprecated_loader" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-dup-accounts" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-error-handling" -version = "1.3.15" +version = "1.3.16" dependencies = [ "num-derive 0.2.5", "num-traits", @@ -1818,21 +1818,21 @@ dependencies = [ [[package]] name = "solana-bpf-rust-external-spend" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-instruction-introspection" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-invoke" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-bpf-rust-invoked", "solana-sdk", @@ -1840,21 +1840,21 @@ dependencies = [ [[package]] name = "solana-bpf-rust-invoked" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-iter" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-many-args" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-bpf-rust-many-args-dep", "solana-sdk", @@ -1862,28 +1862,28 @@ dependencies = [ [[package]] name = "solana-bpf-rust-many-args-dep" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-noop" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-panic" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-param-passing" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-bpf-rust-param-passing-dep", "solana-sdk", @@ -1891,28 +1891,28 @@ dependencies = [ [[package]] name = "solana-bpf-rust-param-passing-dep" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-sanity" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-bpf-rust-sysval" -version = "1.3.15" +version = "1.3.16" dependencies = [ "solana-sdk", ] [[package]] name = "solana-config-program" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bincode", "chrono", @@ -1924,7 +1924,7 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "1.3.15" +version = "1.3.16" dependencies = [ "backtrace", "bytes 0.4.12", @@ -1947,7 +1947,7 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.3.15" +version = "1.3.16" dependencies = [ "env_logger", "lazy_static", @@ -1956,7 +1956,7 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.3.15" +version = "1.3.16" dependencies = [ "jemalloc-ctl", "jemallocator", @@ -1967,7 +1967,7 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.3.15" +version = "1.3.16" dependencies = [ "env_logger", "gethostname", @@ -1979,7 +1979,7 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.3.15" +version = "1.3.16" dependencies = [ "lazy_static", "num_cpus", @@ -1987,7 +1987,7 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bincode", "blake3", @@ -2033,7 +2033,7 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.3.15" +version = "1.3.16" dependencies = [ "assert_matches", "bincode", @@ -2073,7 +2073,7 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bs58", "proc-macro2 1.0.19", @@ -2084,7 +2084,7 @@ dependencies = [ [[package]] name = "solana-sdk-macro-frozen-abi" -version = "1.3.15" +version = "1.3.16" dependencies = [ "lazy_static", "proc-macro2 1.0.19", @@ -2095,7 +2095,7 @@ dependencies = [ [[package]] name = "solana-secp256k1-program" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bincode", "digest 0.9.0", @@ -2108,7 +2108,7 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bincode", "log", @@ -2127,7 +2127,7 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.3.15" +version = "1.3.16" dependencies = [ "bincode", "log", diff --git a/storage-bigtable/build-proto/Cargo.lock b/storage-bigtable/build-proto/Cargo.lock index 4e1d71f0b7..e955a309c9 100644 --- a/storage-bigtable/build-proto/Cargo.lock +++ b/storage-bigtable/build-proto/Cargo.lock @@ -183,7 +183,7 @@ dependencies = [ [[package]] name = "proto" -version = "1.3.15" +version = "1.3.16" dependencies = [ "tonic-build", ]