Sanitize preflight (bp #11373) (#11376)

* Add failing test for unsane tx in RPC preflight

(cherry picked from commit e25846e1ad)

* Add From for SanitizeError > TransactionError

(cherry picked from commit 3f73affb2e)

* Sanitize transactions during RPC preflight test

(cherry picked from commit 29b3265dc7)

* Harden RPC preflight test inputs

(cherry picked from commit 14339dec0a)

Co-authored-by: Trent Nelson <trent@solana.com>

.buildkite/env/secrets.ejson

@@ -1,12 +1,12 @@
 {
     "_public_key": "ae29f4f7ad2fc92de70d470e411c8426d5d48db8817c9e3dae574b122192335f",
     "environment": {
-      "CODECOV_TOKEN": "EJ[1:yGpTmjdbyjW2kjgIHkFoJv7Ue7EbUvUbqHyw6anGgWg=:JnxhrIxh09AvqdJgrVSYmb7PxSrh19aE:07WzVExCHEd1lJ1m8QizRRthGri+WBNeZRKjjEvsy5eo4gv3HD7zVEm42tVTGkqITKkBNQ==]",
-      "CRATES_IO_TOKEN": "EJ[1:yGpTmjdbyjW2kjgIHkFoJv7Ue7EbUvUbqHyw6anGgWg=:d0jJqC32/axwzq/N7kMRmpxKhnRrhtpt:zvcPHwkOzGnjhNkAQSejwdy1Jkr9wR1qXFFCnfIjyt/XQYubzB1tLkoly/qdmeb5]",
-      "GEOLOCATION_API_KEY": "EJ[1:yGpTmjdbyjW2kjgIHkFoJv7Ue7EbUvUbqHyw6anGgWg=:R4gfB6Ey4i50HyfLt4UZDLBqg3qHEUye:UfZCOgt8XI6Y2g+ivCRVoS1fjFycFs7/GSevvCqh1B50mG0+hzpEyzXQLuKG5OeI]",
-      "GITHUB_TOKEN": "EJ[1:yGpTmjdbyjW2kjgIHkFoJv7Ue7EbUvUbqHyw6anGgWg=:Vq2dkGTOzfEpRht0BAGHFp/hDogMvXJe:tFXHg1epVt2mq9hkuc5sRHe+KAnVREi/p8S+IZu67XRyzdiA/nGak1k860FXYuuzuaE0QWekaEc=]",
-      "INFLUX_DATABASE": "EJ[1:yGpTmjdbyjW2kjgIHkFoJv7Ue7EbUvUbqHyw6anGgWg=:5KI9WBkXx3R/W4m256mU5MJOE7N8aAT9:Cb8QFELZ9I60t5zhJ9h55Kcs]",
-      "INFLUX_PASSWORD": "EJ[1:yGpTmjdbyjW2kjgIHkFoJv7Ue7EbUvUbqHyw6anGgWg=:hQRMpLCrav+OYkNphkeM4hagdVoZv5Iw:AUO76rr6+gF1OLJA8ZLSG8wHKXgYCPNk6gRCV8rBhZBJ4KwDaxpvOhMl7bxxXG6jol7v4aRa/Lk=]",
-      "INFLUX_USERNAME": "EJ[1:yGpTmjdbyjW2kjgIHkFoJv7Ue7EbUvUbqHyw6anGgWg=:R7BNmQjfeqoGDAFTJu9bYTGHol2NgnYN:Q2tOT/EBcFvhFk+DKLKmVU7tLCpVC3Ui]"
+      "CODECOV_TOKEN": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:3K68mE38LJ2RB98VWmjuNLFBNn1XTGR4:cR4r05/TOZQKmEZp1v4CSgUJtC6QJiOaL85QjXW0qZ061fMnsBA8AtAPMDoDq4WCGOZM1A==]",
+      "CRATES_IO_TOKEN": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:GGRTYDjMXksevzR6kq4Jx+FaIQZz50RU:xkbwDxcgoCyU+aT2tiI9mymigrEl6YiOr3axe3aX70ELIBKbCdPGilXP/wixvKi94g2u]",
+      "GEOLOCATION_API_KEY": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:U2PZLi5MU3Ru/zK1SilianEeizcMvxml:AJKf2OAtDHmJh0KyXrBnNnistItZvVVP3cZ7ZLtrVupjmWN/PzmKwSsXeCNObWS+]",
+      "GITHUB_TOKEN": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:0NJNlpD/O19mvOakCGBYDhIDfySxWFSC:Dz4NXv9x6ncRQ1u9sVoWOcqmkg0sI09qmefghB0GXZgPcFGgn6T0mw7ynNnbUvjyH8dLruKHauk=]",
+      "INFLUX_DATABASE": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:SzwHIeOVpmbTcGQOGngoFgYumsLZJUGq:t7Rpk49njsWvoM+ztv5Uwuiz]",
+      "INFLUX_PASSWORD": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:/MUs+q7pdGrUjzwcq+6pgIFxur4hxdqu:am22z2E2dtmw1f1J1Mq5JLcUHZsrEjQAJ0pp21M4AZeJbNO6bVb44d9zSkHj7xdN6U+GNlCk+wU=]",
+      "INFLUX_USERNAME": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:XjghH20xGVWro9B+epGlJaJcW8Wze0Bi:ZIdOtXudTY5TqKseDU7gVvQXfmXV99Xh]"
     }
 }

.gitignore

@@ -23,3 +23,7 @@ log-*/
 /.idea/
 /solana.iml
 /.vscode/
+
+# fetch-spl.sh artifacts
+/spl-genesis-args.sh
+/spl_*.so

.travis/affects.sh

@@ -3,6 +3,11 @@
 # Check if files in the commit range match one or more prefixes
 #
 
+# Always run the job if we are on a tagged release
+if [[ -n "$TRAVIS_TAG" ]]; then
+  exit 0
+fi
+
 (
   set -x
   git diff --name-only "$TRAVIS_COMMIT_RANGE"

Cargo.toml

@@ -64,6 +64,4 @@ members = [
 
 exclude = [
     "programs/bpf",
-    "programs/move_loader",
-    "programs/librapay",
 ]

account-decoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,9 +13,9 @@ bincode = "1.2.1"
 bs58 = "0.3.1"
 Inflector = "0.11.4"
 lazy_static = "1.4.0"
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
-spl-memo = "1.0.1"
+solana-sdk = { path = "../sdk", version = "1.2.18"  }
+solana-vote-program = { path = "../programs/vote", version = "1.2.18" }
+spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] }
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.54"

account-decoder/src/lib.rs

@@ -5,10 +5,10 @@ extern crate serde_derive;
 
 pub mod parse_account_data;
 pub mod parse_nonce;
+pub mod parse_token;
 pub mod parse_vote;
 
-use crate::parse_account_data::parse_account_data;
-use serde_json::Value;
+use crate::parse_account_data::{parse_account_data, ParsedAccount};
 use solana_sdk::{account::Account, clock::Epoch, pubkey::Pubkey};
 use std::str::FromStr;
 
