Merge pull request #35 from propeller-heads/repay

Upgrade Rust and tycho-simulation, fix Docker builds

Author: ex9-fyi

Cargo.lock

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 # Simulation dependencies
-tycho-simulation = { git = "https://github.com/propeller-heads/tycho-simulation", tag = "0.103.0" } 
+tycho-simulation = { git = "https://github.com/propeller-heads/tycho-simulation", tag = "0.127.1" } 
 num-bigint = "0.4"
 num-traits = "0.2"
 

api/Cargo.toml

@@ -1,21 +1,27 @@
 # Build stage
 FROM rust:1.87 as builder
-WORKDIR /app
+
+# Create workspace directory structure
+RUN mkdir -p /workspace/api
+WORKDIR /workspace
 
 RUN echo "🔵 [BUILD] Starting Rust build process..."
 
-# Copy dependency files
+# Copy workspace files first
 COPY Cargo.toml Cargo.lock ./
+COPY api/Cargo.toml ./api/
+
+# Build dependencies first
 RUN echo "🔵 [BUILD] Building dependencies first (this may take a while)..."
-RUN mkdir src && echo "fn main() {}" > src/main.rs
-RUN cargo build --release 2>&1 | tee /tmp/cargo-deps.log || (echo "🔴 [ERROR] Dependency build failed" && cat /tmp/cargo-deps.log && exit 1)
-RUN rm -rf src
+RUN mkdir -p api/src && echo "fn main() {}" > api/src/main.rs
+RUN cd api && cargo build --release 2>&1 | tee /tmp/cargo-deps.log || (echo "🔴 [ERROR] Dependency build failed" && cat /tmp/cargo-deps.log && exit 1)
+RUN rm -rf api/src
 
 # Copy actual source
-COPY . .
+COPY api ./api
 RUN echo "🔵 [BUILD] Building tycho-api binary..."
-RUN touch src/main.rs
-RUN cargo build --release 2>&1 | tee /tmp/cargo-build.log || (echo "🔴 [ERROR] Build failed" && cat /tmp/cargo-build.log && exit 1)
+RUN touch api/src/main.rs
+RUN cd api && cargo build --release 2>&1 | tee /tmp/cargo-build.log || (echo "🔴 [ERROR] Build failed" && cat /tmp/cargo-build.log && exit 1)
 RUN echo "🟢 [BUILD] Rust build completed successfully"
 
 # Runtime stage
@@ -29,7 +35,7 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy binary
-COPY --from=builder /app/target/release/tycho-api /usr/local/bin/
+COPY --from=builder /workspace/target/release/tycho-api /usr/local/bin/
 RUN echo "🟢 [PROD] Binary copied successfully"
 
 EXPOSE 3000

api/Dockerfile

@@ -2,7 +2,10 @@
 # Uses cargo watch for hot reloading and builds in debug mode
 
 FROM rust:1.87
-WORKDIR /app
+
+# Create workspace directory structure
+RUN mkdir -p /workspace/api
+WORKDIR /workspace
 
 RUN echo "🔵 [DEV] Setting up development environment..."
 
@@ -18,6 +21,21 @@ RUN apt-get update && apt-get install -y \
 RUN cargo install cargo-watch
 RUN echo "🟢 [DEV] cargo-watch installed"
 
+# Copy workspace files first for better caching
+COPY Cargo.toml Cargo.lock ./
+COPY api/Cargo.toml ./api/
+
+# Create a dummy main.rs to allow cargo to download dependencies
+RUN mkdir -p api/src && echo "fn main() {}" > api/src/main.rs
+
+# Pre-download dependencies (this layer will be cached)
+RUN cargo fetch --manifest-path ./api/Cargo.toml
+
+# Remove dummy file
+RUN rm -rf api/src
+
+WORKDIR /workspace/api
+
 EXPOSE 3000
 
 # Command will be provided by docker-compose

api/Dockerfile.dev

