Fix - loader-v4 #3586
Fix - loader-v4 #3586
Conversation
|
The Firedancer team maintains a line-for-line reimplementation of the |
|
Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis. |
Lichtso
force-pushed
the
fix/loader_v4
branch
from
ab9264a to
211cdeb
Compare
| @@ -103,94 +103,96 @@ pub fn load_program_from_bytes( | |||
| Ok(loaded_program) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
This used to be a function direct_deploy_program() invoking an inner macro deploy_program!().
And now is a macro deploy_program!() invoking an inner function deploy_program_internal().
Swapping the roles of the macro and wrapper function allows us to get rid of some lifetime shenanigans and explicit drop(). It is a pure syntactic refactoring and should have no effect on the behavior.
Lichtso
force-pushed
the
fix/loader_v4
branch
from
211cdeb to
12ebf61
Compare
allows us to get rid of some lifetime shenanigans and explicit drop(). It is a pure syntactic refactoring and should have no effect on the behavior.
…as is in loader-v3.
Lichtso
force-pushed
the
fix/loader_v4
branch
from
12ebf61 to
130dfae
Compare
* Swapping the roles of the macro and wrapper function allows us to get rid of some lifetime shenanigans and explicit drop(). It is a pure syntactic refactoring and should have no effect on the behavior. * Loader-v4 needs to use the same verification logic during deployment as is in loader-v3. * Removes program account check in loader-v4 execution. * Fix program runtime environment of loader-v4. (cherry picked from commit 8bf688f)
Problem
While writing the integration tests for loader-v4 I noticed several issues.
The rekeying of the associated feature gate will happen separately in #2796.
Summary of Changes
Fix program runtime environment of loader-v4. It was still using the v2 environment in
load_program_with_pubkey().Removes program account check in loader-v4 execution. Because there should be no need to look at the program account at all during execution as we have the cached program entry.
Loader-v4 needs to use the same verification logic during deployment as in loader-v3. This prevents programs with certain syscalls from being deployed.