deprecate risc0-build

2026-01-09 16:43:09 +00:00 · 2025-03-07 01:33:18 +04:00 · 2025-03-07 01:33:18 +04:00 · 8e2da63b18
commit 8e2da63b18
parent 98a75dfabb
30 changed files with 36 additions and 120 deletions
--- a/emmarin/cl/Cargo.toml
+++ b/emmarin/cl/Cargo.toml
@ -4,7 +4,9 @@ members = [
    "cl",
    "ledger",
    "ledger_proof_statements",
-    "ledger_validity_proof",
+    "ledger_risc0_proof",
+    "bundle_risc0_proof",
+    "risc0_proofs",
    "risc0_images",
 ]

--- a/emmarin/cl/bundle_risc0_proof/Cargo.toml
+++ b/emmarin/cl/bundle_risc0_proof/Cargo.toml
@ -1,11 +1,17 @@
 [package]
-name = "nomos_mantle_bundle_risc0_proof"
+name = "bundle_risc0_proof"
 version = "0.1.0"
 edition = "2021"

-[build-dependencies]
-risc0-build = { version = "1.0" }
+[dependencies]
+risc0-zkvm = { version = "1.0", default-features = false, features = ['std'] }
+cl = { path = "../cl" }
+risc0_images = { path = "../risc0_images" }
+hex = "0.4"

-[package.metadata.risc0]
-methods = ["bundle"]

+[patch.crates-io]
+# add RISC Zero accelerator support for all downstream usages of the following crates.
+sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
+crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
+curve25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curve25519-4.1.2-risczero.0" }
--- a/emmarin/cl/bundle_risc0_proof/build.rs
+++ b/emmarin/cl/bundle_risc0_proof/build.rs
@ -1,3 +0,0 @@
-fn main() {
-    risc0_build::embed_methods();
-}
--- a/emmarin/cl/bundle_risc0_proof/bundle/Cargo.toml
+++ b/emmarin/cl/bundle_risc0_proof/bundle/Cargo.toml
@ -1,19 +0,0 @@
-[package]
-name = "bundle"
-version = "0.1.0"
-edition = "2021"
-
-[workspace]
-
-[dependencies]
-risc0-zkvm = { version = "1.0", default-features = false, features = ['std'] }
-cl = { path = "../../cl" }
-risc0_images = { path = "../../risc0_images" }
-hex = "0.4"
-
-
-[patch.crates-io]
-# add RISC Zero accelerator support for all downstream usages of the following crates.
-sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
-crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
-curve25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curve25519-4.1.2-risczero.0" }
--- a/emmarin/cl/bundle_risc0_proof/bundle/src/main.rs
+++ b/emmarin/cl/bundle_risc0_proof/bundle/src/main.rs
--- a/emmarin/cl/bundle_risc0_proof/src/lib.rs
+++ b/emmarin/cl/bundle_risc0_proof/src/lib.rs
@ -1 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/methods.rs"));
--- a/emmarin/cl/gen_risc0_images.sh
+++ b/emmarin/cl/gen_risc0_images.sh
@ -3,10 +3,9 @@ set -e

 # Order of these proofs is important, we sequence them topologically by composition order
 proofs=$(cat <<EOF
-tx_risc0_proof/tx
-risc0_proofs/stf_nop
-bundle_risc0_proof/bundle
-ledger_validity_proof/ledger
+risc0_proofs
+bundle_risc0_proof
+ledger_risc0_proof
 EOF
 )

--- a/emmarin/cl/ledger_validity_proof/ledger/Cargo.toml
+++ b/emmarin/cl/ledger_validity_proof/ledger/Cargo.toml
@ -1,16 +1,14 @@
 [package]
-name = "ledger"
+name = "ledger_risc0_proof"
 version = "0.1.0"
 edition = "2021"

-[workspace]
-
 [dependencies]
 risc0-zkvm = { version = "1.0", default-features = false, features = ['std'] }
 serde = { version = "1.0", features = ["derive"] }
