Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "wacc"
version = "2.0.0"
edition = "2021"
rust-version = "1.85"
rust-version = "1.95"
authors = ["Dave Grantham <dwg@linuxprogrammer.org>"]
description = "Web Assembly Cryptographic Constructs VM implementation"
repository = "https://github.com/cryptidtech/wacc.git"
Expand All @@ -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",
Expand All @@ -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]]
Expand Down Expand Up @@ -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 }
multiple_crate_versions = { level = "allow", priority = 1 }
2 changes: 1 addition & 1 deletion src/types/keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down
2 changes: 1 addition & 1 deletion src/vm/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<u8>) -> Val {
Expand Down
4 changes: 2 additions & 2 deletions tests/branch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ fn load_wasm(file_name: &str) -> Option<Vec<u8>> {
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()
}

fn load_wast(file_name: &str) -> Vec<u8> {
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}"))
}

Expand Down
2 changes: 1 addition & 1 deletion tests/forklock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fn load_wast(file_name: &str) -> Vec<u8> {
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"))
}

Expand Down
4 changes: 2 additions & 2 deletions tests/lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ fn load_wasm(file_name: &str) -> Option<Vec<u8>> {
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()
}

fn load_wast(file_name: &str) -> Vec<u8> {
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))
}

Expand Down
4 changes: 2 additions & 2 deletions tests/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ fn load_wasm(file_name: &str) -> Option<Vec<u8>> {
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()
}

fn load_wast(file_name: &str) -> Vec<u8> {
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"))
}

Expand Down
4 changes: 2 additions & 2 deletions tests/preimage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ fn load_wasm(file_name: &str) -> Option<Vec<u8>> {
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()
}

fn load_wast(file_name: &str) -> Vec<u8> {
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"))
}

Expand Down
4 changes: 2 additions & 2 deletions tests/pubkeysig.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ fn load_wasm(file_name: &str) -> Option<Vec<u8>> {
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()
}

fn load_wast(file_name: &str) -> Vec<u8> {
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"))
}

Expand Down
4 changes: 2 additions & 2 deletions tests/unlock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ fn load_wasm(file_name: &str) -> Option<Vec<u8>> {
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()
}

fn load_wast(file_name: &str) -> Vec<u8> {
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))
}

Expand Down
Loading