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

Use bs58 strings to declare IDs rather then raw bytes (#7082)

Browse Source
This commit is contained in:
Jack May
2019-11-21 16:34:40 -08:00
committed by GitHub
parent d9e7a5fcbe
commit d8ead57fbb
37 changed files with 81 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
programs/storage/src/lib.rs
View File

@ -5,13 +5,7 @@ pub mod storage_processor;
use crate::storage_processor::process_instruction;
const STORAGE_PROGRAM_ID: [u8; 32] = [
6, 162, 25, 123, 127, 68, 233, 59, 131, 151, 21, 152, 162, 120, 90, 37, 154, 88, 86, 5, 156,
221, 182, 201, 142, 103, 151, 112, 0, 0, 0, 0,
];
solana_sdk::declare_program!(
STORAGE_PROGRAM_ID,
"Storage111111111111111111111111111111111111",
solana_storage_program,
process_instruction

9
programs/storage/src/rewards_pools.rs
View File

@ -10,12 +10,7 @@ use solana_sdk::hash::{hash, Hash};
use solana_sdk::pubkey::Pubkey;
// base rewards pool ID
const ID: [u8; 32] = [
6, 162, 25, 123, 127, 71, 141, 232, 129, 171, 58, 183, 79, 88, 181, 17, 163, 11, 51, 111, 22,
123, 67, 115, 5, 131, 109, 161, 16, 0, 0, 0,
];
solana_sdk::solana_name_id!(ID, "StorageMiningPoo111111111111111111111111111");
solana_sdk::declare_id!("StorageMiningPoo111111111111111111111111111");
// to cut down on collisions for redemptions, we make multiple accounts
pub const NUM_REWARDS_POOLS: usize = 32;
@ -31,7 +26,7 @@ pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig) -> u64 {
}
pub fn random_id() -> Pubkey {
let mut id = Hash::new(&ID);
let mut id = Hash::new(id().as_ref());
for _i in 0..thread_rng().gen_range(0, NUM_REWARDS_POOLS) {
id = hash(id.as_ref());