Increase transaction account lock limit from 64 to 128 (#27242)

* Increase transaction account lock limit from 64 to 256 * fix bpf test * Reduce lock limit from 256 to 128 (cherry picked from commit b970024) # Conflicts: # programs/bpf/tests/programs.rs # programs/bpf_loader/src/syscalls/cpi.rs # runtime/src/bank.rs # sdk/bpf/c/inc/sol/cpi.h # sdk/bpf/c/inc/sol/inc/cpi.inc # sdk/program/src/syscalls/mod.rs # sdk/src/feature_set.rs
solana-labs · Sep 15, 2022 · d9ee5b8 · d9ee5b8
1 parent 9a161c5
commit d9ee5b8
Show file tree

Hide file tree

Showing 8 changed files with 1,263 additions and 4 deletions.
diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
@@ -1072,6 +1072,17 @@ fn test_program_bpf_invoke_sanity() {
             TEST_INSTRUCTION_META_TOO_LARGE,
             TransactionError::InstructionError(0, InstructionError::ProgramFailedToComplete),
             &[],
+<<<<<<< HEAD
+=======
+            Some(vec![
+                format!("Program {invoke_program_id} invoke [1]"),
+                format!("Program log: invoke {program_lang} program"),
+                "Program log: Test max account infos exceeded".into(),
+                "skip".into(), // don't compare compute consumption logs
+                "Program failed to complete: Invoked an instruction with too many account info's (129 > 128)".into(),
+                format!("Program {invoke_program_id} failed: Program failed to complete"),
+            ]),
+>>>>>>> b9700244b (Increase transaction account lock limit from 64 to 128 (#27242))
         );
 
         do_invoke_failure_test_local(