v1.16: [zk-token-proof] Enable proof program to be invoked as an inne…

…r call (backport of #33045) (#33071) [zk-token-proof] Enable proof program to be invoked as an inner call (#33045) enable close context state account instruction to be invoked as an inner call (cherry picked from commit 01dbe49) Co-authored-by: samkim-crypto <[email protected]>
solana-labs · Aug 30, 2023 · 33474a7 · 33474a7
1 parent fb1693b
commit 33474a7
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/programs/zk-token-proof/src/lib.rs b/programs/zk-token-proof/src/lib.rs
@@ -115,11 +115,6 @@ fn process_close_proof_context(invoke_context: &mut InvokeContext) -> Result<(),
 }
 
 declare_process_instruction!(process_instruction, 0, |invoke_context| {
-    if invoke_context.get_stack_height() != TRANSACTION_LEVEL_STACK_HEIGHT {
-        // Not supported as an inner instruction
-        return Err(InstructionError::UnsupportedProgramId);
-    }
-
     // Consume compute units if feature `native_programs_consume_cu` is activated
     let native_programs_consume_cu = invoke_context
         .feature_set
@@ -130,6 +125,13 @@ declare_process_instruction!(process_instruction, 0, |invoke_context| {
     let instruction = ProofInstruction::instruction_type(instruction_data)
         .ok_or(InstructionError::InvalidInstructionData)?;
 
+    if invoke_context.get_stack_height() != TRANSACTION_LEVEL_STACK_HEIGHT
+        && instruction != ProofInstruction::CloseContextState
+    {
+        // Proof verification instructions are not supported as an inner instruction
+        return Err(InstructionError::UnsupportedProgramId);
+    }
+
     match instruction {
         ProofInstruction::CloseContextState => {
             if native_programs_consume_cu {