Adds loader-v4 to write lock demotion exemptions.

anza-xyz · Nov 5, 2024 · 0a493c3 · 0a493c3
1 parent 6db93da
commit 0a493c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/sdk/program/src/message/legacy.rs b/sdk/program/src/message/legacy.rs
@@ -20,6 +20,7 @@ use {
         bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
         hash::Hash,
         instruction::{CompiledInstruction, Instruction},
+        loader_v4,
         message::{compiled_keys::CompiledKeys, MessageHeader},
         pubkey::Pubkey,
         system_instruction, system_program, sysvar,
@@ -691,7 +692,7 @@ impl Message {
     pub fn is_upgradeable_loader_present(&self) -> bool {
         self.account_keys
             .iter()
-            .any(|&key| key == bpf_loader_upgradeable::id())
+            .any(|key| bpf_loader_upgradeable::check_id(key) || loader_v4::check_id(key))
     }
 }
 

diff --git a/sdk/program/src/message/versions/v0/loaded.rs b/sdk/program/src/message/versions/v0/loaded.rs
@@ -1,6 +1,6 @@
 use {
     crate::{
-        bpf_loader_upgradeable,
+        bpf_loader_upgradeable, loader_v4,
         message::{v0, AccountKeys},
         pubkey::Pubkey,
     },
@@ -179,7 +179,7 @@ impl<'a> LoadedMessage<'a> {
     pub fn is_upgradeable_loader_present(&self) -> bool {
         self.account_keys()
             .iter()
-            .any(|&key| key == bpf_loader_upgradeable::id())
+            .any(|key| bpf_loader_upgradeable::check_id(key) || loader_v4::check_id(key))
     }
 }