Skip to content

Commit e7c77ca

Browse files
committed
fix txn harness stake account loading
1 parent f719ea6 commit e7c77ca

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

conformance/src/txn_execute.zig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,9 +667,10 @@ fn executeTxnContext(
667667
// .accounts_db = &accounts_db,
668668
// });
669669

670-
// Remove address lookup table and config program accounts by inserting empty accounts (zero-lamports)
670+
// Remove address lookup table, stake, and config program accounts by inserting empty accounts (zero-lamports)
671671
try accounts_db.putAccount(slot, program.address_lookup_table.ID, .EMPTY);
672672
try accounts_db.putAccount(slot, program.config.ID, .EMPTY);
673+
try accounts_db.putAccount(slot, program.stake.ID, .EMPTY);
673674

674675
// Load accounts into accounts db
675676
for (accounts_map.keys(), accounts_map.values()) |pubkey, account| {

src/runtime/program_loader.zig

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ pub fn loadPrograms(
4141
errdefer programs.deinit(allocator);
4242

4343
for (accounts.keys(), accounts.values()) |pubkey, account| {
44-
const executable = account.executable or
45-
account.owner.equals(&bpf_loader.v1.ID) or
46-
account.owner.equals(&bpf_loader.v2.ID) or
47-
account.owner.equals(&bpf_loader.v3.ID) or
48-
account.owner.equals(&bpf_loader.v4.ID);
49-
if (!executable) continue;
44+
// https://github.com/firedancer-io/solfuzz-agave/blob/agave-v3.0.3/src/lib.rs#L771-L800
45+
if (!account.owner.equals(&bpf_loader.v1.ID) and
46+
!account.owner.equals(&bpf_loader.v2.ID) and
47+
!account.owner.equals(&bpf_loader.v3.ID) and
48+
!account.owner.equals(&bpf_loader.v4.ID)) continue;
5049

5150
var loaded_program = try loadProgram(
5251
allocator,

0 commit comments

Comments
 (0)