Skip to content

Commit

Permalink
Add vest program to genesis
Browse files Browse the repository at this point in the history
  • Loading branch information
mvines committed Oct 17, 2019
1 parent bfc67e8 commit a210d88
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 2 deletions.
14 changes: 13 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ members = [
"programs/storage_api",
"programs/storage_program",
"programs/vest_api",
"programs/vest_program",
"programs/vote_api",
"programs/vote_program",
"replicator",
Expand Down
2 changes: 2 additions & 0 deletions genesis_programs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
4 changes: 4 additions & 0 deletions genesis_programs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)> {
Expand All @@ -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!(),
]
}
Expand All @@ -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)));
Expand Down
2 changes: 1 addition & 1 deletion programs/vest_api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
Expand Down
19 changes: 19 additions & 0 deletions programs/vest_program/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[package]
name = "solana-vest-program"
version = "0.20.0"
description = "Solana Vest program"
authors = ["Solana Maintainers <[email protected]>"]
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"
9 changes: 9 additions & 0 deletions programs/vest_program/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit a210d88

Please sign in to comment.