Merge pull request #11 from movementlabsxyz/0xmovses/ENG-110-standup-mockrollup

ENG-110 Stand up a MockRollup Sov-labs rollup

Author: 0xmovses

Cargo.toml

@@ -1,50 +1,53 @@
-[workspace.package]
-authors = ["Movement Labs"]
-edition = "2021"
-repository = "https://github.com/movemntdev/sdk"
-license = "Apache-2.0"
-
 [workspace]
+
 resolver = "2"
+
 members = [
-    "protocol-units/data-availability",
-    "protocol-units/zkfp/host",
-    "protocol-units/zkfp/methods",
-    "protocol-units/zkfp/methods/guest"
+    "m2/rollup",
+    "m2/stf",
 ]
 
-exclude = [
-    "shared-sequencer/movement-sequencer"
-]
+[workspace.package]
+version = "0.3.0"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+authors = ["Movement Labs"]
+publish = false
+rust-version = "1.73"
 
 [workspace.dependencies]
-anyhow = "1.0"
-# To try (experimental) std support, add `features = [ "std" ]` to risc0-zkvm
-risc0-zkvm = { version = "0.20.1",  features = ["std"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-serde = "1.0"
-tempfile = "3.2.0"
-
-# Move dependencies
-move-vm-runtime = { path = "protocol-units/zkfp/vendors/move/language/move-vm/runtime" }
-move-vm-test-utils = { path = "protocol-units/zkfp/vendors/move/language/move-vm/test-utils" }
-move-binary-format = { path = "protocol-units/zkfp/vendors/move/language/move-binary-format" }
-move-vm-types = { path = "protocol-units/zkfp/vendors/move/language/move-vm/types"}
-move-core-types = { path = "protocol-units/zkfp/vendors/move/language/move-core/types" }
-move-compiler = { path = "protocol-units/zkfp/vendors/move/language/move-compiler" }
-move-stdlib = { path = "protocol-units/zkfp/vendors/move/language/move-stdlib" }
-
-
-# Always optimize; building and running the guest takes much longer without optimization.
-[profile.dev]
-opt-level = 3
-
-[profile.dev.build-override]
-opt-level = 3
-
-[profile.release]
-debug = 1
-lto = true
-
-[profile.release.build-override]
-opt-level = 3
+sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-accounts = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-bank = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-ledger-rpc = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-sequencer-registry = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-modules-rollup-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-stf-runner = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-db = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-sequencer = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-mock-zkvm = {  git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b"  }
+sov-first-read-last-write-cache = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-cli = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-mock-da = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-celestia-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-prover-storage-manager = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+
+stf-starter = { path = "./crates/stf" }
+
+serde = { version = "1.0.192", features = ["derive", "rc"] }
+serde_json = { version = "1.0" }
+
+anyhow = "1.0.68"
+clap = { version = "4.4.10", features = ["derive"] }
+async-trait = "0.1.71"
+borsh = { version = "0.10.3", features = ["rc", "bytes"] }
+tracing = "0.1.40"
+tokio = { version = "1", features = ["full"] }
+tempfile = "3.5"
+jsonrpsee = { version = "0.20.1", features = ["jsonrpsee-types"] }
+
+risc0-build = "0.20"

m2/provers/risc0/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "m2-risc0"
+version = "0.3.0"
+edition = "2021"
+resolver = "2"
+license = "MIT OR Apache-2.0"
+publish = false
+
+[build-dependencies]
+risc0-build = { workspace = true }
+
+[package.metadata.risc0]
+methods = ["guest-celestia", "guest-mock"]
+
+[features]
+bench = []

m2/provers/risc0/build.rs

@@ -0,0 +1,24 @@
+use std::collections::HashMap;
+
+fn main() {
+    if std::env::var("SKIP_GUEST_BUILD").is_ok() {
+        println!("Skipping guest build for CI run");
+        let out_dir = std::env::var_os("OUT_DIR").unwrap();
+        let out_dir = std::path::Path::new(&out_dir);
+        let methods_path = out_dir.join("methods.rs");
+
+        let elf = r#"
+            pub const ROLLUP_ELF: &[u8] = &[];
+            pub const MOCK_DA_ELF: &[u8] = &[];
+        "#;
+
+        std::fs::write(methods_path, elf).expect("Failed to write mock rollup elf");
+    } else {
+        let guest_pkg_to_options = get_guest_options();
+        risc0_build::embed_methods_with_options(guest_pkg_to_options);
+    }
+}
+
+fn get_guest_options() -> HashMap<&'static str, risc0_build::GuestOptions> {
+    HashMap::new()
+}

m2/provers/risc0/guest-celestia/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "sov-demo-prover-guest-celestia"
+version = "0.3.0"
+edition = "2021"
+resolver = "2"
+
+[workspace]
+
+[dependencies]
+anyhow = "1.0.68"
+ahash = "=0.8.6" # Force ahash to an old version to prevent build issues: https://github.com/risc0/risc0/issues/1406. This can be removed once risc0 updates to rust 1.72
+time-macros = "=0.2.15" # Same as above
+
+risc0-zkvm = { version = "0.20", default-features = false, features = ["std"] }
+risc0-zkvm-platform = "0.20"
+
+m2-stf = { path = "../../../stf" }
+
+sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-celestia-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+
+[patch.crates-io]
+sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
+ed25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curve25519-4.1.0-risczero.1" }
+crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.2-risc0" }
+
+[profile.dev]
+opt-level = 3
+
+[profile.dev.build-override]
+opt-level = 3
+
+[profile.release]
+debug = 1
+lto = true
+
+[profile.release.build-override]
+opt-level = 3

m2/provers/risc0/guest-celestia/src/bin/rollup.rs

@@ -0,0 +1,41 @@
+// TODO: Rename this file to change the name of this method from METHOD_NAME
+
+#![no_main]
+
+use m2_stf::runtime::Runtime;
+use m2_stf::StfVerifier;
+use sov_celestia_adapter::types::Namespace;
+use sov_celestia_adapter::verifier::CelestiaVerifier;
+use sov_modules_api::default_spec::ZkDefaultSpec;
+use sov_modules_stf_blueprint::kernels::basic::BasicKernel;
+use sov_modules_stf_blueprint::StfBlueprint;
+use sov_risc0_adapter::guest::Risc0Guest;
+use sov_risc0_adapter::Risc0Verifier;
+use sov_state::ZkStorage;
+
+/// The namespace for the rollup on Celestia. Must be kept in sync with the "rollup/src/lib.rs"
+const ROLLUP_NAMESPACE: Namespace = Namespace::const_v0(*b"sov-celest");
+
+risc0_zkvm::guest::entry!(main);
+
+pub fn main() {
+    let guest = Risc0Guest::new();
+    let storage = ZkStorage::new();
+    let stf: StfBlueprint<
+        ZkDefaultSpec<Risc0Verifier>,
+        _,
+        Risc0Verifier,
+        Runtime<_, _>,
+        BasicKernel<_, _>,
+    > = StfBlueprint::new();
+
+    let stf_verifier = StfVerifier::new(
+        stf,
+        CelestiaVerifier {
+            rollup_namespace: ROLLUP_NAMESPACE,
+        },
+    );
+    stf_verifier
+        .run_block(guest, storage)
+        .expect("Prover must be honest");
+}

m2/provers/risc0/guest-mock/Cargo.toml

@@ -0,0 +1,44 @@
+[workspace]
+
+[package]
+name = "guest-mock-starter"
+version = "0.3.0"
+edition = "2021"
+resolver = "2"
+
+[dependencies]
+anyhow = "1.0.68"
+ahash = "=0.8.6" # Force ahash to an old version to prevent build issues: https://github.com/risc0/risc0/issues/1406. This can be removed once risc0 updates to rust 1.72
+time-macros = "=0.2.15"
+risc0-zkvm = { version = "0.20", default-features = false, features = ["std"] }
+risc0-zkvm-platform = "0.20"
+
+serde = { version = "1.0.188", features = ["derive", "rc"] }
+
+
+sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-mock-da = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
+
+m2-stf = { path = "../../../stf" }
+
+[patch.crates-io]
+sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
+ed25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curve25519-4.1.0-risczero.1" }
+crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.2-risc0" }
+
+[profile.dev]
+opt-level = 3
+
+[profile.dev.build-override]
+opt-level = 3
+
+[profile.release]
+debug = 1
+lto = true
+
+[profile.release.build-override]
+opt-level = 3

m2/provers/risc0/guest-mock/src/bin/mock_da.rs

@@ -0,0 +1,55 @@
+#![no_main]
+//! This binary implements the verification logic for the rollup. This is the code that runs inside
+//! of the zkvm in order to generate proofs for the rollup.
+
+use m2_stf::runtime::Runtime;
+use m2_stf::StfVerifier;
+use sov_mock_da::MockDaVerifier;
+use sov_modules_api::default_spec::ZkDefaultSpec;
+use sov_modules_stf_blueprint::kernels::basic::BasicKernel;
+use sov_modules_stf_blueprint::StfBlueprint;
+use sov_risc0_adapter::guest::Risc0Guest;
+use sov_risc0_adapter::Risc0Verifier;
+use sov_state::ZkStorage;
+
+#[cfg(feature = "bench")]
+fn report_bench_metrics(start_cycles: usize, end_cycles: usize) {
+    let cycles_per_block = (end_cycles - start_cycles) as u64;
+    let tuple = ("Cycles per block".to_string(), cycles_per_block);
+    let mut serialized = Vec::new();
+    serialized.extend(tuple.0.as_bytes());
+    serialized.push(0);
+    let size_bytes = tuple.1.to_ne_bytes();
+    serialized.extend(&size_bytes);
+
+    // calculate the syscall name.
+    let cycle_string = String::from("cycle_metrics\0");
+    let metrics_syscall_name =
+        risc0_zkvm_platform::syscall::SyscallName::from_bytes_with_nul(cycle_string.as_ptr());
+
+    risc0_zkvm::guest::env::send_recv_slice::<u8, u8>(metrics_syscall_name, &serialized);
+}
+
+risc0_zkvm::guest::entry!(main);
+
+pub fn main() {
+    let guest = Risc0Guest::new();
+    let storage = ZkStorage::new();
+    #[cfg(feature = "bench")]
+    let start_cycles = risc0_zkvm_platform::syscall::sys_cycle_count();
+
+    let stf: StfBlueprint<ZkDefaultSpec<Risc0Verifier>, _, _, Runtime<_, _>, BasicKernel<_, _>> =
+        StfBlueprint::new();
+
+    let stf_verifier = StfVerifier::new(stf, MockDaVerifier {});
+
+    stf_verifier
+        .run_block(guest, storage)
+        .expect("Prover must be honest");
+
+    #[cfg(feature = "bench")]
+    {
+        let end_cycles = risc0_zkvm_platform::syscall::sys_cycle_count();
+        report_bench_metrics(start_cycles, end_cycles);
+    }
+}

protocol-units/zkfp/methods/src/lib.rs m2/provers/risc0/src/lib.rs

@@ -0,0 +1,64 @@
+[package]
+name = "m2-rollup"
+version = "0.1.0" 
+edition = { workspace = true }
+resolver = "2"
+authors = { workspace = true }
+license = { workspace = true }
+homepage = "sovereign.xyz"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+sov-modules-api = { workspace = true, features = ["native"] }
+sov-state = { workspace = true }
+sov-prover-storage-manager = { workspace = true }
+sov-accounts = { workspace = true, features = ["native"] }
+sov-bank = { workspace = true, features = ["native"] }
+sov-ledger-rpc = { workspace = true, features = ["server"] }
+sov-sequencer-registry = { workspace = true, features = ["native"] }
+sov-modules-rollup-blueprint = { workspace = true }
+sov-modules-stf-blueprint = { workspace = true, features = ["native"] }
+sov-stf-runner = { workspace = true, features = ["native"] }
+sov-cli = { workspace = true, optional = true }
+
+sov-db = { workspace = true }
+sov-sequencer = { workspace = true }
+sov-rollup-interface = { workspace = true }
+sov-mock-da = { workspace = true, features = ["native"], optional=true }
+sov-celestia-adapter = { workspace = true, features = ["native"], optional=true }
+
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+borsh = { workspace = true }
+clap = { workspace = true }
+serde = { workspace = true }
+tracing = { workspace = true }
+serde_json = { workspace = true }
+jsonrpsee = { workspace = true }
+tokio = { workspace = true }
+
+m2-risc0 = { path = "../provers/risc0" }
+m2-stf = { path = "../stf", features = ["native"] }
+sov-risc0-adapter = { workspace = true, features = ["native"] }
+
+# binary dependencies
+tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
+
+[dev-dependencies]
+tempfile = { workspace = true }
+sov-mock-zkvm = { workspace = true, features = ["native"] }
+
+[features]
+default = ["mock_da"] # set mock_da as the default feature
+mock_da = ["sov-mock-da"]
+celestia_da = ["sov-celestia-adapter"]
+
+[[bin]]
+name = "node"
+path = "src/bin/node.rs"
+
+[[bin]]
+name = "starter-cli-wallet"
+path = "src/bin/starter_cli_wallet.rs"