fix: adjust rebase for blake2s + sha512 events

Author: huitseeker

core/src/runtime/record.rs

@@ -657,10 +657,13 @@ impl ExecutionRecord {
             secp256k1_double_events: take(&mut self.secp256k1_double_events),
             bn254_add_events: take(&mut self.bn254_add_events),
             bn254_double_events: take(&mut self.bn254_double_events),
+            blake2s_round_events: take(&mut self.blake2s_round_events),
             bls12381_g1_add_events: take(&mut self.bls12381_g1_add_events),
             bls12381_g1_double_events: take(&mut self.bls12381_g1_double_events),
             sha_extend_events: take(&mut self.sha_extend_events),
             sha_compress_events: take(&mut self.sha_compress_events),
+            sha512_extend_events: take(&mut self.sha512_extend_events),
+            sha512_compress_events: take(&mut self.sha512_compress_events),
             ed_add_events: take(&mut self.ed_add_events),
             ed_decompress_events: take(&mut self.ed_decompress_events),
             secp256k1_decompress_events: take(&mut self.secp256k1_decompress_events),
@@ -740,6 +743,13 @@ impl ExecutionRecord {
             opts.deferred_shift_threshold,
             last
         );
+        split_events!(
+            self,
+            blake2s_round_events,
+            shards,
+            opts.deferred_shift_threshold,
+            last
+        );
         split_events!(
             self,
             bls12381_g1_add_events,
@@ -768,6 +778,20 @@ impl ExecutionRecord {
             opts.sha_compress_split_threshold,
             last
         );
+        split_events!(
+            self,
+            sha512_extend_events,
+            shards,
+            opts.deferred_shift_threshold,
+            last
+        );
+        split_events!(
+            self,
+            sha512_compress_events,
+            shards,
+            opts.deferred_shift_threshold,
+            last
+        );
         split_events!(
             self,
             ed_add_events,

core/src/stark/air.rs

@@ -140,6 +140,10 @@ impl<F: PrimeField32> RiscvAir<F> {
         chips.push(RiscvAir::Sha256Extend(sha_extend));
         let sha_compress = ShaCompressChip;
         chips.push(RiscvAir::Sha256Compress(sha_compress));
+        let sha512_extend = Sha512ExtendChip;
+        chips.push(RiscvAir::Sha512Extend(sha512_extend));
+        let sha512_compress = Sha512CompressChip;
+        chips.push(RiscvAir::Sha512Compress(sha512_compress));
         let ed_add_assign = EdAddAssignChip::<EdwardsCurve<Ed25519Parameters>>::new();
         chips.push(RiscvAir::Ed25519Add(ed_add_assign));
         let ed_decompress = EdDecompressChip::<Ed25519Parameters>::default();
@@ -169,10 +173,6 @@ impl<F: PrimeField32> RiscvAir<F> {
         chips.push(RiscvAir::Bls12381G1Decompress(bls12381_g1_decompress));
         let blake_2s_round = Blake2sRoundChip::new();
         chips.push(RiscvAir::Blake2sRound(blake_2s_round));
-        let sha512_extend = Sha512ExtendChip;
-        chips.push(RiscvAir::Sha512Extend(sha512_extend));
-        let sha512_compress = Sha512CompressChip;
-        chips.push(RiscvAir::Sha512Compress(sha512_compress));
         let div_rem = DivRemChip;
         chips.push(RiscvAir::DivRem(div_rem));
 

core/src/syscall/precompiles/sha512/compress/mod.rs

@@ -131,7 +131,9 @@ impl Sha512CompressChip {
 pub mod compress_tests {
 
     use crate::{
-        runtime::{Instruction, Opcode, Program, SyscallCode}, stark::DefaultProver, utils::{run_test, setup_logger, tests::SHA512_COMPRESS_ELF, u64_to_le_u32s}
+        runtime::{Instruction, Opcode, Program, SyscallCode},
+        stark::DefaultProver,
+        utils::{run_test, setup_logger, tests::SHA512_COMPRESS_ELF, u64_to_le_u32s},
     };
 
     use super::SHA512_COMPRESS_K;

core/src/syscall/precompiles/sha512/extend/mod.rs

@@ -46,10 +46,13 @@ pub mod extend_tests {
 
     use super::Sha512ExtendChip;
     use crate::{
-        air::MachineAir, runtime::{ExecutionRecord, Instruction, Opcode, Program, SyscallCode}, stark::DefaultProver, utils::{
+        air::MachineAir,
+        runtime::{ExecutionRecord, Instruction, Opcode, Program, SyscallCode},
+        stark::DefaultProver,
+        utils::{
             self, run_test,
             tests::{SHA512_ELF, SHA512_EXTEND_ELF},
-        }
+        },
     };
 
     pub fn sha512_extend_program() -> Program {