Support JIT orders in the trade verifier

crates/autopilot/src/run.rs

@@ -333,6 +333,7 @@ pub async fn run(args: Arguments) {
             code_fetcher: code_fetcher.clone(),
         },
     )
+    .await
     .expect("failed to initialize price estimator factory");
 
     let native_price_estimator = price_estimator_factory

crates/driver/openapi.yml

@@ -294,29 +294,63 @@ components:
       example: "0x30cff40d9f60caa68a37f0ee73253ad6ad72b45580c945fe3ab67596476937197854163b1b0d24e77dca702b97b5cc33e0f83dcb626122a6"
     QuoteResponse:
       oneOf:
-        - description: |
-            Successful Quote
+        - $ref: "#/components/schemas/LegacyQuote"
+        - $ref: "#/components/schemas/QuoteWithJitOrders"
+        - $ref: "#/components/schemas/Error"
+    LegacyQuote:
+      description: |
+        Successful Quote
 
-            The Solver knows how to fill the request with these parameters.
+        The Solver knows how to fill the request with these parameters.
+
+        If the request was of type `buy` then the response's buy amount has the same value as the
+        request's amount and the sell amount was filled in by the server. Vice versa for type
+        `sell`.
+      type: object
+      properties:
+        amount:
+          $ref: "#/components/schemas/TokenAmount"
+        interactions:
+          type: array
+          items:
+            $ref: "#/components/schemas/Interaction"
+        solver:
+          description: The address of the solver that quoted this order.
+          $ref: "#/components/schemas/Address"
+        gas:
+          type: integer
+          description: How many units of gas this trade is estimated to cost.
+    QuoteWithJitOrders:
+      description: |
+        Successful Quote with JIT orders support.
 
-            If the request was of type `buy` then the response's buy amount has the same value as the
-            request's amount and the sell amount was filled in by the server. Vice versa for type
-            `sell`.
+        The Solver knows how to fill the request with these parameters.
+      type: object
+      properties:
+        clearingPrices:
+          description: |
+            Mapping of hex token address to the uniform clearing price.
           type: object
-          properties:
-            amount:
-              $ref: "#/components/schemas/TokenAmount"
-            interactions:
-              type: array
-              items:
-                $ref: "#/components/schemas/Interaction"
-            solver:
-              description: The address of the solver that quoted this order.
-              $ref: "#/components/schemas/Address"
-            gas:
-              type: integer
-              description: How many units of gas this trade is estimated to cost.
-        - $ref: "#/components/schemas/Error"
+          additionalProperties:
+            $ref: "#/components/schemas/BigUint"
+        preInteractions:
+          type: array
+          items:
+            $ref: "#/components/schemas/Interaction"
+        interactions:
+          type: array
+          items:
+            $ref: "#/components/schemas/Interaction"
+        solver:
+          description: The address of the solver that quoted this order.
+          $ref: "#/components/schemas/Address"
+        gas:
+          type: integer
+          description: How many units of gas this trade is estimated to cost.
+        jitOrders:
+          type: array
+          items:
+            $ref: "#/components/schemas/JitOrder"
     DateTime:
       description: An ISO 8601 UTC date time string.
       type: string
@@ -514,6 +548,43 @@ components:
           $ref: "#/components/schemas/TokenAmount"
         solver:
           $ref: "#/components/schemas/Address"
+    JitOrder:
+      type: object
+      properties:
+        sellToken:
+          $ref: "#/components/schemas/Address"
+        buyToken:
+          $ref: "#/components/schemas/Address"
+        sellAmount:
+          $ref: "#/components/schemas/TokenAmount"
+        buyAmount:
+          $ref: "#/components/schemas/TokenAmount"
+        executedAmount:
+          $ref: "#/components/schemas/TokenAmount"
+        receiver:
+          $ref: "#/components/schemas/Address"
+        validTo:
+          type: integer
+        side:
+          type: string
+          enum: ["buy", "sell"]
+        sellTokenSource:
+          type: string
+          enum: ["erc20", "internal", "external"]
+        buyTokenSource:
+          type: string
+          enum: ["erc20", "internal"]
+        appData:
+          type: string
+        signature:
+          description: | 
+            Hex encoded bytes with `0x` prefix. The content depends on the `signingScheme`.
+            For `presign`, this should contain the address of the owner. 
+            For `eip1271`, the signature should consist of `<owner_address><signature_bytes>`.
+          type: string
+        signingScheme:
+          type: string
+          enum: ["eip712", "ethsign", "presign", "eip1271"]
     Error:
       description: Response on API errors.
       type: object

