From 147c5a0304fafd5e00776b538f9a9b87530c2936 Mon Sep 17 00:00:00 2001 From: bkolad Date: Tue, 14 Nov 2023 16:07:04 +0100 Subject: [PATCH 1/2] Intriduce ProverService --- Cargo.lock | 42 +++++++------- Cargo.toml | 34 +++++------ .../provers/risc0/guest-celestia/Cargo.lock | 26 ++++----- .../provers/risc0/guest-celestia/Cargo.toml | 12 ++-- crates/provers/risc0/guest-mock/Cargo.lock | 26 ++++----- crates/provers/risc0/guest-mock/Cargo.toml | 12 ++-- crates/rollup/src/bin/node.rs | 11 ++-- crates/rollup/src/celestia_rollup.rs | 57 ++++++++++++------- crates/rollup/src/mock_rollup.rs | 44 +++++++++----- 9 files changed, 151 insertions(+), 113 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5754196..d461775 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3749,7 +3749,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -3766,7 +3766,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -3783,7 +3783,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "async-trait", @@ -3811,7 +3811,7 @@ dependencies = [ [[package]] name = "sov-cli" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -3828,7 +3828,7 @@ dependencies = [ [[package]] name = "sov-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bincode", @@ -3845,7 +3845,7 @@ dependencies = [ [[package]] name = "sov-ledger-rpc" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "futures", @@ -3858,7 +3858,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "async-trait", @@ -3874,7 +3874,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bech32", @@ -3900,7 +3900,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bech32", @@ -3919,7 +3919,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -3935,7 +3935,7 @@ dependencies = [ [[package]] name = "sov-modules-rollup-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "async-trait", @@ -3958,7 +3958,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -3976,7 +3976,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bincode", @@ -3993,7 +3993,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "async-trait", @@ -4046,7 +4046,7 @@ dependencies = [ [[package]] name = "sov-schema-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "once_cell", @@ -4059,7 +4059,7 @@ dependencies = [ [[package]] name = "sov-sequencer" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -4075,7 +4075,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -4092,7 +4092,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bcs", @@ -4111,9 +4111,10 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", + "async-trait", "borsh", "futures", "hex", @@ -4122,6 +4123,7 @@ dependencies = [ "serde_json", "sov-db", "sov-rollup-interface", + "thiserror", "tokio", "toml 0.8.6", "tracing", @@ -4130,7 +4132,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "bytes", "risc0-zkvm", diff --git a/Cargo.toml b/Cargo.toml index db0d14a..f0f8bb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,23 +16,23 @@ publish = false rust-version = "1.73" [workspace.dependencies] -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } stf-starter = { path = "./crates/stf" } serde = { version = "1.0.188", features = ["derive", "rc"] } diff --git a/crates/provers/risc0/guest-celestia/Cargo.lock b/crates/provers/risc0/guest-celestia/Cargo.lock index 0900cef..eea87f1 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.lock +++ b/crates/provers/risc0/guest-celestia/Cargo.lock @@ -1977,7 +1977,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -1990,7 +1990,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -2003,7 +2003,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "async-trait", @@ -2043,7 +2043,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bech32", @@ -2064,7 +2064,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bech32", @@ -2083,7 +2083,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -2098,7 +2098,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -2115,7 +2115,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bincode", @@ -2130,7 +2130,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "async-trait", @@ -2147,7 +2147,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -2160,7 +2160,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bcs", @@ -2178,7 +2178,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -2191,7 +2191,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-celestia/Cargo.toml b/crates/provers/risc0/guest-celestia/Cargo.toml index a682c53..84841ba 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.toml +++ b/crates/provers/risc0/guest-celestia/Cargo.toml @@ -13,12 +13,12 @@ risc0-zkvm-platform = "0.18" stf-starter = { path = "../../../stf" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } [patch.crates-io] sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2/v0.10.6-risc0" } diff --git a/crates/provers/risc0/guest-mock/Cargo.lock b/crates/provers/risc0/guest-mock/Cargo.lock index 5ee6267..10c649f 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -942,7 +942,7 @@ checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -955,7 +955,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -968,7 +968,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "async-trait", @@ -983,7 +983,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bech32", @@ -1004,7 +1004,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bech32", @@ -1023,7 +1023,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -1038,7 +1038,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -1055,7 +1055,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bincode", @@ -1070,7 +1070,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "async-trait", @@ -1087,7 +1087,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "bcs", @@ -1118,7 +1118,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "anyhow", "borsh", @@ -1131,7 +1131,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=ed0ae8db577289f17a10e6855de3f7e8835359a4#ed0ae8db577289f17a10e6855de3f7e8835359a4" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index ab203f7..1ad6d82 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -14,12 +14,12 @@ risc0-zkvm-platform = "0.18" serde = { version = "1.0.188", features = ["derive", "rc"] } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "ed0ae8db577289f17a10e6855de3f7e8835359a4" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "84ed498393577fd1272338599639eb57340c5b89" } stf-starter = { path = "../../../stf" } diff --git a/crates/rollup/src/bin/node.rs b/crates/rollup/src/bin/node.rs index c6eafbc..a1e629f 100644 --- a/crates/rollup/src/bin/node.rs +++ b/crates/rollup/src/bin/node.rs @@ -2,15 +2,16 @@ use anyhow::Context; use clap::Parser; -use sov_modules_rollup_blueprint::{Rollup, RollupBlueprint, RollupProverConfig}; -#[cfg(feature = "mock_da")] -use sov_rollup_starter::mock_rollup::MockRollup; #[cfg(feature = "celestia_da")] -use sov_rollup_starter::celestia_rollup::CelestiaRollup; +use sov_celestia_adapter::CelestiaConfig; #[cfg(feature = "mock_da")] use sov_mock_da::MockDaConfig; +use sov_modules_rollup_blueprint::{Rollup, RollupBlueprint}; #[cfg(feature = "celestia_da")] -use sov_celestia_adapter::CelestiaConfig; +use sov_rollup_starter::celestia_rollup::CelestiaRollup; +#[cfg(feature = "mock_da")] +use sov_rollup_starter::mock_rollup::MockRollup; +use sov_stf_runner::RollupProverConfig; use sov_stf_runner::{from_toml_path, RollupConfig}; use std::str::FromStr; use stf_starter::genesis_config::GenesisPaths; diff --git a/crates/rollup/src/celestia_rollup.rs b/crates/rollup/src/celestia_rollup.rs index 53bb661..7a18589 100644 --- a/crates/rollup/src/celestia_rollup.rs +++ b/crates/rollup/src/celestia_rollup.rs @@ -4,19 +4,23 @@ use async_trait::async_trait; use sov_db::ledger_db::LedgerDB; +use sov_celestia_adapter::types::Namespace; +use sov_celestia_adapter::verifier::{CelestiaSpec, CelestiaVerifier, RollupParams}; +use sov_celestia_adapter::{CelestiaConfig, CelestiaService}; use sov_modules_api::default_context::{DefaultContext, ZkDefaultContext}; use sov_modules_api::Spec; use sov_modules_stf_blueprint::kernels::basic::BasicKernel; +use sov_modules_stf_blueprint::StfBlueprint; use sov_risc0_adapter::host::Risc0Host; -use sov_rollup_interface::services::da::DaService; +use sov_rollup_interface::zk::ZkvmHost; use sov_state::config::Config as StorageConfig; -use sov_state::{DefaultStorageSpec, ZkStorage}; use sov_state::storage_manager::ProverStorageManager; +use sov_state::Storage; +use sov_state::{DefaultStorageSpec, ZkStorage}; +use sov_stf_runner::BlockingProver; use sov_stf_runner::RollupConfig; +use sov_stf_runner::RollupProverConfig; use stf_starter::Runtime; -use sov_celestia_adapter::{CelestiaConfig, CelestiaService}; -use sov_celestia_adapter::types::Namespace; -use sov_celestia_adapter::verifier::{CelestiaSpec, CelestiaVerifier, RollupParams}; /// 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"); @@ -44,6 +48,20 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { type NativeKernel = BasicKernel; type ZkKernel = BasicKernel; + type ProverService = BlockingProver< + <::Storage as Storage>::Root, + <::Storage as Storage>::Witness, + Self::DaService, + Self::Vm, + StfBlueprint< + Self::ZkContext, + Self::DaSpec, + ::Guest, + Self::ZkRuntime, + Self::ZkKernel, + >, + >; + fn create_rpc_methods( &self, storage: &::Storage, @@ -51,7 +69,7 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { da_service: &Self::DaService, ) -> Result, anyhow::Error> { #[allow(unused_mut)] - let mut rpc_methods = sov_modules_rollup_blueprint::register_rpc::< + let mut rpc_methods = sov_modules_rollup_blueprint::register_rpc::< Self::NativeRuntime, Self::NativeContext, Self::DaService, @@ -77,7 +95,7 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { namespace: ROLLUP_NAMESPACE, }, ) - .await + .await } fn create_storage_manager( @@ -90,21 +108,20 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { ProverStorageManager::new(storage_config) } - fn create_zk_storage( + async fn create_prover_service( &self, - _rollup_config: &RollupConfig, - ) -> ::Storage { - ZkStorage::new() - } - - fn create_vm(&self) -> Self::Vm { - Risc0Host::new(risc0_starter::ROLLUP_ELF) - } - - fn create_verifier(&self) -> ::Verifier { - CelestiaVerifier { + prover_config: Option, + _da_service: &Self::DaService, + ) -> Self::ProverService { + let vm = Risc0Host::new(risc0_starter::ROLLUP_ELF); + let zk_stf = StfBlueprint::new(); + let zk_storage = ZkStorage::new(); + + let da_verifier = CelestiaVerifier { rollup_namespace: ROLLUP_NAMESPACE, - } + }; + + BlockingProver::new(vm, zk_stf, da_verifier, prover_config, zk_storage) } } diff --git a/crates/rollup/src/mock_rollup.rs b/crates/rollup/src/mock_rollup.rs index 2b08e89..ea5aad9 100644 --- a/crates/rollup/src/mock_rollup.rs +++ b/crates/rollup/src/mock_rollup.rs @@ -7,14 +7,18 @@ use sov_mock_da::{MockDaConfig, MockDaService, MockDaSpec}; use sov_modules_api::default_context::{DefaultContext, ZkDefaultContext}; use sov_modules_api::Spec; use sov_modules_stf_blueprint::kernels::basic::BasicKernel; +use sov_modules_stf_blueprint::StfBlueprint; use sov_risc0_adapter::host::Risc0Host; -use sov_rollup_interface::services::da::DaService; +use sov_rollup_interface::zk::ZkvmHost; use sov_state::config::Config as StorageConfig; +use sov_state::Storage; use sov_state::{DefaultStorageSpec, ZkStorage}; +use sov_stf_runner::BlockingProver; use sov_stf_runner::RollupConfig; +use sov_stf_runner::RollupProverConfig; use stf_starter::Runtime; - /// Rollup with [`MockDaService`]. + pub struct MockRollup {} /// This is the place, where all the rollup components come together and @@ -46,6 +50,21 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for MockRollup { type NativeKernel = BasicKernel; type ZkKernel = BasicKernel; + /// Prover service. + type ProverService = BlockingProver< + <::Storage as Storage>::Root, + <::Storage as Storage>::Witness, + Self::DaService, + Self::Vm, + StfBlueprint< + Self::ZkContext, + Self::DaSpec, + ::Guest, + Self::ZkRuntime, + Self::ZkKernel, + >, + >; + /// This function generates RPC methods for the rollup, allowing for extension with custom endpoints. fn create_rpc_methods( &self, @@ -79,20 +98,19 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for MockRollup { sov_state::storage_manager::ProverStorageManager::new(storage_config) } - fn create_zk_storage( + async fn create_prover_service( &self, - _rollup_config: &RollupConfig, - ) -> ::Storage { - ZkStorage::new() - } - fn create_vm(&self) -> Self::Vm { - Risc0Host::new(risc0_starter::MOCK_DA_ELF) - } + prover_config: Option, + _da_service: &Self::DaService, + ) -> Self::ProverService { + let vm = Risc0Host::new(risc0_starter::MOCK_DA_ELF); + let zk_stf = StfBlueprint::new(); + let zk_storage = ZkStorage::new(); + let da_verifier = Default::default(); - fn create_verifier(&self) -> ::Verifier { - Default::default() + BlockingProver::new(vm, zk_stf, da_verifier, prover_config, zk_storage) } } -impl sov_modules_rollup_blueprint::WalletBlueprint for MockRollup {} \ No newline at end of file +impl sov_modules_rollup_blueprint::WalletBlueprint for MockRollup {} From 418b1be1d12d68b15c3b17674f4880675e8a4f7f Mon Sep 17 00:00:00 2001 From: bkolad Date: Tue, 14 Nov 2023 16:27:38 +0100 Subject: [PATCH 2/2] Fix tests --- crates/rollup/tests/bank/mod.rs | 5 ++--- crates/rollup/tests/test_helpers.rs | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/rollup/tests/bank/mod.rs b/crates/rollup/tests/bank/mod.rs index cb405bd..d05c91c 100644 --- a/crates/rollup/tests/bank/mod.rs +++ b/crates/rollup/tests/bank/mod.rs @@ -1,5 +1,6 @@ use std::net::SocketAddr; +use super::test_helpers::start_rollup; use borsh::BorshSerialize; use jsonrpsee::core::client::{Subscription, SubscriptionClientT}; use jsonrpsee::rpc_params; @@ -8,13 +9,11 @@ use sov_modules_api::default_context::DefaultContext; use sov_modules_api::default_signature::private_key::DefaultPrivateKey; use sov_modules_api::transaction::Transaction; use sov_modules_api::{PrivateKey, Spec}; -use sov_modules_rollup_blueprint::RollupProverConfig; use sov_sequencer::utils::SimpleClient; +use sov_stf_runner::RollupProverConfig; use stf_starter::genesis_config::GenesisPaths; use stf_starter::RuntimeCall; -use super::test_helpers::start_rollup; - const TOKEN_SALT: u64 = 0; const TOKEN_NAME: &str = "test_token"; diff --git a/crates/rollup/tests/test_helpers.rs b/crates/rollup/tests/test_helpers.rs index 8bba56a..199632c 100644 --- a/crates/rollup/tests/test_helpers.rs +++ b/crates/rollup/tests/test_helpers.rs @@ -1,8 +1,9 @@ use std::net::SocketAddr; use sov_mock_da::{MockAddress, MockDaConfig}; -use sov_modules_rollup_blueprint::{RollupBlueprint, RollupProverConfig}; +use sov_modules_rollup_blueprint::RollupBlueprint; use sov_rollup_starter::mock_rollup::MockRollup; +use sov_stf_runner::RollupProverConfig; use sov_stf_runner::{RollupConfig, RpcConfig, RunnerConfig, StorageConfig}; use stf_starter::genesis_config::GenesisPaths; use tokio::sync::oneshot;