Remove stf.rs and use sov-app-template instead. (#5)

Cargo.toml

@@ -12,14 +12,15 @@ tokio = { version = "1", features = ["full"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sha2 = "0.10.6"
-jupiter = { git = "https://github.com/Sovereign-Labs/Jupiter.git", rev = "43b3b4ce86ad0fa2a925e590275c68f7e4483438" }
-accounts = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "3f21032e7414400587f734abdefa3fd9c6081b25" }
-election = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "3f21032e7414400587f734abdefa3fd9c6081b25" }
-sovereign-sdk = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "3f21032e7414400587f734abdefa3fd9c6081b25" }
-sov-state = { git = "https://github.com/Sovereign-Labs/sovereign.git", features = ["temp"], rev = "3f21032e7414400587f734abdefa3fd9c6081b25" }
-sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign.git", features = ["mocks"], rev = "3f21032e7414400587f734abdefa3fd9c6081b25" }
-sov-modules-macros = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "3f21032e7414400587f734abdefa3fd9c6081b25" }
-sovereign-db = { git = "https://github.com/Sovereign-Labs/sovereign.git", features = ["temp"], rev = "3f21032e7414400587f734abdefa3fd9c6081b25" }
+jupiter = { path ="../Jupiter"}
+sov-app-template = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "bfdb58159ff9215a84aa60b9a4d3ce1f32136597" }
+accounts = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "bfdb58159ff9215a84aa60b9a4d3ce1f32136597" }
+election = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "bfdb58159ff9215a84aa60b9a4d3ce1f32136597" }
+sovereign-sdk = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "bfdb58159ff9215a84aa60b9a4d3ce1f32136597" }
+sov-state = { git = "https://github.com/Sovereign-Labs/sovereign.git", features = ["temp"], rev = "bfdb58159ff9215a84aa60b9a4d3ce1f32136597" }
+sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign.git", features = ["mocks"], rev = "bfdb58159ff9215a84aa60b9a4d3ce1f32136597" }
+sov-modules-macros = { git = "https://github.com/Sovereign-Labs/sovereign.git", rev = "bfdb58159ff9215a84aa60b9a4d3ce1f32136597" }
+sovereign-db = { git = "https://github.com/Sovereign-Labs/sovereign.git", features = ["temp"], rev = "bfdb58159ff9215a84aa60b9a4d3ce1f32136597" }
 tracing = "0.1.37"
 tracing-subscriber = "0.3.16"
 

src/helpers.rs

@@ -1,14 +1,13 @@
-use sov_modules_api::DispatchQuery;
+use sov_modules_api::{mocks::MockContext, DispatchQuery};
 use sov_state::{mocks::MockStorageSpec, ProverStorage, WorkingSet};
 
-use crate::{context::DemoContext, runtime::Runtime};
-
+use crate::runtime::Runtime;
 pub(crate) fn run_query(
-    runtime: &mut Runtime<DemoContext>,
+    runtime: &mut Runtime<MockContext>,
     query: Vec<u8>,
     storage: ProverStorage<MockStorageSpec>,
 ) -> String {
-    let module = Runtime::<DemoContext>::decode_query(&query).unwrap();
+    let module = Runtime::<MockContext>::decode_query(&query).unwrap();
     let query_response = runtime.dispatch_query(module, &mut WorkingSet::new(storage));
 
     String::from_utf8(query_response.response).unwrap()

src/main.rs

@@ -1,11 +1,11 @@
-use batch::Batch;
-use context::DemoContext;
 use jsonrpsee::http_client::HeaderMap;
 use jupiter::{
     da_app::{CelestiaApp, TmHash},
     da_service::{CelestiaService, FilteredCelestiaBlock},
 };
 use sha2::{Digest, Sha256};
+use sov_app_template::{AppTemplate, Batch};
+use sov_modules_api::mocks::MockContext;
 use sov_state::ProverStorage;
 use sovereign_db::{
     ledger_db::{LedgerDB, SlotCommitBuilder},
@@ -21,24 +21,23 @@ use sovereign_sdk::{
 };
 use sovereign_sdk::{da::DaLayerTrait, stf::StateTransitionFunction};
 use sovereign_sdk::{db::SlotStore, serial::Decode};
-use stf::Demo;
+
 use tracing::Level;
-use tx_verifier::DemoAppTxVerifier;
+use tx_verifier_impl::DemoAppTxVerifier;
 
 use crate::{
-    data_generation::QueryGenerator, helpers::run_query, runtime::Runtime, tx_hooks::DemoAppTxHooks,
+    data_generation::QueryGenerator, helpers::run_query, runtime::Runtime,
+    tx_hooks_impl::DemoAppTxHooks,
 };
-mod batch;
-mod context;
+
 mod data_generation;
 mod helpers;
 mod runtime;
-mod stf;
-mod tx_hooks;
-mod tx_verifier;
+mod tx_hooks_impl;
+mod tx_verifier_impl;
 
-type C = DemoContext;
-type DemoApp = Demo<C, DemoAppTxVerifier<C>, Runtime<C>, DemoAppTxHooks<C>>;
+type C = MockContext;
+type DemoApp = AppTemplate<C, DemoAppTxVerifier<C>, Runtime<C>, DemoAppTxHooks<C>>;
 const CELESTIA_NODE_AUTH_TOKEN: &'static str = "";
 
 const START_HEIGHT: u64 = HEIGHT_OF_FIRST_TXS - 5;
@@ -168,6 +167,7 @@ async fn main() -> Result<(), anyhow::Error> {
                 }
             }
         }
+
         demo.end_slot();
         data_to_persist.slot_data = Some(StoredSlot {
             hash: DbHash::new(slot_hash.to_vec()),
@@ -177,6 +177,7 @@ async fn main() -> Result<(), anyhow::Error> {
         });
         item_numbers.batch_number += num_batches as u64;
         ledger_db.commit_slot(data_to_persist.finalize()?)?;
+
         println!(
             "Current state: {}",
             run_query(