clean out superfluous changes

Author: kaze-cow

.dockerignore

@@ -1,4 +1,2 @@
 target/
-playground/
-crates/e2e/
 Dockerfile

Dockerfile

@@ -1,112 +1,59 @@
-FROM debian:bookworm AS chef
-WORKDIR /src/
-RUN apt-get update && apt-get install -y curl git clang mold libssl-dev pkg-config git && apt-get clean
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="$PATH:/root/.cargo/bin"
-RUN rustup component add clippy rustfmt
-# configure to use the fast linker
-RUN echo "\
-[build]\n \
-target = \"$(rustc -Vv | grep host | awk '{print $2}')\"\n \
-[target.$(rustc -Vv | grep host | awk '{print $2}')]\n \
-linker = \"clang\"\n \
-rustflags = [\"-C\", \"link-arg=-fuse-ld=/usr/bin/mold\"]\n \
-" > ~/.cargo/config.toml
-
-RUN cargo install cargo-chef
-
-FROM chef AS localdev
-# envs/tools suitable for running the stack locally
-ENV RUST_BACKTRACE=1
-RUN cargo install cargo-watch
-
-FROM chef AS planner
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
 FROM docker.io/flyway/flyway:10.7.1 AS migrations
 COPY database/ /flyway/
 CMD ["migrate"]
 
-FROM chef AS builder
-COPY --from=planner /src/recipe.json recipe.json
-# --mount=type=cache,target=./target,sharing=locked 
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo chef cook --release --recipe-path recipe.json
+FROM docker.io/rust:1-slim-bookworm AS cargo-build
+WORKDIR /src/
 
-# Copy only the library crates for now
-# --mount=type=cache,target=./target,sharing=locked 
-COPY Cargo.toml Cargo.lock ./
-COPY ./crates/app-data/ ./crates/app-data
-COPY ./crates/database/ ./crates/database
-COPY ./crates/bytes-hex/ ./crates/bytes-hex
-COPY ./crates/contracts/ ./crates/contracts
-COPY ./crates/shared/ ./crates/shared
-COPY ./crates/number/ ./crates/number
-COPY ./crates/model/ ./crates/model
-COPY ./crates/rate-limit/ ./crates/rate-limit
-COPY ./crates/chain/ ./crates/chain
-COPY ./crates/ethrpc/ ./crates/ethrpc
-COPY ./crates/observe/ ./crates/observe
-COPY ./crates/order-validation/ ./crates/order-validation
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release --package shared
-COPY ./crates/solver/ ./crates/solver
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release --package solver
+# Install dependencies
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked apt-get update && \
+    apt-get install -y git libssl-dev pkg-config
+# Install Rust toolchain
+RUN rustup install stable && rustup default stable
 
-# Create an base image for all the binaries
-FROM docker.io/debian:bookworm-slim AS base
+# Copy and Build Code
+COPY . .
+RUN --mount=type=cache,target=/usr/local/cargo/registry --mount=type=cache,target=/src/target \
+    CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release && \
+    cp target/release/alerter / && \
+    cp target/release/autopilot / && \
+    cp target/release/driver / && \
+    cp target/release/orderbook / && \
+    cp target/release/refunder / && \
+    cp target/release/solvers /
+
+# Create an intermediate image to extract the binaries
+FROM docker.io/debian:bookworm-slim AS intermediate
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked apt-get update && \
     apt-get install -y ca-certificates tini gettext-base && \
     apt-get clean
 
-FROM builder AS alerter-build
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release --package alerter
-
-FROM base AS alerter
-COPY --from=alerter-build /src/target/release/alerter /usr/local/bin/alerter
+FROM intermediate AS alerter
+COPY --from=cargo-build /alerter /usr/local/bin/alerter
 ENTRYPOINT [ "alerter" ]
 
-FROM builder AS autopilot-build
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release --package autopilot
-
-FROM base AS autopilot
-COPY ./crates/autopilot/ ./crates/autopilot
-COPY --from=autopilot-build /src/target/release/autopilot /usr/local/bin/autopilot
+FROM intermediate AS autopilot
+COPY --from=cargo-build /autopilot /usr/local/bin/autopilot
 ENTRYPOINT [ "autopilot" ]
 
-FROM builder AS driver-build
-COPY ./crates/driver/ ./crates/driver
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release --package driver
-
-FROM base AS driver
-COPY --from=driver-build /src/target/release/driver /usr/local/bin/driver
+FROM intermediate AS driver
+COPY --from=cargo-build /driver /usr/local/bin/driver
 ENTRYPOINT [ "driver" ]
 
-FROM builder AS orderbook-build
-COPY ./crates/orderbook/ ./crates/orderbook
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release --package orderbook
-
-FROM base AS orderbook
-COPY --from=orderbook-build /src/target/release/orderbook /usr/local/bin/orderbook
+FROM intermediate AS orderbook
+COPY --from=cargo-build /orderbook /usr/local/bin/orderbook
 ENTRYPOINT [ "orderbook" ]
 
