Skip to content

Conversation

@Syndamia
Copy link
Contributor

@Syndamia Syndamia commented Feb 19, 2025

Currently, we're using ~2 month old zkVM packages. With the merge of nix-blockchain-development's chore: Update zkVM packages 12.02.25-18.02.25, we can now update them.

This update will include certain changes to zkvmLib and zkVM setups themselves (so it is not just Cargo.lock modifications), to accomodate new toolchain and setup requirements.

Before it becomes ready to review, at least the default fibonacci guest program will be tested.

@Syndamia Syndamia self-assigned this Feb 19, 2025
Certain zkVMs may use clap with versions lower than 4.5 (e.g. 4.5.9).
Here we do not really care about the version, so this change will fix
compatibility issues.
Allows you to add `overrideVendorCargoPackage` and
`overrideVendorGitCheckout` to args, which allow the overriding of
vendored dependencies, as is implemented in crane.lib.

The respective attribute must be added to commonArgs (i.e. to both
`buildDepsOnly` and `buildPackage` args).
Adds the ability to specify an `extraLockfile` attribute in args. Its
value should evaluate to a string path. It's included in the beginning,
so it overshadows dependencies, which are specified in the other
Cargo.lock files.

Must be added to commonArgs (i.e. to both `buildDepsOnly` and
`buildPackage` args).
… toolchains

Allows the host and guest program toolchains to differ. Generally, you
should only need to set one.
@Syndamia Syndamia force-pushed the update-18-02-2025 branch 3 times, most recently from e7217f9 to 8dd2432 Compare February 25, 2025 11:23
This includes:
- Updating flake.lock
- Updating all host and guest Cargo.toml and Cargo.lock files
- Making zkvm default.nix file modifications to account for toolchain
and setup changes
The SDK is out of date. A PR is opened:
ProjectZKM/zkm-project-template#54
However, its not certain it will be merged soon, so for now this
workaround will have to do.
The newest toolchain causes errors, an issue has been filed upstream:
ProjectZKM/toolchain#4
However, it is not certain when it will be resolved, so for now this
workaround will be used.
@Syndamia Syndamia marked this pull request as ready for review February 25, 2025 11:40
Copy link
Contributor

@Aristotelis2002 Aristotelis2002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job!

@Syndamia Syndamia merged commit ec0bc2c into main Feb 26, 2025
@Syndamia Syndamia deleted the update-18-02-2025 branch February 26, 2025 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants