1 files changed, 14 insertions, 3 deletions
diff --git a/packages/pipeline/src/entities/ExchangeFillEvent.ts b/packages/pipeline/src/entities/ExchangeFillEvent.ts
index 1e9e8d986..1716c60d1 100644
--- a/packages/pipeline/src/entities/ExchangeFillEvent.ts
+++ b/packages/pipeline/src/entities/ExchangeFillEvent.ts
@@ -1,5 +1,7 @@
 import { Column, Entity, PrimaryColumn } from 'typeorm';
 
+export type ExchangeFillEventAssetType = 'erc20' | 'erc721';
+
 @Entity()
 export class ExchangeFillEvent {
     @PrimaryColumn() public logIndex!: number;
@@ -17,8 +19,17 @@ export class ExchangeFillEvent {
     @Column() public makerFeePaid!: string;
     @Column() public takerFeePaid!: string;
     @Column() public orderHash!: string;
-    // TODO(albrow): Decode asset data.
-    @Column() public makerAssetData!: string;
-    @Column() public takerAssetData!: string;
+    @Column() public rawMakerAssetData!: string;
+    @Column() public makerAssetType!: ExchangeFillEventAssetType;
+    @Column() public makerAssetProxyId!: string;
+    @Column() public makerTokenAddress!: string;
+    @Column({ nullable: true, type: String })
+    public makerTokenId!: string | null;
+    @Column() public rawTakerAssetData!: string;
+    @Column() public takerAssetType!: ExchangeFillEventAssetType;
+    @Column() public takerAssetProxyId!: string;
+    @Column() public takerTokenAddress!: string;
+    @Column({ nullable: true, type: String })
+    public takerTokenId!: string | null;
     // TODO(albrow): Include topics?
 }