v1.17: [zk-token-proof] include VerifyBatchRangeProofU256 in the enable_zk_transfer_with_fee feature gate (backport of #34747) (#34765)

mergify[bot] · samkim-crypto · web-flow · commit 0aea75aaf57e · 2024-01-12T23:28:05.000+09:00
[zk-token-proof] include `VerifyBatchRangeProofU256` in the `enable_zk_transfer_with_fee` feature gate (#34747) include `VerifyBatchRangeProofU256` in the `enable_zk_transfer_with_fee` feature (cherry picked from commit bc13642) Co-authored-by: samkim-crypto <skim13@cs.stanford.edu>
diff --git a/programs/zk-token-proof/src/lib.rs b/programs/zk-token-proof/src/lib.rs
@@ -257,6 +257,11 @@ declare_process_instruction!(Entrypoint, 0, |invoke_context| {
             )
         }
         ProofInstruction::VerifyBatchedRangeProofU256 => {
+            // transfer with fee related proofs are not enabled
+            if !enable_zk_transfer_with_fee {
+                return Err(InstructionError::InvalidInstructionData);
+            }
+
             if native_programs_consume_cu {
                 invoke_context
                     .consume_checked(VERIFY_BATCHED_RANGE_PROOF_U256_COMPUTE_UNITS)

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,11 @@ declare_process_instruction!(Entrypoint, 0, \|invoke_context\| {`
`257`	`257`	`)`
`258`	`258`	`}`
`259`	`259`	`ProofInstruction::VerifyBatchedRangeProofU256 => {`
	`260`	`+ // transfer with fee related proofs are not enabled`
	`261`	`+ if !enable_zk_transfer_with_fee {`
	`262`	`+ return Err(InstructionError::InvalidInstructionData);`
	`263`	`+ }`
	`264`	`+`
`260`	`265`	`if native_programs_consume_cu {`
`261`	`266`	`invoke_context`
`262`	`267`	`.consume_checked(VERIFY_BATCHED_RANGE_PROOF_U256_COMPUTE_UNITS)`