Add vest program to genesis

This commit is contained in:
Michael Vines 2019-10-17 10:37:08 -07:00
parent 2747c9db23
commit d865f1f0c5
7 changed files with 49 additions and 2 deletions

14
Cargo.lock generated
View File

@ -3456,6 +3456,8 @@ dependencies = [
"solana-stake-program 0.20.0",
"solana-storage-api 0.20.0",
"solana-storage-program 0.20.0",
"solana-vest-api 0.20.0",
"solana-vest-program 0.20.0",
"solana-vote-api 0.20.0",
"solana-vote-program 0.20.0",
]
@ -3897,7 +3899,7 @@ dependencies = [
[[package]]
name = "solana-vest-api"
version = "0.20.0-pre0"
version = "0.20.0"
dependencies = [
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3911,6 +3913,16 @@ dependencies = [
"solana-sdk 0.20.0",
]
[[package]]
name = "solana-vest-program"
version = "0.20.0"
dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.20.0",
"solana-sdk 0.20.0",
"solana-vest-api 0.20.0",
]
[[package]]
name = "solana-vote-api"
version = "0.20.0"

View File

@ -43,6 +43,7 @@ members = [
"programs/storage_api",
"programs/storage_program",
"programs/vest_api",
"programs/vest_program",
"programs/vote_api",
"programs/vote_program",
"replicator",

View File

@ -24,6 +24,8 @@ solana-stake-api = { path = "../programs/stake_api", version = "0.20.0" }
solana-stake-program = { path = "../programs/stake_program", version = "0.20.0" }
solana-storage-api = { path = "../programs/storage_api", version = "0.20.0" }
solana-storage-program = { path = "../programs/storage_program", version = "0.20.0" }
solana-vest-api = { path = "../programs/vest_api", version = "0.20.0" }
solana-vest-program = { path = "../programs/vest_program", version = "0.20.0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.20.0" }
solana-vote-program = { path = "../programs/vote_program", version = "0.20.0" }

View File

@ -17,6 +17,8 @@ extern crate solana_stake_program;
#[macro_use]
extern crate solana_storage_program;
#[macro_use]
extern crate solana_vest_program;
#[macro_use]
extern crate solana_vote_program;
pub fn get() -> Vec<(String, Pubkey)> {
@ -30,6 +32,7 @@ pub fn get() -> Vec<(String, Pubkey)> {
solana_move_loader_program!(),
solana_stake_program!(),
solana_storage_program!(),
solana_vest_program!(),
solana_vote_program!(),
]
}
@ -52,6 +55,7 @@ mod tests {
solana_sdk::system_program::id(),
solana_stake_api::id(),
solana_storage_api::id(),
solana_vest_api::id(),
solana_vote_api::id(),
];
assert!(ids.into_iter().all(move |id| unique.insert(id)));

View File

@ -1,6 +1,6 @@
[package]
name = "solana-vest-api"
version = "0.20.0-pre0"
version = "0.20.0"
description = "Solana Vest program API"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"

View File

@ -0,0 +1,19 @@
[package]
name = "solana-vest-program"
version = "0.20.0"
description = "Solana Vest program"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
edition = "2018"
[dependencies]
log = "0.4.8"
solana-logger = { path = "../../logger", version = "0.20.0" }
solana-sdk = { path = "../../sdk", version = "0.20.0" }
solana-vest-api = { path = "../vest_api", version = "0.20.0" }
[lib]
crate-type = ["lib", "cdylib"]
name = "solana_vest_program"

View File

@ -0,0 +1,9 @@
#[macro_export]
macro_rules! solana_vest_program {
() => {
("solana_vest_program".to_string(), solana_vest_api::id())
};
}
use solana_vest_api::vest_processor::process_instruction;
solana_sdk::solana_entrypoint!(process_instruction);