Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Fix various ledger-tool error due to no builtins #12759

Merged
t-nelson merged 2 commits into from
Oct 9, 2020
Merged

Fix various ledger-tool error due to no builtins #12759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6093ecb
Fix various ledger-tool error due to no builtins
ryoqun Oct 9, 2020
d341fe4
Add missing file...
ryoqun Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ serde_derive = "1.0.103"
serde_json = "1.0.56"
solana-account-decoder = { path = "../account-decoder", version = "1.5.0" }
solana-banks-server = { path = "../banks-server", version = "1.5.0" }
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.5.0" }
solana-clap-utils = { path = "../clap-utils", version = "1.5.0" }
solana-client = { path = "../client", version = "1.5.0" }
solana-faucet = { path = "../faucet", version = "1.5.0" }
Expand Down
4 changes: 0 additions & 4 deletions core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
//! command-line tools to spin up validators and a Rust library
//!

#[macro_use]
extern crate solana_bpf_loader_program;

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;
Expand Down
2 changes: 0 additions & 2 deletions core/src/validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -839,7 +838,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()
};

Expand Down
1 change: 1 addition & 0 deletions ledger/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0" }
solana-transaction-status = { path = "../transaction-status", version = "1.5.0" }
solana-logger = { path = "../logger", version = "1.5.0" }
solana-measure = { path = "../measure", version = "1.5.0" }
Expand Down
2 changes: 1 addition & 1 deletion ledger/src/bank_forks_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
5 changes: 2 additions & 3 deletions ledger/src/blockstore_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, TransactionLogMessages,
Bank, InnerInstructionsList, TransactionBalancesSet, TransactionLogMessages,
TransactionProcessResult, TransactionResults,
},
bank_forks::BankForks,
Expand Down Expand Up @@ -320,7 +320,6 @@ pub struct ProcessOptions {
pub new_hard_forks: Option<Vec<Slot>>,
pub frozen_accounts: Vec<Pubkey>,
pub debug_keys: Option<Arc<HashSet<Pubkey>>>,
pub additional_builtins: Option<Builtins>,
Copy link
Copy Markdown
Contributor Author

@ryoqun ryoqun Oct 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed additional_builtins from the ProcessOptions. Because this isn't rather optional. Now, the solana-ledger crate is responsible for populating this.

}

pub fn process_blockstore(
Expand All @@ -344,7 +343,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...");
Expand Down
0 core/src/builtins.rs → ledger/src/builtins.rs
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions ledger/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down