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

Merge pull request #2684 from 0xProject/feat/asset-swapper/rfqt-indicative-without-takerAddress

Browse Source 
asset-swapper: Stop requiring takerAddress for indicative RFQ-T quotes.
This commit is contained in:
F. Eugene Aumson 2020-08-31 20:14:30 -04:00 committed by GitHub
commit 7b0a1c3630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/asset-swapper/CHANGELOG.json
View File

@ -62,6 +62,10 @@
"note": "Added `Mooniswap`",
"pr": 2675
},
{
"note": "Stop requiring takerAddress for RFQ-T indicative quotes",
"pr": 2684
},
{
"note": "Added two-hop support",
"pr": 2647

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

@ -39,18 +39,6 @@ function getTokenAddressOrThrow(assetData: string): string {
throw new Error(`Decoded asset data (${JSON.stringify(decodedAssetData)}) does not contain a token address`);
}
function assertTakerAddressOrThrow(takerAddress: string | undefined): void {
if (
takerAddress === undefined ||
takerAddress === '' ||
takerAddress === '0x' ||
!takerAddress ||
takerAddress === constants.NULL_ADDRESS
) {
throw new Error('RFQ-T requires the presence of a taker address');
}
}
function inferQueryParams(
marketOperation: MarketOperation,
makerAssetData: string,
@ -137,7 +125,15 @@ export class QuoteRequestor {
options: RfqtRequestOpts,
): Promise<RFQTFirmQuote[]> {
const _opts: RfqtRequestOpts = { ...constants.DEFAULT_RFQT_REQUEST_OPTS, ...options };
assertTakerAddressOrThrow(_opts.takerAddress);
if (
_opts.takerAddress === undefined ||
_opts.takerAddress === '' ||
_opts.takerAddress === '0x' ||
!_opts.takerAddress ||
_opts.takerAddress === constants.NULL_ADDRESS
) {
throw new Error('RFQ-T firm quotes require the presence of a taker address');
}
const firmQuoteResponses = await this._getQuotesAsync<RFQTFirmQuote>( // not yet BigNumber
makerAssetData,
@ -217,7 +213,15 @@ export class QuoteRequestor {
options: RfqtRequestOpts,
): Promise<RFQTIndicativeQuote[]> {
const _opts: RfqtRequestOpts = { ...constants.DEFAULT_RFQT_REQUEST_OPTS, ...options };
assertTakerAddressOrThrow(_opts.takerAddress);
// Originally a takerAddress was required for indicative quotes, but
// now we've eliminated that requirement. @0x/quote-server, however,
// is still coded to expect a takerAddress. So if the client didn't
// send one, just use the null address to satisfy the quote server's
// expectations.
if (!_opts.takerAddress) {
_opts.takerAddress = constants.NULL_ADDRESS;
}
const responsesWithStringInts = await this._getQuotesAsync<RFQTIndicativeQuote>( // not yet BigNumber
makerAssetData,