-FROM builder AS refunder-build
-COPY ./crates/refunder/ ./crates/refunder
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release --package refunder
-
-FROM base AS refunder
-COPY --from=refunder-build /src/target/release/refunder /usr/local/bin/refunder
+FROM intermediate AS refunder
+COPY --from=cargo-build /refunder /usr/local/bin/refunder
 ENTRYPOINT [ "refunder" ]
 
-FROM builder AS solvers-build
-COPY ./crates/solvers/ ./crates/solvers
-RUN CARGO_PROFILE_RELEASE_DEBUG=1 cargo build --release --package solvers
-
-FROM base AS solvers
-COPY --from=solvers-build /src/target/release/solvers /usr/local/bin/solvers
+FROM intermediate AS solvers
+COPY --from=cargo-build /solvers /usr/local/bin/solvers
 ENTRYPOINT [ "solvers" ]
 
 # Extract Binary
-FROM base
+FROM intermediate
 RUN apt-get update && \
     apt-get install -y build-essential cmake git zlib1g-dev libelf-dev libdw-dev libboost-dev libboost-iostreams-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libunwind-dev libzstd-dev git
 RUN git clone https://invent.kde.org/sdk/heaptrack.git /heaptrack && \

configs/baseline-lens-staging.toml

@@ -1,4 +1,3 @@
-ENV=local
 ETH_RPC_URL=wss://mainnet.gateway.tenderly.co
 ACCOUNT_BALANCES=max
 POSTGRES_USER=postgres

configs/baseline-local.toml

@@ -2,6 +2,14 @@
 FROM docker.io/node:22-bookworm-slim as node-build
 WORKDIR /usr/src/app
 
+# RPC URL args
+ARG REACT_APP_NETWORK_URL_1=https://rpc.mevblocker.io
+ARG REACT_APP_NETWORK_URL_5=https://ethereum-goerli.publicnode.com
+ARG REACT_APP_NETWORK_URL_100=https://gnosis.publicnode.com
+
+# Orderbook URL args
+ARG REACT_APP_ORDER_BOOK_URLS='{"1":"https://api.cow.fi/mainnet","100":"https://api.cow.fi/goerli","5":"https://api.cow.fi/xdai"}'
+
 # Install dependencies
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked apt-get update && \
     apt-get install -y git libssl-dev pkg-config git autoconf automake file g++ libtool make python3
@@ -11,9 +19,40 @@ RUN git clone https://github.com/cowprotocol/cowswap . && \
     git submodule update --init --recursive
 
 # Install npm dependencies
-RUN YARN_CACHE_FOLDER=/home/node/.yarn yarn install --frozen-lockfile
+RUN --mount=type=cache,target=/home/node/.yarn YARN_CACHE_FOLDER=/home/node/.yarn yarn install --frozen-lockfile
+
+# Set the environment variable "chain"
+ARG chain
+ENV chain=$chain
+
+# Set the environment variable "ETH_RPC_URL"
+ARG ETH_RPC_URL
+ENV ETH_RPC_URL=$ETH_RPC_URL
+
+# Set the environment variables based on "chain" and "ETH_RPC_URL"
+ENV REACT_APP_NETWORK_URL_1=$REACT_APP_NETWORK_URL_1
+ENV REACT_APP_NETWORK_URL_5=$REACT_APP_NETWORK_URL_5
+ENV REACT_APP_NETWORK_URL_100=$REACT_APP_NETWORK_URL_100
+
+# Update the REACT_APP_ORDER_BOOK_URLS based on the "chain" value if "ETH_RPC_URL" is set
+RUN if [ -n "$ETH_RPC_URL" ]; then \
+        if [ "$chain" = "1" ]; then \
+            export REACT_APP_ORDER_BOOK_URLS=$(echo $REACT_APP_ORDER_BOOK_URLS | jq --argjson chain 1 '.[$chain]="http://127.0.0.1:8080"'); \
+        elif [ "$chain" = "5" ]; then \
+            export REACT_APP_ORDER_BOOK_URLS=$(echo $REACT_APP_ORDER_BOOK_URLS | jq --argjson chain 5 '.[$chain]="http://127.0.0.1:8080"'); \
+        elif [ "$chain" = "100" ]; then \
+            export REACT_APP_ORDER_BOOK_URLS=$(echo $REACT_APP_ORDER_BOOK_URLS | jq --argjson chain 100 '.[$chain]="http://127.0.0.1:8080"'); \
+        fi; \
+    fi
 
-ENV REACT_APP_ORDER_BOOK_URLS='{"1":"http://localhost:8080"}'
+# Update REACT_APP_NETWORK_URLs for the specific chain if "ETH_RPC_URL" is set
+RUN if [ -n "$ETH_RPC_URL" ]; then \
+        case "$chain" in \
+            1) export REACT_APP_NETWORK_URL_1=$ETH_RPC_URL;; \
+            5) export REACT_APP_NETWORK_URL_5=$ETH_RPC_URL;; \
+            100) export REACT_APP_NETWORK_URL_100=$ETH_RPC_URL;; \
+        esac; \
+    fi
 
 # Build the frontend
 RUN APP_ID=1 yarn build:explorer