From 33aec99c9dca2e6ed0de9197e2677c1cc1a78dd0 Mon Sep 17 00:00:00 2001 From: Bobbin Threadbare Date: Tue, 6 Aug 2024 17:08:40 -0700 Subject: [PATCH 1/6] chore: update miden-crypto dependency to the crates.io version --- Cargo.lock | 110 +++++++++++++++++++++++++++++++++--------------- core/Cargo.toml | 2 +- 2 files changed, 77 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 146699745..adb725263 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -228,6 +228,12 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "cast" version = "0.3.0" @@ -236,9 +242,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" dependencies = [ "jobserver", "libc", @@ -279,9 +285,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -289,9 +295,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -301,9 +307,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", @@ -767,9 +773,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown", @@ -1044,8 +1050,9 @@ dependencies = [ [[package]] name = "miden-crypto" -version = "0.9.3" -source = "git+https://github.com/0xPolygonMiden/crypto?branch=next#b06cfa3c035ada8122a405a72d2e4b2ad1a89b47" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6fad06fc3af260ed3c4235821daa2132813d993f96d446856036ae97e9606dd" dependencies = [ "blake3", "cc", @@ -1500,9 +1507,12 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "precomputed-hash" @@ -1675,9 +1685,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -1846,11 +1856,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -1986,14 +1997,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2125,9 +2137,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -2137,18 +2149,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.17" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", @@ -2233,9 +2245,9 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1e5645f2ee8025c2f1d75e1138f2dd034d74e6ba54620f3c569ba2a2a1ea06" +checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8" dependencies = [ "dissimilar", "glob", @@ -2439,11 +2451,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2534,6 +2546,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -2657,9 +2678,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.16" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -2810,3 +2831,24 @@ name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/core/Cargo.toml b/core/Cargo.toml index fd7e695fd..e17e35a53 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -33,7 +33,7 @@ std = [ [dependencies] math = { package = "winter-math", version = "0.9", default-features = false } memchr = { version = "2.7", default-features = false } -miden-crypto = { git = "https://github.com/0xPolygonMiden/crypto", branch = "next", default-features = false } +miden-crypto = { version = "0.10", default-features = false } miden-formatting = { version = "0.1", default-features = false } miette = { version = "7.1.0", git = "https://github.com/bitwalker/miette", branch = "no-std", default-features = false, features = [ "fancy-no-syscall", From e52217abedda866219b2a19a802b447a53bd3b7a Mon Sep 17 00:00:00 2001 From: Bobbin Threadbare Date: Tue, 6 Aug 2024 20:31:01 -0700 Subject: [PATCH 2/6] chore: get thiserror and miette dependencies to crates.io --- Cargo.lock | 123 +++++++++++++++++++++++++++++--------------- Cargo.toml | 4 -- air/Cargo.toml | 2 +- assembly/Cargo.toml | 19 ++----- core/Cargo.toml | 15 +++--- 5 files changed, 93 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index adb725263..3b0c1c27b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1003,8 +1003,8 @@ version = "0.10.0" dependencies = [ "criterion", "miden-core", + "miden-thiserror", "proptest", - "thiserror", "winter-air", "winter-prover", "winter-rand-utils", @@ -1018,12 +1018,12 @@ dependencies = [ "lalrpop", "lalrpop-util", "miden-core", - "miette", + "miden-miette", + "miden-thiserror", "pretty_assertions", "regex", - "rustc_version", + "rustc_version 0.4.0", "smallvec", - "thiserror", "tracing", "unicode-width", ] @@ -1037,12 +1037,12 @@ dependencies = [ "memchr", "miden-crypto", "miden-formatting", - "miette", + "miden-miette", + "miden-thiserror", "num-derive", "num-traits", "parking_lot", "proptest", - "thiserror", "winter-math 0.9.0", "winter-rand-utils", "winter-utils 0.9.1", @@ -1087,6 +1087,37 @@ dependencies = [ "winter-math 0.9.0", ] +[[package]] +name = "miden-miette" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00dd11dd9b90f0b750ba2366a09e63796cdb6e8167a90251544b2560bf222d87" +dependencies = [ + "backtrace", + "backtrace-ext", + "cfg-if", + "futures", + "indenter", + "lazy_static", + "miden-thiserror", + "miette-derive", + "owo-colors", + "regex", + "rustc_version 0.2.3", + "rustversion", + "serde_json", + "spin", + "strip-ansi-escapes", + "supports-color", + "supports-hyperlinks", + "supports-unicode", + "syn", + "terminal_size", + "textwrap", + "trybuild", + "unicode-width", +] + [[package]] name = "miden-processor" version = "0.10.0" @@ -1152,6 +1183,26 @@ dependencies = [ "winter-rand-utils", ] +[[package]] +name = "miden-thiserror" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183ff8de338956ecfde3a38573241eb7a6f3d44d73866c210e5629c07fa00253" +dependencies = [ + "miden-thiserror-impl", +] + +[[package]] +name = "miden-thiserror-impl" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee4176a0f2e7d29d2a8ee7e60b6deb14ce67a20e94c3e2c7275cdb8804e1862" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "miden-verifier" version = "0.10.0" @@ -1192,40 +1243,11 @@ dependencies = [ "winter-fri 0.8.3", ] -[[package]] -name = "miette" -version = "7.1.0" -source = "git+https://github.com/bitwalker/miette?branch=no-std#e918fbde6c9853fe5e0db8e8e05bf7fbc8d2cc15" -dependencies = [ - "backtrace", - "backtrace-ext", - "cfg-if", - "futures", - "indenter", - "lazy_static", - "miette-derive", - "owo-colors", - "regex", - "rustc_version", - "rustversion", - "serde_json", - "spin", - "strip-ansi-escapes", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "syn", - "terminal_size", - "textwrap", - "thiserror", - "trybuild", - "unicode-width", -] - [[package]] name = "miette-derive" version = "7.1.0" -source = "git+https://github.com/bitwalker/miette?branch=no-std#e918fbde6c9853fe5e0db8e8e05bf7fbc8d2cc15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301c3f54f98abc6c212ee722f5e5c62e472a334415840669e356f04850051ec" dependencies = [ "proc-macro2", "quote", @@ -1739,7 +1761,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver", + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.23", ] [[package]] @@ -1828,6 +1859,12 @@ dependencies = [ "semver-parser", ] +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + [[package]] name = "semver-parser" version = "0.7.0" @@ -2090,16 +2127,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" -source = "git+https://github.com/bitwalker/thiserror?branch=no-std#444c920234c683b73e1da67ba371a7084ae11725" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" -source = "git+https://github.com/bitwalker/thiserror?branch=no-std#444c920234c683b73e1da67ba371a7084ae11725" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 7a275ae2b..ac69f241e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,3 @@ inherits = "release" debug = true debug-assertions = true overflow-checks = true - -[patch.crates-io] -thiserror = { git = "https://github.com/bitwalker/thiserror", branch = "no-std" } -miette = { git = "https://github.com/bitwalker/miette", branch = "no-std" } diff --git a/air/Cargo.toml b/air/Cargo.toml index 07cef453b..5eeed2ecb 100644 --- a/air/Cargo.toml +++ b/air/Cargo.toml @@ -34,7 +34,7 @@ testing = [] vm-core = { package = "miden-core", path = "../core", version = "0.10", default-features = false } winter-air = { package = "winter-air", version = "0.9", default-features = false } winter-prover = { package = "winter-prover", version = "0.9", default-features = false } -thiserror = { version = "1.0", git = "https://github.com/bitwalker/thiserror", branch = "no-std", default-features = false } +thiserror = { package = "miden-thiserror", version = "1.0", default-features = false } [dev-dependencies] criterion = "0.5" diff --git a/assembly/Cargo.toml b/assembly/Cargo.toml index bc7463735..20ab4d98c 100644 --- a/assembly/Cargo.toml +++ b/assembly/Cargo.toml @@ -31,14 +31,8 @@ testing = ["dep:regex"] [dependencies] aho-corasick = { version = "1.1", default-features = false } lalrpop-util = { version = "0.20", default-features = false } -miette = { version = "7.1.0", git = "https://github.com/bitwalker/miette", branch = "no-std", default-features = false, features = [ - "fancy-no-syscall", - "derive", -] } -regex = { version = "1.10", optional = true, default-features = false, features = [ - "unicode", - "perf", -] } +miette = { package = "miden-miette", version = "7.1", default-features = false, features = ["fancy-no-syscall", "derive"], optional = true } +regex = { version = "1.10", optional = true, default-features = false, features = ["unicode", "perf"] } smallvec = { version = "1.13", features = [ "union", "const_generics", @@ -47,7 +41,7 @@ smallvec = { version = "1.13", features = [ tracing = { version = "0.1", default-features = false, features = [ "attributes", ] } -thiserror = { version = "1.0", git = "https://github.com/bitwalker/thiserror", branch = "no-std", default-features = false } +thiserror = { package = "miden-thiserror", version = "1.0", default-features = false } unicode-width = { version = "0.1", features = ["no_std"] } vm-core = { package = "miden-core", path = "../core", version = "0.10", default-features = false, features = [ "diagnostics", @@ -55,11 +49,8 @@ vm-core = { package = "miden-core", path = "../core", version = "0.10", default- [dev-dependencies] pretty_assertions = "1.4" -regex = { version = "1.10", default-features = false, features = [ - "unicode", - "perf", -] } +regex = { version = "1.10", default-features = false, features = [ "unicode","perf"] } [build-dependencies] lalrpop = { version = "0.20", default-features = false } -rustc_version = "0.2" +rustc_version = "0.4" diff --git a/core/Cargo.toml b/core/Cargo.toml index e17e35a53..217d5c7a1 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -31,25 +31,22 @@ std = [ ] [dependencies] +lock_api = { version = "0.4", features = ["arc_lock"] } math = { package = "winter-math", version = "0.9", default-features = false } memchr = { version = "2.7", default-features = false } miden-crypto = { version = "0.10", default-features = false } miden-formatting = { version = "0.1", default-features = false } -miette = { version = "7.1.0", git = "https://github.com/bitwalker/miette", branch = "no-std", default-features = false, features = [ - "fancy-no-syscall", - "derive", -], optional = true } -lock_api = { version = "0.4", features = ["arc_lock"] } -parking_lot = { version = "0.12", optional = true } +miette = { package = "miden-miette", version = "7.1", default-features = false, features = ["fancy-no-syscall", "derive"], optional = true } num-derive = { version = "0.4", default-features = false } num-traits = { version = "0.2", default-features = false } -thiserror = { version = "1.0", git = "https://github.com/bitwalker/thiserror", branch = "no-std", default-features = false } +parking_lot = { version = "0.12", optional = true } +thiserror = { package = "miden-thiserror", version = "1.0", default-features = false } winter-utils = { package = "winter-utils", version = "0.9", default-features = false } [dev-dependencies] -proptest = "1.3" -rand_utils = { version = "0.9", package = "winter-rand-utils" } loom = "0.7" +proptest = "1.5" +rand_utils = { version = "0.9", package = "winter-rand-utils" } [target.'cfg(loom)'.dependencies] loom = "0.7" From 067c5054db0e8700e921b3cff1ba25956e63b3b8 Mon Sep 17 00:00:00 2001 From: Bobbin Threadbare Date: Tue, 6 Aug 2024 21:22:50 -0700 Subject: [PATCH 3/6] fix: no-std build --- assembly/Cargo.toml | 7 +++++-- core/Cargo.toml | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/assembly/Cargo.toml b/assembly/Cargo.toml index 20ab4d98c..4f233e98c 100644 --- a/assembly/Cargo.toml +++ b/assembly/Cargo.toml @@ -31,7 +31,10 @@ testing = ["dep:regex"] [dependencies] aho-corasick = { version = "1.1", default-features = false } lalrpop-util = { version = "0.20", default-features = false } -miette = { package = "miden-miette", version = "7.1", default-features = false, features = ["fancy-no-syscall", "derive"], optional = true } +miette = { package = "miden-miette", version = "7.1", default-features = false, features = [ + "fancy-no-syscall", + "derive" +] } regex = { version = "1.10", optional = true, default-features = false, features = ["unicode", "perf"] } smallvec = { version = "1.13", features = [ "union", @@ -49,7 +52,7 @@ vm-core = { package = "miden-core", path = "../core", version = "0.10", default- [dev-dependencies] pretty_assertions = "1.4" -regex = { version = "1.10", default-features = false, features = [ "unicode","perf"] } +regex = { version = "1.10", default-features = false, features = [ "unicode", "perf"] } [build-dependencies] lalrpop = { version = "0.20", default-features = false } diff --git a/core/Cargo.toml b/core/Cargo.toml index 217d5c7a1..df609926d 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -36,7 +36,10 @@ math = { package = "winter-math", version = "0.9", default-features = false } memchr = { version = "2.7", default-features = false } miden-crypto = { version = "0.10", default-features = false } miden-formatting = { version = "0.1", default-features = false } -miette = { package = "miden-miette", version = "7.1", default-features = false, features = ["fancy-no-syscall", "derive"], optional = true } +miette = { package = "miden-miette", version = "7.1", default-features = false, features = [ + "fancy-no-syscall", + "derive" +], optional = true } num-derive = { version = "0.4", default-features = false } num-traits = { version = "0.2", default-features = false } parking_lot = { version = "0.12", optional = true } From f1a73a2d7c56e9a16bba835522f2e91dce157033 Mon Sep 17 00:00:00 2001 From: Bobbin Threadbare Date: Tue, 6 Aug 2024 21:52:07 -0700 Subject: [PATCH 4/6] chore: refresh Cargo.lock --- Cargo.lock | 28 ++++++++++++++-------------- air/Cargo.toml | 2 +- assembly/Cargo.toml | 18 +++--------------- processor/Cargo.toml | 8 +++----- 4 files changed, 21 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b0c1c27b..58d460a6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1089,9 +1089,9 @@ dependencies = [ [[package]] name = "miden-miette" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00dd11dd9b90f0b750ba2366a09e63796cdb6e8167a90251544b2560bf222d87" +checksum = "c532250422d933f15b148fb81e4522a5d649c178ab420d0d596c86228da35570" dependencies = [ "backtrace", "backtrace-ext", @@ -1099,8 +1099,8 @@ dependencies = [ "futures", "indenter", "lazy_static", + "miden-miette-derive", "miden-thiserror", - "miette-derive", "owo-colors", "regex", "rustc_version 0.2.3", @@ -1118,6 +1118,17 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "miden-miette-derive" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc759f0a2947acae217a2f32f722105cacc57d17d5f93bc16362142943a4edd" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "miden-processor" version = "0.10.0" @@ -1243,17 +1254,6 @@ dependencies = [ "winter-fri 0.8.3", ] -[[package]] -name = "miette-derive" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301c3f54f98abc6c212ee722f5e5c62e472a334415840669e356f04850051ec" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "miniz_oxide" version = "0.7.4" diff --git a/air/Cargo.toml b/air/Cargo.toml index 5eeed2ecb..5810a38d4 100644 --- a/air/Cargo.toml +++ b/air/Cargo.toml @@ -31,10 +31,10 @@ std = ["vm-core/std", "winter-air/std", "thiserror/std"] testing = [] [dependencies] +thiserror = { package = "miden-thiserror", version = "1.0", default-features = false } vm-core = { package = "miden-core", path = "../core", version = "0.10", default-features = false } winter-air = { package = "winter-air", version = "0.9", default-features = false } winter-prover = { package = "winter-prover", version = "0.9", default-features = false } -thiserror = { package = "miden-thiserror", version = "1.0", default-features = false } [dev-dependencies] criterion = "0.5" diff --git a/assembly/Cargo.toml b/assembly/Cargo.toml index 4f233e98c..00ba3686f 100644 --- a/assembly/Cargo.toml +++ b/assembly/Cargo.toml @@ -19,13 +19,7 @@ doctest = false [features] default = ["std"] -std = [ - "aho-corasick/std", - "vm-core/std", - "miette/fancy", - "thiserror/std", - "miette/std", -] +std = ["aho-corasick/std", "miette/fancy", "miette/std", "thiserror/std", "vm-core/std"] testing = ["dep:regex"] [dependencies] @@ -36,15 +30,9 @@ miette = { package = "miden-miette", version = "7.1", default-features = false, "derive" ] } regex = { version = "1.10", optional = true, default-features = false, features = ["unicode", "perf"] } -smallvec = { version = "1.13", features = [ - "union", - "const_generics", - "const_new", -] } -tracing = { version = "0.1", default-features = false, features = [ - "attributes", -] } +smallvec = { version = "1.13", features = ["union", "const_generics", "const_new"] } thiserror = { package = "miden-thiserror", version = "1.0", default-features = false } +tracing = { version = "0.1", default-features = false, features = ["attributes"] } unicode-width = { version = "0.1", features = ["no_std"] } vm-core = { package = "miden-core", path = "../core", version = "0.10", default-features = false, features = [ "diagnostics", diff --git a/processor/Cargo.toml b/processor/Cargo.toml index 9be3e0675..18de67f40 100644 --- a/processor/Cargo.toml +++ b/processor/Cargo.toml @@ -24,16 +24,14 @@ testing = ["miden-air/testing"] std = ["vm-core/std", "winter-prover/std"] [dependencies] -tracing = { version = "0.1", default-features = false, features = [ - "attributes", -] } -vm-core = { package = "miden-core", path = "../core", version = "0.10", default-features = false } miden-air = { package = "miden-air", path = "../air", version = "0.10", default-features = false } +tracing = { version = "0.1", default-features = false, features = ["attributes"] } +vm-core = { package = "miden-core", path = "../core", version = "0.10", default-features = false } winter-prover = { package = "winter-prover", version = "0.9", default-features = false } [dev-dependencies] -logtest = { version = "2.0", default-features = false } assembly = { package = "miden-assembly", path = "../assembly", version = "0.10", default-features = false } +logtest = { version = "2.0", default-features = false } test-utils = { package = "miden-test-utils", path = "../test-utils" } winter-fri = { package = "winter-fri", version = "0.9" } winter-utils = { package = "winter-utils", version = "0.9" } From 81eaa3ea2a858a74dd374731c7651153821f2343 Mon Sep 17 00:00:00 2001 From: Bobbin Threadbare Date: Tue, 6 Aug 2024 22:14:32 -0700 Subject: [PATCH 5/6] chore: fix readme fields in Cargo.toml files --- Cargo.lock | 2 +- air/Cargo.toml | 2 +- assembly/Cargo.toml | 2 +- core/Cargo.toml | 4 ++-- miden/Cargo.toml | 2 +- processor/Cargo.toml | 2 +- prover/Cargo.toml | 2 +- stdlib/Cargo.toml | 2 +- test-utils/Cargo.toml | 2 +- verifier/Cargo.toml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 58d460a6f..1ef38803a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "miden-core" -version = "0.10.0" +version = "0.10.1" dependencies = [ "lock_api", "loom", diff --git a/air/Cargo.toml b/air/Cargo.toml index 5810a38d4..e4ad6d683 100644 --- a/air/Cargo.toml +++ b/air/Cargo.toml @@ -3,9 +3,9 @@ name = "miden-air" version = "0.10.0" description = "Algebraic intermediate representation of Miden VM processor" documentation = "https://docs.rs/miden-air/0.10.0" +readme = "README.md" categories = ["cryptography", "no-std"] keywords = ["air", "arithmetization", "crypto", "miden"] -readme.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true diff --git a/assembly/Cargo.toml b/assembly/Cargo.toml index 00ba3686f..5b00c3688 100644 --- a/assembly/Cargo.toml +++ b/assembly/Cargo.toml @@ -3,9 +3,9 @@ name = "miden-assembly" version = "0.10.0" description = "Miden VM assembly language" documentation = "https://docs.rs/miden-assembly/0.10.0" +readme = "README.md" categories = ["compilers", "no-std"] keywords = ["assembler", "assembly", "language", "miden"] -readme.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true diff --git a/core/Cargo.toml b/core/Cargo.toml index df609926d..3685cbeed 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "miden-core" -version = "0.10.0" +version = "0.10.1" description = "Miden VM core components" documentation = "https://docs.rs/miden-core/0.10.0" +readme = "README.md" categories = ["emulators", "no-std"] keywords = ["instruction-set", "miden", "program"] -readme.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true diff --git a/miden/Cargo.toml b/miden/Cargo.toml index be07ffb21..8aac3ea93 100644 --- a/miden/Cargo.toml +++ b/miden/Cargo.toml @@ -3,9 +3,9 @@ name = "miden-vm" version = "0.10.0" description = "Miden virtual machine" documentation = "https://docs.rs/miden-vm/0.10.0" +readme = "README.md" categories = ["cryptography", "emulators", "no-std"] keywords = ["miden", "stark", "virtual-machine", "zkp"] -readme.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true diff --git a/processor/Cargo.toml b/processor/Cargo.toml index 18de67f40..2be006667 100644 --- a/processor/Cargo.toml +++ b/processor/Cargo.toml @@ -3,9 +3,9 @@ name = "miden-processor" version = "0.10.0" description = "Miden VM processor" documentation = "https://docs.rs/miden-processor/0.10.0" +readme = "README.md" categories = ["emulators", "no-std"] keywords = ["miden", "virtual-machine"] -readme.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 90d04f7fa..d7c23c594 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -3,9 +3,9 @@ name = "miden-prover" version = "0.10.0" description = "Miden VM prover" documentation = "https://docs.rs/miden-prover/0.10.0" +readme = "README.md" categories = ["cryptography", "emulators", "no-std"] keywords = ["miden", "prover", "stark", "zkp"] -readme.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml index b372e90bc..955c57892 100644 --- a/stdlib/Cargo.toml +++ b/stdlib/Cargo.toml @@ -2,8 +2,8 @@ name = "miden-stdlib" version = "0.10.0" description = "Miden VM standard library" -readme = "README.md" documentation = "https://docs.rs/miden-stdlib/0.10.0" +readme = "README.md" categories = ["cryptography", "mathematics"] keywords = ["miden", "program", "stdlib"] license.workspace = true diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index ef67bdb01..0d6ac384b 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -2,9 +2,9 @@ name = "miden-test-utils" version = "0.1.0" description = "Test utilities for Miden VM programs" +readme = "README.md" categories = ["development-tools::testing", "no-std"] keywords = ["miden", "test", "virtual-machine"] -readme.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true diff --git a/verifier/Cargo.toml b/verifier/Cargo.toml index ff47f0ba0..beae66d68 100644 --- a/verifier/Cargo.toml +++ b/verifier/Cargo.toml @@ -3,9 +3,9 @@ name = "miden-verifier" version = "0.10.0" description="Miden VM execution verifier" documentation = "https://docs.rs/miden-verifier/0.10.0" +readme = "README.md" categories = ["cryptography", "no-std"] keywords = ["miden", "stark", "verifier", "zkp"] -readme.workspace = true license.workspace = true authors.workspace = true homepage.workspace = true From d1679d64b644704be31f4ca79c0b62161d12c6cf Mon Sep 17 00:00:00 2001 From: Bobbin Threadbare Date: Sun, 11 Aug 2024 00:46:03 -0700 Subject: [PATCH 6/6] chore: increment crate versions to v0.10.2 and update changelog --- CHANGELOG.md | 11 +++++---- Cargo.lock | 53 ++++++++++++++++++++++---------------------- air/Cargo.toml | 4 ++-- assembly/Cargo.toml | 4 ++-- core/Cargo.toml | 4 ++-- miden/Cargo.toml | 4 ++-- processor/Cargo.toml | 4 ++-- prover/Cargo.toml | 4 ++-- stdlib/Cargo.toml | 4 ++-- verifier/Cargo.toml | 4 ++-- 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3279bb92..2f4ef5575 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,17 @@ # Changelog -## Unreleased - -#### Changes - -- [BREAKING] Removed serialization of AST structs (#1442). +## 0.10.1 (2024-08-10) #### Enhancements +- Removed linear search of trace rows from `BlockHashTableRow::table_init()` (#1439). - Exposed some pretty printing internals for `MastNode` (#1441). - Made `KernelLibrary` impl `Clone` and `AsRef` (#1441). - Added serialization to the `Program` struct (#1442). +#### Changes + +- [BREAKING] Removed serialization of AST structs (#1442). ## 0.10.0 (2024-08-06) @@ -47,7 +47,6 @@ - Added `make test-fast` and `make test-skip-proptests` Makefile targets for faster testing during local development. - Added `ProgramFile::read_with` constructor that takes a `SourceManager` impl to use for source management. - Added `RowIndex(u32)` (#1408). -- Removed linear search of trace rows from `BlockHashTableRow::table_init()` (#1439). #### Changed diff --git a/Cargo.lock b/Cargo.lock index 1ef38803a..8245e9570 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,13 +113,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc65048dd435533bb1baf2ed9956b9a278fbfdcf90301b39ee117f06c0199d37" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" dependencies = [ "anstyle", "bstr", "doc-comment", + "libc", "predicates", "predicates-core", "predicates-tree", @@ -242,9 +243,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.7" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" dependencies = [ "jobserver", "libc", @@ -285,9 +286,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.13" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" dependencies = [ "clap_builder", "clap_derive", @@ -295,9 +296,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.13" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -356,9 +357,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics-types" @@ -999,7 +1000,7 @@ dependencies = [ [[package]] name = "miden-air" -version = "0.10.0" +version = "0.10.2" dependencies = [ "criterion", "miden-core", @@ -1012,7 +1013,7 @@ dependencies = [ [[package]] name = "miden-assembly" -version = "0.10.0" +version = "0.10.2" dependencies = [ "aho-corasick", "lalrpop", @@ -1030,7 +1031,7 @@ dependencies = [ [[package]] name = "miden-core" -version = "0.10.1" +version = "0.10.2" dependencies = [ "lock_api", "loom", @@ -1131,7 +1132,7 @@ dependencies = [ [[package]] name = "miden-processor" -version = "0.10.0" +version = "0.10.2" dependencies = [ "logtest", "miden-air", @@ -1146,7 +1147,7 @@ dependencies = [ [[package]] name = "miden-prover" -version = "0.10.0" +version = "0.10.2" dependencies = [ "elsa", "miden-air", @@ -1159,7 +1160,7 @@ dependencies = [ [[package]] name = "miden-stdlib" -version = "0.10.0" +version = "0.10.2" dependencies = [ "blake3", "miden-air", @@ -1216,7 +1217,7 @@ dependencies = [ [[package]] name = "miden-verifier" -version = "0.10.0" +version = "0.10.2" dependencies = [ "miden-air", "miden-core", @@ -1226,7 +1227,7 @@ dependencies = [ [[package]] name = "miden-vm" -version = "0.10.0" +version = "0.10.2" dependencies = [ "assert_cmd", "blake3", @@ -1402,9 +1403,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -1873,18 +1874,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" dependencies = [ "proc-macro2", "quote", @@ -2023,9 +2024,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.72" +version = "2.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "837a7e8026c6ce912ff01cefbe8cafc2f8010ac49682e2a3d9decc3bce1ecaaf" dependencies = [ "proc-macro2", "quote", diff --git a/air/Cargo.toml b/air/Cargo.toml index e4ad6d683..547883760 100644 --- a/air/Cargo.toml +++ b/air/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "miden-air" -version = "0.10.0" +version = "0.10.2" description = "Algebraic intermediate representation of Miden VM processor" -documentation = "https://docs.rs/miden-air/0.10.0" +documentation = "https://docs.rs/miden-air/0.10.2" readme = "README.md" categories = ["cryptography", "no-std"] keywords = ["air", "arithmetization", "crypto", "miden"] diff --git a/assembly/Cargo.toml b/assembly/Cargo.toml index 5b00c3688..71bc63dc6 100644 --- a/assembly/Cargo.toml +++ b/assembly/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "miden-assembly" -version = "0.10.0" +version = "0.10.2" description = "Miden VM assembly language" -documentation = "https://docs.rs/miden-assembly/0.10.0" +documentation = "https://docs.rs/miden-assembly/0.10.2" readme = "README.md" categories = ["compilers", "no-std"] keywords = ["assembler", "assembly", "language", "miden"] diff --git a/core/Cargo.toml b/core/Cargo.toml index 3685cbeed..71a35f5f6 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "miden-core" -version = "0.10.1" +version = "0.10.2" description = "Miden VM core components" -documentation = "https://docs.rs/miden-core/0.10.0" +documentation = "https://docs.rs/miden-core/0.10.2" readme = "README.md" categories = ["emulators", "no-std"] keywords = ["instruction-set", "miden", "program"] diff --git a/miden/Cargo.toml b/miden/Cargo.toml index 8aac3ea93..f8cc65be0 100644 --- a/miden/Cargo.toml +++ b/miden/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "miden-vm" -version = "0.10.0" +version = "0.10.2" description = "Miden virtual machine" -documentation = "https://docs.rs/miden-vm/0.10.0" +documentation = "https://docs.rs/miden-vm/0.10.2" readme = "README.md" categories = ["cryptography", "emulators", "no-std"] keywords = ["miden", "stark", "virtual-machine", "zkp"] diff --git a/processor/Cargo.toml b/processor/Cargo.toml index 2be006667..f3db7aca6 100644 --- a/processor/Cargo.toml +++ b/processor/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "miden-processor" -version = "0.10.0" +version = "0.10.2" description = "Miden VM processor" -documentation = "https://docs.rs/miden-processor/0.10.0" +documentation = "https://docs.rs/miden-processor/0.10.2" readme = "README.md" categories = ["emulators", "no-std"] keywords = ["miden", "virtual-machine"] diff --git a/prover/Cargo.toml b/prover/Cargo.toml index d7c23c594..7ca152470 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "miden-prover" -version = "0.10.0" +version = "0.10.2" description = "Miden VM prover" -documentation = "https://docs.rs/miden-prover/0.10.0" +documentation = "https://docs.rs/miden-prover/0.10.2" readme = "README.md" categories = ["cryptography", "emulators", "no-std"] keywords = ["miden", "prover", "stark", "zkp"] diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml index 955c57892..0625a07c6 100644 --- a/stdlib/Cargo.toml +++ b/stdlib/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "miden-stdlib" -version = "0.10.0" +version = "0.10.2" description = "Miden VM standard library" -documentation = "https://docs.rs/miden-stdlib/0.10.0" +documentation = "https://docs.rs/miden-stdlib/0.10.2" readme = "README.md" categories = ["cryptography", "mathematics"] keywords = ["miden", "program", "stdlib"] diff --git a/verifier/Cargo.toml b/verifier/Cargo.toml index beae66d68..cf68898fb 100644 --- a/verifier/Cargo.toml +++ b/verifier/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "miden-verifier" -version = "0.10.0" +version = "0.10.2" description="Miden VM execution verifier" -documentation = "https://docs.rs/miden-verifier/0.10.0" +documentation = "https://docs.rs/miden-verifier/0.10.2" readme = "README.md" categories = ["cryptography", "no-std"] keywords = ["miden", "stark", "verifier", "zkp"]