Skip to content

Commit

Permalink
Merge branch 'next' into andrew-remove-send-asset
Browse files Browse the repository at this point in the history
  • Loading branch information
Fumuran authored Sep 19, 2024
2 parents c30a31f + 15a3774 commit f1e0231
Show file tree
Hide file tree
Showing 62 changed files with 763 additions and 445 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ jobs:
rustup update --no-self-update
rustup target add wasm32-unknown-unknown
make build-no-std
make build-no-std-testing
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

## 0.6.0 (TBD)

- Implemented serialization for `TransactionWitness`, `ChainMmr`, `TransactionInputs` and `TransactionArgs` (#888).
- [BREAKING] Renamed the `TransactionProver` struct to `LocalTransactionProver` and added the `TransactionProver` trait (#865).
- Implemented `Display`, `TryFrom<&str>` and `FromStr` for `AccountStorageMode` (#861).
- Implemented offset based storage access (#843).
- [BREAKING] `AccountStorageType` enum was renamed to `AccountStorageMode` along with its variants (#854).
- [BREAKING] `AccountStub` structure was renamed to `AccountHeader` (#855).
- [BREAKING] Kernel procedures now have to be invoked using `dynexec` instruction (#803).
- Refactored `AccountStorage` from `Smt` to `sequential hash` (#846)
- Refactored `AccountStorage` from `Smt` to `sequential hash` (#846).
- [BREAKING] Refactored batch/block note trees (#834).
- Set all procedures storage offsets of faucet accounts to `1` (#875).
- Added `AccountStorageHeader` (#876).
- [BREAKING] `send_asset` procedure was removed from the basic wallet (#829).

## 0.5.1 (2024-08-28) - `miden-objects` crate only
Expand Down Expand Up @@ -42,6 +46,7 @@
- Added serialization and equality comparison for `TransactionScript` (#824).
- [BREAKING] Migrated to Miden VM v0.10 (#826).
- Added conversions for `NoteExecutionHint` (#827).
- [BREAKING] Removed `serde`-based serialization from `miden-object` structs (#838).

## 0.4.0 (2024-07-03)

Expand Down
85 changes: 41 additions & 44 deletions Cargo.lock

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

9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ help:

WARNINGS=RUSTDOCFLAGS="-D warnings"
DEBUG_ASSERTIONS=RUSTFLAGS="-C debug-assertions"
ALL_FEATURES_BUT_ASYNC=--features concurrent,testing,serde
ALL_FEATURES_BUT_ASYNC=--features concurrent,testing

# -- linting --------------------------------------------------------------------------------------

Expand Down Expand Up @@ -52,6 +52,7 @@ doc-serve: ## Serves documentation site
test-build: ## Build the test binary
$(DEBUG_ASSERTIONS) cargo nextest run --cargo-profile test-release --features concurrent,testing --no-run


.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)"
Expand Down Expand Up @@ -82,6 +83,12 @@ build: ## By default we should build in release mode
build-no-std: ## Build without the standard library
cargo build --no-default-features --target wasm32-unknown-unknown --workspace --exclude miden-bench-tx


.PHONY: build-no-std-testing
build-no-std-testing: ## Build without the standard library. Includes the `testing` feature
cargo build --no-default-features --target wasm32-unknown-unknown --workspace --exclude miden-bench-tx --features testing


.PHONY: build-async
build-async: ## Build with the `async` feature enabled (only libraries)
cargo build --lib --release --features async
Expand Down
2 changes: 1 addition & 1 deletion bench-tx/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ pub fn get_account_with_default_account_code(
let account_code_src = DEFAULT_ACCOUNT_CODE;
let assembler = TransactionKernel::assembler();

let account_code = AccountCode::compile(account_code_src, assembler).unwrap();
let account_code = AccountCode::compile(account_code_src, assembler, false).unwrap();
let account_storage = AccountStorage::new(vec![StorageSlot::Value(public_key)]).unwrap();

let account_vault = match assets {
Expand Down
Loading

0 comments on commit f1e0231

Please sign in to comment.