stake-pool: Update version for crate publish (#1967)

Finalize the stake pool struct for when a lockup will eventually be
present.

Cargo.lock

@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -3844,7 +3846,7 @@ dependencies = [
 
 [[package]]
 name = "spl-stake-pool"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "arrayref",
  "bincode",
@@ -3865,7 +3867,7 @@ dependencies = [
 
 [[package]]
 name = "spl-stake-pool-cli"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "bincode",
  "borsh",

stake-pool/cli/Cargo.toml

@@ -6,21 +6,21 @@ homepage = "https://spl.solana.com/stake-pool"
 license = "Apache-2.0"
 name = "spl-stake-pool-cli"
 repository = "https://github.com/solana-labs/solana-program-library"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies]
 borsh = "0.8"
 clap = "2.33.3"
 serde_json = "1.0.62"
-solana-account-decoder = "1.7.3"
-solana-clap-utils = "1.7.3"
-solana-cli-config = "1.7.3"
-solana-client = "1.7.3"
-solana-logger = "1.7.3"
-solana-sdk = "1.7.3"
-solana-program = "1.7.3"
+solana-account-decoder = "=1.7.3"
+solana-clap-utils = "=1.7.3"
+solana-cli-config = "=1.7.3"
+solana-client = "=1.7.3"
+solana-logger = "=1.7.3"
+solana-sdk = "=1.7.3"
+solana-program = "=1.7.3"
 spl-associated-token-account = { version = "1.0", path="../../associated-token-account/program", features = [ "no-entrypoint" ] }
-spl-stake-pool = { version = "0.2", path="../program", features = [ "no-entrypoint" ] }
+spl-stake-pool = { version = "0.3", path="../program", features = [ "no-entrypoint" ] }
 spl-token = { version = "3.1", path="../../token/program", features = [ "no-entrypoint" ]  }
 bs58 = "0.4.0"
 bincode = "1.3.1"

stake-pool/program/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spl-stake-pool"
-version = "0.2.0"
+version = "0.3.0"
 description = "Solana Program Library Stake Pool"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"

stake-pool/program/program-id.md

@@ -1 +1 @@
-poo1B9L9nR3CrcaziKVYVpRX6A9Y1LAXYasjjfCbApj
+SPoo1XJbrC5pXDfg5NQAXo2RKyfimXKm6KpqicGvpbo

stake-pool/program/src/lib.rs

@@ -101,4 +101,4 @@ pub fn find_transient_stake_program_address(
     )
 }
 
-solana_program::declare_id!("poo1B9L9nR3CrcaziKVYVpRX6A9Y1LAXYasjjfCbApj");
+solana_program::declare_id!("SPoo1XJbrC5pXDfg5NQAXo2RKyfimXKm6KpqicGvpbo");

stake-pool/program/src/state.rs

@@ -1,7 +1,7 @@
 //! State transition types
 
 use {
-    crate::error::StakePoolError,
+    crate::{error::StakePoolError, stake_program::Lockup},
     borsh::{BorshDeserialize, BorshSchema, BorshSerialize},
     solana_program::{account_info::AccountInfo, msg, program_error::ProgramError, pubkey::Pubkey},
     std::convert::TryFrom,
@@ -79,6 +79,9 @@ pub struct StakePool {
     /// Last epoch the `total_stake_lamports` field was updated
     pub last_update_epoch: u64,
 
+    /// Lockup that all stakes in the pool must have
+    pub lockup: Lockup,
+
     /// Fee taken as a proportion of rewards each epoch
     pub fee: Fee,