Merge branch 'cowprotocol:main' into main

Author: xdecentralix

crates/database/src/ethflow_orders.rs

@@ -140,7 +140,7 @@ AND t.order_uid is null
 AND eo.valid_to < $1
 AND o.sell_amount = oq.sell_amount
 AND (1.0 - o.buy_amount / GREATEST(oq.buy_amount,1)) >= $3
-AND eo.valid_to - extract(epoch from creation_timestamp)::int > $2
+AND eo.valid_to - extract(epoch from o.creation_timestamp)::int > $2
     "#;
     sqlx::query_as(QUERY)
         .bind(since_valid_to)

crates/database/src/trades.rs

@@ -3,7 +3,7 @@ use {
     bigdecimal::BigDecimal,
     futures::stream::BoxStream,
     sqlx::PgConnection,
-    tracing::instrument,
+    tracing::{Instrument, info_span, instrument},
 };
 
 #[derive(Clone, Debug, Default, Eq, PartialEq, sqlx::FromRow)]
@@ -21,12 +21,11 @@ pub struct TradesQueryRow {
     pub auction_id: Option<AuctionId>,
 }
 
-#[instrument(skip_all)]
 pub fn trades<'a>(
     ex: &'a mut PgConnection,
     owner_filter: Option<&'a Address>,
     order_uid_filter: Option<&'a OrderUid>,
-) -> BoxStream<'a, Result<TradesQueryRow, sqlx::Error>> {
+) -> instrument::Instrumented<BoxStream<'a, Result<TradesQueryRow, sqlx::Error>>> {
     const COMMON_QUERY: &str = r#"
 SELECT
     t.block_number,
@@ -72,6 +71,7 @@ LEFT OUTER JOIN LATERAL (
         .bind(owner_filter)
         .bind(order_uid_filter)
         .fetch(ex)
+        .instrument(info_span!("trades"))
 }
 
 #[derive(Clone, Debug, Default, Eq, PartialEq, sqlx::FromRow)]
@@ -214,6 +214,7 @@ mod tests {
         expected: &[TradesQueryRow],
     ) {
         let mut filtered = trades(db, owner_filter, order_uid_filter)
+            .into_inner()
             .try_collect::<Vec<_>>()
             .await
             .unwrap();
@@ -287,6 +288,7 @@ mod tests {
 
         let now = std::time::Instant::now();
         trades(&mut db, Some(&ByteArray([2u8; 20])), None)
+            .into_inner()
             .try_collect::<Vec<_>>()
             .await
             .unwrap();

crates/ethrpc/src/extensions.rs

@@ -3,7 +3,7 @@
 use {
     serde::{Deserialize, Serialize},
     std::collections::HashMap,
-    tracing::instrument,
+    tracing::{Instrument, instrument::Instrumented},
     web3::{
         self,
         Transport,
@@ -23,20 +23,19 @@ where
         call: CallRequest,
         block: BlockId,
         overrides: HashMap<H160, StateOverride>,
-    ) -> CallFuture<Bytes, T::Out>;
+    ) -> Instrumented<CallFuture<Bytes, T::Out>>;
 }
 
 impl<T> EthExt<T> for web3::api::Eth<T>
 where
     T: Transport,
 {
-    #[instrument(skip_all)]
     fn call_with_state_overrides(
         &self,
         call: CallRequest,
         block: BlockId,
         overrides: StateOverrides,
-    ) -> CallFuture<Bytes, T::Out> {
+    ) -> Instrumented<CallFuture<Bytes, T::Out>> {
         let call = helpers::serialize(&call);
         let block = helpers::serialize(&block);
         let overrides = helpers::serialize(&overrides);
@@ -45,6 +44,7 @@ where
             self.transport()
                 .execute("eth_call", vec![call, block, overrides]),
         )
+        .instrument(tracing::info_span!("eth_call"))
     }
 }
 

crates/orderbook/src/database/trades.rs

@@ -36,6 +36,7 @@ impl TradeRetrieving for Postgres {
             filter.owner.map(|owner| ByteArray(owner.0)).as_ref(),
             filter.order_uid.map(|uid| ByteArray(uid.0)).as_ref(),
         )
+        .into_inner()
         .map_err(anyhow::Error::from)
         .try_collect::<Vec<TradesQueryRow>>()
         .await?;

database/README.md

