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

Update libra to new fork (#6523) (#6601)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2019-10-29 14:04:02 -07:00
committed by Grimes
parent 22d60d496b
commit c5a98a5b57
11 changed files with 838 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
programs/librapay_api/Cargo.toml
View File

@@ -14,8 +14,8 @@ log = "0.4.8"
solana-logger = { path = "../../logger", version = "0.20.1" }
solana-sdk = { path = "../../sdk", version = "0.20.1" }
solana-runtime = { path = "../../runtime", version = "0.20.1" }
types = { version = "0.0.0", package = "solana_libra_types" }
language_e2e_tests = { version = "0.0.0", package = "solana_libra_language_e2e_tests" }
types = { version = "0.0.1-sol4", package = "solana_libra_types" }
language_e2e_tests = { version = "0.0.1-sol4", package = "solana_libra_language_e2e_tests" }
solana-move-loader-api = { path = "../move_loader_api", version = "0.20.1" }
[lib]

4
programs/librapay_api/src/lib.rs
View File

@@ -23,7 +23,7 @@ use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction;
use types::account_address::AccountAddress;
use types::account_config;
pub fn create_genesis<T: Client>(from_key: &Keypair, client: &T, amount: u64) -> Keypair {
let libra_genesis_key = Keypair::new();
@@ -48,7 +48,7 @@ pub fn create_genesis<T: Client>(from_key: &Keypair, client: &T, amount: u64) ->
}
pub fn upload_move_program<T: Client>(from: &Keypair, client: &T, code: &str) -> Pubkey {
let address = AccountAddress::default();
let address = account_config::association_address();
let account_state = LibraAccountState::create_program(&address, code, vec![]);
let program_bytes = bincode::serialize(&account_state).unwrap();

4
programs/librapay_api/src/librapay_instruction.rs
View File

@@ -4,7 +4,7 @@ use solana_move_loader_api::processor::InvokeCommand;
use solana_sdk::instruction::{AccountMeta, Instruction};
use solana_sdk::loader_instruction::LoaderInstruction;
use solana_sdk::pubkey::Pubkey;
use types::account_address::AccountAddress;
use types::account_config;
use types::transaction::TransactionArgument;
pub fn genesis(genesis_pubkey: &Pubkey, microlibras: u64) -> Instruction {
@@ -28,7 +28,7 @@ pub fn mint(
];
let data = bincode::serialize(&InvokeCommand::RunProgram {
sender_address: AccountAddress::default(),
sender_address: account_config::association_address(),
function_name: "main".to_string(),
args,
})

5
programs/librapay_api/src/librapay_transaction.rs
View File

@@ -1,5 +1,4 @@
use crate::librapay_instruction;
use language_e2e_tests::account::AccountResource;
use log::*;
use solana_move_loader_api::account_state::{pubkey_to_address, LibraAccountState};
use solana_move_loader_api::data_store::DataStore;
@@ -75,7 +74,7 @@ pub fn create_accounts(
&from.pubkey(),
to,
lamports,
200,
400,
&solana_move_loader_api::id(),
)
})
@@ -128,7 +127,7 @@ pub fn get_libra_balance<T: Client>(
.read_account_resource(&pubkey_to_address(account_address))
.unwrap();
let res = AccountResource::read_balance(&resource);
let res = resource.balance();
Ok(res)
} else {
Ok(0)