Skip to content
Draft
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
44 changes: 39 additions & 5 deletions Cargo.lock

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

8 changes: 7 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ members = [
"crates/db",
"crates/grpc-error-macro",
"crates/large-smt-backend-rocksdb",
"crates/tracing",
"crates/tracing-macro",
"crates/ntx-builder",
"crates/proto",
"crates/remote-prover-client",
Expand All @@ -17,7 +19,7 @@ members = [
"crates/test-macro",
"crates/utils",
"crates/validator",
"proto",
"proto"
]

resolver = "2"
Expand Down Expand Up @@ -51,6 +53,7 @@ miden-node-block-producer = { path = "crates/block-producer", version = "=
miden-node-db = { path = "crates/db", version = "=0.14.0-alpha.1" }
miden-node-grpc-error-macro = { path = "crates/grpc-error-macro", version = "=0.14.0-alpha.1" }
miden-node-ntx-builder = { path = "crates/ntx-builder", version = "=0.14.0-alpha.1" }
miden-node-tracing = { path = "crates/tracing", version = "=0.14.0-alpha.1" }
miden-node-proto = { path = "crates/proto", version = "=0.14.0-alpha.1" }
miden-node-proto-build = { path = "proto", version = "=0.14.0-alpha.1" }
miden-node-rpc = { path = "crates/rpc", version = "=0.14.0-alpha.1" }
Expand All @@ -62,6 +65,8 @@ miden-remote-prover-client = { path = "crates/remote-prover-client", versio
# Temporary workaround until <https://github.com/rust-rocksdb/rust-rocksdb/pull/1029>
# is part of `rocksdb-rust` release
miden-node-rocksdb-cxx-linkage-fix = { path = "crates/rocksdb-cxx-linkage-fix", version = "=0.14.0-alpha.1" }
miden-node-tracing-macro = { path = "crates/tracing-macro", version = "=0.14.0-alpha.1" }
trybuild = { version = "1.0", features = ["diff"] }

# miden-base aka protocol dependencies. These should be updated in sync.
miden-block-prover = { version = "=0.14.0-alpha.1" }
Expand All @@ -71,6 +76,7 @@ miden-testing = { version = "=0.14.0-alpha.1" }
miden-tx = { default-features = false, version = "=0.14.0-alpha.1" }
miden-tx-batch-prover = { version = "=0.14.0-alpha.1" }


# Other miden dependencies. These should align with those expected by miden-base.
miden-air = { features = ["std", "testing"], version = "0.20" }

Expand Down
1 change: 1 addition & 0 deletions crates/block-producer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ futures = { workspace = true }
itertools = { workspace = true }
miden-node-proto = { workspace = true }
miden-node-proto-build = { features = ["internal"], workspace = true }
miden-node-tracing = { workspace = true }
miden-node-utils = { features = ["testing"], workspace = true }
miden-protocol = { default-features = true, workspace = true }
miden-remote-prover-client = { features = ["batch-prover", "block-prover"], workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion crates/block-producer/src/batch_builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use std::time::Duration;
use futures::never::Never;
use futures::{FutureExt, TryFutureExt};
use miden_node_proto::domain::batch::BatchInputs;
use miden_node_tracing::instrument;
use miden_node_utils::tracing::OpenTelemetrySpanExt;
use miden_protocol::MIN_PROOF_SECURITY_LEVEL;
use miden_protocol::batch::{BatchId, ProposedBatch, ProvenBatch};
Expand All @@ -14,7 +15,7 @@ use miden_tx_batch_prover::LocalBatchProver;
use rand::Rng;
use tokio::task::JoinSet;
use tokio::time;
use tracing::{Instrument, Span, instrument};
use tracing::{Instrument, Span};
use url::Url;

use crate::domain::batch::SelectedBatch;
Expand Down
3 changes: 2 additions & 1 deletion crates/block-producer/src/validator/mod.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
use miden_node_proto::clients::{Builder, ValidatorClient};
use miden_node_proto::generated as proto;
use miden_node_tracing::instrument;
use miden_protocol::block::ProposedBlock;
use miden_protocol::crypto::dsa::ecdsa_k256_keccak::Signature;
use miden_protocol::utils::{Deserializable, DeserializationError, Serializable};
use thiserror::Error;
use tracing::{info, instrument};
use tracing::info;
use url::Url;

use crate::COMPONENT;
Expand Down
1 change: 1 addition & 0 deletions crates/ntx-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ futures = { workspace = true }
libsqlite3-sys = { workspace = true }
miden-node-db = { workspace = true }
miden-node-proto = { workspace = true }
miden-node-tracing = { workspace = true }
miden-node-utils = { workspace = true }
miden-protocol = { default-features = true, workspace = true }
miden-remote-prover-client = { features = ["tx-prover"], workspace = true }
Expand Down
1 change: 1 addition & 0 deletions crates/ntx-builder/src/block_producer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use miden_protocol::transaction::ProvenTransaction;
use miden_tx::utils::Serializable;
use tokio_stream::StreamExt;
use tonic::Status;
// Use standard tracing for Status errors (which don't impl std::error::Error)
use tracing::{info, instrument};
use url::Url;

Expand Down
1 change: 1 addition & 0 deletions crates/store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ miden-large-smt-backend-rocksdb = { optional = true, workspace = true }
miden-node-db = { workspace = true }
miden-node-proto = { workspace = true }
miden-node-proto-build = { features = ["internal"], workspace = true }
miden-node-tracing = { workspace = true }
miden-node-utils = { workspace = true }
miden-remote-prover-client = { features = ["block-prover"], workspace = true }
miden-standards = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/store/src/db/migrations.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use diesel::SqliteConnection;
use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
use tracing::instrument;
use miden_node_tracing::instrument;

use crate::COMPONENT;
use crate::db::schema_hash::verify_schema;
Expand Down
25 changes: 25 additions & 0 deletions crates/tracing-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[package]
categories = ["development-tools::procedural-macro-helpers"]
description = "Procedural macro for tracing instrumentation with full error report context"
keywords = ["miden", "node", "tracing"]
name = "miden-node-tracing-macro"

edition.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[lints]
workspace = true

[lib]
proc-macro = true

[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
syn = { features = ["extra-traits", "full", "parsing"], version = "2.0" }
fuzzy-search = "0.1.0"

Loading
Loading