feat: Rfqt included

src/config.ts

@@ -23,7 +23,6 @@ import {
     DEFAULT_LOCAL_POSTGRES_URI,
     DEFAULT_LOGGER_INCLUDE_TIMESTAMP,
     DEFAULT_QUOTE_SLIPPAGE_PERCENTAGE,
-    DEFAULT_RFQT_SKIP_BUY_REQUESTS,
     NULL_ADDRESS,
     NULL_BYTES,
     QUOTE_ORDER_EXPIRATION_BUFFER_MS,
@@ -187,10 +186,6 @@ export const RFQT_MAKER_ASSET_OFFERINGS: RfqtMakerAssetOfferings = _.isEmpty(pro
       );
 
 // tslint:disable-next-line:boolean-naming
-export const RFQT_SKIP_BUY_REQUESTS: boolean = _.isEmpty(process.env.RFQT_SKIP_BUY_REQUESTS)
-    ? DEFAULT_RFQT_SKIP_BUY_REQUESTS
-    : assertEnvVarType('RFQT_SKIP_BUY_REQUESTS', process.env.RFQT_SKIP_BUY_REQUESTS, EnvVarType.Boolean);
-
 export const RFQT_REQUEST_MAX_RESPONSE_MS = 600;
 
 // Whitelisted 0x API keys that can use the meta-txn /submit endpoint

src/constants.ts

@@ -40,7 +40,6 @@ export const PROTOCOL_FEE_UTILS_POLLING_INTERVAL_IN_MS = 6000;
 export const UNWRAP_QUOTE_GAS = new BigNumber(60000);
 export const WRAP_QUOTE_GAS = UNWRAP_QUOTE_GAS;
 export const ONE_GWEI = new BigNumber(1000000000);
-export const DEFAULT_RFQT_SKIP_BUY_REQUESTS = false;
 
 // API namespaces
 export const SRA_PATH = '/sra/v3';

src/errors.ts

@@ -131,10 +131,16 @@ export enum ValidationErrorCodes {
     InvalidOrder = 1007,
     InternalError = 1008,
     TokenNotSupported = 1009,
+    FieldInvalid = 1010,
 }
 
 export enum ValidationErrorReasons {
     PercentageOutOfRange = 'MUST_BE_LESS_THAN_OR_EQUAL_TO_ONE',
+    ConflictingFilteringArguments = 'CONFLICTING_FILTERING_ARGUMENTS',
+    ArgumentNotYetSupported = 'ARGUMENT_NOT_YET_SUPPORTED',
+    InvalidApiKey = 'INVALID_API_KEY',
+    TakerAddressInvalid = 'TAKER_ADDRESS_INVALID',
+    RequiresIntentOnFilling = 'REQUIRES_INTENT_ON_FILLING',
 }
 export abstract class AlertError {
     public abstract message: string;

src/handlers/swap_handlers.ts

@@ -1,9 +1,9 @@
-import { SwapQuoterError } from '@0x/asset-swapper';
+import { RfqtRequestOpts, SwapQuoterError } from '@0x/asset-swapper';
 import { BigNumber, NULL_ADDRESS } from '@0x/utils';
 import * as express from 'express';
 import * as HttpStatus from 'http-status-codes';
 
-import { CHAIN_ID } from '../config';
+import { CHAIN_ID, RFQT_API_KEY_WHITELIST } from '../config';
 import { DEFAULT_QUOTE_SLIPPAGE_PERCENTAGE, SWAP_DOCS_URL } from '../constants';
 import {
     InternalServerError,
@@ -194,6 +194,7 @@ export class SwapHandlers {
                     : {
                           intentOnFilling: rfqt.intentOnFilling,
                           isIndicative: rfqt.isIndicative,
+                          nativeExclusivelyRFQT: rfqt.nativeExclusivelyRFQT,
                       },
             skipValidation,
             swapVersion,
@@ -269,17 +270,28 @@ const parseGetSwapQuoteRequestParams = (
             },
         ]);
     }
-    const excludedSources =
-        req.query.excludedSources === undefined
-            ? undefined
-            : parseUtils.parseStringArrForERC20BridgeSources((req.query.excludedSources as string).split(','));
-    const affiliateAddress = req.query.affiliateAddress as string;
+
     const apiKey = req.header('0x-api-key');
-    const rfqt =
+    // tslint:disable-next-line: boolean-naming
+    const { excludedSources, nativeExclusivelyRFQT } = parseUtils.parseRequestForExcludedSources(
+        {
+            excludedSources: req.query.excludedSources as string | undefined,
+            includedSources: req.query.includedSources as string | undefined,
+            intentOnFilling: req.query.intentOnFilling as string | undefined,
+            takerAddress,
+            apiKey,
+        },
+        RFQT_API_KEY_WHITELIST,
+        endpoint,
+    );
+
+    const affiliateAddress = req.query.affiliateAddress as string;
+    const rfqt: Pick<RfqtRequestOpts, 'intentOnFilling' | 'isIndicative' | 'nativeExclusivelyRFQT'> =
         takerAddress && apiKey
             ? {
                   intentOnFilling: endpoint === 'quote' && req.query.intentOnFilling === 'true',
                   isIndicative: endpoint === 'price',
+                  nativeExclusivelyRFQT,
               }
             : undefined;
     // tslint:disable-next-line:boolean-naming

src/schemas/swap_quote_request_schema.json

@@ -22,7 +22,7 @@
         "excludedSources": {
             "type": "string"
         },
-        "apiKey": {
+        "includedSources": {
             "type": "string"
         },
         "intentOnFilling": {

src/types.ts

@@ -496,10 +496,7 @@ export interface GetSwapQuoteRequestParams {
     gasPrice?: BigNumber;
     excludedSources?: ERC20BridgeSource[];
     affiliateAddress?: string;
-    rfqt?: {
-        intentOnFilling?: boolean;
-        isIndicative?: boolean;
-    };
+    rfqt?: Pick<RfqtRequestOpts, 'intentOnFilling' | 'isIndicative' | 'nativeExclusivelyRFQT'>;
     skipValidation: boolean;
     apiKey?: string;
 }

src/utils/parse_utils.ts

@@ -1,6 +1,7 @@
 import { assert } from '@0x/assert';
 import { ERC20BridgeSource } from '@0x/asset-swapper';
 
+import { ValidationError, ValidationErrorCodes, ValidationErrorReasons } from '../errors';
 import {
     MetaTransactionDailyLimiterConfig,
     MetaTransactionRateLimitConfig,
@@ -10,7 +11,115 @@ import {
 
 import { AvailableRateLimiter, DatabaseKeysUsedForRateLimiter, RollingLimiterIntervalUnit } from './rate-limiters';
 
+interface ParseRequestForExcludedSourcesParams {
+    takerAddress?: string;
+    excludedSources?: string;
+    includedSources?: string;
+    intentOnFilling?: string;
+    apiKey?: string;
+}
+
+/**
+ * This constant contains, as keys, all ERC20BridgeSource types except from `Native`.
+ * As we add more bridge sources to AssetSwapper, we want to keep ourselves accountable to add
+ * them to this constant. Since there isn't a good way to enumerate over enums, we use a obect type.
+ * The type has been defined in a way that the code won't compile if a new ERC20BridgeSource is added.
+ */
+const ALL_EXCEPT_NATIVE: { [key in Exclude<ERC20BridgeSource, ERC20BridgeSource.Native>]: boolean } = {
+    Uniswap: true,
+    Balancer: true,
+    Curve: true,
+    Eth2Dai: true,
+    Kyber: true,
+    LiquidityProvider: true,
+    MultiBridge: true,
+    Uniswap_V2: true,
+};
+
 export const parseUtils = {
+    parseRequestForExcludedSources(
+        request: ParseRequestForExcludedSourcesParams,
+        validApiKeys: string[],
+        endpoint: 'price' | 'quote',
+    ): { excludedSources: ERC20BridgeSource[]; nativeExclusivelyRFQT: boolean } {
+        // Ensure that both filtering arguments cannot be present.
+        if (request.excludedSources !== undefined && request.includedSources !== undefined) {
+            throw new ValidationError([
+                {
+                    field: 'excludedSources',
+                    code: ValidationErrorCodes.IncorrectFormat,
+                    reason: ValidationErrorReasons.ConflictingFilteringArguments,
+                },
+                {
+                    field: 'includedSources',
+                    code: ValidationErrorCodes.IncorrectFormat,
+                    reason: ValidationErrorReasons.ConflictingFilteringArguments,
+                },
+            ]);
+        }
+
+        // If excludedSources is present, parse the string array and return
+        if (request.excludedSources !== undefined) {
+            return {
+                excludedSources: parseUtils.parseStringArrForERC20BridgeSources(request.excludedSources.split(',')),
+                nativeExclusivelyRFQT: false,
+            };
+        }
+
+        if (request.includedSources !== undefined) {
+            // Only RFQT is eligible as of now
+            if (request.includedSources === 'RFQT') {
+                // We assume that if a `takerAddress` key is present, it's value was already validated by the JSON
+                // schema.
+                if (request.takerAddress === undefined || request.takerAddress.length === 0) {
+                    throw new ValidationError([
+                        {
+                            field: 'takerAddress',
+                            code: ValidationErrorCodes.FieldInvalid,
+                            reason: ValidationErrorReasons.TakerAddressInvalid,
+                        },
+                    ]);
+                }
+
+                // We enforce a valid API key - we don't want to fail silently.
+                if (!validApiKeys.includes(request.apiKey)) {
+                    throw new ValidationError([
+                        {
+                            field: '0x-api-key',
+                            code: ValidationErrorCodes.FieldInvalid,
+                            reason: ValidationErrorReasons.InvalidApiKey,
+                        },
+                    ]);
+                }
+
+                // If the user is requesting a firm quote, we want to make sure that `intentOnFilling` is set to "true".
+                if (endpoint === 'quote' && request.intentOnFilling !== 'true') {
+                    throw new ValidationError([
+                        {
+                            field: 'intentOnFilling',
+                            code: ValidationErrorCodes.FieldInvalid,
+                            reason: ValidationErrorReasons.RequiresIntentOnFilling,
+                        },
+                    ]);
+                }
+
+                return {
+                    nativeExclusivelyRFQT: true,
+                    excludedSources: Object.keys(ALL_EXCEPT_NATIVE) as ERC20BridgeSource[],
+                };
+            } else {
+                throw new ValidationError([
+                    {
+                        field: 'includedSources',
+                        code: ValidationErrorCodes.IncorrectFormat,
+                        reason: ValidationErrorReasons.ArgumentNotYetSupported,
+                    },
+                ]);
+            }
+        }
+
+        return { excludedSources: [], nativeExclusivelyRFQT: false };
+    },
     parseStringArrForERC20BridgeSources(excludedSources: string[]): ERC20BridgeSource[] {
         // Need to compare value of the enum instead of the key, as values are used by asset-swapper
         // CurveUsdcDaiUsdt = 'Curve_USDC_DAI_USDT' is excludedSources=Curve_USDC_DAI_USDT

test/parse_utils_test.ts

@@ -0,0 +1,121 @@
+import { ERC20BridgeSource } from '@0x/asset-swapper';
+import { expect } from '@0x/contracts-test-utils';
+import { NULL_ADDRESS } from '@0x/utils';
+import 'mocha';
+
+import { parseUtils } from '../src/utils/parse_utils';
+
+const SUITE_NAME = 'parseUtils';
+
+describe(SUITE_NAME, () => {
+    it('raises a ValidationError if includedSources is anything else than RFQT', async () => {
+        expect(() => {
+            parseUtils.parseRequestForExcludedSources(
+                {
+                    includedSources: 'Uniswap',
+                },
+                [],
+                'price',
+            );
+        }).throws();
+    });
+
+    it('raises a ValidationError if includedSources is RFQT and a taker is not specified', async () => {
+        expect(() => {
+            parseUtils.parseRequestForExcludedSources(
+                {
+                    includedSources: 'RFQT',
+                },
+                [],
+                'price',
+            );
+        }).throws();
+    });
+
+    it('raises a ValidationError if API keys are not present or valid', async () => {
+        expect(() => {
+            parseUtils.parseRequestForExcludedSources(
+                {
+                    includedSources: 'RFQT',
+                    takerAddress: NULL_ADDRESS,
+                    apiKey: 'foo',
+                },
+                ['lorem', 'ipsum'],
+                'price',
+            );
+        }).throws();
+    });
+
+    it('returns excludedSources correctly when excludedSources is present', async () => {
+        // tslint:disable-next-line: boolean-naming
+        const { excludedSources, nativeExclusivelyRFQT } = parseUtils.parseRequestForExcludedSources(
+            {
+                excludedSources: 'Uniswap,Kyber',
+            },
+            [],
+            'price',
+        );
+        expect(excludedSources[0]).to.eql(ERC20BridgeSource.Uniswap);
+        expect(excludedSources[1]).to.eql(ERC20BridgeSource.Kyber);
+        expect(nativeExclusivelyRFQT).to.eql(false);
+    });
+
+    it('returns empty array if no includedSources and excludedSources are present', async () => {
+        // tslint:disable-next-line: boolean-naming
+        const { excludedSources, nativeExclusivelyRFQT } = parseUtils.parseRequestForExcludedSources({}, [], 'price');
+        expect(excludedSources.length).to.eql(0);
+        expect(nativeExclusivelyRFQT).to.eql(false);
+    });
+
+    it('returns excludedSources correctly when includedSources=RFQT', async () => {
+        // tslint:disable-next-line: boolean-naming
+        const { excludedSources, nativeExclusivelyRFQT } = parseUtils.parseRequestForExcludedSources(
+            {
+                includedSources: 'RFQT',
+                takerAddress: NULL_ADDRESS,
+                apiKey: 'ipsum',
+            },
+            ['lorem', 'ipsum'],
+            'price',
+        );
+        expect(nativeExclusivelyRFQT).to.eql(true);
+
+        // Ensure that all sources of liquidity are excluded aside from `Native`.
+        const allPossibleSources: Set<ERC20BridgeSource> = new Set(
+            Object.keys(ERC20BridgeSource).map(s => ERC20BridgeSource[s]),
+        );
+        for (const source of excludedSources) {
+            allPossibleSources.delete(source);
+        }
+        const allPossibleSourcesArray = Array.from(allPossibleSources);
+        expect(allPossibleSourcesArray.length).to.eql(1);
+        expect(allPossibleSourcesArray[0]).to.eql(ERC20BridgeSource.Native);
+    });
+
+    it('raises a ValidationError if includedSources and excludedSources are both present', async () => {
+        expect(() => {
+            parseUtils.parseRequestForExcludedSources(
+                {
+                    excludedSources: 'Native',
+                    includedSources: 'RFQT',
+                },
+                [],
+                'price',
+            );
+        }).throws();
+    });
+
+    it('raises a ValidationError if a firm quote is requested and "intentOnFilling" is not set to "true"', async () => {
+        expect(() => {
+            parseUtils.parseRequestForExcludedSources(
+                {
+                    includedSources: 'RFQT',
+                    takerAddress: NULL_ADDRESS,
+                    apiKey: 'ipsum',
+                },
+                ['lorem', 'ipsum'],
+                'quote',
+            );
+        }).throws();
+    });
+});