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

prettified

Browse Source
This commit is contained in:
Daniel Pyrathon 2020-07-23 10:16:22 -07:00
parent e6dcf92ec8
commit d7918ea047
3 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/asset-swapper/src/swap_quoter.ts
View File

@ -559,7 +559,11 @@ export class SwapQuoter {
// If RFQT is enabled and `nativeExclusivelyRFQT` is set, then `ERC20BridgeSource.Native` should // If RFQT is enabled and `nativeExclusivelyRFQT` is set, then `ERC20BridgeSource.Native` should
// never be excluded. // never be excluded.
if ((opts.rfqt && opts.rfqt.nativeExclusivelyRFQT === true) && opts.excludedSources.includes(ERC20BridgeSource.Native)) { if (
opts.rfqt &&
opts.rfqt.nativeExclusivelyRFQT === true &&
opts.excludedSources.includes(ERC20BridgeSource.Native)
) {
throw new Error('Native liquidity cannot be excluded if "rfqt.nativeExclusivelyRFQT" is set'); throw new Error('Native liquidity cannot be excluded if "rfqt.nativeExclusivelyRFQT" is set');
} }
@ -567,15 +571,16 @@ export class SwapQuoter {
const orderBatchPromises: Array<Promise<SignedOrder[]>> = []; const orderBatchPromises: Array<Promise<SignedOrder[]>> = [];
orderBatchPromises.push( orderBatchPromises.push(
// Don't fetch Open Orderbook orders from the DB if Native has been excluded, or if `nativeExclusivelyRFQT` has been set. // Don't fetch Open Orderbook orders from the DB if Native has been excluded, or if `nativeExclusivelyRFQT` has been set.
opts.excludedSources.includes(ERC20BridgeSource.Native) || (opts.rfqt && opts.rfqt.nativeExclusivelyRFQT === true) opts.excludedSources.includes(ERC20BridgeSource.Native) ||
(opts.rfqt && opts.rfqt.nativeExclusivelyRFQT === true)
? Promise.resolve([]) ? Promise.resolve([])
: this._getSignedOrdersAsync(makerAssetData, takerAssetData), : this._getSignedOrdersAsync(makerAssetData, takerAssetData),
); );
if ( if (
opts.rfqt && // This is an RFQT-enabled API request opts.rfqt && // This is an RFQT-enabled API request
opts.rfqt.intentOnFilling && // The requestor is asking for a firm quote opts.rfqt.intentOnFilling && // The requestor is asking for a firm quote
!opts.excludedSources.includes(ERC20BridgeSource.Native) && // Native liquidity is not excluded !opts.excludedSources.includes(ERC20BridgeSource.Native) && // Native liquidity is not excluded
this._rfqtTakerApiKeyWhitelist.includes(opts.rfqt.apiKey) // A valid API key was provided this._rfqtTakerApiKeyWhitelist.includes(opts.rfqt.apiKey) // A valid API key was provided
) { ) {
if (!opts.rfqt.takerAddress || opts.rfqt.takerAddress === constants.NULL_ADDRESS) { if (!opts.rfqt.takerAddress || opts.rfqt.takerAddress === constants.NULL_ADDRESS) {
throw new Error('RFQ-T requests must specify a taker address'); throw new Error('RFQ-T requests must specify a taker address');

8
packages/asset-swapper/src/utils/market_operation_utils/index.ts
View File

@ -26,6 +26,14 @@ import {
OrderDomain, OrderDomain,
} from './types'; } from './types';
/**
* Returns a indicative quotes or an empty array if RFQT is not enabled or requested
* @param makerAssetData the maker asset data
* @param takerAssetData the taker asset data
* @param marketOperation Buy or Sell
* @param assetFillAmount the amount to fill, in base units
* @param opts market request options
*/
export async function getRfqtIndicativeQuotesAsync( export async function getRfqtIndicativeQuotesAsync(
makerAssetData: string, makerAssetData: string,
takerAssetData: string, takerAssetData: string,

40
packages/asset-swapper/test/market_operation_utils_test.ts
View File

@ -351,41 +351,45 @@ describe('MarketOperationUtils tests', () => {
MarketOperation.Sell, MarketOperation.Sell,
new BigNumber('100e18'), new BigNumber('100e18'),
{ {
rfqt: {quoteRequestor: requestor.object, ...partialRfqt}, rfqt: { quoteRequestor: requestor.object, ...partialRfqt },
excludedSources: [ERC20BridgeSource.Native], excludedSources: [ERC20BridgeSource.Native],
}, },
); );
expect(result.length).to.eql(0); expect(result.length).to.eql(0);
requestor.verify( requestor.verify(
r => r.requestRfqtIndicativeQuotesAsync( r =>
TypeMoq.It.isAny(), r.requestRfqtIndicativeQuotesAsync(
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
), TypeMoq.It.isAny(),
),
TypeMoq.Times.never(), TypeMoq.Times.never(),
); );
}); });
it('calls RFQT if Native source is not excluded', async () => { it('calls RFQT if Native source is not excluded', async () => {
const requestor = TypeMoq.Mock.ofType(QuoteRequestor, TypeMoq.MockBehavior.Loose); const requestor = TypeMoq.Mock.ofType(QuoteRequestor, TypeMoq.MockBehavior.Loose);
requestor.setup( requestor
r => r.requestRfqtIndicativeQuotesAsync( .setup(r =>
TypeMoq.It.isAny(), r.requestRfqtIndicativeQuotesAsync(
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
), TypeMoq.It.isAny(),
).returns(() => Promise.resolve([])).verifiable(TypeMoq.Times.once()); ),
)
.returns(() => Promise.resolve([]))
.verifiable(TypeMoq.Times.once());
await getRfqtIndicativeQuotesAsync( await getRfqtIndicativeQuotesAsync(
MAKER_ASSET_DATA, MAKER_ASSET_DATA,
TAKER_ASSET_DATA, TAKER_ASSET_DATA,
MarketOperation.Sell, MarketOperation.Sell,
new BigNumber('100e18'), new BigNumber('100e18'),
{ {
rfqt: {quoteRequestor: requestor.object, ...partialRfqt}, rfqt: { quoteRequestor: requestor.object, ...partialRfqt },
excludedSources: [], excludedSources: [],
}, },
); );