Skip to content

Commit 1202add

Browse files
smtmfftYue-Zhou1
andauthored
fix(raiko): remove useless log & fix prove script (#665)
* fix(raiko): remove useless log & fix prove script * chore: stop building local risc0 elf * remove hard dependencies on risc0 --------- Co-authored-by: Yue <zhouyue360@gmail.com>
1 parent 137cd59 commit 1202add

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

lib/src/utils/shasta_rules.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use reth_evm_ethereum::taiko::ANCHOR_V4_GAS_LIMIT;
33
use reth_primitives::revm_primitives::SpecId;
44
use reth_primitives::{Block, Header};
55
use std::cmp::max as std_max;
6-
use tracing::warn;
6+
use tracing::{info, warn};
77

88
use crate::consts::ForkCondition;
99
use crate::input::{BlockProposedFork, GuestBatchInput, GuestInput};
@@ -283,9 +283,9 @@ pub fn validate_shasta_block_gas_limit(
283283
),
284284
upper_limit,
285285
);
286-
tracing::info!("validate_shasta_block_gas_limit, parent_gas_limit: {}, block_gas_limit: {}, upper_limit: {}, lower_limit: {}", parent_gas_limit, block_gas_limit, upper_limit, lower_limit);
287286

288287
if block_gas_limit < lower_limit || block_gas_limit > upper_limit {
288+
info!("validate_shasta_block_gas_limit, parent_gas_limit: {}, block_gas_limit: {}, upper_limit: {}, lower_limit: {}", parent_gas_limit, block_gas_limit, upper_limit, lower_limit);
289289
warn!("block gas limit is out of bounds, block_gas_limit: {}, lower_limit: {}, upper_limit: {}", block_gas_limit, lower_limit, upper_limit);
290290
return false;
291291
}

provers/risc0/builder/src/main.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ fn main() {
77
let pipeline = Risc0Pipeline::new("provers/risc0/guest", "release");
88
pipeline.bins(
99
&[
10-
"risc0-aggregation",
11-
"risc0-batch",
1210
"boundless-aggregation",
1311
"boundless-batch",
14-
"risc0-shasta-aggregation",
1512
"boundless-shasta-aggregation",
1613
],
1714
"provers/risc0/driver/src/methods",

provers/risc0/driver/src/lib.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
use crate::{
44
boundless::BoundlessProver,
5-
methods::risc0_aggregation::RISC0_AGGREGATION_ELF, methods::risc0_batch::RISC0_BATCH_ELF,
6-
methods::risc0_shasta_aggregation::RISC0_SHASTA_AGGREGATION_ELF,
5+
methods::{
6+
boundless_aggregation::BOUNDLESS_AGGREGATION_ELF as RISC0_AGGREGATION_ELF,
7+
boundless_batch::BOUNDLESS_BATCH_ELF as RISC0_BATCH_ELF,
8+
boundless_shasta_aggregation::BOUNDLESS_SHASTA_AGGREGATION_ELF as RISC0_SHASTA_AGGREGATION_ELF,
9+
},
710
};
811
use alloy_primitives::{hex::ToHexExt, B256};
912
use bonsai::{cancel_proof, maybe_prove};
@@ -395,7 +398,7 @@ fn build_shasta_block_inputs(
395398
#[cfg(test)]
396399
mod test {
397400
use super::*;
398-
use methods::risc0_batch::RISC0_BATCH_ID;
401+
use methods::boundless_batch::BOUNDLESS_BATCH_ID as RISC0_BATCH_ID;
399402
use methods::test_risc0_batch::{TEST_RISC0_BATCH_ELF, TEST_RISC0_BATCH_ID};
400403
use risc0_zkvm::{default_prover, ExecutorEnv};
401404

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
pub mod boundless_aggregation;
22
pub mod boundless_batch;
33
pub mod boundless_shasta_aggregation;
4-
pub mod risc0_aggregation;
5-
pub mod risc0_batch;
6-
pub mod risc0_shasta_aggregation;
74

85
// To build the following `$ cargo run --features test,bench --bin risc0-builder`
96
// or `$ $TARGET=risc0 make test`

script/prove-shasta.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ elif [ "$chain" == "holesky" ]; then
8080
l1_network="holesky"
8181
elif [ "$chain" == "taiko_mainnet" ]; then
8282
l1_network="ethereum"
83-
elif [ "$chain" == "taiko_a7" ]; then
84-
l1_network="holesky"
83+
elif [ "$chain" == "taiko_hoodi" ]; then
84+
l1_network="hoodi"
8585
elif [ "$chain" == "taiko_dev" ]; then
8686
l1_network="taiko_dev_l1"
8787
else

0 commit comments

Comments
 (0)