@@ -27,7 +27,7 @@ pub struct UiAccount {
 #[serde(rename_all = "camelCase", untagged)]
 pub enum UiAccountData {
     Binary(String),
-    Json(Value),
+    Json(ParsedAccount),
 }
 
 impl From<Vec<u8>> for UiAccountData {

account-decoder/src/parse_account_data.rs

@@ -1,18 +1,22 @@
-use crate::{parse_nonce::parse_nonce, parse_vote::parse_vote};
+use crate::{
+    parse_nonce::parse_nonce,
+    parse_token::{parse_token, spl_token_id_v1_0},
+    parse_vote::parse_vote,
+};
 use inflector::Inflector;
-use serde_json::{json, Value};
+use serde_json::Value;
 use solana_sdk::{instruction::InstructionError, pubkey::Pubkey, system_program};
-use std::{collections::HashMap, str::FromStr};
+use std::collections::HashMap;
 use thiserror::Error;
 
 lazy_static! {
-    static ref SYSTEM_PROGRAM_ID: Pubkey =
-        Pubkey::from_str(&system_program::id().to_string()).unwrap();
-    static ref VOTE_PROGRAM_ID: Pubkey =
-        Pubkey::from_str(&solana_vote_program::id().to_string()).unwrap();
+    static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
+    static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v1_0();
+    static ref VOTE_PROGRAM_ID: Pubkey = solana_vote_program::id();
     pub static ref PARSABLE_PROGRAM_IDS: HashMap<Pubkey, ParsableAccount> = {
         let mut m = HashMap::new();
         m.insert(*SYSTEM_PROGRAM_ID, ParsableAccount::Nonce);
+        m.insert(*TOKEN_PROGRAM_ID, ParsableAccount::SplToken);
         m.insert(*VOTE_PROGRAM_ID, ParsableAccount::Vote);
         m
     };
@@ -20,6 +24,9 @@ lazy_static! {
 
 #[derive(Error, Debug)]
 pub enum ParseAccountError {
+    #[error("{0:?} account not parsable")]
+    AccountNotParsable(ParsableAccount),
+
     #[error("Program not parsable")]
     ProgramNotParsable,
 
@@ -30,24 +37,37 @@ pub enum ParseAccountError {
     SerdeJsonError(#[from] serde_json::error::Error),
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct ParsedAccount {
+    pub program: String,
+    pub parsed: Value,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum ParsableAccount {
     Nonce,
+    SplToken,
     Vote,
 }
 
-pub fn parse_account_data(program_id: &Pubkey, data: &[u8]) -> Result<Value, ParseAccountError> {
+pub fn parse_account_data(
+    program_id: &Pubkey,
+    data: &[u8],
+) -> Result<ParsedAccount, ParseAccountError> {
     let program_name = PARSABLE_PROGRAM_IDS
         .get(program_id)
         .ok_or_else(|| ParseAccountError::ProgramNotParsable)?;
     let parsed_json = match program_name {
         ParsableAccount::Nonce => serde_json::to_value(parse_nonce(data)?)?,
+        ParsableAccount::SplToken => serde_json::to_value(parse_token(data)?)?,
         ParsableAccount::Vote => serde_json::to_value(parse_vote(data)?)?,
     };
-    Ok(json!({
-        format!("{:?}", program_name).to_kebab_case(): parsed_json
-    }))
+    Ok(ParsedAccount {
+        program: format!("{:?}", program_name).to_kebab_case(),
+        parsed: parsed_json,
+    })
 }
 
 #[cfg(test)]
@@ -70,11 +90,11 @@ mod test {
         let versioned = VoteStateVersions::Current(Box::new(vote_state));
         VoteState::serialize(&versioned, &mut vote_account_data).unwrap();
         let parsed = parse_account_data(&solana_vote_program::id(), &vote_account_data).unwrap();
-        assert!(parsed.as_object().unwrap().contains_key("vote"));
+        assert_eq!(parsed.program, "vote".to_string());
 
         let nonce_data = Versions::new_current(State::Initialized(Data::default()));
         let nonce_account_data = bincode::serialize(&nonce_data).unwrap();
         let parsed = parse_account_data(&system_program::id(), &nonce_account_data).unwrap();
-        assert!(parsed.as_object().unwrap().contains_key("nonce"));
+        assert_eq!(parsed.program, "nonce".to_string());
     }
 }

account-decoder/src/parse_nonce.rs

@@ -21,7 +21,7 @@ pub fn parse_nonce(data: &[u8]) -> Result<UiNonceState, ParseAccountError> {
 
 /// A duplicate representation of NonceState for pretty JSON serialization
 #[derive(Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "camelCase", tag = "type", content = "info")]
 pub enum UiNonceState {
     Uninitialized,
     Initialized(UiNonceData),

account-decoder/src/parse_token.rs

@@ -0,0 +1,185 @@
+use crate::parse_account_data::{ParsableAccount, ParseAccountError};
+use solana_sdk::pubkey::Pubkey;
+use spl_token_v1_0::{
+    option::COption,
+    solana_sdk::pubkey::Pubkey as SplTokenPubkey,
+    state::{unpack, Account, Mint, Multisig},
+};
+use std::{mem::size_of, str::FromStr};
+
+// A helper function to convert spl_token_v1_0::id() as spl_sdk::pubkey::Pubkey to
+// solana_sdk::pubkey::Pubkey
+pub fn spl_token_id_v1_0() -> Pubkey {
+    Pubkey::from_str(&spl_token_v1_0::id().to_string()).unwrap()
+}
+
+// A helper function to convert spl_token_v1_0::native_mint::id() as spl_sdk::pubkey::Pubkey to
+// solana_sdk::pubkey::Pubkey
+pub fn spl_token_v1_0_native_mint() -> Pubkey {
+    Pubkey::from_str(&spl_token_v1_0::native_mint::id().to_string()).unwrap()
+}
+
+pub fn parse_token(data: &[u8]) -> Result<TokenAccountType, ParseAccountError> {
+    let mut data = data.to_vec();
+    if data.len() == size_of::<Account>() {
+        let account: Account = *unpack(&mut data)
+            .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?;
+        Ok(TokenAccountType::Account(UiTokenAccount {
+            mint: account.mint.to_string(),
+            owner: account.owner.to_string(),
+            amount: account.amount,
+            delegate: match account.delegate {
+                COption::Some(pubkey) => Some(pubkey.to_string()),
+                COption::None => None,
+            },
+            is_initialized: account.is_initialized,
+            is_native: account.is_native,
+            delegated_amount: account.delegated_amount,
+        }))
+    } else if data.len() == size_of::<Mint>() {
+        let mint: Mint = *unpack(&mut data)
+            .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?;
+        Ok(TokenAccountType::Mint(UiMint {
+            owner: match mint.owner {
+                COption::Some(pubkey) => Some(pubkey.to_string()),
+                COption::None => None,
+            },
+            decimals: mint.decimals,
+            is_initialized: mint.is_initialized,
+        }))
+    } else if data.len() == size_of::<Multisig>() {
+        let multisig: Multisig = *unpack(&mut data)
+            .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?;
+        Ok(TokenAccountType::Multisig(UiMultisig {
+            num_required_signers: multisig.m,
+            num_valid_signers: multisig.n,
+            is_initialized: multisig.is_initialized,
+            signers: multisig
+                .signers
+                .iter()
+                .filter_map(|pubkey| {
+                    if pubkey != &SplTokenPubkey::default() {
+                        Some(pubkey.to_string())
+                    } else {
+                        None
+                    }
+                })
+                .collect(),
+        }))
+    } else {
+        Err(ParseAccountError::AccountNotParsable(
+            ParsableAccount::SplToken,
+        ))
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase", tag = "type", content = "info")]
+pub enum TokenAccountType {
+    Account(UiTokenAccount),
+    Mint(UiMint),
+    Multisig(UiMultisig),
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct UiTokenAccount {
+    pub mint: String,
+    pub owner: String,
+    pub amount: u64,
+    pub delegate: Option<String>,
+    pub is_initialized: bool,
+    pub is_native: bool,
+    pub delegated_amount: u64,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct UiMint {
+    pub owner: Option<String>,
+    pub decimals: u8,
+    pub is_initialized: bool,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct UiMultisig {
+    pub num_required_signers: u8,
+    pub num_valid_signers: u8,
+    pub is_initialized: bool,
+    pub signers: Vec<String>,
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use spl_token_v1_0::state::unpack_unchecked;
+
+    #[test]
+    fn test_parse_token() {
+        let mint_pubkey = SplTokenPubkey::new(&[2; 32]);
+        let owner_pubkey = SplTokenPubkey::new(&[3; 32]);
+        let mut account_data = [0; size_of::<Account>()];
+        let mut account: &mut Account = unpack_unchecked(&mut account_data).unwrap();
+        account.mint = mint_pubkey;
+        account.owner = owner_pubkey;
+        account.amount = 42;
+        account.is_initialized = true;
+        assert_eq!(
+            parse_token(&account_data).unwrap(),
+            TokenAccountType::Account(UiTokenAccount {
+                mint: mint_pubkey.to_string(),
+                owner: owner_pubkey.to_string(),
+                amount: 42,
+                delegate: None,
+                is_initialized: true,
+                is_native: false,
+                delegated_amount: 0,
+            }),
+        );
+
+        let mut mint_data = [0; size_of::<Mint>()];
+        let mut mint: &mut Mint = unpack_unchecked(&mut mint_data).unwrap();
+        mint.owner = COption::Some(owner_pubkey);
+        mint.decimals = 3;
+        mint.is_initialized = true;
+        assert_eq!(
+            parse_token(&mint_data).unwrap(),
+            TokenAccountType::Mint(UiMint {
+                owner: Some(owner_pubkey.to_string()),
+                decimals: 3,
+                is_initialized: true,
+            }),
+        );
+
+        let signer1 = SplTokenPubkey::new(&[1; 32]);
+        let signer2 = SplTokenPubkey::new(&[2; 32]);
+        let signer3 = SplTokenPubkey::new(&[3; 32]);
+        let mut multisig_data = [0; size_of::<Multisig>()];
+        let mut multisig: &mut Multisig = unpack_unchecked(&mut multisig_data).unwrap();
+        let mut signers = [SplTokenPubkey::default(); 11];
+        signers[0] = signer1;
+        signers[1] = signer2;
+        signers[2] = signer3;
+        multisig.m = 2;
+        multisig.n = 3;
+        multisig.is_initialized = true;
+        multisig.signers = signers;
+        assert_eq!(
+            parse_token(&multisig_data).unwrap(),
+            TokenAccountType::Multisig(UiMultisig {
+                num_required_signers: 2,
+                num_valid_signers: 3,
+                is_initialized: true,
+                signers: vec![
+                    signer1.to_string(),
+                    signer2.to_string(),
+                    signer3.to_string()
+                ],
+            }),
+        );
+
+        let bad_data = vec![0; 4];
+        assert!(parse_token(&bad_data).is_err());
+    }
+}

account-decoder/src/parse_vote.rs

@@ -5,7 +5,7 @@ use solana_sdk::{
 };
 use solana_vote_program::vote_state::{BlockTimestamp, Lockout, VoteState};
 
-pub fn parse_vote(data: &[u8]) -> Result<UiVoteState, ParseAccountError> {
+pub fn parse_vote(data: &[u8]) -> Result<VoteAccountType, ParseAccountError> {
     let mut vote_state = VoteState::deserialize(data).map_err(ParseAccountError::from)?;
     let epoch_credits = vote_state
         .epoch_credits()
@@ -45,7 +45,7 @@ pub fn parse_vote(data: &[u8]) -> Result<UiVoteState, ParseAccountError> {
             },
         )
         .collect();
-    Ok(UiVoteState {
+    Ok(VoteAccountType::Vote(UiVoteState {
         node_pubkey: vote_state.node_pubkey.to_string(),
         authorized_withdrawer: vote_state.authorized_withdrawer.to_string(),
         commission: vote_state.commission,
@@ -55,7 +55,14 @@ pub fn parse_vote(data: &[u8]) -> Result<UiVoteState, ParseAccountError> {
         prior_voters,
         epoch_credits,
         last_timestamp: vote_state.last_timestamp,
-    })
+    }))
+}
+
+/// A wrapper enum for consistency across programs
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase", tag = "type", content = "info")]
+pub enum VoteAccountType {
+    Vote(UiVoteState),
 }
 
 /// A duplicate representation of VoteState for pretty JSON serialization
@@ -126,7 +133,10 @@ mod test {
         let mut expected_vote_state = UiVoteState::default();
         expected_vote_state.node_pubkey = Pubkey::default().to_string();
         expected_vote_state.authorized_withdrawer = Pubkey::default().to_string();
-        assert_eq!(parse_vote(&vote_account_data).unwrap(), expected_vote_state,);
+        assert_eq!(
+            parse_vote(&vote_account_data).unwrap(),
+            VoteAccountType::Vote(expected_vote_state)
+        );
 
         let bad_data = vec![0; 4];
         assert!(parse_vote(&bad_data).is_err());

accounts-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-accounts-bench"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -10,10 +10,10 @@ homepage = "https://solana.com/"
 [dependencies]
 log = "0.4.6"
 rayon = "1.3.0"
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-measure = { path = "../measure", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-measure = { path = "../measure", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
 rand = "0.7.0"
 clap = "2.33.1"
 crossbeam-channel = "0.4"

banking-bench/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-banking-bench"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,16 +13,16 @@ crossbeam-channel = "0.4"
 log = "0.4.6"
 rand = "0.7.0"
 rayon = "1.3.0"
-solana-core = { path = "../core", version = "1.2.11" }
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-streamer = { path = "../streamer", version = "1.2.11" }
-solana-perf = { path = "../perf", version = "1.2.11" }
-solana-ledger = { path = "../ledger", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-measure = { path = "../measure", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-core = { path = "../core", version = "1.2.18" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-streamer = { path = "../streamer", version = "1.2.18" }
+solana-perf = { path = "../perf", version = "1.2.18" }
+solana-ledger = { path = "../ledger", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-measure = { path = "../measure", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-exchange/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,21 +18,21 @@ rand = "0.7.0"
 rayon = "1.3.0"
 serde_json = "1.0.53"
 serde_yaml = "0.8.12"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-core = { path = "../core", version = "1.2.11" }
-solana-genesis = { path = "../genesis", version = "1.2.11" }
-solana-client = { path = "../client", version = "1.2.11" }
-solana-faucet = { path = "../faucet", version = "1.2.11" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-metrics = { path = "../metrics", version = "1.2.11" }
-solana-net-utils = { path = "../net-utils", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-core = { path = "../core", version = "1.2.18" }
+solana-genesis = { path = "../genesis", version = "1.2.18" }
+solana-client = { path = "../client", version = "1.2.18" }
+solana-faucet = { path = "../faucet", version = "1.2.18" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-metrics = { path = "../metrics", version = "1.2.18" }
+solana-net-utils = { path = "../net-utils", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 
 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "1.2.11" }
+solana-local-cluster = { path = "../local-cluster", version = "1.2.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-streamer/Cargo.toml

@@ -2,18 +2,18 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
 clap = "2.33.1"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-streamer = { path = "../streamer", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-net-utils = { path = "../net-utils", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-streamer = { path = "../streamer", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-net-utils = { path = "../net-utils", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-tps/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,28 +14,23 @@ log = "0.4.8"
 rayon = "1.3.0"
 serde_json = "1.0.53"
 serde_yaml = "0.8.12"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-core = { path = "../core", version = "1.2.11" }
-solana-genesis = { path = "../genesis", version = "1.2.11" }
-solana-client = { path = "../client", version = "1.2.11" }
-solana-faucet = { path = "../faucet", version = "1.2.11" }
-solana-librapay = { path = "../programs/librapay", version = "1.2.11", optional = true }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-metrics = { path = "../metrics", version = "1.2.11" }
-solana-measure = { path = "../measure", version = "1.2.11" }
-solana-net-utils = { path = "../net-utils", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-move-loader-program = { path = "../programs/move_loader", version = "1.2.11", optional = true }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-core = { path = "../core", version = "1.2.18" }
+solana-genesis = { path = "../genesis", version = "1.2.18" }
+solana-client = { path = "../client", version = "1.2.18" }
+solana-faucet = { path = "../faucet", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-metrics = { path = "../metrics", version = "1.2.18" }
+solana-measure = { path = "../measure", version = "1.2.18" }
+solana-net-utils = { path = "../net-utils", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 
 [dev-dependencies]
 serial_test = "0.4.0"
 serial_test_derive = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "1.2.11" }
-
-[features]
-move = ["solana-librapay", "solana-move-loader-program"]
+solana-local-cluster = { path = "../local-cluster", version = "1.2.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

bench-tps/src/bench.rs

@@ -4,8 +4,6 @@ use rayon::prelude::*;
 use solana_client::perf_utils::{sample_txs, SampleStats};
 use solana_core::gen_keys::GenKeys;
 use solana_faucet::faucet::request_airdrop_transaction;
-#[cfg(feature = "move")]
-use solana_librapay::{create_genesis, upload_mint_script, upload_payment_script};
 use solana_measure::measure::Measure;
 use solana_metrics::{self, datapoint_info};
 use solana_sdk::{
@@ -37,9 +35,6 @@ use std::{
 const MAX_TX_QUEUE_AGE: u64 =
     MAX_PROCESSING_AGE as u64 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND;
 
-#[cfg(feature = "move")]
-use solana_librapay::librapay_transaction;
-
 pub const MAX_SPENDS_PER_TX: u64 = 4;
 
 #[derive(Debug)]
@@ -51,8 +46,6 @@ pub type Result<T> = std::result::Result<T, BenchTpsError>;
 
 pub type SharedTransactions = Arc<RwLock<VecDeque<Vec<(Transaction, u64)>>>>;
 
-type LibraKeys = (Keypair, Pubkey, Pubkey, Vec<Keypair>);
-
 fn get_recent_blockhash<T: Client>(client: &T) -> (Hash, FeeCalculator) {
     loop {
         match client.get_recent_blockhash_with_commitment(CommitmentConfig::recent()) {
@@ -122,7 +115,6 @@ fn generate_chunked_transfers(
     threads: usize,
     duration: Duration,
     sustained: bool,
-    libra_args: Option<LibraKeys>,
 ) {
     // generate and send transactions for the specified duration
     let start = Instant::now();
@@ -137,7 +129,6 @@ fn generate_chunked_transfers(
             &dest_keypair_chunks[chunk_index],
             threads,
             reclaim_lamports_back_to_source_account,
-            &libra_args,
         );
 
         // In sustained mode, overlap the transfers with generation. This has higher average
@@ -205,12 +196,7 @@ where
         .collect()
 }
 
-pub fn do_bench_tps<T>(
-    client: Arc<T>,
-    config: Config,
-    gen_keypairs: Vec<Keypair>,
-    libra_args: Option<LibraKeys>,
-) -> u64
+pub fn do_bench_tps<T>(client: Arc<T>, config: Config, gen_keypairs: Vec<Keypair>) -> u64
 where
     T: 'static + Client + Send + Sync,
 {
@@ -294,7 +280,6 @@ where
         threads,
         duration,
         sustained,
-        libra_args,
     );
 
     // Stop the sampling threads so it will collect the stats
@@ -340,52 +325,6 @@ fn metrics_submit_lamport_balance(lamport_balance: u64) {
     );
 }
 
-#[cfg(feature = "move")]
-fn generate_move_txs(
-    source: &[&Keypair],
-    dest: &VecDeque<&Keypair>,
-    reclaim: bool,
-    move_keypairs: &[Keypair],
-    libra_pay_program_id: &Pubkey,
-    libra_mint_id: &Pubkey,
-    blockhash: &Hash,
-) -> Vec<(Transaction, u64)> {
-    let count = move_keypairs.len() / 2;
-    let source_move = &move_keypairs[..count];
-    let dest_move = &move_keypairs[count..];
-    let pairs: Vec<_> = if !reclaim {
-        source_move
-            .iter()
-            .zip(dest_move.iter())
-            .zip(source.iter())
-            .collect()
-    } else {
-        dest_move
-            .iter()
-            .zip(source_move.iter())
-            .zip(dest.iter())
-            .collect()
-    };
-
-    pairs
-        .par_iter()
-        .map(|((from, to), payer)| {
-            (
-                librapay_transaction::transfer(
-                    libra_pay_program_id,
-                    libra_mint_id,
-                    &payer,
-                    &from,
-                    &to.pubkey(),
-                    1,
-                    *blockhash,
-                ),
-                timestamp(),
-            )
-        })
-        .collect()
-}
-
 fn generate_system_txs(
     source: &[&Keypair],
     dest: &VecDeque<&Keypair>,
@@ -416,7 +355,6 @@ fn generate_txs(
     dest: &VecDeque<&Keypair>,
     threads: usize,
     reclaim: bool,
-    libra_args: &Option<LibraKeys>,
 ) {
     let blockhash = *blockhash.read().unwrap();
     let tx_count = source.len();
@@ -426,33 +364,7 @@ fn generate_txs(
     );
     let signing_start = Instant::now();
 
-    let transactions = if let Some((
-        _libra_genesis_keypair,
-        _libra_pay_program_id,
-        _libra_mint_program_id,
-        _libra_keys,
-    )) = libra_args
-    {
-        #[cfg(not(feature = "move"))]
-        {
-            return;
-        }
-
-        #[cfg(feature = "move")]
-        {
-            generate_move_txs(
-                source,
-                dest,
-                reclaim,
-                &_libra_keys,
-                _libra_pay_program_id,
-                &_libra_genesis_keypair.pubkey(),
-                &blockhash,
-            )
-        }
-    } else {
-        generate_system_txs(source, dest, reclaim, &blockhash)
-    };
+    let transactions = generate_system_txs(source, dest, reclaim, &blockhash);
 
     let duration = signing_start.elapsed();
     let ns = duration.as_secs() * 1_000_000_000 + u64::from(duration.subsec_nanos());
@@ -954,181 +866,13 @@ pub fn generate_keypairs(seed_keypair: &Keypair, count: u64) -> (Vec<Keypair>, u
     (rnd.gen_n_keypairs(total_keys), extra)
 }
 
-#[cfg(feature = "move")]
-fn fund_move_keys<T: Client>(
-    client: &T,
-    funding_key: &Keypair,
-    keypairs: &[Keypair],
-    total: u64,
-    libra_pay_program_id: &Pubkey,
-    libra_mint_program_id: &Pubkey,
-    libra_genesis_key: &Keypair,
-) {
-    let (mut blockhash, _fee_calculator) = get_recent_blockhash(client);
-
-    info!("creating the libra funding account..");
-    let libra_funding_key = Keypair::new();
-    let tx = librapay_transaction::create_account(funding_key, &libra_funding_key, 1, blockhash);
-    client
-        .send_and_confirm_message(&[funding_key, &libra_funding_key], tx.message)
-        .unwrap();
-
-    info!("minting to funding keypair");
-    let tx = librapay_transaction::mint_tokens(
-        &libra_mint_program_id,
-        funding_key,
-        libra_genesis_key,
-        &libra_funding_key.pubkey(),
-        total,
-        blockhash,
-    );
-    client
-        .send_and_confirm_message(&[funding_key, libra_genesis_key], tx.message)
-        .unwrap();
-
-    info!("creating {} move accounts...", keypairs.len());
-    let total_len = keypairs.len();
-    let create_len = 5;
-    let mut funding_time = Measure::start("funding_time");
-    for (i, keys) in keypairs.chunks(create_len).enumerate() {
-        if client
-            .get_balance_with_commitment(&keys[0].pubkey(), CommitmentConfig::recent())
-            .unwrap_or(0)
-            > 0
-        {
-            // already created these accounts.
-            break;
-        }
-
-        let keypairs: Vec<_> = keys.iter().map(|k| k).collect();
-        let tx = librapay_transaction::create_accounts(funding_key, &keypairs, 1, blockhash);
-        let ser_size = bincode::serialized_size(&tx).unwrap();
-        let mut keys = vec![funding_key];
-        keys.extend(&keypairs);
-        client.send_and_confirm_message(&keys, tx.message).unwrap();
-
-        if i % 10 == 0 {
-            info!(
-                "created {} accounts of {} (size {})",
-                i,
-                total_len / create_len,
-                ser_size,
-            );
-        }
-    }
-
-    const NUM_FUNDING_KEYS: usize = 10;
-    let funding_keys: Vec<_> = (0..NUM_FUNDING_KEYS).map(|_| Keypair::new()).collect();
-    let pubkey_amounts: Vec<_> = funding_keys
-        .iter()
-        .map(|key| (key.pubkey(), total / NUM_FUNDING_KEYS as u64))
-        .collect();
-    let instructions = system_instruction::transfer_many(&funding_key.pubkey(), &pubkey_amounts);
-    let message = Message::new(&instructions, Some(&funding_key.pubkey()));
-    let tx = Transaction::new(&[funding_key], message, blockhash);
-    client
-        .send_and_confirm_message(&[funding_key], tx.message)
-        .unwrap();
-    let mut balance = 0;
-    for _ in 0..20 {
-        if let Ok(balance_) = client
-            .get_balance_with_commitment(&funding_keys[0].pubkey(), CommitmentConfig::recent())
-        {
-            if balance_ > 0 {
-                balance = balance_;
-                break;
-            }
-        }
-        sleep(Duration::from_millis(100));
-    }
-    assert!(balance > 0);
-    info!(
-        "funded multiple funding accounts with {:?} lanports",
-        balance
-    );
-
-    let libra_funding_keys: Vec<_> = (0..NUM_FUNDING_KEYS).map(|_| Keypair::new()).collect();
-    for (i, key) in libra_funding_keys.iter().enumerate() {
-        let tx = librapay_transaction::create_account(&funding_keys[i], &key, 1, blockhash);
-        client
-            .send_and_confirm_message(&[&funding_keys[i], &key], tx.message)
-            .unwrap();
-
-        let tx = librapay_transaction::transfer(
-            libra_pay_program_id,
-            &libra_genesis_key.pubkey(),
-            &funding_keys[i],
-            &libra_funding_key,
-            &key.pubkey(),
-            total / NUM_FUNDING_KEYS as u64,
-            blockhash,
-        );
-        client
-            .send_and_confirm_message(&[&funding_keys[i], &libra_funding_key], tx.message)
-            .unwrap();
-
-        info!("funded libra funding key {}", i);
-    }
-
-    let keypair_count = keypairs.len();
-    let amount = total / (keypair_count as u64);
-    for (i, keys) in keypairs[..keypair_count]
-        .chunks(NUM_FUNDING_KEYS)
-        .enumerate()
-    {
-        for (j, key) in keys.iter().enumerate() {
-            let tx = librapay_transaction::transfer(
-                libra_pay_program_id,
-                &libra_genesis_key.pubkey(),
-                &funding_keys[j],
-                &libra_funding_keys[j],
-                &key.pubkey(),
-                amount,
-                blockhash,
-            );
-
-            let _sig = client
-                .async_send_transaction(tx.clone())
-                .expect("create_account in generate_and_fund_keypairs");
-        }
-
-        for (j, key) in keys.iter().enumerate() {
-            let mut times = 0;
-            loop {
-                let balance =
-                    librapay_transaction::get_libra_balance(client, &key.pubkey()).unwrap();
-                if balance >= amount {
-                    break;
-                } else if times > 20 {
-                    info!("timed out.. {} key: {} balance: {}", i, j, balance);
-                    break;
-                } else {
-                    times += 1;
-                    sleep(Duration::from_millis(100));
-                }
-            }
-        }
-
-        info!(
-            "funded group {} of {}",
-            i + 1,
-            keypairs.len() / NUM_FUNDING_KEYS
-        );
-        blockhash = get_recent_blockhash(client).0;
-    }
-
-    funding_time.stop();
-    info!("done funding keys, took {} ms", funding_time.as_ms());
-}
-
 pub fn generate_and_fund_keypairs<T: 'static + Client + Send + Sync>(
     client: Arc<T>,
     faucet_addr: Option<SocketAddr>,
     funding_key: &Keypair,
     keypair_count: usize,
     lamports_per_account: u64,
-    use_move: bool,
-) -> Result<(Vec<Keypair>, Option<LibraKeys>)> {
+) -> Result<Vec<Keypair>> {
     info!("Creating {} keypairs...", keypair_count);
     let (mut keypairs, extra) = generate_keypairs(funding_key, keypair_count as u64);
     info!("Get lamports...");
@@ -1141,12 +885,6 @@ pub fn generate_and_fund_keypairs<T: 'static + Client + Send + Sync>(
     let last_key = keypairs[keypair_count - 1].pubkey();
     let last_keypair_balance = client.get_balance(&last_key).unwrap_or(0);
 
-    #[cfg(feature = "move")]
-    let mut move_keypairs_ret = None;
-
-    #[cfg(not(feature = "move"))]
-    let move_keypairs_ret = None;
-
     // Repeated runs will eat up keypair balances from transaction fees. In order to quickly
     //   start another bench-tps run without re-funding all of the keypairs, check if the
     //   keypairs still have at least 80% of the expected funds. That should be enough to
@@ -1157,10 +895,7 @@ pub fn generate_and_fund_keypairs<T: 'static + Client + Send + Sync>(
         let max_fee = fee_rate_governor.max_lamports_per_signature;
         let extra_fees = extra * max_fee;
         let total_keypairs = keypairs.len() as u64 + 1; // Add one for funding keypair
-        let mut total = lamports_per_account * total_keypairs + extra_fees;
-        if use_move {
-            total *= 3;
-        }
+        let total = lamports_per_account * total_keypairs + extra_fees;
 
         let funding_key_balance = client.get_balance(&funding_key.pubkey()).unwrap_or(0);
         info!(
@@ -1172,40 +907,6 @@ pub fn generate_and_fund_keypairs<T: 'static + Client + Send + Sync>(
             airdrop_lamports(client.as_ref(), &faucet_addr.unwrap(), funding_key, total)?;
         }
 
-        #[cfg(feature = "move")]
-        {
-            if use_move {
-                let libra_genesis_keypair =
-                    create_genesis(&funding_key, client.as_ref(), 10_000_000);
-                let libra_mint_program_id = upload_mint_script(&funding_key, client.as_ref());
-                let libra_pay_program_id = upload_payment_script(&funding_key, client.as_ref());
-
-                // Generate another set of keypairs for move accounts.
-                // Still fund the solana ones which will be used for fees.
-                let seed = [0u8; 32];
-                let mut rnd = GenKeys::new(seed);
-                let move_keypairs = rnd.gen_n_keypairs(keypair_count as u64);
-                fund_move_keys(
-                    client.as_ref(),
-                    funding_key,
-                    &move_keypairs,
-                    total / 3,
-                    &libra_pay_program_id,
-                    &libra_mint_program_id,
-                    &libra_genesis_keypair,
-                );
-                move_keypairs_ret = Some((
-                    libra_genesis_keypair,
-                    libra_pay_program_id,
-                    libra_mint_program_id,
-                    move_keypairs,
-                ));
-
-                // Give solana keys 1/3 and move keys 1/3 the lamports. Keep 1/3 for fees.
-                total /= 3;
-            }
-        }
-
         fund_keys(
             client,
             funding_key,
@@ -1219,7 +920,7 @@ pub fn generate_and_fund_keypairs<T: 'static + Client + Send + Sync>(
     // 'generate_keypairs' generates extra keys to be able to have size-aligned funding batches for fund_keys.
     keypairs.truncate(keypair_count);
 
-    Ok((keypairs, move_keypairs_ret))
+    Ok(keypairs)
 }
 
 #[cfg(test)]
@@ -1243,11 +944,11 @@ mod tests {
         config.duration = Duration::from_secs(5);
 
         let keypair_count = config.tx_count * config.keypair_multiplier;
-        let (keypairs, _move_keypairs) =
-            generate_and_fund_keypairs(client.clone(), None, &config.id, keypair_count, 20, false)
+        let keypairs =
+            generate_and_fund_keypairs(client.clone(), None, &config.id, keypair_count, 20)
                 .unwrap();
 
-        do_bench_tps(client, config, keypairs, None);
+        do_bench_tps(client, config, keypairs);
     }
 
     #[test]
@@ -1258,9 +959,8 @@ mod tests {
         let keypair_count = 20;
         let lamports = 20;
 
-        let (keypairs, _move_keypairs) =
-            generate_and_fund_keypairs(client.clone(), None, &id, keypair_count, lamports, false)
-                .unwrap();
+        let keypairs =
+            generate_and_fund_keypairs(client.clone(), None, &id, keypair_count, lamports).unwrap();
 
         for kp in &keypairs {
             assert_eq!(
@@ -1282,9 +982,8 @@ mod tests {
         let keypair_count = 20;
         let lamports = 20;
 
-        let (keypairs, _move_keypairs) =
-            generate_and_fund_keypairs(client.clone(), None, &id, keypair_count, lamports, false)
-                .unwrap();
+        let keypairs =
+            generate_and_fund_keypairs(client.clone(), None, &id, keypair_count, lamports).unwrap();
 
         for kp in &keypairs {
             assert_eq!(client.get_balance(&kp.pubkey()).unwrap(), lamports);

bench-tps/src/cli.rs

@@ -23,7 +23,6 @@ pub struct Config {
     pub read_from_client_file: bool,
     pub target_lamports_per_signature: u64,
     pub multi_client: bool,
-    pub use_move: bool,
     pub num_lamports_per_account: u64,
     pub target_slots_per_epoch: u64,
 }
@@ -46,7 +45,6 @@ impl Default for Config {
             read_from_client_file: false,
             target_lamports_per_signature: FeeRateGovernor::default().target_lamports_per_signature,
             multi_client: true,
-            use_move: false,
             num_lamports_per_account: NUM_LAMPORTS_PER_ACCOUNT_DEFAULT,
             target_slots_per_epoch: 0,
         }
@@ -109,11 +107,6 @@ pub fn build_args<'a, 'b>(version: &'b str) -> App<'a, 'b> {
                 .long("sustained")
                 .help("Use sustained performance mode vs. peak mode. This overlaps the tx generation with transfers."),
         )
-        .arg(
-            Arg::with_name("use-move")
-                .long("use-move")
-                .help("Use Move language transactions to perform transfers."),
-        )
         .arg(
             Arg::with_name("no-multi-client")
                 .long("no-multi-client")
@@ -263,7 +256,6 @@ pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {
         args.target_lamports_per_signature = v.to_string().parse().expect("can't parse lamports");
     }
 
-    args.use_move = matches.is_present("use-move");
     args.multi_client = !matches.is_present("no-multi-client");
 
     if let Some(v) = matches.value_of("num_lamports_per_account") {

bench-tps/src/main.rs

@@ -29,7 +29,6 @@ fn main() {
         write_to_client_file,
         read_from_client_file,
         target_lamports_per_signature,
-        use_move,
         multi_client,
         num_lamports_per_account,
         ..
@@ -86,7 +85,7 @@ fn main() {
         Arc::new(get_client(&nodes))
     };
 
-    let (keypairs, move_keypairs) = if *read_from_client_file && !use_move {
+    let keypairs = if *read_from_client_file {
         let path = Path::new(&client_ids_and_stake_file);
         let file = File::open(path).unwrap();
 
@@ -115,8 +114,8 @@ fn main() {
         // Sort keypairs so that do_bench_tps() uses the same subset of accounts for each run.
         // This prevents the amount of storage needed for bench-tps accounts from creeping up
         // across multiple runs.
-        keypairs.sort_by(|x, y| x.pubkey().to_string().cmp(&y.pubkey().to_string()));
-        (keypairs, None)
+        keypairs.sort_by_key(|x| x.pubkey().to_string());
+        keypairs
     } else {
         generate_and_fund_keypairs(
             client.clone(),
@@ -124,7 +123,6 @@ fn main() {
             &id,
             keypair_count,
             *num_lamports_per_account,
-            *use_move,
         )
         .unwrap_or_else(|e| {
             eprintln!("Error could not fund keys: {:?}", e);
@@ -132,5 +130,5 @@ fn main() {
         })
     };
 
-    do_bench_tps(client, cli_config, keypairs, move_keypairs);
+    do_bench_tps(client, cli_config, keypairs);
 }

bench-tps/tests/bench_tps.rs

@@ -6,17 +6,11 @@ use solana_core::cluster_info::VALIDATOR_PORT_RANGE;
 use solana_core::validator::ValidatorConfig;
 use solana_faucet::faucet::run_local_faucet;
 use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};
-#[cfg(feature = "move")]
-use solana_sdk::move_loader::solana_move_loader_program;
 use solana_sdk::signature::{Keypair, Signer};
 use std::sync::{mpsc::channel, Arc};
 use std::time::Duration;
 
 fn test_bench_tps_local_cluster(config: Config) {
-    #[cfg(feature = "move")]
-    let native_instruction_processors = vec![solana_move_loader_program()];
-
-    #[cfg(not(feature = "move"))]
     let native_instruction_processors = vec![];
 
     solana_logger::setup();
@@ -48,17 +42,16 @@ fn test_bench_tps_local_cluster(config: Config) {
     let lamports_per_account = 100;
 
     let keypair_count = config.tx_count * config.keypair_multiplier;
-    let (keypairs, move_keypairs) = generate_and_fund_keypairs(
+    let keypairs = generate_and_fund_keypairs(
         client.clone(),
         Some(faucet_addr),
         &config.id,
         keypair_count,
         lamports_per_account,
-        config.use_move,
     )
     .unwrap();
 
-    let _total = do_bench_tps(client, config, keypairs, move_keypairs);
+    let _total = do_bench_tps(client, config, keypairs);
 
     #[cfg(not(debug_assertions))]
     assert!(_total > 100);
@@ -73,14 +66,3 @@ fn test_bench_tps_local_cluster_solana() {
 
     test_bench_tps_local_cluster(config);
 }
-
-#[test]
-#[serial]
-fn test_bench_tps_local_cluster_move() {
-    let mut config = Config::default();
-    config.tx_count = 100;
-    config.duration = Duration::from_secs(10);
-    config.use_move = true;
-
-    test_bench_tps_local_cluster(config);
-}

ci/buildkite-secondary.yml

@@ -16,6 +16,3 @@ steps:
     timeout_in_minutes: 240
     name: "publish crate"
     branches: "!master"
-    #  - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-move.sh"
-    #    name: "move"
-    #    timeout_in_minutes: 20

ci/publish-tarball.sh

@@ -45,7 +45,7 @@ linux)
   TARGET=x86_64-unknown-linux-gnu
   ;;
 windows)
-  TARGET=x86_64-pc-windows-gnu
+  TARGET=x86_64-pc-windows-msvc
   ;;
 *)
   echo CI_OS_NAME unset

ci/semver_bash/README.md

@@ -27,5 +27,5 @@ Alternatively, you can source it from within a script:
     local PATCH=0  
     local SPECIAL=""
     
-    semverParseInto "1.2.11" MAJOR MINOR PATCH SPECIAL
+    semverParseInto "1.2.18" MAJOR MINOR PATCH SPECIAL
     semverParseInto "3.2.1" MAJOR MINOR PATCH SPECIAL

ci/test-move.sh

@@ -1 +0,0 @@
-test-stable.sh

ci/test-stable.sh

@@ -47,7 +47,6 @@ echo "Executing $testName"
 case $testName in
 test-stable)
   _ cargo +"$rust_stable" test --jobs "$NPROC" --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
-  _ cargo +"$rust_stable" test --manifest-path bench-tps/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
   ;;
 test-stable-perf)
   ci/affects-files.sh \
@@ -93,27 +92,6 @@ test-stable-perf)
   _ cargo +"$rust_stable" build --bins ${V:+--verbose}
   _ cargo +"$rust_stable" test --package solana-perf --package solana-ledger --package solana-core --lib ${V:+--verbose} -- --nocapture
   ;;
-test-move)
-  ci/affects-files.sh \
-    Cargo.lock$ \
-    Cargo.toml$ \
-    ^ci/rust-version.sh \
-    ^ci/test-stable.sh \
-    ^ci/test-move.sh \
-    ^programs/move_loader \
-    ^programs/librapay \
-    ^logger/ \
-    ^runtime/ \
-    ^sdk/ \
-  || {
-    annotate --style info \
-      "Skipped $testName as no relevant files were modified"
-    exit 0
-  }
-  _ cargo +"$rust_stable" test --manifest-path programs/move_loader/Cargo.toml ${V:+--verbose} -- --nocapture
-  _ cargo +"$rust_stable" test --manifest-path programs/librapay/Cargo.toml ${V:+--verbose} -- --nocapture
-  exit 0
-  ;;
 test-local-cluster)
   _ cargo +"$rust_stable" build --release --bins ${V:+--verbose}
   _ cargo +"$rust_stable" test --release --package solana-local-cluster ${V:+--verbose} -- --nocapture --test-threads=1

clap-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,8 +11,8 @@ edition = "2018"
 [dependencies]
 clap = "2.33.0"
 rpassword = "4.0"
-solana-remote-wallet = { path = "../remote-wallet", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
 thiserror = "1.0.11"
 tiny-bip39 = "0.7.0"
 url = "2.1.0"

cli-config/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"

cli/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -27,29 +27,29 @@ reqwest = { version = "0.10.4", default-features = false, features = ["blocking"
 serde = "1.0.110"
 serde_derive = "1.0.103"
 serde_json = "1.0.53"
-solana-account-decoder = { path = "../account-decoder", version = "1.2.11" }
-solana-budget-program = { path = "../programs/budget", version = "1.2.11" }
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-cli-config = { path = "../cli-config", version = "1.2.11" }
-solana-client = { path = "../client", version = "1.2.11" }
-solana-config-program = { path = "../programs/config", version = "1.2.11" }
-solana-faucet = { path = "../faucet", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-net-utils = { path = "../net-utils", version = "1.2.11" }
-solana-remote-wallet = { path = "../remote-wallet", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-stake-program = { path = "../programs/stake", version = "1.2.11" }
-solana-transaction-status = { path = "../transaction-status", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
-solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
-solana-vote-signer = { path = "../vote-signer", version = "1.2.11" }
+solana-account-decoder = { path = "../account-decoder", version = "1.2.18" }
+solana-budget-program = { path = "../programs/budget", version = "1.2.18" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-cli-config = { path = "../cli-config", version = "1.2.18" }
+solana-client = { path = "../client", version = "1.2.18" }
+solana-config-program = { path = "../programs/config", version = "1.2.18" }
+solana-faucet = { path = "../faucet", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-net-utils = { path = "../net-utils", version = "1.2.18" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-stake-program = { path = "../programs/stake", version = "1.2.18" }
+solana-transaction-status = { path = "../transaction-status", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
+solana-vote-program = { path = "../programs/vote", version = "1.2.18" }
+solana-vote-signer = { path = "../vote-signer", version = "1.2.18" }
 thiserror = "1.0.19"
 url = "2.1.1"
 
 [dev-dependencies]
-solana-core = { path = "../core", version = "1.2.11" }
-solana-budget-program = { path = "../programs/budget", version = "1.2.11" }
+solana-core = { path = "../core", version = "1.2.18" }
+solana-budget-program = { path = "../programs/budget", version = "1.2.18" }
 tempfile = "3.1.0"
 
 [[bin]]

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -19,11 +19,11 @@ reqwest = { version = "0.10.4", default-features = false, features = ["blocking"
 serde = "1.0.110"
 serde_derive = "1.0.103"
 serde_json = "1.0.53"
-solana-account-decoder = { path = "../account-decoder", version = "1.2.11" }
-solana-net-utils = { path = "../net-utils", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-transaction-status = { path = "../transaction-status", version = "1.2.11" }
-solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
+solana-account-decoder = { path = "../account-decoder", version = "1.2.18" }
+solana-net-utils = { path = "../net-utils", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-transaction-status = { path = "../transaction-status", version = "1.2.18" }
+solana-vote-program = { path = "../programs/vote", version = "1.2.18" }
 thiserror = "1.0"
 tungstenite = "0.10.1"
 url = "2.1.1"
@@ -32,7 +32,7 @@ url = "2.1.1"
 assert_matches = "1.3.0"
 jsonrpc-core = "14.1.0"
 jsonrpc-http-server = "14.1.0"
-solana-logger = { path = "../logger", version = "1.2.11" }
+solana-logger = { path = "../logger", version = "1.2.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

client/src/rpc_client.rs

@@ -2,8 +2,8 @@ use crate::{
     client_error::{ClientError, ClientErrorKind, Result as ClientResult},
     http_sender::HttpSender,
     mock_sender::{MockSender, Mocks},
-    rpc_config::{RpcLargestAccountsConfig, RpcSendTransactionConfig},
-    rpc_request::{RpcError, RpcRequest},
+    rpc_config::{RpcLargestAccountsConfig, RpcSendTransactionConfig, RpcTokenAccountsFilter},
+    rpc_request::{RpcError, RpcRequest, TokenAccountsFilter},
     rpc_response::*,
     rpc_sender::RpcSender,
 };
@@ -11,7 +11,10 @@ use bincode::serialize;
 use indicatif::{ProgressBar, ProgressStyle};
 use log::*;
 use serde_json::{json, Value};
-use solana_account_decoder::UiAccount;
+use solana_account_decoder::{
+    parse_token::{parse_token, TokenAccountType, UiMint, UiMultisig, UiTokenAccount},
+    UiAccount,
+};
 use solana_sdk::{
     account::Account,
     clock::{
@@ -511,17 +514,7 @@ impl RpcClient {
     pub fn get_program_accounts(&self, pubkey: &Pubkey) -> ClientResult<Vec<(Pubkey, Account)>> {
         let accounts: Vec<RpcKeyedAccount> =
             self.send(RpcRequest::GetProgramAccounts, json!([pubkey.to_string()]))?;
-        let mut pubkey_accounts: Vec<(Pubkey, Account)> = Vec::new();
-        for RpcKeyedAccount { pubkey, account } in accounts.into_iter() {
-            let pubkey = pubkey.parse().map_err(|_| {
-                ClientError::new_with_request(
-                    RpcError::ParseError("Pubkey".to_string()).into(),
-                    RpcRequest::GetProgramAccounts,
-                )
-            })?;
-            pubkey_accounts.push((pubkey, account.decode().unwrap()));
-        }
-        Ok(pubkey_accounts)
+        parse_keyed_accounts(accounts, RpcRequest::GetProgramAccounts)
     }
 
     /// Request the transaction count.
@@ -668,6 +661,211 @@ impl RpcClient {
         Ok(hash)
     }
 
+    pub fn get_token_account(&self, pubkey: &Pubkey) -> ClientResult<Option<UiTokenAccount>> {
+        Ok(self
+            .get_token_account_with_commitment(pubkey, CommitmentConfig::default())?
+            .value)
+    }
+
+    pub fn get_token_account_with_commitment(
+        &self,
+        pubkey: &Pubkey,
+        commitment_config: CommitmentConfig,
+    ) -> RpcResult<Option<UiTokenAccount>> {
+        let Response {
+            context,
+            value: account,
+        } = self.get_account_with_commitment(pubkey, commitment_config)?;
+
+        Ok(Response {
+            context,
+            value: account
+                .map(|account| match parse_token(&account.data) {
+                    Ok(TokenAccountType::Account(ui_token_account)) => Some(ui_token_account),
+                    _ => None,
+                })
+                .flatten(),
+        })
+    }
+
+    pub fn get_token_mint(&self, pubkey: &Pubkey) -> ClientResult<Option<UiMint>> {
+        Ok(self
+            .get_token_mint_with_commitment(pubkey, CommitmentConfig::default())?
+            .value)
+    }
+
+    pub fn get_token_mint_with_commitment(
+        &self,
+        pubkey: &Pubkey,
+        commitment_config: CommitmentConfig,
+    ) -> RpcResult<Option<UiMint>> {
+        let Response {
+            context,
+            value: account,
+        } = self.get_account_with_commitment(pubkey, commitment_config)?;
+
+        Ok(Response {
+            context,
+            value: account
+                .map(|account| match parse_token(&account.data) {
+                    Ok(TokenAccountType::Mint(ui_token_mint)) => Some(ui_token_mint),
+                    _ => None,
+                })
+                .flatten(),
+        })
+    }
+
+    pub fn get_token_multisig(&self, pubkey: &Pubkey) -> ClientResult<Option<UiMultisig>> {
+        Ok(self
+            .get_token_multisig_with_commitment(pubkey, CommitmentConfig::default())?
+            .value)
+    }
+
+    pub fn get_token_multisig_with_commitment(
+        &self,
+        pubkey: &Pubkey,
+        commitment_config: CommitmentConfig,
+    ) -> RpcResult<Option<UiMultisig>> {
+        let Response {
+            context,
+            value: account,
+        } = self.get_account_with_commitment(pubkey, commitment_config)?;
+
+        Ok(Response {
+            context,
+            value: account
+                .map(|account| match parse_token(&account.data) {
+                    Ok(TokenAccountType::Multisig(ui_token_multisig)) => Some(ui_token_multisig),
+                    _ => None,
+                })
+                .flatten(),
+        })
+    }
+
+    pub fn get_token_account_balance(&self, pubkey: &Pubkey) -> ClientResult<RpcTokenAmount> {
+        Ok(self
+            .get_token_account_balance_with_commitment(pubkey, CommitmentConfig::default())?
+            .value)
+    }
+
+    pub fn get_token_account_balance_with_commitment(
+        &self,
+        pubkey: &Pubkey,
+        commitment_config: CommitmentConfig,
+    ) -> RpcResult<RpcTokenAmount> {
+        self.send(
+            RpcRequest::GetTokenAccountBalance,
+            json!([pubkey.to_string(), commitment_config]),
+        )
+    }
+
+    pub fn get_token_accounts_by_delegate(
+        &self,
+        delegate: &Pubkey,
+        token_account_filter: TokenAccountsFilter,
+    ) -> ClientResult<Vec<(Pubkey, UiTokenAccount)>> {
+        Ok(self
+            .get_token_accounts_by_delegate_with_commitment(
+                delegate,
+                token_account_filter,
+                CommitmentConfig::default(),
+            )?
+            .value)
+    }
+
+    pub fn get_token_accounts_by_delegate_with_commitment(
+        &self,
+        delegate: &Pubkey,
+        token_account_filter: TokenAccountsFilter,
+        commitment_config: CommitmentConfig,
+    ) -> RpcResult<Vec<(Pubkey, UiTokenAccount)>> {
+        let token_account_filter = match token_account_filter {
+            TokenAccountsFilter::Mint(mint) => RpcTokenAccountsFilter::Mint(mint.to_string()),
+            TokenAccountsFilter::ProgramId(program_id) => {
+                RpcTokenAccountsFilter::ProgramId(program_id.to_string())
+            }
+        };
+        let Response {
+            context,
+            value: accounts,
+        } = self.send(
+            RpcRequest::GetTokenAccountsByDelegate,
+            json!([
+                delegate.to_string(),
+                token_account_filter,
+                commitment_config
+            ]),
+        )?;
+        let pubkey_accounts = accounts_to_token_accounts(parse_keyed_accounts(
+            accounts,
+            RpcRequest::GetTokenAccountsByDelegate,
+        )?);
+        Ok(Response {
+            context,
+            value: pubkey_accounts,
+        })
+    }
+
+    pub fn get_token_accounts_by_owner(
+        &self,
+        owner: &Pubkey,
+        token_account_filter: TokenAccountsFilter,
+    ) -> ClientResult<Vec<(Pubkey, UiTokenAccount)>> {
+        Ok(self
+            .get_token_accounts_by_owner_with_commitment(
+                owner,
+                token_account_filter,
+                CommitmentConfig::default(),
+            )?
+            .value)
+    }
+
+    pub fn get_token_accounts_by_owner_with_commitment(
+        &self,
+        owner: &Pubkey,
+        token_account_filter: TokenAccountsFilter,
+        commitment_config: CommitmentConfig,
+    ) -> RpcResult<Vec<(Pubkey, UiTokenAccount)>> {
+        let token_account_filter = match token_account_filter {
+            TokenAccountsFilter::Mint(mint) => RpcTokenAccountsFilter::Mint(mint.to_string()),
+            TokenAccountsFilter::ProgramId(program_id) => {
+                RpcTokenAccountsFilter::ProgramId(program_id.to_string())
+            }
+        };
+        let Response {
+            context,
+            value: accounts,
+        } = self.send(
+            RpcRequest::GetTokenAccountsByOwner,
+            json!([owner.to_string(), token_account_filter, commitment_config]),
+        )?;
+        let pubkey_accounts = accounts_to_token_accounts(parse_keyed_accounts(
+            accounts,
+            RpcRequest::GetTokenAccountsByDelegate,
+        )?);
+        Ok(Response {
+            context,
+            value: pubkey_accounts,
+        })
+    }
+
+    pub fn get_token_supply(&self, mint: &Pubkey) -> ClientResult<RpcTokenAmount> {
+        Ok(self
+            .get_token_supply_with_commitment(mint, CommitmentConfig::default())?
+            .value)
+    }
+
+    pub fn get_token_supply_with_commitment(
+        &self,
+        mint: &Pubkey,
+        commitment_config: CommitmentConfig,
+    ) -> RpcResult<RpcTokenAmount> {
+        self.send(
+            RpcRequest::GetTokenSupply,
+            json!([mint.to_string(), commitment_config]),
+        )
+    }
+
     pub fn poll_balance_with_timeout_and_commitment(
         &self,
         pubkey: &Pubkey,
@@ -1009,6 +1207,43 @@ pub fn get_rpc_request_str(rpc_addr: SocketAddr, tls: bool) -> String {
     }
 }
 
+fn parse_keyed_accounts(
+    accounts: Vec<RpcKeyedAccount>,
+    request: RpcRequest,
+) -> ClientResult<Vec<(Pubkey, Account)>> {
+    let mut pubkey_accounts: Vec<(Pubkey, Account)> = Vec::new();
+    for RpcKeyedAccount { pubkey, account } in accounts.into_iter() {
+        let pubkey = pubkey.parse().map_err(|_| {
+            ClientError::new_with_request(
+                RpcError::ParseError("Pubkey".to_string()).into(),
+                request,
+            )
+        })?;
+        pubkey_accounts.push((
+            pubkey,
+            account.decode().ok_or_else(|| {
+                ClientError::new_with_request(
+                    RpcError::ParseError("Account from rpc".to_string()).into(),
+                    request,
+                )
+            })?,
+        ));
+    }
+    Ok(pubkey_accounts)
+}
+
+fn accounts_to_token_accounts(
+    pubkey_accounts: Vec<(Pubkey, Account)>,
+) -> Vec<(Pubkey, UiTokenAccount)> {
+    pubkey_accounts
+        .into_iter()
+        .filter_map(|(pubkey, account)| match parse_token(&account.data) {
+            Ok(TokenAccountType::Account(ui_token_account)) => Some((pubkey, ui_token_account)),
+            _ => None,
+        })
+        .collect()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

client/src/rpc_config.rs

@@ -58,3 +58,10 @@ pub struct RpcProgramAccountsConfig {
     #[serde(flatten)]
     pub account_config: RpcAccountInfoConfig,
 }
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum RpcTokenAccountsFilter {
+    Mint(String),
+    ProgramId(String),
+}

client/src/rpc_request.rs

@@ -1,4 +1,5 @@
 use serde_json::{json, Value};
+use solana_sdk::pubkey::Pubkey;
 use std::fmt;
 use thiserror::Error;
 
@@ -36,6 +37,10 @@ pub enum RpcRequest {
     GetSlotsPerSegment,
     GetStoragePubkeysForSlot,
     GetSupply,
+    GetTokenAccountBalance,
+    GetTokenAccountsByDelegate,
+    GetTokenAccountsByOwner,
+    GetTokenSupply,
     GetTotalSupply,
     GetTransactionCount,
     GetVersion,
@@ -83,6 +88,10 @@ impl fmt::Display for RpcRequest {
             RpcRequest::GetSlotsPerSegment => "getSlotsPerSegment",
             RpcRequest::GetStoragePubkeysForSlot => "getStoragePubkeysForSlot",
             RpcRequest::GetSupply => "getSupply",
+            RpcRequest::GetTokenAccountBalance => "getTokenAccountBalance",
+            RpcRequest::GetTokenAccountsByDelegate => "getTokenAccountsByDelegate",
+            RpcRequest::GetTokenAccountsByOwner => "getTokenAccountsByOwner",
+            RpcRequest::GetTokenSupply => "getTokenSupply",
             RpcRequest::GetTotalSupply => "getTotalSupply",
             RpcRequest::GetTransactionCount => "getTransactionCount",
             RpcRequest::GetVersion => "getVersion",
@@ -131,9 +140,16 @@ pub enum RpcError {
     ForUser(String), /* "direct-to-user message" */
 }
 
+#[derive(Serialize, Deserialize)]
+pub enum TokenAccountsFilter {
+    Mint(Pubkey),
+    ProgramId(Pubkey),
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::rpc_config::RpcTokenAccountsFilter;
     use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel};
 
     #[test]
@@ -198,5 +214,16 @@ mod tests {
         let request =
             test_request.build_request_json(1, json!([addr.clone(), commitment_config.clone()]));
         assert_eq!(request["params"], json!([addr, commitment_config]));
+
+        // Test request with CommitmentConfig and params
+        let test_request = RpcRequest::GetTokenAccountsByOwner;
+        let mint = Pubkey::new_rand();
+        let token_account_filter = RpcTokenAccountsFilter::Mint(mint.to_string());
+        let request = test_request
+            .build_request_json(1, json!([addr, token_account_filter, commitment_config]));
+        assert_eq!(
+            request["params"],
+            json!([addr, token_account_filter, commitment_config])
+        );
     }
 }

client/src/rpc_response.rs

@@ -9,6 +9,7 @@ use solana_sdk::{
 use std::{collections::HashMap, net::SocketAddr};
 
 pub type RpcResult<T> = client_error::Result<Response<T>>;
+pub type RpcAmount = String;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct RpcResponseContext {
@@ -219,3 +220,19 @@ pub struct RpcStakeActivation {
     pub active: u64,
     pub inactive: u64,
 }
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct RpcTokenAmount {
+    pub ui_amount: f64,
+    pub decimals: u8,
+    pub amount: RpcAmount,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct RpcTokenAccountBalance {
+    pub address: String,
+    #[serde(flatten)]
+    pub amount: RpcTokenAmount,
+}

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.2.11"
+version = "1.2.18"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "../README.md"
@@ -21,7 +21,7 @@ byteorder = "1.3.4"
 chrono = { version = "0.4.11", features = ["serde"] }
 core_affinity = "0.5.10"
 crossbeam-channel = "0.4"
-ed25519-dalek = "=1.0.0-pre.3"
+ed25519-dalek = "=1.0.0-pre.4"
 fs_extra = "1.1.0"
 flate2 = "1.0"
 indexmap = "1.3"
@@ -42,36 +42,37 @@ regex = "1.3.7"
 serde = "1.0.110"
 serde_derive = "1.0.103"
 serde_json = "1.0.53"
-solana-account-decoder = { path = "../account-decoder", version = "1.2.11" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.2.11" }
-solana-budget-program = { path = "../programs/budget", version = "1.2.11" }
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-client = { path = "../client", version = "1.2.11" }
-solana-faucet = { path = "../faucet", version = "1.2.11" }
-solana-genesis-programs = { path = "../genesis-programs", version = "1.2.11" }
-solana-ledger = { path = "../ledger", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-merkle-tree = { path = "../merkle-tree", version = "1.2.11" }
-solana-metrics = { path = "../metrics", version = "1.2.11" }
-solana-measure = { path = "../measure", version = "1.2.11" }
-solana-net-utils = { path = "../net-utils", version = "1.2.11" }
-solana-perf = { path = "../perf", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-stake-program = { path = "../programs/stake", version = "1.2.11" }
-solana-streamer = { path = "../streamer", version = "1.2.11" }
-solana-sys-tuner = { path = "../sys-tuner", version = "1.2.11" }
-solana-transaction-status = { path = "../transaction-status", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
-solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
-solana-vote-signer = { path = "../vote-signer", version = "1.2.11" }
+solana-account-decoder = { path = "../account-decoder", version = "1.2.18" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.2.18" }
+solana-budget-program = { path = "../programs/budget", version = "1.2.18" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-client = { path = "../client", version = "1.2.18" }
+solana-faucet = { path = "../faucet", version = "1.2.18" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.2.18" }
+solana-ledger = { path = "../ledger", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-merkle-tree = { path = "../merkle-tree", version = "1.2.18" }
+solana-metrics = { path = "../metrics", version = "1.2.18" }
+solana-measure = { path = "../measure", version = "1.2.18" }
+solana-net-utils = { path = "../net-utils", version = "1.2.18" }
+solana-perf = { path = "../perf", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-stake-program = { path = "../programs/stake", version = "1.2.18" }
+solana-streamer = { path = "../streamer", version = "1.2.18" }
+solana-sys-tuner = { path = "../sys-tuner", version = "1.2.18" }
+solana-transaction-status = { path = "../transaction-status", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
+solana-vote-program = { path = "../programs/vote", version = "1.2.18" }
+solana-vote-signer = { path = "../vote-signer", version = "1.2.18" }
+spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] }
 tempfile = "3.1.0"
 thiserror = "1.0"
 tokio = "0.1"
 tokio-codec = "0.1"
 tokio-fs = "0.1"
 tokio-io = "0.1"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.2.11" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.2.18" }
 trees = "0.2.1"
 
 [dev-dependencies]

core/src/banking_stage.rs

@@ -509,7 +509,7 @@ impl BankingStage {
         // expires.
         let txs = batch.transactions();
         let pre_balances = if transaction_status_sender.is_some() {
-            bank.collect_balances(txs)
+            bank.collect_balances(batch)
         } else {
             vec![]
         };
@@ -545,10 +545,11 @@ impl BankingStage {
                 .processing_results;
 
             if let Some(sender) = transaction_status_sender {
-                let post_balances = bank.collect_balances(txs);
+                let post_balances = bank.collect_balances(batch);
                 send_transaction_status_batch(
                     bank.clone(),
                     batch.transactions(),
+                    batch.iteration_order_vec(),
                     transaction_statuses,
                     TransactionBalancesSet::new(pre_balances, post_balances),
                     sender,

core/src/cluster_info_vote_listener.rs

@@ -1,16 +1,18 @@
 use crate::{
     cluster_info::{ClusterInfo, GOSSIP_SLEEP_MILLIS},
     commitment::VOTE_THRESHOLD_SIZE,
+    consensus::PubkeyVotes,
     crds_value::CrdsValueLabel,
     poh_recorder::PohRecorder,
     pubkey_references::LockedPubkeyReferences,
+    replay_stage::ReplayVotesReceiver,
     result::{Error, Result},
     rpc_subscriptions::RpcSubscriptions,
     sigverify,
     verified_vote_packets::VerifiedVotePackets,
 };
 use crossbeam_channel::{
-    unbounded, Receiver as CrossbeamReceiver, RecvTimeoutError, Sender as CrossbeamSender,
+    unbounded, Receiver as CrossbeamReceiver, RecvTimeoutError, Select, Sender as CrossbeamSender,
 };
 use itertools::izip;
 use log::*;
@@ -28,9 +30,9 @@ use solana_sdk::{
     pubkey::Pubkey,
     transaction::Transaction,
 };
-use solana_vote_program::{vote_instruction::VoteInstruction, vote_state::Vote};
+use solana_vote_program::vote_instruction::VoteInstruction;
 use std::{
-    collections::{HashMap, HashSet},
+    collections::HashMap,
     sync::{
         atomic::{AtomicBool, Ordering},
         {Arc, Mutex, RwLock},
@@ -44,14 +46,18 @@ pub type VerifiedLabelVotePacketsSender = CrossbeamSender<Vec<(CrdsValueLabel, P
 pub type VerifiedLabelVotePacketsReceiver = CrossbeamReceiver<Vec<(CrdsValueLabel, Packets)>>;
 pub type VerifiedVoteTransactionsSender = CrossbeamSender<Vec<Transaction>>;
 pub type VerifiedVoteTransactionsReceiver = CrossbeamReceiver<Vec<Transaction>>;
-pub type VerifiedVoteSender = CrossbeamSender<(Pubkey, Vote)>;
-pub type VerifiedVoteReceiver = CrossbeamReceiver<(Pubkey, Vote)>;
+pub type VerifiedVoteSender = CrossbeamSender<(Pubkey, Vec<Slot>)>;
+pub type VerifiedVoteReceiver = CrossbeamReceiver<(Pubkey, Vec<Slot>)>;
 
 #[derive(Default)]
 pub struct SlotVoteTracker {
-    voted: HashSet<Arc<Pubkey>>,
+    // Maps pubkeys that have voted for this slot
+    // to whether or not we've seen the vote on gossip.
+    // True if seen on gossip, false if only seen in replay.
+    voted: HashMap<Arc<Pubkey>, bool>,
     updates: Option<Vec<Arc<Pubkey>>>,
     total_stake: u64,
+    gossip_only_stake: u64,
 }
 
 impl SlotVoteTracker {
@@ -128,7 +134,7 @@ impl VoteTracker {
 
         let mut w_slot_vote_tracker = slot_vote_tracker.write().unwrap();
 
-        w_slot_vote_tracker.voted.insert(pubkey.clone());
+        w_slot_vote_tracker.voted.insert(pubkey.clone(), true);
         if let Some(ref mut updates) = w_slot_vote_tracker.updates {
             updates.push(pubkey.clone())
         } else {
@@ -210,6 +216,7 @@ impl ClusterInfoVoteListener {
         bank_forks: Arc<RwLock<BankForks>>,
         subscriptions: Arc<RpcSubscriptions>,
         verified_vote_sender: VerifiedVoteSender,
+        replay_votes_receiver: ReplayVotesReceiver,
     ) -> Self {
         let exit_ = exit.clone();
 
@@ -253,6 +260,7 @@ impl ClusterInfoVoteListener {
                     &bank_forks,
                     subscriptions,
                     verified_vote_sender,
+                    replay_votes_receiver,
                 );
             })
             .unwrap();
@@ -378,6 +386,7 @@ impl ClusterInfoVoteListener {
         bank_forks: &RwLock<BankForks>,
         subscriptions: Arc<RpcSubscriptions>,
         verified_vote_sender: VerifiedVoteSender,
+        replay_votes_receiver: ReplayVotesReceiver,
     ) -> Result<()> {
         loop {
             if exit.load(Ordering::Relaxed) {
@@ -387,7 +396,6 @@ impl ClusterInfoVoteListener {
             let root_bank = bank_forks.read().unwrap().root_bank().clone();
             vote_tracker.process_new_root_bank(&root_bank);
             let epoch_stakes = root_bank.epoch_stakes(root_bank.epoch());
-
             if let Err(e) = Self::get_and_process_votes(
                 &vote_txs_receiver,
                 &vote_tracker,
@@ -395,12 +403,11 @@ impl ClusterInfoVoteListener {
                 subscriptions.clone(),
                 epoch_stakes,
                 &verified_vote_sender,
+                &replay_votes_receiver,
             ) {
                 match e {
-                    Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Disconnected) => {
-                        return Ok(());
-                    }
-                    Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout) => (),
+                    Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout)
+                    | Error::ReadyTimeoutError => (),
                     _ => {
                         error!("thread {:?} error {:?}", thread::current().name(), e);
                     }
@@ -416,6 +423,7 @@ impl ClusterInfoVoteListener {
         last_root: Slot,
         subscriptions: Arc<RpcSubscriptions>,
         verified_vote_sender: &VerifiedVoteSender,
+        replay_votes_receiver: &ReplayVotesReceiver,
     ) -> Result<()> {
         Self::get_and_process_votes(
             vote_txs_receiver,
@@ -424,6 +432,7 @@ impl ClusterInfoVoteListener {
             subscriptions,
             None,
             verified_vote_sender,
+            replay_votes_receiver,
         )
     }
 
@@ -434,20 +443,40 @@ impl ClusterInfoVoteListener {
         subscriptions: Arc<RpcSubscriptions>,
         epoch_stakes: Option<&EpochStakes>,
         verified_vote_sender: &VerifiedVoteSender,
+        replay_votes_receiver: &ReplayVotesReceiver,
     ) -> Result<()> {
-        let timer = Duration::from_millis(200);
-        let mut vote_txs = vote_txs_receiver.recv_timeout(timer)?;
-        while let Ok(new_txs) = vote_txs_receiver.try_recv() {
-            vote_txs.extend(new_txs);
+        let mut sel = Select::new();
+        sel.recv(vote_txs_receiver);
+        sel.recv(replay_votes_receiver);
+        let mut remaining_wait_time = 200;
+        loop {
+            if remaining_wait_time == 0 {
+                break;
+            }
+            let start = Instant::now();
+            // Wait for one of the receivers to be ready. `ready_timeout`
+            // will return if channels either have something, or are
+            // disconnected. `ready_timeout` can wake up spuriously,
+            // hence the loop
+            let _ = sel.ready_timeout(Duration::from_millis(remaining_wait_time))?;
+            let vote_txs: Vec<_> = vote_txs_receiver.try_iter().flatten().collect();
+            let replay_votes: Vec<_> = replay_votes_receiver.try_iter().collect();
+            if !vote_txs.is_empty() || !replay_votes.is_empty() {
+                Self::process_votes(
+                    vote_tracker,
+                    vote_txs,
+                    last_root,
+                    subscriptions,
+                    epoch_stakes,
+                    verified_vote_sender,
+                    &replay_votes,
+                );
+                break;
+            } else {
+                remaining_wait_time = remaining_wait_time
+                    .saturating_sub(std::cmp::max(start.elapsed().as_millis() as u64, 1));
+            }
         }
-        Self::process_votes(
-            vote_tracker,
-            vote_txs,
-            last_root,
-            subscriptions,
-            epoch_stakes,
-            verified_vote_sender,
-        );
         Ok(())
     }
 
@@ -458,10 +487,10 @@ impl ClusterInfoVoteListener {
         subscriptions: Arc<RpcSubscriptions>,
         epoch_stakes: Option<&EpochStakes>,
         verified_vote_sender: &VerifiedVoteSender,
+        replay_votes: &[Arc<PubkeyVotes>],
     ) {
-        let mut diff: HashMap<Slot, HashSet<Arc<Pubkey>>> = HashMap::new();
+        let mut diff: HashMap<Slot, HashMap<Arc<Pubkey>, bool>> = HashMap::new();
         {
-            let all_slot_trackers = &vote_tracker.slot_vote_trackers;
             for tx in vote_txs {
                 if let (Some(vote_pubkey), Some(vote_instruction)) = tx
                     .message
@@ -515,26 +544,33 @@ impl ClusterInfoVoteListener {
                             continue;
                         }
 
-                        // Don't insert if we already have marked down this pubkey
-                        // voting for this slot
-                        let maybe_slot_tracker =
-                            all_slot_trackers.read().unwrap().get(&slot).cloned();
-                        if let Some(slot_tracker) = maybe_slot_tracker {
-                            if slot_tracker.read().unwrap().voted.contains(vote_pubkey) {
-                                continue;
-                            }
-                        }
                         let unduplicated_pubkey = vote_tracker.keys.get_or_insert(vote_pubkey);
-                        diff.entry(slot).or_default().insert(unduplicated_pubkey);
+                        diff.entry(slot)
+                            .or_default()
+                            .insert(unduplicated_pubkey, true);
                     }
 
                     subscriptions.notify_vote(&vote);
-                    let _ = verified_vote_sender.send((*vote_pubkey, vote));
+                    let _ = verified_vote_sender.send((*vote_pubkey, vote.slots));
                 }
             }
         }
 
-        for (slot, slot_diff) in diff {
+        // Process the replay votes
+        for votes in replay_votes {
+            for (pubkey, slot) in votes.iter() {
+                if *slot <= root {
+                    continue;
+                }
+                let unduplicated_pubkey = vote_tracker.keys.get_or_insert(pubkey);
+                diff.entry(*slot)
+                    .or_default()
+                    .entry(unduplicated_pubkey)
+                    .or_default();
+            }
+        }
+
+        for (slot, mut slot_diff) in diff {
             let slot_tracker = vote_tracker
                 .slot_vote_trackers
                 .read()
@@ -542,15 +578,55 @@ impl ClusterInfoVoteListener {
                 .get(&slot)
                 .cloned();
             if let Some(slot_tracker) = slot_tracker {
+                {
+                    let r_slot_tracker = slot_tracker.read().unwrap();
+                    // Only keep the pubkeys we haven't seen voting for this slot
+                    slot_diff.retain(|pubkey, seen_in_gossip_above| {
+                        let seen_in_gossip_previously = r_slot_tracker.voted.get(pubkey);
+                        let is_new = seen_in_gossip_previously.is_none();
+                        if is_new && !*seen_in_gossip_above {
+                            // If this vote wasn't seen in gossip, then it must be a
+                            // replay vote, and we haven't sent a notification for
+                            // those yet
+                            let _ = verified_vote_sender.send((**pubkey, vec![slot]));
+                        }
+
+                        // `is_new_from_gossip` means we observed a vote for this slot
+                        // for the first time in gossip
+                        let is_new_from_gossip =
+                            !seen_in_gossip_previously.cloned().unwrap_or(false)
+                                && *seen_in_gossip_above;
+                        is_new || is_new_from_gossip
+                    });
+                }
                 let mut w_slot_tracker = slot_tracker.write().unwrap();
                 if w_slot_tracker.updates.is_none() {
                     w_slot_tracker.updates = Some(vec![]);
                 }
                 let mut current_stake = 0;
-                for pubkey in slot_diff {
-                    Self::sum_stake(&mut current_stake, epoch_stakes, &pubkey);
+                let mut gossip_only_stake = 0;
+                for (pubkey, seen_in_gossip_above) in slot_diff {
+                    let is_new = !w_slot_tracker.voted.contains_key(&pubkey);
+                    Self::sum_stake(
+                        &mut current_stake,
+                        &mut gossip_only_stake,
+                        epoch_stakes,
+                        &pubkey,
+                        // By this point we know if the vote was seen in gossip above,
+                        // it was not seen in gossip at any point in the past, so it's
+                        // safe to pass this in here as an overall indicator of whether
+                        // this vote is new
+                        seen_in_gossip_above,
+                        is_new,
+                    );
 
-                    w_slot_tracker.voted.insert(pubkey.clone());
+                    // From the `slot_diff.retain` earlier, we know because there are
+                    // no other writers to `slot_vote_tracker` that
+                    // `is_new || is_new_from_gossip`. In both cases we want to record
+                    // `is_new_from_gossip` for the `pubkey` entry.
+                    w_slot_tracker
+                        .voted
+                        .insert(pubkey.clone(), seen_in_gossip_above);
                     w_slot_tracker.updates.as_mut().unwrap().push(pubkey);
                 }
                 Self::notify_for_stake_change(
@@ -561,20 +637,33 @@ impl ClusterInfoVoteListener {
                     slot,
                 );
                 w_slot_tracker.total_stake += current_stake;
+                w_slot_tracker.gossip_only_stake += gossip_only_stake
             } else {
                 let mut total_stake = 0;
-                let voted: HashSet<_> = slot_diff
+                let mut gossip_only_stake = 0;
+                let voted: HashMap<_, _> = slot_diff
                     .into_iter()
-                    .map(|pubkey| {
-                        Self::sum_stake(&mut total_stake, epoch_stakes, &pubkey);
-                        pubkey
+                    .map(|(pubkey, seen_in_gossip_above)| {
+                        if !seen_in_gossip_above {
+                            let _ = verified_vote_sender.send((*pubkey, vec![slot]));
+                        }
+                        Self::sum_stake(
+                            &mut total_stake,
+                            &mut gossip_only_stake,
+                            epoch_stakes,
+                            &pubkey,
+                            seen_in_gossip_above,
+                            true,
+                        );
+                        (pubkey, seen_in_gossip_above)
                     })
                     .collect();
                 Self::notify_for_stake_change(total_stake, 0, &subscriptions, epoch_stakes, slot);
                 let new_slot_tracker = SlotVoteTracker {
-                    voted: voted.clone(),
-                    updates: Some(voted.into_iter().collect()),
+                    updates: Some(voted.keys().cloned().collect()),
+                    voted,
                     total_stake,
+                    gossip_only_stake,
                 };
                 vote_tracker
                     .slot_vote_trackers
@@ -602,10 +691,26 @@ impl ClusterInfoVoteListener {
         }
     }
 
-    fn sum_stake(sum: &mut u64, epoch_stakes: Option<&EpochStakes>, pubkey: &Pubkey) {
+    fn sum_stake(
+        sum: &mut u64,
+        gossip_only_stake: &mut u64,
+        epoch_stakes: Option<&EpochStakes>,
+        pubkey: &Pubkey,
+        is_new_from_gossip: bool,
+        is_new: bool,
+    ) {
+        if !is_new_from_gossip && !is_new {
+            return;
+        }
+
         if let Some(stakes) = epoch_stakes {
             if let Some(vote_account) = stakes.stakes().vote_accounts().get(pubkey) {
-                *sum += vote_account.0;
+                if is_new {
+                    *sum += vote_account.0;
+                }
+                if is_new_from_gossip {
+                    *gossip_only_stake += vote_account.0;
+                }
             }
         }
     }
@@ -625,6 +730,7 @@ mod tests {
     use solana_sdk::signature::Signature;
     use solana_sdk::signature::{Keypair, Signer};
     use solana_vote_program::vote_transaction;
+    use std::collections::BTreeSet;
 
     #[test]
     fn test_max_vote_tx_fits() {
@@ -798,8 +904,10 @@ mod tests {
         let (vote_tracker, _, validator_voting_keypairs, subscriptions) = setup();
         let (votes_sender, votes_receiver) = unbounded();
         let (verified_vote_sender, verified_vote_receiver) = unbounded();
+        let (replay_votes_sender, replay_votes_receiver) = unbounded();
 
         let vote_slots = vec![1, 2];
+        let replay_vote_slots = vec![3, 4];
         validator_voting_keypairs.iter().for_each(|keypairs| {
             let node_keypair = &keypairs.node_keypair;
             let vote_keypair = &keypairs.vote_keypair;
@@ -812,6 +920,15 @@ mod tests {
                 vote_keypair,
             );
             votes_sender.send(vec![vote_tx]).unwrap();
+            for vote_slot in &replay_vote_slots {
+                // Send twice, should only expect to be notified once later
+                replay_votes_sender
+                    .send(Arc::new(vec![(vote_keypair.pubkey(), *vote_slot)]))
+                    .unwrap();
+                replay_votes_sender
+                    .send(Arc::new(vec![(vote_keypair.pubkey(), *vote_slot)]))
+                    .unwrap();
+            }
         });
 
         // Check that all the votes were registered for each validator correctly
@@ -822,25 +939,41 @@ mod tests {
             subscriptions,
             None,
             &verified_vote_sender,
+            &replay_votes_receiver,
         )
         .unwrap();
 
         // Check that the received votes were pushed to other commponents
-        // subscribing via a channel
-        let received_votes: Vec<_> = verified_vote_receiver.try_iter().collect();
-        assert_eq!(received_votes.len(), validator_voting_keypairs.len());
-        for (voting_keypair, (received_pubkey, received_vote)) in
-            validator_voting_keypairs.iter().zip(received_votes.iter())
-        {
-            assert_eq!(voting_keypair.vote_keypair.pubkey(), *received_pubkey);
-            assert_eq!(received_vote.slots, vote_slots);
+        // subscribing via `verified_vote_receiver`
+        let all_expected_slots: BTreeSet<_> = vote_slots
+            .into_iter()
+            .chain(replay_vote_slots.into_iter())
+            .collect();
+        let mut pubkey_to_votes: HashMap<Pubkey, BTreeSet<Slot>> = HashMap::new();
+        for (received_pubkey, new_votes) in verified_vote_receiver.try_iter() {
+            let already_received_votes = pubkey_to_votes.entry(received_pubkey).or_default();
+            for new_vote in new_votes {
+                // `new_vote` should only be received once
+                assert!(already_received_votes.insert(new_vote));
+            }
         }
-        for vote_slot in vote_slots {
+        assert_eq!(pubkey_to_votes.len(), validator_voting_keypairs.len());
+        for keypairs in &validator_voting_keypairs {
+            assert_eq!(
+                *pubkey_to_votes
+                    .get(&keypairs.vote_keypair.pubkey())
+                    .unwrap(),
+                all_expected_slots
+            );
+        }
+
+        // Check the vote trackers were updated correctly
+        for vote_slot in all_expected_slots {
             let slot_vote_tracker = vote_tracker.get_slot_vote_tracker(vote_slot).unwrap();
             let r_slot_vote_tracker = slot_vote_tracker.read().unwrap();
             for voting_keypairs in &validator_voting_keypairs {
                 let pubkey = voting_keypairs.vote_keypair.pubkey();
-                assert!(r_slot_vote_tracker.voted.contains(&pubkey));
+                assert!(r_slot_vote_tracker.voted.contains_key(&pubkey));
                 assert!(r_slot_vote_tracker
                     .updates
                     .as_ref()
@@ -857,6 +990,7 @@ mod tests {
         // Send some votes to process
         let (votes_txs_sender, votes_txs_receiver) = unbounded();
         let (verified_vote_sender, verified_vote_receiver) = unbounded();
+        let (_replay_votes_sender, replay_votes_receiver) = unbounded();
 
         let mut expected_votes = vec![];
         for (i, keyset) in validator_voting_keypairs.chunks(2).enumerate() {
@@ -887,15 +1021,13 @@ mod tests {
             subscriptions,
             None,
             &verified_vote_sender,
+            &replay_votes_receiver,
         )
         .unwrap();
 
         // Check that the received votes were pushed to other commponents
         // subscribing via a channel
-        let received_votes: Vec<_> = verified_vote_receiver
-            .try_iter()
-            .map(|(pubkey, vote)| (pubkey, vote.slots))
-            .collect();
+        let received_votes: Vec<_> = verified_vote_receiver.try_iter().collect();
         assert_eq!(received_votes.len(), validator_voting_keypairs.len());
         for (expected_pubkey_vote, received_pubkey_vote) in
             expected_votes.iter().zip(received_votes.iter())
@@ -909,7 +1041,7 @@ mod tests {
             let r_slot_vote_tracker = &slot_vote_tracker.read().unwrap();
             for voting_keypairs in keyset {
                 let pubkey = voting_keypairs.vote_keypair.pubkey();
-                assert!(r_slot_vote_tracker.voted.contains(&pubkey));
+                assert!(r_slot_vote_tracker.voted.contains_key(&pubkey));
                 assert!(r_slot_vote_tracker
                     .updates
                     .as_ref()
@@ -919,6 +1051,79 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_process_votes3() {
+        let (votes_sender, votes_receiver) = unbounded();
+        let (verified_vote_sender, _verified_vote_receiver) = unbounded();
+        let (replay_votes_sender, replay_votes_receiver) = unbounded();
+
+        let vote_slot = 1;
+
+        // Events:
+        // 0: Send gossip vote
+        // 1: Send replay vote
+        // 2: Send both
+        let ordered_events = vec![
+            vec![0],
+            vec![1],
+            vec![0, 1],
+            vec![1, 0],
+            vec![2],
+            vec![0, 1, 2],
+            vec![1, 0, 2],
+        ];
+        for events in ordered_events {
+            let (vote_tracker, bank, validator_voting_keypairs, subscriptions) = setup();
+            let node_keypair = &validator_voting_keypairs[0].node_keypair;
+            let vote_keypair = &validator_voting_keypairs[0].vote_keypair;
+            for &e in &events {
+                if e == 0 || e == 2 {
+                    // Create vote transaction
+                    let vote_tx = vote_transaction::new_vote_transaction(
+                        vec![vote_slot],
+                        Hash::default(),
+                        Hash::default(),
+                        node_keypair,
+                        vote_keypair,
+                        vote_keypair,
+                    );
+                    votes_sender.send(vec![vote_tx.clone()]).unwrap();
+                }
+                if e == 1 || e == 2 {
+                    replay_votes_sender
+                        .send(Arc::new(vec![(vote_keypair.pubkey(), vote_slot)]))
+                        .unwrap();
+                }
+                let _ = ClusterInfoVoteListener::get_and_process_votes(
+                    &votes_receiver,
+                    &vote_tracker,
+                    0,
+                    subscriptions.clone(),
+                    Some(
+                        // Make sure `epoch_stakes` exists for this slot by unwrapping
+                        bank.epoch_stakes(bank.epoch_schedule().get_epoch(vote_slot))
+                            .unwrap(),
+                    ),
+                    &verified_vote_sender,
+                    &replay_votes_receiver,
+                );
+            }
+            let slot_vote_tracker = vote_tracker.get_slot_vote_tracker(vote_slot).unwrap();
+            let r_slot_vote_tracker = &slot_vote_tracker.read().unwrap();
+
+            if events == vec![1] {
+                // Check `gossip_only_stake` is not incremented
+                assert_eq!(r_slot_vote_tracker.total_stake, 100);
+                assert_eq!(r_slot_vote_tracker.gossip_only_stake, 0);
+            } else {
+                // Check that both the `gossip_only_stake` and `total_stake` both
+                // increased
+                assert_eq!(r_slot_vote_tracker.total_stake, 100);
+                assert_eq!(r_slot_vote_tracker.gossip_only_stake, 100);
+            }
+        }
+    }
+
     #[test]
     fn test_get_voters_by_epoch() {
         // Create some voters at genesis
@@ -982,14 +1187,14 @@ mod tests {
         let ref_count_per_vote = 2;
 
         // Create some voters at genesis
-        let validator_voting_keypairs: Vec<_> = (0..2)
+        let validator_keypairs: Vec<_> = (0..2)
             .map(|_| ValidatorVoteKeypairs::new(Keypair::new(), Keypair::new(), Keypair::new()))
             .collect();
 
         let GenesisConfigInfo { genesis_config, .. } =
             genesis_utils::create_genesis_config_with_vote_accounts(
                 10_000,
-                &validator_voting_keypairs,
+                &validator_keypairs,
                 100,
             );
         let bank = Bank::new(&genesis_config);
@@ -1003,16 +1208,17 @@ mod tests {
             &exit,
             Arc::new(RwLock::new(bank_forks)),
             Arc::new(RwLock::new(BlockCommitmentCache::default_with_blockstore(
-                blockstore.clone(),
+                blockstore,
             ))),
         ));
 
         // Send a vote to process, should add a reference to the pubkey for that voter
         // in the tracker
-        let validator0_keypairs = &validator_voting_keypairs[0];
+        let validator0_keypairs = &validator_keypairs[0];
+        let voted_slot = bank.slot() + 1;
         let vote_tx = vec![vote_transaction::new_vote_transaction(
             // Must vote > root to be processed
-            vec![bank.slot() + 1],
+            vec![voted_slot],
             Hash::default(),
             Hash::default(),
             &validator0_keypairs.node_keypair,
@@ -1028,6 +1234,11 @@ mod tests {
             subscriptions.clone(),
             None,
             &verified_vote_sender,
+            // Add vote for same slot, should not affect outcome
+            &[Arc::new(vec![(
+                validator0_keypairs.vote_keypair.pubkey(),
+                voted_slot,
+            )])],
         );
         let ref_count = Arc::strong_count(
             &vote_tracker
@@ -1062,8 +1273,9 @@ mod tests {
         // Test with votes across two epochs
         let first_slot_in_new_epoch = bank.epoch_schedule().get_first_slot_in_epoch(new_epoch);
 
-        // Make 2 new votes in two different epochs, ref count should go up
-        // by 2 * ref_count_per_vote
+        // Make 2 new votes in two different epochs for the same pubkey,
+        // the ref count should go up by 3 * ref_count_per_vote
+        // Add 1 vote through the replay channel, ref count should
         let vote_txs: Vec<_> = [bank.slot() + 2, first_slot_in_new_epoch]
             .iter()
             .map(|slot| {
@@ -1086,8 +1298,25 @@ mod tests {
             subscriptions,
             None,
             &verified_vote_sender,
+            &[Arc::new(vec![(
+                validator_keypairs[1].vote_keypair.pubkey(),
+                first_slot_in_new_epoch,
+            )])],
         );
 
+        // Check new replay vote pubkey first
+        let ref_count = Arc::strong_count(
+            &vote_tracker
+                .keys
+                .0
+                .read()
+                .unwrap()
+                .get(&validator_keypairs[1].vote_keypair.pubkey())
+                .unwrap(),
+        );
+        assert_eq!(ref_count, current_ref_count);
+
+        // Check the existing pubkey
         let ref_count = Arc::strong_count(
             &vote_tracker
                 .keys
@@ -1127,7 +1356,7 @@ mod tests {
             &exit,
             Arc::new(RwLock::new(bank_forks)),
             Arc::new(RwLock::new(BlockCommitmentCache::default_with_blockstore(
-                blockstore.clone(),
+                blockstore,
             ))),
         ));
 
@@ -1213,4 +1442,78 @@ mod tests {
         assert_eq!(vote_txs.len(), 2);
         verify_packets_len(&packets, 2);
     }
+
+    #[test]
+    fn test_sum_stake() {
+        let (_, bank, validator_voting_keypairs, _) = setup();
+        let vote_keypair = &validator_voting_keypairs[0].vote_keypair;
+        let epoch_stakes = bank.epoch_stakes(bank.epoch()).unwrap();
+
+        // If `is_new_from_gossip` and `is_new` are both true, both fields
+        // should increase
+        let mut total_stake = 0;
+        let mut gossip_only_stake = 0;
+        let is_new_from_gossip = true;
+        let is_new = true;
+        ClusterInfoVoteListener::sum_stake(
+            &mut total_stake,
+            &mut gossip_only_stake,
+            Some(epoch_stakes),
+            &vote_keypair.pubkey(),
+            is_new_from_gossip,
+            is_new,
+        );
+        assert_eq!(total_stake, 100);
+        assert_eq!(gossip_only_stake, 100);
+
+        // If `is_new_from_gossip` and `is_new` are both false, none should increase
+        let mut total_stake = 0;
+        let mut gossip_only_stake = 0;
+        let is_new_from_gossip = false;
+        let is_new = false;
+        ClusterInfoVoteListener::sum_stake(
+            &mut total_stake,
+            &mut gossip_only_stake,
+            Some(epoch_stakes),
+            &vote_keypair.pubkey(),
+            is_new_from_gossip,
+            is_new,
+        );
+        assert_eq!(total_stake, 0);
+        assert_eq!(gossip_only_stake, 0);
+
+        // If only `is_new`, but not `is_new_from_gossip` then
+        // `total_stake` will increase, but `gossip_only_stake` won't
+        let mut total_stake = 0;
+        let mut gossip_only_stake = 0;
+        let is_new_from_gossip = false;
+        let is_new = true;
+        ClusterInfoVoteListener::sum_stake(
+            &mut total_stake,
+            &mut gossip_only_stake,
+            Some(epoch_stakes),
+            &vote_keypair.pubkey(),
+            is_new_from_gossip,
+            is_new,
+        );
+        assert_eq!(total_stake, 100);
+        assert_eq!(gossip_only_stake, 0);
+
+        // If only `is_new_from_gossip`, but not `is_new` then
+        // `gossip_only_stake` will increase, but `total_stake` won't
+        let mut total_stake = 0;
+        let mut gossip_only_stake = 0;
+        let is_new_from_gossip = true;
+        let is_new = false;
+        ClusterInfoVoteListener::sum_stake(
+            &mut total_stake,
+            &mut gossip_only_stake,
+            Some(epoch_stakes),
+            &vote_keypair.pubkey(),
+            is_new_from_gossip,
+            is_new,
+        );
+        assert_eq!(total_stake, 0);
+        assert_eq!(gossip_only_stake, 100);
+    }
 }

core/src/consensus.rs

@@ -61,6 +61,8 @@ impl SwitchForkDecision {
 pub const VOTE_THRESHOLD_DEPTH: usize = 8;
 pub const SWITCH_FORK_THRESHOLD: f64 = 0.38;
 
+pub type PubkeyVotes = Vec<(Pubkey, Slot)>;
+
 #[derive(Default, Debug, Clone)]
 pub struct StakeLockout {
     lockout: u64,
@@ -84,7 +86,7 @@ pub(crate) struct ComputedBankState {
     pub total_staked: u64,
     pub bank_weight: u128,
     pub lockout_intervals: LockoutIntervals,
-    pub pubkey_votes: Vec<(Pubkey, Slot)>,
+    pub pubkey_votes: Arc<PubkeyVotes>,
 }
 
 pub struct Tower {
@@ -258,7 +260,7 @@ impl Tower {
             total_staked,
             bank_weight,
             lockout_intervals,
-            pubkey_votes,
+            pubkey_votes: Arc::new(pubkey_votes),
         }
     }
 
@@ -666,6 +668,7 @@ pub mod test {
         progress_map::ForkProgress,
         replay_stage::{HeaviestForkFailures, ReplayStage},
     };
+    use crossbeam_channel::unbounded;
     use solana_ledger::bank_forks::BankForks;
     use solana_runtime::{
         bank::Bank,
@@ -785,6 +788,7 @@ pub mod test {
                 .cloned()
                 .collect();
 
+            let (replay_slot_sender, _replay_slot_receiver) = unbounded();
             let _ = ReplayStage::compute_bank_stats(
                 &my_pubkey,
                 &ancestors,
@@ -797,6 +801,7 @@ pub mod test {
                 &mut PubkeyReferences::default(),
                 &mut self.heaviest_subtree_fork_choice,
                 &mut BankWeightForkChoice::default(),
+                &replay_slot_sender,
             );
 
             let vote_bank = self
@@ -1353,7 +1358,7 @@ pub mod test {
         //two accounts voting for slot 0 with 1 token staked
         let mut accounts = gen_stakes(&[(1, &[0]), (1, &[0])]);
         accounts.sort_by_key(|(pk, _)| *pk);
-        let account_latest_votes: Vec<(Pubkey, Slot)> =
+        let account_latest_votes: PubkeyVotes =
             accounts.iter().map(|(pubkey, _)| (*pubkey, 0)).collect();
 
         let ancestors = vec![(1, vec![0].into_iter().collect()), (0, HashSet::new())]
@@ -1363,7 +1368,7 @@ pub mod test {
             stake_lockouts,
             total_staked,
             bank_weight,
-            mut pubkey_votes,
+            pubkey_votes,
             ..
         } = Tower::collect_vote_lockouts(
             &Pubkey::default(),
@@ -1375,6 +1380,7 @@ pub mod test {
         assert_eq!(stake_lockouts[&0].stake, 2);
         assert_eq!(stake_lockouts[&0].lockout, 2 + 2 + 4 + 4);
         assert_eq!(total_staked, 2);
+        let mut pubkey_votes = Arc::try_unwrap(pubkey_votes).unwrap();
         pubkey_votes.sort();
         assert_eq!(pubkey_votes, account_latest_votes);
 
@@ -1390,7 +1396,7 @@ pub mod test {
         //two accounts voting for slots 0..MAX_LOCKOUT_HISTORY with 1 token staked
         let mut accounts = gen_stakes(&[(1, &votes), (1, &votes)]);
         accounts.sort_by_key(|(pk, _)| *pk);
-        let account_latest_votes: Vec<(Pubkey, Slot)> = accounts
+        let account_latest_votes: PubkeyVotes = accounts
             .iter()
             .map(|(pubkey, _)| (*pubkey, (MAX_LOCKOUT_HISTORY - 1) as Slot))
             .collect();
@@ -1417,7 +1423,7 @@ pub mod test {
         let ComputedBankState {
             stake_lockouts,
             bank_weight,
-            mut pubkey_votes,
+            pubkey_votes,
             ..
         } = Tower::collect_vote_lockouts(
             &Pubkey::default(),
@@ -1433,6 +1439,7 @@ pub mod test {
         // should be the sum of all the weights for root
         assert!(stake_lockouts[&0].lockout > (2 * (1 << MAX_LOCKOUT_HISTORY)));
         assert_eq!(bank_weight, expected_bank_weight);
+        let mut pubkey_votes = Arc::try_unwrap(pubkey_votes).unwrap();
         pubkey_votes.sort();
         assert_eq!(pubkey_votes, account_latest_votes);
     }

core/src/non_circulating_supply.rs

@@ -23,14 +23,14 @@ pub fn calculate_non_circulating_supply(bank: &Arc<Bank>) -> NonCirculatingSuppl
         let stake_account = StakeState::from(&account).unwrap_or_default();
         match stake_account {
             StakeState::Initialized(meta) => {
-                if meta.lockup.is_in_force(&clock, &HashSet::default())
+                if meta.lockup.is_in_force(&clock, None)
                     || withdraw_authority_list.contains(&meta.authorized.withdrawer)
                 {
                     non_circulating_accounts_set.insert(*pubkey);
                 }
             }
             StakeState::Stake(meta, _stake) => {
-                if meta.lockup.is_in_force(&clock, &HashSet::default())
+                if meta.lockup.is_in_force(&clock, None)
                     || withdraw_authority_list.contains(&meta.authorized.withdrawer)
                 {
                     non_circulating_accounts_set.insert(*pubkey);
@@ -77,6 +77,7 @@ solana_sdk::pubkeys!(
         "5q54XjQ7vDx4y6KphPeE97LUNiYGtP55spjvXAWPGBuf",
         "3o6xgkJ9sTmDeQWyfj3sxwon18fXJB9PV5LDc8sfgR4a",
         "GumSE5HsMV5HCwBTv2D2D81yy9x17aDkvobkqAfTRgmo",
+        "AzVV9ZZDxTgW4wWfJmsG6ytaHpQGSe1yz76Nyy84VbQF",
     ]
 );
 

core/src/repair_service.rs

@@ -219,8 +219,8 @@ impl RepairService {
                 let mut slot_to_vote_pubkeys: HashMap<Slot, Vec<Pubkey>> = HashMap::new();
                 verified_vote_receiver
                     .try_iter()
-                    .for_each(|(vote_pubkey, vote)| {
-                        for slot in vote.slots {
+                    .for_each(|(vote_pubkey, vote_slots)| {
+                        for slot in vote_slots {
                             slot_to_vote_pubkeys
                                 .entry(slot)
                                 .or_default()

core/src/replay_stage.rs

@@ -8,7 +8,7 @@ use crate::{
     cluster_slots::ClusterSlots,
     commitment::BlockCommitmentCache,
     commitment_service::{AggregateCommitmentService, CommitmentAggregationData},
-    consensus::{ComputedBankState, StakeLockout, SwitchForkDecision, Tower},
+    consensus::{ComputedBankState, PubkeyVotes, StakeLockout, SwitchForkDecision, Tower},
     fork_choice::{ForkChoice, SelectVoteAndResetForkResult},
     heaviest_subtree_fork_choice::HeaviestSubtreeForkChoice,
     poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
@@ -19,6 +19,7 @@ use crate::{
     rewards_recorder_service::RewardsRecorderSender,
     rpc_subscriptions::RpcSubscriptions,
 };
+use crossbeam_channel::{Receiver as CrossbeamReceiver, Sender as CrossbeamSender};
 use solana_ledger::{
     bank_forks::BankForks,
     block_error::BlockError,
@@ -61,6 +62,9 @@ pub const MAX_ENTRY_RECV_PER_ITER: usize = 512;
 pub const SUPERMINORITY_THRESHOLD: f64 = 1f64 / 3f64;
 pub const MAX_UNCONFIRMED_SLOTS: usize = 5;
 
+pub type ReplayVotesSender = CrossbeamSender<Arc<PubkeyVotes>>;
+pub type ReplayVotesReceiver = CrossbeamReceiver<Arc<PubkeyVotes>>;
+
 #[derive(PartialEq, Debug)]
 pub(crate) enum HeaviestForkFailures {
     LockedOut(u64),
@@ -221,6 +225,7 @@ impl ReplayStage {
         cluster_slots: Arc<ClusterSlots>,
         retransmit_slots_sender: RetransmitSlotsSender,
         duplicate_slots_reset_receiver: DuplicateSlotsResetReceiver,
+        replay_votes_sender: ReplayVotesSender,
     ) -> Self {
         let ReplayStageConfig {
             my_pubkey,
@@ -387,6 +392,7 @@ impl ReplayStage {
                         &mut all_pubkeys,
                         &mut heaviest_subtree_fork_choice,
                         &mut bank_weight_fork_choice,
+                        &replay_votes_sender,
                     );
                     compute_bank_stats_time.stop();
 
@@ -1303,6 +1309,7 @@ impl ReplayStage {
         all_pubkeys: &mut PubkeyReferences,
         heaviest_subtree_fork_choice: &mut dyn ForkChoice,
         bank_weight_fork_choice: &mut dyn ForkChoice,
+        replay_votes_sender: &ReplayVotesSender,
     ) -> Vec<Slot> {
         frozen_banks.sort_by_key(|bank| bank.slot());
         let mut new_stats = vec![];
@@ -1324,6 +1331,9 @@ impl ReplayStage {
                         &ancestors,
                         all_pubkeys,
                     );
+                    // Notify any listeners of the votes found in this newly computed
+                    // bank
+                    let _ = replay_votes_sender.send(computed_bank_state.pubkey_votes.clone());
                     heaviest_subtree_fork_choice.compute_bank_stats(
                         &bank,
                         tower,
@@ -1853,7 +1863,8 @@ impl ReplayStage {
     pub fn get_unlock_switch_vote_slot(operating_mode: OperatingMode) -> Slot {
         match operating_mode {
             OperatingMode::Development => 0,
-            OperatingMode::Stable => std::u64::MAX / 2,
+            // 400_000 slots into epoch 61
+            OperatingMode::Stable => 26_752_000,
             // Epoch 63
             OperatingMode::Preview => 21_692_256,
         }
@@ -1862,7 +1873,8 @@ impl ReplayStage {
     pub fn get_unlock_heaviest_subtree_fork_choice(operating_mode: OperatingMode) -> Slot {
         match operating_mode {
             OperatingMode::Development => 0,
-            OperatingMode::Stable => std::u64::MAX / 2,
+            // 400_000 slots into epoch 61
+            OperatingMode::Stable => 26_752_000,
             // Epoch 63
             OperatingMode::Preview => 21_692_256,
         }
@@ -1938,146 +1950,179 @@ pub(crate) mod tests {
         assert!(ReplayStage::is_partition_detected(&ancestors, 4, 3));
     }
 
+    struct ReplayBlockstoreComponents {
+        blockstore: Arc<Blockstore>,
+        validator_voting_keys: HashMap<Pubkey, Pubkey>,
+        progress: ProgressMap,
+        bank_forks: Arc<RwLock<BankForks>>,
+        leader_schedule_cache: Arc<LeaderScheduleCache>,
+        rpc_subscriptions: Arc<RpcSubscriptions>,
+    }
+
+    fn replay_blockstore_components() -> ReplayBlockstoreComponents {
+        // Setup blockstore
+        let ledger_path = get_tmp_ledger_path!();
+        let blockstore = Arc::new(
+            Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger"),
+        );
+        let validator_authorized_voter_keypairs: Vec<_> =
+            (0..20).map(|_| ValidatorVoteKeypairs::new_rand()).collect();
+
+        let validator_voting_keys: HashMap<_, _> = validator_authorized_voter_keypairs
+            .iter()
+            .map(|v| (v.node_keypair.pubkey(), v.vote_keypair.pubkey()))
+            .collect();
+        let GenesisConfigInfo { genesis_config, .. } =
+            genesis_utils::create_genesis_config_with_vote_accounts(
+                10_000,
+                &validator_authorized_voter_keypairs,
+                100,
+            );
+
+        let bank0 = Bank::new(&genesis_config);
+
+        // ProgressMap
+        let mut progress = ProgressMap::default();
+        progress.insert(
+            0,
+            ForkProgress::new_from_bank(
+                &bank0,
+                bank0.collector_id(),
+                &Pubkey::default(),
+                None,
+                0,
+                0,
+            ),
+        );
+
+        // Leader schedule cache
+        let leader_schedule_cache = Arc::new(LeaderScheduleCache::new_from_bank(&bank0));
+
+        // BankForks
+        let bank_forks = Arc::new(RwLock::new(BankForks::new(bank0)));
+
+        // RpcSubscriptions
+        let exit = Arc::new(AtomicBool::new(false));
+        let rpc_subscriptions = Arc::new(RpcSubscriptions::new(
+            &exit,
+            bank_forks.clone(),
+            Arc::new(RwLock::new(BlockCommitmentCache::default_with_blockstore(
+                blockstore.clone(),
+            ))),
+        ));
+
+        ReplayBlockstoreComponents {
+            blockstore,
+            validator_voting_keys,
+            progress,
+            bank_forks,
+            leader_schedule_cache,
+            rpc_subscriptions,
+        }
+    }
+
     #[test]
     fn test_child_slots_of_same_parent() {
-        let ledger_path = get_tmp_ledger_path!();
-        {
-            // Setup
-            let blockstore = Arc::new(
-                Blockstore::open(&ledger_path)
-                    .expect("Expected to be able to open database ledger"),
-            );
-            let validator_authorized_voter_keypairs: Vec<_> = (0..20)
-                .map(|_| ValidatorVoteKeypairs::new(Keypair::new(), Keypair::new(), Keypair::new()))
-                .collect();
+        let ReplayBlockstoreComponents {
+            blockstore,
+            validator_voting_keys,
+            mut progress,
+            bank_forks,
+            leader_schedule_cache,
+            rpc_subscriptions,
+        } = replay_blockstore_components();
 
-            let validator_voting_keys: HashMap<_, _> = validator_authorized_voter_keypairs
-                .iter()
-                .map(|v| (v.node_keypair.pubkey(), v.vote_keypair.pubkey()))
-                .collect();
-            let GenesisConfigInfo { genesis_config, .. } =
-                genesis_utils::create_genesis_config_with_vote_accounts(
-                    10_000,
-                    &validator_authorized_voter_keypairs,
-                    100,
-                );
-            let bank0 = Bank::new(&genesis_config);
-            let mut progress = ProgressMap::default();
-            progress.insert(
+        // Insert a non-root bank so that the propagation logic will update this
+        // bank
+        let bank1 = Bank::new_from_parent(
+            bank_forks.read().unwrap().get(0).unwrap(),
+            &leader_schedule_cache.slot_leader_at(1, None).unwrap(),
+            1,
+        );
+        progress.insert(
+            1,
+            ForkProgress::new_from_bank(
+                &bank1,
+                bank1.collector_id(),
+                validator_voting_keys.get(&bank1.collector_id()).unwrap(),
+                Some(0),
                 0,
-                ForkProgress::new_from_bank(
-                    &bank0,
-                    bank0.collector_id(),
-                    &Pubkey::default(),
-                    None,
-                    0,
-                    0,
-                ),
-            );
-            let leader_schedule_cache = Arc::new(LeaderScheduleCache::new_from_bank(&bank0));
-            let exit = Arc::new(AtomicBool::new(false));
-            let mut bank_forks = BankForks::new(bank0);
+                0,
+            ),
+        );
+        assert!(progress.get_propagated_stats(1).unwrap().is_leader_slot);
+        bank1.freeze();
+        bank_forks.write().unwrap().insert(bank1);
 
-            // Insert a non-root bank so that the propagation logic will update this
-            // bank
-            let bank1 = Bank::new_from_parent(
-                bank_forks.get(0).unwrap(),
-                &leader_schedule_cache.slot_leader_at(1, None).unwrap(),
-                1,
-            );
-            progress.insert(
-                1,
-                ForkProgress::new_from_bank(
-                    &bank1,
-                    bank1.collector_id(),
-                    &validator_voting_keys.get(&bank1.collector_id()).unwrap(),
-                    Some(0),
-                    0,
-                    0,
-                ),
-            );
-            assert!(progress.get_propagated_stats(1).unwrap().is_leader_slot);
-            bank1.freeze();
-            bank_forks.insert(bank1);
-            let bank_forks = Arc::new(RwLock::new(bank_forks));
-            let subscriptions = Arc::new(RpcSubscriptions::new(
-                &exit,
-                bank_forks.clone(),
-                Arc::new(RwLock::new(BlockCommitmentCache::default_with_blockstore(
-                    blockstore.clone(),
-                ))),
-            ));
+        // Insert shreds for slot NUM_CONSECUTIVE_LEADER_SLOTS,
+        // chaining to slot 1
+        let (shreds, _) = make_slot_entries(NUM_CONSECUTIVE_LEADER_SLOTS, 1, 8);
+        blockstore.insert_shreds(shreds, None, false).unwrap();
+        assert!(bank_forks
+            .read()
+            .unwrap()
+            .get(NUM_CONSECUTIVE_LEADER_SLOTS)
+            .is_none());
+        ReplayStage::generate_new_bank_forks(
+            &blockstore,
+            &bank_forks,
+            &leader_schedule_cache,
+            &rpc_subscriptions,
+            None,
+            &mut progress,
+            &mut PubkeyReferences::default(),
+        );
+        assert!(bank_forks
+            .read()
+            .unwrap()
+            .get(NUM_CONSECUTIVE_LEADER_SLOTS)
+            .is_some());
 
-            // Insert shreds for slot NUM_CONSECUTIVE_LEADER_SLOTS,
-            // chaining to slot 1
-            let (shreds, _) = make_slot_entries(NUM_CONSECUTIVE_LEADER_SLOTS, 1, 8);
-            blockstore.insert_shreds(shreds, None, false).unwrap();
-            assert!(bank_forks
-                .read()
-                .unwrap()
-                .get(NUM_CONSECUTIVE_LEADER_SLOTS)
-                .is_none());
-            ReplayStage::generate_new_bank_forks(
-                &blockstore,
-                &bank_forks,
-                &leader_schedule_cache,
-                &subscriptions,
-                None,
-                &mut progress,
-                &mut PubkeyReferences::default(),
-            );
-            assert!(bank_forks
-                .read()
-                .unwrap()
-                .get(NUM_CONSECUTIVE_LEADER_SLOTS)
-                .is_some());
+        // Insert shreds for slot 2 * NUM_CONSECUTIVE_LEADER_SLOTS,
+        // chaining to slot 1
+        let (shreds, _) = make_slot_entries(2 * NUM_CONSECUTIVE_LEADER_SLOTS, 1, 8);
+        blockstore.insert_shreds(shreds, None, false).unwrap();
+        assert!(bank_forks
+            .read()
+            .unwrap()
+            .get(2 * NUM_CONSECUTIVE_LEADER_SLOTS)
+            .is_none());
+        ReplayStage::generate_new_bank_forks(
+            &blockstore,
+            &bank_forks,
+            &leader_schedule_cache,
+            &rpc_subscriptions,
+            None,
+            &mut progress,
+            &mut PubkeyReferences::default(),
+        );
+        assert!(bank_forks
+            .read()
+            .unwrap()
+            .get(NUM_CONSECUTIVE_LEADER_SLOTS)
+            .is_some());
+        assert!(bank_forks
+            .read()
+            .unwrap()
+            .get(2 * NUM_CONSECUTIVE_LEADER_SLOTS)
+            .is_some());
 
-            // Insert shreds for slot 2 * NUM_CONSECUTIVE_LEADER_SLOTS,
-            // chaining to slot 1
-            let (shreds, _) = make_slot_entries(2 * NUM_CONSECUTIVE_LEADER_SLOTS, 1, 8);
-            blockstore.insert_shreds(shreds, None, false).unwrap();
-            assert!(bank_forks
-                .read()
+        // // There are 20 equally staked accounts, of which 3 have built
+        // banks above or at bank 1. Because 3/20 < SUPERMINORITY_THRESHOLD,
+        // we should see 3 validators in bank 1's propagated_validator set.
+        let expected_leader_slots = vec![
+            1,
+            NUM_CONSECUTIVE_LEADER_SLOTS,
+            2 * NUM_CONSECUTIVE_LEADER_SLOTS,
+        ];
+        for slot in expected_leader_slots {
+            let leader = leader_schedule_cache.slot_leader_at(slot, None).unwrap();
+            let vote_key = validator_voting_keys.get(&leader).unwrap();
+            assert!(progress
+                .get_propagated_stats(1)
                 .unwrap()
-                .get(2 * NUM_CONSECUTIVE_LEADER_SLOTS)
-                .is_none());
-            ReplayStage::generate_new_bank_forks(
-                &blockstore,
-                &bank_forks,
-                &leader_schedule_cache,
-                &subscriptions,
-                None,
-                &mut progress,
-                &mut PubkeyReferences::default(),
-            );
-            assert!(bank_forks
-                .read()
-                .unwrap()
-                .get(NUM_CONSECUTIVE_LEADER_SLOTS)
-                .is_some());
-            assert!(bank_forks
-                .read()
-                .unwrap()
-                .get(2 * NUM_CONSECUTIVE_LEADER_SLOTS)
-                .is_some());
-
-            // // There are 20 equally staked acccounts, of which 3 have built
-            // banks above or at bank 1. Because 3/20 < SUPERMINORITY_THRESHOLD,
-            // we should see 3 validators in bank 1's propagated_validator set.
-            let expected_leader_slots = vec![
-                1,
-                NUM_CONSECUTIVE_LEADER_SLOTS,
-                2 * NUM_CONSECUTIVE_LEADER_SLOTS,
-            ];
-            for slot in expected_leader_slots {
-                let leader = leader_schedule_cache.slot_leader_at(slot, None).unwrap();
-                let vote_key = validator_voting_keys.get(&leader).unwrap();
-                assert!(progress
-                    .get_propagated_stats(1)
-                    .unwrap()
-                    .propagated_validators
-                    .contains(vote_key));
-            }
+                .propagated_validators
+                .contains(vote_key));
         }
     }
 
@@ -2695,6 +2740,7 @@ pub(crate) mod tests {
             .cloned()
             .collect();
         let tower = Tower::new_for_tests(0, 0.67);
+        let (replay_votes_sender, replay_votes_receiver) = unbounded();
         let newly_computed = ReplayStage::compute_bank_stats(
             &node_pubkey,
             &ancestors,
@@ -2707,8 +2753,13 @@ pub(crate) mod tests {
             &mut PubkeyReferences::default(),
             &mut heaviest_subtree_fork_choice,
             &mut BankWeightForkChoice::default(),
+            &replay_votes_sender,
         );
+
+        // bank 0 has no votes, should not send any votes on the channel
+        assert_eq!(replay_votes_receiver.try_recv().unwrap(), Arc::new(vec![]));
         assert_eq!(newly_computed, vec![0]);
+
         // The only vote is in bank 1, and bank_forks does not currently contain
         // bank 1, so no slot should be confirmed.
         {
@@ -2750,8 +2801,15 @@ pub(crate) mod tests {
             &mut PubkeyReferences::default(),
             &mut heaviest_subtree_fork_choice,
             &mut BankWeightForkChoice::default(),
+            &replay_votes_sender,
         );
 
+        // Bank 1 had one vote, ensure that `compute_bank_stats` notifies listeners
+        // via `replay_votes_receiver`.
+        assert_eq!(
+            replay_votes_receiver.try_recv().unwrap(),
+            Arc::new(vec![(my_keypairs.vote_keypair.pubkey(), 0)])
+        );
         assert_eq!(newly_computed, vec![1]);
         {
             let fork_progress = progress.get(&1).unwrap();
@@ -2785,8 +2843,10 @@ pub(crate) mod tests {
             &mut PubkeyReferences::default(),
             &mut heaviest_subtree_fork_choice,
             &mut BankWeightForkChoice::default(),
+            &replay_votes_sender,
         );
         // No new stats should have been computed
+        assert!(replay_votes_receiver.try_iter().next().is_none());
         assert!(newly_computed.is_empty());
     }
 
@@ -2811,6 +2871,7 @@ pub(crate) mod tests {
             .collect();
 
         let ancestors = vote_simulator.bank_forks.read().unwrap().ancestors();
+        let (replay_votes_sender, _replay_votes_receiver) = unbounded();
         ReplayStage::compute_bank_stats(
             &node_pubkey,
             &ancestors,
@@ -2823,6 +2884,7 @@ pub(crate) mod tests {
             &mut PubkeyReferences::default(),
             &mut heaviest_subtree_fork_choice,
             &mut BankWeightForkChoice::default(),
+            &replay_votes_sender,
         );
 
         assert_eq!(
@@ -2885,6 +2947,7 @@ pub(crate) mod tests {
             .cloned()
             .collect();
 
+        let (replay_votes_sender, _replay_votes_receiver) = unbounded();
         ReplayStage::compute_bank_stats(
             &node_pubkey,
             &vote_simulator.bank_forks.read().unwrap().ancestors(),
@@ -2897,6 +2960,7 @@ pub(crate) mod tests {
             &mut PubkeyReferences::default(),
             &mut vote_simulator.heaviest_subtree_fork_choice,
             &mut BankWeightForkChoice::default(),
+            &replay_votes_sender,
         );
 
         frozen_banks.sort_by_key(|bank| bank.slot());

core/src/result.rs

@@ -17,6 +17,7 @@ pub enum Error {
     RecvError(std::sync::mpsc::RecvError),
     TryCrossbeamRecvError(crossbeam_channel::TryRecvError),
     CrossbeamRecvTimeoutError(crossbeam_channel::RecvTimeoutError),
+    ReadyTimeoutError,
     RecvTimeoutError(std::sync::mpsc::RecvTimeoutError),
     CrossbeamSendError,
     TryRecvError(std::sync::mpsc::TryRecvError),
@@ -61,6 +62,11 @@ impl std::convert::From<crossbeam_channel::RecvTimeoutError> for Error {
         Error::CrossbeamRecvTimeoutError(e)
     }
 }
+impl std::convert::From<crossbeam_channel::ReadyTimeoutError> for Error {
+    fn from(_e: crossbeam_channel::ReadyTimeoutError) -> Error {
+        Error::ReadyTimeoutError
+    }
+}
 impl std::convert::From<std::sync::mpsc::RecvTimeoutError> for Error {
     fn from(e: std::sync::mpsc::RecvTimeoutError) -> Error {
         Error::RecvTimeoutError(e)

core/src/rpc_error.rs

@@ -4,6 +4,7 @@ use solana_sdk::clock::Slot;
 const JSON_RPC_SERVER_ERROR_0: i64 = -32000;
 const JSON_RPC_SERVER_ERROR_1: i64 = -32001;
 const JSON_RPC_SERVER_ERROR_2: i64 = -32002;
+const JSON_RPC_SERVER_ERROR_3: i64 = -32003;
 
 pub enum RpcCustomError {
     NonexistentClusterRoot {
@@ -17,6 +18,7 @@ pub enum RpcCustomError {
     SendTransactionPreflightFailure {
         message: String,
     },
+    SendTransactionIsNotSigned,
 }
 
 impl From<RpcCustomError> for Error {
@@ -49,6 +51,11 @@ impl From<RpcCustomError> for Error {
                 message,
                 data: None,
             },
+            RpcCustomError::SendTransactionIsNotSigned => Self {
+                code: ErrorCode::ServerError(JSON_RPC_SERVER_ERROR_3),
+                message: "Transaction is not signed".to_string(),
+                data: None,
+            },
         }
     }
 }

core/src/rpc_pubsub.rs

@@ -5,7 +5,10 @@ use jsonrpc_core::{Error, ErrorCode, Result};
 use jsonrpc_derive::rpc;
 use jsonrpc_pubsub::{typed::Subscriber, Session, SubscriptionId};
 use solana_account_decoder::UiAccount;
-use solana_client::rpc_response::{Response as RpcResponse, RpcKeyedAccount, RpcSignatureResult};
+use solana_client::{
+    rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
+    rpc_response::{Response as RpcResponse, RpcKeyedAccount, RpcSignatureResult},
+};
 #[cfg(test)]
 use solana_ledger::{bank_forks::BankForks, blockstore::Blockstore};
 use solana_sdk::{
@@ -38,7 +41,7 @@ pub trait RpcSolPubSub {
         meta: Self::Metadata,
         subscriber: Subscriber<RpcResponse<UiAccount>>,
         pubkey_str: String,
-        commitment: Option<CommitmentConfig>,
+        config: Option<RpcAccountInfoConfig>,
     );
 
     // Unsubscribe from account notification subscription.
@@ -62,7 +65,7 @@ pub trait RpcSolPubSub {
         meta: Self::Metadata,
         subscriber: Subscriber<RpcResponse<RpcKeyedAccount>>,
         pubkey_str: String,
-        commitment: Option<CommitmentConfig>,
+        config: Option<RpcProgramAccountsConfig>,
     );
 
     // Unsubscribe from account notification subscription.
@@ -178,7 +181,7 @@ impl RpcSolPubSub for RpcSolPubSubImpl {
         _meta: Self::Metadata,
         subscriber: Subscriber<RpcResponse<UiAccount>>,
         pubkey_str: String,
-        commitment: Option<CommitmentConfig>,
+        config: Option<RpcAccountInfoConfig>,
     ) {
         match param::<Pubkey>(&pubkey_str, "pubkey") {
             Ok(pubkey) => {
@@ -186,7 +189,7 @@ impl RpcSolPubSub for RpcSolPubSubImpl {
                 let sub_id = SubscriptionId::Number(id as u64);
                 info!("account_subscribe: account={:?} id={:?}", pubkey, sub_id);
                 self.subscriptions
-                    .add_account_subscription(pubkey, commitment, sub_id, subscriber)
+                    .add_account_subscription(pubkey, config, sub_id, subscriber)
             }
             Err(e) => subscriber.reject(e).unwrap(),
         }
@@ -214,7 +217,7 @@ impl RpcSolPubSub for RpcSolPubSubImpl {
         _meta: Self::Metadata,
         subscriber: Subscriber<RpcResponse<RpcKeyedAccount>>,
         pubkey_str: String,
-        commitment: Option<CommitmentConfig>,
+        config: Option<RpcProgramAccountsConfig>,
     ) {
         match param::<Pubkey>(&pubkey_str, "pubkey") {
             Ok(pubkey) => {
@@ -222,7 +225,7 @@ impl RpcSolPubSub for RpcSolPubSubImpl {
                 let sub_id = SubscriptionId::Number(id as u64);
                 info!("program_subscribe: account={:?} id={:?}", pubkey, sub_id);
                 self.subscriptions
-                    .add_program_subscription(pubkey, commitment, sub_id, subscriber)
+                    .add_program_subscription(pubkey, config, sub_id, subscriber)
             }
             Err(e) => subscriber.reject(e).unwrap(),
         }
@@ -361,6 +364,7 @@ mod tests {
     use jsonrpc_core::{futures::sync::mpsc, Response};
     use jsonrpc_pubsub::{PubSubHandler, Session};
     use serial_test_derive::serial;
+    use solana_account_decoder::{parse_account_data::parse_account_data, UiAccountEncoding};
     use solana_budget_program::{self, budget_instruction};
     use solana_ledger::{
         bank_forks::BankForks,
@@ -376,7 +380,7 @@ mod tests {
         message::Message,
         pubkey::Pubkey,
         signature::{Keypair, Signer},
-        system_program, system_transaction,
+        system_instruction, system_program, system_transaction,
         transaction::{self, Transaction},
     };
     use solana_vote_program::vote_transaction;
@@ -555,7 +559,10 @@ mod tests {
             session,
             subscriber,
             contract_state.pubkey().to_string(),
-            Some(CommitmentConfig::recent()),
+            Some(RpcAccountInfoConfig {
+                commitment: Some(CommitmentConfig::recent()),
+                encoding: None,
+            }),
         );
 
         let tx = system_transaction::transfer(&alice, &contract_funds.pubkey(), 51, blockhash);
@@ -628,6 +635,94 @@ mod tests {
         );
     }
 
+    #[test]
+    #[serial]
+    fn test_account_subscribe_with_encoding() {
+        let GenesisConfigInfo {
+            genesis_config,
+            mint_keypair: alice,
+            ..
+        } = create_genesis_config(10_000);
+
+        let nonce_account = Keypair::new();
+        let bank = Bank::new(&genesis_config);
+        let blockhash = bank.last_blockhash();
+        let bank_forks = Arc::new(RwLock::new(BankForks::new(bank)));
+        let bank0 = bank_forks.read().unwrap().get(0).unwrap().clone();
+        let bank1 = Bank::new_from_parent(&bank0, &Pubkey::default(), 1);
+        bank_forks.write().unwrap().insert(bank1);
+        let ledger_path = get_tmp_ledger_path!();
+        let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
+
+        let rpc = RpcSolPubSubImpl {
+            subscriptions: Arc::new(RpcSubscriptions::new(
+                &Arc::new(AtomicBool::new(false)),
+                bank_forks.clone(),
+                Arc::new(RwLock::new(
+                    BlockCommitmentCache::new_for_tests_with_blockstore_bank(
+                        blockstore,
+                        bank_forks.read().unwrap().get(1).unwrap().clone(),
+                        1,
+                    ),
+                )),
+            )),
+            uid: Arc::new(atomic::AtomicUsize::default()),
+        };
+        let session = create_session();
+        let (subscriber, _id_receiver, receiver) = Subscriber::new_test("accountNotification");
+        rpc.account_subscribe(
+            session,
+            subscriber,
+            nonce_account.pubkey().to_string(),
+            Some(RpcAccountInfoConfig {
+                commitment: Some(CommitmentConfig::recent()),
+                encoding: Some(UiAccountEncoding::JsonParsed),
+            }),
+        );
+
+        let ixs = system_instruction::create_nonce_account(
+            &alice.pubkey(),
+            &nonce_account.pubkey(),
+            &alice.pubkey(),
+            100,
+        );
+        let message = Message::new(&ixs, Some(&alice.pubkey()));
+        let tx = Transaction::new(&[&alice, &nonce_account], message, blockhash);
+        process_transaction_and_notify(&bank_forks, &tx, &rpc.subscriptions, 1).unwrap();
+        sleep(Duration::from_millis(200));
+
+        // Test signature confirmation notification #1
+        let expected_data = bank_forks
+            .read()
+            .unwrap()
+            .get(1)
+            .unwrap()
+            .get_account(&nonce_account.pubkey())
+            .unwrap()
+            .data;
+        let expected_data = parse_account_data(&system_program::id(), &expected_data).unwrap();
+        let expected = json!({
+           "jsonrpc": "2.0",
+           "method": "accountNotification",
+           "params": {
+               "result": {
+                   "context": { "slot": 1 },
+                   "value": {
+                       "owner": system_program::id().to_string(),
+                       "lamports": 100,
+                       "data": expected_data,
+                       "executable": false,
+                       "rentEpoch": 1,
+                   },
+               },
+               "subscription": 0,
+           }
+        });
+
+        let (response, _) = robust_poll_or_panic(receiver);
+        assert_eq!(serde_json::to_string(&expected).unwrap(), response);
+    }
+
     #[test]
     #[serial]
     fn test_account_unsubscribe() {
@@ -702,7 +797,10 @@ mod tests {
             session,
             subscriber,
             bob.pubkey().to_string(),
-            Some(CommitmentConfig::root()),
+            Some(RpcAccountInfoConfig {
+                commitment: Some(CommitmentConfig::root()),
+                encoding: None,
+            }),
         );
 
         let tx = system_transaction::transfer(&alice, &bob.pubkey(), 100, blockhash);
@@ -755,7 +853,10 @@ mod tests {
             session,
             subscriber,
             bob.pubkey().to_string(),
-            Some(CommitmentConfig::root()),
+            Some(RpcAccountInfoConfig {
+                commitment: Some(CommitmentConfig::root()),
+                encoding: None,
+            }),
         );
 
         let tx = system_transaction::transfer(&alice, &bob.pubkey(), 100, blockhash);
@@ -921,12 +1022,14 @@ mod tests {
 
         // Process votes and check they were notified.
         let (s, _r) = unbounded();
+        let (_replay_votes_sender, replay_votes_receiver) = unbounded();
         ClusterInfoVoteListener::get_and_process_votes_for_tests(
             &votes_receiver,
             &vote_tracker,
             0,
             rpc.subscriptions.clone(),
             &s,
+            &replay_votes_receiver,
         )
         .unwrap();
 

core/src/rpc_subscriptions.rs

@@ -9,8 +9,10 @@ use jsonrpc_pubsub::{
 };
 use serde::Serialize;
 use solana_account_decoder::{UiAccount, UiAccountEncoding};
-use solana_client::rpc_response::{
-    Response, RpcKeyedAccount, RpcResponseContext, RpcSignatureResult,
+use solana_client::{
+    rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
+    rpc_filter::RpcFilterType,
+    rpc_response::{Response, RpcKeyedAccount, RpcResponseContext, RpcSignatureResult},
 };
 use solana_ledger::{bank_forks::BankForks, blockstore::Blockstore};
 use solana_runtime::bank::Bank;
@@ -87,29 +89,44 @@ impl std::fmt::Debug for NotificationEntry {
     }
 }
 
-struct SubscriptionData<S> {
+struct SubscriptionData<S, T> {
     sink: Sink<S>,
     commitment: CommitmentConfig,
     last_notified_slot: RwLock<Slot>,
+    config: Option<T>,
 }
-type RpcAccountSubscriptions =
-    RwLock<HashMap<Pubkey, HashMap<SubscriptionId, SubscriptionData<Response<UiAccount>>>>>;
-type RpcProgramSubscriptions =
-    RwLock<HashMap<Pubkey, HashMap<SubscriptionId, SubscriptionData<Response<RpcKeyedAccount>>>>>;
+#[derive(Default, Clone)]
+struct ProgramConfig {
+    filters: Vec<RpcFilterType>,
+    encoding: Option<UiAccountEncoding>,
+}
+type RpcAccountSubscriptions = RwLock<
+    HashMap<
+        Pubkey,
+        HashMap<SubscriptionId, SubscriptionData<Response<UiAccount>, UiAccountEncoding>>,
+    >,
+>;
+type RpcProgramSubscriptions = RwLock<
+    HashMap<
+        Pubkey,
+        HashMap<SubscriptionId, SubscriptionData<Response<RpcKeyedAccount>, ProgramConfig>>,
+    >,
+>;
 type RpcSignatureSubscriptions = RwLock<
-    HashMap<Signature, HashMap<SubscriptionId, SubscriptionData<Response<RpcSignatureResult>>>>,
+    HashMap<Signature, HashMap<SubscriptionId, SubscriptionData<Response<RpcSignatureResult>, ()>>>,
 >;
 type RpcSlotSubscriptions = RwLock<HashMap<SubscriptionId, Sink<SlotInfo>>>;
 type RpcVoteSubscriptions = RwLock<HashMap<SubscriptionId, Sink<RpcVote>>>;
 type RpcRootSubscriptions = RwLock<HashMap<SubscriptionId, Sink<Slot>>>;
 
-fn add_subscription<K, S>(
-    subscriptions: &mut HashMap<K, HashMap<SubscriptionId, SubscriptionData<S>>>,
+fn add_subscription<K, S, T>(
+    subscriptions: &mut HashMap<K, HashMap<SubscriptionId, SubscriptionData<S, T>>>,
     hashmap_key: K,
     commitment: Option<CommitmentConfig>,
     sub_id: SubscriptionId,
     subscriber: Subscriber<S>,
     last_notified_slot: Slot,
+    config: Option<T>,
 ) where
     K: Eq + Hash,
     S: Clone,
@@ -120,6 +137,7 @@ fn add_subscription<K, S>(
         sink,
         commitment,
         last_notified_slot: RwLock::new(last_notified_slot),
+        config,
     };
     if let Some(current_hashmap) = subscriptions.get_mut(&hashmap_key) {
         current_hashmap.insert(sub_id, subscription_data);
@@ -130,8 +148,8 @@ fn add_subscription<K, S>(
     subscriptions.insert(hashmap_key, hashmap);
 }
 
-fn remove_subscription<K, S>(
-    subscriptions: &mut HashMap<K, HashMap<SubscriptionId, SubscriptionData<S>>>,
+fn remove_subscription<K, S, T>(
+    subscriptions: &mut HashMap<K, HashMap<SubscriptionId, SubscriptionData<S, T>>>,
     sub_id: &SubscriptionId,
 ) -> bool
 where
@@ -153,8 +171,8 @@ where
 }
 
 #[allow(clippy::type_complexity)]
-fn check_commitment_and_notify<K, S, B, F, X>(
-    subscriptions: &HashMap<K, HashMap<SubscriptionId, SubscriptionData<Response<S>>>>,
+fn check_commitment_and_notify<K, S, B, F, X, T>(
+    subscriptions: &HashMap<K, HashMap<SubscriptionId, SubscriptionData<Response<S>, T>>>,
     hashmap_key: &K,
     bank_forks: &Arc<RwLock<BankForks>>,
     cache_slot_info: &CacheSlotInfo,
@@ -166,8 +184,9 @@ where
     K: Eq + Hash + Clone + Copy,
     S: Clone + Serialize,
     B: Fn(&Bank, &K) -> X,
-    F: Fn(X, Slot) -> (Box<dyn Iterator<Item = S>>, Slot),
+    F: Fn(X, Slot, Option<T>) -> (Box<dyn Iterator<Item = S>>, Slot),
     X: Clone + Serialize + Default,
+    T: Clone,
 {
     let mut notified_set: HashSet<SubscriptionId> = HashSet::new();
     if let Some(hashmap) = subscriptions.get(hashmap_key) {
@@ -177,6 +196,7 @@ where
                 sink,
                 commitment,
                 last_notified_slot,
+                config,
             },
         ) in hashmap.iter()
         {
@@ -196,7 +216,8 @@ where
                     .unwrap_or_default()
             };
             let mut w_last_notified_slot = last_notified_slot.write().unwrap();
-            let (filter_results, result_slot) = filter_results(results, *w_last_notified_slot);
+            let (filter_results, result_slot) =
+                filter_results(results, *w_last_notified_slot, config.as_ref().cloned());
             for result in filter_results {
                 notifier.notify(
                     Response {
@@ -228,16 +249,15 @@ impl RpcNotifier {
 fn filter_account_result(
     result: Option<(Account, Slot)>,
     last_notified_slot: Slot,
+    encoding: Option<UiAccountEncoding>,
 ) -> (Box<dyn Iterator<Item = UiAccount>>, Slot) {
     if let Some((account, fork)) = result {
         // If fork < last_notified_slot this means that we last notified for a fork
         // and should notify that the account state has been reverted.
         if fork != last_notified_slot {
+            let encoding = encoding.unwrap_or(UiAccountEncoding::Binary);
             return (
-                Box::new(iter::once(UiAccount::encode(
-                    account,
-                    UiAccountEncoding::Binary,
-                ))),
+                Box::new(iter::once(UiAccount::encode(account, encoding))),
                 fork,
             );
         }
@@ -248,6 +268,7 @@ fn filter_account_result(
 fn filter_signature_result(
     result: Option<transaction::Result<()>>,
     last_notified_slot: Slot,
+    _config: Option<()>,
 ) -> (Box<dyn Iterator<Item = RpcSignatureResult>>, Slot) {
     (
         Box::new(
@@ -262,14 +283,24 @@ fn filter_signature_result(
 fn filter_program_results(
     accounts: Vec<(Pubkey, Account)>,
     last_notified_slot: Slot,
+    config: Option<ProgramConfig>,
 ) -> (Box<dyn Iterator<Item = RpcKeyedAccount>>, Slot) {
+    let config = config.unwrap_or_default();
+    let encoding = config.encoding.unwrap_or(UiAccountEncoding::Binary);
+    let filters = config.filters;
     (
         Box::new(
             accounts
                 .into_iter()
-                .map(|(pubkey, account)| RpcKeyedAccount {
+                .filter(move |(_, account)| {
+                    filters.iter().all(|filter_type| match filter_type {
+                        RpcFilterType::DataSize(size) => account.data.len() as u64 == *size,
+                        RpcFilterType::Memcmp(compare) => compare.bytes_match(&account.data),
+                    })
+                })
+                .map(move |(pubkey, account)| RpcKeyedAccount {
                     pubkey: pubkey.to_string(),
-                    account: UiAccount::encode(account, UiAccountEncoding::Binary),
+                    account: UiAccount::encode(account, encoding.clone()),
                 }),
         ),
         last_notified_slot,
@@ -461,11 +492,13 @@ impl RpcSubscriptions {
     pub fn add_account_subscription(
         &self,
         pubkey: Pubkey,
-        commitment: Option<CommitmentConfig>,
+        config: Option<RpcAccountInfoConfig>,
         sub_id: SubscriptionId,
         subscriber: Subscriber<Response<UiAccount>>,
     ) {
-        let commitment_level = commitment
+        let config = config.unwrap_or_default();
+        let commitment_level = config
+            .commitment
             .unwrap_or_else(CommitmentConfig::single)
             .commitment;
         let slot = match commitment_level {
@@ -511,10 +544,11 @@ impl RpcSubscriptions {
         add_subscription(
             &mut subscriptions,
             pubkey,
-            commitment,
+            config.commitment,
             sub_id,
             subscriber,
             last_notified_slot,
+            config.encoding,
         );
     }
 
@@ -535,11 +569,14 @@ impl RpcSubscriptions {
     pub fn add_program_subscription(
         &self,
         program_id: Pubkey,
-        commitment: Option<CommitmentConfig>,
+        config: Option<RpcProgramAccountsConfig>,
         sub_id: SubscriptionId,
         subscriber: Subscriber<Response<RpcKeyedAccount>>,
     ) {
-        let commitment_level = commitment
+        let config = config.unwrap_or_default();
+        let commitment_level = config
+            .account_config
+            .commitment
             .unwrap_or_else(CommitmentConfig::recent)
             .commitment;
         let mut subscriptions = if commitment_level == CommitmentLevel::SingleGossip {
@@ -553,10 +590,14 @@ impl RpcSubscriptions {
         add_subscription(
             &mut subscriptions,
             program_id,
-            commitment,
+            config.account_config.commitment,
             sub_id,
             subscriber,
             0, // last_notified_slot is not utilized for program subscriptions
+            Some(ProgramConfig {
+                filters: config.filters.unwrap_or_default(),
+                encoding: config.account_config.encoding,
+            }),
         );
     }
 
@@ -599,6 +640,7 @@ impl RpcSubscriptions {
             sub_id,
             subscriber,
             0, // last_notified_slot is not utilized for signature subscriptions
+            None,
         );
     }
 
@@ -718,6 +760,9 @@ impl RpcSubscriptions {
                             notifier.notify(slot_info, sink);
                         }
                     }
+                    // These notifications are only triggered by votes observed on gossip,
+                    // unlike `NotificationEntry::Gossip`, which also accounts for slots seen
+                    // in VoteState's from bank states built in ReplayStage.
                     NotificationEntry::Vote(ref vote_info) => {
                         let subscriptions = subscriptions.vote_subscriptions.read().unwrap();
                         for (_, sink) in subscriptions.iter() {
@@ -982,7 +1027,10 @@ pub(crate) mod tests {
         );
         subscriptions.add_account_subscription(
             alice.pubkey(),
-            Some(CommitmentConfig::recent()),
+            Some(RpcAccountInfoConfig {
+                commitment: Some(CommitmentConfig::recent()),
+                encoding: None,
+            }),
             sub_id.clone(),
             subscriber,
         );
@@ -1392,7 +1440,7 @@ pub(crate) mod tests {
     #[test]
     #[serial]
     fn test_add_and_remove_subscription() {
-        let mut subscriptions: HashMap<u64, HashMap<SubscriptionId, SubscriptionData<()>>> =
+        let mut subscriptions: HashMap<u64, HashMap<SubscriptionId, SubscriptionData<(), ()>>> =
             HashMap::new();
 
         let num_keys = 5;
@@ -1400,7 +1448,7 @@ pub(crate) mod tests {
             let (subscriber, _id_receiver, _transport_receiver) =
                 Subscriber::new_test("notification");
             let sub_id = SubscriptionId::Number(key);
-            add_subscription(&mut subscriptions, key, None, sub_id, subscriber, 0);
+            add_subscription(&mut subscriptions, key, None, sub_id, subscriber, 0, None);
         }
 
         // Add another subscription to the "0" key
@@ -1413,6 +1461,7 @@ pub(crate) mod tests {
             extra_sub_id.clone(),
             subscriber,
             0,
+            None,
         );
 
         assert_eq!(subscriptions.len(), num_keys as usize);
@@ -1474,7 +1523,10 @@ pub(crate) mod tests {
         let sub_id0 = SubscriptionId::Number(0 as u64);
         subscriptions.add_account_subscription(
             alice.pubkey(),
-            Some(CommitmentConfig::single_gossip()),
+            Some(RpcAccountInfoConfig {
+                commitment: Some(CommitmentConfig::single_gossip()),
+                encoding: None,
+            }),
             sub_id0.clone(),
             subscriber0,
         );
@@ -1539,7 +1591,10 @@ pub(crate) mod tests {
         let sub_id1 = SubscriptionId::Number(1 as u64);
         subscriptions.add_account_subscription(
             alice.pubkey(),
-            Some(CommitmentConfig::single_gossip()),
+            Some(RpcAccountInfoConfig {
+                commitment: Some(CommitmentConfig::single_gossip()),
+                encoding: None,
+            }),
             sub_id1.clone(),
             subscriber1,
         );

core/src/tpu.rs

@@ -8,6 +8,7 @@ use crate::{
     cluster_info_vote_listener::{ClusterInfoVoteListener, VerifiedVoteSender, VoteTracker},
     fetch_stage::FetchStage,
     poh_recorder::{PohRecorder, WorkingBankEntry},
+    replay_stage::ReplayVotesReceiver,
     rpc_subscriptions::RpcSubscriptions,
     sigverify::TransactionSigVerifier,
     sigverify_stage::SigVerifyStage,
@@ -53,6 +54,7 @@ impl Tpu {
         vote_tracker: Arc<VoteTracker>,
         bank_forks: Arc<RwLock<BankForks>>,
         verified_vote_sender: VerifiedVoteSender,
+        replay_votes_receiver: ReplayVotesReceiver,
     ) -> Self {
         let (packet_sender, packet_receiver) = channel();
         let fetch_stage = FetchStage::new_with_sender(
@@ -79,6 +81,7 @@ impl Tpu {
             bank_forks,
             subscriptions.clone(),
             verified_vote_sender,
+            replay_votes_receiver,
         );
 
         let banking_stage = BankingStage::new(

core/src/transaction_status_service.rs

@@ -3,6 +3,7 @@ use solana_ledger::{blockstore::Blockstore, blockstore_processor::TransactionSta
 use solana_runtime::{
     bank::{Bank, HashAgeKind},
     nonce_utils,
+    transaction_utils::OrderedIterator,
 };
 use solana_transaction_status::TransactionStatusMeta;
 use std::{
@@ -50,16 +51,17 @@ impl TransactionStatusService {
         let TransactionStatusBatch {
             bank,
             transactions,
+            iteration_order,
             statuses,
             balances,
         } = write_transaction_status_receiver.recv_timeout(Duration::from_secs(1))?;
 
         let slot = bank.slot();
-        for (((transaction, (status, hash_age_kind)), pre_balances), post_balances) in transactions
-            .iter()
-            .zip(statuses)
-            .zip(balances.pre_balances)
-            .zip(balances.post_balances)
+        for (((transaction, (status, hash_age_kind)), pre_balances), post_balances) in
+            OrderedIterator::new(&transactions, iteration_order.as_deref())
+                .zip(statuses)
+                .zip(balances.pre_balances)
+                .zip(balances.post_balances)
         {
             if Bank::can_commit(&status) && !transaction.signatures.is_empty() {
                 let fee_calculator = match hash_age_kind {

core/src/tvu.rs

@@ -11,7 +11,7 @@ use crate::{
     commitment::BlockCommitmentCache,
     ledger_cleanup_service::LedgerCleanupService,
     poh_recorder::PohRecorder,
-    replay_stage::{ReplayStage, ReplayStageConfig},
+    replay_stage::{ReplayStage, ReplayStageConfig, ReplayVotesSender},
     retransmit_stage::RetransmitStage,
     rewards_recorder_service::RewardsRecorderSender,
     rpc_subscriptions::RpcSubscriptions,
@@ -97,6 +97,7 @@ impl Tvu {
         vote_tracker: Arc<VoteTracker>,
         retransmit_slots_sender: RetransmitSlotsSender,
         verified_vote_receiver: VerifiedVoteReceiver,
+        replay_votes_sender: ReplayVotesSender,
         tvu_config: TvuConfig,
     ) -> Self {
         let keypair: Arc<Keypair> = cluster_info.keypair.clone();
@@ -197,6 +198,7 @@ impl Tvu {
             cluster_slots,
             retransmit_slots_sender,
             duplicate_slots_reset_receiver,
+            replay_votes_sender,
         );
 
         let ledger_cleanup_service = tvu_config.max_ledger_shreds.map(|max_ledger_shreds| {
@@ -280,6 +282,7 @@ pub mod tests {
         ));
         let (retransmit_slots_sender, _retransmit_slots_receiver) = unbounded();
         let (_verified_vote_sender, verified_vote_receiver) = unbounded();
+        let (replay_votes_sender, _replay_votes_receiver) = unbounded();
         let bank_forks = Arc::new(RwLock::new(bank_forks));
         let tvu = Tvu::new(
             &vote_keypair.pubkey(),
@@ -313,6 +316,7 @@ pub mod tests {
             Arc::new(VoteTracker::new(&bank)),
             retransmit_slots_sender,
             verified_vote_receiver,
+            replay_votes_sender,
             TvuConfig::default(),
         );
         exit.store(true, Ordering::Relaxed);

core/src/validator.rs

@@ -401,6 +401,7 @@ impl Validator {
 
         let (retransmit_slots_sender, retransmit_slots_receiver) = unbounded();
         let (verified_vote_sender, verified_vote_receiver) = unbounded();
+        let (replay_votes_sender, replay_votes_receiver) = unbounded();
         let tvu = Tvu::new(
             vote_account,
             authorized_voter_keypairs,
@@ -446,6 +447,7 @@ impl Validator {
             vote_tracker.clone(),
             retransmit_slots_sender,
             verified_vote_receiver,
+            replay_votes_sender,
             TvuConfig {
                 max_ledger_shreds: config.max_ledger_shreds,
                 halt_on_trusted_validators_accounts_hash_mismatch: config
@@ -473,6 +475,7 @@ impl Validator {
             vote_tracker,
             bank_forks,
             verified_vote_sender,
+            replay_votes_receiver,
         );
 
         datapoint_info!("validator-new", ("id", id.to_string(), String));

crate-features/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-crate-features"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana Crate Features"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -21,7 +21,7 @@ rand_chacha = { version = "0.2.2" }
 regex-syntax = { version = "0.6.12" }
 reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde = { version = "1.0.100", features = ["rc"] }
-ed25519-dalek = { version = "=1.0.0-pre.3", features = ["serde"] }
+ed25519-dalek = { version = "=1.0.0-pre.4", features = ["serde"] }
 syn_0_15 = { package = "syn", version = "0.15.42", features = ["extra-traits", "fold", "full"] }
 syn_1_0 = { package = "syn", version = "1.0.3", features = ["extra-traits", "fold", "full"] }
 tokio = { version = "0.1.22",features=["bytes", "codec", "default", "fs", "io", "mio", "num_cpus", "reactor", "rt-full", "sync", "tcp", "timer", "tokio-codec", "tokio-current-thread", "tokio-executor", "tokio-io", "tokio-io", "tokio-reactor", "tokio-tcp", "tokio-tcp", "tokio-threadpool", "tokio-timer", "tokio-udp", "tokio-uds", "udp", "uds"] }

docs/.gitignore

@@ -9,6 +9,7 @@
 .cache-loader
 .vercel
 /static/img/*.svg
+/static/img/*.png
 vercel.json
 
 # Misc

docs/build.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -ex
 
+cd "$(dirname "$0")"
+
 # shellcheck source=ci/env.sh
 source ../ci/env.sh
 
-cd "$(dirname "$0")"
-
 : "${rust_stable_docker_image:=}" # Pacify shellcheck
 
 # shellcheck source=ci/rust-version.sh

docs/convert-ascii-to-svg.sh

@@ -11,11 +11,11 @@ output_dir=static/img
 mkdir -p "$output_dir"
 
 while read -r bob_file; do
-  svg_file=$(basename "${bob_file%.*}".svg)
-  svgbob "$bob_file" --output "$output_dir/$svg_file"
+  out_file=$(basename "${bob_file%.*}".svg)
+  svgbob "$bob_file" --output "$output_dir/$out_file"
 done < <(find art/*.bob)
 
 while read -r msc_file; do
-  svg_file=$(basename "${msc_file%.*}".svg)
-  mscgen -T svg -o "$output_dir/$svg_file" -i "$msc_file"
+  out_file=$(basename "${msc_file%.*}".png)
+  mscgen -T png -o "$output_dir/$out_file" -i "$msc_file"
 done < <(find art/*.msc)

docs/docusaurus.config.js

@@ -17,19 +17,24 @@ module.exports = {
       links: [
         {
           to: "introduction",
-          label: "Docs",
+          label: "Introduction",
           position: "left",
         },
         {
-          to: "apps/README",
+          to: "apps",
           label: "Developers",
           position: "left",
         },
         {
-          to: "running-validator/README",
+          to: "running-validator",
           label: "Validators",
           position: "left",
         },
+        {
+          to: "clusters",
+          label: "Clusters",
+          position: "left",
+        },
         {
           href: "https://discordapp.com/invite/pquxPsq",
           label: "Chat",
@@ -43,6 +48,10 @@ module.exports = {
         },
       ],
     },
+    algolia: {
+      apiKey: "d58e0d68c875346d52645d68b13f3ac0",
+      indexName: "solana",
+    },
     footer: {
       style: "dark",
       links: [
@@ -55,7 +64,7 @@ module.exports = {
             },
             {
               label: "Tour de SOL",
-              to: "tour-de-sol/README",
+              to: "tour-de-sol",
             },
           ],
         },

docs/sidebars.js

@@ -38,16 +38,19 @@ module.exports = {
       "cli/conventions",
       "cli/choose-a-cluster",
       "cli/transfer-tokens",
+      "cli/delegate-stake",
       "cli/manage-stake-accounts",
       "offline-signing",
       "offline-signing/durable-nonce",
+      "cli/usage",
     ],
     "Solana Clusters": ["clusters"],
     "Develop Applications": [
       "apps",
       "apps/rent",
+      "apps/hello-world",
+      "apps/break",
       "apps/webwallet",
-      "apps/tictactoe",
       "apps/drones",
       "transaction",
       "apps/jsonrpc-api",
@@ -59,6 +62,7 @@ module.exports = {
       "running-validator",
       "running-validator/validator-reqs",
       "running-validator/validator-start",
+      "running-validator/vote-accounts",
       "running-validator/validator-stake",
       "running-validator/validator-monitor",
       "running-validator/validator-info",
@@ -111,11 +115,12 @@ module.exports = {
     Terminology: ["terminology"],
     History: ["history"],
     "Implemented Design Proposals": [
+      "implemented-proposals/implemented-proposals",
       {
         type: "category",
         label: "Economic Design",
         items: [
-          "implemented-proposals/ed_overview/ed_cluster_economics",
+          "implemented-proposals/ed_overview/ed_overview",
           {
             type: "category",
             label: "Validation Client Economics",
@@ -141,7 +146,6 @@ module.exports = {
       "implemented-proposals/repair-service",
       "implemented-proposals/testing-programs",
       "implemented-proposals/readonly-accounts",
-      "implemented-proposals/embedding-move",
       "implemented-proposals/staking-rewards",
       "implemented-proposals/rent",
       "implemented-proposals/durable-tx-nonces",
@@ -152,7 +156,7 @@ module.exports = {
       "implemented-proposals/program-derived-addresses",
     ],
     "Accepted Design Proposals": [
-      "proposals/accepted_design_proposals",
+      "proposals/accepted-design-proposals",
       "proposals/ledger-replication-to-implement",
       "proposals/optimistic-confirmation-and-slashing",
       "proposals/vote-signing-to-implement",
@@ -167,7 +171,6 @@ module.exports = {
       "proposals/block-confirmation",
       "proposals/rust-clients",
       "proposals/optimistic_confirmation",
-      "proposals/abi-management",
     ],
   },
 };

docs/src/apps.md

@@ -22,7 +22,7 @@ Each instruction specifies a single program account \(which must be marked execu
 
 ![SDK tools](/img/sdk-tools.svg)
 
-As shown in the diagram above, a program author creates a program and compiles it to an ELF shared object containing BPF bytecode and uploads it to the Solana cluster with a special _deploy_ transaction. The cluster makes it available to clients via a _program ID_. The program ID is a _address_ specified when deploying and is used to reference the program in subsequent transactions.
+As shown in the diagram above, a program author creates a program and compiles it to an ELF shared object containing BPF bytecode and uploads it to the Solana cluster with a special _deploy_ transaction. The cluster makes it available to clients via a _program ID_. The program ID is an _address_ specified when deploying and is used to reference the program in subsequent transactions.
 
 A program may be written in any programming language that can target the Berkley Packet Filter \(BPF\) safe execution environment. The Solana SDK offers the best support for C/C++ and Rust programs, which are compiled to BPF using the [LLVM compiler infrastructure](https://llvm.org).
 

docs/src/apps/break.md

@@ -0,0 +1,31 @@
+---
+title: "Example: Break"
+---
+
+[Break](https://break.solana.com/) is a React app that gives users a visceral
+feeling for just how fast and high-performance the Solana network really is.
+Can you _break_ the Solana blockchain?
+During a 15 second playthough, each click of a button or keystroke
+sends a new transaction to the cluster.  Smash the keyboard as fast as you can
+and watch your transactions get finalized in real time while the network takes
+it all in stride!
+
+Break can be played on our Devnet, Testnet and Mainnet Beta networks.  Plays are
+free on Devnet and Testnet, where the session is funded by a network faucet.
+On Mainnet Beta, users pay to play 0.08 SOL per game.  The session account can
+be funded by a local keystore wallet or by scanning a QR code from Trust Wallet
+to transfer the tokens.
+
+[Click here to play Break](https://break.solana.com/)
+
+## Build and run Break locally
+
+First fetch the latest version of the example code:
+
+```bash
+$ git clone https://github.com/solana-labs/break.git
+$ cd break
+```
+
+Next, follow the steps in the git repository's
+[README](https://github.com/solana-labs/break/blob/master/README.md).

docs/src/apps/hello-world.md

@@ -0,0 +1,23 @@
+---
+title: "Example: Hello World"
+---
+
+Hello World is a project that demonstrates how to use the Solana Javascript API
+to build, deploy, and interact with programs on the Solana blockchain.
+
+The project comprises of:
+ - An on-chain hello world program
+ - A client that can send a "hello" to an account and get back the number of
+ times "hello" has been sent
+
+## Build and run Hello World program
+
+First fetch the latest version of the example code:
+
+```bash
+$ git clone https://github.com/solana-labs/example-helloworld.git
+$ cd example-helloworld
+```
+
+Next, follow the steps in the git repository's
+[README](https://github.com/solana-labs/example-helloworld/blob/master/README.md).

docs/src/apps/jsonrpc-api.md

@@ -45,6 +45,10 @@ To interact with a Solana node inside a JavaScript application, use the [solana-
 - [getSlotLeader](jsonrpc-api.md#getslotleader)
 - [getStakeActivation](jsonrpc-api.md#getstakeactivation)
 - [getSupply](jsonrpc-api.md#getsupply)
+- [getTokenAccountBalance](jsonrpc-api.md#gettokenaccountbalance)
+- [getTokenAccountsByDelegate](jsonrpc-api.md#gettokenaccountsbydelegate)
+- [getTokenAccountsByOwner](jsonrpc-api.md#gettokenaccountsbyowner)
+- [getTokenSupply](jsonrpc-api.md#gettokensupply)
 - [getTransactionCount](jsonrpc-api.md#gettransactioncount)
 - [getVersion](jsonrpc-api.md#getversion)
 - [getVoteAccounts](jsonrpc-api.md#getvoteaccounts)
@@ -466,6 +470,7 @@ Returns information about the current epoch
 The result field will be an object with the following fields:
 
 - `absoluteSlot: <u64>`, the current slot
+- `blockHeight: <u64>`, the current block height
 - `epoch: <u64>`, the current epoch
 - `slotIndex: <u64>`, the current slot relative to the start of the current epoch
 - `slotsInEpoch: <u64>`, the number of slots in this epoch
@@ -477,7 +482,7 @@ The result field will be an object with the following fields:
 curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getEpochInfo"}' http://localhost:8899
 
 // Result
-{"jsonrpc":"2.0","result":{"absoluteSlot":166598,"epoch":27,"slotIndex":2790,"slotsInEpoch":8192},"id":1}
+{"jsonrpc":"2.0","result":{"absoluteSlot":166598,"blockHeight": 166500, "epoch":27,"slotIndex":2790,"slotsInEpoch":8192},"id":1}
 ```
 
 ### getEpochSchedule
@@ -1015,6 +1020,130 @@ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "
 {"jsonrpc":"2.0","result":{"context":{"slot":1114},"value":{"circulating":16000,"nonCirculating":1000000,"nonCirculatingAccounts":["FEy8pTbP5fEoqMV1GdTz83byuA8EKByqYat1PKDgVAq5","9huDUZfxoJ7wGMTffUE7vh1xePqef7gyrLJu9NApncqA","3mi1GmwEE3zo2jmfDuzvjSX9ovRXsDUKHvsntpkhuLJ9","BYxEJTDerkaRWBem3XgnVcdhppktBXa2HbkHPKj2Ui4Z],total:1016000}},"id":1}
 ```
 
+### getTokenAccountBalance
+
+Returns the token balance of an SPL Token account.
+
+#### Parameters:
+
+- `<string>` - Pubkey of Token account to query, as base-58 encoded string
+- `<object>` - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+
+#### Results:
+
+The result will be an RpcResponse JSON object with `value` equal to a JSON object containing:
+
+- `uiAmount: <f64>` - the balance, using mint-prescribed decimals
+- `amount: <string>` - the raw balance without decimals, a string representation of u64
+- `decimals: <u8>` - number of base 10 digits to the right of the decimal place
+
+#### Example:
+
+```bash
+// Request
+curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getTokenAccountBalance", "params": ["7fUAJdStEuGbc3sM84cKRL6yYaaSstyLSU4ve5oovLS7"]}' http://localhost:8899
+// Result
+{"jsonrpc":"2.0","result":{"context":{"slot":1114},"value":{"uiAmount":98.64,"amount":"9864","decimals":2},"id":1}
+```
+
+### getTokenAccountsByDelegate
+
+Returns all SPL Token accounts by approved Delegate.
+
+#### Parameters:
+
+- `<string>` - Pubkey of account delegate to query, as base-58 encoded string
+- `<object>` - Either:
+  * `mint: <string>` - Pubkey of the specific token Mint to limit accounts to, as base-58 encoded string; or
+  * `programId: <string>` - Pubkey of the Token program ID that owns the accounts, as base-58 encoded string
+- `<object>` - (optional) Configuration object containing the following optional fields:
+  - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+  - (optional) `encoding: <string>` - encoding for Account data, either "binary" or jsonParsed". If parameter not provided, the default encoding is binary.
+    Parsed-JSON encoding attempts to use program-specific state parsers to return more human-readable and explicit account state data. If parsed-JSON is requested but a parser cannot be found, the field falls back to binary encoding, detectable when the `data` field is type `<string>`.
+
+#### Results:
+
+The result will be an RpcResponse JSON object with `value` equal to an array of JSON objects, which will contain:
+
+- `pubkey: <string>` - the account Pubkey as base-58 encoded string
+- `account: <object>` - a JSON object, with the following sub fields:
+   - `lamports: <u64>`, number of lamports assigned to this account, as a u64
+   - `owner: <string>`, base-58 encoded Pubkey of the program this account has been assigned to
+   - `data: <object>`, Token state data associated with the account, either as base-58 encoded binary data or in JSON format `{<program>: <state>}`
+   - `executable: <bool>`, boolean indicating if the account contains a program \(and is strictly read-only\)
+   - `rentEpoch: <u64>`, the epoch at which this account will next owe rent, as u64
+
+#### Example:
+
+```bash
+// Request
+curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getTokenAccountsByDelegate", "params": ["4Nd1mBQtrMJVYVfKf2PJy9NZUZdTAsp7D4xWLs4gDB4T", {"programId": "TokenSVp5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"}, {"encoding": "jsonParsed"}]}' http://localhost:8899
+// Result
+{"jsonrpc":"2.0","result":{"context":{"slot":1114},"value":[{"data":{"program":"spl-token","parsed":{"accountType":"account","info":{"amount":1,"delegate":"4Nd1mBQtrMJVYVfKf2PJy9NZUZdTAsp7D4xWLs4gDB4T","delegatedAmount":1,"isInitialized":true,"isNative":false,"mint":"3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E","owner":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}}},"executable":false,"lamports":1726080,"owner":"TokenSVp5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o","rentEpoch":4},"pubkey":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}],"id":1}
+```
+
+### getTokenAccountsByOwner
+
+Returns all SPL Token accounts by token owner.
+
+#### Parameters:
+
+- `<string>` - Pubkey of account owner to query, as base-58 encoded string
+- `<object>` - Either:
+  * `mint: <string>` - Pubkey of the specific token Mint to limit accounts to, as base-58 encoded string; or
+  * `programId: <string>` - Pubkey of the Token program ID that owns the accounts, as base-58 encoded string
+- `<object>` - (optional) Configuration object containing the following optional fields:
+  - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+  - (optional) `encoding: <string>` - encoding for Account data, either "binary" or jsonParsed". If parameter not provided, the default encoding is binary.
+    Parsed-JSON encoding attempts to use program-specific state parsers to return more human-readable and explicit account state data. If parsed-JSON is requested but a parser cannot be found, the field falls back to binary encoding, detectable when the `data` field is type `<string>`.
+
+#### Results:
+
+The result will be an RpcResponse JSON object with `value` equal to an array of JSON objects, which will contain:
+
+- `pubkey: <string>` - the account Pubkey as base-58 encoded string
+- `account: <object>` - a JSON object, with the following sub fields:
+   - `lamports: <u64>`, number of lamports assigned to this account, as a u64
+   - `owner: <string>`, base-58 encoded Pubkey of the program this account has been assigned to
+   - `data: <object>`, Token state data associated with the account, either as base-58 encoded binary data or in JSON format `{<program>: <state>}`
+   - `executable: <bool>`, boolean indicating if the account contains a program \(and is strictly read-only\)
+   - `rentEpoch: <u64>`, the epoch at which this account will next owe rent, as u64
+
+#### Example:
+
+```bash
+// Request
+curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getTokenAccountsByOwner", "params": ["4Qkev8aNZcqFNSRhQzwyLMFSsi94jHqE8WNVTJzTP99F", {"mint":"3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E"}, {"encoding": "jsonParsed"}]}' http://localhost:8899
+// Result
+{"jsonrpc":"2.0","result":{"context":{"slot":1114},"value":[{"data":{"program":"spl-token","parsed":{"accountType":"account","info":{"amount":1,"delegate":null,"delegatedAmount":1,"isInitialized":true,"isNative":false,"mint":"3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E","owner":"4Qkev8aNZcqFNSRhQzwyLMFSsi94jHqE8WNVTJzTP99F"}}},"executable":false,"lamports":1726080,"owner":"TokenSVp5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o","rentEpoch":4},"pubkey":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}],"id":1}
+```
+
+### getTokenSupply
+
+Returns the total supply of an SPL Token type.
+
+#### Parameters:
+
+- `<string>` - Pubkey of token Mint to query, as base-58 encoded string
+- `<object>` - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+
+#### Results:
+
+The result will be an RpcResponse JSON object with `value` equal to a JSON object containing:
+
+- `uiAmount: <f64>` - the total token supply, using mint-prescribed decimals
+- `amount: <string>` - the raw total token supply without decimals, a string representation of u64
+- `decimals: <u8>` - number of base 10 digits to the right of the decimal place
+
+#### Example:
+
+```bash
+// Request
+curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getTokenSupply", "params": ["3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E"]}' http://localhost:8899
+// Result
+{"jsonrpc":"2.0","result":{"context":{"slot":1114},"value":{"uiAmount":1000.0,"amount":"100000","decimals":2},"id":1}
+```
+
 ### getTransactionCount
 
 Returns the current Transaction count from the ledger
@@ -1057,7 +1186,7 @@ The result field will be a JSON object with the following fields:
 // Request
 curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVersion"}' http://localhost:8899
 // Result
-{"jsonrpc":"2.0","result":{"solana-core": "1.2.11"},"id":1}
+{"jsonrpc":"2.0","result":{"solana-core": "1.2.18"},"id":1}
 ```
 
 ### getVoteAccounts
@@ -1255,7 +1384,10 @@ Subscribe to an account to receive notifications when the lamports or data for a
 #### Parameters:
 
 - `<string>` - account Pubkey, as base-58 encoded string
-- `<object>` - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+- `<object>` - (optional) Configuration object containing the following optional fields:
+  - `<object>` - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+  - (optional) `encoding: <string>` - encoding for Account data, either "binary" or jsonParsed". If parameter not provided, the default encoding is binary.
+    Parsed-JSON encoding attempts to use program-specific state parsers to return more human-readable and explicit account state data. If parsed-JSON is requested but a parser cannot be found, the field falls back to binary encoding, detectable when the `data` field is type `<string>`.
 
 #### Results:
 
@@ -1269,13 +1401,16 @@ Subscribe to an account to receive notifications when the lamports or data for a
 
 {"jsonrpc":"2.0", "id":1, "method":"accountSubscribe", "params":["CM78CPUeXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNH12", {"commitment": "single"}]}
 
+{"jsonrpc":"2.0", "id":1, "method":"accountSubscribe", "params":["CM78CPUeXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNH12", {"encoding":"jsonParsed"}]}
+
 // Result
-{"jsonrpc": "2.0","result": 0,"id": 1}
+{"jsonrpc": "2.0","result": 23784,"id": 1}
 ```
 
 #### Notification Format:
 
 ```bash
+// Binary encoding
 {
   "jsonrpc": "2.0",
   "method": "accountNotification",
@@ -1285,10 +1420,41 @@ Subscribe to an account to receive notifications when the lamports or data for a
         "slot": 5199307
       },
       "value": {
-        "data": "9qRxMDwy1ntDhBBoiy4Na9uDLbRTSzUS989mpwz",
+        "data": "11116bv5nS2h3y12kD1yUKeMZvGcKLSjQgX6BeV7u1FrjeJcKfsHPXHRDEHrBesJhZyqnnq9qJeUuF7WHxiuLuL5twc38w2TXNLxnDbjmuR",
         "executable": false,
         "lamports": 33594,
-        "owner": "H9oaJujXETwkmjyweuqKPFtk2no4SumoU9A3hi3dC8U6",
+        "owner": "11111111111111111111111111111111",
+        "rentEpoch": 635
+      }
+    },
+    "subscription": 23784
+  }
+}
+
+// Parsed-JSON encoding
+{
+  "jsonrpc": "2.0",
+  "method": "accountNotification",
+  "params": {
+    "result": {
+      "context": {
+        "slot": 5199307
+      },
+      "value": {
+        "data": {
+           "nonce": {
+              "initialized": {
+                 "authority": "Bbqg1M4YVVfbhEzwA9SpC9FhsaG83YMTYoR4a8oTDLX",
+                 "blockhash": "LUaQTmM7WbMRiATdMMHaRGakPtCkc2GHtH57STKXs6k",
+                 "feeCalculator": {
+                    "lamportsPerSignature": 5000
+                 }
+              }
+           }
+        },
+        "executable": false,
+        "lamports": 33594,
+        "owner": "11111111111111111111111111111111",
         "rentEpoch": 635
       }
     },
@@ -1326,7 +1492,11 @@ Subscribe to a program to receive notifications when the lamports or data for a
 #### Parameters:
 
 - `<string>` - program_id Pubkey, as base-58 encoded string
-- `<object>` - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+- `<object>` - (optional) Configuration object containing the following optional fields:
+  - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment)
+  - (optional) `encoding: <string>` - encoding for Account data, either "binary" or jsonParsed". If parameter not provided, the default encoding is binary.
+    Parsed-JSON encoding attempts to use program-specific state parsers to return more human-readable and explicit account state data. If parsed-JSON is requested but a parser cannot be found, the field falls back to binary encoding, detectable when the `data` field is type `<string>`.
+  - (optional) `filters: <array>` - filter results using various [filter objects](jsonrpc-api.md#filters); account must meet all filter criteria to be included in results
 
 #### Results:
 
@@ -1336,17 +1506,22 @@ Subscribe to a program to receive notifications when the lamports or data for a
 
 ```bash
 // Request
-{"jsonrpc":"2.0", "id":1, "method":"programSubscribe", "params":["7BwE8yitxiWkD8jVPFvPmV7rs2Znzi4NHzJGLu2dzpUq"]}
+{"jsonrpc":"2.0", "id":1, "method":"programSubscribe", "params":["11111111111111111111111111111111"]}
 
-{"jsonrpc":"2.0", "id":1, "method":"programSubscribe", "params":["7BwE8yitxiWkD8jVPFvPmV7rs2Znzi4NHzJGLu2dzpUq", {"commitment": "single"}]}
+{"jsonrpc":"2.0", "id":1, "method":"programSubscribe", "params":["11111111111111111111111111111111", {"commitment": "single"}]}
+
+{"jsonrpc":"2.0", "id":1, "method":"programSubscribe", "params":["11111111111111111111111111111111", {"encoding":"jsonParsed"}]}
+
+{"jsonrpc":"2.0", "id":1, "method":"programSubscribe", "params":["11111111111111111111111111111111", {"filters":[{"dataSize":80}]}]}
 
 // Result
-{"jsonrpc": "2.0","result": 0,"id": 1}
+{"jsonrpc": "2.0","result": 24040,"id": 1}
 ```
 
 #### Notification Format:
 
 ```bash
+// Binary encoding
 {
   "jsonrpc": "2.0",
   "method": "programNotification",
@@ -1358,10 +1533,44 @@ Subscribe to a program to receive notifications when the lamports or data for a
       "value": {
         "pubkey": "H4vnBqifaSACnKa7acsxstsY1iV1bvJNxsCY7enrd1hq"
         "account": {
-          "data": "9qRxMDwy1ntDhBBoiy4Na9uDLbRTSzUS989m",
+          "data": "11116bv5nS2h3y12kD1yUKeMZvGcKLSjQgX6BeV7u1FrjeJcKfsHPXHRDEHrBesJhZyqnnq9qJeUuF7WHxiuLuL5twc38w2TXNLxnDbjmuR",
           "executable": false,
           "lamports": 33594,
-          "owner": "7BwE8yitxiWkD8jVPFvPmV7rs2Znzi4NHzJGLu2dzpUq",
+          "owner": "11111111111111111111111111111111",
+          "rentEpoch": 636
+        },
+      }
+    },
+    "subscription": 24040
+  }
+}
+
+// Parsed-JSON encoding
+{
+  "jsonrpc": "2.0",
+  "method": "programNotification",
+  "params": {
+    "result": {
+      "context": {
+        "slot": 5208469
+      },
+      "value": {
+        "pubkey": "H4vnBqifaSACnKa7acsxstsY1iV1bvJNxsCY7enrd1hq"
+        "account": {
+          "data": {
+             "nonce": {
+                "initialized": {
+                   "authority": "Bbqg1M4YVVfbhEzwA9SpC9FhsaG83YMTYoR4a8oTDLX",
+                   "blockhash": "LUaQTmM7WbMRiATdMMHaRGakPtCkc2GHtH57STKXs6k",
+                   "feeCalculator": {
+                      "lamportsPerSignature": 5000
+                   }
+                }
+             }
+          },
+          "executable": false,
+          "lamports": 33594,
+          "owner": "11111111111111111111111111111111",
           "rentEpoch": 636
         },
       }

docs/src/apps/tictactoe.md

@@ -1,23 +0,0 @@
----
-title: "Example: Tic-Tac-Toe"
----
-
-[Click here to play Tic-Tac-Toe](https://solana-example-tictactoe.herokuapp.com/) on the Solana testnet. Open the link and wait for another player to join, or open the link in a second browser tab to play against yourself. You will see that every move a player makes stores a transaction on the ledger.
-
-## Build and run Tic-Tac-Toe locally
-
-First fetch the latest release of the example code:
-
-```bash
-$ git clone https://github.com/solana-labs/example-tictactoe.git
-$ cd example-tictactoe
-$ TAG=$(git describe --tags $(git rev-list --tags
---max-count=1))
-$ git checkout $TAG
-```
-
-Next, follow the steps in the git repository's [README](https://github.com/solana-labs/example-tictactoe/blob/master/README.md).
-
-## Getting lamports to users
-
-You may have noticed you interacted with the Solana cluster without first needing to acquire lamports to pay transaction fees. Under the hood, the web app creates a new ephemeral identity and sends a request to an off-chain service for a signed transaction authorizing a user to start a new game. The service is called a _drone_. When the app sends the signed transaction to the Solana cluster, the drone's lamports are spent to pay the transaction fee and start the game. In a real world app, the drone might request the user watch an ad or pass a CAPTCHA before signing over its lamports.

docs/src/cli/.usage.md.header

@@ -1,4 +1,6 @@
-# solana CLI
+---
+title: CLI Usage Reference
+---
 
 The [solana-cli crate](https://crates.io/crates/solana-cli) provides a command-line interface tool for Solana
 

docs/src/cli/install-solana-cli-tools.md

@@ -72,7 +72,7 @@ solana --version
   installer into a temporary directory:
 
 ```bash
-curl http://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/solana-install-init-x86_64-pc-windows-gnu.exe --output C:\solana-install-tmp\solana-install-init.exe --create-dirs
+curl http://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/solana-install-init-x86_64-pc-windows-msvc.exe --output C:\solana-install-tmp\solana-install-init.exe --create-dirs
 ```
 
 - Copy and paste the following command, then press Enter to install the latest
@@ -107,7 +107,7 @@ manually download and install the binaries.
 
 Download the binaries by navigating to
 [https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
-download **solana-release-x86_64-unknown-linux-gnu.tar.bz2**, then extract the
+download **solana-release-x86_64-unknown-linux-msvc.tar.bz2**, then extract the
 archive:
 
 ```bash
@@ -133,7 +133,7 @@ export PATH=$PWD/bin:$PATH
 
 - Download the binaries by navigating to
   [https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
-  download **solana-release-x86_64-pc-windows-gnu.tar.bz2**, then extract the
+  download **solana-release-x86_64-pc-windows-msvc.tar.bz2**, then extract the
   archive using WinZip or similar.
 
 - Open a Command Prompt and navigate to the directory into which you extracted

docs/src/cluster/stake-delegation-and-rewards.md

@@ -126,7 +126,7 @@ Lamports build up over time in a Stake account and any excess over activated sta
 
 ## Example Callflow
 
-![Passive Staking Callflow](/img/passive-staking-callflow.svg)
+![Passive Staking Callflow](/img/passive-staking-callflow.png)
 
 ## Staking Rewards
 

docs/src/implemented-proposals/ed_overview/ed_mvp.md

@@ -4,7 +4,17 @@ title: Economic Design MVP
 
 **Subject to change.**
 
-The preceding sections, outlined in the [Economic Design Overview](../README.md), describe a long-term vision of a sustainable Solana economy. Of course, we don't expect the final implementation to perfectly match what has been described above. We intend to fully engage with network stakeholders throughout the implementation phases \(i.e. pre-testnet, testnet, mainnet\) to ensure the system supports, and is representative of, the various network participants' interests. The first step toward this goal, however, is outlining a some desired MVP economic features to be available for early pre-testnet and testnet participants. Below is a rough sketch outlining basic economic functionality from which a more complete and functional system can be developed.
+The preceding sections, outlined in the
+[Economic Design Overview](ed_overview.md),
+describe a long-term vision of a sustainable Solana economy.
+Of course, we don't expect the final implementation to perfectly match what has
+been described above. We intend to fully engage with network stakeholders
+throughout the implementation phases \(i.e. pre-testnet, testnet, mainnet\)
+to ensure the system supports, and is representative of, the various network
+participants' interests. The first step toward this goal, however, is outlining
+a some desired MVP economic features to be available for early pre-testnet and
+testnet participants. Below is a rough sketch outlining basic economic
+functionality from which a more complete and functional system can be developed.
 
 ## MVP Economic Features
 

docs/src/implemented-proposals/implemented-proposals.md

@@ -0,0 +1,9 @@
+---
+title: Implemented Design Proposals
+---
+
+The following architectural proposals have been accepted and implemented
+by the Solana team.  Any designs that may be subject to future change are noted
+in the specific proposal page.
+Design proposals that have been accepted but not yet implemented are found in
+[Accepted Proposals](../proposals/accepted-design-proposals.md).

docs/src/implemented-proposals/staking-rewards.md

@@ -52,6 +52,6 @@ Solana's trustless sense of time and ordering provided by its PoH data structure
 
 ## Penalties
 
-As discussed in the [Economic Design](ed_overview/ed_cluster_economics.md) section, annual validator interest rates are to be specified as a function of total percentage of circulating supply that has been staked. The cluster rewards validators who are online and actively participating in the validation process throughout the entirety of their _validation period_. For validators that go offline/fail to validate transactions during this period, their annual reward is effectively reduced.
+As discussed in the [Economic Design](ed_overview/ed_overview.md) section, annual validator interest rates are to be specified as a function of total percentage of circulating supply that has been staked. The cluster rewards validators who are online and actively participating in the validation process throughout the entirety of their _validation period_. For validators that go offline/fail to validate transactions during this period, their annual reward is effectively reduced.
 
 Similarly, we may consider an algorithmic reduction in a validator's active amount staked amount in the case that they are offline. I.e. if a validator is inactive for some amount of time, either due to a partition or otherwise, the amount of their stake that is considered ‘active’ \(eligible to earn rewards\) may be reduced. This design would be structured to help long-lived partitions to eventually reach finality on their respective chains as the % of non-voting total stake is reduced over time until a supermajority can be achieved by the active validators in each partition. Similarly, upon re-engaging, the ‘active’ amount staked will come back online at some defined rate. Different rates of stake reduction may be considered depending on the size of the partition/active set.

docs/src/pages/index.js

@@ -59,7 +59,7 @@ const features = [
   }, //
   // {
   //   title: <>Understand Our Economic Design</>,
-  //   imageUrl: "implemented-proposals/ed_overview/ed_cluster_economics",
+  //   imageUrl: "implemented-proposals/ed_overview/ed_overview",
   //   description: (
   //     <>
   //       Solana's Economic Design provides a scalable blueprint for long term

docs/src/proposals/accepted-design-proposals.md

@@ -0,0 +1,11 @@
+---
+title: Accepted Design Proposals
+---
+
+The following architectural proposals have been accepted by the Solana team,
+but are not yet fully implemented.
+The proposals may be implemented as described, implemented differently as
+issues in the designs become evident, or not implemented at all.
+If implemented, the proposal will be moved to
+[Implemented Proposals](../implemented-proposals/implemented-proposals.md)
+and the details will be added to relevant sections of the docs.

docs/src/proposals/accepted_design_proposals.md

@@ -1,5 +0,0 @@
----
-title: Accepted Design Proposals
----
-
-The following architectural proposals have been accepted by the Solana team, but are not yet fully implemented. The proposals may be implemented as described, implemented differently as issues in the designs become evident, or not implemented at all. If implemented, the proposal will be moved to [Implemented Proposals](../implemented-proposals/README.md) and the details will be added to relevant sections of the docs.

docs/src/running-validator/validator-start.md

@@ -168,12 +168,15 @@ vote account on the network. If you have completed this step, you should see the
 solana-keygen new -o ~/vote-account-keypair.json
 ```
 
-Create your vote account on the blockchain:
+The following command can be used to create your vote account on the blockchain
+with all the default options:
 
 ```bash
 solana create-vote-account ~/vote-account-keypair.json ~/validator-keypair.json
 ```
 
+Read more about [creating and managing a vote account](vote-accounts.md).
+
 ## Trusted validators
 
 If you know and trust other validator nodes, you can specify this on the command line with the `--trusted-validator <PUBKEY>`

docs/src/running-validator/vote-accounts.md

@@ -0,0 +1,146 @@
+---
+title: Vote Account Management
+---
+
+This page describes how to set up an on-chain _vote account_.  Creating a vote
+account is needed if you plan to run a validator node on Solana.
+
+## Create a Vote Account
+A vote account can be created with the
+[create-vote-account](../cli/usage.md#solana-create-vote-account) command.
+The vote account can be configured when first created or after the validator is
+running.  All aspects of the vote account can be changed except for the
+[vote account address](#vote-account-address), which is fixed for the lifetime
+of the account.
+
+### Configure an Existing Vote Account
+ - To change the [validator identity](#validator-identity), use
+[vote-update-validator](../cli/usage.md#solana-vote-update-validator).
+ - To change the [vote authority](#vote-authority), use
+[vote-authorize-voter](../cli/usage.md#solana-vote-authorize-voter).
+ - To change the [withdraw authority](#withdraw-authority), use
+[vote-authorize-withdrawer](../cli/usage.md#solana-vote-authorize-withdrawer).
+ - To change the [commission](#commission), use
+ [vote-update-commission](../cli/usage.md#solana-vote-update-commission).
+
+## Vote Account Structure
+
+### Vote Account Address
+A vote account is created at an address that is either the public key of a
+keypair file, or at a derived address based on a keypair file's public key and
+a seed string.
+
+The address of a vote account is never needed to sign any transactions,
+but is just used to look up the account information.
+
+When someone wants to [delegate tokens in a stake account](../staking.md),
+the delegation command is pointed at the vote account address of the validator
+to whom the token-holder wants to delegate.
+
+### Validator Identity
+
+The _validator identity_ is a system account that is used to pay for all the
+vote transaction fees submitted to the vote account.
+Because the validator is expected to vote on most valid blocks it receives,
+the validator identity account is frequently
+(potentially multiple times per second) signing transactions and
+paying fees.  For this reason the validator identity keypair must be
+stored as a "hot wallet" in a keypair file on the same system the validator
+process is running.
+
+Because a hot wallet is generally less secure than an offline or "cold" wallet,
+the validator operator may choose to store only enough SOL on the identity
+account to cover voting fees for a limited amount of time, such as a few weeks
+or months.  The validator identity account could be periodically topped off
+from a more secure wallet.
+
+This practice can reduce the risk of loss of funds if the validator node's
+disk or file system becomes compromised or corrupted.
+
+The validator identity is required to be provided when a vote account is created.
+The validator identity can also be changed after an account is created by using
+the [vote-update-validator](../cli/usage.md#solana-vote-update-validator) command.
+
+### Vote Authority
+
+The _vote authority_ keypair is used to sign each vote transaction the validator
+node wants to submit to the cluster.  This doesn't necessarily have to be unique
+from the validator identity, as you will see later in this document.  Because
+the vote authority, like the validator identity, is signing transactions
+frequently, this also must be a hot keypair on the same file system as the
+validator process.
+
+The vote authority can be set to the same address as the validator identity.
+If the validator identity is also the vote authority, only one
+signature per vote transaction is needed in order to both sign the vote and pay
+the transaction fee.  Because transaction fees on Solana are assessed
+per-signature, having one signer instead of two will result in half the transaction
+fee paid compared to setting the vote authority and validator identity to two
+different accounts.
+
+The vote authority can be set when the vote account is created.  If it is not
+provided, the default behavior is to assign it the same as the validator identity.
+The vote authority can be changed later with the
+[vote-authorize-voter](../cli/usage.md#solana-vote-authorize-voter) command.
+
+The vote authority can be changed at most once per epoch.  If the authority is
+changed with [vote-authorize-voter](../cli/usage.md#solana-vote-authorize-voter),
+this will not take effect until the beginning of the next epoch.
+To support a smooth transition of the vote signing,
+`solana-validator` allows the `--authorized-voter` argument to be specified
+multiple times.  This allows the validator process to keep voting successfully
+when the network reaches an epoch boundary at which the validator's vote
+authority account changes.
+
+### Withdraw Authority
+
+The _withdraw authority_ keypair is used to withdraw funds from a vote account
+using the [withdraw-from-vote-account](../cli/usage.md#solana-withdraw-from-vote-account)
+command.  Any network rewards a validator earns are deposited into the vote
+account and are only retrievable by signing with the withdraw authority keypair.
+
+The withdraw authority is also required to sign any transaction to change
+a vote account's [commission](#commission), and to change the validator
+identity on a vote account.
+
+Because the vote account could accrue a significant balance, consider keeping
+the withdraw authority keypair in an offline/cold wallet, as it is
+not needed to sign frequent transactions.
+
+The withdraw authority can be set at vote account creation with the
+`--authorized-withdrawer` option.  If this is not provided, the validator
+identity will be set as the withdraw authority by default.
+
+The withdraw authority can be changed later with the
+[vote-authorize-withdrawer](../cli/usage.md#solana-vote-authorize-withdrawer)
+command.
+
+### Commission
+
+_Commission_ is the percent of network rewards earned by a validator that are
+deposited into the validator's vote account.  The remainder of the rewards
+are distributed to all of the stake accounts delegated to that vote account,
+proportional to the active stake weight of each stake account.
+
+For example, if a vote account has a commission of 10%, for all rewards earned
+by that validator in a given epoch, 10% of these rewards will be deposited into
+the vote account in the first block of the following epoch. The remaining 90%
+will be deposited into delegated stake accounts as immediately active stake.
+
+A validator may choose to set a low commission to try to attract more stake
+delegations as a lower commission results in a larger percentage of rewards
+passed along to the delegator.  As there are costs associated with setting up
+and operating a validator node, a validator would ideally set a high enough
+commission to at least cover their expenses.
+
+Commission can be set upon vote account creation with the `--commission` option.
+If it is not provided, it will default to 100%, which will result in all
+rewards deposited in the vote account, and none passed on to any delegated
+stake accounts.
+
+Commission can also be changed later with the
+[vote-update-commission](../cli/usage.md#solana-vote-update-commission) command.
+
+When setting the commission, only integer values in the set [0-100] are accepted.
+The integer represents the number of percentage points for the commission, so
+creating an account with `--commission 10` will set a 10% commission.

docs/src/theme/SearchBar/index.js

@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React, {
+  useState,
+  useEffect,
+  useContext,
+  useRef,
+  useCallback,
+} from "react";
+import classnames from "classnames";
+
+import DocusaurusContext from "@docusaurus/context";
+
+import "./styles.css";
+
+const Search = (props) => {
+  const [isEnabled, setIsEnabled] = useState(true);
+  const searchBarRef = useRef(null);
+  const context = useContext(DocusaurusContext);
+
+  useEffect(() => {
+    const { siteConfig = {} } = context;
+    const {
+      themeConfig: { algolia },
+    } = siteConfig;
+
+    // https://github.com/algolia/docsearch/issues/352
+    const isClient = typeof window !== "undefined";
+    if (isClient) {
+      import("docsearch.js").then(({ default: docsearch }) => {
+        docsearch({
+          appId: algolia.appId,
+          apiKey: algolia.apiKey,
+          indexName: algolia.indexName,
+          inputSelector: "#search_input_react",
+          algoliaOptions: algolia.algoliaOptions,
+        });
+      });
+    } else {
+      console.warn("Search has failed to load and now is being disabled");
+      setIsEnabled(false);
+    }
+  }, []);
+
+  const toggleSearchIconClick = useCallback(
+    (e) => {
+      if (!searchBarRef.current.contains(e.target)) {
+        searchBarRef.current.focus();
+      }
+
+      props.handleSearchBarToggle(!props.isSearchBarExpanded);
+    },
+    [props.isSearchBarExpanded]
+  );
+
+  return isEnabled ? (
+    <div className="navbar__search" key="search-box">
+      <span
+        role="button"
+        className={classnames("search-icon", {
+          "search-icon-hidden": props.isSearchBarExpanded,
+        })}
+        onClick={toggleSearchIconClick}
+        onKeyDown={toggleSearchIconClick}
+        tabIndex={0}
+      />
+      <input
+        id="search_input_react"
+        type="search"
+        placeholder="Search"
+        aria-label="Search"
+        className={classnames(
+          "navbar__search-input",
+          { "search-bar-expanded": props.isSearchBarExpanded },
+          { "search-bar": !props.isSearchBarExpanded }
+        )}
+        onFocus={toggleSearchIconClick}
+        onBlur={toggleSearchIconClick}
+        ref={searchBarRef}
+      />
+    </div>
+  ) : null;
+};
+
+export default Search;

docs/src/wallet-guide.md

@@ -53,10 +53,10 @@ Solana supports supports several types of wallets in the Solana native
 command-line app as well as wallets from third-parties.
 
 For the majority of users, we recommend using one of the
-[app wallets](apps.md), which will provide a more familiar user
+[app wallets](wallet-guide/apps.md), which will provide a more familiar user
 experience rather than needing to learn command line tools.
 
-For advanced users or developers, the [command-line wallets](cli.md)
+For advanced users or developers, the [command-line wallets](wallet-guide/cli.md)
 may be more appropriate, as new features on the Solana blockchain will always be
 supported on the command line first before being integrated into third-party
 solutions.

docs/src/wallet-guide/cli.md

@@ -30,7 +30,7 @@ keypairs are stored on your computer as files, a skilled hacker with physical
 access to your computer may be able to access it. Using an encrypted hard
 drive, such as FileVault on MacOS, minimizes that risk.
 
-[File System Wallet](../file-system-wallet/README.md")
+[File System Wallet](file-system-wallet.md)
 
 ## Paper Wallet
 
@@ -64,4 +64,4 @@ security and convenience for cryptocurrencies. It effectively automates the
 process of offline signing while retaining nearly all the convenience of a file
 system wallet.
 
-[Hardware Wallets]("../hardware-wallet/README.md")
+[Hardware Wallets](hardware-wallets.md)

dos/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-dos"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,14 +13,14 @@ clap = "2.33.1"
 log = "0.4.8"
 rand = "0.7.0"
 rayon = "1.3.0"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-core = { path = "../core", version = "1.2.11" }
-solana-ledger = { path = "../ledger", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-net-utils = { path = "../net-utils", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-core = { path = "../core", version = "1.2.18" }
+solana-ledger = { path = "../ledger", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-net-utils = { path = "../net-utils", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

download-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-download-utils"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana Download Utils"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,8 +14,8 @@ console = "0.10.1"
 indicatif = "0.14.0"
 log = "0.4.8"
 reqwest = { version = "0.10.4", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-ledger = { path = "../ledger", version = "1.2.11" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-ledger = { path = "../ledger", version = "1.2.18" }
 tar = "0.4.28"
 
 [lib]

faucet/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-faucet"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana Faucet"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,11 +16,11 @@ clap = "2.33"
 log = "0.4.8"
 serde = "1.0.110"
 serde_derive = "1.0.103"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-metrics = { path = "../metrics", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-metrics = { path = "../metrics", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 tokio = "0.1"
 tokio-codec = "0.1"
 

fetch-perf-libs.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PERF_LIBS_VERSION=v0.19.0
+PERF_LIBS_VERSION=v0.19.1
 VERSION=$PERF_LIBS_VERSION-1
 
 set -e

fetch-spl.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+#
+# Fetches the latest SPL programs and produces the solana-genesis command-line
+# arguments needed to install them
+#
+
+set -e
+
+fetch_program() {
+  declare name=$1
+  declare version=$2
+  declare address=$3
+
+  declare so=spl_$name-$version.so
+
+  genesis_args+=(--bpf-program "$address" "$so")
+
+  if [[ -r $so ]]; then
+    return
+  fi
+
+  if [[ -r ~/.cache/solana-spl/$so ]]; then
+    cp ~/.cache/solana-spl/"$so" "$so"
+  else
+    echo "Downloading $name $version"
+    (
+      set -x
+      curl -L --retry 5 --retry-delay 2 --retry-connrefused \
+        -o "$so" \
+        "https://github.com/solana-labs/solana-program-library/releases/download/$name-v$version/spl_$name.so"
+    )
+
+    mkdir -p ~/.cache/solana-spl
+    cp "$so" ~/.cache/solana-spl/"$so"
+  fi
+
+}
+
+fetch_program token 1.0.0 TokenSVp5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
+fetch_program memo  1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo
+
+echo "${genesis_args[@]}" > spl-genesis-args.sh
+
+echo
+echo "Available SPL programs:"
+ls -l spl_*.so
+
+echo
+echo "solana-genesis command-line arguments (spl-genesis-args.sh):"
+cat spl-genesis-args.sh

genesis-programs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-genesis-programs"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana genesis programs"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,12 +10,12 @@ edition = "2018"
 
 [dependencies]
 log = { version = "0.4.8" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.2.11" }
-solana-budget-program = { path = "../programs/budget", version = "1.2.11" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-vest-program = { path = "../programs/vest", version = "1.2.11" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.2.18" }
+solana-budget-program = { path = "../programs/budget", version = "1.2.18" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-vest-program = { path = "../programs/vest", version = "1.2.18" }
 
 [lib]
 crate-type = ["lib"]

genesis-programs/src/lib.rs

@@ -1,6 +1,5 @@
 use solana_sdk::{
-    clock::Epoch, genesis_config::OperatingMode, inflation::Inflation,
-    move_loader::solana_move_loader_program, pubkey::Pubkey,
+    clock::Epoch, genesis_config::OperatingMode, inflation::Inflation, pubkey::Pubkey,
 };
 
 #[macro_use]
@@ -25,10 +24,13 @@ pub fn get_inflation(operating_mode: OperatingMode, epoch: Epoch) -> Option<Infl
             // No inflation at epoch 0
             0 => Some(Inflation::new_disabled()),
             // testnet enabled inflation at epoch 44:
-            // https://github.com/solana-labs/solana/blob/d8e885f4259e6c7db420cce513cb34ebf961073d
+            // https://github.com/solana-labs/solana/commit/d8e885f4259e6c7db420cce513cb34ebf961073d
             44 => Some(Inflation::default()),
             // Completely disable inflation prior to ship the inflation fix at epoch 68
             68 => Some(Inflation::new_disabled()),
+            // Enable again after the inflation fix has landed:
+            // https://github.com/solana-labs/solana/commit/7cc2a6801bed29a816ef509cfc26a6f2522e46ff
+            74 => Some(Inflation::default()),
             _ => None,
         },
         OperatingMode::Stable => match epoch {
@@ -54,7 +56,6 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
                     // Programs that are only available in Development mode
                     solana_budget_program!(),
                     solana_exchange_program!(),
-                    solana_move_loader_program(),
                 ])
             } else {
                 None
@@ -104,6 +105,7 @@ pub fn get_entered_epoch_callback(operating_mode: OperatingMode) -> EnteredEpoch
                 bank.add_native_program(name, program_id);
             }
         }
+        bank.set_cross_program_support(OperatingMode::Stable != operating_mode);
     })
 }
 
@@ -132,7 +134,7 @@ mod tests {
     fn test_development_programs() {
         assert_eq!(
             get_programs(OperatingMode::Development, 0).unwrap().len(),
-            5
+            4
         );
         assert_eq!(get_programs(OperatingMode::Development, 1), None);
     }

genesis/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-genesis"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,14 +15,14 @@ chrono = "0.4"
 serde = "1.0.110"
 serde_json = "1.0.53"
 serde_yaml = "0.8.12"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-genesis-programs = { path = "../genesis-programs", version = "1.2.11" }
-solana-ledger = { path = "../ledger", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-stake-program = { path = "../programs/stake", version = "1.2.11" }
-solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.2.18" }
+solana-ledger = { path = "../ledger", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-stake-program = { path = "../programs/stake", version = "1.2.18" }
+solana-vote-program = { path = "../programs/vote", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 tempfile = "3.1.0"
 
 [[bin]]

genesis/src/main.rs

@@ -12,7 +12,7 @@ use solana_ledger::{
 };
 use solana_sdk::{
     account::Account,
-    clock,
+    bpf_loader, clock,
     epoch_schedule::EpochSchedule,
     fee_calculator::FeeRateGovernor,
     genesis_config::{GenesisConfig, OperatingMode},
@@ -26,7 +26,14 @@ use solana_sdk::{
 use solana_stake_program::stake_state::{self, StakeState};
 use solana_vote_program::vote_state::{self, VoteState};
 use std::{
-    collections::HashMap, error, fs::File, io, path::PathBuf, process, str::FromStr, time::Duration,
+    collections::HashMap,
+    error,
+    fs::File,
+    io::{self, Read},
+    path::PathBuf,
+    process,
+    str::FromStr,
+    time::Duration,
 };
 
 pub enum AccountFileFormat {
@@ -341,6 +348,15 @@ fn main() -> Result<(), Box<dyn error::Error>> {
                     "maximum total uncompressed file size of created genesis archive",
                 ),
         )
+        .arg(
+            Arg::with_name("bpf_program")
+                .long("bpf-program")
+                .value_name("ADDRESS BPF_PROGRAM.SO")
+                .takes_value(true)
+                .number_of_values(2)
+                .multiple(true)
+                .help("Install a BPF program at the given address"),
+        )
         .get_matches();
 
     let faucet_lamports = value_t!(matches, "faucet_lamports", u64).unwrap_or(0);
@@ -535,6 +551,39 @@ fn main() -> Result<(), Box<dyn error::Error>> {
 
     add_genesis_accounts(&mut genesis_config, issued_lamports - faucet_lamports);
 
+    if let Some(values) = matches.values_of("bpf_program") {
+        let values: Vec<&str> = values.collect::<Vec<_>>();
+        for address_program in values.chunks(2) {
+            match address_program {
+                [address, program] => {
+                    let address = address.parse::<Pubkey>().unwrap_or_else(|err| {
+                        eprintln!("Error: invalid address {}: {}", address, err);
+                        process::exit(1);
+                    });
+
+                    let mut program_data = vec![];
+                    File::open(program)
+                        .and_then(|mut file| file.read_to_end(&mut program_data))
+                        .unwrap_or_else(|err| {
+                            eprintln!("Error: failed to read {}: {}", program, err);
+                            process::exit(1);
+                        });
+                    genesis_config.add_account(
+                        address,
+                        Account {
+                            lamports: genesis_config.rent.minimum_balance(program_data.len()),
+                            data: program_data,
+                            executable: true,
+                            owner: bpf_loader::id(),
+                            rent_epoch: 0,
+                        },
+                    );
+                }
+                _ => unreachable!(),
+            }
+        }
+    }
+
     solana_logger::setup();
     create_new_ledger(
         &ledger_path,

gossip/Cargo.toml

@@ -3,20 +3,20 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-gossip"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
 clap = "2.33.1"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-core = { path = "../core", version = "1.2.11" }
-solana-client = { path = "../client", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-net-utils = { path = "../net-utils", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-core = { path = "../core", version = "1.2.18" }
+solana-client = { path = "../client", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-net-utils = { path = "../net-utils", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

install/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-install"
 description = "The solana cluster software installer"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -24,12 +24,12 @@ reqwest = { version = "0.10.4", default-features = false, features = ["blocking"
 serde = "1.0.110"
 serde_derive = "1.0.103"
 serde_yaml = "0.8.12"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-client = { path = "../client", version = "1.2.11" }
-solana-config-program = { path = "../programs/config", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-client = { path = "../client", version = "1.2.18" }
+solana-config-program = { path = "../programs/config", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 semver = "0.9.0"
 tar = "0.4.28"
 tempdir = "0.3.7"

keygen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-keygen"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana key generation utility"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,11 +13,11 @@ bs58 = "0.3.1"
 clap = "2.33"
 dirs = "2.0.2"
 num_cpus = "1.13.0"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-cli-config = { path = "../cli-config", version = "1.2.11" }
-solana-remote-wallet = { path = "../remote-wallet", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-cli-config = { path = "../cli-config", version = "1.2.18" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 tiny-bip39 = "0.7.0"
 
 [[bin]]

ledger-tool/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-ledger-tool"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,16 +16,16 @@ histogram = "*"
 log = { version = "0.4.8" }
 serde_json = "1.0.53"
 serde_yaml = "0.8.12"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-cli = { path = "../cli", version = "1.2.11" }
-solana-ledger = { path = "../ledger", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-stake-program = { path = "../programs/stake", version = "1.2.11" }
-solana-transaction-status = { path = "../transaction-status", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
-solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-cli = { path = "../cli", version = "1.2.18" }
+solana-ledger = { path = "../ledger", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-stake-program = { path = "../programs/stake", version = "1.2.18" }
+solana-transaction-status = { path = "../transaction-status", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
+solana-vote-program = { path = "../programs/vote", version = "1.2.18" }
 tempfile = "3.1.0"
 regex = "1"
 

ledger-tool/src/main.rs

@@ -20,13 +20,17 @@ use solana_ledger::{
 };
 use solana_runtime::bank::Bank;
 use solana_sdk::{
-    clock::Slot, genesis_config::GenesisConfig, native_token::lamports_to_sol, pubkey::Pubkey,
+    clock::{Epoch, Slot},
+    genesis_config::GenesisConfig,
+    inflation::Inflation,
+    native_token::{lamports_to_sol, Sol},
+    pubkey::Pubkey,
     shred_version::compute_shred_version,
 };
 use solana_vote_program::vote_state::VoteState;
 use std::{
     collections::{BTreeMap, BTreeSet, HashMap, HashSet},
-    convert::TryInto,
+    convert::{TryFrom, TryInto},
     ffi::OsStr,
     fs::{self, File},
     io::{self, stdout, BufRead, BufReader, Write},
@@ -614,6 +618,19 @@ fn open_genesis_config_by(ledger_path: &Path, matches: &ArgMatches<'_>) -> Genes
     open_genesis_config(ledger_path, max_genesis_archive_unpacked_size)
 }
 
+fn assert_capitalization(bank: &Bank) {
+    let calculated_capitalization = bank.calculate_capitalization();
+    assert_eq!(
+        bank.capitalization(),
+        calculated_capitalization,
+        "Capitalization mismatch!?: +/-{}",
+        Sol(u64::try_from(
+            (i128::from(calculated_capitalization) - i128::from(bank.capitalization())).abs()
+        )
+        .unwrap()),
+    );
+}
+
 #[allow(clippy::cognitive_complexity)]
 fn main() {
     // Ignore SIGUSR1 to prevent long-running calls being killed by logrotate
@@ -857,12 +874,36 @@ fn main() {
             .arg(&max_genesis_archive_unpacked_size_arg)
         ).subcommand(
             SubCommand::with_name("capitalization")
-            .about("Print capitalization (aka, total suppy)")
+            .about("Print capitalization (aka, total suppy) while checksumming it")
             .arg(&no_snapshot_arg)
             .arg(&account_paths_arg)
             .arg(&halt_at_slot_arg)
             .arg(&hard_forks_arg)
             .arg(&max_genesis_archive_unpacked_size_arg)
+            .arg(
+                Arg::with_name("warp_epoch")
+                    .required(false)
+                    .long("warp-epoch")
+                    .takes_value(true)
+                    .value_name("WARP_EPOCH")
+                    .help("After loading the snapshot warp the ledger to WARP_EPOCH, \
+                           which could be an epoch in a galaxy far far away"),
+            )
+            .arg(
+                Arg::with_name("enable_inflation")
+                    .required(false)
+                    .long("enable-inflation")
+                    .takes_value(false)
+                    .help("Always enable inflation when warping even if it's disabled"),
+            )
+            .arg(
+                Arg::with_name("recalculate_capitalization")
+                    .required(false)
+                    .long("recalculate-capitalization")
+                    .takes_value(false)
+                    .help("Recalculate capitalization before warping; circumvents \
+                          bank's out-of-sync capitalization"),
+            )
         ).subcommand(
             SubCommand::with_name("purge")
             .about("Delete a range of slots from the ledger.")
@@ -1325,52 +1366,98 @@ fn main() {
                         exit(1);
                     });
 
-                    use solana_sdk::native_token::LAMPORTS_PER_SOL;
-                    use std::fmt::{Display, Formatter, Result};
-                    pub struct Sol(u64);
-
-                    impl Display for Sol {
-                        fn fmt(&self, f: &mut Formatter) -> Result {
-                            write!(
-                                f,
-                                "{}.{:09} SOL",
-                                self.0 / LAMPORTS_PER_SOL,
-                                self.0 % LAMPORTS_PER_SOL
-                            )
+                    if arg_matches.is_present("recalculate_capitalization") {
+                        println!("Recalculating capitalization");
+                        let old_capitalization = bank.set_capitalization();
+                        if old_capitalization == bank.capitalization() {
+                            eprintln!("Capitalization was identical: {}", Sol(old_capitalization));
                         }
                     }
 
-                    let computed_capitalization: u64 = bank
-                        .get_program_accounts(None)
-                        .into_iter()
-                        .filter_map(|(_pubkey, account)| {
-                            if account.lamports == u64::max_value() {
-                                return None;
-                            }
+                    if arg_matches.is_present("warp_epoch") {
+                        let base_bank = bank;
 
-                            let is_specially_retained =
-                                solana_sdk::native_loader::check_id(&account.owner)
-                                    || solana_sdk::sysvar::check_id(&account.owner);
+                        let raw_warp_epoch = value_t!(arg_matches, "warp_epoch", String).unwrap();
+                        let warp_epoch = if raw_warp_epoch.starts_with('+') {
+                            base_bank.epoch() + value_t!(arg_matches, "warp_epoch", Epoch).unwrap()
+                        } else {
+                            value_t!(arg_matches, "warp_epoch", Epoch).unwrap()
+                        };
+                        if warp_epoch < base_bank.epoch() {
+                            eprintln!(
+                                "Error: can't warp epoch backwards: {} => {}",
+                                base_bank.epoch(),
+                                warp_epoch
+                            );
+                            exit(1);
+                        }
 
-                            if is_specially_retained {
-                                // specially retained accounts are ensured to exist by
-                                // alwaysing having a balance of 1 lamports, which is
-                                // outside the capitalization calculation.
-                                Some(account.lamports - 1)
-                            } else {
-                                Some(account.lamports)
-                            }
-                        })
-                        .sum();
+                        if arg_matches.is_present("enable_inflation") {
+                            let inflation = Inflation::default();
+                            println!(
+                                "Forcing to: {:?} (was: {:?})",
+                                inflation,
+                                base_bank.inflation()
+                            );
+                            base_bank.set_inflation(inflation);
+                        }
 
-                    if bank.capitalization() != computed_capitalization {
-                        panic!(
-                            "Capitalization mismatch!?: {} != {}",
-                            bank.capitalization(),
-                            computed_capitalization
+                        let next_epoch = base_bank
+                            .epoch_schedule()
+                            .get_first_slot_in_epoch(warp_epoch);
+                        let warped_bank =
+                            Bank::new_from_parent(&base_bank, base_bank.collector_id(), next_epoch);
+                        warped_bank.freeze();
+
+                        println!("Slot: {} => {}", base_bank.slot(), warped_bank.slot());
+                        println!("Epoch: {} => {}", base_bank.epoch(), warped_bank.epoch());
+                        assert_capitalization(&base_bank);
+                        assert_capitalization(&warped_bank);
+                        println!(
+                            "Capitalization: {} => {} (+{} {}%)",
+                            Sol(base_bank.capitalization()),
+                            Sol(warped_bank.capitalization()),
+                            Sol(warped_bank.capitalization() - base_bank.capitalization()),
+                            ((warped_bank.capitalization() as f64)
+                                / (base_bank.capitalization() as f64)
+                                * 100_f64),
                         );
+
+                        let mut overall_delta = 0;
+                        for (pubkey, warped_account) in
+                            warped_bank.get_all_accounts_modified_since_parent()
+                        {
+                            if let Some(base_account) = base_bank.get_account(&pubkey) {
+                                if base_account.lamports != warped_account.lamports {
+                                    let delta = warped_account.lamports - base_account.lamports;
+                                    println!(
+                                        "{}({}): {} => {} (+{})",
+                                        pubkey,
+                                        base_account.owner,
+                                        Sol(base_account.lamports),
+                                        Sol(warped_account.lamports),
+                                        Sol(delta),
+                                    );
+                                    overall_delta += delta;
+                                }
+                            }
+                        }
+                        if overall_delta > 0 {
+                            println!("Sum of lamports changes: {}", Sol(overall_delta));
+                        }
+                    } else {
+                        if arg_matches.is_present("recalculate_capitalization") {
+                            eprintln!("Capitalization isn't verified because it's recalculated");
+                        }
+                        if arg_matches.is_present("enable_inflation") {
+                            eprintln!(
+                                "Forcing inflation isn't meaningful because bank isn't warping"
+                            );
+                        }
+
+                        assert_capitalization(&bank);
+                        println!("Capitalization: {}", Sol(bank.capitalization()));
                     }
-                    println!("Capitalization: {}", Sol(bank.capitalization()));
                 }
                 Err(err) => {
                     eprintln!("Failed to load ledger: {:?}", err);

ledger/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-ledger"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana ledger"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -32,19 +32,19 @@ reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] }
 regex = "1.3.7"
 serde = "1.0.110"
 serde_bytes = "0.11.4"
-solana-transaction-status = { path = "../transaction-status", version = "1.2.11" }
-solana-genesis-programs = { path = "../genesis-programs", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-measure = { path = "../measure", version = "1.2.11" }
-solana-merkle-tree = { path = "../merkle-tree", version = "1.2.11" }
-solana-metrics = { path = "../metrics", version = "1.2.11" }
-solana-perf = { path = "../perf", version = "1.2.11" }
+solana-transaction-status = { path = "../transaction-status", version = "1.2.18" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-measure = { path = "../measure", version = "1.2.18" }
+solana-merkle-tree = { path = "../merkle-tree", version = "1.2.18" }
+solana-metrics = { path = "../metrics", version = "1.2.18" }
+solana-perf = { path = "../perf", version = "1.2.18" }
 ed25519-dalek = "1.0.0-pre.3"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-stake-program = { path = "../programs/stake", version = "1.2.11" }
-solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-stake-program = { path = "../programs/stake", version = "1.2.18" }
+solana-vote-program = { path = "../programs/vote", version = "1.2.18" }
 symlink = "0.1.0"
 tar = "0.4.28"
 thiserror = "1.0"
@@ -62,7 +62,7 @@ features = ["lz4"]
 [dev-dependencies]
 assert_matches = "1.3.0"
 matches = "0.1.6"
-solana-budget-program = { path = "../programs/budget", version = "1.2.11" }
+solana-budget-program = { path = "../programs/budget", version = "1.2.18" }
 
 [lib]
 crate-type = ["lib"]

ledger/src/blockstore_processor.rs

@@ -18,13 +18,14 @@ use solana_rayon_threadlimit::get_thread_count;
 use solana_runtime::{
     bank::{Bank, TransactionBalancesSet, TransactionProcessResult, TransactionResults},
     transaction_batch::TransactionBatch,
+    transaction_utils::OrderedIterator,
 };
 use solana_sdk::{
     clock::{Slot, MAX_PROCESSING_AGE},
     genesis_config::GenesisConfig,
     hash::Hash,
     pubkey::Pubkey,
-    signature::Keypair,
+    signature::{Keypair, Signature},
     timing::duration_as_ms,
     transaction::{Result, Transaction, TransactionError},
 };
@@ -57,6 +58,37 @@ fn first_err(results: &[Result<()>]) -> Result<()> {
     Ok(())
 }
 
+// Includes transaction signature for unit-testing
+fn get_first_error(
+    batch: &TransactionBatch,
+    fee_collection_results: Vec<Result<()>>,
+) -> Option<(Result<()>, Signature)> {
+    let mut first_err = None;
+    for (result, transaction) in fee_collection_results.iter().zip(OrderedIterator::new(
+        batch.transactions(),
+        batch.iteration_order(),
+    )) {
+        if let Err(ref err) = result {
+            if first_err.is_none() {
+                first_err = Some((result.clone(), transaction.signatures[0]));
+            }
+            warn!(
+                "Unexpected validator error: {:?}, transaction: {:?}",
+                err, transaction
+            );
+            datapoint_error!(
+                "validator_process_entry_error",
+                (
+                    "error",
+                    format!("error: {:?}, transaction: {:?}", err, transaction),
+                    String
+                )
+            );
+        }
+    }
+    first_err
+}
+
 fn execute_batch(
     batch: &TransactionBatch,
     bank: &Arc<Bank>,
@@ -78,33 +110,15 @@ fn execute_batch(
         send_transaction_status_batch(
             bank.clone(),
             batch.transactions(),
+            batch.iteration_order_vec(),
             processing_results,
             balances,
             sender,
         );
     }
 
-    let mut first_err = None;
-    for (result, transaction) in fee_collection_results.iter().zip(batch.transactions()) {
-        if let Err(ref err) = result {
-            if first_err.is_none() {
-                first_err = Some(result.clone());
-            }
-            warn!(
-                "Unexpected validator error: {:?}, transaction: {:?}",
-                err, transaction
-            );
-            datapoint_error!(
-                "validator_process_entry_error",
-                (
-                    "error",
-                    format!("error: {:?}, transaction: {:?}", err, transaction),
-                    String
-                )
-            );
-        }
-    }
-    first_err.unwrap_or(Ok(()))
+    let first_err = get_first_error(batch, fee_collection_results);
+    first_err.map(|(result, _)| result).unwrap_or(Ok(()))
 }
 
 fn execute_batches(
@@ -825,6 +839,7 @@ fn process_single_slot(
 pub struct TransactionStatusBatch {
     pub bank: Arc<Bank>,
     pub transactions: Vec<Transaction>,
+    pub iteration_order: Option<Vec<usize>>,
     pub statuses: Vec<TransactionProcessResult>,
     pub balances: TransactionBalancesSet,
 }
@@ -833,6 +848,7 @@ pub type TransactionStatusSender = Sender<TransactionStatusBatch>;
 pub fn send_transaction_status_batch(
     bank: Arc<Bank>,
     transactions: &[Transaction],
+    iteration_order: Option<Vec<usize>>,
     statuses: Vec<TransactionProcessResult>,
     balances: TransactionBalancesSet,
     transaction_status_sender: TransactionStatusSender,
@@ -841,6 +857,7 @@ pub fn send_transaction_status_batch(
     if let Err(e) = transaction_status_sender.send(TransactionStatusBatch {
         bank,
         transactions: transactions.to_vec(),
+        iteration_order,
         statuses,
         balances,
     }) {
@@ -2635,4 +2652,51 @@ pub mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_get_first_error() {
+        let GenesisConfigInfo {
+            genesis_config,
+            mint_keypair,
+            ..
+        } = create_genesis_config(1_000_000_000);
+        let bank = Arc::new(Bank::new(&genesis_config));
+
+        let present_account_key = Keypair::new();
+        let present_account = Account::new(1, 10, &Pubkey::default());
+        bank.store_account(&present_account_key.pubkey(), &present_account);
+
+        let keypair = Keypair::new();
+
+        // Create array of two transactions which throw different errors
+        let account_not_found_tx =
+            system_transaction::transfer(&keypair, &Pubkey::new_rand(), 42, bank.last_blockhash());
+        let account_not_found_sig = account_not_found_tx.signatures[0];
+        let mut account_loaded_twice = system_transaction::transfer(
+            &mint_keypair,
+            &Pubkey::new_rand(),
+            42,
+            bank.last_blockhash(),
+        );
+        account_loaded_twice.message.account_keys[1] = mint_keypair.pubkey();
+        let transactions = [account_loaded_twice, account_not_found_tx];
+
+        // Use inverted iteration_order
+        let iteration_order: Vec<usize> = vec![1, 0];
+
+        let batch = bank.prepare_batch(&transactions, Some(iteration_order));
+        let (
+            TransactionResults {
+                fee_collection_results,
+                processing_results: _,
+            },
+            _balances,
+        ) = batch
+            .bank()
+            .load_execute_and_commit_transactions(&batch, MAX_PROCESSING_AGE, false);
+        let (err, signature) = get_first_error(&batch, fee_collection_results).unwrap();
+        // First error found should be for the 2nd transaction, due to iteration_order
+        assert_eq!(err.unwrap_err(), TransactionError::AccountNotFound);
+        assert_eq!(signature, account_not_found_sig);
+    }
 }

local-cluster/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-local-cluster"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,22 +12,22 @@ homepage = "https://solana.com/"
 itertools = "0.9.0"
 log = "0.4.8"
 rand = "0.7.0"
-solana-config-program = { path = "../programs/config", version = "1.2.11" }
-solana-core = { path = "../core", version = "1.2.11" }
-solana-client = { path = "../client", version = "1.2.11" }
-solana-download-utils = { path = "../download-utils", version = "1.2.11" }
-solana-faucet = { path = "../faucet", version = "1.2.11" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.2.11" }
-solana-genesis-programs = { path = "../genesis-programs", version = "1.2.11" }
-solana-ledger = { path = "../ledger", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-runtime = { path = "../runtime", version = "1.2.11" }
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-stake-program = { path = "../programs/stake", version = "1.2.11" }
-solana-vest-program = { path = "../programs/vest", version = "1.2.11" }
-solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
+solana-config-program = { path = "../programs/config", version = "1.2.18" }
+solana-core = { path = "../core", version = "1.2.18" }
+solana-client = { path = "../client", version = "1.2.18" }
+solana-download-utils = { path = "../download-utils", version = "1.2.18" }
+solana-faucet = { path = "../faucet", version = "1.2.18" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.2.18" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.2.18" }
+solana-ledger = { path = "../ledger", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-runtime = { path = "../runtime", version = "1.2.18" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-stake-program = { path = "../programs/stake", version = "1.2.18" }
+solana-vest-program = { path = "../programs/vest", version = "1.2.18" }
+solana-vote-program = { path = "../programs/vote", version = "1.2.18" }
 tempfile = "3.1.0"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.2.11" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.2.18" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"

log-analyzer/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-log-analyzer"
 description = "The solana cluster network analysis tool"
-version = "1.2.11"
+version = "1.2.18"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,9 +14,9 @@ byte-unit = "3.1.1"
 clap = "2.33.1"
 serde = "1.0.110"
 serde_json = "1.0.53"
-solana-clap-utils = { path = "../clap-utils", version = "1.2.11" }
-solana-logger = { path = "../logger", version = "1.2.11" }
-solana-version = { path = "../version", version = "1.2.11" }
+solana-clap-utils = { path = "../clap-utils", version = "1.2.18" }
+solana-logger = { path = "../logger", version = "1.2.18" }
+solana-version = { path = "../version", version = "1.2.18" }
 
 [[bin]]
 name = "solana-log-analyzer"

logger/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-logger"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana Logger"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"

logger/src/lib.rs

@@ -26,7 +26,7 @@ fn replace_logger(logger: env_logger::Logger) {
     let max_level = logger.filter();
     log::set_max_level(max_level);
     let mut rw = LOGGER.write().unwrap();
-    std::mem::replace(&mut *rw, logger);
+    let _ = std::mem::replace(&mut *rw, logger);
     let _ = log::set_boxed_logger(Box::new(LoggerShim {}));
 }
 

measure/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana-measure"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.2.11"
+version = "1.2.18"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "../README.md"
@@ -12,8 +12,8 @@ edition = "2018"
 
 [dependencies]
 log = "0.4.8"
-solana-sdk = { path = "../sdk", version = "1.2.11" }
-solana-metrics = { path = "../metrics", version = "1.2.11" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
+solana-metrics = { path = "../metrics", version = "1.2.18" }
 
 [target."cfg(unix)".dependencies]
 jemallocator = "0.3.2"

merkle-tree/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-merkle-tree"
-version = "1.2.11"
+version = "1.2.18"
 description = "Solana Merkle Tree"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../sdk", version = "1.2.11" }
+solana-sdk = { path = "../sdk", version = "1.2.18" }
 fast-math = "0.1"
 
 [dev-dependencies]