crates/e2e/tests/e2e/quote_verification.rs

@@ -13,7 +13,7 @@ use {
             Estimate,
             Verification,
         },
-        trade_finding::{Interaction, Trade},
+        trade_finding::{Interaction, LegacyTrade, Trade},
     },
     std::{str::FromStr, sync::Arc},
 };
@@ -62,7 +62,9 @@ async fn test_bypass_verification_for_rfq_quotes(web3: Web3) {
         onchain.contracts().gp_settlement.address(),
         onchain.contracts().weth.address(),
         0.0,
-    );
+    )
+    .await
+    .unwrap();
 
     let verify_trade = |tx_origin| {
         let verifier = verifier.clone();
@@ -86,7 +88,7 @@ async fn test_bypass_verification_for_rfq_quotes(web3: Web3) {
                         sell_token_source: SellTokenSource::Erc20,
                         buy_token_destination: BuyTokenDestination::Erc20,
                     },
-                    Trade {
+                    Trade::Legacy(LegacyTrade {
                         out_amount: 16380122291179526144u128.into(),
                         gas_estimate: Some(225000),
                         interactions: vec![Interaction {
@@ -98,7 +100,7 @@ async fn test_bypass_verification_for_rfq_quotes(web3: Web3) {
                         solver: H160::from_str("0xe3067c7c27c1038de4e8ad95a83b927d23dfbd99")
                             .unwrap(),
                         tx_origin,
-                    },
+                    }),
                 )
                 .await
         }

crates/orderbook/src/run.rs

@@ -274,6 +274,7 @@ pub async fn run(args: Arguments) {
             code_fetcher: code_fetcher.clone(),
         },
     )
+    .await
     .expect("failed to initialize price estimator factory");
 
     let native_price_estimator = price_estimator_factory

crates/shared/src/price_estimation/factory.rs

@@ -74,28 +74,30 @@ pub struct Components {
 }
 
 impl<'a> PriceEstimatorFactory<'a> {
-    pub fn new(
+    pub async fn new(
         args: &'a Arguments,
         shared_args: &'a arguments::Arguments,
         network: Network,
         components: Components,
     ) -> Result<Self> {
         Ok(Self {
-            trade_verifier: Self::trade_verifier(args, shared_args, &network, &components),
+            trade_verifier: Self::trade_verifier(args, shared_args, &network, &components).await?,
             args,
             network,
             components,
             estimators: HashMap::new(),
         })
     }
 
-    fn trade_verifier(
+    async fn trade_verifier(
         args: &'a Arguments,
         shared_args: &arguments::Arguments,
         network: &Network,
         components: &Components,
-    ) -> Option<Arc<dyn TradeVerifying>> {
-        let web3 = network.simulation_web3.clone()?;
+    ) -> Result<Option<Arc<dyn TradeVerifying>>> {
+        let Some(web3) = network.simulation_web3.clone() else {
+            return Ok(None);
+        };
         let web3 = ethrpc::instrumented::instrument_with_label(&web3, "simulator".into());
 
         let tenderly = shared_args
@@ -112,14 +114,17 @@ impl<'a> PriceEstimatorFactory<'a> {
             None => Arc::new(web3.clone()),
         };
 
-        Some(Arc::new(TradeVerifier::new(
-            web3,
-            simulator,
-            components.code_fetcher.clone(),
-            network.block_stream.clone(),
-            network.settlement,
-            network.native_token,
-            args.quote_inaccuracy_limit,
+        Ok(Some(Arc::new(
+            TradeVerifier::new(
+                web3,
+                simulator,
+                components.code_fetcher.clone(),
+                network.block_stream.clone(),
+                network.settlement,
+                network.native_token,
+                args.quote_inaccuracy_limit,
+            )
+            .await?,
         )))
     }