feat: update miden-base with new 0.14 VM

Author: tomyrd

Cargo.lock

@@ -13,7 +13,7 @@ default-members = ["crates/rust-client", "bin/miden-cli"]
 
 [workspace.package]
 edition = "2024"
-rust-version = "1.86"
+rust-version = "1.87"
 license = "MIT"
 authors = ["miden contributors"]
 repository = "https://github.com/0xMiden/miden-client"

Cargo.toml

@@ -18,7 +18,7 @@ WARNINGS=RUSTDOCFLAGS="-D warnings"
 
 PROVER_DIR="miden-base"
 PROVER_REPO="https://github.com/0xMiden/miden-base.git"
-PROVER_BRANCH="3d8c3b28048fffbb63592a971d0fcae5dc58bce9"
+PROVER_BRANCH="next"
 PROVER_FEATURES_TESTING=--features "testing"
 PROVER_PORT=50051
 

Makefile

@@ -3,7 +3,7 @@
 [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/0xMiden/miden-client/blob/main/LICENSE)
 [![test](https://github.com/0xMiden/miden-client/actions/workflows/test.yml/badge.svg)](https://github.com/0xMiden/miden-client/actions/workflows/test.yml)
 [![build](https://github.com/0xMiden/miden-client/actions/workflows/build.yml/badge.svg)](https://github.com/0xMiden/miden-client/actions/workflows/build.yml)
-[![RUST_VERSION](https://img.shields.io/badge/rustc-1.86+-lightgray.svg)](https://www.rust-lang.org/tools/install)
+[![RUST_VERSION](https://img.shields.io/badge/rustc-1.87+-lightgray.svg)](https://www.rust-lang.org/tools/install)
 [![crates.io](https://img.shields.io/crates/v/miden-client)](https://crates.io/crates/miden-client)
 
 This repository contains the Miden client, which provides a way to execute and prove transactions, facilitating the interaction with the Miden rollup.

README.md

@@ -4,7 +4,7 @@ This binary allows the user to interact with the Miden rollup via a simple comma
 
 ## Usage
 
-Before you can use the Miden client, you'll need to make sure you have both [Rust](https://www.rust-lang.org/tools/install) and SQLite3 installed. Miden client requires rust version **1.86** or higher.
+Before you can use the Miden client, you'll need to make sure you have both [Rust](https://www.rust-lang.org/tools/install) and SQLite3 installed. Miden client requires rust version **1.87** or higher.
 
 ### Running `miden-client`'s CLI
 

bin/miden-cli/README.md

@@ -74,6 +74,7 @@ use core::fmt::{self};
 use miden_objects::{
     AssetError, Digest, Felt, Word,
     account::{Account, AccountCode, AccountDelta, AccountId},
+    assembly::DefaultSourceManager,
     asset::{Asset, NonFungibleAsset},
     block::BlockNumber,
     note::{Note, NoteDetails, NoteId, NoteTag},
@@ -550,7 +551,13 @@ impl Client {
         // Execute the transaction and get the witness
         let executed_transaction = self
             .tx_executor
-            .execute_transaction(account_id, block_num, notes, tx_args)
+            .execute_transaction(
+                account_id,
+                block_num,
+                notes,
+                tx_args,
+                Arc::new(DefaultSourceManager::default()), // TODO: Use the correct source manager
+            )
             .await?;
 
         // Check that the expected output notes matches the transaction outcome.
@@ -1024,6 +1031,7 @@ impl Client {
                 tx_script,
                 advice_inputs,
                 foreign_account_inputs,
+                Arc::new(DefaultSourceManager::default()), // TODO: Use the correct source manager
             )
             .await?)
     }

crates/rust-client/src/transaction/mod.rs

@@ -296,7 +296,7 @@ export const customTransaction = async (
                 mem_loadw
                 # => [NOTE_ARG_1]
 
-                push.${expectedNoteArg1} assert_eqw.err=101
+                push.${expectedNoteArg1} assert_eqw.err="First note argument didn't match expected"
                 # => []
 
                 # read second word
@@ -305,15 +305,15 @@ export const customTransaction = async (
                 mem_loadw
                 # => [NOTE_ARG_2]
 
-                push.${expectedNoteArg2} assert_eqw.err=102
+                push.${expectedNoteArg2} assert_eqw.err="Second note argument didn't match expected"
                 # => []
 
                 # store the note inputs to memory starting at address 0
                 push.0 exec.note::get_inputs
                 # => [num_inputs, inputs_ptr]
 
-                # make sure the number of inputs is 1
-                eq.2 assert.err=103
+                # make sure the number of inputs is 2
+                eq.2 assert.err="P2ID script expects exactly 2 note inputs"
                 # => [inputs_ptr]
 
                 # read the target account id from the note inputs
@@ -324,7 +324,7 @@ export const customTransaction = async (
                 # => [account_id_prefix, target_account_id_prefix, ...]
 
                 # ensure account_id = target_account_id, fails otherwise
-                assert_eq.err=104
+                assert_eq.err="P2ID's target account address and transaction address do not match"
                 # => [...]
 
                 exec.add_note_assets_to_account

crates/web-client/test/new_transactions.test.ts

@@ -1,6 +1,6 @@
 ## Software prerequisites
 
-- [Rust installation](https://www.rust-lang.org/tools/install) minimum version 1.86.
+- [Rust installation](https://www.rust-lang.org/tools/install) minimum version 1.87.
 
 ## Install the client
 

docs/src/install-and-run.md

@@ -83,7 +83,7 @@ begin
     mem_loadw
     # => [NOTE_ARG_1]
 
-    push.{expected_note_arg_1} assert_eqw.err=101
+    push.{expected_note_arg_1} assert_eqw.err="First note argument didn't match expected"
     # => []
 
     # read second word
@@ -92,15 +92,15 @@ begin
     mem_loadw
     # => [NOTE_ARG_2]
 
-    push.{expected_note_arg_2} assert_eqw.err=102
+    push.{expected_note_arg_2} assert_eqw.err="Second note argument didn't match expected"
     # => []
 
     # store the note inputs to memory starting at address 0
     push.0 exec.note::get_inputs
     # => [num_inputs, inputs_ptr]
 
-    # make sure the number of inputs is 1
-    eq.2 assert.err=103
+    # make sure the number of inputs is 2
+    eq.2 assert.err="P2ID script expects exactly 2 note inputs"
     # => [inputs_ptr]
 
     # read the target account id from the note inputs
@@ -111,7 +111,7 @@ begin
     # => [account_id_prefix, target_account_id_prefix, ...]
 
     # ensure account_id = target_account_id, fails otherwise
-    assert_eq.err=104
+    assert_eq.err="P2ID's target account address and transaction address do not match"
     # => [...]
 
     exec.add_note_assets_to_account

tests/integration/asm/custom_p2id.masm

@@ -200,7 +200,7 @@ async fn test_merkle_store() {
             push.4000 push.{pos} exec.mmr::get
 
             # check the element matches what was inserted at `pos`
-            push.{expected_element} assert_eqw.err=999
+            push.{expected_element} assert_eqw.err=\"element in merkle store didn't match expected\"
         "
         )
         .as_str();