chore: migrate to miden-vm v0.11 (#929)

0xPolygonMiden · Oct 28, 2024 · b624d08 · b624d08
1 parent dd01de8
commit b624d08
Show file tree

Hide file tree

Showing 30 changed files with 320 additions and 312 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - Implement `Serializable` for `FungibleAsset` (#907).
 - [BREAKING] Changed type of `EMPTY_STORAGE_MAP_ROOT` constant to `RpoDigst`, which references constant from `miden-crypto` (#916).
 - Added `TransactionExecutor::load_account_code()` method to support foreign procedure invocation (#936).
+- [BREAKING] Migrated to v0.11 version of Miden VM (#929).
 
 ## 0.5.1 (2024-08-28) - `miden-objects` crate only
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ members = [
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.80"
+rust-version = "1.82"
 license = "MIT"
 authors = ["Miden contributors"]
 homepage = "https://polygon.technology/polygon-miden"
@@ -32,14 +32,30 @@ codegen-units = 1
 lto = true
 
 [workspace.dependencies]
-assembly = { package = "miden-assembly", version = "0.10", default-features = false }
-miden-crypto = { version = "0.10", default-features = false }
+#assembly = { package = "miden-assembly", version = "0.10", default-features = false }
+assembly = { package = "miden-assembly", git = "https://github.com/0xPolygonMiden/miden-vm.git", branch = "next", default-features = false }
+
+miden-crypto = { version = "0.11", default-features = false }
+#miden-crypto = { git = "https://github.com/0xPolygonMiden/miden-vm.git", branch = "next", default-features = false }
+
 miden-lib = { path = "miden-lib", version = "0.6", default-features = false }
 miden-objects = { path = "objects", version = "0.6", default-features = false }
-miden-prover = { version = "0.10", default-features = false }
-miden-stdlib = { version = "0.10", default-features = false }
+
+#miden-prover = { version = "0.10", default-features = false }
+miden-prover = { git = "https://github.com/0xPolygonMiden/miden-vm.git", branch = "next", default-features = false }
+
+#miden-stdlib = { version = "0.10", default-features = false }
+miden-stdlib = { git = "https://github.com/0xPolygonMiden/miden-vm.git", branch = "next", default-features = false }
+
 miden-tx = { path = "miden-tx", version = "0.6", default-features = false }
-miden-verifier = { version = "0.10", default-features = false }
+
+#miden-verifier = { version = "0.10", default-features = false }
+miden-verifier = { git = "https://github.com/0xPolygonMiden/miden-vm.git", branch = "next", default-features = false }
+
 rand = { version = "0.8", default-features = false }
-vm-core = { package = "miden-core", version = "0.10", default-features = false }
-vm-processor = { package = "miden-processor", version = "0.10", default-features = false }
+
+#vm-core = { package = "miden-core", version = "0.10", default-features = false }
+vm-core = { package = "miden-core", git = "https://github.com/0xPolygonMiden/miden-vm.git", branch = "next", default-features = false }
+
+#vm-processor = { package = "miden-processor", version = "0.10", default-features = false }
+vm-processor = { package = "miden-processor", git = "https://github.com/0xPolygonMiden/miden-vm.git", branch = "next", default-features = false }
diff --git a/miden-lib/asm/kernels/transaction/lib/account.masm b/miden-lib/asm/kernels/transaction/lib/account.masm
@@ -1,5 +1,5 @@
 use.std::collections::smt
-use.std::crypto::hashes::native
+use.std::crypto::hashes::rpo
 use.std::mem
 
 use.kernel::constants
@@ -190,7 +190,7 @@ export.get_current_hash
     mem_stream hperm mem_stream hperm
 
     # extract account hash
-    exec.native::state_to_digest
+    exec.rpo::squeeze_digest
 
     # drop memory pointer
     movup.4 drop
@@ -694,7 +694,7 @@ export.validate_seed
         # => [RATE, RATE, CAP]
 
         # extract digest
-        exec.native::state_to_digest
+        exec.rpo::squeeze_digest
         # => [DIG]
 
         # assert the account id matches the account id of the new account and extract pow
@@ -781,7 +781,7 @@ export.save_account_storage_data
     # AS => []
 
     # extract the digest
-    exec.native::state_to_digest
+    exec.rpo::squeeze_digest
     # OS => [DIGEST, end_ptr', STORAGE_COMMITMENT]
 
     # drop end_ptr
@@ -850,7 +850,7 @@ export.save_account_procedure_data
     # AS => []
 
     # extract the digest
-    exec.native::state_to_digest
+    exec.rpo::squeeze_digest
     # OS => [DIGEST, end_ptr', CODE_COMMITMENT]
 
     # drop end_ptr

diff --git a/miden-lib/asm/kernels/transaction/lib/epilogue.masm b/miden-lib/asm/kernels/transaction/lib/epilogue.masm
@@ -5,7 +5,7 @@ use.kernel::memory
 use.kernel::note
 use.kernel::tx
 
-use.std::crypto::hashes::native
+use.std::crypto::hashes::rpo
 
 # ERRORS
 # =================================================================================================
@@ -193,11 +193,11 @@ proc.update_account_storage_commitment
         # => [PAD, PAD, PAD, start_ptr, end_ptr]
 
         # hash elements from memory
-        exec.native::hash_memory_even
+        exec.rpo::absorb_double_words_from_memory
         # => [PERM, PERM, PERM, start_ptr, end_ptr]
 
         # extract the digest
-        exec.native::state_to_digest
+        exec.rpo::squeeze_digest
         # => [DIGEST, end_ptr, end_ptr]
 
         # clean stack

diff --git a/miden-lib/asm/kernels/transaction/lib/memory.masm b/miden-lib/asm/kernels/transaction/lib/memory.masm
@@ -1,5 +1,3 @@
-use.std::crypto::hashes::native
-
 use.kernel::account
 use.kernel::constants