Merge branch 'next' into igamigo-acc-pkg

CHANGELOG.md

@@ -4,21 +4,23 @@
 
 ### Changes
 
-- Introduced `ComponentPackage` and `ComponentConfig` with TOML serialization (#1015).
-- Removed workers list from the proxy configuration file (#1018).
-- Added health check endpoints to the prover service (#1006).
-- Implemented serialization for `AccountHeader` (#996).
-- Updated Pingora crates to 0.4 and added polling time to the configuration file (#997).
-- Added support for `miden-tx-prover` proxy to update workers on a running proxy (#989).
-- Refactored `miden-tx-prover` proxy load balancing strategy (#976).
 - [BREAKING] Better error display when queues are full in the prover service (#967).
 - [BREAKING] Remove `AccountBuilder::build_testing` and make `Account::initialize_from_components` private (#969).
 - [BREAKING] Add error messages to errors and implement `core::error::Error` (#974).
+- Refactored `miden-tx-prover` proxy load balancing strategy (#976).
+- [BREAKING] Extend `AccountId` to two `Felt`s and require block hash in derivation (#982).
+- Added conversion from `Account` to `AccountDelta` for initial account state representation as delta (#983).
 - Implemented new `digest_from_hex!` macro (#984).
 - Added Format Guidebook to the `miden-lib` crate (#987).
-- Added conversion from `Account` to `AccountDelta` for initial account state representation as delta (#983).
+- Added support for `miden-tx-prover` proxy to update workers on a running proxy (#989).
 - [BREAKING] Added `miden::note::get_script_hash` procedure (#995).
+- Implemented serialization for `AccountHeader` (#996).
+- Updated Pingora crates to 0.4 and added polling time to the configuration file (#997).
 - [BREAKING] Refactor error messages in `miden-lib` and `miden-tx` and use `thiserror` 2.0 (#1005).
+- Added health check endpoints to the prover service (#1006).
+- Added tracing to the `miden-tx-prover` CLI (#1014).
+- Introduced `ComponentPackage` and `ComponentConfig` with TOML serialization (#1015).
+- Removed workers list from the proxy configuration file (#1018).
 
 ## 0.6.2 (2024-11-20)
 

Makefile

@@ -10,6 +10,9 @@ WARNINGS=RUSTDOCFLAGS="-D warnings"
 DEBUG_ASSERTIONS=RUSTFLAGS="-C debug-assertions"
 ALL_FEATURES_BUT_ASYNC=--features concurrent,testing
 BUILD_KERNEL_ERRORS=BUILD_KERNEL_ERRORS=1
+# Enable backtraces for tests where we return an anyhow::Result. If enabled, anyhow::Error will
+# then contain a `Backtrace` and print it when a test returns an error.
+BACKTRACE=RUST_BACKTRACE=1
 
 # -- linting --------------------------------------------------------------------------------------
 
@@ -56,12 +59,12 @@ test-build: ## Build the test binary
 
 .PHONY: test-default
 test-default: ## Run default tests excluding `prove`
-	$(DEBUG_ASSERTIONS) cargo nextest run --profile default --cargo-profile test-release --features concurrent,testing --filter-expr "not test(prove)"
+	$(DEBUG_ASSERTIONS) $(BACKTRACE) cargo nextest run --profile default --cargo-profile test-release --features concurrent,testing --filter-expr "not test(prove)"
 
 
 .PHONY: test-prove
 test-prove: ## Run `prove` tests (tests which use the Miden prover)
-	$(DEBUG_ASSERTIONS) cargo nextest run --profile prove --cargo-profile test-release --features concurrent,testing --filter-expr "test(prove)"
+	$(DEBUG_ASSERTIONS) $(BACKTRACE) cargo nextest run --profile prove --cargo-profile test-release --features concurrent,testing --filter-expr "test(prove)"
 
 
 .PHONY: test

bin/bench-tx/src/utils.rs

@@ -21,8 +21,9 @@ use super::{read_to_string, write, Benchmark, Path};
 // CONSTANTS
 // ================================================================================================
 
-pub const ACCOUNT_ID_FUNGIBLE_FAUCET_ON_CHAIN: u64 = 0x200000000000001f; // 2305843009213693983
-pub const ACCOUNT_ID_SENDER: u64 = 0x800000000000001f; // 9223372036854775839
+// Copied from miden_objects::testing::account_id.
+pub const ACCOUNT_ID_FUNGIBLE_FAUCET_ON_CHAIN: u128 = 0x00aa00000000bc200000bc000000de00;
+pub const ACCOUNT_ID_SENDER: u128 = 0x00fa00000000bb800000cc000000de00;
 
 pub const DEFAULT_AUTH_SCRIPT: &str = "
     begin