Add recursive MultiAsset decoding, store first address in pipeline

3 files changed, 24 insertions, 18 deletions

diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json
index a40f3d21c..ab73642ec 100644
--- a/packages/pipeline/package.json
+++ b/packages/pipeline/package.json
@@ -44,7 +44,7 @@
         "@0x/contract-artifacts": "^1.0.1",
         "@0x/contract-wrappers": "^3.0.0",
         "@0x/dev-utils": "^1.0.21",
-        "@0x/order-utils": "^2.0.0",
+        "@0x/order-utils": "^3.0.7",
         "@0x/subproviders": "^2.1.8",
         "@0x/types": "^1.4.1",
         "@0x/utils": "^2.0.8",
diff --git a/packages/pipeline/src/parsers/events/exchange_events.ts b/packages/pipeline/src/parsers/events/exchange_events.ts
index 16b05260b..50fad7e00 100644
--- a/packages/pipeline/src/parsers/events/exchange_events.ts
+++ b/packages/pipeline/src/parsers/events/exchange_events.ts
@@ -1,6 +1,6 @@
 import { ExchangeCancelEventArgs, ExchangeCancelUpToEventArgs, ExchangeFillEventArgs } from '@0x/contract-wrappers';
 import { assetDataUtils } from '@0x/order-utils';
