diff --git a/Cargo.lock b/Cargo.lock index 501a9ee2..d6e5e381 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2817,8 +2817,7 @@ dependencies = [ [[package]] name = "miden-air" version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2702f8adb96844e3521f49149f6c3d4773ecdd2a96a3169e3c025a2e3ee32b5e" +source = "git+https://github.com/0xPolygonMiden/miden-vm?rev=1b4609e60e6409a7f0d66bd13cfdc8320ab2727c#1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" dependencies = [ "miden-core", "miden-thiserror", @@ -2829,8 +2828,7 @@ dependencies = [ [[package]] name = "miden-assembly" version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae9cef4fbafb4fe26da18574bcdbd78815857cfe1099760782701ababb076c2" +source = "git+https://github.com/0xPolygonMiden/miden-vm?rev=1b4609e60e6409a7f0d66bd13cfdc8320ab2727c#1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" dependencies = [ "aho-corasick", "lalrpop", @@ -2855,8 +2853,7 @@ dependencies = [ [[package]] name = "miden-core" version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3f6db878d6b56c1566cd5b832908675566d3919b9a3523d630dfb5e2f7422d" +source = "git+https://github.com/0xPolygonMiden/miden-vm?rev=1b4609e60e6409a7f0d66bd13cfdc8320ab2727c#1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" dependencies = [ "lock_api", "loom", @@ -2983,8 +2980,7 @@ dependencies = [ [[package]] name = "miden-processor" version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e7b212b152b69373e89b069a18cb01742ef2c3f9c328e7b24c44e44f022e52" +source = "git+https://github.com/0xPolygonMiden/miden-vm?rev=1b4609e60e6409a7f0d66bd13cfdc8320ab2727c#1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" dependencies = [ "miden-air", "miden-core", @@ -3008,8 +3004,7 @@ version = "0.0.6" [[package]] name = "miden-stdlib" version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41623ad4f4ea6449760f70ab8928c682c3824d735d3e330f07e3d24d1ad20bfa" +source = "git+https://github.com/0xPolygonMiden/miden-vm?rev=1b4609e60e6409a7f0d66bd13cfdc8320ab2727c#1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" dependencies = [ "miden-assembly", ] diff --git a/Cargo.toml b/Cargo.toml index d1c63284..343e2725 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,15 +83,15 @@ thiserror = { package = "miden-thiserror", version = "1.0" } toml = { version = "0.8", features = ["preserve_order"] } derive_more = "0.99" indexmap = "2.2" -miden-assembly = { version = "0.10.3" } -miden-core = { version = "0.10.3" } -miden-parsing = "0.1" -miden-processor = { version = "0.10.3" } -miden-stdlib = { version = "0.10.3", features = ["with-debug-info"] } -#miden-assembly = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "828557c28ca1d159bfe42195e7ea73256ce4aa06" } -#miden-core = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "828557c28ca1d159bfe42195e7ea73256ce4aa06" } -#miden-processor = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "828557c28ca1d159bfe42195e7ea73256ce4aa06" } -#miden-stdlib = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "828557c28ca1d159bfe42195e7ea73256ce4aa06" } +# miden-assembly = { version = "0.10.3" } +# miden-core = { version = "0.10.3" } +# miden-parsing = "0.1" +# miden-processor = { version = "0.10.3" } +# miden-stdlib = { version = "0.10.3", features = ["with-debug-info"] } +miden-assembly = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" } +miden-core = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" } +miden-processor = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" } +miden-stdlib = { git = "https://github.com/0xPolygonMiden/miden-vm", rev = "1b4609e60e6409a7f0d66bd13cfdc8320ab2727c", features = ["with-debug-info"] } midenc-codegen-masm = { version = "0.0.6", path = "codegen/masm" } midenc-hir = { version = "0.0.6", path = "hir" } midenc-hir-analysis = { version = "0.0.6", path = "hir-analysis" } diff --git a/midenc-debug/src/exec/executor.rs b/midenc-debug/src/exec/executor.rs index b92a9fd2..57036f18 100644 --- a/midenc-debug/src/exec/executor.rs +++ b/midenc-debug/src/exec/executor.rs @@ -2,6 +2,7 @@ use std::{ cell::RefCell, collections::{BTreeMap, BTreeSet, VecDeque}, rc::Rc, + sync::Arc, }; use miden_assembly::Library as CompiledLibrary; @@ -29,7 +30,7 @@ use crate::{debug::CallStack, felt::PopFromStack, TestFelt}; pub struct Executor { stack: StackInputs, advice: AdviceInputs, - libraries: Vec, + libraries: Vec>, } impl Executor { /// Construct an executor with the given arguments on the operand stack diff --git a/midenc-debug/src/exec/host.rs b/midenc-debug/src/exec/host.rs index 576526e1..762a0734 100644 --- a/midenc-debug/src/exec/host.rs +++ b/midenc-debug/src/exec/host.rs @@ -50,7 +50,7 @@ impl DebuggerHost { } /// Load `forest` into the MAST store for this host - pub fn load_mast_forest(&mut self, forest: MastForest) { + pub fn load_mast_forest(&mut self, forest: Arc) { self.store.insert(forest); } } diff --git a/tests/rust-apps-wasm/rust-sdk/account-test/Cargo.lock b/tests/rust-apps-wasm/rust-sdk/account-test/Cargo.lock index b4a93b30..d15baff4 100644 --- a/tests/rust-apps-wasm/rust-sdk/account-test/Cargo.lock +++ b/tests/rust-apps-wasm/rust-sdk/account-test/Cargo.lock @@ -534,9 +534,8 @@ checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "miden-assembly" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3aefae8d99d66c3f8666e917cb3ef976edb39247099311f695e5ba57305616d" +version = "0.10.5" +source = "git+https://github.com/0xPolygonMiden/miden-vm?rev=1b4609e60e6409a7f0d66bd13cfdc8320ab2727c#1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" dependencies = [ "aho-corasick", "lalrpop", @@ -552,7 +551,7 @@ dependencies = [ [[package]] name = "miden-base-sys" -version = "0.0.4" +version = "0.0.6" dependencies = [ "miden-assembly", "miden-stdlib-sys", @@ -560,9 +559,8 @@ dependencies = [ [[package]] name = "miden-core" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e46df4105dc2ec15aa14182ce6de299720991bfb83a9b6aa9293c6ee2b12b18" +version = "0.10.5" +source = "git+https://github.com/0xPolygonMiden/miden-vm?rev=1b4609e60e6409a7f0d66bd13cfdc8320ab2727c#1b4609e60e6409a7f0d66bd13cfdc8320ab2727c" dependencies = [ "lock_api", "loom", @@ -650,7 +648,7 @@ dependencies = [ [[package]] name = "miden-sdk" -version = "0.0.4" +version = "0.0.6" dependencies = [ "miden-base-sys", "miden-sdk-alloc", @@ -667,11 +665,11 @@ dependencies = [ [[package]] name = "miden-sdk-alloc" -version = "0.0.4" +version = "0.0.6" [[package]] name = "miden-stdlib-sys" -version = "0.0.4" +version = "0.0.6" [[package]] name = "miden-thiserror"