diff --git a/packages/asset-swapper/src/utils/quote_requestor.ts b/packages/asset-swapper/src/utils/quote_requestor.ts index ab10cf5cb0..0107985f27 100644 --- a/packages/asset-swapper/src/utils/quote_requestor.ts +++ b/packages/asset-swapper/src/utils/quote_requestor.ts @@ -373,22 +373,23 @@ export class QuoteRequestor { options: RfqtRequestOpts, quoteType: 'firm' | 'indicative', ): Promise> { + const requestParams = QuoteRequestor.makeQueryParameters( + options.takerAddress, + marketOperation, + makerAssetData, + takerAssetData, + assetFillAmount, + comparisonPrice, + ); + const result: Array<{ response: ResponseT; makerUri: string }> = []; await Promise.all( Object.keys(this._rfqtAssetOfferings).map(async url => { - if ( - this._makerSupportsPair(url, makerAssetData, takerAssetData) && - !rfqMakerBlacklist.isMakerBlacklisted(url) - ) { - const requestParams = QuoteRequestor.makeQueryParameters( - options.takerAddress, - marketOperation, - makerAssetData, - takerAssetData, - assetFillAmount, - comparisonPrice, - ); - const partialLogEntry = { url, quoteType, requestParams }; + const isBlacklisted = rfqMakerBlacklist.isMakerBlacklisted(url); + const partialLogEntry = { url, quoteType, requestParams, isBlacklisted }; + if (isBlacklisted) { + this._infoLogger({ rfqtMakerInteraction: { ...partialLogEntry } }); + } else if (this._makerSupportsPair(url, makerAssetData, takerAssetData)) { const timeBeforeAwait = Date.now(); const maxResponseTimeMs = options.makerEndpointMaxResponseTimeMs === undefined diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index eda013cdf4..945fd294fa 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -13,6 +13,10 @@ { "note": "Added LiquidityProviderFeature errors", "pr": 2691 + }, + { + "note": "Added abi encoder support for uint80 lol", + "pr": 2728 } ] }, diff --git a/packages/utils/src/abi_encoder/evm_data_types/uint.ts b/packages/utils/src/abi_encoder/evm_data_types/uint.ts index 1e447075c8..153da7f7f5 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/uint.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/uint.ts @@ -10,7 +10,7 @@ import * as EncoderMath from '../utils/math'; export class UIntDataType extends AbstractBlobDataType { 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 _MAX_WIDTH: number = 256;