Switch account hashing to blake3 (#11969)

* Switch account hashing to blake3 Co-authored-by: Carl <[email protected]>
solana-labs · Sep 2, 2020 · af08221 · af08221
1 parent 2ed6a45
commit af08221
Show file tree

Hide file tree

Showing 11 changed files with 330 additions and 110 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/accounts-bench/src/main.rs b/accounts-bench/src/main.rs
@@ -5,7 +5,7 @@ use solana_runtime::{
     accounts::{create_test_accounts, update_accounts, Accounts},
     accounts_index::Ancestors,
 };
-use solana_sdk::pubkey::Pubkey;
+use solana_sdk::{genesis_config::OperatingMode, pubkey::Pubkey};
 use std::fs;
 use std::path::PathBuf;
 
@@ -54,7 +54,7 @@ fn main() {
     if fs::remove_dir_all(path.clone()).is_err() {
         println!("Warning: Couldn't remove {:?}", path);
     }
-    let accounts = Accounts::new(vec![path]);
+    let accounts = Accounts::new(vec![path], &OperatingMode::Preview);
     println!("Creating {} accounts", num_accounts);
     let mut create_time = Measure::start("create accounts");
     let pubkeys: Vec<_> = (0..num_slots)

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -10,6 +10,7 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.3.1"
+blake3 = "0.3.6"
 bv = { version = "0.11.1", features = ["serde"] }
 byteorder = "1.3.4"
 bzip2 = "0.3.3"

diff --git a/runtime/benches/accounts.rs b/runtime/benches/accounts.rs
@@ -6,7 +6,11 @@ use solana_runtime::{
     accounts::{create_test_accounts, Accounts},
     bank::*,
 };
-use solana_sdk::{account::Account, genesis_config::create_genesis_config, pubkey::Pubkey};
+use solana_sdk::{
+    account::Account,
+    genesis_config::{create_genesis_config, OperatingMode},
+    pubkey::Pubkey,
+};
 use std::{path::PathBuf, sync::Arc};
 use test::Bencher;
 
@@ -65,7 +69,10 @@ fn test_accounts_squash(bencher: &mut Bencher) {
 
 #[bench]
 fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
-    let accounts = Accounts::new(vec![PathBuf::from("bench_accounts_hash_internal")]);
+    let accounts = Accounts::new(
+        vec![PathBuf::from("bench_accounts_hash_internal")],
+        &OperatingMode::Development,
+    );
     let mut pubkeys: Vec<Pubkey> = vec![];
     create_test_accounts(&accounts, &mut pubkeys, 60000, 0);
     let ancestors = vec![(0, 0)].into_iter().collect();
@@ -76,7 +83,10 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
 #[bench]
 fn test_update_accounts_hash(bencher: &mut Bencher) {
     solana_logger::setup();
-    let accounts = Accounts::new(vec![PathBuf::from("update_accounts_hash")]);
+    let accounts = Accounts::new(
+        vec![PathBuf::from("update_accounts_hash")],
+        &OperatingMode::Development,
+    );
     let mut pubkeys: Vec<Pubkey> = vec![];
     create_test_accounts(&accounts, &mut pubkeys, 50_000, 0);
     let ancestors = vec![(0, 0)].into_iter().collect();
@@ -88,7 +98,10 @@ fn test_update_accounts_hash(bencher: &mut Bencher) {
 #[bench]
 fn test_accounts_delta_hash(bencher: &mut Bencher) {
     solana_logger::setup();
-    let accounts = Accounts::new(vec![PathBuf::from("accounts_delta_hash")]);
+    let accounts = Accounts::new(
+        vec![PathBuf::from("accounts_delta_hash")],
+        &OperatingMode::Development,
+    );
     let mut pubkeys: Vec<Pubkey> = vec![];
     create_test_accounts(&accounts, &mut pubkeys, 100_000, 0);
     bencher.iter(|| {
@@ -99,7 +112,10 @@ fn test_accounts_delta_hash(bencher: &mut Bencher) {
 #[bench]
 fn bench_delete_dependencies(bencher: &mut Bencher) {
     solana_logger::setup();
-    let accounts = Accounts::new(vec![PathBuf::from("accounts_delete_deps")]);
+    let accounts = Accounts::new(
+        vec![PathBuf::from("accounts_delete_deps")],
+        &OperatingMode::Development,
+    );
     let mut old_pubkey = Pubkey::default();
     let zero_account = Account::new(0, 0, &Account::default().owner);
     for i in 0..1000 {