Add built-in programs to InvokeContext #10383
Conversation
| @@ -146,6 +146,8 @@ macro_rules! declare_loader( | |||
| ) | |||
| ); | |||
|
|
|||
| pub type ProcessInstruction = fn(&Pubkey, &[KeyedAccount], &[u8]) -> Result<(), InstructionError>; | |||
There was a problem hiding this comment.
This mimics the ProcessInstruction in sdk/src/entrypoint.rs so I felt pretty good about promoting this type from runtime/ to sdk/
There was a problem hiding this comment.
This file should not be part of our developer sdk anyway since it's native program specific
| @@ -767,9 +767,8 @@ fn call<'a>( | |||
| let program_account = (*accounts[callee_program_id_index]).clone(); | |||
| let executable_accounts = vec![(callee_program_id, program_account)]; | |||
| let mut message_processor = MessageProcessor::default(); | |||
| let builtin_programs = get_builtin_programs(); | |||
There was a problem hiding this comment.
The problem! As of #10375, get_builtin_programs() takes two arguments that are not available here (nor should they be IMO)
| @@ -479,6 +490,7 @@ impl MessageProcessor { | |||
| instruction.program_id(&message.account_keys), | |||
| rent_collector.rent, | |||
| pre_accounts, | |||
| self.programs.clone(), | |||
There was a problem hiding this comment.
I'm not proud of this clone, my main goal is to unblock 1.1 and 1.2 releases by landing #10375.
Removing this could be one of those "non-jit BPF optimizations" in the v1.3 time frame
There was a problem hiding this comment.
Yeah, we should be able to pass a reference here, I'll file an issue to track when this lands
mvines
force-pushed
the
ic
branch
2 times, most recently
from
9671474 to
0023edf
Compare
Codecov Report
@@ Coverage Diff @@
## master #10383 +/- ##
=========================================
- Coverage 81.4% 81.3% -0.2%
=========================================
Files 294 294
Lines 68250 68258 +8
=========================================
- Hits 55577 55501 -76
- Misses 12673 12757 +84 |
automerge (cherry picked from commit a4cd966)
Keep
BPFLoaderfrom reaching intoruntime/src/builtin_programsto populate the message processor it uses to invoke other programs. This breaks the model of the bank being the decider of what built-in programs are available for a given operating mode/epoch.