Adjust feature gate for deployment (#6)

Author: LucasSte

program-runtime/src/vm.rs

@@ -229,7 +229,8 @@ pub fn execute<'a, 'b: 'a>(
     let direct_account_pointers_in_program_input = invoke_context
         .get_feature_set()
         .direct_account_pointers_in_program_input;
-    let is_abi_v2 = executable.get_sbpf_version() == SBPFVersion::V4;
+    let is_abi_v2 = executable.get_sbpf_version() == SBPFVersion::V4
+        && invoke_context.get_feature_set().program_runtime_abiv2;
 
     let mut abiv1_parameters = if is_abi_v2 {
         initialize_abi_v2_areas(invoke_context, executable)?;

syscalls/src/lib.rs

@@ -338,8 +338,11 @@ pub fn create_program_runtime_environment(
         } else {
             SBPFVersion::V3
         };
-    let max_sbpf_version = if feature_set.enable_sbpf_v3_deployment_and_execution {
+
+    let max_sbpf_version = if feature_set.program_runtime_abiv2 {
         SBPFVersion::V4
+    } else if feature_set.enable_sbpf_v3_deployment_and_execution {
+        SBPFVersion::V3
     } else if feature_set.enable_sbpf_v2_deployment_and_execution {
         SBPFVersion::V2
     } else if feature_set.enable_sbpf_v1_deployment_and_execution {