Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate externally passed Rust toolchain identifiers #1817

Merged
merged 4 commits into from
Nov 19, 2024

Conversation

cmichi
Copy link
Collaborator

@cmichi cmichi commented Nov 14, 2024

How the new output formatting looks:

image

I did a drive-by improvement of the output format of cargo-contract version mismatches:

image

@cmichi cmichi force-pushed the cmichi-validate-toolchain-names-for-cargo-verify branch from 6b49830 to f3b868d Compare November 14, 2024 14:27
@cmichi cmichi force-pushed the cmichi-validate-toolchain-names-for-cargo-verify branch from f3b868d to 5e6a44e Compare November 14, 2024 14:27
@cmichi cmichi merged commit c8eec11 into master Nov 19, 2024
9 checks passed
@cmichi cmichi deleted the cmichi-validate-toolchain-names-for-cargo-verify branch November 19, 2024 15:27
cmichi added a commit that referenced this pull request Nov 20, 2024
* Validate toolchains passed from external are valid

* Improve user output formatting

* Update changelog
@cmichi cmichi mentioned this pull request Nov 20, 2024
cmichi added a commit that referenced this pull request Nov 20, 2024
* Handle case of Rust 1.79 behavior of stringify! on crate path (#1821)

* Handle case of Rust 1.79 behavior of `stringify!` on crate path

* Update changelog

* Simplify code following Andrew's suggestion

* Update crates/cargo-contract/src/cmd/config.rs

Co-authored-by: Andrew Jones <ascjones@gmail.com>

---------

Co-authored-by: Andrew Jones <ascjones@gmail.com>

* Validate externally passed Rust toolchain identifiers (#1817)

* Validate toolchains passed from external are valid

* Improve user output formatting

* Update changelog

* For contract verification: don't rely on Wasm hash in metadata (#1820)

* For contract verification: don't rely on Wasm hash in metadata

* Improve user output

* Check if reference contract `source.hash` matches `hash(source.wasm)`

* Adapt existing test to new user output format

* Update changelog

* Apply `cargo fmt`

* Update changelog

* Bump versions

* Execute `cargo update`

* Update codeowners (#1787)

* Make `clippy` happy

* Apply `cargo fmt`

---------

Co-authored-by: Andrew Jones <ascjones@gmail.com>
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.

2 participants