diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9f3c392..da2d78e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,14 +37,14 @@ jobs: run: cargo doc --no-deps msrv: - name: Verify MSRV (1.85) + name: Verify MSRV (1.95) runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install Rust Toolchain (1.85) - uses: dtolnay/rust-toolchain@1.85.0 + - name: Install Rust Toolchain (1.95) + uses: dtolnay/rust-toolchain@1.95.0 - name: Check run: cargo check \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index e7288f9..5d9098c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "wacc" version = "2.0.0" edition = "2021" -rust-version = "1.85" +rust-version = "1.95" authors = ["Dave Grantham "] description = "Web Assembly Cryptographic Constructs VM implementation" repository = "https://github.com/cryptidtech/wacc.git" @@ -12,18 +12,18 @@ keywords = ["wasm", "cryptographic", "vm", "provenance", "scripting"] categories = ["cryptography", "wasm"] [dependencies] -blake3 = { version = "1.5.1", features = ["traits-preview"] } +blake3 = { version = "1.8.1", features = ["traits-preview"] } log = "0.4" -multi-cid = { version = "0.1", path = "../multi-cid" } -multi-codec = { package = "bs-multicodec", version = "0.7.0", path = "../bettersign/crates/multicodec" } -multi-hash = { package = "bs-multihash", version = "0.7.0", path = "../bettersign/crates/multihash" } -multi-key = { package = "bs-multikey", version = "0.7.0", path = "../bettersign/crates/multikey" } -multi-sig = { package = "bs-multisig", version = "0.7.0", path = "../bettersign/crates/multisig" } -multi-trait = { package = "bs-multitrait", version = "0.7.0", path = "../bettersign/crates/multitrait" } -multi-util = { package = "bs-multiutil", version = "0.7.0", path = "../bettersign/crates/multiutil" } +multi-cid = "0.2" +multi-codec = "1.2" +multi-hash = "1.1" +multi-key = "1.1" +multi-sig = "1.2" +multi-trait = "1.0" +multi-util = "1.1" thiserror = "2.0" tracing = "0.1" -wasmtime = { version = "41.0", default-features = false, features = [ +wasmtime = { version = "47.0", default-features = false, features = [ "cranelift", "parallel-compilation", "runtime", @@ -33,7 +33,7 @@ wasmtime = { version = "41.0", default-features = false, features = [ [dev-dependencies] hex = "0.4" -proptest = "1.4" +proptest = "1.11" test-log = { version = "0.2", features = ["trace", "color"] } [[test]] @@ -84,4 +84,4 @@ path = "tests/property_tests.rs" pedantic = { level = "warn", priority = -1 } nursery = { level = "warn", priority = -1 } cargo = { level = "warn", priority = -1 } -multiple_crate_versions = { level = "allow", priority = 1 } \ No newline at end of file +multiple_crate_versions = { level = "allow", priority = 1 } diff --git a/src/types/keys.rs b/src/types/keys.rs index c3390a6..c969e48 100644 --- a/src/types/keys.rs +++ b/src/types/keys.rs @@ -279,7 +279,7 @@ impl ContextPath { /// Checks if this is the root path #[inline] #[must_use] - pub fn is_root(&self) -> bool { + pub const fn is_root(&self) -> bool { self.0.is_empty() } diff --git a/src/vm/context.rs b/src/vm/context.rs index 4580d3a..bc9ec37 100644 --- a/src/vm/context.rs +++ b/src/vm/context.rs @@ -138,7 +138,7 @@ impl Context { /// Push raw bytes directly onto the parameter stack /// - /// Unlike [`push`], this does not look up a value from the KVP store. + /// Unlike [`Self::push`], this does not look up a value from the KVP store. /// It pushes the provided bytes directly as a `Value::Bin`. /// Used by the `_push_value` WASM import to push data from linear memory. pub fn push_value(&mut self, bytes: Vec) -> Val { diff --git a/tests/branch.rs b/tests/branch.rs index 5d0b667..9e468a0 100644 --- a/tests/branch.rs +++ b/tests/branch.rs @@ -21,7 +21,7 @@ fn load_wasm(file_name: &str) -> Option> { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("target"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).ok() } @@ -29,7 +29,7 @@ fn load_wast(file_name: &str) -> Vec { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("examples/wacc/wast"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).unwrap_or_else(|_| panic!("Error loading file {file_name}")) } diff --git a/tests/forklock.rs b/tests/forklock.rs index d21f052..8fa3890 100644 --- a/tests/forklock.rs +++ b/tests/forklock.rs @@ -21,7 +21,7 @@ fn load_wast(file_name: &str) -> Vec { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("examples/wacc/wast"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).unwrap_or_else(|_| panic!("WAST file {file_name} must exist")) } diff --git a/tests/lock.rs b/tests/lock.rs index c5badc0..09fc7ff 100644 --- a/tests/lock.rs +++ b/tests/lock.rs @@ -23,7 +23,7 @@ fn load_wasm(file_name: &str) -> Option> { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("target"); pb.push(file_name); - info!("trying to load: {:?}", pb.as_os_str()); + info!("trying to load: {}", pb.as_os_str().display()); read(&pb).ok() } @@ -31,7 +31,7 @@ fn load_wast(file_name: &str) -> Vec { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("examples/wacc/wast"); pb.push(file_name); - info!("trying to load: {:?}", pb.as_os_str()); + info!("trying to load: {}", pb.as_os_str().display()); read(&pb).unwrap_or_else(|_| panic!("WAST file {} must exist", file_name)) } diff --git a/tests/log.rs b/tests/log.rs index bdac644..707552c 100644 --- a/tests/log.rs +++ b/tests/log.rs @@ -21,7 +21,7 @@ fn load_wasm(file_name: &str) -> Option> { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("target"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).ok() } @@ -29,7 +29,7 @@ fn load_wast(file_name: &str) -> Vec { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("examples/wacc/wast"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).unwrap_or_else(|_| panic!("WAST file {file_name} must exist")) } diff --git a/tests/preimage.rs b/tests/preimage.rs index 183b5bf..49895a9 100644 --- a/tests/preimage.rs +++ b/tests/preimage.rs @@ -21,7 +21,7 @@ fn load_wasm(file_name: &str) -> Option> { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("target"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).ok() } @@ -29,7 +29,7 @@ fn load_wast(file_name: &str) -> Vec { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("examples/wacc/wast"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).unwrap_or_else(|_| panic!("WAST file {file_name} must exist")) } diff --git a/tests/pubkeysig.rs b/tests/pubkeysig.rs index 6ae9ca3..a040fb1 100644 --- a/tests/pubkeysig.rs +++ b/tests/pubkeysig.rs @@ -21,7 +21,7 @@ fn load_wasm(file_name: &str) -> Option> { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("target"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).ok() } @@ -29,7 +29,7 @@ fn load_wast(file_name: &str) -> Vec { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("examples/wacc/wast"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).unwrap_or_else(|_| panic!("WAST file {file_name} must exist")) } diff --git a/tests/unlock.rs b/tests/unlock.rs index 48a7879..a821287 100644 --- a/tests/unlock.rs +++ b/tests/unlock.rs @@ -21,7 +21,7 @@ fn load_wasm(file_name: &str) -> Option> { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("target"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).ok() } @@ -29,7 +29,7 @@ fn load_wast(file_name: &str) -> Vec { let mut pb = PathBuf::from(env!("CARGO_MANIFEST_DIR")); pb.push("examples/wacc/wast"); pb.push(file_name); - println!("trying to load: {:?}", pb.as_os_str()); + println!("trying to load: {}", pb.as_os_str().display()); read(&pb).unwrap_or_else(|_| panic!("WAST file {} must exist", file_name)) }