-cl = { path = "../../cl" }
-ledger_proof_statements = { path = "../../ledger_proof_statements" }
-risc0_images = { path = "../../risc0_images" }
+cl = { path = "../cl" }
+ledger_proof_statements = { path = "../ledger_proof_statements" }
+risc0_images = { path = "../risc0_images" }
 hex = "0.4"

 [patch.crates-io]
--- a/emmarin/cl/ledger_validity_proof/ledger/src/main.rs
+++ b/emmarin/cl/ledger_validity_proof/ledger/src/main.rs
--- a/emmarin/cl/ledger_validity_proof/Cargo.toml
+++ b/emmarin/cl/ledger_validity_proof/Cargo.toml
@ -1,11 +0,0 @@
-[package]
-name = "ledger_validity_proof"
-version = "0.1.0"
-edition = "2021"
-
-[build-dependencies]
-risc0-build = { version = "1.0" }
-
-[package.metadata.risc0]
-methods = [ "ledger"]
-
--- a/emmarin/cl/ledger_validity_proof/build.rs
+++ b/emmarin/cl/ledger_validity_proof/build.rs
@ -1,3 +0,0 @@
-fn main() {
-    risc0_build::embed_methods();
-}
--- a/emmarin/cl/ledger_validity_proof/src/lib.rs
+++ b/emmarin/cl/ledger_validity_proof/src/lib.rs
@ -1 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/methods.rs"));
--- a/emmarin/cl/risc0_images/src/BUNDLE_ELF
+++ b/emmarin/cl/risc0_images/src/BUNDLE_ELF
--- a/emmarin/cl/risc0_images/src/BUNDLE_ID
+++ b/emmarin/cl/risc0_images/src/BUNDLE_ID
@ -1 +1 @@
-b59b938e2af89c2ad422c968aeed8b243b003563b4ed54d031c3dbba57c1b18d
+656df266362e6596f47280edf402fbeac259e4657d9632e63f415cd836cd81ee
--- a/emmarin/cl/risc0_images/src/LEDGER_ELF
+++ b/emmarin/cl/risc0_images/src/LEDGER_ELF
--- a/emmarin/cl/risc0_images/src/LEDGER_ID
+++ b/emmarin/cl/risc0_images/src/LEDGER_ID
@ -1 +1 @@
-faec091447493d67f0e51863788ab0d34a268528b466d7c72d090d5b72604e6b
+5c4983ddea9568b40fe52e684b65f616e1f41b0b5799d7514db6f9165918c836
--- a/emmarin/cl/risc0_images/src/STF_NOP_ELF
+++ b/emmarin/cl/risc0_images/src/STF_NOP_ELF
--- a/emmarin/cl/risc0_images/src/STF_NOP_ID
+++ b/emmarin/cl/risc0_images/src/STF_NOP_ID
@ -1 +1 @@
-fe255112cc925c6e507222cbdae2030eb271b1e384e0fa8ab25cfe10109fb10f
+800a1ac71ac4d061aad3dba2a22d2beefda24b49151a65b22d01c1f396354bd6
--- a/emmarin/cl/risc0_images/src/TX_ELF
+++ b/emmarin/cl/risc0_images/src/TX_ELF
--- a/emmarin/cl/risc0_images/src/TX_ID
+++ b/emmarin/cl/risc0_images/src/TX_ID
@ -1 +1 @@
-de9c0427462cd7fbaff5f640547278a6e41a98dc79445442db2dfe8d0978fc25
+d935d8c24cf50a0acf09f4832b63fc232e8ec43598cd769df0b1c814ca0b0e16
--- a/emmarin/cl/risc0_proofs/Cargo.toml
+++ b/emmarin/cl/risc0_proofs/Cargo.toml
@ -1,11 +1,17 @@
 [package]
-name = "nomos_mantle_risc0_proofs"
+name = "risc0_proofs"
 version = "0.1.0"
 edition = "2021"

