Update to spl-token 2

Bump spl-token version
Update to token pack/unpack changes (bp #11900 ) (#11903 )
2020-08-29 09:23:20 -07:00 · 2020-08-29 03:24:36 -06:00 · 2020-08-29 05:46:07 +00:00 · 2020-08-28 23:36:53 +00:00 · 2020-08-28 20:37:26 +00:00 · 2020-08-28 10:36:11 -07:00
102 changed files with 1713 additions and 1094 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-account-decoder"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana account decoder"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,11 +18,11 @@ lazy_static = "1.4.0"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-config-program = { path = "../programs/config", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
-spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] }
+solana-config-program = { path = "../programs/config", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
+spl-token-v2-0 = { package = "spl-token", version = "2.0.3", features = ["skip-no-mangle"] }
 thiserror = "1.0"

 [package.metadata.docs.rs]
--- a/account-decoder/src/parse_account_data.rs
+++ b/account-decoder/src/parse_account_data.rs
@@ -3,7 +3,7 @@ use crate::{
    parse_nonce::parse_nonce,
    parse_stake::parse_stake,
    parse_sysvar::parse_sysvar,
-    parse_token::{parse_token, spl_token_id_v1_0},
+    parse_token::{parse_token, spl_token_id_v2_0},
    parse_vote::parse_vote,
 };
 use inflector::Inflector;
@@ -17,7 +17,7 @@ lazy_static! {
    static ref STAKE_PROGRAM_ID: Pubkey = solana_stake_program::id();
    static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
    static ref SYSVAR_PROGRAM_ID: Pubkey = sysvar::id();
-    static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v1_0();
+    static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v2_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();
--- a/account-decoder/src/parse_token.rs
+++ b/account-decoder/src/parse_token.rs
@@ -3,32 +3,32 @@ use crate::{
    StringAmount,
 };
 use solana_sdk::pubkey::Pubkey;
-use spl_token_v1_0::{
+use spl_token_v2_0::{
    option::COption,
+    pack::Pack,
    solana_sdk::pubkey::Pubkey as SplTokenPubkey,
-    state::{unpack, Account, Mint, Multisig},
+    state::{Account, AccountState, Mint, Multisig},
 };
-use std::{mem::size_of, str::FromStr};
+use std::str::FromStr;

-// A helper function to convert spl_token_v1_0::id() as spl_sdk::pubkey::Pubkey to
+// A helper function to convert spl_token_v2_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()
+pub fn spl_token_id_v2_0() -> Pubkey {
+    Pubkey::from_str(&spl_token_v2_0::id().to_string()).unwrap()
 }

-// A helper function to convert spl_token_v1_0::native_mint::id() as spl_sdk::pubkey::Pubkey to
+// A helper function to convert spl_token_v2_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 spl_token_v2_0_native_mint() -> Pubkey {
+    Pubkey::from_str(&spl_token_v2_0::native_mint::id().to_string()).unwrap()
 }

 pub fn parse_token(
    data: &[u8],
    mint_decimals: Option<u8>,
 ) -> Result<TokenAccountType, ParseAccountError> {
-    let mut data = data.to_vec();
-    if data.len() == size_of::<Account>() {
-        let account: Account = *unpack(&mut data)
+    if data.len() == Account::get_packed_len() {
+        let account = Account::unpack(data)
            .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?;
        let decimals = mint_decimals.ok_or_else(|| {
            ParseAccountError::AdditionalDataMissing(
@@ -43,8 +43,12 @@ pub fn parse_token(
                COption::Some(pubkey) => Some(pubkey.to_string()),
                COption::None => None,
            },
-            is_initialized: account.is_initialized,
-            is_native: account.is_native,
+            state: account.state.into(),
+            is_native: account.is_native(),
+            rent_exempt_reserve: match account.is_native {
+                COption::Some(reserve) => Some(token_amount_to_ui_amount(reserve, decimals)),
+                COption::None => None,
+            },
            delegated_amount: if account.delegate.is_none() {
                None
            } else {
@@ -53,20 +57,29 @@ pub fn parse_token(
                    decimals,
                ))
            },
-        }))
-    } 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 {
+            close_authority: match account.close_authority {
                COption::Some(pubkey) => Some(pubkey.to_string()),
                COption::None => None,
            },
+        }))
+    } else if data.len() == Mint::get_packed_len() {
+        let mint = Mint::unpack(data)
+            .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?;
+        Ok(TokenAccountType::Mint(UiMint {
+            mint_authority: match mint.mint_authority {
+                COption::Some(pubkey) => Some(pubkey.to_string()),
+                COption::None => None,
+            },
+            supply: mint.supply.to_string(),
            decimals: mint.decimals,
            is_initialized: mint.is_initialized,
+            freeze_authority: match mint.freeze_authority {
+                COption::Some(pubkey) => Some(pubkey.to_string()),
+                COption::None => None,
+            },
        }))
-    } else if data.len() == size_of::<Multisig>() {
-        let multisig: Multisig = *unpack(&mut data)
+    } else if data.len() == Multisig::get_packed_len() {
+        let multisig = Multisig::unpack(data)
            .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?;
        Ok(TokenAccountType::Multisig(UiMultisig {
            num_required_signers: multisig.m,
@@ -107,10 +120,32 @@ pub struct UiTokenAccount {
    pub token_amount: UiTokenAmount,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub delegate: Option<String>,
-    pub is_initialized: bool,
+    pub state: UiAccountState,
    pub is_native: bool,
    #[serde(skip_serializing_if = "Option::is_none")]
+    pub rent_exempt_reserve: Option<UiTokenAmount>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub delegated_amount: Option<UiTokenAmount>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub close_authority: Option<String>,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub enum UiAccountState {
+    Uninitialized,
+    Initialized,
+    Frozen,
+}
+
+impl From<AccountState> for UiAccountState {
+    fn from(state: AccountState) -> Self {
+        match state {
+            AccountState::Uninitialized => UiAccountState::Uninitialized,
+            AccountState::Initialized => UiAccountState::Initialized,
+            AccountState::Frozen => UiAccountState::Frozen,
+        }
+    }
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
@@ -134,9 +169,11 @@ pub fn token_amount_to_ui_amount(amount: u64, decimals: u8) -> UiTokenAmount {
 #[derive(Debug, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct UiMint {
-    pub owner: Option<String>,
+    pub mint_authority: Option<String>,
+    pub supply: StringAmount,
    pub decimals: u8,
    pub is_initialized: bool,
+    pub freeze_authority: Option<String>,
 }

 #[derive(Debug, Serialize, Deserialize, PartialEq)]
@@ -149,7 +186,7 @@ pub struct UiMultisig {
 }

 pub fn get_token_account_mint(data: &[u8]) -> Option<Pubkey> {
-    if data.len() == size_of::<Account>() {
+    if data.len() == Account::get_packed_len() {
        Some(Pubkey::new(&data[0..32]))
    } else {
        None
@@ -159,18 +196,23 @@ pub fn get_token_account_mint(data: &[u8]) -> Option<Pubkey> {
 #[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;
+        let mut account_data = vec![0; Account::get_packed_len()];
+        Account::unpack_unchecked_mut(&mut account_data, &mut |account: &mut Account| {
+            account.mint = mint_pubkey;
+            account.owner = owner_pubkey;
+            account.amount = 42;
+            account.state = AccountState::Initialized;
+            account.is_native = COption::None;
+            account.close_authority = COption::Some(owner_pubkey);
+            Ok(())
+        })
+        .unwrap();
+
        assert!(parse_token(&account_data, None).is_err());
        assert_eq!(
            parse_token(&account_data, Some(2)).unwrap(),
@@ -183,39 +225,52 @@ mod test {
                    amount: "42".to_string()
                },
                delegate: None,
-                is_initialized: true,
+                state: UiAccountState::Initialized,
                is_native: false,
+                rent_exempt_reserve: None,
                delegated_amount: None,
+                close_authority: Some(owner_pubkey.to_string()),
            }),
        );

-        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;
+        let mut mint_data = vec![0; Mint::get_packed_len()];
+        Mint::unpack_unchecked_mut(&mut mint_data, &mut |mint: &mut Mint| {
+            mint.mint_authority = COption::Some(owner_pubkey);
+            mint.supply = 42;
+            mint.decimals = 3;
+            mint.is_initialized = true;
+            mint.freeze_authority = COption::Some(owner_pubkey);
+            Ok(())
+        })
+        .unwrap();
+
        assert_eq!(
            parse_token(&mint_data, None).unwrap(),
            TokenAccountType::Mint(UiMint {
-                owner: Some(owner_pubkey.to_string()),
+                mint_authority: Some(owner_pubkey.to_string()),
+                supply: 42.to_string(),
                decimals: 3,
                is_initialized: true,
+                freeze_authority: Some(owner_pubkey.to_string()),
            }),
        );

        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 multisig_data = vec![0; Multisig::get_packed_len()];
        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;
+        Multisig::unpack_unchecked_mut(&mut multisig_data, &mut |multisig: &mut Multisig| {
+            multisig.m = 2;
+            multisig.n = 3;
+            multisig.is_initialized = true;
+            multisig.signers = signers;
+            Ok(())
+        })
+        .unwrap();
        assert_eq!(
            parse_token(&multisig_data, None).unwrap(),
            TokenAccountType::Multisig(UiMultisig {
@@ -237,9 +292,12 @@ mod test {
    #[test]
    fn test_get_token_account_mint() {
        let mint_pubkey = SplTokenPubkey::new(&[2; 32]);
-        let mut account_data = [0; size_of::<Account>()];
-        let mut account: &mut Account = unpack_unchecked(&mut account_data).unwrap();
-        account.mint = mint_pubkey;
+        let mut account_data = vec![0; Account::get_packed_len()];
+        Account::unpack_unchecked_mut(&mut account_data, &mut |account: &mut Account| {
+            account.mint = mint_pubkey;
+            Ok(())
+        })
+        .unwrap();

        let expected_mint_pubkey = Pubkey::new(&[2; 32]);
        assert_eq!(
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-accounts-bench"
-version = "1.3.5"
+version = "1.3.6"
 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.1"
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
 rand = "0.7.0"
 clap = "2.33.1"
 crossbeam-channel = "0.4"
--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-banking-bench"
-version = "1.3.5"
+version = "1.3.6"
 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.1"
-solana-core = { path = "../core", version = "1.3.5" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-streamer = { path = "../streamer", version = "1.3.5" }
-solana-perf = { path = "../perf", version = "1.3.5" }
-solana-ledger = { path = "../ledger", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-streamer = { path = "../streamer", version = "1.3.6" }
+solana-perf = { path = "../perf", version = "1.3.6" }
+solana-ledger = { path = "../ledger", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-client"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana banks client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,15 +12,15 @@ edition = "2018"
 async-trait = "0.1.36"
 bincode = "1.3.1"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-banks-interface = { path = "../banks-interface", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
 tarpc = { version = "0.21.0", features = ["full"] }
 tokio = "0.2"
 tokio-serde = { version = "0.6", features = ["bincode"] }

 [dev-dependencies]
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-banks-server = { path = "../banks-server", version = "1.3.5" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-banks-server = { path = "../banks-server", version = "1.3.6" }

 [lib]
 crate-type = ["lib"]
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-interface"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana banks RPC interface"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ edition = "2018"

 [dependencies]
 serde = { version = "1.0.112", features = ["derive"] }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
 tarpc = { version = "0.21.0", features = ["full"] }

 [lib]
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-banks-server"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana banks server"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,9 +11,9 @@ edition = "2018"
 [dependencies]
 bincode = "1.3.1"
 futures = "0.3"
-solana-banks-interface = { path = "../banks-interface", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-banks-interface = { path = "../banks-interface", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
 tarpc = { version = "0.21.0", features = ["full"] }
 tokio = "0.2"
 tokio-serde = { version = "0.6", features = ["bincode"] }
--- a/bench-exchange/Cargo.toml
+++ b/bench-exchange/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "1.3.5"
+version = "1.3.6"
 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.1"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-core = { path = "../core", version = "1.3.5" }
-solana-genesis = { path = "../genesis", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-faucet = { path = "../faucet", version = "1.3.5" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-genesis = { path = "../genesis", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-faucet = { path = "../faucet", version = "1.3.6" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [dev-dependencies]
-solana-local-cluster = { path = "../local-cluster", version = "1.3.5" }
+solana-local-cluster = { path = "../local-cluster", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -2,18 +2,18 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "1.3.5"
+version = "1.3.6"
 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.3.5" }
-solana-streamer = { path = "../streamer", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-streamer = { path = "../streamer", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,23 +14,23 @@ log = "0.4.8"
 rayon = "1.3.1"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-core = { path = "../core", version = "1.3.5" }
-solana-genesis = { path = "../genesis", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-faucet = { path = "../faucet", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-genesis = { path = "../genesis", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-faucet = { path = "../faucet", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [dev-dependencies]
 serial_test = "0.4.0"
 serial_test_derive = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "1.3.5" }
+solana-local-cluster = { path = "../local-cluster", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-clap-utils"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana utilities for the clap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 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.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
 thiserror = "1.0.20"
 tiny-bip39 = "0.7.0"
 url = "2.1.0"
--- a/cli-config/Cargo.toml
+++ b/cli-config/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -27,29 +27,29 @@ reqwest = { version = "0.10.6", default-features = false, features = ["blocking"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "1.3.5" }
-solana-budget-program = { path = "../programs/budget", version = "1.3.5" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-cli-config = { path = "../cli-config", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-config-program = { path = "../programs/config", version = "1.3.5" }
-solana-faucet = { path = "../faucet", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-remote-wallet = { path = "../remote-wallet", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
-solana-vote-signer = { path = "../vote-signer", version = "1.3.5" }
+solana-account-decoder = { path = "../account-decoder", version = "1.3.6" }
+solana-budget-program = { path = "../programs/budget", version = "1.3.6" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-cli-config = { path = "../cli-config", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-config-program = { path = "../programs/config", version = "1.3.6" }
+solana-faucet = { path = "../faucet", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
+solana-vote-signer = { path = "../vote-signer", version = "1.3.6" }
 thiserror = "1.0.20"
 url = "2.1.1"

 [dev-dependencies]
-solana-core = { path = "../core", version = "1.3.5" }
-solana-budget-program = { path = "../programs/budget", version = "1.3.5" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-budget-program = { path = "../programs/budget", version = "1.3.6" }
 tempfile = "3.1.0"

 [[bin]]
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -19,11 +19,11 @@ reqwest = { version = "0.10.6", default-features = false, features = ["blocking"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
+solana-account-decoder = { path = "../account-decoder", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
 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.2.0"
 jsonrpc-http-server = "14.2.0"
-solana-logger = { path = "../logger", version = "1.3.5" }
+solana-logger = { path = "../logger", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-core"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "../README.md"
@@ -43,39 +43,39 @@ regex = "1.3.9"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
-solana-account-decoder = { path = "../account-decoder", version = "1.3.5" }
-solana-banks-server = { path = "../banks-server", version = "1.3.5" }
-solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.3.5" }
-solana-budget-program = { path = "../programs/budget", version = "1.3.5" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-faucet = { path = "../faucet", version = "1.3.5" }
-solana-genesis-programs = { path = "../genesis-programs", version = "1.3.5" }
-solana-ledger = { path = "../ledger", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-merkle-tree = { path = "../merkle-tree", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-perf = { path = "../perf", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "1.3.5" }
-solana-streamer = { path = "../streamer", version = "1.3.5" }
-solana-sys-tuner = { path = "../sys-tuner", version = "1.3.5" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
-solana-vote-signer = { path = "../vote-signer", version = "1.3.5" }
-spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] }
+solana-account-decoder = { path = "../account-decoder", version = "1.3.6" }
+solana-banks-server = { path = "../banks-server", version = "1.3.6" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.3.6" }
+solana-budget-program = { path = "../programs/budget", version = "1.3.6" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-faucet = { path = "../faucet", version = "1.3.6" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.3.6" }
+solana-ledger = { path = "../ledger", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-merkle-tree = { path = "../merkle-tree", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-perf = { path = "../perf", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "1.3.6" }
+solana-streamer = { path = "../streamer", version = "1.3.6" }
+solana-sys-tuner = { path = "../sys-tuner", version = "1.3.6" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
+solana-vote-signer = { path = "../vote-signer", version = "1.3.6" }
+spl-token-v2-0 = { package = "spl-token", version = "2.0.3", features = ["skip-no-mangle"] }
 tempfile = "3.1.0"
 thiserror = "1.0"
 tokio_01 = { version = "0.1", package = "tokio" }
 tokio_fs_01 = { version = "0.1", package = "tokio-fs" }
 tokio_io_01 = { version = "0.1", package = "tokio-io" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.5" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.6" }
 tokio = { version = "0.2.22", features = ["full"] }
 trees = "0.2.1"

--- a/core/src/rpc.rs
+++ b/core/src/rpc.rs
@@ -11,7 +11,7 @@ use jsonrpc_derive::rpc;
 use solana_account_decoder::{
    parse_account_data::AccountAdditionalData,
    parse_token::{
-        get_token_account_mint, spl_token_id_v1_0, spl_token_v1_0_native_mint,
+        get_token_account_mint, spl_token_id_v2_0, spl_token_v2_0_native_mint,
        token_amount_to_ui_amount, UiTokenAmount,
    },
    UiAccount, UiAccountEncoding,
@@ -58,11 +58,13 @@ use solana_transaction_status::{
    ConfirmedBlock, ConfirmedTransaction, TransactionStatus, UiTransactionEncoding,
 };
 use solana_vote_program::vote_state::{VoteState, MAX_LOCKOUT_HISTORY};
-use spl_token_v1_0::state::{Account as TokenAccount, Mint};
+use spl_token_v2_0::{
+    pack::Pack,
+    state::{Account as TokenAccount, Mint},
+};
 use std::{
    cmp::{max, min},
    collections::{HashMap, HashSet},
-    mem::size_of,
    net::SocketAddr,
    str::FromStr,
    sync::{
@@ -247,7 +249,7 @@ impl JsonRpcRequestProcessor {
        check_slice_and_encoding(&encoding, config.data_slice.is_some())?;
        let mut response = None;
        if let Some(account) = bank.get_account(pubkey) {
-            if account.owner == spl_token_id_v1_0() && encoding == UiAccountEncoding::JsonParsed {
+            if account.owner == spl_token_id_v2_0() && encoding == UiAccountEncoding::JsonParsed {
                response = Some(get_parsed_token_account(bank.clone(), pubkey, account));
            } else if (encoding == UiAccountEncoding::Binary
                || encoding == UiAccountEncoding::Base58)
@@ -295,7 +297,7 @@ impl JsonRpcRequestProcessor {
        check_slice_and_encoding(&encoding, data_slice_config.is_some())?;
        let keyed_accounts = get_filtered_program_accounts(&bank, program_id, filters);
        let result =
-            if program_id == &spl_token_id_v1_0() && encoding == UiAccountEncoding::JsonParsed {
+            if program_id == &spl_token_id_v2_0() && encoding == UiAccountEncoding::JsonParsed {
                get_parsed_token_accounts(bank, keyed_accounts).collect()
            } else {
                keyed_accounts
@@ -1025,16 +1027,14 @@ impl JsonRpcRequestProcessor {
            Error::invalid_params("Invalid param: could not find account".to_string())
        })?;

-        if account.owner != spl_token_id_v1_0() {
+        if account.owner != spl_token_id_v2_0() {
            return Err(Error::invalid_params(
-                "Invalid param: not a v1.0 Token account".to_string(),
+                "Invalid param: not a v2.0 Token account".to_string(),
            ));
        }
-        let mut data = account.data.to_vec();
-        let token_account =
-            spl_token_v1_0::state::unpack::<TokenAccount>(&mut data).map_err(|_| {
-                Error::invalid_params("Invalid param: not a v1.0 Token account".to_string())
-            })?;
+        let token_account = TokenAccount::unpack(&account.data).map_err(|_| {
+            Error::invalid_params("Invalid param: not a v2.0 Token account".to_string())
+        })?;
        let mint = &Pubkey::from_str(&token_account.mint.to_string())
            .expect("Token account mint should be convertible to Pubkey");
        let (_, decimals) = get_mint_owner_and_decimals(&bank, &mint)?;
@@ -1048,32 +1048,19 @@ impl JsonRpcRequestProcessor {
        commitment: Option<CommitmentConfig>,
    ) -> Result<RpcResponse<UiTokenAmount>> {
        let bank = self.bank(commitment);
-        let (mint_owner, decimals) = get_mint_owner_and_decimals(&bank, mint)?;
-        if mint_owner != spl_token_id_v1_0() {
+        let mint_account = bank.get_account(mint).ok_or_else(|| {
+            Error::invalid_params("Invalid param: could not find account".to_string())
+        })?;
+        if mint_account.owner != spl_token_id_v2_0() {
            return Err(Error::invalid_params(
-                "Invalid param: not a v1.0 Token mint".to_string(),
+                "Invalid param: not a v2.0 Token mint".to_string(),
            ));
        }
+        let mint = Mint::unpack(&mint_account.data).map_err(|_| {
+            Error::invalid_params("Invalid param: mint could not be unpacked".to_string())
+        })?;

-        let filters = vec![
-            // Filter on Mint address
-            RpcFilterType::Memcmp(Memcmp {
-                offset: 0,
-                bytes: MemcmpEncodedBytes::Binary(mint.to_string()),
-                encoding: None,
-            }),
-            // Filter on Token Account state
-            RpcFilterType::DataSize(size_of::<TokenAccount>() as u64),
-        ];
-        let supply = get_filtered_program_accounts(&bank, &mint_owner, filters)
-            .map(|(_pubkey, account)| {
-                let mut data = account.data.to_vec();
-                spl_token_v1_0::state::unpack(&mut data)
-                    .map(|account: &mut TokenAccount| account.amount)
-                    .unwrap_or(0)
-            })
-            .sum();
-        let supply = token_amount_to_ui_amount(supply, decimals);
+        let supply = token_amount_to_ui_amount(mint.supply, mint.decimals);
        Ok(new_response(&bank, supply))
    }

@@ -1084,9 +1071,9 @@ impl JsonRpcRequestProcessor {
    ) -> Result<RpcResponse<Vec<RpcTokenAccountBalance>>> {
        let bank = self.bank(commitment);
        let (mint_owner, decimals) = get_mint_owner_and_decimals(&bank, mint)?;
-        if mint_owner != spl_token_id_v1_0() {
+        if mint_owner != spl_token_id_v2_0() {
            return Err(Error::invalid_params(
-                "Invalid param: not a v1.0 Token mint".to_string(),
+                "Invalid param: not a v2.0 Token mint".to_string(),
            ));
        }
        let filters = vec![
@@ -1097,14 +1084,13 @@ impl JsonRpcRequestProcessor {
                encoding: None,
            }),
            // Filter on Token Account state
-            RpcFilterType::DataSize(size_of::<TokenAccount>() as u64),
+            RpcFilterType::DataSize(TokenAccount::get_packed_len() as u64),
        ];
        let mut token_balances: Vec<RpcTokenAccountBalance> =
            get_filtered_program_accounts(&bank, &mint_owner, filters)
                .map(|(address, account)| {
-                    let mut data = account.data.to_vec();
-                    let amount = spl_token_v1_0::state::unpack(&mut data)
-                        .map(|account: &mut TokenAccount| account.amount)
+                    let amount = TokenAccount::unpack(&account.data)
+                        .map(|account| account.amount)
                        .unwrap_or(0);
                    let amount = token_amount_to_ui_amount(amount, decimals);
                    RpcTokenAccountBalance {
@@ -1146,7 +1132,7 @@ impl JsonRpcRequestProcessor {
                encoding: None,
            }),
            // Filter on Token Account state
-            RpcFilterType::DataSize(size_of::<TokenAccount>() as u64),
+            RpcFilterType::DataSize(TokenAccount::get_packed_len() as u64),
        ];
        if let Some(mint) = mint {
            // Optional filter on Mint address
@@ -1205,7 +1191,7 @@ impl JsonRpcRequestProcessor {
                encoding: None,
            }),
            // Filter on Token Account state
-            RpcFilterType::DataSize(size_of::<TokenAccount>() as u64),
+            RpcFilterType::DataSize(TokenAccount::get_packed_len() as u64),
        ];
        if let Some(mint) = mint {
            // Optional filter on Mint address
@@ -1368,15 +1354,15 @@ fn get_token_program_id_and_mint(
    match token_account_filter {
        TokenAccountsFilter::Mint(mint) => {
            let (mint_owner, _) = get_mint_owner_and_decimals(&bank, &mint)?;
-            if mint_owner != spl_token_id_v1_0() {
+            if mint_owner != spl_token_id_v2_0() {
                return Err(Error::invalid_params(
-                    "Invalid param: not a v1.0 Token mint".to_string(),
+                    "Invalid param: not a v2.0 Token mint".to_string(),
                ));
            }
            Ok((mint_owner, Some(mint)))
        }
        TokenAccountsFilter::ProgramId(program_id) => {
-            if program_id == spl_token_id_v1_0() {
+            if program_id == spl_token_id_v2_0() {
                Ok((program_id, None))
            } else {
                Err(Error::invalid_params(
@@ -1390,8 +1376,8 @@ fn get_token_program_id_and_mint(
 /// Analyze a mint Pubkey that may be the native_mint and get the mint-account owner (token
 /// program_id) and decimals
 fn get_mint_owner_and_decimals(bank: &Arc<Bank>, mint: &Pubkey) -> Result<(Pubkey, u8)> {
-    if mint == &spl_token_v1_0_native_mint() {
-        Ok((spl_token_id_v1_0(), spl_token_v1_0::native_mint::DECIMALS))
+    if mint == &spl_token_v2_0_native_mint() {
+        Ok((spl_token_id_v2_0(), spl_token_v2_0::native_mint::DECIMALS))
    } else {
        let mint_account = bank.get_account(mint).ok_or_else(|| {
            Error::invalid_params("Invalid param: could not find mint".to_string())
@@ -1402,12 +1388,11 @@ fn get_mint_owner_and_decimals(bank: &Arc<Bank>, mint: &Pubkey) -> Result<(Pubke
 }

 fn get_mint_decimals(data: &[u8]) -> Result<u8> {
-    let mut data = data.to_vec();
-    spl_token_v1_0::state::unpack(&mut data)
+    Mint::unpack(data)
        .map_err(|_| {
            Error::invalid_params("Invalid param: Token mint could not be unpacked".to_string())
        })
-        .map(|mint: &mut Mint| mint.decimals)
+        .map(|mint| mint.decimals)
 }

 #[rpc]
@@ -1692,7 +1677,7 @@ pub trait RpcSol {
    ) -> Result<RpcStakeActivation>;

    // SPL Token-specific RPC endpoints
-    // See https://github.com/solana-labs/solana-program-library/releases/tag/token-v1.0.0 for
+    // See https://github.com/solana-labs/solana-program-library/releases/tag/token-v2.0.0 for
    // program details

    #[rpc(meta, name = "getTokenAccountBalance")]
@@ -2505,8 +2490,9 @@ pub mod tests {
        vote_instruction,
        vote_state::{Vote, VoteInit, MAX_LOCKOUT_HISTORY},
    };
-    use spl_token_v1_0::{
-        option::COption, solana_sdk::pubkey::Pubkey as SplTokenPubkey, state::Mint,
+    use spl_token_v2_0::{
+        option::COption, solana_sdk::pubkey::Pubkey as SplTokenPubkey,
+        state::AccountState as TokenAccountState, state::Mint,
    };
    use std::collections::HashMap;

@@ -4761,43 +4747,50 @@ pub mod tests {
    fn test_token_rpcs() {
        let RpcHandler { io, meta, bank, .. } = start_rpc_handler_with_tx(&Pubkey::new_rand());

-        let mut account_data = [0; size_of::<TokenAccount>()];
-        let account: &mut TokenAccount =
-            spl_token_v1_0::state::unpack_unchecked(&mut account_data).unwrap();
+        let mut account_data = vec![0; TokenAccount::get_packed_len()];
        let mint = SplTokenPubkey::new(&[2; 32]);
        let owner = SplTokenPubkey::new(&[3; 32]);
        let delegate = SplTokenPubkey::new(&[4; 32]);
-        *account = TokenAccount {
-            mint,
-            owner,
-            delegate: COption::Some(delegate),
-            amount: 420,
-            is_initialized: true,
-            is_native: false,
-            delegated_amount: 30,
-        };
+        TokenAccount::unpack_unchecked_mut(&mut account_data, &mut |account: &mut TokenAccount| {
+            *account = TokenAccount {
+                mint,
+                owner,
+                delegate: COption::Some(delegate),
+                amount: 420,
+                state: TokenAccountState::Initialized,
+                is_native: COption::None,
+                delegated_amount: 30,
+                close_authority: COption::Some(owner),
+            };
+            Ok(())
+        })
+        .unwrap();
        let token_account = Account {
            lamports: 111,
            data: account_data.to_vec(),
-            owner: spl_token_id_v1_0(),
+            owner: spl_token_id_v2_0(),
            ..Account::default()
        };
        let token_account_pubkey = Pubkey::new_rand();
        bank.store_account(&token_account_pubkey, &token_account);

        // Add the mint
-        let mut mint_data = [0; size_of::<Mint>()];
-        let mint_state: &mut Mint =
-            spl_token_v1_0::state::unpack_unchecked(&mut mint_data).unwrap();
-        *mint_state = Mint {
-            owner: COption::Some(owner),
-            decimals: 2,
-            is_initialized: true,
-        };
+        let mut mint_data = vec![0; Mint::get_packed_len()];
+        Mint::unpack_unchecked_mut(&mut mint_data, &mut |mint: &mut Mint| {
+            *mint = Mint {
+                mint_authority: COption::Some(owner),
+                supply: 500,
+                decimals: 2,
+                is_initialized: true,
+                freeze_authority: COption::Some(owner),
+            };
+            Ok(())
+        })
+        .unwrap();
        let mint_account = Account {
            lamports: 111,
            data: mint_data.to_vec(),
-            owner: spl_token_id_v1_0(),
+            owner: spl_token_id_v2_0(),
            ..Account::default()
        };
        bank.store_account(&Pubkey::from_str(&mint.to_string()).unwrap(), &mint_account);
@@ -4826,10 +4819,7 @@ pub mod tests {
            .expect("actual response deserialization");
        assert!(result.get("error").is_some());

-        // Add another token account to ensure getTokenSupply sums all mint accounts
-        let other_token_account_pubkey = Pubkey::new_rand();
-        bank.store_account(&other_token_account_pubkey, &token_account);
-
+        // Test get token supply, pulls supply from mint
        let req = format!(
            r#"{{"jsonrpc":"2.0","id":1,"method":"getTokenSupply","params":["{}"]}}"#,
            mint,
@@ -4840,8 +4830,8 @@ pub mod tests {
        let supply: UiTokenAmount =
            serde_json::from_value(result["result"]["value"].clone()).unwrap();
        let error = f64::EPSILON;
-        assert!((supply.ui_amount - 2.0 * 4.2).abs() < error);
-        assert_eq!(supply.amount, (2 * 420).to_string());
+        assert!((supply.ui_amount - 5.0).abs() < error);
+        assert_eq!(supply.amount, 500.to_string());
        assert_eq!(supply.decimals, 2);

        // Test non-existent mint address
@@ -4854,24 +4844,31 @@ pub mod tests {
            .expect("actual response deserialization");
        assert!(result.get("error").is_some());

+        // Add another token account with the same owner, delegate, and mint
+        let other_token_account_pubkey = Pubkey::new_rand();
+        bank.store_account(&other_token_account_pubkey, &token_account);
+
        // Add another token account with the same owner and delegate but different mint
-        let mut account_data = [0; size_of::<TokenAccount>()];
-        let account: &mut TokenAccount =
-            spl_token_v1_0::state::unpack_unchecked(&mut account_data).unwrap();
+        let mut account_data = vec![0; TokenAccount::get_packed_len()];
        let new_mint = SplTokenPubkey::new(&[5; 32]);
-        *account = TokenAccount {
-            mint: new_mint,
-            owner,
-            delegate: COption::Some(delegate),
-            amount: 42,
-            is_initialized: true,
-            is_native: false,
-            delegated_amount: 30,
-        };
+        TokenAccount::unpack_unchecked_mut(&mut account_data, &mut |account: &mut TokenAccount| {
+            *account = TokenAccount {
+                mint: new_mint,
+                owner,
+                delegate: COption::Some(delegate),
+                amount: 42,
+                state: TokenAccountState::Initialized,
+                is_native: COption::None,
+                delegated_amount: 30,
+                close_authority: COption::Some(owner),
+            };
+            Ok(())
+        })
+        .unwrap();
        let token_account = Account {
            lamports: 111,
            data: account_data.to_vec(),
-            owner: spl_token_id_v1_0(),
+            owner: spl_token_id_v2_0(),
            ..Account::default()
        };
        let token_with_different_mint_pubkey = Pubkey::new_rand();
@@ -4886,7 +4883,7 @@ pub mod tests {
                "params":["{}", {{"programId": "{}"}}]
            }}"#,
            owner,
-            spl_token_id_v1_0(),
+            spl_token_id_v2_0(),
        );
        let res = io.handle_request_sync(&req, meta.clone());
        let result: Value = serde_json::from_str(&res.expect("actual response"))
@@ -4904,7 +4901,7 @@ pub mod tests {
                "params":["{}", {{"programId": "{}"}}, {{"encoding": "jsonParsed"}}]
            }}"#,
            owner,
-            spl_token_id_v1_0(),
+            spl_token_id_v2_0(),
        );
        let res = io.handle_request_sync(&req, meta.clone());
        let result: Value = serde_json::from_str(&res.expect("actual response"))
@@ -4968,7 +4965,7 @@ pub mod tests {
                "params":["{}", {{"programId": "{}"}}]
            }}"#,
            Pubkey::new_rand(),
-            spl_token_id_v1_0(),
+            spl_token_id_v2_0(),
        );
        let res = io.handle_request_sync(&req, meta.clone());
        let result: Value = serde_json::from_str(&res.expect("actual response"))
@@ -4986,7 +4983,7 @@ pub mod tests {
                "params":["{}", {{"programId": "{}"}}]
            }}"#,
            delegate,
-            spl_token_id_v1_0(),
+            spl_token_id_v2_0(),
        );
        let res = io.handle_request_sync(&req, meta.clone());
        let result: Value = serde_json::from_str(&res.expect("actual response"))
@@ -5051,7 +5048,7 @@ pub mod tests {
                "params":["{}", {{"programId": "{}"}}]
            }}"#,
            Pubkey::new_rand(),
-            spl_token_id_v1_0(),
+            spl_token_id_v2_0(),
        );
        let res = io.handle_request_sync(&req, meta.clone());
        let result: Value = serde_json::from_str(&res.expect("actual response"))
@@ -5061,40 +5058,47 @@ pub mod tests {
        assert!(accounts.is_empty());

        // Add new_mint, and another token account on new_mint with different balance
-        let mut mint_data = [0; size_of::<Mint>()];
-        let mint_state: &mut Mint =
-            spl_token_v1_0::state::unpack_unchecked(&mut mint_data).unwrap();
-        *mint_state = Mint {
-            owner: COption::Some(owner),
-            decimals: 2,
-            is_initialized: true,
-        };
+        let mut mint_data = vec![0; Mint::get_packed_len()];
+        Mint::unpack_unchecked_mut(&mut mint_data, &mut |mint: &mut Mint| {
+            *mint = Mint {
+                mint_authority: COption::Some(owner),
+                supply: 500,
+                decimals: 2,
+                is_initialized: true,
+                freeze_authority: COption::Some(owner),
+            };
+            Ok(())
+        })
+        .unwrap();
        let mint_account = Account {
            lamports: 111,
            data: mint_data.to_vec(),
-            owner: spl_token_id_v1_0(),
+            owner: spl_token_id_v2_0(),
            ..Account::default()
        };
        bank.store_account(
            &Pubkey::from_str(&new_mint.to_string()).unwrap(),
            &mint_account,
        );
-        let mut account_data = [0; size_of::<TokenAccount>()];
-        let account: &mut TokenAccount =
-            spl_token_v1_0::state::unpack_unchecked(&mut account_data).unwrap();
-        *account = TokenAccount {
-            mint: new_mint,
-            owner,
-            delegate: COption::Some(delegate),
-            amount: 10,
-            is_initialized: true,
-            is_native: false,
-            delegated_amount: 30,
-        };
+        let mut account_data = vec![0; TokenAccount::get_packed_len()];
+        TokenAccount::unpack_unchecked_mut(&mut account_data, &mut |account: &mut TokenAccount| {
+            *account = TokenAccount {
+                mint: new_mint,
+                owner,
+                delegate: COption::Some(delegate),
+                amount: 10,
+                state: TokenAccountState::Initialized,
+                is_native: COption::None,
+                delegated_amount: 30,
+                close_authority: COption::Some(owner),
+            };
+            Ok(())
+        })
+        .unwrap();
        let token_account = Account {
            lamports: 111,
            data: account_data.to_vec(),
-            owner: spl_token_id_v1_0(),
+            owner: spl_token_id_v2_0(),
            ..Account::default()
        };
        let token_with_smaller_balance = Pubkey::new_rand();
@@ -5137,43 +5141,50 @@ pub mod tests {
    fn test_token_parsing() {
        let RpcHandler { io, meta, bank, .. } = start_rpc_handler_with_tx(&Pubkey::new_rand());

-        let mut account_data = [0; size_of::<TokenAccount>()];
-        let account: &mut TokenAccount =
-            spl_token_v1_0::state::unpack_unchecked(&mut account_data).unwrap();
+        let mut account_data = vec![0; TokenAccount::get_packed_len()];
        let mint = SplTokenPubkey::new(&[2; 32]);
        let owner = SplTokenPubkey::new(&[3; 32]);
        let delegate = SplTokenPubkey::new(&[4; 32]);
-        *account = TokenAccount {
-            mint,
-            owner,
-            delegate: COption::Some(delegate),
-            amount: 420,
-            is_initialized: true,
-            is_native: false,
-            delegated_amount: 30,
-        };
+        TokenAccount::unpack_unchecked_mut(&mut account_data, &mut |account: &mut TokenAccount| {
+            *account = TokenAccount {
+                mint,
+                owner,
+                delegate: COption::Some(delegate),
+                amount: 420,
+                state: TokenAccountState::Initialized,
+                is_native: COption::Some(10),
+                delegated_amount: 30,
+                close_authority: COption::Some(owner),
+            };
+            Ok(())
+        })
+        .unwrap();
        let token_account = Account {
            lamports: 111,
            data: account_data.to_vec(),
-            owner: spl_token_id_v1_0(),
+            owner: spl_token_id_v2_0(),
            ..Account::default()
        };
        let token_account_pubkey = Pubkey::new_rand();
        bank.store_account(&token_account_pubkey, &token_account);

        // Add the mint
-        let mut mint_data = [0; size_of::<Mint>()];
-        let mint_state: &mut Mint =
-            spl_token_v1_0::state::unpack_unchecked(&mut mint_data).unwrap();
-        *mint_state = Mint {
-            owner: COption::Some(owner),
-            decimals: 2,
-            is_initialized: true,
-        };
+        let mut mint_data = vec![0; Mint::get_packed_len()];
+        Mint::unpack_unchecked_mut(&mut mint_data, &mut |mint: &mut Mint| {
+            *mint = Mint {
+                mint_authority: COption::Some(owner),
+                supply: 500,
+                decimals: 2,
+                is_initialized: true,
+                freeze_authority: COption::Some(owner),
+            };
+            Ok(())
+        })
+        .unwrap();
        let mint_account = Account {
            lamports: 111,
            data: mint_data.to_vec(),
-            owner: spl_token_id_v1_0(),
+            owner: spl_token_id_v2_0(),
            ..Account::default()
        };
        bank.store_account(&Pubkey::from_str(&mint.to_string()).unwrap(), &mint_account);
@@ -5189,7 +5200,7 @@ pub mod tests {
            result["result"]["value"]["data"],
            json!({
                "program": "spl-token",
-                "space": 120,
+                "space": TokenAccount::get_packed_len(),
                "parsed": {
                    "type": "account",
                    "info": {
@@ -5201,13 +5212,19 @@ pub mod tests {
                            "amount": "420",
                        },
                        "delegate": delegate.to_string(),
-                        "isInitialized": true,
-                        "isNative": false,
+                        "state": "initialized",
+                        "isNative": true,
+                        "rentExemptReserve": {
+                            "uiAmount": 0.1,
+                            "decimals": 2,
+                            "amount": "10",
+                        },
                        "delegatedAmount": {
                            "uiAmount": 0.3,
                            "decimals": 2,
                            "amount": "30",
                        },
+                        "closeAuthority": owner.to_string(),
                    }
                }
            })
@@ -5225,13 +5242,15 @@ pub mod tests {
            result["result"]["value"]["data"],
            json!({
                "program": "spl-token",
-                "space": 40,
+                "space": Mint::get_packed_len(),
                "parsed": {
                    "type": "mint",
                    "info": {
-                        "owner": owner.to_string(),
+                        "mintAuthority": owner.to_string(),
                        "decimals": 2,
+                        "supply": "500".to_string(),
                        "isInitialized": true,
+                        "freezeAuthority": owner.to_string(),
                    }
                }
            })
--- a/core/src/rpc_subscriptions.rs
+++ b/core/src/rpc_subscriptions.rs
@@ -8,7 +8,7 @@ use jsonrpc_pubsub::{
    SubscriptionId,
 };
 use serde::Serialize;
-use solana_account_decoder::{parse_token::spl_token_id_v1_0, UiAccount, UiAccountEncoding};
+use solana_account_decoder::{parse_token::spl_token_id_v2_0, UiAccount, UiAccountEncoding};
 use solana_client::{
    rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
    rpc_filter::RpcFilterType,
@@ -256,7 +256,7 @@ fn filter_account_result(
        // and should notify that the account state has been reverted.
        if fork != last_notified_slot {
            let encoding = encoding.unwrap_or(UiAccountEncoding::Binary);
-            if account.owner == spl_token_id_v1_0() && encoding == UiAccountEncoding::JsonParsed {
+            if account.owner == spl_token_id_v2_0() && encoding == UiAccountEncoding::JsonParsed {
                let bank = bank.unwrap(); // If result.is_some(), bank must also be Some
                return (
                    Box::new(iter::once(get_parsed_token_account(bank, pubkey, account))),
--- a/crate-features/Cargo.toml
+++ b/crate-features/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-crate-features"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Crate Features"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/docs/src/apps/jsonrpc-api.md
+++ b/docs/src/apps/jsonrpc-api.md
@@ -1257,7 +1257,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.3.5"},"id":1}
+{"jsonrpc":"2.0","result":{"solana-core": "1.3.6"},"id":1}
 ```

 ### getVoteAccounts
--- a/docs/src/clusters.md
+++ b/docs/src/clusters.md
@@ -39,14 +39,14 @@ solana config set --url https://devnet.solana.com
 $ solana-validator \
    --identity ~/validator-keypair.json \
    --vote-account ~/vote-account-keypair.json \
-    --trusted-validator 47Sbuv6jL7CViK9F2NMW51aQGhfdpUu7WNvKyH645Rfi \
+    --trusted-validator dv1LfzJvDF7S1fBKpFgKoKXK5yoSosmkAdfbxBo1GqJ \
    --no-untrusted-rpc \
    --ledger ~/validator-ledger \
    --rpc-port 8899 \
    --dynamic-port-range 8000-8010 \
-    --entrypoint devnet.solana.com:8001 \
-    --expected-genesis-hash HzyuivuNXMHJKjM6q6BE2qBsR3etqW21BSvuJTpJFj9A \
-    --expected-shred-version 61357 \
+    --entrypoint 35.197.53.105:8001 \
+    --expected-genesis-hash Ap36zrBt2jLWpwUjaF48hRULVgmvSE3ViFxiQgjZX2XC \
+    --expected-shred-version 37460 \
    --limit-ledger-size
 ```

--- a/docs/src/staking.md
+++ b/docs/src/staking.md
@@ -64,10 +64,15 @@ Different wallets will vary slightly in their process for this but the general
 description is below.

 #### Supported Wallets
-Currently, staking operation are only supported by wallets that can interact
-with the Solana command line tools, including Ledger Nano S and paper wallet.
+Staking operations are supported by the following wallet solutions:

-[Staking commands using the Solana Command Line Tools](cli/delegate-stake.md)
+ - SolFlare.com in conjunction with a keystore file or a Ledger Nano S.  Check
+ out our [guide to using SolFlare](wallet-guide/solflare.md) for details.
+
+ - Solana command line tools can perform all stake operations in conjunction
+ with a CLI-generated keypair file wallet, a paper wallet, or with a connected
+ Ledger Nano S.
+ [Staking commands using the Solana Command Line Tools](cli/delegate-stake.md).

 #### Create a Stake Account
 A stake account is a different type of account from a wallet address
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-dos"
-version = "1.3.5"
+version = "1.3.6"
 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.1"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-core = { path = "../core", version = "1.3.5" }
-solana-ledger = { path = "../ledger", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-ledger = { path = "../ledger", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/download-utils/Cargo.toml
+++ b/download-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-download-utils"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Download Utils"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,8 +14,8 @@ console = "0.11.3"
 indicatif = "0.15.0"
 log = "0.4.8"
 reqwest = { version = "0.10.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
 tar = "0.4.28"

 [lib]
--- a/explorer/wasm/Cargo.lock
+++ b/explorer/wasm/Cargo.lock
@@ -98,7 +98,7 @@ dependencies = [

 [[package]]
 name = "solana-sdk-wasm"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "bincode",
 "bs58",
--- a/explorer/wasm/Cargo.toml
+++ b/explorer/wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-sdk-wasm"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana SDK Wasm"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-faucet"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Faucet"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,11 +16,11 @@ clap = "2.33"
 log = "0.4.8"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
 tokio = "0.1"
 tokio-codec = "0.1"

--- a/fetch-perf-libs.sh
+++ b/fetch-perf-libs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-PERF_LIBS_VERSION=v0.19.1
+PERF_LIBS_VERSION=v0.19.3
 VERSION=$PERF_LIBS_VERSION-1

 set -e
--- a/fetch-spl.sh
+++ b/fetch-spl.sh
@@ -37,7 +37,7 @@ fetch_program() {

 }

-fetch_program token 1.0.0 TokenSVp5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o BPFLoader1111111111111111111111111111111111
+fetch_program token 2.0.3 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader1111111111111111111111111111111111
 fetch_program memo  1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo BPFLoader1111111111111111111111111111111111

 echo "${genesis_args[@]}" > spl-genesis-args.sh
--- a/genesis-programs/Cargo.toml
+++ b/genesis-programs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-genesis-programs"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana genesis programs"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 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.3.5" }
-solana-budget-program = { path = "../programs/budget", version = "1.3.5" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-vest-program = { path = "../programs/vest", version = "1.3.5" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.3.6" }
+solana-budget-program = { path = "../programs/budget", version = "1.3.6" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-vest-program = { path = "../programs/vest", version = "1.3.6" }

 [lib]
 crate-type = ["lib"]
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-genesis"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,15 +15,15 @@ chrono = "0.4"
 serde = "1.0.112"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-genesis-programs = { path = "../genesis-programs", version = "1.3.5" }
-solana-ledger = { path = "../ledger", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.3.6" }
+solana-ledger = { path = "../ledger", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
 tempfile = "3.1.0"

 [[bin]]
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -3,20 +3,20 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-gossip"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 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.3.5" }
-solana-core = { path = "../core", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-install"
 description = "The solana cluster software installer"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -24,12 +24,12 @@ reqwest = { version = "0.10.6", default-features = false, features = ["blocking"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-config-program = { path = "../programs/config", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-config-program = { path = "../programs/config", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
 semver = "0.9.0"
 tar = "0.4.28"
 tempdir = "0.3.7"
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-keygen"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana key generation utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 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.3.5" }
-solana-cli-config = { path = "../cli-config", version = "1.3.5" }
-solana-remote-wallet = { path = "../remote-wallet", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-cli-config = { path = "../cli-config", version = "1.3.6" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
 tiny-bip39 = "0.7.0"

 [[bin]]
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-ledger-tool"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -19,18 +19,18 @@ log = { version = "0.4.8" }
 regex = "1"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-cli = { path = "../cli", version = "1.3.5" }
-solana-ledger = { path = "../ledger", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-storage-bigtable = { path = "../storage-bigtable", version = "1.3.5" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-cli = { path = "../cli", version = "1.3.6" }
+solana-ledger = { path = "../ledger", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-storage-bigtable = { path = "../storage-bigtable", version = "1.3.6" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
 tempfile = "3.1.0"
 tokio = { version = "0.2.22", features = ["full"] }

--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-ledger"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana ledger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -29,18 +29,18 @@ reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] }
 serde = "1.0.112"
 serde_bytes = "0.11.4"
 sha2 = "0.8.2"
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
-solana-genesis-programs = { path = "../genesis-programs", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-merkle-tree = { path = "../merkle-tree", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-perf = { path = "../perf", version = "1.3.5" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-merkle-tree = { path = "../merkle-tree", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-perf = { path = "../perf", version = "1.3.6" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
 tempfile = "3.1.0"
 thiserror = "1.0"
 trees = "0.2.1"
@@ -55,7 +55,7 @@ features = ["lz4"]
 [dev-dependencies]
 assert_matches = "1.3.0"
 matches = "0.1.6"
-solana-budget-program = { path = "../programs/budget", version = "1.3.5" }
+solana-budget-program = { path = "../programs/budget", version = "1.3.6" }

 [lib]
 crate-type = ["lib"]
--- a/local-cluster/Cargo.toml
+++ b/local-cluster/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-local-cluster"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,22 +13,22 @@ itertools = "0.9.0"
 gag = "0.1.10"
 log = "0.4.8"
 rand = "0.7.0"
-solana-config-program = { path = "../programs/config", version = "1.3.5" }
-solana-core = { path = "../core", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-download-utils = { path = "../download-utils", version = "1.3.5" }
-solana-faucet = { path = "../faucet", version = "1.3.5" }
-solana-exchange-program = { path = "../programs/exchange", version = "1.3.5" }
-solana-genesis-programs = { path = "../genesis-programs", version = "1.3.5" }
-solana-ledger = { path = "../ledger", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-vest-program = { path = "../programs/vest", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
+solana-config-program = { path = "../programs/config", version = "1.3.6" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-download-utils = { path = "../download-utils", version = "1.3.6" }
+solana-faucet = { path = "../faucet", version = "1.3.6" }
+solana-exchange-program = { path = "../programs/exchange", version = "1.3.6" }
+solana-genesis-programs = { path = "../genesis-programs", version = "1.3.6" }
+solana-ledger = { path = "../ledger", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-vest-program = { path = "../programs/vest", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
 tempfile = "3.1.0"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.5" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.6" }

 [dev-dependencies]
 assert_matches = "1.3.0"
--- a/log-analyzer/Cargo.toml
+++ b/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.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,9 +14,9 @@ byte-unit = "4.0.8"
 clap = "2.33.1"
 serde = "1.0.112"
 serde_json = "1.0.56"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [[bin]]
 name = "solana-log-analyzer"
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-logger"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Logger"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/measure/Cargo.toml
+++ b/measure/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-measure"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 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.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }

 [target."cfg(unix)".dependencies]
 jemallocator = "0.3.2"
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-merkle-tree"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Merkle Tree"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
 fast-math = "0.1"

 [dev-dependencies]
--- a/metrics/Cargo.toml
+++ b/metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-metrics"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Metrics"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,7 +14,7 @@ gethostname = "0.2.1"
 lazy_static = "1.4.0"
 log = "0.4.8"
 reqwest = { version = "0.10.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }

 [dev-dependencies]
 rand = "0.7.0"
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-net-shaper"
 description = "The solana cluster network shaping tool"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,8 +13,8 @@ publish = false
 clap = "2.33.1"
 serde = "1.0.112"
 serde_json = "1.0.56"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
 rand = "0.7.0"

 [[bin]]
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-net-utils"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Network Utilities"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -18,9 +18,9 @@ rand = "0.7.0"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 socket2 = "0.3.12"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
 tokio = "0.1"
 tokio-codec = "0.1"
 url = "2.1.1"
--- a/notifier/Cargo.toml
+++ b/notifier/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-notifier"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Notifier"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/perf/Cargo.toml
+++ b/perf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-perf"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Performance APIs"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -17,11 +17,11 @@ serde = "1.0.112"
 dlopen_derive = "0.1.4"
 lazy_static = "1.4.0"
 log = "0.4.8"
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.5" }
-solana-budget-program = { path = "../programs/budget", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.6" }
+solana-budget-program = { path = "../programs/budget", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
 curve25519-dalek = { version = "2" }

 [lib]
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-poh-bench"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -12,13 +12,13 @@ clap = "2.33.1"
 log = "0.4.6"
 rand = "0.7.0"
 rayon = "1.3.0"
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-ledger = { path = "../ledger", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
-solana-perf = { path = "../perf", version = "1.3.5" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-ledger = { path = "../ledger", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
+solana-perf = { path = "../perf", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -1612,7 +1612,7 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"

 [[package]]
 name = "solana-bpf-loader-program"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "bincode",
 "byteorder 1.3.4",
@@ -1626,7 +1626,7 @@ dependencies = [

 [[package]]
 name = "solana-bpf-programs"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "bincode",
 "byteorder 1.3.4",
@@ -1641,7 +1641,7 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-128bit"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-bpf-rust-128bit-dep",
 "solana-sdk",
@@ -1649,21 +1649,21 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-128bit-dep"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-alloc"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-dep-crate"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "byteorder 1.3.4",
 "solana-sdk",
@@ -1671,14 +1671,14 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-dup-accounts"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-error-handling"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "num-derive 0.2.5",
 "num-traits",
@@ -1688,14 +1688,14 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-external-spend"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-invoke"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-bpf-rust-invoked",
 "solana-sdk",
@@ -1703,21 +1703,21 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-invoked"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-iter"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-many-args"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-bpf-rust-many-args-dep",
 "solana-sdk",
@@ -1725,28 +1725,28 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-many-args-dep"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-noop"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-panic"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-param-passing"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-bpf-rust-param-passing-dep",
 "solana-sdk",
@@ -1754,21 +1754,21 @@ dependencies = [

 [[package]]
 name = "solana-bpf-rust-param-passing-dep"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-bpf-rust-sysval"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "solana-sdk",
 ]

 [[package]]
 name = "solana-config-program"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "bincode",
 "chrono",
@@ -1780,7 +1780,7 @@ dependencies = [

 [[package]]
 name = "solana-crate-features"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "backtrace",
 "bytes 0.4.12",
@@ -1803,7 +1803,7 @@ dependencies = [

 [[package]]
 name = "solana-logger"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "env_logger",
 "lazy_static",
@@ -1812,7 +1812,7 @@ dependencies = [

 [[package]]
 name = "solana-measure"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "jemalloc-ctl",
 "jemallocator",
@@ -1823,7 +1823,7 @@ dependencies = [

 [[package]]
 name = "solana-metrics"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "env_logger",
 "gethostname",
@@ -1835,7 +1835,7 @@ dependencies = [

 [[package]]
 name = "solana-rayon-threadlimit"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "lazy_static",
 "num_cpus",
@@ -1843,7 +1843,7 @@ dependencies = [

 [[package]]
 name = "solana-runtime"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "bincode",
 "bv",
@@ -1887,7 +1887,7 @@ dependencies = [

 [[package]]
 name = "solana-sdk"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "assert_matches",
 "bincode",
@@ -1924,7 +1924,7 @@ dependencies = [

 [[package]]
 name = "solana-sdk-macro"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "bs58",
 "proc-macro2 1.0.19",
@@ -1935,7 +1935,7 @@ dependencies = [

 [[package]]
 name = "solana-sdk-macro-frozen-abi"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "lazy_static",
 "proc-macro2 1.0.19",
@@ -1946,7 +1946,7 @@ dependencies = [

 [[package]]
 name = "solana-stake-program"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "bincode",
 "log",
@@ -1965,7 +1965,7 @@ dependencies = [

 [[package]]
 name = "solana-vote-program"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "bincode",
 "log",
--- a/programs/bpf/Cargo.toml
+++ b/programs/bpf/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-bpf-programs"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "README.md"
@@ -22,10 +22,10 @@ walkdir = "2"
 bincode = "1.1.4"
 byteorder = "1.3.2"
 elf = "0.0.10"
-solana-bpf-loader-program = { path = "../bpf_loader", version = "1.3.5" }
-solana-logger = { path = "../../logger", version = "1.3.5" }
-solana-runtime = { path = "../../runtime", version = "1.3.5" }
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
+solana-bpf-loader-program = { path = "../bpf_loader", version = "1.3.6" }
+solana-logger = { path = "../../logger", version = "1.3.6" }
+solana-runtime = { path = "../../runtime", version = "1.3.6" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }
 solana_rbpf = "=0.1.30"

 [[bench]]
--- a/programs/bpf/rust/128bit/Cargo.toml
+++ b/programs/bpf/rust/128bit/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-128bit"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,8 +12,8 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
-solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }
+solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/128bit_dep/Cargo.toml
+++ b/programs/bpf/rust/128bit_dep/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-128bit-dep"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/alloc/Cargo.toml
+++ b/programs/bpf/rust/alloc/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-alloc"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/dep_crate/Cargo.toml
+++ b/programs/bpf/rust/dep_crate/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-dep-crate"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,7 +13,7 @@ edition = "2018"

 [dependencies]
 byteorder = { version = "1", default-features = false }
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/dup_accounts/Cargo.toml
+++ b/programs/bpf/rust/dup_accounts/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-dup-accounts"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/error_handling/Cargo.toml
+++ b/programs/bpf/rust/error_handling/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-error-handling"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,7 +14,7 @@ edition = "2018"
 [dependencies]
 num-derive = "0.2"
 num-traits = "0.2"
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }
 thiserror = "1.0"

 [features]
--- a/programs/bpf/rust/external_spend/Cargo.toml
+++ b/programs/bpf/rust/external_spend/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-external-spend"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/invoke/Cargo.toml
+++ b/programs/bpf/rust/invoke/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-invoke"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,7 +13,7 @@ edition = "2018"

 [dependencies]
 solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/invoked/Cargo.toml
+++ b/programs/bpf/rust/invoked/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-invoked"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/iter/Cargo.toml
+++ b/programs/bpf/rust/iter/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-iter"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/many_args/Cargo.toml
+++ b/programs/bpf/rust/many_args/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-many-args"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,8 +12,8 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
-solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }
+solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/many_args_dep/Cargo.toml
+++ b/programs/bpf/rust/many_args_dep/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-many-args-dep"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/noop/Cargo.toml
+++ b/programs/bpf/rust/noop/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-noop"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/panic/Cargo.toml
+++ b/programs/bpf/rust/panic/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-panic"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/param_passing/Cargo.toml
+++ b/programs/bpf/rust/param_passing/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-param-passing"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,8 +12,8 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
-solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }
+solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/param_passing_dep/Cargo.toml
+++ b/programs/bpf/rust/param_passing_dep/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-param-passing-dep"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf/rust/sysval/Cargo.toml
+++ b/programs/bpf/rust/sysval/Cargo.toml
@@ -3,7 +3,7 @@

 [package]
 name = "solana-bpf-rust-sysval"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF test program written in Rust"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../../../sdk/", version = "1.3.5", default-features = false }
+solana-sdk = { path = "../../../../sdk/", version = "1.3.6", default-features = false }

 [features]
 program = ["solana-sdk/program"]
--- a/programs/bpf_loader/Cargo.toml
+++ b/programs/bpf_loader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-bpf-loader-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana BPF loader"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -13,8 +13,8 @@ bincode = "1.3.1"
 byteorder = "1.3.4"
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
-solana-runtime = { path = "../../runtime", version = "1.3.5" }
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
+solana-runtime = { path = "../../runtime", version = "1.3.6" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }
 solana_rbpf = "=0.1.30"
 thiserror = "1.0"

--- a/programs/budget/Cargo.toml
+++ b/programs/budget/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-budget-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Budget program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -16,11 +16,11 @@ num-derive = "0.3"
 num-traits = "0.2"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }
 thiserror = "1.0"

 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "1.3.5" }
+solana-runtime = { path = "../../runtime", version = "1.3.6" }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/config/Cargo.toml
+++ b/programs/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-config-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Config program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,10 +14,10 @@ chrono = { version = "0.4.11", features = ["serde"] }
 log = "0.4.8"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }

 [dev-dependencies]
-solana-logger = { path = "../../logger", version = "1.3.5" }
+solana-logger = { path = "../../logger", version = "1.3.6" }

 [lib]
 crate-type = ["lib"]
--- a/programs/exchange/Cargo.toml
+++ b/programs/exchange/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-exchange-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Exchange program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,13 +15,13 @@ num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-logger = { path = "../../logger", version = "1.3.5" }
-solana-metrics = { path = "../../metrics", version = "1.3.5" }
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
+solana-logger = { path = "../../logger", version = "1.3.6" }
+solana-metrics = { path = "../../metrics", version = "1.3.6" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }
 thiserror = "1.0"

 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "1.3.5" }
+solana-runtime = { path = "../../runtime", version = "1.3.6" }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/failure/Cargo.toml
+++ b/programs/failure/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-failure-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana failure program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -9,10 +9,10 @@ homepage = "https://solana.com/"
 edition = "2018"

 [dependencies]
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }

 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "1.3.5" }
+solana-runtime = { path = "../../runtime", version = "1.3.6" }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/noop/Cargo.toml
+++ b/programs/noop/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-noop-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Noop program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,8 +10,8 @@ edition = "2018"

 [dependencies]
 log = "0.4.8"
-solana-logger = { path = "../../logger", version = "1.3.5" }
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
+solana-logger = { path = "../../logger", version = "1.3.6" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/ownable/Cargo.toml
+++ b/programs/ownable/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-ownable"
-version = "1.3.5"
+version = "1.3.6"
 description = "ownable program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,13 +10,13 @@ edition = "2018"

 [dependencies]
 bincode = "1.3.1"
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }
 num-derive = "0.3"
 num-traits = "0.2"
 thiserror = "1.0"

 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "1.3.5" }
+solana-runtime = { path = "../../runtime", version = "1.3.6" }

 [lib]
 crate-type = ["lib", "cdylib"]
--- a/programs/stake/Cargo.toml
+++ b/programs/stake/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-stake-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Stake program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,15 +15,15 @@ num-derive = "0.3"
 num-traits = "0.2"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-metrics = { path = "../../metrics", version = "1.3.5" }
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
-solana-vote-program = { path = "../vote", version = "1.3.5" }
-solana-config-program = { path = "../config", version = "1.3.5" }
-solana-sdk-macro-frozen-abi = { path = "../../sdk/macro-frozen-abi", version = "1.3.5" }
+solana-metrics = { path = "../../metrics", version = "1.3.6" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }
+solana-vote-program = { path = "../vote", version = "1.3.6" }
+solana-config-program = { path = "../config", version = "1.3.6" }
+solana-sdk-macro-frozen-abi = { path = "../../sdk/macro-frozen-abi", version = "1.3.6" }
 thiserror = "1.0"

 [dev-dependencies]
-solana-logger = { path = "../../logger", version = "1.3.5" }
+solana-logger = { path = "../../logger", version = "1.3.6" }

 [build-dependencies]
 rustc_version = "0.2"
--- a/programs/vest/Cargo.toml
+++ b/programs/vest/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-vest-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Vest program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,12 +15,12 @@ num-derive = "0.2"
 num-traits = "0.2"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
-solana-config-program = { path = "../config", version = "1.3.5" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }
+solana-config-program = { path = "../config", version = "1.3.6" }
 thiserror = "1.0"

 [dev-dependencies]
-solana-runtime = { path = "../../runtime", version = "1.3.5" }
+solana-runtime = { path = "../../runtime", version = "1.3.6" }

 [lib]
 crate-type = ["lib"]
--- a/programs/vote/Cargo.toml
+++ b/programs/vote/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-vote-program"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Vote program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -15,10 +15,10 @@ num-derive = "0.3"
 num-traits = "0.2"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-logger = { path = "../../logger", version = "1.3.5" }
-solana-metrics = { path = "../../metrics", version = "1.3.5" }
-solana-sdk = { path = "../../sdk", version = "1.3.5" }
-solana-sdk-macro-frozen-abi = { path = "../../sdk/macro-frozen-abi", version = "1.3.5" }
+solana-logger = { path = "../../logger", version = "1.3.6" }
+solana-metrics = { path = "../../metrics", version = "1.3.6" }
+solana-sdk = { path = "../../sdk", version = "1.3.6" }
+solana-sdk-macro-frozen-abi = { path = "../../sdk/macro-frozen-abi", version = "1.3.6" }
 thiserror = "1.0"

 [build-dependencies]
--- a/ramp-tps/Cargo.toml
+++ b/ramp-tps/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-ramp-tps"
 description = "Solana Tour de SOL - TPS ramp up"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/tour-de-sol"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -16,12 +16,12 @@ reqwest = { version = "0.10.6", default-features = false }
 serde = "1.0.112"
 serde_json = "1.0.56"
 serde_yaml = "0.8.13"
-solana-core = { path = "../core", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-notifier = { path = "../notifier", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-notifier = { path = "../notifier", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
 tar = "0.4.28"
--- a/rayon-threadlimit/Cargo.toml
+++ b/rayon-threadlimit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-rayon-threadlimit"
-version = "1.3.5"
+version = "1.3.6"
 description = "solana-rayon-threadlimit"
 homepage = "https://solana.com/"
 readme = "../README.md"
--- a/remote-wallet/Cargo.toml
+++ b/remote-wallet/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-remote-wallet"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,7 +18,7 @@ num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
 parking_lot = "0.10"
 semver = "0.9"
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
 thiserror = "1.0"
 url = "2.1.1"

--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-runtime"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana runtime"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -32,15 +32,15 @@ rayon = "1.3.1"
 regex = "1.3.9"
 serde = { version = "1.0.112", features = ["rc"] }
 serde_derive = "1.0.103"
-solana-config-program = { path = "../programs/config", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
+solana-config-program = { path = "../programs/config", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
 symlink = "0.1.0"
 tar = "0.4.28"
 tempfile = "3.1.0"
@@ -53,7 +53,7 @@ name = "solana_runtime"

 [dev-dependencies]
 assert_matches = "1.3.0"
-solana-noop-program = { path = "../programs/noop", version = "1.3.5" }
+solana-noop-program = { path = "../programs/noop", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/scripts/Cargo.toml
+++ b/scripts/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-scripts"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-sdk"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana SDK"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -55,10 +55,10 @@ serde_json = { version = "1.0.56", optional = true }
 sha2 = "0.8.2"
 thiserror = "1.0"
 ed25519-dalek = { version = "=1.0.0-pre.4", optional = true }
-solana-crate-features = { path = "../crate-features", version = "1.3.5", optional = true }
-solana-logger = { path = "../logger", version = "1.3.5", optional = true }
-solana-sdk-macro = { path = "macro", version = "1.3.5" }
-solana-sdk-macro-frozen-abi = { path = "macro-frozen-abi", version = "1.3.5" }
+solana-crate-features = { path = "../crate-features", version = "1.3.6", optional = true }
+solana-logger = { path = "../logger", version = "1.3.6", optional = true }
+solana-sdk-macro = { path = "macro", version = "1.3.6" }
+solana-sdk-macro-frozen-abi = { path = "macro-frozen-abi", version = "1.3.6" }
 rustversion = "1.0.3"

 [dev-dependencies]
--- a/sdk/macro-frozen-abi/Cargo.toml
+++ b/sdk/macro-frozen-abi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-sdk-macro-frozen-abi"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana SDK Macro frozen abi"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/sdk/macro/Cargo.toml
+++ b/sdk/macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-sdk-macro"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana SDK Macro"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
--- a/stake-accounts/Cargo.toml
+++ b/stake-accounts/Cargo.toml
@@ -3,22 +3,22 @@ name = "solana-stake-accounts"
 description = "Blockchain, Rebuilt for Scale"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
-version = "1.3.5"
+version = "1.3.6"
 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.3.5" }
-solana-cli-config = { path = "../cli-config", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-remote-wallet = { path = "../remote-wallet", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-cli-config = { path = "../cli-config", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }

 [dev-dependencies]
-solana-runtime = { path = "../runtime", version = "1.3.5" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/stake-monitor/Cargo.toml
+++ b/stake-monitor/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-stake-monitor"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -14,21 +14,21 @@ console = "0.11.3"
 log = "0.4.8"
 serde = "1.0.112"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-cli-config = { path = "../cli-config", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-cli-config = { path = "../cli-config", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [dev-dependencies]
 serial_test = "0.4.0"
 serial_test_derive = "0.4.0"
-solana-local-cluster = { path = "../local-cluster", version = "1.3.5" }
-solana-core = { path = "../core", version = "1.3.5" }
+solana-local-cluster = { path = "../local-cluster", version = "1.3.6" }
+solana-core = { path = "../core", version = "1.3.6" }
 tempfile = "3.1.0"

 [[bin]]
--- a/stake-o-matic/Cargo.toml
+++ b/stake-o-matic/Cargo.toml
@@ -6,22 +6,22 @@ homepage = "https://solana.com/"
 license = "Apache-2.0"
 name = "solana-stake-o-matic"
 repository = "https://github.com/solana-labs/stake-o-matic"
-version = "1.3.5"
+version = "1.3.6"

 [dependencies]
 clap = "2.33.0"
 log = "0.4.8"
 serde_yaml = "0.8.13"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-cli-config = { path = "../cli-config", version = "1.3.5" }
-solana-cli = { path = "../cli", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-notifier = { path = "../notifier", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-cli-config = { path = "../cli-config", version = "1.3.6" }
+solana-cli = { path = "../cli", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-notifier = { path = "../notifier", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
--- a/storage-bigtable/Cargo.toml
+++ b/storage-bigtable/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-storage-bigtable"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Storage BigTable"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -21,8 +21,8 @@ prost-types = "0.6.1"
 serde = "1.0.112"
 serde_derive = "1.0.103"
 smpl_jwt = "0.5.0"
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }
 thiserror = "1.0"
 futures = "0.3.5"
 tonic = {version="0.3.0", features = ["tls", "transport"]}
--- a/storage-bigtable/build-proto/Cargo.lock
+++ b/storage-bigtable/build-proto/Cargo.lock
@@ -183,7 +183,7 @@ dependencies = [

 [[package]]
 name = "proto"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
 "tonic-build",
 ]
--- a/storage-bigtable/build-proto/Cargo.toml
+++ b/storage-bigtable/build-proto/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 name = "proto"
 publish = false
 repository = "https://github.com/solana-labs/solana"
-version = "1.3.5"
+version = "1.3.6"

 [workspace]

--- a/streamer/Cargo.toml
+++ b/streamer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-streamer"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Streamer"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -10,14 +10,14 @@ edition = "2018"

 [dependencies]
 log = "0.4.8"
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
 thiserror = "1.0"
-solana-measure = { path = "../measure", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
+solana-measure = { path = "../measure", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
 libc = "0.2.72"
 nix = "0.17.0"
-solana-perf = { path = "../perf", version = "1.3.5" }
+solana-perf = { path = "../perf", version = "1.3.6" }

 [dev-dependencies]

--- a/sys-tuner/Cargo.toml
+++ b/sys-tuner/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-sys-tuner"
 description = "The solana cluster system tuner daemon"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -13,9 +13,9 @@ publish = true
 clap = "2.33.1"
 log = "0.4.8"
 libc = "0.2.72"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }

 [target."cfg(unix)".dependencies]
 unix_socket2 = "0.5.4"
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -3,7 +3,7 @@ name = "solana-tokens"
 description = "Blockchain, Rebuilt for Scale"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -18,16 +18,16 @@ indexmap = "1.4.0"
 indicatif = "0.15.0"
 pickledb = "0.4.1"
 serde = { version = "1.0", features = ["derive"] }
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-cli-config = { path = "../cli-config", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-remote-wallet = { path = "../remote-wallet", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-transaction-status = { path = "../transaction-status", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-cli-config = { path = "../cli-config", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-remote-wallet = { path = "../remote-wallet", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-transaction-status = { path = "../transaction-status", version = "1.3.6" }
 tempfile = "3.1.0"
 thiserror = "1.0"

 [dev-dependencies]
-solana-core = { path = "../core", version = "1.3.5" }
+solana-core = { path = "../core", version = "1.3.6" }
--- a/transaction-status/Cargo.toml
+++ b/transaction-status/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-transaction-status"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana transaction status types"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -14,12 +14,12 @@ bincode = "1.3.1"
 bs58 = "0.3.1"
 Inflector = "0.11.4"
 lazy_static = "1.4.0"
-solana-account-decoder = { path = "../account-decoder", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-stake-program = { path = "../programs/stake", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
+solana-account-decoder = { path = "../account-decoder", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-stake-program = { path = "../programs/stake", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
 spl-memo-v1-0 = { package = "spl-memo", version = "1.0.7", features = ["skip-no-mangle"] }
-spl-token-v1-0 = { package = "spl-token", version = "1.0.8", features = ["skip-no-mangle"] }
+spl-token-v2-0 = { package = "spl-token", version = "2.0.3", features = ["skip-no-mangle"] }
 serde = "1.0.112"
 serde_derive = "1.0.103"
 serde_json = "1.0.56"
--- a/transaction-status/src/parse_instruction.rs
+++ b/transaction-status/src/parse_instruction.rs
@@ -1,7 +1,7 @@
 use crate::parse_token::parse_token;
 use inflector::Inflector;
 use serde_json::Value;
-use solana_account_decoder::parse_token::spl_token_id_v1_0;
+use solana_account_decoder::parse_token::spl_token_id_v2_0;
 use solana_sdk::{instruction::CompiledInstruction, pubkey::Pubkey};
 use std::{
    collections::HashMap,
@@ -12,7 +12,7 @@ use thiserror::Error;
 lazy_static! {
    static ref MEMO_PROGRAM_ID: Pubkey =
        Pubkey::from_str(&spl_memo_v1_0::id().to_string()).unwrap();
-    static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v1_0();
+    static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v2_0();
    static ref PARSABLE_PROGRAM_IDS: HashMap<Pubkey, ParsableProgram> = {
        let mut m = HashMap::new();
        m.insert(*MEMO_PROGRAM_ID, ParsableProgram::SplMemo);
--- a/transaction-status/src/parse_token.rs
+++ b/transaction-status/src/parse_token.rs
--- a/upload-perf/Cargo.toml
+++ b/upload-perf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-upload-perf"
-version = "1.3.5"
+version = "1.3.6"
 description = "Metrics Upload Utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -11,7 +11,7 @@ publish = false

 [dependencies]
 serde_json = "1.0.56"
-solana-metrics = { path = "../metrics", version = "1.3.5" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }

 [[bin]]
 name = "solana-upload-perf"
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 edition = "2018"
 name = "solana-validator"
 description = "Blockchain, Rebuilt for Scale"
-version = "1.3.5"
+version = "1.3.6"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
@@ -15,21 +15,21 @@ console = "0.11.3"
 log = "0.4.8"
 rand = "0.7.0"
 serde_json = "1.0.56"
-solana-clap-utils = { path = "../clap-utils", version = "1.3.5" }
-solana-client = { path = "../client", version = "1.3.5" }
-solana-core = { path = "../core", version = "1.3.5" }
-solana-download-utils = { path = "../download-utils", version = "1.3.5" }
-solana-faucet = { path = "../faucet", version = "1.3.5" }
-solana-ledger = { path = "../ledger", version = "1.3.5" }
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-perf = { path = "../perf", version = "1.3.5" }
-solana-metrics = { path = "../metrics", version = "1.3.5" }
-solana-net-utils = { path = "../net-utils", version = "1.3.5" }
-solana-runtime = { path = "../runtime", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-version = { path = "../version", version = "1.3.5" }
-solana-vote-program = { path = "../programs/vote", version = "1.3.5" }
-solana-vote-signer = { path = "../vote-signer", version = "1.3.5" }
+solana-clap-utils = { path = "../clap-utils", version = "1.3.6" }
+solana-client = { path = "../client", version = "1.3.6" }
+solana-core = { path = "../core", version = "1.3.6" }
+solana-download-utils = { path = "../download-utils", version = "1.3.6" }
+solana-faucet = { path = "../faucet", version = "1.3.6" }
+solana-ledger = { path = "../ledger", version = "1.3.6" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-perf = { path = "../perf", version = "1.3.6" }
+solana-metrics = { path = "../metrics", version = "1.3.6" }
+solana-net-utils = { path = "../net-utils", version = "1.3.6" }
+solana-runtime = { path = "../runtime", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-version = { path = "../version", version = "1.3.6" }
+solana-vote-program = { path = "../programs/vote", version = "1.3.6" }
+solana-vote-signer = { path = "../vote-signer", version = "1.3.6" }

 [target."cfg(unix)".dependencies]
 libc = "0.2.72"
--- a/version/Cargo.toml
+++ b/version/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-version"
-version = "1.3.5"
+version = "1.3.6"
 description = "Solana Version"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,9 +12,9 @@ edition = "2018"
 log = "0.4.8"
 serde = "1.0.112"
 serde_derive = "1.0.103"
-solana-logger = { path = "../logger", version = "1.3.5" }
-solana-sdk = { path = "../sdk", version = "1.3.5" }
-solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.3.5" }
+solana-logger = { path = "../logger", version = "1.3.6" }
+solana-sdk = { path = "../sdk", version = "1.3.6" }
+solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.3.6" }

 [lib]
 name = "solana_version"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Vines	acb992c3be	Update to spl-token 2	2020-08-29 09:23:20 -07:00
Tyera Eulberg	61aca235a3	Bump spl-token version	2020-08-29 03:24:36 -06:00
mergify[bot]	bad0709ff1	Update to token pack/unpack changes (bp #11900 ) (#11903 ) * Update to token pack/unpack changes (#11900) (cherry picked from commit `2eff9a19c3`) # Conflicts: # account-decoder/Cargo.toml # core/Cargo.toml * Fix conflicts Co-authored-by: Tyera Eulberg <teulberg@gmail.com> Co-authored-by: Tyera Eulberg <tyera@solana.com>	2020-08-29 05:46:07 +00:00
mergify[bot]	2a649e990d	Update spl-token to v2.0 (bp #11884 ) (#11897 ) * Update spl-token to v2.0 (#11884) * Update account-decoder to spl-token v2.0 * Update transaction-status to spl-token v2.0 * Update rpc to spl-token v2.0 * Update getTokenSupply to pull from Mint directly * Fixup to spl-token v2.0.1 (cherry picked from commit `76be36c9ce`) # Conflicts: # Cargo.lock # account-decoder/Cargo.toml # core/Cargo.toml * Fix conflicts Co-authored-by: Tyera Eulberg <teulberg@gmail.com> Co-authored-by: Tyera Eulberg <tyera@solana.com>	2020-08-28 23:36:53 +00:00
mergify[bot]	1a25889f72	Take v0.19.3 of perf libs which improves sigverify perf 2x (#11894 ) (#11895 ) (cherry picked from commit `9393dce1ff`) Co-authored-by: sakridge <sakridge@gmail.com>	2020-08-28 20:37:26 +00:00
Trent Nelson	e15dca6961	Update devnet cluster docs since reboot	2020-08-28 10:36:11 -07:00
mergify[bot]	bb12f48014	Add SolFlare as stake-supporting wallet (#11891 ) (#11892 ) Co-authored-by: publish-docs.sh <maintainers@solana.com> (cherry picked from commit `8ba3a33129`) Co-authored-by: Dan Albert <dan@solana.com>	2020-08-28 16:17:24 +00:00
Jon Cinque	c6416fca6e	Bump version to 1.3.6 (#11890 )	2020-08-28 16:58:59 +02:00