From 94b9ed0671bea8096a6dcb567f54d32abdd596a7 Mon Sep 17 00:00:00 2001 From: aakoshh Date: Tue, 25 Mar 2025 21:45:31 +0000 Subject: [PATCH 1/4] Keep testing with msgpack-codegen --- avm-transpiler/Cargo.lock | 78 ++++++++++++++++++++++++++++++++++++++- noir/noir-repo-ref | 2 +- noir/noir-repo.patch | 23 ------------ 3 files changed, 77 insertions(+), 26 deletions(-) diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock index f5d473b4a95d..9e4f508556fe 100644 --- a/avm-transpiler/Cargo.lock +++ b/avm-transpiler/Cargo.lock @@ -13,9 +13,11 @@ dependencies = [ "color-eyre", "flate2", "noir_protobuf", + "num_enum", "prost", "prost-build", "protoc-prebuilt", + "rmp-serde", "serde", "serde-big-array", "strum", @@ -1489,6 +1491,27 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "object" version = "0.32.2" @@ -1591,6 +1614,15 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "proc-macro-crate" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" +dependencies = [ + "toml_edit 0.22.24", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -1789,6 +1821,28 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -2212,7 +2266,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -2234,7 +2288,18 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +dependencies = [ + "indexmap 2.8.0", + "toml_datetime", + "winnow 0.7.4", ] [[package]] @@ -2563,6 +2628,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" +dependencies = [ + "memchr", +] + [[package]] name = "write16" version = "1.0.0" diff --git a/noir/noir-repo-ref b/noir/noir-repo-ref index 2ca8d89893e2..8cda881454fb 100644 --- a/noir/noir-repo-ref +++ b/noir/noir-repo-ref @@ -1 +1 @@ -nightly-2025-04-01 +af/msgpack-codegen diff --git a/noir/noir-repo.patch b/noir/noir-repo.patch index c9e4dc4678e1..ac966bd2384d 100644 --- a/noir/noir-repo.patch +++ b/noir/noir-repo.patch @@ -21,26 +21,3 @@ index 30dd2a7e..a2712fd7 100644 "src/**/*.ts" -- 2.43.0 - -From fd8f444eba5db51bee2173d7c2f66bebaa693d30 Mon Sep 17 00:00:00 2001 -From: aakoshh -Date: Mon, 17 Mar 2025 12:10:58 +0000 -Subject: [PATCH 4/4] Ignore package.tgz - ---- - .gitignore | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/.gitignore b/.gitignore -index 3349018..c93fe8e 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -59,3 +59,6 @@ codegen - - mutants.out - mutants.out.old -+ -+# Artifacts created by `noir/bootstrap.sh build_packages` -+**/package.tgz --- -2.43.0 From 230cb2da8897b9c2f5119fb8c1a4fe9a339b5592 Mon Sep 17 00:00:00 2001 From: aakoshh Date: Tue, 25 Mar 2025 18:45:17 +0000 Subject: [PATCH 2/4] Use msgpack --- bootstrap.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootstrap.sh b/bootstrap.sh index 9216b64b1dfa..24102488c297 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -13,6 +13,9 @@ export DENOISE=${DENOISE:-1} # Number of TXE servers to run when testing. export NUM_TXES=8 +# Use msgpack with Noir artifacts +export NOIR_SERIALIZATION_FORMAT=msgpack + cmd=${1:-} [ -n "$cmd" ] && shift From 82f40294f8d369d8188e49f45f98db7becf7c710 Mon Sep 17 00:00:00 2001 From: aakoshh Date: Tue, 25 Mar 2025 22:59:37 +0000 Subject: [PATCH 3/4] Update noir to where msgpack is the default --- noir/noir-repo-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noir/noir-repo-ref b/noir/noir-repo-ref index 8cda881454fb..2ee4eac9b8dd 100644 --- a/noir/noir-repo-ref +++ b/noir/noir-repo-ref @@ -1 +1 @@ -af/msgpack-codegen +af/msgpack-default From 0502b93f2275c00ce3d5dc1c5753c2bd8e274e38 Mon Sep 17 00:00:00 2001 From: aakoshh Date: Tue, 25 Mar 2025 23:03:53 +0000 Subject: [PATCH 4/4] No need for env var --- bootstrap.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 24102488c297..9216b64b1dfa 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -13,9 +13,6 @@ export DENOISE=${DENOISE:-1} # Number of TXE servers to run when testing. export NUM_TXES=8 -# Use msgpack with Noir artifacts -export NOIR_SERIALIZATION_FORMAT=msgpack - cmd=${1:-} [ -n "$cmd" ] && shift