Merge branch 'main' into simulator-refactor

Author: m-sz

crates/database/src/ethflow_orders.rs

@@ -37,6 +37,9 @@ pub async fn insert_or_overwrite_ethflow_order(
     )
     .await?;
 
+    // Update true_valid_to field if order already in the database
+    // as the Ethflow orders get inserted with validity of u32::MAX
+    // and the true validity is contained in the EthOrderPlacement
     const UPDATE_TRUE_VALID_TO_QUERY: &str = r#"
         UPDATE orders
         SET true_valid_to = $1
@@ -51,26 +54,6 @@ pub async fn insert_or_overwrite_ethflow_order(
     Ok(())
 }
 
-// Ethflow orders are created with valid_to equal to u32::MAX, their
-// true validity is parsed from Settlement contract events.
-#[instrument(skip_all)]
-pub async fn update_true_valid_to_for_ethflow_order(
-    ex: &mut PgConnection,
-    event: &EthOrderPlacement,
-) -> Result<(), sqlx::Error> {
-    const QUERY: &str = r#"
-        UPDATE orders
-        SET true_valid_to = $1
-        WHERE uid = $2
-    "#;
-    sqlx::query(QUERY)
-        .bind(event.valid_to)
-        .bind(event.uid)
-        .execute(ex)
-        .await?;
-    Ok(())
-}
-
 #[derive(Clone, Debug, Default, sqlx::FromRow, Eq, PartialEq)]
 pub struct EthOrderData {
     pub uid: OrderUid,

crates/database/src/orders.rs

@@ -148,7 +148,18 @@ INSERT INTO orders (
     class,
     true_valid_to
 )
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21)
+VALUES (
+    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20,
+    -- Ethflow orders are inserted with valid_to set to u32::MAX. Their true validity is stored in
+    -- the ethflow_orders table.
+    -- If there already exists an Ethflow order with the same uid, take smaller of the two valid_to values
+    CASE 
+        WHEN $21 = 4294967295 THEN  -- u32::MAX
+            COALESCE((SELECT valid_to FROM ethflow_orders WHERE uid = $1), $21)
+        ELSE 
+            $21
+    END
+)
     "#;
 
 #[instrument(skip_all)]

crates/e2e/tests/e2e/ethflow.rs

