diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index a7157fb3d..294ca5292 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -16,13 +16,6 @@ description: "Install dependencies for building and bundling Nomos." runs: using: "composite" steps: - - name: Install risc0 - uses: ./.github/actions/install-risc0 - with: - github_token: ${{ inputs.github_token }} - os: ${{ inputs.os }} - target_triple: ${{ inputs.target_triple }} - - name: Setup linux system if: inputs.os == 'linux' shell: bash diff --git a/.github/actions/install-risc0/action.yml b/.github/actions/install-risc0/action.yml deleted file mode 100644 index 34bcc16a5..000000000 --- a/.github/actions/install-risc0/action.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: "Install Risc0" - -description: "Install the Risc0 toolchain. Requires the Rust toolchain to be installed." - -inputs: - github_token: - description: "The GitHub token to use for rate limiting." - required: true - -runs: - using: "composite" - steps: - - name: Install cargo-binstall - uses: cargo-bins/cargo-binstall@b9bf4400702f721d469eec4d280125f650c85638 # Version 1.12.2 - env: - # Required to avoid throttling by GitHub - GITHUB_TOKEN: ${{ inputs.github_token }} - - name: Install risc0 using cargo-install - # rzup manage risc0 rust toolchain. To check what are supported versions - # visit https://github.com/risc0/risc0 and https://github.com/risc0/rust - # release pages. - # - # When updating rzup, risczero or risc0 rust toolchain also update these files: - # * Dockerfile - # * ci/Dockerfile - # * testnet/Dockerfile - # * .github/workflows/code-check.yml (the `risc0-clippy` within the `lints` job) - run: | - cargo install rzup --version 0.4.1 --locked \ - && ~/.cargo/bin/rzup install cargo-risczero 2.3.2 \ - && ~/.cargo/bin/rzup install rust 1.88.0 - shell: bash - env: - # Required to avoid throttling by GitHub - GITHUB_TOKEN: ${{ inputs.github_token }} diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml index 6b5ac64eb..8167e00d7 100644 --- a/.github/workflows/code-check.yml +++ b/.github/workflows/code-check.yml @@ -72,7 +72,6 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run cargo-hack env: - RISC0_SKIP_BUILD: true RUSTFLAGS: -D warnings run: cargo hack --feature-powerset --no-dev-deps check - name: Update Cargo cache @@ -107,7 +106,6 @@ jobs: os: [ ubuntu-latest, macos-latest ] runs-on: ${{ matrix.os }} env: - RISC0_SKIP_BUILD: true RUSTFLAGS: -D warnings steps: - name: Checkout repository @@ -146,11 +144,6 @@ jobs: - name: Checkout repository uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # Version 4.2.2 - - name: Install risc0 dependencies - uses: ./.github/actions/install-risc0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - - name: Set up Cargo cache uses: ./.github/actions/setup-cargo-cache with: diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index ae5640af6..9f56b9cb0 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -18,10 +18,6 @@ jobs: uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # Version 4.2.2 - name: Add llvm-tools-preview component run: rustup component add llvm-tools-preview - - name: Install risc0 dependencies - uses: ./.github/actions/install-risc0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - name: Build required binaries uses: actions-rs/cargo@9e120dd99b0fbad1c065f686657e914e76bd7b72 # Version 1.0.1 with: diff --git a/Cargo.toml b/Cargo.toml index c5f0e732e..eba181864 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -131,7 +131,6 @@ overwatch = { default-features = false, git = "https://github.com/logos- overwatch-derive = { default-features = false, git = "https://github.com/logos-co/Overwatch", rev = "f5a9902" } rand = { default-features = false, version = "0.8" } reqwest = { default-features = false, version = "0.12" } -risc0-zkvm = { default-features = false, version = "2.3.2" } serde_json = { default-features = false, version = "1.0" } serde_with = { default-features = false, version = "3.14.0" } tempfile = { default-features = false, version = "3" } diff --git a/README.md b/README.md index dc0f2f6b8..985ea8d72 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,6 @@ necessary for running and interacting with the Nomos blockchain. Key features in - We aim to maintain compatibility with the latest stable version of Rust. - [Installation Guide](https://www.rust-lang.org/tools/install) -- **Risc0** - - Required for zero-knowledge proof functionality. - - [Installation Guide](https://dev.risczero.com/api/zkvm/install) - ## Design Goals ### Service Architecture diff --git a/hooks/cargo-hack.sh b/hooks/cargo-hack.sh index 7e13b3774..aef52764c 100755 --- a/hooks/cargo-hack.sh +++ b/hooks/cargo-hack.sh @@ -1,3 +1,3 @@ #!/bin/bash -RISC0_SKIP_BUILD=true RUSTFLAGS="-D warnings" cargo hack --feature-powerset --no-dev-deps check +RUSTFLAGS="-D warnings" cargo hack --feature-powerset --no-dev-deps check diff --git a/nomos-core/chain-defs/Cargo.toml b/nomos-core/chain-defs/Cargo.toml index e9e59124e..f094f4436 100644 --- a/nomos-core/chain-defs/Cargo.toml +++ b/nomos-core/chain-defs/Cargo.toml @@ -9,7 +9,6 @@ version = "0.1.0" workspace = true [dependencies] -anyhow = { default-features = false, version = "1.0" } ark-ff = { default-features = false, version = "0.4" } async-trait = { version = "0.1" } bincode = "1.3" diff --git a/nomos-core/chain-defs/src/codec/bincode/mod.rs b/nomos-core/chain-defs/src/codec/bincode/mod.rs index 3cb5c2640..bc172e490 100644 --- a/nomos-core/chain-defs/src/codec/bincode/mod.rs +++ b/nomos-core/chain-defs/src/codec/bincode/mod.rs @@ -17,10 +17,7 @@ pub type BincodeOptions = WithOtherTrailing< RejectTrailing, >; -// TODO: Remove this once we transition to smaller proofs -// Risc0 proofs are HUGE (220 Kb) and it's the only reason we need to have this -// limit so large -pub const DATA_LIMIT: u64 = 1 << 18; // Do not serialize/deserialize more than 256 KiB +pub const DATA_LIMIT: u64 = 1 << 16; // Do not serialize/deserialize more than 64 KiB pub static OPTIONS: LazyLock = LazyLock::new(|| { bincode::DefaultOptions::new() .with_little_endian() diff --git a/nomos-core/chain-defs/src/mantle/mod.rs b/nomos-core/chain-defs/src/mantle/mod.rs index 9d1ca5d96..55968d558 100644 --- a/nomos-core/chain-defs/src/mantle/mod.rs +++ b/nomos-core/chain-defs/src/mantle/mod.rs @@ -81,8 +81,6 @@ pub trait TxSelect { #[derive(Debug, Error)] pub enum Error { - #[error("Risc0 failed to prove execution of the zkvm")] - Risc0ProofFailed(#[from] anyhow::Error), #[error("Invalid witness")] InvalidWitness, } diff --git a/nomos-libp2p/src/behaviour/mod.rs b/nomos-libp2p/src/behaviour/mod.rs index 26a5b8cc1..6d9c30f74 100644 --- a/nomos-libp2p/src/behaviour/mod.rs +++ b/nomos-libp2p/src/behaviour/mod.rs @@ -20,9 +20,7 @@ pub mod gossipsub; pub mod kademlia; pub mod nat; -// TODO: Risc0 proofs are HUGE (220 Kb) and it's the only reason we need to have -// this limit so large. Remove this once we transition to smaller proofs. -const DATA_LIMIT: usize = 1 << 18; // Do not serialize/deserialize more than 256 KiB +const DATA_LIMIT: usize = 1 << 16; // Do not serialize/deserialize more than 256 KiB pub(crate) struct BehaviourConfig { pub gossipsub_config: libp2p::gossipsub::Config,