gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nit, cleanup uses (#7747)

Browse Source 
automerge
This commit is contained in:
Jack May
2020-01-09 23:58:13 -08:00
committed by Grimes
parent 6da8f49d8b
commit 2d08dddfc8
8 changed files with 769 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
programs/librapay/src/lib.rs
View File

@@ -1,6 +1,4 @@
solana_sdk::declare_id!(
"LibraPay11111111111111111111111111111111111"
);
solana_sdk::declare_id!("LibraPay11111111111111111111111111111111111");
pub mod librapay_instruction;
pub mod librapay_transaction;
@@ -9,13 +7,15 @@ extern crate solana_move_loader_program;
use solana_move_loader_program::account_state::LibraAccountState;
use solana_runtime::loader_utils::load_program;
use solana_sdk::account::KeyedAccount;
use solana_sdk::client::Client;
use solana_sdk::instruction::InstructionError;
use solana_sdk::message::Message;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction;
use solana_sdk::{
account::KeyedAccount,
client::Client,
instruction::InstructionError,
message::Message,
pubkey::Pubkey,
signature::{Keypair, KeypairUtil},
system_instruction,
};
use types::account_config;

14
programs/librapay/src/librapay_instruction.rs
View File

@@ -1,11 +1,11 @@
use bincode;
use solana_move_loader_program::account_state::pubkey_to_address;
use solana_move_loader_program::processor::InvokeCommand;
use solana_sdk::instruction::{AccountMeta, Instruction};
use solana_sdk::loader_instruction::LoaderInstruction;
use solana_sdk::pubkey::Pubkey;
use types::account_config;
use types::transaction::TransactionArgument;
use solana_move_loader_program::{account_state::pubkey_to_address, processor::InvokeCommand};
use solana_sdk::{
instruction::{AccountMeta, Instruction},
loader_instruction::LoaderInstruction,
pubkey::Pubkey,
};
use types::{account_config, transaction::TransactionArgument};
pub fn genesis(genesis_pubkey: &Pubkey, microlibras: u64) -> Instruction {
let data = bincode::serialize(&InvokeCommand::CreateGenesis(microlibras)).unwrap();

26
programs/librapay/src/librapay_transaction.rs
View File

@@ -1,17 +1,19 @@
use crate::librapay_instruction;
use log::*;
use solana_move_loader_program::account_state::{pubkey_to_address, LibraAccountState};
use solana_move_loader_program::data_store::DataStore;
use solana_sdk::client::Client;
use solana_sdk::commitment_config::CommitmentConfig;
use solana_sdk::hash::Hash;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction;
use solana_sdk::transaction::Transaction;
use std::boxed::Box;
use std::error;
use std::fmt;
use solana_move_loader_program::{
account_state::{pubkey_to_address, LibraAccountState},
data_store::DataStore,
};
use solana_sdk::{
client::Client,
commitment_config::CommitmentConfig,
hash::Hash,
pubkey::Pubkey,
signature::{Keypair, KeypairUtil},
system_instruction,
transaction::Transaction,
};
use std::{boxed::Box, error, fmt};
pub fn create_genesis(keypair: &Keypair, microlibras: u64, recent_blockhash: Hash) -> Transaction {
let ix = librapay_instruction::genesis(&keypair.pubkey(), microlibras);