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

Rename program_id to owner in system instructions (#10069)

Browse Source
This commit is contained in:
Michael Vines
2020-05-18 12:55:41 -07:00
committed by GitHub
parent bac4aec16f
commit bbc549f592
4 changed files with 94 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/src/pubkey.rs
View File

@@ -73,21 +73,18 @@ impl Pubkey {
pub fn create_with_seed(
base: &Pubkey,
seed: &str,
program_id: &Pubkey,
owner: &Pubkey,
) -> Result<Pubkey, PubkeyError> {
if seed.len() > MAX_SEED_LEN {
return Err(PubkeyError::MaxSeedLengthExceeded);
}
Ok(Pubkey::new(
hashv(&[base.as_ref(), seed.as_ref(), program_id.as_ref()]).as_ref(),
hashv(&[base.as_ref(), seed.as_ref(), owner.as_ref()]).as_ref(),
))
}
pub fn create_program_address(
seeds: &[&str],
program_id: &Pubkey,
) -> Result<Pubkey, PubkeyError> {
pub fn create_program_address(seeds: &[&str], owner: &Pubkey) -> Result<Pubkey, PubkeyError> {
let mut hasher = Hasher::default();
for seed in seeds.iter() {
if seed.len() > MAX_SEED_LEN {
@@ -95,7 +92,7 @@ impl Pubkey {
}
hasher.hash(seed.as_ref());
}
hasher.hashv(&[program_id.as_ref(), "ProgramDerivedAddress".as_ref()]);
hasher.hashv(&[owner.as_ref(), "ProgramDerivedAddress".as_ref()]);
Ok(Pubkey::new(hashv(&[hasher.result().as_ref()]).as_ref()))
}