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

Merge branch 'development' of github.com:0xProject/0x-monorepo into refactor_rfq_comparison_price_integration

Browse Source
This commit is contained in:
Daniel Pyrathon 2020-10-08 15:27:14 -07:00
commit efe598c8fd
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,22 +373,23 @@ 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 requestParams = QuoteRequestor.makeQueryParameters(
options.takerAddress,
marketOperation,
makerAssetData,
takerAssetData,
assetFillAmount,
comparisonPrice,
);
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 requestParams = QuoteRequestor.makeQueryParameters( } else if (this._makerSupportsPair(url, makerAssetData, takerAssetData)) {
options.takerAddress,
marketOperation,
makerAssetData,
takerAssetData,
assetFillAmount,
comparisonPrice,
);
const partialLogEntry = { url, quoteType, requestParams };
const timeBeforeAwait = Date.now(); const timeBeforeAwait = Date.now();
const maxResponseTimeMs = const maxResponseTimeMs =
options.makerEndpointMaxResponseTimeMs === undefined options.makerEndpointMaxResponseTimeMs === undefined

4
packages/utils/CHANGELOG.json
View File

@ -13,6 +13,10 @@
{ {
"note": "Added LiquidityProviderFeature errors", "note": "Added LiquidityProviderFeature errors",
"pr": 2691 "pr": 2691
},
{
"note": "Added abi encoder support for uint80 lol",
"pr": 2728
} }
] ]
}, },

2
packages/utils/src/abi_encoder/evm_data_types/uint.ts
View File

@ -10,7 +10,7 @@ import * as EncoderMath from '../utils/math';
export class UIntDataType extends AbstractBlobDataType { export class UIntDataType extends AbstractBlobDataType {
private static readonly _MATCHER = RegExp( private static readonly _MATCHER = RegExp(
'^uint(8|16|24|32|40|48|56|64|72|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256){0,1}$', '^uint(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256){0,1}$',
); );
private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = true; private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = true;
private static readonly _MAX_WIDTH: number = 256; private static readonly _MAX_WIDTH: number = 256;