Fix various ledger-tool error due to no builtins#12759
Fix various ledger-tool error due to no builtins#12759t-nelson merged 2 commits intosolana-labs:masterfrom
Conversation
| pub new_hard_forks: Option<Vec<Slot>>, | ||
| pub frozen_accounts: Vec<Pubkey>, | ||
| pub debug_keys: Option<Arc<HashSet<Pubkey>>>, | ||
| pub additional_builtins: Option<Builtins>, |
There was a problem hiding this comment.
Removed additional_builtins from the ProcessOptions. Because this isn't rather optional. Now, the solana-ledger crate is responsible for populating this.
|
FYI: @carllin This is the fix of the libsolana_bpf_loader.so issue. |
Codecov Report
@@ Coverage Diff @@
## master #12759 +/- ##
=========================================
- Coverage 81.9% 81.9% -0.1%
=========================================
Files 353 353
Lines 84340 84338 -2
=========================================
- Hits 69101 69093 -8
- Misses 15239 15245 +6 |
|
@t-nelson it progressed but stumbled on different error: |
|
D'oh! This one's on me, in the scripts |
|
This one is looking better! https://buildkite.com/solana-labs/rolling-upgrade-tests/builds/125#4312544a-2bef-44ff-9e44-e172bea7f914 |
|
Ok, this gets v1.3 off the ground. Great work, thanks! The upgrade to v1.4 is failing now:
|
yay!
This is true.
how halted? Also, v1.3 cluster is halted? Is there some logs? |
I think we probably drop |
It halted expectedly. We lost supermajority due to 40% of stake going off line because of the above issues Run logs https://buildkite.com/solana-labs/rolling-upgrade-tests/builds/125#4312544a-2bef-44ff-9e44-e172bea7f914. |
Ok, great! This is what I was hoping, just wasn't sure if the default behavior was "load if present" |
|
@ryoqun does merging this to master with v1.4 tag and merging my manual v1.3 bp sound good to you? |
Yeah, that sounds good. :) |
|
@t-nelson Please feel free to merge this & backport as you please if you want this quickly. I'm going go to bed. I've confirmed the remaining two of the three bugs in this pr's description are fixed on separate prs: #12690 (CI is green) and #12175 (this failed by unrelated reason, though; re-runnung). So, overall I'm pretty confident with this pr, now. :) |
|
@Mergifyio refresh |
|
Command
|
* Fix various ledger-tool error due to no builtins * Add missing file... (cherry picked from commit 1f4bcf7) # Conflicts: # core/Cargo.toml # ledger/Cargo.toml
* Fix various ledger-tool error due to no builtins (#12759) * Fix various ledger-tool error due to no builtins * Add missing file... (cherry picked from commit 1f4bcf7) # Conflicts: # core/Cargo.toml # ledger/Cargo.toml * Rebase Co-authored-by: Ryo Onodera <ryoqun@gmail.com> Co-authored-by: Michael Vines <mvines@gmail.com>
Problem
at least there is 3 bugs because of this:
(probably)ConfirmedOnly the
solana-validatorcode-path correctly populates builtins including bpf loader. That's becausenew_banks_from_ledgerpopulates them usingsolana_core::builtins. The same treatment is needed for variousledger-toolcommands.Summary of Changes
Move
builtinsfromcoretoledger(we can't goruntimebecause of circular dep.). And ensure bothsolana-validatorandsolana-ledger-toolpopulates builtins via the common codepath ofsolana-ledgercrate.Context
Introduced in #12490