Merge remote-tracking branch 'origin/ratan/constrain-entrypoint' into…

… ratan/zellic-audit-changes
succinctlabs · Mar 3, 2024 · a6f31dd · a6f31dd
2 parents 2994586 + 1800e7c
commit a6f31dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/circuits/skip.rs b/circuits/skip.rs
@@ -42,7 +42,11 @@ impl<L: PlonkParameters<D>, const D: usize> TendermintSkipCircuit<L, D> for Circ
             input_stream,
             SkipOffchainInputs::<MAX_VALIDATOR_SET_SIZE> {},
         );
-        let skip_variable = output_stream.read::<VerifySkipVariable<MAX_VALIDATOR_SET_SIZE>>(self);
+        let mut skip_variable =
+            output_stream.read::<VerifySkipVariable<MAX_VALIDATOR_SET_SIZE>>(self);
+        skip_variable.trusted_block = trusted_block;
+        skip_variable.trusted_header = trusted_header_hash;
+        skip_variable.target_block = target_block;
 
         let target_header = skip_variable.target_header;
 

diff --git a/circuits/step.rs b/circuits/step.rs
@@ -36,7 +36,12 @@ impl<L: PlonkParameters<D>, const D: usize> TendermintStepCircuit<L, D> for Circ
             input_stream,
             StepOffchainInputs::<MAX_VALIDATOR_SET_SIZE> {},
         );
-        let step_variable = output_stream.read::<VerifyStepVariable<MAX_VALIDATOR_SET_SIZE>>(self);
+        let mut step_variable =
+            output_stream.read::<VerifyStepVariable<MAX_VALIDATOR_SET_SIZE>>(self);
+        step_variable.prev_header = prev_header_hash;
+        let one = self.one();
+        let next_block = self.add(prev_block_number, one);
+        step_variable.next_block = next_block;
 
         let next_header = step_variable.next_header;