diff --git a/contracts/zero-ex/CHANGELOG.json b/contracts/zero-ex/CHANGELOG.json index 4711695bab..2e80948e8d 100644 --- a/contracts/zero-ex/CHANGELOG.json +++ b/contracts/zero-ex/CHANGELOG.json @@ -3,7 +3,12 @@ "version": "0.37.0", "changes": [ { - "note": "Add support for OTC orders in the FillQuoteTransformer" + "note": "Add support for OTC orders in the FillQuoteTransformer", + "pr": "565" + }, + { + "note": "fix CI", + "pr": "569" } ] }, diff --git a/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts b/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts index 4c8cd00d9b..08a3ce0ee8 100644 --- a/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts +++ b/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts @@ -393,6 +393,7 @@ blockchainTests.resets('FillQuoteTransformer', env => { buyToken: makerToken.address, bridgeOrders: [], limitOrders: [], + otcOrders: [], rfqOrders: [], fillSequence: [], fillAmount: MAX_UINT256, diff --git a/packages/protocol-utils/src/transformer_utils.ts b/packages/protocol-utils/src/transformer_utils.ts index 71eb65f36b..ca19978168 100644 --- a/packages/protocol-utils/src/transformer_utils.ts +++ b/packages/protocol-utils/src/transformer_utils.ts @@ -1,7 +1,7 @@ import { AbiEncoder, BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils'; import * as ethjs from 'ethereumjs-util'; -import { LimitOrder, LimitOrderFields, RfqOrder, RfqOrderFields, OtcOrder, OtcOrderFields } from './orders'; +import { LimitOrder, LimitOrderFields, OtcOrder, OtcOrderFields, RfqOrder, RfqOrderFields } from './orders'; import { Signature, SIGNATURE_ABI } from './signature_utils'; const BRIDGE_ORDER_ABI_COMPONENTS = [ @@ -105,8 +105,8 @@ export enum FillQuoteTransformerSide { export enum FillQuoteTransformerOrderType { Bridge, Limit, + Otc, Rfq, - Otc } /** @@ -202,7 +202,7 @@ export type FillQuoteTransformerRfqOrderInfo = FillQuoteTransformerNativeOrderIn /** * `FillQuoteTransformer.OtcOrderInfo` */ - export type FillQuoteTransformerOtcOrderInfo = FillQuoteTransformerNativeOrderInfo; +export type FillQuoteTransformerOtcOrderInfo = FillQuoteTransformerNativeOrderInfo; /** * ABI-encode a `FillQuoteTransformer.TransformData` type.