@@ -6,7 +6,7 @@ use {
     anyhow::bail,
     autopilot::database::onchain_order_events::ethflow_events::WRAP_ALL_SELECTOR,
     contracts::alloy::{CoWSwapEthFlow, ERC20Mintable, WETH9},
-    database::order_events::OrderEventLabel,
+    database::{byte_array::ByteArray, order_events::OrderEventLabel},
     e2e::setup::{
         ACCOUNT_ENDPOINT,
         API_HOST,
@@ -49,6 +49,7 @@ use {
     refunder::RefundStatus,
     reqwest::Client,
     shared::signature_validator::check_erc1271_result,
+    std::ops::DerefMut,
 };
 
 const DAI_PER_ETH: u64 = 1_000;
@@ -243,6 +244,28 @@ async fn eth_flow_tx(web3: Web3) {
         .await
         .unwrap();
     assert_eq!(allowance, alloy::primitives::U256::ZERO);
+
+    // Check that true_valid_to is equal to the ethflow_order's valid to
+    let uid = ethflow_order
+        .uid(onchain.contracts(), ethflow_contract)
+        .await;
+    let mut db = services.db().acquire().await.unwrap();
+    let true_valid_to: (i64,) = sqlx::query_as("SELECT true_valid_to FROM orders WHERE uid = $1")
+        .bind(ByteArray(uid.0))
+        .fetch_one(db.deref_mut())
+        .await
+        .unwrap();
+    assert_eq!(
+        true_valid_to.0,
+        services
+            .get_order(&uid)
+            .await
+            .unwrap()
+            .metadata
+            .ethflow_data
+            .unwrap()
+            .user_valid_to
+    );
 }
 
 async fn eth_flow_without_quote(web3: Web3) {

playground/Dockerfile.cowswap

@@ -10,6 +10,10 @@ RUN corepack enable \
 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
+ARG REACT_APP_EXPLORER_URL_DEV=http://localhost:8001
+
+# Block explorer URL (Otterscan for local development)
+ARG REACT_APP_BLOCK_EXPLORER_URL=http://localhost:8003
 
 # 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"}'
@@ -37,6 +41,8 @@ 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"
 ENV REACT_APP_ORDER_BOOK_URLS="$REACT_APP_ORDER_BOOK_URLS"
+ENV REACT_APP_EXPLORER_URL_DEV="$REACT_APP_EXPLORER_URL_DEV"
+ENV REACT_APP_BLOCK_EXPLORER_URL="$REACT_APP_BLOCK_EXPLORER_URL"
 
 # Update environment variables based on "chain" and "ETH_RPC_URL", then build safely
 RUN set -e; \
@@ -56,12 +62,14 @@ RUN set -e; \
                 ;; \
         esac; \
     fi; \
-    export REACT_APP_NETWORK_URL_1 REACT_APP_NETWORK_URL_5 REACT_APP_NETWORK_URL_100 REACT_APP_ORDER_BOOK_URLS; \
+    export REACT_APP_NETWORK_URL_1 REACT_APP_NETWORK_URL_5 REACT_APP_NETWORK_URL_100 REACT_APP_ORDER_BOOK_URLS REACT_APP_EXPLORER_URL_DEV REACT_APP_BLOCK_EXPLORER_URL; \
     NODE_OPTIONS="--max-old-space-size=4096" NX_NO_CLOUD=true pnpm run build \
         --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" \
-        --env REACT_APP_ORDER_BOOK_URLS="$REACT_APP_ORDER_BOOK_URLS"
+        --env REACT_APP_ORDER_BOOK_URLS="$REACT_APP_ORDER_BOOK_URLS" \
+        --env REACT_APP_EXPLORER_URL_DEV="$REACT_APP_EXPLORER_URL_DEV" \
+        --env REACT_APP_BLOCK_EXPLORER_URL="$REACT_APP_BLOCK_EXPLORER_URL"
 
 # Stage 2: Copy the frontend build to the nginx container
 FROM docker.io/nginx:1.21-alpine AS frontend

playground/Dockerfile.explorer

@@ -16,14 +16,16 @@ RUN git clone https://github.com/cowprotocol/cowswap . \
     && git submodule update --init --recursive \
     && pnpm install --frozen-lockfile
 
-# Set environment variable for the order book
+# Build environment variables
 ENV REACT_APP_ORDER_BOOK_URLS='{"1":"http://localhost:8080"}'
+ENV REACT_APP_BLOCK_EXPLORER_URL=http://localhost:8003
 
 # Build the frontend
-RUN APP_ID=1 pnpm run build:explorer
+RUN APP_ID=1 REACT_APP_BLOCK_EXPLORER_URL=$REACT_APP_BLOCK_EXPLORER_URL pnpm run build:explorer
 
 # Stage 2: Copy the frontend build to the nginx container
 FROM docker.io/nginx:1.21-alpine AS frontend
 COPY --from=node-build /usr/src/app/build/explorer /usr/share/nginx/html
+COPY nginx-spa.conf /etc/nginx/conf.d/default.conf
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

playground/README.md

@@ -42,7 +42,7 @@ Now with Rabby configured, and the services started, you can browse to http://lo
 > The EthFlow is not configured by default, the next section explains how to set it up.
 > You can follow along with watching the logs of the `autopilot`, `driver`, and `baseline` solver to see how the Protocol interacts.
 > If you make any changes to the files in your repo directory, services will automatically be recompiled and restarted.
-> The CoW Explorer is avialable at http://localhost:8001 to see more information about transaction status
+> The CoW Explorer is available at http://localhost:8001 to see more information about transaction status
 
 ### Resetting the playground
 
@@ -147,7 +147,7 @@ In this mode, the stack will spin up:
 - Driver
 - Baseline
 - Cow Swap
-- Cow Explorer (*not yet implemented*)
+- Cow Explorer
 
 ### Local
 

playground/nginx-spa.conf

@@ -0,0 +1,10 @@
+server {
+    listen 80;
+    server_name localhost;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+}