Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes in demo-rollup to filter out transaction registrations #712

Merged
merged 2 commits into from
Aug 23, 2023
Merged

Minor fixes in demo-rollup to filter out transaction registrations #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ada064c
Minor fixes in demo-rollup to filter out transaction registrations
citizen-stig Aug 22, 2023
2d6064b
Merge branch 'nightly' into chores/demo_rollup_filter
citizen-stig Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 31 additions & 3 deletions examples/demo-prover/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/demo-rollup/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ futures = "0.3"

# Crates which only this package depends on
tokio = { workspace = true }
tracing-subscriber = "0.3.17"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }

celestia = { path = "../../adapters/celestia", features = ["native"] }
demo-stf = { path = "../demo-stf", features = ["native"] }
Expand All @@ -35,7 +35,7 @@ sov-ethereum = { path = "../../full-node/sov-ethereum", optional = true }
sov-sequencer = { path = "../../full-node/sov-sequencer" }
sov-stf-runner = { path = "../../full-node/sov-stf-runner" }
risc0-adapter = { path = "../../adapters/risc0", features = ["native"] }
sov-modules-stf-template = { path = "../../module-system/sov-modules-stf-template" }
sov-modules-stf-template = { path = "../../module-system/sov-modules-stf-template", features = ["native"] }

sov-bank = { path = "../../module-system/module-implementations/sov-bank", features = ["native"] }
sov-election = { path = "../../module-system/module-implementations/examples/sov-election", features = ["native"] }
Expand Down
15 changes: 7 additions & 8 deletions examples/demo-rollup/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
use std::env;
use std::str::FromStr;

use sov_demo_rollup::new_rollup_with_celestia_da;
use tracing::Level;
use tracing_subscriber::prelude::*;
use tracing_subscriber::{fmt, EnvFilter};

#[cfg(test)]
mod test_rpc;
Expand All @@ -13,13 +15,10 @@ mod test_rpc;
#[tokio::main]
async fn main() -> Result<(), anyhow::Error> {
// Initializing logging
let subscriber = tracing_subscriber::fmt()
.with_max_level(Level::INFO)
.finish();

tracing::subscriber::set_global_default(subscriber)
.map_err(|_err| eprintln!("Unable to set global default subscriber"))
.expect("Cannot fail to set subscriber");
tracing_subscriber::registry()
.with(fmt::layer())
.with(EnvFilter::from_str("info,sov_sequencer=warn").unwrap())
.init();

let rollup_config_path = env::args()
.nth(1)
Expand Down