-[build-dependencies]
-risc0-build = { version = "1.0" }
+[dependencies]
+risc0-zkvm = { version = "1.0", default-features = false, features = ['std'] }
+serde = { version = "1.0", features = ["derive"] }
+cl = { path = "../cl" }
+ledger_proof_statements = { path = "../ledger_proof_statements" }

-[package.metadata.risc0]
-methods = ["stf_nop"]

+[patch.crates-io]
+# add RISC Zero accelerator support for all downstream usages of the following crates.
+sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
+crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
+curve25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curve25519-4.1.2-risczero.0" }
--- a/emmarin/cl/risc0_proofs/build.rs
+++ b/emmarin/cl/risc0_proofs/build.rs
@ -1,3 +0,0 @@
-fn main() {
-    risc0_build::embed_methods();
-}
--- a/emmarin/cl/risc0_proofs/stf_nop/src/main.rs
+++ b/emmarin/cl/risc0_proofs/stf_nop/src/main.rs
--- a/emmarin/cl/tx_risc0_proof/tx/src/main.rs
+++ b/emmarin/cl/tx_risc0_proof/tx/src/main.rs
--- a/emmarin/cl/risc0_proofs/src/lib.rs
+++ b/emmarin/cl/risc0_proofs/src/lib.rs
@ -1 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/methods.rs"));
--- a/emmarin/cl/risc0_proofs/stf_nop/Cargo.toml
+++ b/emmarin/cl/risc0_proofs/stf_nop/Cargo.toml
@ -1,19 +0,0 @@
-[package]
-name = "stf_nop"
-version = "0.1.0"
-edition = "2021"
-
-[workspace]
-
-[dependencies]
-risc0-zkvm = { version = "1.0", default-features = false, features = ['std'] }
-serde = { version = "1.0", features = ["derive"] }
-cl = { path = "../../cl" }
-ledger_proof_statements = { path = "../../ledger_proof_statements" }
-
-
-[patch.crates-io]
-# add RISC Zero accelerator support for all downstream usages of the following crates.
-sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
-crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
-curve25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curve25519-4.1.2-risczero.0" }
--- a/emmarin/cl/tx_risc0_proof/Cargo.toml
+++ b/emmarin/cl/tx_risc0_proof/Cargo.toml
@ -1,11 +0,0 @@
-[package]
-name = "nomos_mantle_tx_risc0_proof"
-version = "0.1.0"
-edition = "2021"
-
-[build-dependencies]
-risc0-build = { version = "1.0" }
-
-[package.metadata.risc0]
-methods = ["tx"]
-
--- a/emmarin/cl/tx_risc0_proof/build.rs
+++ b/emmarin/cl/tx_risc0_proof/build.rs
@ -1,3 +0,0 @@
-fn main() {
-    risc0_build::embed_methods();
-}
--- a/emmarin/cl/tx_risc0_proof/src/lib.rs
+++ b/emmarin/cl/tx_risc0_proof/src/lib.rs
@ -1 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/methods.rs"));
--- a/emmarin/cl/tx_risc0_proof/tx/Cargo.toml
+++ b/emmarin/cl/tx_risc0_proof/tx/Cargo.toml
@ -1,19 +0,0 @@
-[package]
-name = "tx"
-version = "0.1.0"
-edition = "2021"
-
-[workspace]
-
-[dependencies]
-risc0-zkvm = { version = "1.0", default-features = false, features = ['std'] }
-serde = { version = "1.0", features = ["derive"] }
-cl = { path = "../../cl" }
-ledger_proof_statements = { path = "../../ledger_proof_statements" }
-
-
-[patch.crates-io]
-# add RISC Zero accelerator support for all downstream usages of the following crates.
-sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
-crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
-curve25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curve25519-4.1.2-risczero.0" }
				`@ -1 +0,0 @@`
				`include!(concat!(env!("OUT_DIR"), "/methods.rs"));`