Plumb libra accounts to genesis (#5333)

* Plumb move_loader to genesis

* Remove core dependency on genesis-programs
This commit is contained in:
sakridge
2019-07-31 16:10:55 -07:00
committed by GitHub
parent 9278201198
commit c2fc0f2418
8 changed files with 82 additions and 65 deletions

View File

@@ -52,7 +52,6 @@ solana-chacha-sys = { path = "../chacha-sys", version = "0.18.0-pre0" }
solana-client = { path = "../client", version = "0.18.0-pre0" }
solana-drone = { path = "../drone", version = "0.18.0-pre0" }
solana-ed25519-dalek = "0.2.0"
solana-genesis-programs = { path = "../genesis_programs", version = "0.18.0-pre0" }
solana-kvstore = { path = "../kvstore", version = "0.18.0-pre0", optional = true }
solana-logger = { path = "../logger", version = "0.18.0-pre0" }
solana-merkle-tree = { path = "../merkle-tree", version = "0.18.0-pre0" }
@@ -66,7 +65,6 @@ solana-storage-api = { path = "../programs/storage_api", version = "0.18.0-pre0"
solana-storage-program = { path = "../programs/storage_program", version = "0.18.0-pre0" }
solana-vote-api = { path = "../programs/vote_api", version = "0.18.0-pre0" }
solana-vote-signer = { path = "../vote-signer", version = "0.18.0-pre0" }
solana-librapay-api = { path = "../programs/librapay_api", version = "0.18.0-pre0" }
sys-info = "0.5.7"
tokio = "0.1"
tokio-codec = "0.1"

View File

@@ -76,6 +76,7 @@ pub mod window_service;
#[macro_use]
extern crate solana_budget_program;
#[macro_use]
extern crate solana_storage_program;
#[cfg(test)]

View File

@@ -156,10 +156,9 @@ impl LocalCluster {
genesis_block
.native_instruction_processors
.extend_from_slice(&config.native_instruction_processors);
genesis_block
.native_instruction_processors
.extend_from_slice(&solana_genesis_programs::get());
.push(solana_storage_program!());
let storage_keypair = Keypair::new();
genesis_block.accounts.push((