Skip to content

Update to use TransactionHeader #781

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

Merged
PhilippGackstatter merged 9 commits into from
Apr 3, 2025
Merged

Update to use TransactionHeader #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e46e9d
feat: Update to use `TransactionHeader`
PhilippGackstatter Apr 1, 2025
a19245f
chore: Add changelog
PhilippGackstatter Apr 1, 2025
b6bda48
chore: make lint
PhilippGackstatter Apr 1, 2025
2c9aaa4
chore: Remove changelog entry
PhilippGackstatter Apr 2, 2025
c336ba9
chore: Update used miden-base version
PhilippGackstatter Apr 3, 2025
21cb236
Merge remote-tracking branch 'origin/next' into pgackst-tx-header
PhilippGackstatter Apr 3, 2025
9b25479
chore: Update to latest miden base
PhilippGackstatter Apr 3, 2025
fd5add4
Merge remote-tracking branch 'origin/next' into pgackst-tx-header
PhilippGackstatter Apr 3, 2025
2ab5f25
chore: Use next branch of miden-base
PhilippGackstatter Apr 3, 2025
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
83 changes: 39 additions & 44 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ assert_matches = { version = "1.5" }
http = { version = "1.3" }
itertools = { version = "0.14" }
miden-air = { version = "0.13" }
miden-lib = { version = "0.8" }
miden-lib = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-node-block-producer = { path = "crates/block-producer", version = "0.9" }
miden-node-proto = { path = "crates/proto", version = "0.9" }
miden-node-proto-build = { path = "proto", version = "0.9" }
miden-node-rpc = { path = "crates/rpc", version = "0.9" }
miden-node-store = { path = "crates/store", version = "0.9" }
miden-node-test-macro = { path = "crates/test-macro" }
miden-node-utils = { path = "crates/utils", version = "0.9" }
miden-objects = { version = "0.8" }
miden-objects = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-processor = { version = "0.13" }
miden-tx = { version = "0.8" }
miden-tx = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
prost = { version = "0.13" }
rand = { version = "0.9" }
thiserror = { version = "2.0", default-features = false }
Expand Down
30 changes: 16 additions & 14 deletions bin/stress-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,20 @@ version.workspace = true
workspace = true

[dependencies]
anyhow = { workspace = true }
clap = { version = "4.5", features = ["derive", "string"] }
miden-air = { workspace = true }
miden-block-prover = { version = "0.8", features = ["testing"] }
miden-lib = { workspace = true }
anyhow = { workspace = true }
clap = { version = "4.5", features = ["derive", "string"] }
miden-air = { workspace = true }
miden-block-prover = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", features = [
"testing",
] }
miden-lib = { workspace = true }
miden-node-block-producer = { workspace = true }
miden-node-proto = { workspace = true }
miden-node-store = { workspace = true }
miden-node-utils = { workspace = true }
miden-objects = { workspace = true, features = ["testing"] }
rand = { version = "0.9" }
rayon = { version = "1.5" }
tokio = { workspace = true, features = ["macros", "net", "rt-multi-thread", "sync", "time"] }
tonic = { workspace = true }
winterfell = { version = "0.12" }
miden-node-proto = { workspace = true }
miden-node-store = { workspace = true }
miden-node-utils = { workspace = true }
miden-objects = { workspace = true, features = ["testing"] }
rand = { version = "0.9" }
rayon = { version = "1.5" }
tokio = { workspace = true, features = ["macros", "net", "rt-multi-thread", "sync", "time"] }
tonic = { workspace = true }
winterfell = { version = "0.12" }
6 changes: 5 additions & 1 deletion bin/stress-test/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ use miden_objects::{
rand::RpoRandomCoin,
},
note::{Note, NoteHeader, NoteId, NoteInclusionProof},
transaction::{InputNote, InputNotes, OutputNote, ProvenTransaction, ProvenTransactionBuilder},
transaction::{
InputNote, InputNotes, OrderedTransactionHeaders, OutputNote, ProvenTransaction,
ProvenTransactionBuilder, TransactionHeader,
},
vm::ExecutionProof,
};
use rand::Rng;
Expand Down Expand Up @@ -353,6 +356,7 @@ fn create_batch(txs: &[ProvenTransaction], block_ref: &BlockHeader) -> ProvenBat
InputNotes::new(input_notes).unwrap(),
output_notes,
BlockNumber::from(u32::MAX),
OrderedTransactionHeaders::new_unchecked(txs.iter().map(TransactionHeader::from).collect()),
)
}

Expand Down
43 changes: 23 additions & 20 deletions crates/block-producer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,29 @@ workspace = true
tracing-forest = ["miden-node-utils/tracing-forest"]

[dependencies]
async-trait = { version = "0.1" }
futures = { version = "0.3" }
itertools = { workspace = true }
miden-block-prover = { version = "0.8" }
miden-lib = { workspace = true }
miden-node-proto = { workspace = true }
miden-node-utils = { workspace = true }
miden-objects = { workspace = true }
miden-processor = { workspace = true }
miden-proving-service-client = { version = "0.8", features = ["batch-prover", "block-prover"] }
miden-tx = { workspace = true }
miden-tx-batch-prover = { version = "0.8" }
rand = { version = "0.9" }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["macros", "net", "rt-multi-thread", "sync", "time"] }
tokio-stream = { workspace = true, features = ["net"] }
tonic = { workspace = true, features = ["transport"] }
tower-http = { workspace = true, features = ["util"] }
tracing = { workspace = true }
url = { workspace = true }
async-trait = { version = "0.1" }
futures = { version = "0.3" }
itertools = { workspace = true }
miden-block-prover = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-lib = { workspace = true }
miden-node-proto = { workspace = true }
miden-node-utils = { workspace = true }
miden-objects = { workspace = true }
miden-processor = { workspace = true }
miden-proving-service-client = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", features = [
"batch-prover",
"block-prover",
] }
miden-tx = { workspace = true }
miden-tx-batch-prover = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
rand = { version = "0.9" }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["macros", "net", "rt-multi-thread", "sync", "time"] }
tokio-stream = { workspace = true, features = ["net"] }
tonic = { workspace = true, features = ["transport"] }
tower-http = { workspace = true, features = ["util"] }
tracing = { workspace = true }
url = { workspace = true }

[dev-dependencies]
assert_matches = { workspace = true }
Expand Down
7 changes: 5 additions & 2 deletions crates/block-producer/src/block_builder/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,11 @@ impl TelemetryInjectorExt for ProposedBlock {
.expect("should have less than u32::MAX output notes"),
);

let num_batch_created_notes =
self.batches().iter().fold(0, |acc, batch| acc + batch.output_notes().len());
let num_batch_created_notes = self
.batches()
.as_slice()
.iter()
.fold(0, |acc, batch| acc + batch.output_notes().len());
span.set_attribute(
"block.batches.output_notes.count",
u32::try_from(num_batch_created_notes)
Expand Down
Loading