@@ -14,10 +14,11 @@ Associates the 32 bytes contract app data with the corresponding full app data.
 
 See [here](https://github.com/cowprotocol/services/issues/1465) for more details. In this table the contract app data is either the old unixfs based scheme, or the new keccak scheme. The new scheme can be validated by keccak-256 hashing the full app data, which should produce the contract app data. The old scheme cannot be validated.
 
-Column               | Type  | Nullable | Details
----------------------|-------|----------|-------
- contract\_app\_data | bytea | not null | 32 bytes. Referenced by `orders.app_data`.
- full\_app\_data     | bytea | not null | Is utf-8 but not stored as string because the raw bytes are important for hashing.
+Column                | Type        | Nullable | Details
+----------------------|-------      |----------|-------
+ contract\_app\_data  | bytea       | not null | 32 bytes. Referenced by `orders.app_data`.
+ full\_app\_data      | bytea       | not null | Is utf-8 but not stored as string because the raw bytes are important for hashing.
+ creation\_timestamp  | timestamptz | not null | when the entry was created or when column was added (DEFAULT NOW() for new and 1970-01-01 for historical data)
 
 Indexes:
 - "app\_data\_pkey" PRIMARY KEY, btree (`contract_app_data`)
@@ -61,7 +62,7 @@ Indexes:
 
 ### competition\_auctions
 
-Contains all auctions for which a valid solver competition exists. 
+Contains all auctions for which a valid solver competition exists.
 
  Column        | Type    | Nullable | Details
 ---------------|---------|----------|--------
@@ -202,7 +203,7 @@ Indexes:
 
 ### order\_execution
 
-Contains metainformation for trades, required for reward computations that cannot be recovered from the blockchain and are not stored in a persistent manner somewhere else. 
+Contains metainformation for trades, required for reward computations that cannot be recovered from the blockchain and are not stored in a persistent manner somewhere else.
 Protocol fee tokens/amounts are stored in the same order as fee policies in fee_policies table.
 
  Column                 | Type      | Nullable | Details
@@ -230,17 +231,18 @@ Indexes:
 
 Quotes that an order was created with. These quotes get stored persistently and can be used to evaluate how accurate the quoted fee predicted the execution cost that actually happened on-chain.
 
- Column             | Type    | Nullable | Details
---------------------|---------|----------|--------
- order\_uid         | bytea   | not null | order that this quote belongs to
- gas\_amount        | double  | not null | estimated gas used by the quote used to create this order with
- gas\_price         | double  | not null | gas price at the time of order creation
- sell\_token\_price | double  | not null | ether-denominated price of sell\_token at the time of quoting. The ether value of `x` sell\_tokens is `x * sell_token_price`.
- sell\_amount       | numeric | not null | sell\_amount of the quote used to create the order with
- buy\_amount        | numeric | not null | buy\_amount of the quote used to create the order with
- solver             | bytea   | not null | public address of the solver that provided this quote
- verified           | boolean | not null | information if quote was verified
- metadata           | json    | not null | additional data associated with the quote in json format
+ Column              | Type        | Nullable | Details
+---------------------|-------------|----------|--------
+ order\_uid          | bytea       | not null | order that this quote belongs to
+ gas\_amount         | double      | not null | estimated gas used by the quote used to create this order with
+ gas\_price          | double      | not null | gas price at the time of order creation
+ sell\_token\_price  | double      | not null | ether-denominated price of sell\_token at the time of quoting. The ether value of `x` sell\_tokens is `x * sell_token_price`.
+ sell\_amount        | numeric     | not null | sell\_amount of the quote used to create the order with
+ buy\_amount         | numeric     | not null | buy\_amount of the quote used to create the order with
+ solver              | bytea       | not null | public address of the solver that provided this quote
+ verified            | boolean     | not null | information if quote was verified
+ metadata            | json        | not null | additional data associated with the quote in json format
+ creation\_timestamp | timestamptz | not null | when the entry was created (DEFAULT NOW() for new and 1970-01-01 for historical data)
 
 Indexes:
 - PRIMARY KEY: btree(`order_uid`)
@@ -354,7 +356,7 @@ All solutions reported by solvers, that were part of a solver competition. A sol
 
  Column        | Type      | Nullable | Details
 ---------------|-----------|----------|--------
- auction\_id   | bigint    | not null | auction for which the solution was proposed 
+ auction\_id   | bigint    | not null | auction for which the solution was proposed
  uid           | bigint    | not null | unique id of the proposed solution within a single auction
  id            | numeric   | not null | id of the proposed solution as reported by the solver
  solver        | bytea     | not null | solver submission address
@@ -369,11 +371,11 @@ Indexes:
 
 ### proposed\_trade\_executions
 
-Contains all order executions for proposed solutions. 
+Contains all order executions for proposed solutions.
 
  Column         | Type     | Nullable | Details
 ----------------|----------|----------|--------
- auction\_id    | bigint   | not null | auction for which the order was executed 
+ auction\_id    | bigint   | not null | auction for which the order was executed
  solution_uid   | bigint   | not null | `uid` from `proposed\_solutions`
  order_uid      | bigint   | not null | id of the order
  executed\_sell | numeric  | not null | the effective amount that left the user's wallet including all fees
@@ -388,7 +390,7 @@ Solvers report orders they solved on each competition. Orders that don't exist i
 
  Column       | Type               | Nullable | Details
 --------------|--------------------|----------|--------
- auction\_id  | bigint             | not null | auction for which the order was executed 
+ auction\_id  | bigint             | not null | auction for which the order was executed
  solution_uid | bigint             | not null | `uid` from `proposed\_solutions`
  order_uid    | bigint             | not null | id of the order
  sell\_token  | numeric            | not null | the effective amount that left the user's wallet including all fees

database/sql/V089__add_creation_timestamp_to_appdata_and_orderquotes.sql

@@ -0,0 +1,15 @@
+-- This adds `creation_timestamp` column to `app_data`, `order_quotes`
+-- in order to help data ingestion for our analytics team
+
+ALTER TABLE app_data
+    ADD COLUMN creation_timestamp timestamptz NOT NULL SET DEFAULT '1970-01-01 00:00:00+00'::timestamptz;
+
+ALTER TABLE order_quotes
+    ADD COLUMN creation_timestamp timestamptz NOT NULL SET DEFAULT '1970-01-01 00:00:00+00'::timestamptz;
+
+-- Set default for future inserts
+ALTER TABLE app_data
+    ALTER COLUMN creation_timestamp SET DEFAULT NOW();
+
+ALTER TABLE order_quotes
+    ALTER COLUMN creation_timestamp SET DEFAULT NOW();