Merge pull request #1810 from 0xProject/bug/asset-buyer/remainingTakerAssetAmount

Fix bug where remainingTakerAssetAmount is not converted to BigNumber

.circleci/config.yml

@@ -124,6 +124,7 @@ jobs:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run: yarn wsrun test:circleci @0x/contracts-test-utils
             - run: yarn wsrun test:circleci @0x/abi-gen
+            - run: yarn wsrun test:circleci @0x/asset-buyer
             - run: yarn wsrun test:circleci @0x/contract-artifacts
             - run: yarn wsrun test:circleci @0x/assert
             - run: yarn wsrun test:circleci @0x/base-contract
@@ -149,6 +150,10 @@ jobs:
                   key: coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
                       - ~/repo/packages/assert/coverage/lcov.info
+            - save_cache:
+                  key: coverage-asset-buyer-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/asset-buyer/coverage/lcov.info
             - save_cache:
                   key: coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
@@ -327,6 +332,9 @@ jobs:
             - restore_cache:
                   keys:
                       - coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-asset-buyer-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
                   keys:
                       - coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}

packages/asset-buyer/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "6.1.2",
+        "changes": [
+            {
+                "note": "Convert `metaData.remainingTakerAssetAmount` to BigNumber if present in APIOrder",
+                "pr": 1810
+            }
+        ]
+    },
     {
         "timestamp": 1557507213,
         "version": "6.1.1",

packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts

@@ -1,6 +1,7 @@
 import { HttpClient } from '@0x/connect';
 import { orderCalculationUtils } from '@0x/order-utils';
 import { APIOrder, AssetPairsResponse, OrderbookResponse } from '@0x/types';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
 import {
@@ -25,12 +26,14 @@ export class StandardRelayerAPIOrderProvider implements OrderProvider {
     ): SignedOrderWithRemainingFillableMakerAssetAmount[] {
         const result = _.map(apiOrders, apiOrder => {
             const { order, metaData } = apiOrder;
-            // calculate remainingFillableMakerAssetAmount from api metadata, else assume order is completely fillable
-            const remainingFillableTakerAssetAmount = _.get(
-                metaData,
-                'remainingTakerAssetAmount',
-                order.takerAssetAmount,
-            );
+            // The contents of metaData is not explicity defined in the spec
+            // We check for remainingTakerAssetAmount as a string and use this value if populated
+            const metaDataRemainingTakerAssetAmount = _.get(metaData, 'remainingTakerAssetAmount') as
+                | string
+                | undefined;
+            const remainingFillableTakerAssetAmount = metaDataRemainingTakerAssetAmount
+                ? new BigNumber(metaDataRemainingTakerAssetAmount)
+                : order.takerAssetAmount;
             const remainingFillableMakerAssetAmount = orderCalculationUtils.getMakerFillAmount(
                 order,
                 remainingFillableTakerAssetAmount,