Register asset types within collisionResistantAbiDecoder

1 files changed, 14 insertions, 0 deletions

diff --git a/packages/order-watcher/src/order_watcher/order_watcher.ts b/packages/order-watcher/src/order_watcher/order_watcher.ts
index af479f32d..cefead761 100644
--- a/packages/order-watcher/src/order_watcher/order_watcher.ts
+++ b/packages/order-watcher/src/order_watcher/order_watcher.ts
@@ -152,6 +152,20 @@ export class OrderWatcher {
 
         this._orderByOrderHash[orderHash] = signedOrder;
         this._dependentOrderHashesTracker.addToDependentOrderHashes(signedOrder);
+
+        const decodedMakerAssetData = assetProxyUtils.decodeAssetData(signedOrder.makerAssetData);
+        if (decodedMakerAssetData.assetProxyId === AssetProxyId.ERC20) {
+            this._collisionResistantAbiDecoder.addERC20Token(decodedMakerAssetData.tokenAddress);
+        } else if (decodedMakerAssetData.assetProxyId === AssetProxyId.ERC721) {
+            this._collisionResistantAbiDecoder.addERC721Token(decodedMakerAssetData.tokenAddress);
+        }
+
+        const decodedTakerAssetData = assetProxyUtils.decodeAssetData(signedOrder.takerAssetData);
+        if (decodedTakerAssetData.assetProxyId === AssetProxyId.ERC20) {
+            this._collisionResistantAbiDecoder.addERC20Token(decodedTakerAssetData.tokenAddress);
+        } else if (decodedTakerAssetData.assetProxyId === AssetProxyId.ERC721) {
+            this._collisionResistantAbiDecoder.addERC721Token(decodedTakerAssetData.tokenAddress);
+        }
     }
     /**
      * Removes an order from the orderWatcher