crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2726 from 0xProject/fix/asset-swapper/rfqtMakerInteraction-with-blacklisting

Browse Source 
asset-swapper: isBlacklisted in rfqtMakerInteraction
This commit is contained in:
F. Eugene Aumson 2020-10-08 14:19:10 -04:00 committed by GitHub
commit f7ae697475
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/asset-swapper/src/utils/quote_requestor.ts
View File

@ -334,31 +334,31 @@ export class QuoteRequestor {
options: RfqtRequestOpts, options: RfqtRequestOpts,
quoteType: 'firm' | 'indicative', quoteType: 'firm' | 'indicative',
): Promise<Array<{ response: ResponseT; makerUri: string }>> { ): Promise<Array<{ response: ResponseT; makerUri: string }>> {
const requestParamsWithBigNumbers = {
takerAddress: options.takerAddress,
...inferQueryParams(marketOperation, makerAssetData, takerAssetData, assetFillAmount),
};
// convert BigNumbers to strings
// so they are digestible by axios
const requestParams = {
...requestParamsWithBigNumbers,
sellAmountBaseUnits: requestParamsWithBigNumbers.sellAmountBaseUnits
? requestParamsWithBigNumbers.sellAmountBaseUnits.toString()
: undefined,
buyAmountBaseUnits: requestParamsWithBigNumbers.buyAmountBaseUnits
? requestParamsWithBigNumbers.buyAmountBaseUnits.toString()
: undefined,
};
const result: Array<{ response: ResponseT; makerUri: string }> = []; const result: Array<{ response: ResponseT; makerUri: string }> = [];
await Promise.all( await Promise.all(
Object.keys(this._rfqtAssetOfferings).map(async url => { Object.keys(this._rfqtAssetOfferings).map(async url => {
if ( const isBlacklisted = rfqMakerBlacklist.isMakerBlacklisted(url);
this._makerSupportsPair(url, makerAssetData, takerAssetData) && const partialLogEntry = { url, quoteType, requestParams, isBlacklisted };
!rfqMakerBlacklist.isMakerBlacklisted(url) if (isBlacklisted) {
) { this._infoLogger({ rfqtMakerInteraction: { ...partialLogEntry } });
const requestParamsWithBigNumbers = { } else if (this._makerSupportsPair(url, makerAssetData, takerAssetData)) {
takerAddress: options.takerAddress,
...inferQueryParams(marketOperation, makerAssetData, takerAssetData, assetFillAmount),
};
// convert BigNumbers to strings
// so they are digestible by axios
const requestParams = {
...requestParamsWithBigNumbers,
sellAmountBaseUnits: requestParamsWithBigNumbers.sellAmountBaseUnits
? requestParamsWithBigNumbers.sellAmountBaseUnits.toString()
: undefined,
buyAmountBaseUnits: requestParamsWithBigNumbers.buyAmountBaseUnits
? requestParamsWithBigNumbers.buyAmountBaseUnits.toString()
: undefined,
};
const partialLogEntry = { url, quoteType, requestParams };
const timeBeforeAwait = Date.now(); const timeBeforeAwait = Date.now();
const maxResponseTimeMs = const maxResponseTimeMs =
options.makerEndpointMaxResponseTimeMs === undefined options.makerEndpointMaxResponseTimeMs === undefined