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

Restore ability for programs to upgrade themselves (#20265)

Browse Source 
* Make helper associated fn

* Add feature definition

* Add handling to preserve program-id write lock when upgradeable loader is present; restore bpf upgrade-self test

* Use single feature
This commit is contained in:
Tyera Eulberg
2021-09-28 10:59:08 -05:00
committed by GitHub
parent 30bce9ddbc
commit 2cd9dc99b6
6 changed files with 126 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/program/src/message/legacy.rs
View File

@@ -354,6 +354,9 @@ impl Message {
}
pub fn is_writable(&self, i: usize, demote_program_write_locks: bool) -> bool {
let demote_program_id = demote_program_write_locks
&& self.is_key_called_as_program(i)
&& !self.is_upgradeable_loader_present();
(i < (self.header.num_required_signatures - self.header.num_readonly_signed_accounts)
as usize
|| (i >= self.header.num_required_signatures as usize
@@ -363,7 +366,7 @@ impl Message {
let key = self.account_keys[i];
sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key)
}
&& !(demote_program_write_locks && self.is_key_called_as_program(i))
&& !demote_program_id
}
pub fn is_signer(&self, i: usize) -> bool {
@@ -503,6 +506,13 @@ impl Message {
}
false
}
/// Returns true if any account is the bpf upgradeable loader
pub fn is_upgradeable_loader_present(&self) -> bool {
self.account_keys
.iter()
.any(|&key| key == bpf_loader_upgradeable::id())
}
}
#[cfg(test)]