-import { AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0x/types';
+import { AssetProxyId, ERC721AssetData, SingleAssetData } from '@0x/types';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as R from 'ramda';
 
@@ -62,8 +62,9 @@ export function _convertToExchangeFillEvent(eventLog: LogWithDecodedArgs<Exchang
     // HACK(abandeali1): this event schema currently does not support multiple maker/taker assets, so we store a null byte array when decoding assetData from the MultiAssetProxy
     exchangeFillEvent.makerTokenAddress =
         makerAssetData.assetProxyId === AssetProxyId.MultiAsset
-            ? '0x'
-            : (makerAssetData as ERC20AssetData | ERC721AssetData).tokenAddress;
+            ? assetDataUtils.decodeMultiAssetDataRecursively(eventLog.args.makerAssetData).nestedAssetData[0]
+                  .tokenAddress
+            : (makerAssetData as SingleAssetData).tokenAddress;
     // tslint has a false positive here. Type assertion is required.
     // tslint:disable-next-line:no-unnecessary-type-assertion
     exchangeFillEvent.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
@@ -72,9 +73,10 @@ export function _convertToExchangeFillEvent(eventLog: LogWithDecodedArgs<Exchang
     exchangeFillEvent.takerAssetProxyId = takerAssetData.assetProxyId;
     // HACK(abandeali1): this event schema currently does not support multiple maker/taker assets, so we store a null byte array when decoding assetData from the MultiAssetProxy
     exchangeFillEvent.takerTokenAddress =
-        makerAssetData.assetProxyId === AssetProxyId.MultiAsset
-            ? '0x'
-            : (takerAssetData as ERC20AssetData | ERC721AssetData).tokenAddress;
+        takerAssetData.assetProxyId === AssetProxyId.MultiAsset
+            ? assetDataUtils.decodeMultiAssetDataRecursively(eventLog.args.takerAssetData).nestedAssetData[0]
+                  .tokenAddress
+            : (takerAssetData as SingleAssetData).tokenAddress;
     // tslint:disable-next-line:no-unnecessary-type-assertion
     exchangeFillEvent.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);
     return exchangeFillEvent;
@@ -107,8 +109,9 @@ export function _convertToExchangeCancelEvent(
     // HACK(abandeali1): this event schema currently does not support multiple maker/taker assets, so we store a null byte array when decoding assetData from the MultiAssetProxy
     exchangeCancelEvent.makerTokenAddress =
         makerAssetData.assetProxyId === AssetProxyId.MultiAsset
-            ? '0x'
-            : (makerAssetData as ERC20AssetData | ERC721AssetData).tokenAddress;
+            ? assetDataUtils.decodeMultiAssetDataRecursively(eventLog.args.makerAssetData).nestedAssetData[0]
+                  .tokenAddress
+            : (makerAssetData as SingleAssetData).tokenAddress;
     // tslint:disable-next-line:no-unnecessary-type-assertion
     exchangeCancelEvent.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
     exchangeCancelEvent.rawTakerAssetData = eventLog.args.takerAssetData;
@@ -116,9 +119,10 @@ export function _convertToExchangeCancelEvent(
     exchangeCancelEvent.takerAssetProxyId = takerAssetData.assetProxyId;
     // HACK(abandeali1): this event schema currently does not support multiple maker/taker assets, so we store a null byte array when decoding assetData from the MultiAssetProxy
     exchangeCancelEvent.takerTokenAddress =
-        makerAssetData.assetProxyId === AssetProxyId.MultiAsset
-            ? '0x'
-            : (takerAssetData as ERC20AssetData | ERC721AssetData).tokenAddress;
+        takerAssetData.assetProxyId === AssetProxyId.MultiAsset
+            ? assetDataUtils.decodeMultiAssetDataRecursively(eventLog.args.takerAssetData).nestedAssetData[0]
+                  .tokenAddress
+            : (takerAssetData as SingleAssetData).tokenAddress;
     // tslint:disable-next-line:no-unnecessary-type-assertion
     exchangeCancelEvent.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);
     return exchangeCancelEvent;
diff --git a/packages/pipeline/src/parsers/sra_orders/index.ts b/packages/pipeline/src/parsers/sra_orders/index.ts
index 2d3e5381d..663b8f509 100644
--- a/packages/pipeline/src/parsers/sra_orders/index.ts
+++ b/packages/pipeline/src/parsers/sra_orders/index.ts
@@ -1,6 +1,6 @@
 import { APIOrder, OrdersResponse } from '@0x/connect';
 import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
-import { AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0x/types';
+import { AssetProxyId, ERC721AssetData, SingleAssetData } from '@0x/types';
 import * as R from 'ramda';
 
 import { SraOrder } from '../../entities';
@@ -46,8 +46,9 @@ export function _convertToEntity(apiOrder: APIOrder): SraOrder {
     // HACK(abandeali1): this event schema currently does not support multiple maker/taker assets, so we store a null byte array when decoding assetData from the MultiAssetProxy
     sraOrder.makerTokenAddress =
         makerAssetData.assetProxyId === AssetProxyId.MultiAsset
-            ? '0x'
-            : (makerAssetData as ERC20AssetData | ERC721AssetData).tokenAddress;
+            ? assetDataUtils.decodeMultiAssetDataRecursively(apiOrder.order.makerAssetData).nestedAssetData[0]
+                  .tokenAddress
+            : (makerAssetData as SingleAssetData).tokenAddress;
     // tslint has a false positive here. Type assertion is required.
     // tslint:disable-next-line:no-unnecessary-type-assertion
     sraOrder.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
@@ -56,9 +57,10 @@ export function _convertToEntity(apiOrder: APIOrder): SraOrder {
     sraOrder.takerAssetProxyId = takerAssetData.assetProxyId;
     // HACK(abandeali1): this event schema currently does not support multiple maker/taker assets, so we store a null byte array when decoding assetData from the MultiAssetProxy
     sraOrder.takerTokenAddress =
-        makerAssetData.assetProxyId === AssetProxyId.MultiAsset
-            ? '0x'
-            : (takerAssetData as ERC20AssetData | ERC721AssetData).tokenAddress;
+        takerAssetData.assetProxyId === AssetProxyId.MultiAsset
+            ? assetDataUtils.decodeMultiAssetDataRecursively(apiOrder.order.takerAssetData).nestedAssetData[0]
+                  .tokenAddress
+            : (takerAssetData as SingleAssetData).tokenAddress;
     // tslint:disable-next-line:no-unnecessary-type-assertion
     sraOrder.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);