Storing quotes longer, in case an on-chain order placement is intended

crates/database/src/quotes.rs

@@ -7,6 +7,14 @@ use sqlx::{
 
 pub type QuoteId = i64;
 
+#[derive(Clone, Debug, PartialEq, sqlx::Type)]
+#[sqlx(type_name = "OnchainSigningScheme")]
+#[sqlx(rename_all = "lowercase")]
+pub enum OnchainSigningScheme {
+    Eip1271,
+    PreSign,
+}
+
 /// One row in the `quotes` table.
 #[derive(Clone, Debug, PartialEq, sqlx::FromRow)]
 pub struct Quote {
@@ -20,6 +28,7 @@ pub struct Quote {
     pub sell_token_price: f64,
     pub order_kind: OrderKind,
     pub expiration_timestamp: DateTime<Utc>,
+    pub onchain_signing_scheme: Option<OnchainSigningScheme>,
 }
 
 /// Stores the quote and returns the id. The id of the quote parameter is not used.
@@ -34,9 +43,10 @@ INSERT INTO quotes (
     gas_price,
     sell_token_price,
     order_kind,
-    expiration_timestamp
+    expiration_timestamp,
+    onchain_signing_scheme
 )
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
 RETURNING id
     "#;
     let (id,) = sqlx::query_as(QUERY)
@@ -49,6 +59,7 @@ RETURNING id
         .bind(quote.sell_token_price)
         .bind(quote.order_kind)
         .bind(quote.expiration_timestamp)
+        .bind(&quote.onchain_signing_scheme)
         .fetch_one(ex)
         .await?;
     Ok(id)
@@ -73,6 +84,7 @@ pub struct QuoteSearchParameters {
     pub buy_amount: BigDecimal,
     pub kind: OrderKind,
     pub expiration: DateTime<Utc>,
+    pub onchain_signing_scheme: Option<OnchainSigningScheme>,
 }
 
 pub async fn find(
@@ -91,7 +103,8 @@ WHERE
         (order_kind = 'buy' AND buy_amount = $5)
     ) AND
     order_kind = $6 AND
-    expiration_timestamp >= $7
+    expiration_timestamp >= $7 AND
+    onchain_signing_scheme IS NOT DISTINCT FROM $8
 ORDER BY gas_amount * gas_price * sell_token_price ASC
 LIMIT 1
     "#;
@@ -103,6 +116,7 @@ LIMIT 1
         .bind(&params.buy_amount)
         .bind(params.kind)
         .bind(params.expiration)
+        .bind(&params.onchain_signing_scheme)
         .fetch_optional(ex)
         .await
 }
@@ -155,6 +169,7 @@ mod tests {
             sell_token_price: 7.,
             order_kind: OrderKind::Sell,
             expiration_timestamp: now,
+            onchain_signing_scheme: None,
         };
         let id = save(&mut db, &quote).await.unwrap();
         quote.id = id;
@@ -186,6 +201,7 @@ mod tests {
             gas_price: 1.,
             sell_token_price: 1.,
             expiration_timestamp: now,
+            onchain_signing_scheme: None,
         };
 
         let token_b = ByteArray([2; 20]);
@@ -200,6 +216,7 @@ mod tests {
             gas_price: 1.,
             sell_token_price: 1.,
             expiration_timestamp: now,
+            onchain_signing_scheme: None,
         };
 
         // Save two measurements for token_a
@@ -247,6 +264,7 @@ mod tests {
             buy_amount: 1.into(),
             kind: quote_a.order_kind,
             expiration: now,
+            onchain_signing_scheme: None,
         };
         assert_eq!(
             find(&mut db, &search_a).await.unwrap().unwrap(),
@@ -306,6 +324,7 @@ mod tests {
             buy_amount: quote_b.buy_amount,
             kind: quote_b.order_kind,
             expiration: now,
+            onchain_signing_scheme: None,
         };
         assert_eq!(
             find(&mut db, &search_b).await.unwrap().unwrap(),
@@ -345,4 +364,48 @@ mod tests {
         assert_eq!(find(&mut db, &search_a).await.unwrap(), None);
         assert_eq!(find(&mut db, &search_b).await.unwrap(), None);
     }
+
+    #[tokio::test]
+    #[ignore]
+    async fn postgres_save_and_find_quote_and_differentiates_by_signing_scheme() {
+        let mut db = PgConnection::connect("postgresql://").await.unwrap();
+        let mut db = db.begin().await.unwrap();
+        crate::clear_DANGER_(&mut db).await.unwrap();
+
+        let now = low_precision_now();
+        let token_a = ByteArray([1; 20]);
+        let quote = {
+            let mut quote = Quote {
+                id: Default::default(),
+                sell_token: token_a,
+                buy_token: ByteArray([3; 20]),
+                sell_amount: 4.into(),
+                buy_amount: 5.into(),
+                gas_amount: 1.,
+                gas_price: 1.,
+                sell_token_price: 1.,
+                order_kind: OrderKind::Sell,
+                expiration_timestamp: now,
+                onchain_signing_scheme: Some(OnchainSigningScheme::Eip1271),
+            };
+            let id = save(&mut db, &quote).await.unwrap();
+            quote.id = id;
+            quote
+        };
+        // Token A has readings valid until now and in 30s
+        let mut search_a = QuoteSearchParameters {
+            sell_token: quote.sell_token,
+            buy_token: quote.buy_token,
+            sell_amount_0: quote.sell_amount.clone(),
+            sell_amount_1: quote.sell_amount.clone(),
+            buy_amount: quote.buy_amount.clone(),
+            kind: quote.order_kind,
+            expiration: quote.expiration_timestamp,
+            onchain_signing_scheme: quote.onchain_signing_scheme.clone(),
+        };
+
+        assert_eq!(find(&mut db, &search_a).await.unwrap().unwrap(), quote,);
+        search_a.onchain_signing_scheme = None;
+        assert_eq!(find(&mut db, &search_a).await.unwrap(), None,);
+    }
 }

crates/e2e/Cargo.toml

@@ -13,6 +13,7 @@ harness = false
 anyhow = "1.0"
 autopilot = { path = "../autopilot" }
 contracts = { path = "../contracts" }
+chrono = "0.4"
 criterion = "0.3"
 database = { path = "../database" }
 ethcontract = { version = "0.17.0", default-features = false }

crates/e2e/tests/e2e/services.rs

@@ -235,6 +235,8 @@ impl OrderbookServices {
                 ..Default::default()
             }),
             api_db.clone(),
+            chrono::Duration::seconds(60i64),
+            chrono::Duration::seconds(60i64),
         ));
         let balance_fetcher = Arc::new(Web3BalanceFetcher::new(
             web3.clone(),

crates/model/src/quote.rs

@@ -1,7 +1,6 @@
 use crate::{
     app_id::AppId,
     order::{BuyTokenDestination, OrderKind, SellTokenSource},
-    signature::SigningScheme,
     time, u256_decimal,
 };
 use chrono::{DateTime, Utc};
@@ -16,6 +15,20 @@ pub enum PriceQuality {
     Optimal,
 }
 
+#[derive(Eq, PartialEq, Clone, Copy, Debug, Default, Deserialize, Serialize, Hash)]
+#[serde(rename_all = "lowercase")]
+pub enum QuoteSigningScheme {
+    #[default]
+    Eip712,
+    EthSign,
+    /// EIP1271 orders can be created via API-call or in the future via on-chain orders
+    Eip1271,
+    Eip1271ForOnchainOrder,
+    /// PreSign orders can be created via API-call or in the future via on-chain orders
+    PreSign,
+    PreSignForOnchainOrder,
+}
+
 /// The order parameters to quote a price and fee for.
 #[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
@@ -38,7 +51,7 @@ pub struct OrderQuoteRequest {
     #[serde(default)]
     pub buy_token_balance: BuyTokenDestination,
     #[serde(default)]
-    pub signing_scheme: SigningScheme,
+    pub signing_scheme: QuoteSigningScheme,
     #[serde(default)]
     pub price_quality: PriceQuality,
 }

crates/model/src/signature.rs

@@ -1,4 +1,4 @@
-use crate::{bytes_hex, DomainSeparator};
+use crate::{bytes_hex, quote::QuoteSigningScheme, DomainSeparator};
 use anyhow::{ensure, Context as _, Result};
 use primitive_types::{H160, H256};
 use serde::{de, Deserialize, Serialize};
@@ -21,6 +21,19 @@ pub enum SigningScheme {
     PreSign,
 }
 
+impl From<QuoteSigningScheme> for SigningScheme {
+    fn from(scheme: QuoteSigningScheme) -> Self {
+        match scheme {
+            QuoteSigningScheme::Eip712 => SigningScheme::Eip712,
+            QuoteSigningScheme::Eip1271 => SigningScheme::Eip1271,
+            QuoteSigningScheme::Eip1271ForOnchainOrder => SigningScheme::Eip1271,
+            QuoteSigningScheme::PreSign => SigningScheme::PreSign,
+            QuoteSigningScheme::PreSignForOnchainOrder => SigningScheme::PreSign,
+            QuoteSigningScheme::EthSign => SigningScheme::EthSign,
+        }
+    }
+}
+
 #[derive(Eq, PartialEq, Clone, Deserialize, Serialize, Hash)]
 #[serde(into = "JsonSignature", try_from = "JsonSignature")]
 pub enum Signature {

crates/orderbook/openapi.yml

@@ -542,7 +542,7 @@ components:
         Provides the information to calculate the fees.
       type: object
       properties:
-        expirationDate:
+        expiration:
           description: |
             Expiration date of the offered fee. Order service might not accept
             the fee after this expiration date. Encoded as ISO 8601 UTC.
@@ -552,7 +552,7 @@ components:
           description: Absolute amount of fee charged per order in specified sellToken
           $ref: "#/components/schemas/TokenAmount"
       required:
-        - expirationDate
+        - expiration
         - amount
     OrderType:
       description: Is this a buy order or sell order?
@@ -623,7 +623,7 @@ components:
           $ref: "#/components/schemas/BuyTokenDestination"
           default: "erc20"
         signingScheme:
-          $ref: "#/components/schemas/SigningScheme"
+          $ref: "#/components/schemas/QuoteSigningScheme"
           default: "eip712"
       required:
         - sellToken
@@ -837,6 +837,10 @@ components:
       description: How was the order signed?
       type: string
       enum: [eip712, ethsign, presign]
+    QuoteSigningScheme:
+      description: How will the order be signed and is it intended for onchain order placement?
+      type: string
+      enum: [eip712, ethsign, presign, eip1271, eip1271asonchainorder, presignasonchainorder]
     EcdsaSigningScheme:
       description: How was the order signed?
       type: string
@@ -1081,7 +1085,7 @@ components:
           $ref: "#/components/schemas/OrderParameters"
         from:
           $ref: "#/components/schemas/Address"
-        expirationDate:
+        expiration:
           description: |
             Expiration date of the offered fee. Order service might not accept
             the fee after this expiration date. Encoded as ISO 8601 UTC.

crates/orderbook/src/api/create_order.rs

@@ -159,6 +159,13 @@ impl IntoWarpReply for ValidationError {
                 error("ZeroAmount", "Buy or sell amount is zero."),
                 StatusCode::BAD_REQUEST,
             ),
+            Self::IncompatibleSigningScheme => with_status(
+                error(
+                    "IncompatibleSigningScheme",
+                    "Signing scheme is not compatible with order placement method.",
+                ),
+                StatusCode::BAD_REQUEST,
+            ),
             Self::Other(err) => with_status(
                 internal_error(err.context("order_validation")),
                 StatusCode::INTERNAL_SERVER_ERROR,