diff --git a/crates/provers/risc0/guest-mock/src/bin/mock_da.rs b/crates/provers/risc0/guest-mock/src/bin/mock_da.rs index a3d9c11..2393df2 100644 --- a/crates/provers/risc0/guest-mock/src/bin/mock_da.rs +++ b/crates/provers/risc0/guest-mock/src/bin/mock_da.rs @@ -3,6 +3,7 @@ //! of the zkvm in order to generate proofs for the rollup. use sov_modules_api::default_context::ZkDefaultContext; +use sov_modules_stf_template::kernels::basic::BasicKernel; use sov_modules_stf_template::AppTemplate; use sov_risc0_adapter::guest::Risc0Guest; use sov_rollup_interface::mocks::MockDaVerifier; @@ -15,7 +16,8 @@ risc0_zkvm::guest::entry!(main); pub fn main() { let guest = Risc0Guest::new(); let storage = ZkStorage::new(); - let app: AppTemplate> = AppTemplate::new(); + let app: AppTemplate, BasicKernel<_>> = + AppTemplate::new(); let mut stf_verifier = AppVerifier::new(app, MockDaVerifier {}); diff --git a/crates/rollup/src/lib.rs b/crates/rollup/src/lib.rs index 5c515a2..9aee9db 100644 --- a/crates/rollup/src/lib.rs +++ b/crates/rollup/src/lib.rs @@ -5,6 +5,7 @@ use async_trait::async_trait; use sov_db::ledger_db::LedgerDB; use sov_modules_api::default_context::{DefaultContext, ZkDefaultContext}; use sov_modules_api::Spec; +use sov_modules_stf_template::kernels::basic::BasicKernel; use sov_risc0_adapter::host::Risc0Host; use sov_rollup_interface::mocks::{MockDaConfig, MockDaService, MockDaSpec}; use sov_rollup_interface::services::da::DaService; @@ -41,6 +42,9 @@ impl sov_modules_rollup_template::RollupTemplate for StarterRollup { type ZkRuntime = Runtime; /// Runtime for the Native environment. type NativeRuntime = Runtime; + /// Kernels. + type NativeKernel = BasicKernel; + type ZkKernel = BasicKernel; /// This function generates RPC methods for the rollup, allowing for extension with custom endpoints. fn create_rpc_methods( diff --git a/crates/stf/src/lib.rs b/crates/stf/src/lib.rs index d32cd68..8e1d894 100644 --- a/crates/stf/src/lib.rs +++ b/crates/stf/src/lib.rs @@ -10,5 +10,5 @@ use sov_rollup_interface::da::DaVerifier; use sov_stf_runner::verifier::StateTransitionVerifier; /// Alias for StateTransitionVerifier. -pub type AppVerifier = - StateTransitionVerifier::Spec, Vm, RT>, DA, Vm>; +pub type AppVerifier = + StateTransitionVerifier::Spec, Vm, RT, K>, DA, Vm>; diff --git a/crates/stf/src/runtime.rs b/crates/stf/src/runtime.rs index 072e755..d4c13ab 100644 --- a/crates/stf/src/runtime.rs +++ b/crates/stf/src/runtime.rs @@ -10,16 +10,12 @@ pub use sov_accounts::{AccountsRpcImpl, AccountsRpcServer}; #[cfg(feature = "native")] pub use sov_bank::{BankRpcImpl, BankRpcServer}; use sov_modules_api::capabilities::{BlobRefOrOwned, BlobSelector}; -use sov_modules_api::default_context::ZkDefaultContext; use sov_modules_api::macros::DefaultRuntime; #[cfg(feature = "native")] use sov_modules_api::Spec; use sov_modules_api::{Context, DaSpec, DispatchCall, Genesis, MessageCodec}; -use sov_modules_stf_template::AppTemplate; -use sov_rollup_interface::da::DaVerifier; #[cfg(feature = "native")] pub use sov_sequencer_registry::{SequencerRegistryRpcImpl, SequencerRegistryRpcServer}; -use sov_stf_runner::verifier::StateTransitionVerifier; #[cfg(feature = "native")] use crate::genesis_config::GenesisPaths; @@ -112,15 +108,3 @@ impl BlobSelector for Runtime { Ok(current_blobs.into_iter().map(BlobRefOrOwned::Ref).collect()) } } - -/// A verifier for the rollup -pub type RollupVerifier = StateTransitionVerifier< - AppTemplate< - ZkDefaultContext, - ::Spec, - Zk, - Runtime::Spec>, - >, - DA, - Zk, ->;