@@ -9,7 +9,7 @@ use tower_http::{
     trace::TraceLayer,
 };
 use tracing::info;
-use tycho_simulation::protocol::models::BlockUpdate;
+use tycho_simulation::protocol::models::Update as BlockUpdate;
 
 use crate::simulation::state::SimulationState;
 

api/src/api/mod.rs

@@ -4,7 +4,6 @@ use axum::{
     Json, Router,
 };
 use num_bigint::BigUint;
-use num_traits::FromPrimitive;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use tracing::info;
@@ -64,7 +63,7 @@ async fn simulate_transaction(
     };
 
     // Parse integer part as BigUint
-    let mut amount_biguint = BigUint::parse_bytes(integer_part.as_bytes(), 10)
+    let amount_biguint = BigUint::parse_bytes(integer_part.as_bytes(), 10)
         .ok_or_else(|| ApiError::InvalidInput("Invalid amount format".to_string()))?;
 
     let mut current_amount = None;

api/src/api/routes.rs

@@ -7,18 +7,18 @@ use tycho_simulation::{
     evm::{
         engine_db::tycho_db::PreCachedDB,
         protocol::{
-            filters::{balancer_pool_filter, uniswap_v4_pool_with_hook_filter},
+            filters::{balancer_v2_pool_filter, uniswap_v4_pool_with_hook_filter},
             uniswap_v2::state::UniswapV2State,
             uniswap_v3::state::UniswapV3State,
             uniswap_v4::state::UniswapV4State,
             pancakeswap_v2::state::PancakeswapV2State,
             ekubo::state::EkuboState,
             vm::state::EVMPoolState,
-            filters::{curve_pool_filter}
+            filters::curve_pool_filter
         },
         stream::ProtocolStreamBuilder,
     },
-    protocol::models::BlockUpdate,
+    protocol::models::Update as BlockUpdate,
     tycho_client::feed::component_tracker::ComponentFilter,
     tycho_core::models::Chain,
     utils::load_all_tokens,
@@ -47,7 +47,7 @@ fn register_exchanges(
                 .exchange::<EVMPoolState<PreCachedDB>>(
                     "vm:balancer_v2",
                     tvl_filter.clone(),
-                    Some(balancer_pool_filter),
+                    Some(balancer_v2_pool_filter),
                 )
                 .exchange::<UniswapV4State>(
                     "uniswap_v4",

api/src/simulation/mod.rs

@@ -2,11 +2,8 @@ use serde::Serialize;
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::{broadcast, RwLock};
 use tycho_simulation::{
-    models::Token,
-    protocol::{
-        models::{BlockUpdate, ProtocolComponent},
-        state::ProtocolSim,
-    },
+    protocol::models::{Update as BlockUpdate, ProtocolComponent},
+    tycho_core::{models::token::Token, simulation::protocol_sim::ProtocolSim},
 };
 
 /// Represents the current state of the simulation
@@ -38,7 +35,7 @@ impl From<BlockUpdate> for ClientUpdate {
         }
 
         ClientUpdate {
-            block_number: update.block_number,
+            block_number: update.block_number_or_timestamp,
             new_pairs: update.new_pairs,
             spot_prices,
             tvl_updates,

api/src/simulation/state.rs

@@ -7,8 +7,8 @@ services:
   # Ethereum Mainnet Tycho API (Development)
   tycho-api-ethereum-dev:
     build: 
-      context: ./api
-      dockerfile: Dockerfile.dev
+      context: .
+      dockerfile: api/Dockerfile.dev
     ports:
       - "${TYCHO_API_ETHEREUM_PORT}:3000"
     environment:
@@ -21,13 +21,14 @@ services:
     command: ["/bin/bash", "-c", "cargo watch -x 'run -- --tvl-threshold ${TVL_THRESHOLD} --chain ethereum --port 3000 --tycho-url ${TYCHO_ETHEREUM_URL}'"]
     volumes:
       # Mount source code for development
-      - ./api/src:/app/src:ro
-      - ./api/Cargo.toml:/app/Cargo.toml:ro
-      - ./api/Cargo.lock:/app/Cargo.lock
+      - ./api/src:/workspace/api/src:ro
+      - ./api/Cargo.toml:/workspace/api/Cargo.toml:ro
+      - ./Cargo.toml:/workspace/Cargo.toml:ro
+      - ./Cargo.lock:/workspace/Cargo.lock:ro
       # Share cargo cache and build artifacts
       - cargo-cache:/usr/local/cargo/registry
       - cargo-registry:/usr/local/cargo/git
-      - cargo-target:/app/target
+      - cargo-target:/workspace/target
     networks:
       - tycho-network-dev
     healthcheck:
@@ -44,8 +45,8 @@ services:
   # Base Mainnet Tycho API (Development)
   tycho-api-base-dev:
     build: 
-      context: ./api
-      dockerfile: Dockerfile.dev
+      context: .
+      dockerfile: api/Dockerfile.dev
     depends_on:
       tycho-api-ethereum-dev:
         condition: service_healthy
@@ -61,13 +62,14 @@ services:
     command: ["/bin/bash", "-c", "cargo watch -x 'run -- --tvl-threshold ${TVL_THRESHOLD} --chain base --port 3000 --tycho-url ${TYCHO_BASE_URL}'"]
     volumes:
       # Mount source code for development
-      - ./api/src:/app/src:ro
-      - ./api/Cargo.toml:/app/Cargo.toml:ro
-      - ./api/Cargo.lock:/app/Cargo.lock
+      - ./api/src:/workspace/api/src:ro
+      - ./api/Cargo.toml:/workspace/api/Cargo.toml:ro
+      - ./Cargo.toml:/workspace/Cargo.toml:ro
+      - ./Cargo.lock:/workspace/Cargo.lock:ro
       # Share cargo cache and build artifacts
       - cargo-cache:/usr/local/cargo/registry
       - cargo-registry:/usr/local/cargo/git
-      - cargo-target:/app/target
+      - cargo-target:/workspace/target
     networks:
       - tycho-network-dev
     healthcheck:
@@ -84,8 +86,8 @@ services:
   # Unichain Mainnet Tycho API (Development)
   tycho-api-unichain-dev:
     build: 
-      context: ./api
-      dockerfile: Dockerfile.dev
+      context: .
+      dockerfile: api/Dockerfile.dev
     depends_on:
       tycho-api-ethereum-dev:
         condition: service_healthy
@@ -101,13 +103,14 @@ services:
     command: ["/bin/bash", "-c", "cargo watch -x 'run -- --tvl-threshold ${TVL_THRESHOLD} --chain unichain --port 3000 --tycho-url ${TYCHO_UNICHAIN_URL}'"]
     volumes:
       # Mount source code for development
-      - ./api/src:/app/src:ro
-      - ./api/Cargo.toml:/app/Cargo.toml:ro
-      - ./api/Cargo.lock:/app/Cargo.lock
+      - ./api/src:/workspace/api/src:ro
+      - ./api/Cargo.toml:/workspace/api/Cargo.toml:ro
+      - ./Cargo.toml:/workspace/Cargo.toml:ro
+      - ./Cargo.lock:/workspace/Cargo.lock:ro
       # Share cargo cache and build artifacts
       - cargo-cache:/usr/local/cargo/registry
       - cargo-registry:/usr/local/cargo/git
-      - cargo-target:/app/target
+      - cargo-target:/workspace/target
     networks:
       - tycho-network-dev
     healthcheck:

docker-compose.dev.yml

@@ -2,8 +2,8 @@ services:
   # Ethereum Mainnet Tycho API
   tycho-api-ethereum:
     build: 
-      context: ./api
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: api/Dockerfile
     image: tycho-explorer/api:latest
     container_name: tycho-api-ethereum
     deploy: