From 2cc71f2d552e5ff964fb76903395d3d5b1679ccb Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 06:14:53 +0000 Subject: [PATCH] Merge heaviest bank modules (bp #10672) (#10677) * Merge heaviest bank modules * Update lockfiles Co-authored-by: Greg Fitzgerald --- core/src/bank_weight_fork_choice.rs | 6 +- ...mod.rs => heaviest_subtree_fork_choice.rs} | 71 ++++++- .../fork_choice.rs | 72 ------- programs/bpf/Cargo.lock | 194 +++++++++--------- programs/librapay/Cargo.lock | 80 ++++---- programs/move_loader/Cargo.lock | 10 +- 6 files changed, 212 insertions(+), 221 deletions(-) rename core/src/{heaviest_subtree_fork_choice/mod.rs => heaviest_subtree_fork_choice.rs} (94%) delete mode 100644 core/src/heaviest_subtree_fork_choice/fork_choice.rs diff --git a/core/src/bank_weight_fork_choice.rs b/core/src/bank_weight_fork_choice.rs index d5500f4bc4..d34c741a1f 100644 --- a/core/src/bank_weight_fork_choice.rs +++ b/core/src/bank_weight_fork_choice.rs @@ -21,7 +21,7 @@ impl ForkChoice for BankWeightForkChoice { bank: &Bank, _tower: &Tower, progress: &mut ProgressMap, - computed_bank_stats: &ComputedBankState, + computed_bank_state: &ComputedBankState, ) { let bank_slot = bank.slot(); // Only time progress map should be missing a bank slot @@ -37,14 +37,14 @@ impl ForkChoice for BankWeightForkChoice { .get_fork_stats_mut(bank_slot) .expect("All frozen banks must exist in the Progress map"); - let ComputedBankState { bank_weight, .. } = computed_bank_stats; + let ComputedBankState { bank_weight, .. } = computed_bank_state; stats.weight = *bank_weight; stats.fork_weight = stats.weight + parent_weight; } // Returns: // 1) The heaviest overall bank - // 2) The heavest bank on the same fork as the last vote (doesn't require a + // 2) The heaviest bank on the same fork as the last vote (doesn't require a // switching proof to vote for) fn select_forks( &self, diff --git a/core/src/heaviest_subtree_fork_choice/mod.rs b/core/src/heaviest_subtree_fork_choice.rs similarity index 94% rename from core/src/heaviest_subtree_fork_choice/mod.rs rename to core/src/heaviest_subtree_fork_choice.rs index 8a620d7627..29f4a0a054 100644 --- a/core/src/heaviest_subtree_fork_choice/mod.rs +++ b/core/src/heaviest_subtree_fork_choice.rs @@ -1,4 +1,8 @@ -#[cfg(test)] +use crate::{ + consensus::{ComputedBankState, Tower}, + fork_choice::ForkChoice, + progress_map::ProgressMap, +}; use solana_ledger::bank_forks::BankForks; use solana_runtime::{bank::Bank, epoch_stakes::EpochStakes}; use solana_sdk::{ @@ -7,13 +11,12 @@ use solana_sdk::{ pubkey::Pubkey, }; use std::{ - collections::{BTreeMap, HashMap}, - sync::Arc, + collections::{BTreeMap, HashMap, HashSet}, + sync::{Arc, RwLock}, }; #[cfg(test)] use trees::{Tree, TreeWalk}; -mod fork_choice; pub type ForkWeight = u64; #[derive(PartialEq, Eq, Clone, Debug, PartialOrd, Ord)] @@ -401,6 +404,66 @@ impl HeaviestSubtreeForkChoice { } } +impl ForkChoice for HeaviestSubtreeForkChoice { + fn compute_bank_stats( + &mut self, + bank: &Bank, + _tower: &Tower, + _progress: &mut ProgressMap, + computed_bank_state: &ComputedBankState, + ) { + let ComputedBankState { pubkey_votes, .. } = computed_bank_state; + + // Update `heaviest_subtree_fork_choice` to find the best fork to build on + let best_overall_slot = self.add_votes( + &pubkey_votes, + bank.epoch_stakes_map(), + bank.epoch_schedule(), + ); + + datapoint_info!( + "best_slot", + ("slot", bank.slot(), i64), + ("best_slot", best_overall_slot, i64), + ); + } + + // Returns: + // 1) The heaviest overall bank + // 2) The heaviest bank on the same fork as the last vote (doesn't require a + // switching proof to vote for) + fn select_forks( + &self, + _frozen_banks: &[Arc], + tower: &Tower, + _progress: &ProgressMap, + _ancestors: &HashMap>, + bank_forks: &RwLock, + ) -> (Arc, Option>) { + let last_vote = tower.last_vote().slots.last().cloned(); + let heaviest_slot_on_same_voted_fork = last_vote.map(|last_vote| { + let heaviest_slot_on_same_voted_fork = + self.best_slot(last_vote).expect("last_vote is a frozen bank so must have been added to heaviest_subtree_fork_choice at time of freezing"); + if heaviest_slot_on_same_voted_fork == last_vote { + None + } else { + Some(heaviest_slot_on_same_voted_fork) + } + }).unwrap_or(None); + let heaviest_slot = self.best_overall_slot(); + let r_bank_forks = bank_forks.read().unwrap(); + ( + r_bank_forks.get(heaviest_slot).unwrap().clone(), + heaviest_slot_on_same_voted_fork.map(|heaviest_slot_on_same_voted_fork| { + r_bank_forks + .get(heaviest_slot_on_same_voted_fork) + .unwrap() + .clone() + }), + ) + } +} + struct AncestorIterator<'a> { current_slot: Slot, fork_infos: &'a HashMap, diff --git a/core/src/heaviest_subtree_fork_choice/fork_choice.rs b/core/src/heaviest_subtree_fork_choice/fork_choice.rs deleted file mode 100644 index 5fb46cca14..0000000000 --- a/core/src/heaviest_subtree_fork_choice/fork_choice.rs +++ /dev/null @@ -1,72 +0,0 @@ -use crate::{ - consensus::{ComputedBankState, Tower}, - fork_choice::ForkChoice, - heaviest_subtree_fork_choice::HeaviestSubtreeForkChoice, - progress_map::ProgressMap, -}; -use solana_ledger::bank_forks::BankForks; -use solana_runtime::bank::Bank; -use std::{ - collections::{HashMap, HashSet}, - sync::{Arc, RwLock}, -}; - -impl ForkChoice for HeaviestSubtreeForkChoice { - fn compute_bank_stats( - &mut self, - bank: &Bank, - _tower: &Tower, - _progress: &mut ProgressMap, - computed_bank_stats: &ComputedBankState, - ) { - let ComputedBankState { pubkey_votes, .. } = computed_bank_stats; - - // Update `heaviest_subtree_fork_choice` to find the best fork to build on - let best_overall_slot = self.add_votes( - &pubkey_votes, - bank.epoch_stakes_map(), - bank.epoch_schedule(), - ); - - datapoint_info!( - "best_slot", - ("slot", bank.slot(), i64), - ("best_slot", best_overall_slot, i64), - ); - } - - // Returns: - // 1) The heaviest overall bbank - // 2) The heavest bank on the same fork as the last vote (doesn't require a - // switching proof to vote for) - fn select_forks( - &self, - _frozen_banks: &[Arc], - tower: &Tower, - _progress: &ProgressMap, - _ancestors: &HashMap>, - bank_forks: &RwLock, - ) -> (Arc, Option>) { - let last_vote = tower.last_vote().slots.last().cloned(); - let heaviest_slot_on_same_voted_fork = last_vote.map(|last_vote| { - let heaviest_slot_on_same_voted_fork = - self.best_slot(last_vote).expect("last_vote is a frozen bank so must have been added to heaviest_subtree_fork_choice at time of freezing"); - if heaviest_slot_on_same_voted_fork == last_vote { - None - } else { - Some(heaviest_slot_on_same_voted_fork) - } - }).unwrap_or(None); - let heaviest_slot = self.best_overall_slot(); - let r_bank_forks = bank_forks.read().unwrap(); - ( - r_bank_forks.get(heaviest_slot).unwrap().clone(), - heaviest_slot_on_same_voted_fork.map(|heaviest_slot_on_same_voted_fork| { - r_bank_forks - .get(heaviest_slot_on_same_voted_fork) - .unwrap() - .clone() - }), - ) - } -} diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 6e7ddd61c6..4d962f30a3 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1352,7 +1352,7 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1360,187 +1360,187 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 1.2.4", - "solana-runtime 1.2.4", - "solana-sdk 1.2.4", + "solana-logger 1.2.5", + "solana-runtime 1.2.5", + "solana-sdk 1.2.5", "solana_rbpf 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-bpf-programs" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "elf 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-bpf-loader-program 1.2.4", - "solana-logger 1.2.4", - "solana-runtime 1.2.4", - "solana-sdk 1.2.4", + "solana-bpf-loader-program 1.2.5", + "solana-logger 1.2.5", + "solana-runtime 1.2.5", + "solana-sdk 1.2.5", "solana_rbpf 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-bpf-rust-128bit" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-bpf-rust-128bit-dep 1.2.4", - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-bpf-rust-128bit-dep 1.2.5", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-128bit-dep" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-alloc" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-dep-crate" -version = "1.2.4" +version = "1.2.5" dependencies = [ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-dup-accounts" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-error-handling" -version = "1.2.4" +version = "1.2.5" dependencies = [ "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-bpf-rust-external-spend" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-invoke" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-bpf-rust-invoked 1.2.4", - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-bpf-rust-invoked 1.2.5", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-invoked" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-iter" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-many-args" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-bpf-rust-many-args-dep 1.2.4", - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-bpf-rust-many-args-dep 1.2.5", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-many-args-dep" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-noop" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-panic" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-param-passing" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-bpf-rust-param-passing-dep 1.2.4", - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-bpf-rust-param-passing-dep 1.2.5", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-param-passing-dep" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-bpf-rust-sysval" -version = "1.2.4" +version = "1.2.5" dependencies = [ - "solana-sdk 1.2.4", - "solana-sdk-bpf-test 1.2.4", + "solana-sdk 1.2.5", + "solana-sdk-bpf-test 1.2.5", ] [[package]] name = "solana-config-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.2.4", + "solana-sdk 1.2.5", ] [[package]] name = "solana-crate-features" -version = "1.2.4" +version = "1.2.5" dependencies = [ "backtrace 0.3.49 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1563,7 +1563,7 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.2.4" +version = "1.2.5" dependencies = [ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1572,30 +1572,30 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.2.4" +version = "1.2.5" dependencies = [ "jemalloc-ctl 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 1.2.4", - "solana-sdk 1.2.4", + "solana-metrics 1.2.5", + "solana-sdk 1.2.5", ] [[package]] name = "solana-metrics" -version = "1.2.4" +version = "1.2.5" dependencies = [ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "gethostname 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.2.4", + "solana-sdk 1.2.5", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.2.4" +version = "1.2.5" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1603,7 +1603,7 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bv 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1623,21 +1623,21 @@ dependencies = [ "rayon 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-config-program 1.2.4", - "solana-logger 1.2.4", - "solana-measure 1.2.4", - "solana-metrics 1.2.4", - "solana-rayon-threadlimit 1.2.4", - "solana-sdk 1.2.4", - "solana-stake-program 1.2.4", - "solana-vote-program 1.2.4", + "solana-config-program 1.2.5", + "solana-logger 1.2.5", + "solana-measure 1.2.5", + "solana-metrics 1.2.5", + "solana-rayon-threadlimit 1.2.5", + "solana-sdk 1.2.5", + "solana-stake-program 1.2.5", + "solana-vote-program 1.2.5", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-sdk" -version = "1.2.4" +version = "1.2.5" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1662,19 +1662,19 @@ dependencies = [ "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-crate-features 1.2.4", - "solana-logger 1.2.4", - "solana-sdk-macro 1.2.4", + "solana-crate-features 1.2.5", + "solana-logger 1.2.5", + "solana-sdk-macro 1.2.5", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-sdk-bpf-test" -version = "1.2.4" +version = "1.2.5" [[package]] name = "solana-sdk-macro" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bs58 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1684,7 +1684,7 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1692,16 +1692,16 @@ dependencies = [ "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-config-program 1.2.4", - "solana-metrics 1.2.4", - "solana-sdk 1.2.4", - "solana-vote-program 1.2.4", + "solana-config-program 1.2.5", + "solana-metrics 1.2.5", + "solana-sdk 1.2.5", + "solana-vote-program 1.2.5", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-vote-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1709,8 +1709,8 @@ dependencies = [ "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 1.2.4", - "solana-sdk 1.2.4", + "solana-metrics 1.2.5", + "solana-sdk 1.2.5", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/programs/librapay/Cargo.lock b/programs/librapay/Cargo.lock index 25b1606d81..0ff365be31 100644 --- a/programs/librapay/Cargo.lock +++ b/programs/librapay/Cargo.lock @@ -2288,19 +2288,19 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.2.4", + "solana-sdk 1.2.5", ] [[package]] name = "solana-crate-features" -version = "1.2.4" +version = "1.2.5" dependencies = [ "backtrace 0.3.49 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2323,20 +2323,20 @@ dependencies = [ [[package]] name = "solana-librapay" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 1.2.4", - "solana-move-loader-program 1.2.4", - "solana-runtime 1.2.4", - "solana-sdk 1.2.4", + "solana-logger 1.2.5", + "solana-move-loader-program 1.2.5", + "solana-runtime 1.2.5", + "solana-sdk 1.2.5", "solana_libra_types 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-logger" -version = "1.2.4" +version = "1.2.5" dependencies = [ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2345,30 +2345,30 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.2.4" +version = "1.2.5" dependencies = [ "jemalloc-ctl 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 1.2.4", - "solana-sdk 1.2.4", + "solana-metrics 1.2.5", + "solana-sdk 1.2.5", ] [[package]] name = "solana-metrics" -version = "1.2.4" +version = "1.2.5" dependencies = [ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "gethostname 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-sdk 1.2.4", + "solana-sdk 1.2.5", ] [[package]] name = "solana-move-loader-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2379,8 +2379,8 @@ dependencies = [ "serde_bytes 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 1.2.4", - "solana-sdk 1.2.4", + "solana-logger 1.2.5", + "solana-sdk 1.2.5", "solana_libra_bytecode_verifier 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)", "solana_libra_canonical_serialization 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)", "solana_libra_compiler 0.0.1-sol5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2397,7 +2397,7 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.2.4" +version = "1.2.5" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2405,7 +2405,7 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bv 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2425,21 +2425,21 @@ dependencies = [ "rayon 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-config-program 1.2.4", - "solana-logger 1.2.4", - "solana-measure 1.2.4", - "solana-metrics 1.2.4", - "solana-rayon-threadlimit 1.2.4", - "solana-sdk 1.2.4", - "solana-stake-program 1.2.4", - "solana-vote-program 1.2.4", + "solana-config-program 1.2.5", + "solana-logger 1.2.5", + "solana-measure 1.2.5", + "solana-metrics 1.2.5", + "solana-rayon-threadlimit 1.2.5", + "solana-sdk 1.2.5", + "solana-stake-program 1.2.5", + "solana-vote-program 1.2.5", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-sdk" -version = "1.2.4" +version = "1.2.5" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2464,15 +2464,15 @@ dependencies = [ "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-crate-features 1.2.4", - "solana-logger 1.2.4", - "solana-sdk-macro 1.2.4", + "solana-crate-features 1.2.5", + "solana-logger 1.2.5", + "solana-sdk-macro 1.2.5", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-sdk-macro" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bs58 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2482,7 +2482,7 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2490,16 +2490,16 @@ dependencies = [ "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-config-program 1.2.4", - "solana-metrics 1.2.4", - "solana-sdk 1.2.4", - "solana-vote-program 1.2.4", + "solana-config-program 1.2.5", + "solana-metrics 1.2.5", + "solana-sdk 1.2.5", + "solana-vote-program 1.2.5", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "solana-vote-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2507,8 +2507,8 @@ dependencies = [ "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-metrics 1.2.4", - "solana-sdk 1.2.4", + "solana-metrics 1.2.5", + "solana-sdk 1.2.5", "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/programs/move_loader/Cargo.lock b/programs/move_loader/Cargo.lock index 71bbd7127c..287ce48f71 100644 --- a/programs/move_loader/Cargo.lock +++ b/programs/move_loader/Cargo.lock @@ -2472,7 +2472,7 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "1.2.4" +version = "1.2.5" dependencies = [ "backtrace", "bytes 0.4.12", @@ -2495,7 +2495,7 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.2.4" +version = "1.2.5" dependencies = [ "env_logger", "lazy_static", @@ -2504,7 +2504,7 @@ dependencies = [ [[package]] name = "solana-move-loader-program" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bincode", "indexmap", @@ -2533,7 +2533,7 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.2.4" +version = "1.2.5" dependencies = [ "assert_matches", "bincode", @@ -2566,7 +2566,7 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.2.4" +version = "1.2.5" dependencies = [ "bs58 0.3.1", "proc-macro2 1.0.18",