Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,108 changes: 713 additions & 395 deletions Cargo.lock

Large diffs are not rendered by default.

79 changes: 71 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ include = [
]
license = "GPL-3.0"
edition = "2024"
rust-version = "1.92.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we able to keep using 1.92.0? Any reason we downgraded?

rust-version = "1.90.0"

[workspace]
members = [
Expand Down Expand Up @@ -89,18 +89,31 @@ path = "./test-framework"
version = "=3.4.0"

[workspace.dependencies.aleo-std]
version = "1.0.1"
version = "1.0.3"

[workspace.dependencies.aleo-std-storage]
version = "1.0.3"
default-features = false

[workspace.dependencies.anyhow]
version = "1.0"

[workspace.dependencies.axum]
version = "0.8.0"

[workspace.dependencies.axum-extra]
version = "0.10"
features = ["erased-json", "typed-header"]

[workspace.dependencies.base62]
version = "2.2.1"

[workspace.dependencies.colored]
version = "2.0"

[workspace.dependencies.http]
version = "1"

[workspace.dependencies.indexmap]
version = "2.6"
features = [ "serde" ]
Expand All @@ -111,6 +124,12 @@ version = "0.13.0"
[workspace.dependencies.paste]
version = "1.0"

[workspace.dependencies.is-terminal]
version = "0.4"

[workspace.dependencies.parking_lot]
version = "0.12"

[workspace.dependencies.rand]
version = "0.8"
default-features = false
Expand All @@ -120,11 +139,14 @@ version = "0.3.0"
default-features = false

[workspace.dependencies.rayon]
version = "1.11.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, are we able to keep using the newer version of rayon rather than downgrading?

version = "0.8"

[workspace.dependencies.regex]
version = "1.11.1"

[workspace.dependencies.reqwest]
version = "0.12.23"

[workspace.dependencies.self_update]
version = "0.41.0"
features = [ "archive-zip", "compression-zip-deflate" ]
Expand All @@ -144,15 +166,30 @@ version = "3.1.1"
version = "0.10.9"

[workspace.dependencies.snarkvm]
version = "4.4.0"
features = [ "test_consensus_heights" ]
git = "https://github.com/ProvableHQ/snarkVM.git"
rev = "7787e6e"
features = ["dev_skip_checks", "test_consensus_heights", "test_targets"]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to me that this will always disable checks in the devnode.

Can we enable dev_skip_checks only if the Leo build feature flag devnode_skip_checks is enabled, so developers can also use the devnode with checks enabled?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And maybe you can also write some comments giving context to future developers:
// We set test_consensus_heights to give developers freedom to set custom consensus version upgrade heights.
// We set test_targets because the devnode's genesis block was created with the same feature flag


[workspace.dependencies.tempfile]
version = "3.13"

[workspace.dependencies.tokio]
version = "1"
features = ["full"]

[workspace.dependencies.tower-http]
version = "0.6.0"

[workspace.dependencies.tower_governor]
version = "0.7"

[workspace.dependencies.tracing]
version = "0.1"

[workspace.dependencies.tracing-subscriber]
version = "0.3"
features = ["env-filter", "fmt"]

[workspace.dependencies.ureq]
version = "3.0.12"

Expand Down Expand Up @@ -206,6 +243,15 @@ workspace = true
[dependencies.aleo-std]
workspace = true

[dependencies.aleo-std-storage]
workspace = true

[dependencies.axum]
workspace = true

[dependencies.axum-extra]
workspace = true

[dependencies.backtrace]
version = "0.3.74"

Expand Down Expand Up @@ -240,6 +286,9 @@ version = "1.0.5"
[dependencies.indexmap]
workspace = true

[dependencies.is-terminal]
version = "0.4"

[dependencies.itertools]
workspace = true

Expand All @@ -264,6 +313,9 @@ workspace = true
[dependencies.regex]
workspace = true

[dependencies.reqwest]
workspace = true

[dependencies.rpassword]
version = "7.4.0"

Expand All @@ -284,20 +336,31 @@ workspace = true

[dependencies.snarkvm]
workspace = true
features = [ "circuit", "console" ]
features = ["circuit", "console"]

[dependencies.sys-info]
version = "0.9.1"

[dependencies.tempfile]
version = "3.20.0"

[dependencies.tokio]
workspace = true
features = ["full", "rt-multi-thread", "macros"]

[dependencies.tower-http]
workspace = true
features = ["cors", "trace"]

[dependencies.tower_governor]
workspace = true

[dependencies.tracing]
workspace = true

[dependencies.tracing-subscriber]
version = "0.3.18"
features = [ "fmt" ]
version = "0.3.0"
features = ["env-filter","fmt"]

[dependencies.ureq]
workspace = true
Expand Down
12 changes: 11 additions & 1 deletion leo/cli/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ enum Commands {
#[clap(flatten)]
command: LeoDevnet,
},
#[clap(about = "Run a local devnode")]
Devnode {
#[clap(flatten)]
command: LeoDevnode,
},
#[clap(about = "Query live data from the Aleo network")]
Query {
#[clap(flatten)]
Expand Down Expand Up @@ -141,6 +146,7 @@ impl Commands {
Commands::Execute { .. } => "execute",
Commands::Deploy { .. } => "deploy",
Commands::Devnet { .. } => "devnet",
Commands::Devnode { .. } => "devnode",
Commands::Query { .. } => "query",
Commands::Build { .. } => "build",
Commands::Debug { .. } => "debug",
Expand Down Expand Up @@ -194,7 +200,10 @@ pub fn run_with_args(cli: CLI) -> Result<()> {
// Initialize the `.env` file.
dotenvy::dotenv().ok();

if !quiet {
// Skip logger initialization for devnode -- it uses it's own logger.
let is_devnode = matches!(&cli.command, Commands::Devnode { .. });

if !quiet && !is_devnode {
// Init logger with optional debug flag.
logger::init_logger("leo", match cli.debug {
false => 1,
Expand Down Expand Up @@ -231,6 +240,7 @@ pub fn run_with_args(cli: CLI) -> Result<()> {
Commands::Clean { command } => command.try_execute(context)?,
Commands::Deploy { command } => command_output = Some(JsonOutput::Deploy(command.execute(context)?)),
Commands::Devnet { command } => command.try_execute(context)?,
Commands::Devnode { command } => command.try_execute(context)?,
Commands::Run { command } => command_output = Some(JsonOutput::Run(command.execute(context)?)),
Commands::Test { command } => command_output = Some(JsonOutput::Test(command.execute(context)?)),
Commands::Execute { command } => command_output = Some(JsonOutput::Execute(command.execute(context)?)),
Expand Down
Loading