resolve merge conflict

Signed-off-by: smtmfft <smtm@taiko.xyz>

host/src/cache.rs

@@ -130,11 +130,18 @@ mod test {
         (input, provider.clone())
     }
 
+    async fn get_a_testable_block_num(chain_spec: &ChainSpec) -> u64 {
+        let provider = RpcBlockDataProvider::new(&chain_spec.rpc, 0).unwrap();
+        let height = provider.provider.get_block_number().await.unwrap();
+        height - 299582 // a hardcode helka & mainnet height diff for the test
+    }
+
     #[tokio::test]
     async fn test_generate_input_from_cache() {
         let l1 = &Network::Holesky.to_string();
         let l2 = &Network::TaikoA7.to_string();
-        let block_number: u64 = 123456;
+        let taiko_chain_spec = SupportedChainSpecs::default().get_chain_spec(l2).unwrap();
+        let block_number: u64 = get_a_testable_block_num(&taiko_chain_spec).await;
         let (input, provider) = create_cache_input(l1, l2, block_number).await;
         let cache_path = Some("./".into());
         assert!(cache::set_input(&cache_path, block_number, l2, &input).is_ok());

provers/risc0/driver/src/methods/risc0_guest.rs

@@ -1,5 +1,5 @@
 pub const RISC0_GUEST_ELF: &[u8] =
     include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest");
 pub const RISC0_GUEST_ID: [u32; 8] = [
-    2008664807, 702630247, 4092627615, 3260109499, 2561937414, 4278577207, 738819978, 61928151,
+    778116790, 3147350329, 3518605327, 2941923414, 1667247192, 584142090, 3914021799, 3838916379,
 ];