Skip to content

Use AccountTree type wrapper #783

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
Mirko-von-Leipzig merged 13 commits into from
Apr 18, 2025
Merged

Use AccountTree type wrapper #783

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8ef31ad
feat: Use `AccountTree`
PhilippGackstatter Apr 3, 2025
27e3d43
chore: Adapt to miden-base updates
PhilippGackstatter Apr 4, 2025
24c7814
chore: Add changelog
PhilippGackstatter Apr 4, 2025
4d9bb72
chore: Do not panic in account witness deserialization
PhilippGackstatter Apr 4, 2025
4464e69
chore: Use new ordered batches/tx apis
PhilippGackstatter Apr 4, 2025
9af948d
feat: Use AccountTree in genesis, update account witness
PhilippGackstatter Apr 15, 2025
231a96c
chore: Bump miden-base commit
PhilippGackstatter Apr 15, 2025
ef273e4
fix: Clippy lint
PhilippGackstatter Apr 15, 2025
cf56adb
chore: Bump miden-base commit
PhilippGackstatter Apr 15, 2025
4fd6dbd
chore: Bump miden-base commit
PhilippGackstatter Apr 16, 2025
060969f
chore: Bump miden-base commit
PhilippGackstatter Apr 17, 2025
0b781bb
Merge remote-tracking branch 'origin/next' into pgackst-account-tree
PhilippGackstatter Apr 17, 2025
bdd89d7
Use next@base
Mirko-von-Leipzig Apr 18, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Database is now created during bootstrap process instead of on first startup.
- Data directory is no longer created but is instead expected to exist.
- The genesis block can no longer be configured which also removes the `store dump-genesis` command.
- [BREAKING] Use `AccountTree` and update account witness proto definitions (#783).

## v0.8.0 (2025-03-26)

Expand Down
63 changes: 31 additions & 32 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 = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-lib = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "pgackst-account-tree" }
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 = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-objects = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "pgackst-account-tree" }
miden-processor = { version = "0.13" }
miden-tx = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-tx = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "pgackst-account-tree" }
prost = { version = "0.13" }
rand = { version = "0.9" }
thiserror = { version = "2.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion bin/stress-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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 = [
miden-block-prover = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "pgackst-account-tree", features = [
"testing",
] }
miden-lib = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions crates/block-producer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ anyhow = { 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-block-prover = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "pgackst-account-tree" }
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 = [
miden-proving-service-client = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "pgackst-account-tree", features = [
"batch-prover",
"block-prover",
] }
miden-tx = { workspace = true }
miden-tx-batch-prover = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-tx-batch-prover = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "pgackst-account-tree" }
rand = { version = "0.9" }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["macros", "net", "rt-multi-thread", "sync", "time"] }
Expand Down
11 changes: 2 additions & 9 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 @@ -309,21 +309,14 @@ impl TelemetryInjectorExt for ProposedBlock {
u32::try_from(self.created_nullifiers().len())
.expect("should have less than u32::MAX created nullifiers"),
);
let num_block_created_notes = self
.output_note_batches()
.iter()
.fold(0, |acc, output_notes| acc + output_notes.len());
let num_block_created_notes = self.batches().num_created_notes();
span.set_attribute(
"block.output_notes.count",
u32::try_from(num_block_created_notes)
.expect("should have less than u32::MAX output notes"),
);

let num_batch_created_notes = self
.batches()
.as_slice()
.iter()
.fold(0, |acc, batch| acc + batch.output_notes().len());
let num_batch_created_notes = self.batches().num_created_notes();
Comment on lines +312 to +319
Copy link
Collaborator

@igamigo igamigo Apr 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Is this right? Seems like there is no difference between num_block_created_notes and num_batch_created_notes and so num_erased_notes will always be 0

Copy link
Collaborator

@Mirko-von-Leipzig Mirko-von-Leipzig Apr 18, 2025

Choose a reason for hiding this comment

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

Ah yeah nice catch. It looks like the block variant is incorrect now.

ProposedBlock::output_note_batches should be used there it seems, though the naming is a bit confusing :)

I'll create an issue.

Copy link
Contributor

@bobbinth bobbinth Apr 18, 2025

Choose a reason for hiding this comment

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

Nice catch!

span.set_attribute(
"block.batches.output_notes.count",
u32::try_from(num_batch_created_notes)
Expand Down
17 changes: 10 additions & 7 deletions crates/block-producer/src/test_utils/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use miden_objects::{
ACCOUNT_TREE_DEPTH, Digest,
Digest,
batch::ProvenBatch,
block::{
BlockAccountUpdate, BlockHeader, BlockNoteIndex, BlockNoteTree, OutputNoteBatch,
ProvenBlock,
AccountTree, BlockAccountUpdate, BlockHeader, BlockNoteIndex, BlockNoteTree,
OutputNoteBatch, ProvenBlock,
},
crypto::merkle::{Mmr, SimpleSmt},
crypto::merkle::Mmr,
note::Nullifier,
transaction::{OrderedTransactionHeaders, OutputNote},
};
Expand Down Expand Up @@ -34,7 +34,9 @@ pub async fn build_expected_block_header(
let new_account_root = {
let mut store_accounts = store.accounts.read().await.clone();
for (&account_id, update) in updated_accounts {
store_accounts.insert(account_id.into(), update.final_state_commitment().into());
store_accounts
.insert(account_id, update.final_state_commitment())
.expect("account IDs should be unique");
}

store_accounts.root()
Expand Down Expand Up @@ -71,7 +73,7 @@ pub async fn build_expected_block_header(

#[derive(Debug)]
pub struct MockBlockBuilder {
store_accounts: SimpleSmt<ACCOUNT_TREE_DEPTH>,
store_accounts: AccountTree,
store_chain_mmr: Mmr,
last_block_header: BlockHeader,

Expand Down Expand Up @@ -105,7 +107,8 @@ impl MockBlockBuilder {
pub fn account_updates(mut self, updated_accounts: Vec<BlockAccountUpdate>) -> Self {
for update in &updated_accounts {
self.store_accounts
.insert(update.account_id().into(), update.final_state_commitment().into());
.insert(update.account_id(), update.final_state_commitment())
.expect("account IDs should be unique");
}

self.updated_accounts = Some(updated_accounts);
Expand Down
Loading