Merge commit 'f4c5da3c729dc2683864329b13bcc9f704670389'

solana-labs · Oct 16, 2019 · 2de7267 · 2de7267
2 parents 2d0cb53 + f4c5da3
commit 2de7267
Show file tree

Hide file tree

Showing 300 changed files with 21,664 additions and 6,469 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,6 +42,7 @@ members = [
     "programs/stake_tests",
     "programs/storage_api",
     "programs/storage_program",
+    "programs/vest_api",
     "programs/vote_api",
     "programs/vote_program",
     "replicator",

diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml
@@ -22,7 +22,7 @@ rayon = "1.2.0"
 serde = "1.0.101"
 serde_derive = "1.0.101"
 serde_json = "1.0.41"
-serde_yaml = "0.8.9"
+serde_yaml = "0.8.11"
 # solana-runtime = { path = "../solana/runtime"}
 solana-core = { path = "../core", version = "0.20.0" }
 solana-genesis = { path = "../genesis", version = "0.20.0" }
@@ -36,4 +36,4 @@ solana-netutil = { path = "../netutil", version = "0.20.0" }
 solana-runtime = { path = "../runtime", version = "0.20.0" }
 solana-sdk = { path = "../sdk", version = "0.20.0" }
 untrusted = "0.7.0"
-ws = "0.9.0"
+ws = "0.9.1"
diff --git a/bench-exchange/src/bench.rs b/bench-exchange/src/bench.rs
@@ -11,7 +11,7 @@ use solana_drone::drone::request_airdrop_transaction;
 use solana_exchange_api::exchange_instruction;
 use solana_exchange_api::exchange_state::*;
 use solana_exchange_api::id;
-use solana_genesis::PrimordialAccountDetails;
+use solana_genesis::Base64Account;
 use solana_metrics::datapoint_info;
 use solana_sdk::client::Client;
 use solana_sdk::client::SyncClient;
@@ -89,7 +89,7 @@ pub fn create_client_accounts_file(
     keypairs.iter().for_each(|keypair| {
         accounts.insert(
             serde_json::to_string(&keypair.to_bytes().to_vec()).unwrap(),
-            PrimordialAccountDetails {
+            Base64Account {
                 balance: fund_amount,
                 executable: false,
                 owner: system_program::id().to_string(),
@@ -140,8 +140,7 @@ where
         let path = Path::new(&client_ids_and_stake_file);
         let file = File::open(path).unwrap();
 
-        let accounts: HashMap<String, PrimordialAccountDetails> =
-            serde_yaml::from_reader(file).unwrap();
+        let accounts: HashMap<String, Base64Account> = serde_yaml::from_reader(file).unwrap();
         accounts
             .into_iter()
             .map(|(keypair, _)| {

diff --git a/bench-exchange/src/cli.rs b/bench-exchange/src/cli.rs
@@ -1,7 +1,7 @@
 use clap::{crate_description, crate_name, crate_version, value_t, App, Arg, ArgMatches};
 use solana_core::gen_keys::GenKeys;
 use solana_drone::drone::DRONE_PORT;
-use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil};
+use solana_sdk::signature::{read_keypair_file, Keypair, KeypairUtil};
 use std::net::SocketAddr;
 use std::process::exit;
 use std::time::Duration;
@@ -179,7 +179,7 @@ pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {
         });
 
     if matches.is_present("identity") {
-        args.identity = read_keypair(matches.value_of("identity").unwrap())
+        args.identity = read_keypair_file(matches.value_of("identity").unwrap())
             .expect("can't read client identity");
     } else {
         args.identity = {

diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
@@ -15,7 +15,7 @@ rayon = "1.2.0"
 serde = "1.0.101"
 serde_derive = "1.0.101"
 serde_json = "1.0.41"
-serde_yaml = "0.8.9"
+serde_yaml = "0.8.11"
 solana-core = { path = "../core", version = "0.20.0" }
 solana-genesis = { path = "../genesis", version = "0.20.0" }
 solana-client = { path = "../client", version = "0.20.0" }