Merge pull request #995 from 0xMiden/pr/migrate-to-v0.21.1

Migrate to VM v0.22 and protocol v0.14

Author: bitwalker

Cargo.lock

@@ -17,7 +17,6 @@ members = [
     "midenc-log",
     "midenc-session",
     "sdk/field-repr/*",
-    "sdk/field",
     "sdk/alloc",
     "sdk/base",
     "sdk/base-macros",
@@ -26,7 +25,6 @@ members = [
     "sdk/stdlib-sys",
     "tools/*",
     "tests/integration",
-    "test-harness/*",
     "tests/integration-network",
 ]
 exclude = [
@@ -78,18 +76,19 @@ litcheck-filecheck = "0.4"
 log = { version = "0.4", features = ["kv"] }
 
 # Miden Dependencies
-miden-assembly = { version = "0.20", default-features = false }
-miden-core = { version = "0.20", default-features = false }
-miden-debug = { version = "0.4" }
-miden-debug-types = { version = "0.20", default-features = false }
-miden-assembly-syntax = { version = "0.20", default-features = false }
+miden-assembly = { version = "0.22", default-features = false }
+miden-core = { version = "0.22", default-features = false }
+miden-debug = { version = "0.6" }
+miden-debug-types = { version = "0.22", default-features = false }
+miden-assembly-syntax = { version = "0.22", default-features = false }
 miden-formatting = { version = "0.1", default-features = false }
-miden-protocol = { version = "0.13", default-features = false }
-miden-standards = { version = "0.13", default-features = false }
-miden-processor = { version = "0.20", default-features = false }
-miden-core-lib = { version = "0.20", default-features = false }
-miden-mast-package = { version = "0.20", default-features = false }
-miette = { package = "miden-miette", version = "7.1.1" }
+miden-protocol = { version = "0.14.0", default-features = false }
+miden-standards = { version = "0.14.0", default-features = false }
+
+miden-processor = { version = "0.22", default-features = false }
+miden-core-lib = { version = "0.22", default-features = false }
+miden-mast-package = { version = "0.22", default-features = false }
+miette = { package = "miden-miette", version = "8.0" }
 paste = "1.0"
 parking_lot = "0.12"
 parking_lot_core = "0.9"
@@ -156,8 +155,7 @@ midenc-session = { version = "0.7.1", path = "midenc-session" }
 cargo-miden = { version = "0.7.1", path = "tools/cargo-miden" }
 miden-integration-tests = { path = "tests/integration" }
 midenc-expect-test = { path = "tools/expect-test" }
-miden-test-harness = { path = "test-harness/test-harness-lib" }
-miden-test-harness-macros = { path = "test-harness/test-harness-macros" }
+miden-field = { version = "0.22" }
 
 [patch.crates-io]
 #miden-assembly = { git = "https://github.com/0xMiden/miden-vm", rev = "614cd7f9b52f45238b0ab59c71ebb49325051e5d" }
@@ -172,6 +170,10 @@ miden-test-harness-macros = { path = "test-harness/test-harness-macros" }
 #miden-processor = { path = "../miden-vm/processor" }
 #miden-mast-package = { git = "https://github.com/0xMiden/miden-vm", rev = "614cd7f9b52f45238b0ab59c71ebb49325051e5d" }
 #miden-mast-package = { path = "../miden-vm/package" }
+# miden-protocol = { git = "https://github.com/0xMiden/protocol", rev = "a53bbe2209f506df87876c8b9c9a1730214f456b" }
+# miden-standards = { git = "https://github.com/0xMiden/protocol", rev = "a53bbe2209f506df87876c8b9c9a1730214f456b" }
+# miden-tx        = { tag = "v0.14.0-beta.4", git = "https://github.com/0xMiden/miden-base" }
+
 
 
 [profile.dev]
@@ -195,41 +197,17 @@ opt-level = 3
 # Speed up the test profile (proving times)
 # ============================================================
 # The test package itself needs optimization
-[profile.test.package.midenc-integration-network-tests]
-opt-level = 3
-
 # Core Miden packages
 [profile.test.package.miden-processor]
 opt-level = 3
 
-[profile.test.package.miden-prover]
-opt-level = 3
-
-[profile.test.package.winter-prover]
-opt-level = 3
-
-[profile.test.package.miden-client]
-opt-level = 3
-
 [profile.test.package.miden-protocol]
 opt-level = 3
 
-[profile.test.package.miden-tx]
-opt-level = 3
-
 # Additional crypto and math-heavy dependencies
 [profile.test.package.miden-crypto]
 opt-level = 3
 
-[profile.test.package.winter-crypto]
-opt-level = 3
-
-[profile.test.package.winter-air]
-opt-level = 3
-
-[profile.test.package.winter-math]
-opt-level = 3
-
 [profile.test.package.miden-standards]
 opt-level = 3
 
@@ -270,18 +248,6 @@ opt-level = 3
 [profile.dev.package.miden-processor]
 opt-level = 3
 
-[profile.dev.package.miden-prover]
-opt-level = 3
-
-[profile.dev.package.winter-prover]
-opt-level = 3
-
-[profile.dev.package.miden-client]
-opt-level = 3
-
 [profile.dev.package.miden-protocol]
 opt-level = 3
-
-[profile.dev.package.miden-tx]
-opt-level = 3
 # ============================================================

Cargo.toml

@@ -24,13 +24,13 @@ pub proc adv_push_mapvaln
     # Stack: [num_elements, ...]
 end
 
-#! Emits an event to request a Falcon signature loaded to the advice stack
+#! Emits an event to request a Falcon signature loaded to the advice stack.
 #! MSG and PK are expected to be on the operand stack.
-#! Emits the canonical `miden::auth::request` event introduced in node/client 0.12.
+#! Emits the canonical `miden::protocol::auth::request` event used by protocol v0.14.
 #!
 #! Inputs:  [msg3, msg2, msg1, msg0, pk3, pk2, pk1, pk0, ...]
 #! Outputs: [...]
-const AUTH_REQUEST_EVENT=event("miden::auth::request")
+const AUTH_REQUEST_EVENT=event("miden::protocol::auth::request")
 pub proc emit_falcon_sig_to_stack
     emit.AUTH_REQUEST_EVENT
     dropw dropw

codegen/masm/intrinsics/advice.masm

@@ -174,7 +174,7 @@ pub proc overflowing_mul # [b, a]
         movup.2 cdrop                     # [-a or a, is_b_signed, b, negate_result]
         swap.2 dup.0 exec.unchecked_neg   # [-b, b, is_b_signed, -a or a, negate_result]
         movup.2 cdrop                     # [-b or b, -a or a, negate_result]
-        u32overflowing_mul                # [overflowed, result, negate_result]
+        u32widening_mul swap.1         # [overflowed, result, negate_result]
 
         # if the unsigned op overflowed, we definitely overflowed, but overflow
         # also occurred if the supposedly unsigned result has its sign bit set,