Fee&OrderQuote Endpoint: Implemention with legacy logic.

e2e/tests/services.rs

@@ -225,7 +225,7 @@ impl OrderbookServices {
             true,
             solvable_orders_cache.clone(),
             Duration::from_secs(600),
-            order_validator,
+            order_validator.clone(),
         ));
         let maintenance = ServiceMaintenance {
             maintainers: vec![db.clone(), event_updater],
@@ -236,6 +236,7 @@ impl OrderbookServices {
             fee_calculator,
             price_estimator.clone(),
             API_HOST[7..].parse().expect("Couldn't parse API address"),
+            order_validator,
             pending(),
         );
 

orderbook/openapi.yml

@@ -438,7 +438,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/OrderQuote"
+                $ref: "#/components/schemas/OrderQuoteResponse"
         400:
           description: Error quoting order.
           content:
@@ -886,12 +886,15 @@ components:
             buyTokenBalance:
               $ref: "#/components/schemas/BuyTokenDestination"
               default: "erc20"
+            from:
+              $ref: "#/components/schemas/Address"
           required:
             - sellToken
             - buyToken
             - validTo
             - appData
             - partiallyFillable
+            - from
     OrderQuote:
       description: |
         An order quoted by the back end that can be directly signed and
@@ -905,3 +908,14 @@ components:
               $ref: "#/components/schemas/Address"
           required:
             - from
+    OrderQuoteResponse:
+      type: object
+      properties:
+        quote:
+          $ref: "#/components/schemas/OrderQuote"
+        expirationDate:
+          description: |
+            Expiration date of the offered fee. Order service might not accept
+            the fee after this expiration date. Encoded as ISO 8601 UTC.
+          type: string
+          example: "1985-03-10T18:35:18.814523Z"

orderbook/src/api.rs

@@ -12,7 +12,8 @@ pub mod order_validation;
 mod post_quote;
 
 use crate::{
-    database::trades::TradeRetrieving, fee::EthAwareMinFeeCalculator, orderbook::Orderbook,
+    api::order_validation::OrderValidator, database::trades::TradeRetrieving,
+    fee::EthAwareMinFeeCalculator, orderbook::Orderbook,
 };
 use anyhow::Error as anyhowError;
 use serde::de::DeserializeOwned;
@@ -31,6 +32,7 @@ pub fn handle_all_routes(
     orderbook: Arc<Orderbook>,
     fee_calculator: Arc<EthAwareMinFeeCalculator>,
     price_estimator: Arc<dyn PriceEstimating>,
+    order_validator: Arc<OrderValidator>,
 ) -> impl Filter<Extract = (impl Reply,), Error = Rejection> + Clone {
     let create_order = create_order::create_order(orderbook.clone());
     let get_orders = get_orders::get_orders(orderbook.clone());
@@ -41,12 +43,19 @@ pub fn handle_all_routes(
     let get_trades = get_trades::get_trades(database);
     let cancel_order = cancel_order::cancel_order(orderbook.clone());
     let get_amount_estimate = get_markets::get_amount_estimate(price_estimator.clone());
-    let get_fee_and_quote_sell =
-        get_fee_and_quote::get_fee_and_quote_sell(fee_calculator.clone(), price_estimator.clone());
-    let get_fee_and_quote_buy =
-        get_fee_and_quote::get_fee_and_quote_buy(fee_calculator, price_estimator.clone());
+    let get_fee_and_quote_sell = get_fee_and_quote::get_fee_and_quote_sell(
+        fee_calculator.clone(),
+        price_estimator.clone(),
+        order_validator.clone(),
+    );
+    let get_fee_and_quote_buy = get_fee_and_quote::get_fee_and_quote_buy(
+        fee_calculator.clone(),
+        price_estimator.clone(),
+        order_validator.clone(),
+    );
     let get_user_orders = get_user_orders::get_user_orders(orderbook);
-    let post_quote = post_quote::post_quote();
+    let post_quote =
+        post_quote::post_quote(fee_calculator, price_estimator.clone(), order_validator);
     let cors = warp::cors()
         .allow_any_origin()
         .allow_methods(vec!["GET", "POST", "DELETE", "OPTIONS", "PUT", "PATCH"])
@@ -122,7 +131,7 @@ fn internal_error() -> Json {
 }
 
 pub trait WarpReplyConverting {
-    fn to_warp_reply(&self) -> (Json, StatusCode);
+    fn to_warp_reply(self) -> (Json, StatusCode);
 }
 
 pub fn convert_get_orders_error_to_reply(err: anyhowError) -> WithStatus<Json> {