Merge pull request #28 from propeller-heads/tl/create-tycho-demo

feat: create simple solver for tycho demo

Cargo.toml

@@ -4,10 +4,10 @@ version = "0.32.0"
 edition = "2021"
 
 [workspace]
-members = ["protosim_py"]
+members = ["protosim_py", "tutorial"]
 
 [dependencies]
-ethabi = "13.0" 
+ethabi = "13.0"
 ethers = "2.0.13"
 serde_json = "1.0.105"
 serde = { version = "1.0", features = ["rc"] }
@@ -28,8 +28,8 @@ uuid = { version = "1.4.1", features = [
 ] }
 num-traits = "0.2.17"
 dotenv = "0.15.0"
-tycho-core = { git = "ssh://github.com/propeller-heads/tycho-indexer.git", package = "tycho-core", tag = "0.34.0" }
-tycho-client = { git = "ssh://github.com/propeller-heads/tycho-indexer.git", package = "tycho-client", tag = "0.34.0" }
+tycho-core = { git = "ssh://github.com/propeller-heads/tycho-indexer.git", package = "tycho-core", tag = "0.41.0" }
+tycho-client = { git = "ssh://github.com/propeller-heads/tycho-indexer.git", package = "tycho-client", tag = "0.41.0" }
 foundry-config = { git = "https://github.com/foundry-rs/foundry", rev = "2544793" }
 foundry-evm = { git = "https://github.com/foundry-rs/foundry", rev = "2544793" }
 revm-inspectors = { version = "0.5", features = ["serde"] }
@@ -47,7 +47,6 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
     "fmt",
 ] }
 tempfile = "3.13.0"
-
 [features]
 default = []
 network_tests = []

tutorial/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "tutorial"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "tutorial"
+path = "src/main.rs"
+
+[dependencies]
+protosim = { path = ".." }
+tokio = { version = "1", features = ["full"] }
+tracing = "0.1"
+tracing-subscriber = "0.3"
+ethers = "2.0.13"
+clap = { version = "4.5.3", features = ["derive"] }
+anyhow = "1.0.79"
+tycho-core = { git = "ssh://github.com/propeller-heads/tycho-indexer.git", package = "tycho-core", tag = "0.41.0" }
+tycho-client = { git = "ssh://github.com/propeller-heads/tycho-indexer.git", package = "tycho-client", tag = "0.41.0" }

tutorial/src/data_feed/mod.rs

@@ -0,0 +1,2 @@
+pub mod state;
+pub mod tycho;

tutorial/src/data_feed/state.rs

@@ -0,0 +1,36 @@
+//! Message structs for state updates
+//!
+//! A BlockState typically groups changes together based on the latency of the data source,
+//! for example, on the Ethereum network, a BlockState is emitted every block and contains
+//! all the changes from that block.
+use std::collections::HashMap;
+
+use ethers::types::H160;
+
+use protosim::protocol::{models::ProtocolComponent, state::ProtocolSim};
+
+#[derive(Debug)]
+pub struct BlockState {
+    pub time: u64,
+    /// The current state of all pools
+    pub states: HashMap<H160, Box<dyn ProtocolSim>>,
+    /// The new pairs that were added in this block
+    pub new_pairs: HashMap<H160, ProtocolComponent>,
+    /// The pairs that were removed in this block
+    pub removed_pairs: HashMap<H160, ProtocolComponent>,
+}
+
+impl BlockState {
+    pub fn new(
+        time: u64,
+        states: HashMap<H160, Box<dyn ProtocolSim>>,
+        new_pairs: HashMap<H160, ProtocolComponent>,
+    ) -> Self {
+        BlockState { time, states, new_pairs, removed_pairs: HashMap::new() }
+    }
+
+    pub fn set_removed_pairs(mut self, pairs: HashMap<H160, ProtocolComponent>) -> Self {
+        self.removed_pairs = pairs;
+        self
+    }
+}