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

* Fix various ledger-tool error due to no builtins

* Add missing file...

Cargo.lock

@@ -3713,7 +3713,6 @@ dependencies = [
  "serial_test_derive",
  "solana-account-decoder",
  "solana-banks-server",
- "solana-bpf-loader-program",
  "solana-clap-utils",
  "solana-client",
  "solana-faucet",
@@ -3990,6 +3989,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "sha2",
+ "solana-bpf-loader-program",
  "solana-budget-program",
  "solana-logger 1.5.0",
  "solana-measure",

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.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" }

core/src/lib.rs

@@ -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;

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,
@@ -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()
     };
 

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.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" }

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");
 

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, TransactionLogMessages,
+        Bank, InnerInstructionsList, TransactionBalancesSet, TransactionLogMessages,
         TransactionProcessResult, TransactionResults,
     },
     bank_forks::BankForks,
@@ -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>,
 }
 
 pub fn process_blockstore(
@@ -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...");

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;