diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2019-01-03 08:52:15 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2019-01-08 02:31:11 +0800 |
commit | 1dda10b4f34eb19b731e58c26f13ecc08e367bbe (patch) | |
tree | a33ff795d65bcbb67379414e29138cb364c02fe0 /packages/pipeline/src/parsers/sra_orders/index.ts | |
parent | 0fba0b1a1bbe1192802ebcf4b88437b94d6a1c18 (diff) | |
download | dexon-sol-tools-1dda10b4f34eb19b731e58c26f13ecc08e367bbe.tar dexon-sol-tools-1dda10b4f34eb19b731e58c26f13ecc08e367bbe.tar.gz dexon-sol-tools-1dda10b4f34eb19b731e58c26f13ecc08e367bbe.tar.bz2 dexon-sol-tools-1dda10b4f34eb19b731e58c26f13ecc08e367bbe.tar.lz dexon-sol-tools-1dda10b4f34eb19b731e58c26f13ecc08e367bbe.tar.xz dexon-sol-tools-1dda10b4f34eb19b731e58c26f13ecc08e367bbe.tar.zst dexon-sol-tools-1dda10b4f34eb19b731e58c26f13ecc08e367bbe.zip |
Add recursive MultiAsset decoding, store first address in pipeline
Diffstat (limited to 'packages/pipeline/src/parsers/sra_orders/index.ts')
-rw-r--r-- | packages/pipeline/src/parsers/sra_orders/index.ts | 14 |
1 files changed, 8 insertions, 6 deletions
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); |