Skip to content

Commit

Permalink
Fix Cargo lock error
Browse files Browse the repository at this point in the history
Summary:

Test Plan:
  • Loading branch information
duc-nx committed Dec 9, 2024
1 parent 0b787f2 commit 1e66373
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 6 deletions.
8 changes: 7 additions & 1 deletion assets/scripts/smoke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ cargo build --release --package cargo-nexus --bin cargo-nexus
./target/release/cargo-nexus nexus new "$PROJECT_NAME"
cp "$1" "$PROJECT_NAME/src/main.rs"
cd "$PROJECT_NAME"
cargo update

ls -lab .

cargo version -v
cat Cargo.lock

# Link the test program to the latest runtime code
sed -e "s#git = \"https://github.com/nexus-xyz/nexus-zkvm.git\"#path = \"$ORIGINAL_DIR/runtime\"#" Cargo.toml > Cargo.tmp && mv Cargo.tmp Cargo.toml
Expand All @@ -55,4 +61,4 @@ sed -e "s#git = \"https://github.com/nexus-xyz/nexus-zkvm.git\"#path = \"$ORIGIN
"$ORIGINAL_DIR/target/release/cargo-nexus" nexus prove
"$ORIGINAL_DIR/target/release/cargo-nexus" nexus verify

cleanup
# cleanup
6 changes: 6 additions & 0 deletions assets/scripts/test_sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ function check_project_directory() {
}

function build_cargo_nexus() {
cargo update
cargo build --release --package cargo-nexus --bin cargo-nexus
}

Expand All @@ -59,6 +60,11 @@ pushd src/guest
$CARGO_NEXUS nexus run
popd

ls -lab .

cargo version -v
cat Cargo.lock

cargo run --release
}

Expand Down
2 changes: 1 addition & 1 deletion cli/src/command/host.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,6 @@ const GUEST_TEMPLATE_SRC_MAIN: &str = include_str!(concat!(guest_examples_dir!()

// freeze toolchain that works with all provers
const GUEST_RUST_TOOLCHAIN: &str = r#"[toolchain]
channel = "1.77.0"
channel = "1.80.0"
targets = ["riscv32i-unknown-none-elf"]
"#;
5 changes: 3 additions & 2 deletions cli/src/command/new.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const TEMPLATE_SRC_MAIN: &str = include_str!(concat!(examples_dir!(), "/src/main

// freeze toolchain that works with all provers
const RUST_TOOLCHAIN: &str = r#"[toolchain]
channel = "1.77.0"
channel = "1.80.0"

Check warning on line 80 in cli/src/command/new.rs

View workflow job for this annotation

GitHub Actions / check-fmt

Diff in /home/runner/work/nexus-zkvm/nexus-zkvm/cli/src/command/new.rs

Check warning on line 80 in cli/src/command/new.rs

View workflow job for this annotation

GitHub Actions / check-fmt

Diff in /home/runner/work/nexus-zkvm/nexus-zkvm/cli/src/command/new.rs
targets = ["riscv32i-unknown-none-elf"]
"#;
"#;
2 changes: 1 addition & 1 deletion runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ categories = { workspace = true }

[dependencies]
nexus-rt-macros = { path = "macros", version = "0.1.0" }
postcard = { version = "1.0.10", features = ["alloc"], default_features = false }
postcard = { version = "1.0.10", features = ["alloc"], default-features = false }
serde = { version = "1.0", default-features = false }

[lib]
Expand Down
2 changes: 1 addition & 1 deletion sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ serde.workspace = true

nexus-core = { path = "../core", features = ["prover_nova", "prover_jolt", "prover_hypernova"] }
nexus-macro = { path = "../macro" }
postcard = { version = "1.0.10", features = ["alloc"], default_features = false }
postcard = { version = "1.0.10", features = ["alloc"], default-features = false }
uuid = { version = "1.9.1", features = ["v4", "fast-rng"] }
thiserror = "1.0.61"

Expand Down

0 comments on commit 1e66373

Please sign in to comment.