From d0916e196c5872ee9ac82941f4a9f323f5179e74 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 12 Dec 2017 14:53:39 -0600
Subject: [PATCH 001/125] progress weth page

---
 .../public/images/token_icons/ether_erc20.png | Bin 69772 -> 7584 bytes
 .../public/images/wrapped_eth_gray.png        | Bin 0 -> 7649 bytes
 packages/website/ts/blockchain.ts             |   2 +
 .../website/ts/components/eth_wrappers.tsx    | 214 ++++++++++++++++++
 packages/website/ts/components/fill_order.tsx |   1 -
 packages/website/ts/components/portal.tsx     |  18 ++
 .../website/ts/components/portal_menu.tsx     |   8 +
 packages/website/ts/types.ts                  |  10 +
 packages/website/ts/utils/configs.ts          |  13 +-
 yarn.lock                                     |  22 +-
 10 files changed, 285 insertions(+), 3 deletions(-)
 create mode 100644 packages/website/public/images/wrapped_eth_gray.png
 create mode 100644 packages/website/ts/components/eth_wrappers.tsx

diff --git a/packages/website/public/images/token_icons/ether_erc20.png b/packages/website/public/images/token_icons/ether_erc20.png
index f4154db7b34513c7c45a6365ea0070fe2ac09e54..bc8beae8bedde2837801637230df794cd61cc743 100644
GIT binary patch
literal 7584
zcmV;R9be*!P)<h;3K|Lk000e1NJLTq005u>005u}1^@s7{K!|k00009a7bBm000XT
z000XT0n*)m`~UzQQb|NXRCt{2U0<vn#d-hPHKmO)wHx6G6352~cnA+MkhCRi>T|Ux
z5<UE}9Ys!|0xn80Rhu++oqa>%TFpx`K{ygs1*Gz&krEPBvPr^8CC=(zs>Qqjb|msp
zK==|TMWw2I{pTT$5bnc#bMBluGrKdpGkbQg`AJvzoc%L9XZD-<{?7LSp0UPsqSsF@
z0>E&<)+onk0UQP}KOC?J3!l*ICmqq4#kIxP_4>&^-SH?+UU6!)*H1d8heUC5yQx7H
zYo*U8bFRCQ8a6g6dTM+rQtuAX$9u%FEM=d`?V;^UC_=BFToga~P(kkiV54;0_|uI)
zIf|1#0JZ@55*@luI{l96XRp;AB<z<OQ?WIQlmB&UFiY93IS*r5%C1rm_WH@JvB4-#
zE(h@MYQxmf9^E~|0h>3z<t$|vsNn-y%5J5G{-KB#*U*R4!vWi5=&2JO78179=siV^
z0m@6UAn=EE2lEz)?K!<Ptv0&~I$=K*ou(|U%;@!#i@ko*6~}zd`|6;cP4vceJhvfl
z*OnQdJd!as7RAW{o8=#nR&163%8f~%@6lZ|9I!Ql9@mNkrl%`7U^+1zu%iI5R?u5f
z@1$e7>~t--SfOj|^1K^$7%g7~y;FJ0JAirBS*v@yQJg$W4e5BwR&bv3ce);$SinE!
z@f2FU|JZb13-ObqIJr5Blb2;KXDjDu8&&A=m7I040~CuQzmgh$1;}LqCxH^eQV~y)
zyX<8yTQ^#!Bcls!8m8-JouA(8CkrkQvt4C$51R#WSgcgK2hp;29Kdz}n}!3nT=sb`
z9UF1g689c<9roN2lzzSSnjXc;U0KS0W^=7H>c-J6{fc#Pk@;*fvA8;m83dJ?m02%!
z&(;aA+Z<T5wsU1Wshe=4j`aG;zTtprwY{8<?ZmjU21t5>K$+Lw>nBHs1Gamt$1Wph
z8Z})92~TAyd&;4M7Xcg`y<!iY6B5Q&`un(Yey`&zKMLSc=UGghy9&S#!zJn~mys)9
z=}^XW@f(;sSA?xDo$K|Ji|a}}<P)-d7sbiTMK=f=LKG*rL~-(pO((6bNjgMv@-+ZL
z?tU#x*#aGZ0i5%EJxkfMbWEnZd$W|i;qokbnYjqy=y1SxJ9KnnvScZHOg9-^UoF5V
zt~!g06?~;L>M>2{UM<@>!0?Lmv_~DHIJpwQL-f_kpkw=7QwKK!I1OOgWMMLNw3M(=
zhEW7Zo)KDxb&pBmKSEz`8V=Zr5}g{Yx3;5IX-LVY|G0GM&~U)^YZm@`#QkZYiqdo%
zz(!Jxx&RjB^NMU|=eP0ELFM%o&T{p22cM}`Y@=oFE&Meh)~H@TnFH`BfW_f}&E#EM
zq;>{dKzse<aRB>Dw_irPBP-66C7#nYo%c2}QJic6clX@mOD6`*dhrq6#RVAoqAKXb
zr`6-CUVIz?Tx3G((APA_HaPZi29g6)+d*(?_@HCMz>0J&V?lGwh~a=O0+UP8sDr|8
zHyp4zmxgonV?=TCL&r`|%!x{qM4A{f#uWFe6Go_=os#!!owPDaPMBHoS-j$tvT4=^
zx`~l<?KLiK12`;bQC6CAS&jxS?w+4IwmmXp<vOrT$e9@HbMCRSx&pv(!1jyJ>j3Pu
z?-~%riO%+NJ%CTs=dJYr6o3z;Yp!;AjzC%Ckw6cVi>vwr{tv);@x^skm$jstf<pka
zb?bKk{s+L_S<3#~_L=J(MXJ1x72%J-U;i(`&3Cz=el6vN(M+Hq62=B+bkQ<7SaLSM
zWhuKgijyk<yx@4BOUDFWTnoTjUyb7Az9>%a%TjipM)N-{Zo65s54u|Y=c>%&r?Zru
zrDL)YQ%sWAvy?CXBxT<M;G8&Si?RmH(NZIu;Hab5Nh7ualGs&7a46-5pv78V;4fq;
zdqTNp>~)r~b}bGEY(`9yc>uGv4P+^MD~c2O(B(9$&w<-&RIV{$=q!Se4McRxgVggm
zhfeAqx>M6RWGVZRZM%8Cx@B->+8TyVs@IeeSV!iR(K_g2NmXzbz?Ft`t|HvTJkY6~
z3uFSeLYA_p4X4g!DLZG|POqOF*F9Iq>bl_eX=~_Swaa=(GU;~u8^c5g^MWJ_P-?xS
zc*w&5P6*XAw}WLnnWgMC`e;343CF?hj5j&nw}P@!9tCZ7Y_7AFW)^z=1n^)Cm(6al
zV6`r82xk{UP8&<Z0o!JCkF`7~(d8`t?_y<Q9F$EabnXEV`;>mrL08jCRX@pTNJ^7o
zauu3+^UxgM7{OxYaDEFRQ6?h58MGEJKx3cO%(rFTbrOy$ZJP$XwC~6TK`Bu3hR8Sp
zVE1sqmI6Fab!`F&>)Z0_Iue0~hh)=K(;!i7DTlX;N>kWCVZW@>W{o&bvPC5dEz9pu
z0_aGGPE-=*42a_7b^zb<=~WXTNpEZ)V3~m|OM&~rV?Sne0=f^#kzr(?m~m0Ria=|y
z5NnRW!F(peYQ*Vn?Q#unEepi}F1xHAb1_ep1qr)5Y`C~}tO6mpXrS@EsKL5#WGTBh
zWFM5@oGW+c?XB)WS|dV-xfmR#fFasB#JVU$-o5~sf4|nAK=M?bgSQhF4qfG*ayzOl
zK}>O^;+X{YJPKR@@M37SNeLs?!4z*V;N(v$0}|Kfb;AEtb>X}q3<*U82smzD@Ch|{
zgdo!(a-9sz!2|3D5CGoIQg&C_{@6eopHU3F9LghGqMd@FToA>{bq<5)f~!NXixNgL
z`Z5!d?Pg0Mo=Vv&oT4^LJR{g3%FI*{+&cOqM;Td}VqM`#b@CP@5!NDtFl?Un3c@p&
zjexR^4t#De`F@hc;C&V=1EnHw&(?1Nyq|ME2y^N6lkLKi6I#Bz9Do`Vw;nt`=`zb^
z@&-`F8BFT5L79u{BiQdt-;LtrMgX^CJj$#LTn13Z`vBer@PSXwMH;VpRTG)8=2pNv
z;Bj452CpjCfu~q1+=y5bonStZEM?~b$h#^38Nkh<o~OY~ma^A<H>!A{-Q(PBAsGjr
z$WnG8OWEH`=l&AFw>>}dRF<-d7Zk<G9DqALPT>cn&(DZ8a649l1j+`=XrXZ6m$Q@|
z(_HfcfGZ45<gI~^WGS22s1n7=0syhA;h=4T2OFqkRf{eh#mNjNr|(%^@J|#c`v81d
zI;0NZby>>JDEHh2P54%5lNT_l3m*YjQ-bVhERY9(lBMjFa{bi+{v}J<#P(*|@o|Hp
zt;H;5-z?u#JtSYyXnah@gkUznC{FGJu({x}x3ZKyr`&f9?6xL&^_>VPj<g4d12zw6
z1nHUvQ72%VU~7$W4kNaO5)w6LsnS`bM@*#3X3{(mS9T7r&B47j4c<f~o-T%QS)#nk
zp8Gt|AU;=kVSXE*aZPaH2(gv$kWNBrOmtT06gr_`>lY5bE&^ebB-x_ZPYz>cUqH1j
z;!49#yZ@^o$FUyFCoBob0#-h7Cu-6>B-lVo-a0XWp~RC8#$#lhepA`tq7HcQ`hFiF
zVkSg!vKhdj1}FMqU}e{g3w*{0%2Pa8&`}jA!myV<dSwU(xp5ghm~qMHvuvQqa5B8b
zSqI~&n&8W^H{R<f8-3~9y?)YFsYzve;5i+=>-STU1A8mQAM!BLH|d^2t!Nq<xf&x#
z10!p17nsb|L3`C62X_@LHgS#p5GBww3S0nDpb3pioQIk=+6YL~aF!0K+^}1sO|dpE
zgUhA!<$LIkx^^nb`lXCV0nAC?A4EQL857zS57|cW<THoC2XiK*kS`E=r_xxMtOk`g
zyQmuqRfL}Mp$AYWdU%U|P@dHR-+H0Gu%KE|=m8W{x0a26(sR4un;U~#jQ~#rC|hZo
z#wBG)ONzG$T&EO4I*{mbT>9Rv+GaqA>Ajuu7j~*PSZM%hjqA$C8m=Lz%g9NWgfBXj
zwFipq(=xnobB*HU?kr`lY3d50VQ!_Tv@-=725(!SJ;E~~0@7)nmc^&-WGi$=nJGN0
zb|z3*@O|{r*0JscqB!}bcgnQmJb)y_ErI6-2^qPtS^DmjYSR|<TV?<(qGWJ=BSj8r
z+I|AS=jrpqS;}6WQkRUdqQG81ne)N&Z4kwYDT>u8VRaSs`pFSnajb9vN!NT7`DJo_
z!sy7RXw#se-@6MuUsI>(`rH8|8Ob_ZT2)Al!-P9)=!VRl3yG$P0>_*}rMhDYm2u=;
z7lfe*sG%GpnYsza0aS!dZT2_Mu#Feo5XH$YAv>Z-7u)luvT4WqSV(ORTVFrtcuO4&
zMb40KoXRE&l#3Gtow@|)JjS6JipDFbbI=!a;m}hzij#+muhOCph9V2s+Rc!r0o)Dl
zdkwuA@k*GJu-e=onxQO#&%lEwUBBr$6J$-qgsEyMl?|$8QG#)pP@9ILgIYjlUtKC2
zN-z!+qB!}kueS0)X_&k6F*)hP5pbt>aFwkB<1nG?xxERHir0lwxJRZyr)rU9QI&Dz
zv>TM6fSd3D=*!#G3E$Kw5L!c#Q^AZjri%hbbJEFRDegQn4ikbg6vgU3GO!2={DyR4
z$o!|?7>5aUF%$tYfWb{xB^k#SxCcOWOFYLGquD9e!CKb95{zR9c*2Ssz>AP?1urgS
z`@B%ui@qm)egK#pz{NlhwxPbu0QA8JPFF|hW8ed6^&+C!e}sgx4lV&J1Go)5YRbFi
z#e#9H2OqSZ06t>T<R<We{Aj^-LDoXD58NbzrGo3iIr?q~K+z7Q^(Zd=_IvQ;Iy$_X
zrR?E?`zs-|wdEm9PPtFfpABpVP~ZdbfmCy81=(XK5HfGfW{eNs4p>x{tAMrO3<uy@
z-hM})7f?*;rLj&<;P2V~cON)o_yX+KHlO$y{XY%hY!oNmEcIg;mgBvL1GZ)z#xwDF
zK@=x<pjtgdU)V%{hv6?T;;j6|se+&_vXng!;CbKeRzO~$dnJTSKK3mD-zrG!6dGU8
zQub`f2du@onWpRe0a?nv0N{S#?H1srEM-@P9z1{#;5*Xyj*mtuSJntw%HE`+q5tZm
z{Q_L4ri!B6T0yWD<LcWE!*x!`QnnDq$pNYdA|L-g4Wvo%t%CcB>PCslqBz+=dU3F1
zv}+Z=@2szeDXGqlG>}`Ab6*7TMNg0V1r6LU<bzaQdjUMtM+mRoGO)r#L?tcXy6^(E
zxhIN~u|lv}%H9QVYZND61@M&;ZJ)_fHj!H}ij%zn_Daw3ohD^$tm@E()nWsuvXuQq
zbKSpzC#;oWQss7KDSJt|Uzgo2s2T^<<XATt6rRgc_Lg#;T0&bLz$demJ)&v<XP6x5
zA9+r2rbS%?xEWlv)8UCMWfzp|?*Q-!RtC_NAN2tAQT)MD;i=FiV60SY(gez*zr}F+
zy)0!v(A@J3c%D=>v*j(waUcb%0w(qYj*X9;3SQoBzimn>;TNPzyQVhe1hYDP)0g2u
zhA9D?Y|?*5`W(th{Y1g}84`OY%=S^7e3xXpyuo`T#Ng#&G=NI3fli2r(OPHoavl<1
zyeLk(G;m#u_CsZMlhY8)%jZ<5(kMcm(k6KaP0<U57XnvCaq>9qeH$T}#;o|DZX6#Q
zKqVGh8`A0nvOw(#KMy7EDN!2}razrucyv)HDkMyB-LlBipq0nutsWCbS=|827low4
z_W+zKys)^P;MvLv%ev%c+AO|U31JAjy+NnaIl_Ckat#&%z?8gV>bo@yl5*$8NCz*2
zW`n84NDGi?<6JPM34;e%_(Y^F{y|hc0LW5yjJCPvm57vacZhxfW53rbkAe*aid{=x
zMWFNw2hnCRaJe&)55mfmXET8Ep0QauJ~#jhnM#N<7XoE!2iR`)nwJh8Cd-6(kk#eA
zobw?wn2%*5v5nHOVj`rz$QzN52OLC`fE~;@s>uLnoo~yU3)6xs3zEkJZpu;D!*ii(
zt7``DCYNl#PGSrRlXBxh_Lh)n^P2QMq@h3^Jg0nyW%9;s0$&r4hR6dbkfltRy@D2`
z2UlGe!HvklGhQ0e>n9sYhH5l?hp%|g9|)e&C`gIjDv**g0`M0L=_@*`BY!4&%6m4q
zGB6}d^9G;Q9Oj@Yj)y4?BuNOzq1i;_GZNRkHAX2pF+!cGK{Z8I1a=Px?5NLYdAG*U
z`lpIJ6Y#m1YvfUt>JCzxKCgoZ)L;+n^^-YG3K5;oIS=4Pa3-{9XsZkEo!fy)FP&Qb
zVHbdnp);FLs~m<?X$u;RBRQ7?f$~!qVOj>&O>o<n*U332a_HASct8V8`T}w-5%9#_
zOUn5<`q-#iB8?fqrh+yieH!l38cP743&FTn6D}zNB#l!TkaAZ7O%1}b$W7-@iqb4r
zB(I}WwQ1ChRY`#4wb_YcYo(Dmh%io~dNv88FH<#d<lrdyYC2!BFO5U%36O~G8z{G%
z(8}(ntNP~yISRWCP5}5`+ljKZ1ZY_qQN;;x?dQ2B3F5$LHQWiVNVra>%5|xxg<4C>
z)rckV{5VIaQBbxFXhJNi$7z+^1-{C647V?Z=~Z|%as{N-tpf{zoRo!);OulMc;^}b
zl21ihEu+a=QE-;0Wvj|VV+b(E8wCW~GPRmfV14#h+Pf;I%7RJmIf8sma~T0rvRndK
z$~pIFub(^$KCZi`DG%4a0%}SNn{Wc$!PZLQx+x$L<uHmBn|W}TQmvD{?ic}G(OMZ(
zpOLnpT`dOz{5gQTLuX|00ZWc^0{k5;)zPO~2++c0QftxSs-WaIdoaFz>fS76Z%nUO
zZpf+CE)cYuwLo12*n!^Q`e54(skDnqcsA7idyj<*fDZ-3;^3`lbrBk)1-Ai|KkY{8
zkZuF%&jauIUR9X-2G_QL3RT`%cp-3S6em9n-JjJ0U;7%m7<Z~KgUb-D*I-H6cnJE<
z%XwSq&!HvCNf8V-S}!tU<rR=}Y^f0)!qn1gkg}oXJG8|H01KfDr`80WgJ6N)eI=A8
zz+OMuPO;%#&FN(Tt<h?AAZ25Zho+v4;zXCyuua$oy)&TO>n9hhY!&~5GB?qZY|{1)
z4F_!I?Kh9L)_Xz9#-CYSdL;}sUKM=qlh@vM&96@$TddNrY2ocRk1fCb=CN;Id;M)2
z0sMvLlE1z7`rFpL{pPVn*S4KyKqalEiq?h&2^cEIm|#<CR>m8l5*pTpf=F@aL_$sk
zXxep&hHj{K0i_tdA8zuVD**zlL^<(A3)V6qt$ex%9$f{*w*_WR*Ed#$azgK1x8bTo
zRh6yaqJ(@;bL`M?z;<hnw+2)q(1)_&iq<P9^zIKThnE3ZCv&)@Jt0w?>;y1TJHr8G
zSg?x4kg4aIj!V`PLdr%J;`4<rmF>7BamlTKC6x^me5`;1=K%ao;4G$%gO&hE)n34O
z+?e;=K6OJ1qw)ox1Ss%upju<KfeHnvx$d>Dy9pLd5zD&FT-KUR6EQ_)!xc|b{kAqk
zS7>2Dmqb!01DbreQ_uHT7F6`=)@k>{0eho3u`M>!M3`u0g0|GkXC^CmZ2^itL6I!?
z!``#uiV!SVMk9(+ltHhb9EX1U#hABDT>)3k>PO1P*AR~Q>cG`eoGegf(6+&96&w*D
zt$tn24UNhtXM-qCt^@aMtOjfV@YA+=PE45|z$0izE2F#uK454|=K*OfNZHsK@Db|)
zd=|i$0L0+YFk1n96k+#Sw^2DU(awn0WCGO2bhXL!5=hzT0O)}e+?N3S74#ukR{;1p
zRtWNHI_495qc|~E{cRd@XlF!g@{HY&aogWA!j|*&29L_ddT`>o9>8T4+xkQBRq><r
z{R41g^LYU8S7`SZ@|@h;l8BmZ7~c=R2w)UH(0We@DH~<wy{iCxivE{@DDYkuzXNcF
z{+GesZTFnCngB`Ju$A{N181k#1NexiE>tBz74KtZmHfc+o*?z&>q2V@Fp85I05|7c
zvL1YOvk93m3*Q8&!+G#kGLLOPm8I;d!2JjUxtPQ(R<x66nw+tKl#MOQ;SP9oOPw{t
z>L5TBzsJfdDdW{FWe?Zf7b|EIQq6-BA+4bcbXMzNg@VgM+N1lY@TV+P!88a^g-~wJ
z0{AT&sGJzW_ZNo)HY2oP?UuWcohpf4;4+_Y^G2Jo7Qmm--<1IF0PyTodo+oT=|rn?
zL}w}cF@PTfqkX&kz*oUb8LtC)Bum*#)9y$aw2A;_WGQ<M-1dhkPObp(RRCX}YNzVM
zlK@zjvNO}}NL2^|d=VO!8>&8rZ)7Pu58x2}A&Qebz*ooB!m3XJ_)eCxrm@yS<ka<i
z5m+I>Md<T?bm3N2FeoIC#~A=GXDK_SyDm%F^8lWwd#(oX2=YxfO~gw8zHa)BGAK}C
zFMw;%JSC)SIKBvsn_+Y{KpUqC1EYWg;q$!!;25#wqWi7@@Ymq1+Q;hXQwu%=ZqNIU
z&Be5(b1!(b4A4+pped7vs3$ASfJZS|Tdhu;nl-YN9gE`Rb*yYInjyn90K5fYAxqg=
z&3)$qe4qY=BJ&8QXG%E*zRDFU5EK*mkC=R!P2bF<v#^YU6x4|54mc5Rgr??f6H&0Y
z_bh<_uw-LbfXj_{I6S`03ivFz)>^1QL~+sua3JRyt=LmchUhMRU6eENx7HOW!(q4E
z%itb^3l?pD8C<i@W7ReUcm|x{3KfVbPBs7#thETO-#rJc5&{&UG`gEDFFysog1l$Z
z?)BiSqpHZ52=FCvqI=z<?Hj;XIopWm)@Rs~v8o6Vn8;#piwod#<F72*7mCbRFiwCB
zz>}7&^)7IEZbQ+v3R;zgUxeQ0rR+0pOrOJ~S*DR1u?_`!oo(<daDpsk)t3F)0KUrI
zS+a>%rF1iBzK4bbHnCC3M1V)2uQtBFi4_-3un5_*fwdx|Jo^>^bEvLi|0qk@V-?$|
z4ZVJ{5BlAeM|GLhj4Zg<PfkN`hN-23jxR)UvKhdAo|?M=;I%Ae#|+Qf3$8@CvQ`t?
zR(+|9$%OR)FBQ8<cTXMx=A~k7UHMc)3}IEg2OxsI0%42B#`c+zQw<BqN!^^QgyhtC
zTLve>RwW{L4B@vyh|CDB3$Z6V-%02>W^OsQ-28xaqnZH|^q`ZvWHU`hma?}1JOM7(
zH4X0qm|11Scd#h3zA!;0Rn|5U;pyToHVawGE@UZt8r&$|6g-us?5?(GxeD@#Z?5QO
zs|=|*M7U^ke-lB9#M9u4#k3&ID~$^xaDYy>vm!oV6&j+;phB+bDl*`QRW(tvQqpR}
zuTLKPuTNfk+izf34O50~r6d&(x5=Xs5?)t8QpM3W6O9Z<fAS?&DappQ<_cfsT6N{$
zTba}n0HQd#5y0&hm%0$(!7OF1%!Y5+wmUx@u*wA~eU)kGXpU{CN{YIC!Hot5B|HH?
z3W_kVw2t_C{bV0S%Ih+xb$mR-8w)lBFvw_?3s0cHpIo#8w#ttykmFJlu-0;m;9CaV
z2;Om1{n%DkQYU}%9!y5pm<aG3xT4V-KQ3S_&mrRk`1|wb0SjV=A!S5Y>Oo)`yza<i
zi06lb#$2N#z*dCG%djB4WpID)lJ92+wF6rGuvUe40TcdYl>l28CZFT)2WsG0wHTre
zgxJb}24EEMx(8e~{5)E0UNQJ`TPZ4Ca){#O?zWd)oi-Zhiqk~YdegWrHE1jo+OYU(
zqEQ5x6V5Gg6kKjxs;5Wo0x5rwL%*FupivXLQ3MF&mUvRJ3|@!gP#fh)A0YW{AAoPb
zE{jFuyi<)MKmnS~hvAkevr)4<1PZiP9Tvf(l9xjCrz#ptfGS9yv6<<uGws;I!b1TN
zXK2erYz+a*$YDLXEJh=gFM?b5U!;4NeD~GRj}Ew)v4j41rPH~Jf+p~z)uKo%39t+-
zeAPB6)FKVl!d<cIMF|04(J*bmA?U-$U9gWf?Q20qUX}QkL784J1za*Kpbq4r*$&{-
z^nW|@Wz1ZkXu%FKxs4O__e*fr|Dng>Lwty7;Qs+hcsy4O+`kq80000<MNUMnLSTaA
CKrfpB

literal 69772
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%0AZZa{ux=KXhhM_uk*PEG1tZj#~H_0^&G
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

diff --git a/packages/website/public/images/wrapped_eth_gray.png b/packages/website/public/images/wrapped_eth_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..397b31b1c67a7fec1cc54de1ad686094ac222e60
GIT binary patch
literal 7649
zcmV<79UkI|P)<h;3K|Lk000e1NJLTq005u>005u}1^@s7{K!|k00009a7bBm000XT
z000XT0n*)m`~UzQlSxEDRCt{2U0<jj$9ezhPbA-1k$vO1Zm*r1+(Wui1hP?t)dpEm
z(mREc4I}}%B~Y0{kRO6kp_uxi7(F@BOOxP-h*Gff;=~Y_cvDI~<sq?!v4s+xkXt7Q
z_F|Pvv2bk3j@v7xiqnVr=G-}RW_D+GXZGw${(<0X&z{*iv)|13|NDT**yQ>k&-3E|
zP!z=@#`S#w4gok@6vflEPssCpQ4QvCZ~c9Fo*%GX7eYK7G-#gZi>`+VAu`v1CN^t-
zKU#6$9XzmeP&HHMOVMU`kpH|_T_d8eSI*G)CDb9$^W*9#pRSo504!+Noj=|AlZ6oX
z0JsIf9=>#&_VFdx&)#gi$hcn{%*3J);<2C^@+`lk{a2sikBI1p=KXn|?{m&j2(cBw
z&xq&={W=jHgJb4JQJhsHTi>z};-LOwgb?=%As(*UHJkX4V?|L|*Cdn<YYAH$^xnF`
z0OKut5co5;i&Y22QpGG?>$baQ68>8;Xv^}+j6Bbe=XpL-*JADa_TZV#%*J)Sa-eAU
zHd&u4l5q~kTd?-{4;kzr@8Nr0_bGY|<|(yXPtjY=VEVO6cDfl-tgsEXwd#vDOpdRb
z*_k}$65#&nn{6*d2=N6T$aXR>Lh_V9v(3=O0)Ai~{W_QpywCNy73wDoA?_4Hd`ahW
zzH*LrP=lvb@smZMUKF{g4g4@rNr#UD2?$%Ca=g9lGiZ~EOm6TQnD29L+o~@;6!I`H
zM(=poJ^+W5+F^T8Q528ld43eY5`f2wqF8VGypV}axN3v%9tvId$`#ap{fvU<f)HXC
z5xwGbueR#W)ouKWZ3vP1d@*yl28$UClbJO+FKy4>WZnSa@uDa$wV2$L91yyarp~`f
z``|!P6jp7oVq&{7tqRRdu*oEOK8K5<IJrfebv7Q4PX$cwAb|H<KKeuR!e}(wKN^it
zmgRZh@v|)ZLY8G4H0ZlawaJ-K62>C`yT$l?e;{410$2&&#XPwk0G1uMn6F$%rF>;W
z6Vt_8a8Irdiy@QC^Za<QXbRvKUA{AH2Uf7m2O-2=LWqZbCh2WWvOx&(NdW4{ohPD_
zuYVDe^L&?xUgm2$-91G_uZKKKKW2^tSS^a;WWYpcHVY9wXWI;+uNIIS*WAVR3cfKJ
z^O|LH=bKIraJ=F?&yNQlJ2wHikN@js(D8k)Yk~^^jsaMAS(qFXZ6qwXOxklrl@VHp
z_bz6I|1kget3^><XfUbCdF#7ct>i(r>3>GMbh;>tXDtVRH{$+0&_-!G24H~|qY;23
z`sao+<>$AFF+t<?)$Vfhbtm7cZET}WzFWJ3DbA=o&sPAf09Y%E;u}@>Zs~e*05Bep
z*Rm{I0B}#1Wh)_){M6(^UkO`rKHuOuPD4O6y;ulwE2PMOZ!Db{aO=f~Z8z6oV)1OD
z6CX3Ln@*jh01zS*@`OHVxwbuUjwhfwFs&1Wl!n6zc0;<>al~@XiJ~Y<VD>1QOi<bF
zilPXbphE>!pZ!hXBxg>GR+~iI7&=;+K1?XJ(@Qq9z~x?^py7s@*bvn#epENj`oOj^
zD(>AGGB$uiiWYUHsgmVb5Ta8*7&!LCh*jypa-m{lY^(UrgTCVzMe(fqdn*D}O(BHM
z_VOXHsTk651OS%-{9d~!^fd!$u#1h=`zU4)SMvw_4}jmQ|Ag-9svwZ6$thFY%*k)T
z&5*150Ujf0CAS8ORJF%S)w3Wc`uC7JcO`gUmx5NX%4_L~E6UR4iA%xeHzIn11%WRH
zelKKV3gu=1-ukK#Vy_TlFA-hk)m-!V+SfGuU=UX+isDq8U3`X!uJAQm0Mu(lbb>$s
zJb*g^TvgY6(bRxBIcjth98dH%ZN;`j6T6xS4k}J6NIBxeT0h{g5z!0AJyWl<fwgO`
zD2i{WO>!21H_IcUH-r%SrLDZGs{nG$a*Y{7XC0Jmu$lk!G|zk`V3M|n?zT)0%3kdQ
zr$i08o4qH<53XIAh63xvoYGqD6hhnw;3n;oE>WK#qN{Djx2c^Eu?g4<M0CdS(bbU2
z<#~S8_FNmQTZRX()M0zoA?F>-q)XTk+1wMX3X-TnsZB2ANLhjm(z>8j&&mllog@({
zSF87qWgLaHGk!JjdmCsP<xw-HmnP{e%^b<|9Ee~H&-45<08~JIE$0exLj=1JD#o}}
z6vg8{-|?0QHM&$`v%2B@lx{NN&prWWpV|*P6>3^(>nAw|O)qh5u39s16`}_A#DK@i
z5&RZXqDe$RF!(G!0*jVv*>CH%`!uW?W4ji-vF|7ZNhwhChUmBe;ACj<mFM$J*Cv3p
zzO85rs0A9H)=g7=gGRB99Ns2cZQ%+E8v>59Y|)BB8&P1M=Z|8;MhQqcv$-hefDj@B
z@Ru>YY6>jrP2~YLS;(dfsA4}(*aY+#&?3W>e%M+!bb-B+>rI%B*8=j}+8r9)+7uPh
zy3d7}Cz^tV-DRHztqcX=!Hz>_Q)XF~Esn?I)w=JrfyMWt2kYKF8jY6Aviy0<Ib>OO
z6u?rJWh+^hVLTo?4YXCc)l+9g>M$3F!xXTDV*~Lb@LkZ;7XbI~cSQ|O$x|IHo-K}D
z!I^m1!6HrtdIh=J*=by+R-244VjG+b$as>7-i|n>8L+r^)+YSVRTr)b!q8B+fB^6k
z5xvxQK22cDaRCy^bvis35Aa(+0C<~-o@_WBFKFvCiGkNcd2~y3P%u;ogb=p{EM5q9
zHqJB+$HcFu8>Mx-S#(7om{h9>irQ%KjAV<bGZ95_DilhOGV(IThJvZi%xiLC2WE4k
zJ`nJ%hZ{sUg<=6P(&!-fc693V*s>qSv~I1VDrf600Pj|Oo`kvNdA_79IZ3%NR~Im2
z;<iD?C)H{}jH(4RaRsv>AxW9bRDc42XJhHRLWny6WSEXJYl4skH1RHgw*mY<rqHde
z*ICoEIb+Rjfy<C*SewObi_HLT1#m9W_#aH>6JgVno=y2#$Uvj6aDs?li#@2}g?=;H
z0&2#A7l`N@5&fI?*)o8?iu}mSMD#VwJXQeginxV8q5b`1bp|eBBS^qI<<JKP2R=tc
zGuw&NXI)tcRcGM$iReYkct^DHPWcvi@PWBjo#?_sh!JMD?-g6{j}YR10QYE@%mw_4
zici$OvkR8+t<=^UU{)7C45=w3$!M&R2Y*IHmyP>(0{AQu&8U`~@o~FjtTiI~Uh|pS
zq4|O)>*F#eB(nhuA@)LQ8dZ3Mh^8#xyqFJqJR*tj#BiiNt*QggY~hX;(I#NK;A@Qu
z4kPx35fU|Jsj@}5O_)fVWYQ`yR}K!Yt-w<qE#6Edo-KxPU8B6DPI6wvR!%A+`g&-A
zi$Exg{Artn(wpe43I^la!gI4i>+tmpCqEZ~v_+D9k>~j#Y~%&h#tt?L0Yw6VTStXs
z{dFRGD#bH30a?K-JT7PpTON{ZA-f9gu*Ap&{idd|F^d2mfHZ$4V>CjD9RU8W1OM+K
zU?XcL1To_S^(~$(=%@`0VK~YhqjF(~+_(-I%$UScRWl!5hSL!(&N`VGV+p>TdgFPX
zFT~Qf^E@A!)MPR}0AEg_-_J!3%r}}pRAHiT@^@;rqIp#0>Wv@`Osu`jz-+A!&Q;4H
zt0%7Y@r->B4bV3Vd<ZpVGkaAy4;>}iC}`VIsY)g{46Zq<osH`N3jN&d0$pV)>H4LP
z6-*aSdK%TtWlCr_JY)-y#b*vdF6N1pLcT)kOr@zXSqoYxyO;@uCQ@(t)C*`6J)%WF
z7|&XSOuaB)SW>Mh^#ZD`+ezY|_FNU)oYZOrL|Q=IO4BzksY5$bqD9~al?bwdMUSJ}
z|Dz}1M}*qmOI*LOX^FTAS}h=-aZ{p4&ou<|7<n|L;EN4S?SZQLw2tU$u0n{96VZRh
z922lIx5isKm;xP(_jsZl;Zcf!bUvqb@o9-|g~4dDh4ttp6h-k!qOjn-{HL#DJqS#3
z`b%$g9tJNU%W#(<YlEbWT-c%gKd3ybFZj2dfUNe`D7d~?#smdz+uj1;BmDO>MD*Wt
znvxS<6qx7vN(`3o10jSfiuH3{JRguzYQExF?E<o{xq|98xiR6KI7gc%1^?dNkoB5s
ziKcP^Sw`}%mev*;<8WbD2h;eK_IEAO)KTD+Q>f8&JYh19iu;l<6a_PsLlskZ!MT8j
zuxYLS78$<rg4=}<ccq+&Azdt0ZDs2M=0;244pLw54*W_N3`IBeI=8Zm0`=wuNw+Q|
zbODny6pL5T=Af_V!l}0|*AZ=kE*Od~Tz}AZgEiqV%d!gqcKTK!YzpqdRYiR_p+dzP
zjYjvDW%=Xi6Jw0W<11N~twCyC|6#kQ?==&2O~i${YACG@s!h>=ak$W#hGK)+K;}SK
zDjOOw4i|(FpN=(F6}SxZl%}K?oj44c?wVX>Yr!~NXxaqS8?53j!)V;2Q()3!5DLsV
zZmPX8eB7iO3b-XKU~g~JC1O*bLTU{~&)3V<AF67HE|exKaTk$sxR8vY7*_X*fkjc^
z0qw?=^-ohTU}p?PK`mf%lT|~;aVx@)nUoA=vOCo|*vT2#fN_i<%LUvHDNHXSAd)O$
z^`hsszpV@C(@Liae5h{=fR8~g+|8EHKLELqUJVMlE<;op=ir+F>%v)<orTo*o{9ZX
zW*oOx+_DW)g!%)_>gHQ8yI}8wJaV=G_`iyA|D-I-=*fuV@%U7hWvfL|ya;rl3s>m7
zi;yLss;~|9HM4#PSzO14^F;KWn(wzl(lgM(IPQSlrge+wi!G2Z!^Uv#Y|xW52+0<Z
z^W1dCp%}v*i5|HLc7~HwL)oeqoQ)i5uosd#K8lL=k%^$T{r>{EDuh@jq9_bfkM}N$
z;*re=XgcN#uH&)?k~ws}cskw>Ns$jk9CK>DHba(-iwdq3^o!Wzw!lB98aQR~u^#~V
zK}}hw)c9`d((#+Y0wItlJeP?61;Dprk6VLRiRf4tb@w+zvvZ+gjGPIsl{Eno{hFJG
zx*Fxh#8=ExQG6yR!B$MGZ_AL~EL(wyN*16m645WU>t_I*5keeBKv7vwe4B`-&Rwks
zX><)sVYA`)jmD9=sLmZih=W{9Q2*>CfNw^6)Gv6unv3@!<l?=a$ZNL_Y%mekNh@{~
zLJ1b2g%DGXV7dPN6RfQ?F?C%bqOX`2g%JAz?AM+XyG+W|T6Lido6QE^BBGyK?)z)V
zg0(tay6{ONde!*8t-4#XE;tHZ6=1X(6jq7o4dXtug|@kXFA~xBE#p6k+2*`2M=o$?
zMOO>B15&lK;RPbPX57CEz^AaWfUf$e2VsxmPgV-ggslK$t6q~Xa2<VDDfoAY=qHx%
zJOEiI)vRoJ7b+Y`iMoKPe88#o(H-lmp8j%*=mgujr(p+k>!|>9BKo#v@s6O{`xd?Q
zCqqT5PFcG3!~LxG;X_E%l;8zaN1~2c2tQ*fH2Z1PJB(hBWp(kzgaVCP14-gz_^k7Z
zH@r_7V}%gQ>?Er7aU`tlrk5d@QZ!71>Lh=R%O*t!H^aVGdn0g@5F!WQ>*r0$G$sm$
znK(YRfJQ8|HKa8Lbb&e&UP;*XP><S}DIH}q=}&G-MTLwRuG<tul(O@fzJOmgKeR2N
zep5;+d<U|jO51UgS1V_%+lrT2tN3Cggdu5qLyc(TgH$4mjx_*q6|b0kwq{LH?y4B+
z<ZaM=Ft-?K1r}|B8>aMO@c<8>h?e4?M8yLDB09%fh_8?4$rSSdrhczi9R(i>R9Q>Q
zhCmq=0iw-X;$E7n9)wpbBcBD-MTC8Nd~gE%tnP*sZ7vj=^bV+PO*S5nFJ)P_h>bV0
zJIk`w@p$~3(1+EbEXymS(dag8IOC@>l@eDlKL#231;9T_!;6Wq`l6Q!Im+gp=&+f!
z7|D#ImI`p*^|rjZFdwM8AbB)lQjU2ZUQOlWwJhFOL#q7-i7_lp>VqfAEn(5-y!QW;
zh5~c(g6bJIsT=bcq)BHrMIAr|B2s3rBqk~ikAv&RbW!ori9F92Scd8~Vu!CpuOA2*
zYn?RDxCwk3&No4<=q#O?EV4Wmy_#DSIEtl3L(FatX6<~1xhy102uEQ_B8nM_8{HaX
zw49ir%hI5hCMyaji=t@N1j|HpYYd-%rnobMn1{JV9yO`%6qo6Xx_Ceb_P{*PS1ct&
zY&z#zNO9tlt5S&8tYFf#K!e%+VK;z<)RoQW)ea-5wFNK6;fmXVMD?lbFfW7ZV+hO3
zt5O-)F{i}?dSKF5(0hqM7Vf@ee6BcruX>5}W&!&OPDEOQqjFIN-h@<lqcg7S2{#l0
zvc{<lNR=mnr3YbCRF?B+Md=gRki1ssYSZW#o%XZo3hcGnjT&oZp66A>aS0pY<ZbXP
z*9WF~gRzq5xq0g<Bw=>itEUSL{sd%VQ*1I6UUoNI*S{F3P}qHN0n$n{Xrde}0eW^u
zG;sk^`&sRiAP!7U!`+aIMCfK}-Ir=!xGq^RB>Q|GlF&MDDBA?QA!arOpOU))+z+=o
zU=Y92hF+e4e7Y^dLm+2mVFAFKLm{@dV8unX)pDAw4FzX?Ubd<#^o9T{yitJkcHa=h
z6$>@i=V-0H+hVRPnB|_oMYX26jszuHZU9tm*cIOJ>j1tvPkFfW6VTFH*o6y_4z@uG
z*L?wtD2Gt5*qnuI%j_M|7XzIUU`5kf9dqB2zTm8u6##z>;K|e#8DhYb<6MA@+vr5(
z>4X41OeUQ+9c~LQezOPD=~GV;(d+Y@RTwIIwJRj;X06Z_0lEyXPY=zI%2`w@7|P7w
zd#;NjXEEV89HKR?u0wCM;2}T=kzu;*t1W@_mBcyU*A;4$yWWEYH>xxvVr*@)ZXb<C
z%Vk;qyqlQ~8?o{lOsD!fqzo~54VIOS`(QU&Ri)5h#XyvkIyh{!QDnr{5vg2b%Z%t)
z02lKfGFaI#>mB-HJAfmp8>e;zn}gtpR$r|#8nfU$&zG_+`zP4_lj{Kfbvzyq)_}~)
zMqRPr%1)JxU8B+HYFU=A#hF?6;O;2<pyi)47PBl{X_If?hy~ZU&3cg$*9I14!v&vC
zp9+IlPPp)wt9Df*_g*jo^0DhG+&9>;AO$W`=-VwTga83q4Kj7Mcv93viU$`G3L-#P
z)+KtHP#pqp)3z63@?Izb0@sOh5{nkRWk5dpY;LsGq9~s59jA|AWn(YGl`<b0(8N{%
z`$nVD`LZliR;x;i@pybX%d#cN&UHE#vMgH~kH=nB3_}+DdCRraMNyozTptX$Mc|$}
zJo<A&2wT1N!GPbrDfg`d@YVrtXita`VmE->S`5*I1)Eq)S$eMTxM4jZtZbOAGD6XW
z1)EqLjYhl5vK*8TITmiX6R@GO;X;fPP~j?MM9pC3!X~g1AgkI(Fda7*y|z!+(88!<
zAtnJTJd>!`SZ8q93$3oZ86|`xmTi@}>Z;rH8go=OLh(87-!^2}jMYbMMI>!n@Jw1h
zW3b*0ZhCe1yyp>s{oLkgsBqEB3~fy*A<TMhO|dQvDPmbc2(fiE8tntHBhe#bC?PHk
zRyi4u$N!aO*>21>o?J5h#^wp=ieM>XPOuBGvhhjyyVd%LokEBs+!=IeaM8>Zjp?lm
zmtgnt_Ntzo4}=i6p;=GeK4Lq72Zt8c#WZ6p0=cX=TF_5GSAvSo1JYZtvXP{QKVut!
z4?`+6ABAMWivVs$+KQh;R8Cy9Godwo!K~?$Lo&T2QZ^PL32hJm`xxwU-!@3Ij3UUL
z*ytM*3;Tr-pN~9dGE~scgw}Lp?6a7*{jDQyJI`p~u=%}cFYj%GB%TkUy_aYU<f(Ww
z|Nr-p#^$R4-fc1No!s#Jsewe)JdWvn@HGIF_<_NDLRi^oD(~%p3_QKL?nVbxgZHMm
z2D#CFdI8(;<j_4QgC;;$Hhks1E!a5SVzI`y1Zd)2$T~Q`g*-8R@V%~Ep2x&s36T5L
z-&t|XHptU0m7PvKBPIdb@LR}JvWjiLL_{woo<|Z)2#_=6m3DHr&lL+;*|^2HtWLKs
zdxmvEfF^#2jZ;#`c_R8w$8+(5r6AR$5Yi^T;V5Rc;AD-0n?lRceLvzU3vDnD0yLqN
zn=6pb=zFJ}IKubWilX?2(t>U2ldi<0c|ujb-#+h&^az_EwSV<*7l6LG@0?=LplU=D
z(N6*V6qw}g-Vb>S-pF_j!1syh)p<{(2?j-gI*8~zfNueS5MnzdYrbc$lj;sH0{9UT
z4L0##K@ngH3(HN_A0swc=6Rm~K?t!6GA8YMVbzx*39fIfwH6h9JxgGN09|&ZWmsAV
z%nO>w<0^o2M0DA99}&F*;1&MPP5_@mwaKQBcoo2RUB6KW2P*7`REYYfgt&BxHDKBd
zW9tFhJ53mv1RN-z?=?tbJn!+n?T~Ex9>h5vV`{-yAnkcS^tqW+I`?Dacl6R0=&Gcl
z`pN1t;3{Ul3cZY_BcgLch>O@rE*i068UWq^P}<}pJ{ivNKc&e01?Fc;xeR&Ay;^r8
zpX3KI`!f5U%w#KiJ_%Bo@`Pwzc@|*lIon6n<n~?xF!p3)+aa~;j|Duw$qD!}q}E!i
zKnNk0A&JfvkUEH*Vm3spjkBg#;vcLlPDent+c`*&L9O$jy)E~lnpOJ{;1x)Mt5qO)
z6DZbNhrwsh0oMruDsUNH-~5laAX)W09^-xp@^my685aS*3Q2UeH35YXw?m$CzDm;I
zD{Sewt_TpAsbcSoYmmfv(PMn2$lQl%0{jtx7d=_)E=ZyaRfGmrg<pl<SC#B@C8pa7
zQ1((IwxOo3vkxvp5@gdjJ##+WAqlRo;;IXSD(U9Xe658`T?BX-_Bgv|``B^O1&@#|
zA9yP=#<TB&)UexTw7pD3&$S$*Gvs-G0QT(4Ra+%BCkxK={21(^O`UYmi3K6V4oGuN
z3|xa$V$M09wI5Q6h~<G9TK6ThTY|!RQ528azEeejRi#)5*FMz|L)aGYK-Pwd?Pck0
zY@Z7i-LQa)(#_6Ty774Yn=H#N!On{JWm)#pcs!0GBXxnYEH92mqjxY{(X$P1hiq0D
z6W=4E7b1_D6l~}F2h3K{2V^_8U%I|q8O%8zk1u3d2Fz-e?*s6s10=%r(P(rYl5k=~
z0>v!N@iwHQ@#{$Abpj^7e}r9JJ5{GM)J7AJ$K$mMBK-65cs!`q17%shTbAYd(P#t!
zx3(NE76HCQME_ov<?kYl)hW1FjEnecX~Qd%p9iuHHrQ+|RwT}#c}ipqDDz71f(Qce
zE6X+So*~zrA-V}#)QWCXpmOkyYhvJrtr4xGEX&tNqtRRN>yD(ODGPpPNFI%ph<XCD
zDvqI<XmkYnlW(X_Nj|Q%P{eB2YHR=AS=a5@5JKDmAoI92gaA)*r1s$8NZUOdqiAWY
zq$IPEGXN}cl=Yz8cK|>{7ljaSpq)Qi;cfIUOx_C>ZZ*LE&Vvz+1=n=Y1P129Q>gJL
z*PVca^5ZI0xYQIHb;h(IwhXucIdN;PK@7B$I{TCNVD>b05#UuwMPo32T)^3$L&pWk
z_h$>UZ-gXf7*<AXtsWHC0eo|4C!)n%V<W&pgvsmhAiQ-*e{OW;GN~QV<A)7SJ~T?g
znFKhvFnKOYb;$8?a*oxBA=*KR>j1tS^EmGc9PqjaQa1bu25eq&_;Lp+D&24pLVSGa
zEm!A_-nrr|s(&<%>qdjcGGPsipC@`nfHig}KqfRlJ7iBwO0e?x8B~`o?$w6w6#)WH
ztGf;B08T^h>cPp8F~IWM0siMx8Mb%csooKw0`KMr5LPI&SGzj}YP41x)&P9FuUw<I
z1ZaZg8K0d#IMa?VJUkQtbB3X8#K91tjtbUO$zm)*`5L5kzvS<Ba!T;&z62R%ZuaP_
zR1_?MAA=S}21$TT;Nh$GL9G_)=oTJ|>t2*lNZDMkZ#WHk+O@#}PTIFZ6BF7%ooF`%
z23sRK6wIEc*fV=*^nZVZY8i7K)t%!{qh3y3hs>k6p#Ht*ad;2!VNUpeCIBA?i*`Qz
P00000NkvXXu0mjfaGF%g

literal 0
HcmV?d00001

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 172ba6b52c..5bc95238b9 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -602,6 +602,8 @@ export class Blockchain {
             // HACK: For now we have a hard-coded list of iconUrls for the dummyTokens
             // TODO: Refactor this out and pull the iconUrl directly from the TokenRegistry
             const iconUrl = constants.iconUrlBySymbol[t.symbol];
+            // TEMPORARY HACK: Swap out for new WETH address
+            const address = t.symbol === 'WETH' ? '0x739E78d6bEbbDF24105a5145fA04436589d1CBd9' : t.address;
             const token: Token = {
                 iconUrl,
                 address: t.address,
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
new file mode 100644
index 0000000000..2779298706
--- /dev/null
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -0,0 +1,214 @@
+import {ZeroEx} from '0x.js';
+import BigNumber from 'bignumber.js';
+import * as _ from 'lodash';
+import Divider from 'material-ui/Divider';
+import Paper from 'material-ui/Paper';
+import RaisedButton from 'material-ui/RaisedButton';
+import {colors} from 'material-ui/styles';
+import {
+    Table,
+    TableBody,
+    TableHeader,
+    TableHeaderColumn,
+    TableRow,
+    TableRowColumn,
+} from 'material-ui/Table';
+import * as moment from 'moment';
+import * as React from 'react';
+import {Blockchain} from 'ts/blockchain';
+import {LifeCycleRaisedButton} from 'ts/components/ui/lifecycle_raised_button';
+import {trackedTokenStorage} from 'ts/local_storage/tracked_token_storage';
+import {Dispatcher} from 'ts/redux/dispatcher';
+import {
+    OutdatedWrappedEther,
+    TokenByAddress,
+    TokenStateByAddress,
+} from 'ts/types';
+import {configs} from 'ts/utils/configs';
+import {constants} from 'ts/utils/constants';
+import {errorReporter} from 'ts/utils/error_reporter';
+import {utils} from 'ts/utils/utils';
+
+const PRECISION = 5;
+const DATE_FORMAT = 'D/M/YY';
+const ICON_DIMENSION = 40;
+const ETHER_ICON_PATH = '/images/ether.png';
+const OUTDATED_WETH_ICON_PATH = '/images/wrapped_eth_gray.png';
+const ETHER_TOKEN_SYMBOL = 'WETH';
+
+interface EthWrappersProps {
+    networkId: number;
+    blockchain: Blockchain;
+    dispatcher: Dispatcher;
+    tokenByAddress: TokenByAddress;
+    tokenStateByAddress: TokenStateByAddress;
+    userAddress: string;
+    userEtherBalance: BigNumber;
+}
+
+interface EthWrappersState {}
+
+export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersState> {
+    constructor(props: EthWrappersProps) {
+        super(props);
+        this.state = {};
+    }
+    public componentDidMount() {
+        window.scrollTo(0, 0);
+    }
+    public render() {
+        const tokens = _.values(this.props.tokenByAddress);
+        const wethToken = _.find(tokens, {symbol: 'WETH'});
+        const wethState = this.props.tokenStateByAddress[wethToken.address];
+        const wethBalance = ZeroEx.toUnitAmount(wethState.balance, 18);
+        return (
+            <div className="clearfix lg-px4 md-px4 sm-px2" style={{minHeight: 600}}>
+                <h3>ETH Wrapper</h3>
+                <Divider />
+                <div>
+                    <div className="py2">
+                        Wrap ETH into an ERC20-compliant Ether token
+                    </div>
+                    <div>
+                        <Table
+                            selectable={false}
+                            style={{backgroundColor: colors.grey50}}
+                        >
+                            <TableHeader displaySelectAll={false} adjustForCheckbox={false}>
+                                <TableRow>
+                                    <TableHeaderColumn>ETH Token</TableHeaderColumn>
+                                    <TableHeaderColumn>Balance</TableHeaderColumn>
+                                    <TableHeaderColumn>
+                                        {'ETH <-> WETH'}
+                                    </TableHeaderColumn>
+                                </TableRow>
+                            </TableHeader>
+                            <TableBody displayRowCheckbox={false}>
+                                <TableRow key="ETH">
+                                    <TableRowColumn className="py1">
+                                        <div className="flex">
+                                            <img
+                                                style={{width: ICON_DIMENSION, height: ICON_DIMENSION}}
+                                                src={ETHER_ICON_PATH}
+                                            />
+                                            <div className="mt2 ml2 sm-hide xs-hide">
+                                                Ether
+                                            </div>
+                                        </div>
+                                    </TableRowColumn>
+                                    <TableRowColumn>
+                                        {this.props.userEtherBalance.toFixed(PRECISION)} ETH
+                                    </TableRowColumn>
+                                    <TableRowColumn style={{paddingLeft: 3}}>
+                                        <LifeCycleRaisedButton
+                                            labelReady="Wrap"
+                                            labelLoading="Wrapping..."
+                                            labelComplete="Wrapped!"
+                                            onClickAsyncFn={this.wrapEthAsync.bind(this, true)}
+                                        />
+                                    </TableRowColumn>
+                                </TableRow>
+                                <TableRow key="WETH">
+                                    <TableRowColumn className="py1">
+                                        <div className="flex">
+                                            <img
+                                                style={{width: ICON_DIMENSION, height: ICON_DIMENSION}}
+                                                src={constants.iconUrlBySymbol.WETH}
+                                            />
+                                            <div className="mt2 ml2 sm-hide xs-hide">
+                                                Wrapped Ether
+                                            </div>
+                                        </div>
+                                    </TableRowColumn>
+                                    <TableRowColumn>
+                                        {wethBalance.toFixed(PRECISION)} WETH
+                                    </TableRowColumn>
+                                    <TableRowColumn style={{paddingLeft: 3}}>
+                                        <LifeCycleRaisedButton
+                                            labelReady="Unwrap"
+                                            labelLoading="Unwrapping..."
+                                            labelComplete="Unwrapped!"
+                                            onClickAsyncFn={this.unwrapEthAsync.bind(this, true)}
+                                        />
+                                    </TableRowColumn>
+                                </TableRow>
+                            </TableBody>
+                        </Table>
+                    </div>
+                </div>
+                <h4>Outdated WETH</h4>
+                <Divider />
+                <div className="pt2" style={{lineHeight: 1.5}}>
+                    The{' '}
+                    <a
+                        href="https://blog.0xproject.com/canonical-weth-a9aa7d0279dd"
+                        target="_blank"
+                    >
+                        canonical WETH
+                    </a> contract is updated when necessary.
+                    Unwrap outdated WETH in order to
 retrieve your ETH and move it
+                    to the updated WETH token.
+                </div>
+                <div>
+                    <Table
+                        selectable={false}
+                        style={{backgroundColor: colors.grey50}}
+                    >
+                        <TableHeader displaySelectAll={false} adjustForCheckbox={false}>
+                            <TableRow>
+                                <TableHeaderColumn>WETH Version</TableHeaderColumn>
+                                <TableHeaderColumn>Balance</TableHeaderColumn>
+                                <TableHeaderColumn>
+                                    {'WETH -> ETH'}
+                                </TableHeaderColumn>
+                            </TableRow>
+                        </TableHeader>
+                        <TableBody displayRowCheckbox={false}>
+                            {this.renderOutdatedWeths()}
+                        </TableBody>
+                    </Table>
+                </div>
+            </div>
+        );
+    }
+    private renderOutdatedWeths() {
+        const rows = _.map(configs.outdatedWrappedEthers, (outdatedWETH: OutdatedWrappedEther) => {
+            const timestampMsRange = outdatedWETH.timestampMsRangeByNetworkId[this.props.networkId];
+            const startMoment = moment(timestampMsRange.startTimestampMs);
+            const endMoment = moment(timestampMsRange.endTimestampMs);
+            return (
+                <TableRow key={`weth-${outdatedWETH.address}`}>
+                    <TableRowColumn className="py1">
+                        <div className="flex">
+                            <img
+                                style={{width: ICON_DIMENSION, height: ICON_DIMENSION}}
+                                src={OUTDATED_WETH_ICON_PATH}
+                            />
+                            <div className="mt2 ml2 sm-hide xs-hide">
+                                {startMoment.format(DATE_FORMAT)}-{endMoment.format(DATE_FORMAT)}
+                            </div>
+                        </div>
+                    </TableRowColumn>
+                    <TableRowColumn>
+                        0 WETH
+                    </TableRowColumn>
+                    <TableRowColumn style={{paddingLeft: 3}}>
+                        <LifeCycleRaisedButton
+                            labelReady="Unwrap"
+                            labelLoading="Unwrapping..."
+                            labelComplete="Unwrapped!"
+                            onClickAsyncFn={this.unwrapEthAsync.bind(this, true)}
+                        />
+                    </TableRowColumn>
+                </TableRow>
+            );
+        });
+        return rows;
+    }
+    private async wrapEthAsync() {
+        // TODO
+    }
+    private async unwrapEthAsync() {
+        // TODO
+    }
+} // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index 388c72d8e5..77a9cfddbc 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -4,7 +4,6 @@ import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import {Card, CardHeader, CardText} from 'material-ui/Card';
 import Divider from 'material-ui/Divider';
-import Paper from 'material-ui/Paper';
 import RaisedButton from 'material-ui/RaisedButton';
 import TextField from 'material-ui/TextField';
 import * as moment from 'moment';
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index 62a5d2eacf..57e75dab34 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -9,6 +9,7 @@ import {Route, Switch} from 'react-router-dom';
 import {Blockchain} from 'ts/blockchain';
 import {BlockchainErrDialog} from 'ts/components/dialogs/blockchain_err_dialog';
 import {PortalDisclaimerDialog} from 'ts/components/dialogs/portal_disclaimer_dialog';
+import {EthWrappers} from 'ts/components/eth_wrappers';
 import {FillOrder} from 'ts/components/fill_order';
 import {Footer} from 'ts/components/footer';
 import {PortalMenu} from 'ts/components/portal_menu';
@@ -205,6 +206,10 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
                                     <div className="py2" style={{backgroundColor: colors.grey50}}>
                                         {this.props.blockchainIsLoaded ?
                                             <Switch>
+                                                <Route
+                                                    path={`${WebsitePaths.Portal}/weth`}
+                                                    render={this.renderEthWrapper.bind(this)}
+                                                />
                                                 <Route
                                                     path={`${WebsitePaths.Portal}/fill`}
                                                     render={this.renderFillOrder.bind(this)}
@@ -250,6 +255,19 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
             </div>
         );
     }
+    private renderEthWrapper() {
+        return (
+            <EthWrappers
+                networkId={this.props.networkId}
+                blockchain={this.blockchain}
+                dispatcher={this.props.dispatcher}
+                tokenByAddress={this.props.tokenByAddress}
+                tokenStateByAddress={this.props.tokenStateByAddress}
+                userAddress={this.props.userAddress}
+                userEtherBalance={this.props.userEtherBalance}
+            />
+        );
+    }
     private renderTradeHistory() {
         return (
             <TradeHistory
diff --git a/packages/website/ts/components/portal_menu.tsx b/packages/website/ts/components/portal_menu.tsx
index 869df3e716..e00fbd40ce 100644
--- a/packages/website/ts/components/portal_menu.tsx
+++ b/packages/website/ts/components/portal_menu.tsx
@@ -50,6 +50,14 @@ export class PortalMenu extends React.Component<PortalMenuProps, PortalMenuState
                 >
                     {this.renderMenuItemWithIcon('Trade history', 'zmdi-format-list-bulleted')}
                 </MenuItem>
+                <MenuItem
+                    style={this.props.menuItemStyle}
+                    className="py2"
+                    to={`${WebsitePaths.Portal}/weth`}
+                    onClick={this.props.onClick.bind(this)}
+                >
+                    {this.renderMenuItemWithIcon('ETH wrapper', 'zmdi-circle-o')}
+                </MenuItem>
             </div>
         );
     }
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index d225e77849..05e797cebf 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -683,4 +683,14 @@ export interface DocsInfoConfig {
   menuSubsectionToVersionWhenIntroduced?: {[sectionName: string]: string};
 }
 
+export interface TimestampMsRange {
+    startTimestampMs: number;
+    endTimestampMs: number;
+}
+
+export interface OutdatedWrappedEther {
+    address: string;
+    timestampMsRangeByNetworkId: {[networkId: number]: TimestampMsRange};
+}
+
 // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index 63fcd27b60..e84dbd38fc 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {Environments} from 'ts/types';
+import {Environments, OutdatedWrappedEther} from 'ts/types';
 
 const BASE_URL = window.location.origin;
 const isDevelopment = _.includes(BASE_URL, 'https://0xproject.dev:3572') ||
@@ -15,4 +15,15 @@ export const configs = {
     defaultTrackedTokenSymbols: ['WETH', 'ZRX'],
     lastLocalStorageFillClearanceDate: '2017-11-22',
     isMainnetEnabled: true,
+    outdatedWrappedEthers: [
+        {
+            address: '0x05d090b51c40b020eab3bfcb6a2dff130df22e9c',
+            timestampMsRangeByNetworkId: {
+                42: {
+                    startTimestampMs: 1501614680000,
+                    endTimestampMs: 1513106129000,
+                },
+            },
+        } as OutdatedWrappedEther,
+    ],
 };
diff --git a/yarn.lock b/yarn.lock
index 1eec4f122c..13b5b211ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,6 +9,26 @@
     jsonschema "^1.2.0"
     lodash.values "^4.3.0"
 
+"0x.js@0.27.1":
+  version "0.27.1"
+  resolved "https://registry.yarnpkg.com/0x.js/-/0x.js-0.27.1.tgz#e0dff70e257efbb7f54dddb55dddf2dce0b971ab"
+  dependencies:
+    "@0xproject/assert" "^0.0.6"
+    "@0xproject/json-schemas" "^0.6.9"
+    bignumber.js "~4.1.0"
+    bintrees "^1.0.2"
+    bn.js "4.11.8"
+    compare-versions "^3.0.1"
+    es6-promisify "^5.0.0"
+    ethereumjs-abi "^0.6.4"
+    ethereumjs-blockstream "^2.0.6"
+    ethereumjs-util "^5.1.1"
+    find-versions "^2.0.0"
+    js-sha3 "^0.6.1"
+    lodash "^4.17.4"
+    uuid "^3.1.0"
+    web3 "^0.20.0"
+
 "0x.js@^0.22.6":
   version "0.22.6"
   resolved "https://registry.yarnpkg.com/0x.js/-/0x.js-0.22.6.tgz#bc3ff79b6d71f8cf7fae3c78b2c776cfa79c193a"
@@ -1345,7 +1365,7 @@ bn.js@4.11.7:
   version "4.11.7"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.3, bn.js@^4.11.6, bn.js@^4.11.7, bn.js@^4.11.8, bn.js@^4.4.0, bn.js@^4.8.0:
+bn.js@4.11.8, bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.3, bn.js@^4.11.6, bn.js@^4.11.7, bn.js@^4.11.8, bn.js@^4.4.0, bn.js@^4.8.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 

From 5619780cc18a5bdc6d1ff638c413870f56cf07e0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 13 Dec 2017 19:43:43 -0600
Subject: [PATCH 002/125] Use boxed ETH

---
 packages/website/public/images/ether.png | Bin 2312 -> 4235 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/website/public/images/ether.png b/packages/website/public/images/ether.png
index 6a40a976dfc023b70bacd652c12486c4689b78d3..c92f456810c5f95eb9acf78259e8f9cf4512e0eb 100644
GIT binary patch
literal 4235
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
E0T0EvJOBUy

literal 2312
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


From 565010408e9dc2dd43a00dfdaefd51035008dd6f Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 13 Dec 2017 19:44:27 -0600
Subject: [PATCH 003/125] Remove temporary hack

---
 packages/website/ts/blockchain.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 5bc95238b9..172ba6b52c 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -602,8 +602,6 @@ export class Blockchain {
             // HACK: For now we have a hard-coded list of iconUrls for the dummyTokens
             // TODO: Refactor this out and pull the iconUrl directly from the TokenRegistry
             const iconUrl = constants.iconUrlBySymbol[t.symbol];
-            // TEMPORARY HACK: Swap out for new WETH address
-            const address = t.symbol === 'WETH' ? '0x739E78d6bEbbDF24105a5145fA04436589d1CBd9' : t.address;
             const token: Token = {
                 iconUrl,
                 address: t.address,

From b054080fa1da88460f52021278fb33b8d88371a3 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 13 Dec 2017 19:45:44 -0600
Subject: [PATCH 004/125] Remove ETH-WETH convert button from balances page

---
 .../website/ts/components/token_balances.tsx  | 24 -------------------
 packages/website/ts/types.ts                  |  1 -
 2 files changed, 25 deletions(-)

diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index ae5ef9222f..799fecc695 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -23,7 +23,6 @@ import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
 import firstBy = require('thenby');
 import {Blockchain} from 'ts/blockchain';
-import {EthWethConversionButton} from 'ts/components/eth_weth_conversion_button';
 import {AssetPicker} from 'ts/components/generate_order/asset_picker';
 import {AllowanceToggle} from 'ts/components/inputs/allowance_toggle';
 import {SendButton} from 'ts/components/send_button';
@@ -425,16 +424,6 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                             onClickAsyncFn={this.onMintTestTokensAsync.bind(this, token)}
                         />
                     }
-                    {token.symbol === ETHER_TOKEN_SYMBOL &&
-                        <EthWethConversionButton
-                            blockchain={this.props.blockchain}
-                            dispatcher={this.props.dispatcher}
-                            ethToken={this.getWrappedEthToken()}
-                            ethTokenState={tokenState}
-                            userEtherBalance={this.props.userEtherBalance}
-                            onError={this.onEthWethConversionFailed.bind(this)}
-                        />
-                    }
                     {token.symbol === ZRX_TOKEN_SYMBOL && this.props.networkId === constants.TESTNET_NETWORK_ID &&
                         <LifeCycleRaisedButton
                             labelReady="Request"
@@ -488,11 +477,6 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
             isTokenPickerOpen: false,
         });
     }
-    private onEthWethConversionFailed() {
-        this.setState({
-            errorType: BalanceErrs.wethConversionFailed,
-        });
-    }
     private onSendFailed() {
         this.setState({
             errorType: BalanceErrs.sendFailed,
@@ -551,14 +535,6 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                     </div>
                 );
 
-            case BalanceErrs.wethConversionFailed:
-                return (
-                    <div>
-                        Converting between Ether and Ether Tokens failed unexpectedly.
-                        Please refresh the page and try again.
-                    </div>
-                );
-
             case BalanceErrs.allowanceSettingFailed:
                 return (
                     <div>
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 05e797cebf..4caa090259 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -135,7 +135,6 @@ export enum BalanceErrs {
     faucetRequestFailed,
     faucetQueueIsFull,
     mintingFailed,
-    wethConversionFailed,
     sendFailed,
     allowanceSettingFailed,
 }

From ceae51fe322ebf444d0c8b61fdb7a86ab11c8071 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 13 Dec 2017 19:46:48 -0600
Subject: [PATCH 005/125] Make label optional and make sure the input field
 still renders properly without it

---
 .../website/ts/components/inputs/token_amount_input.tsx    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx
index f39341a4fc..1ae9bc85eb 100644
--- a/packages/website/ts/components/inputs/token_amount_input.tsx
+++ b/packages/website/ts/components/inputs/token_amount_input.tsx
@@ -8,9 +8,9 @@ import {BalanceBoundedInput} from 'ts/components/inputs/balance_bounded_input';
 import {InputErrMsg, Token, TokenState, ValidatedBigNumberCallback, WebsitePaths} from 'ts/types';
 
 interface TokenAmountInputProps {
-    label: string;
     token: Token;
     tokenState: TokenState;
+    label?: string;
     amount?: BigNumber;
     shouldShowIncompleteErrs: boolean;
     shouldCheckBalance: boolean;
@@ -26,8 +26,9 @@ export class TokenAmountInput extends React.Component<TokenAmountInputProps, Tok
         const amount = this.props.amount ?
             ZeroEx.toUnitAmount(this.props.amount, this.props.token.decimals) :
             undefined;
+        const hasLabel = !_.isUndefined(this.props.label);
         return (
-            <div className="flex overflow-hidden" style={{height: 84}}>
+            <div className="flex overflow-hidden" style={{height: hasLabel ? 84 : 62}}>
                 <BalanceBoundedInput
                     label={this.props.label}
                     amount={amount}
@@ -38,7 +39,7 @@ export class TokenAmountInput extends React.Component<TokenAmountInputProps, Tok
                     shouldShowIncompleteErrs={this.props.shouldShowIncompleteErrs}
                     onVisitBalancesPageClick={this.props.onVisitBalancesPageClick}
                 />
-                <div style={{paddingTop: 39}}>
+                <div style={{paddingTop: hasLabel ? 39 : 14}}>
                     {this.props.token.symbol}
                 </div>
             </div>

From 105bcc6664f0d4ab642486977f1edaf8d84b020e Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 13 Dec 2017 19:58:33 -0600
Subject: [PATCH 006/125] Clear trackedTokens so that a user starts tracking
 the new WETH and no longer the old one

---
 packages/website/ts/index.tsx                         |  2 ++
 .../website/ts/local_storage/tracked_token_storage.ts | 11 +++++++++++
 packages/website/ts/utils/configs.ts                  |  1 +
 3 files changed, 14 insertions(+)

diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 922102d969..61cd6c2f5e 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -10,6 +10,7 @@ import {BrowserRouter as Router, Link, Redirect, Route, Switch} from 'react-rout
 import * as injectTapEventPlugin from 'react-tap-event-plugin';
 import {createStore, Store as ReduxStore} from 'redux';
 import {createLazyComponent} from 'ts/lazy_component';
+import {trackedTokenStorage} from 'ts/local_storage/tracked_token_storage';
 import {tradeHistoryStorage} from 'ts/local_storage/trade_history_storage';
 import {About} from 'ts/pages/about/about';
 import {FAQ} from 'ts/pages/faq/faq';
@@ -29,6 +30,7 @@ BigNumber.config({
 
 // Check if we've introduced an update that requires us to clear the tradeHistory local storage entries
 tradeHistoryStorage.clearIfRequired();
+trackedTokenStorage.clearIfRequired();
 
 const CUSTOM_GREY = 'rgb(39, 39, 39)';
 const CUSTOM_GREEN = 'rgb(102, 222, 117)';
diff --git a/packages/website/ts/local_storage/tracked_token_storage.ts b/packages/website/ts/local_storage/tracked_token_storage.ts
index 051a78ae1b..086b06af57 100644
--- a/packages/website/ts/local_storage/tracked_token_storage.ts
+++ b/packages/website/ts/local_storage/tracked_token_storage.ts
@@ -1,10 +1,21 @@
 import * as _ from 'lodash';
 import {localStorage} from 'ts/local_storage/local_storage';
 import {Token, TrackedTokensByNetworkId} from 'ts/types';
+import {configs} from 'ts/utils/configs';
 
 const TRACKED_TOKENS_KEY = 'trackedTokens';
+const TRACKED_TOKENS_CLEAR_KEY = 'lastClearTrackedTokensDate';
 
 export const trackedTokenStorage = {
+    // Clear trackedTokens localStorage if we've updated the config variable in an update
+    // that introduced a backward incompatible change requiring the tracked tokens to be re-set
+    clearIfRequired() {
+        const lastClearFillDate = localStorage.getItemIfExists(TRACKED_TOKENS_CLEAR_KEY);
+        if (lastClearFillDate !== configs.lastLocalStorageTrackedTokenClearanceDate) {
+            localStorage.removeItem(TRACKED_TOKENS_KEY);
+        }
+        localStorage.setItem(TRACKED_TOKENS_CLEAR_KEY, configs.lastLocalStorageTrackedTokenClearanceDate);
+    },
     addTrackedTokenToUser(userAddress: string, networkId: number, token: Token) {
         const trackedTokensByUserAddress = this.getTrackedTokensByUserAddress();
         let trackedTokensByNetworkId = trackedTokensByUserAddress[userAddress];
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index e84dbd38fc..c887d176fa 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -14,6 +14,7 @@ export const configs = {
     // WARNING: ZRX & WETH MUST always be default trackedTokens
     defaultTrackedTokenSymbols: ['WETH', 'ZRX'],
     lastLocalStorageFillClearanceDate: '2017-11-22',
+    lastLocalStorageTrackedTokenClearanceDate: '2017-12-13',
     isMainnetEnabled: true,
     outdatedWrappedEthers: [
         {

From 7ce1021798ac2d459f80d1827a3259e781b4b201 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 14 Dec 2017 10:41:33 -0600
Subject: [PATCH 007/125] Refactor the WETH conversion dialog/button to be
 either wrap or unwrap specific and not both

---
 .../dialogs/eth_weth_conversion_dialog.tsx    | 130 +++++++++++-------
 .../components/eth_weth_conversion_button.tsx |  38 ++++-
 2 files changed, 109 insertions(+), 59 deletions(-)

diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index aba5b9faf8..4904ee9e23 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -1,14 +1,15 @@
 import BigNumber from 'bignumber.js';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import RadioButton from 'material-ui/RadioButton';
-import RadioButtonGroup from 'material-ui/RadioButton/RadioButtonGroup';
 import * as React from 'react';
 import {EthAmountInput} from 'ts/components/inputs/eth_amount_input';
 import {TokenAmountInput} from 'ts/components/inputs/token_amount_input';
 import {Side, Token, TokenState} from 'ts/types';
 
+const DARK_BLUE = '#4D5481';
+
 interface EthWethConversionDialogProps {
+    direction: Side;
     onComplete: (direction: Side, value: BigNumber) => void;
     onCancelled: () => void;
     isOpen: boolean;
@@ -19,7 +20,6 @@ interface EthWethConversionDialogProps {
 
 interface EthWethConversionDialogState {
     value?: BigNumber;
-    direction: Side;
     shouldShowIncompleteErrs: boolean;
     hasErrors: boolean;
 }
@@ -29,7 +29,6 @@ export class EthWethConversionDialog extends
     constructor() {
         super();
         this.state = {
-            direction: Side.deposit,
             shouldShowIncompleteErrs: false,
             hasErrors: true,
         };
@@ -48,11 +47,13 @@ export class EthWethConversionDialog extends
                 onTouchTap={this.onConvertClick.bind(this)}
             />,
         ];
+        const title = this.props.direction === Side.deposit ?  'Wrap ETH' : 'Unwrap WETH';
         return (
             <Dialog
-                title="I want to convert"
+                title={title}
                 titleStyle={{fontWeight: 100}}
                 actions={convertDialogActions}
+                contentStyle={{width: 600}}
                 open={this.props.isOpen}
             >
                 {this.renderConversionDialogBody()}
@@ -60,56 +61,81 @@ export class EthWethConversionDialog extends
         );
     }
     private renderConversionDialogBody() {
+        const explanation = this.props.direction === Side.deposit ?
+                            'Convert your Ether into a tokenized, tradable form.' :
+                            'Convert your Wrapped Ether back into it\'s native form.';
+        const isWrappedVersion = this.props.direction === Side.receive;
         return (
-            <div className="mx-auto" style={{maxWidth: 300}}>
-                <RadioButtonGroup
-                    className="pb1"
-                    defaultSelected={this.state.direction}
-                    name="conversionDirection"
-                    onChange={this.onConversionDirectionChange.bind(this)}
-                >
-                    <RadioButton
-                        className="pb1"
-                        value={Side.deposit}
-                        label="Ether -> Ether Tokens"
-                    />
-                    <RadioButton
-                        value={Side.receive}
-                        label="Ether Tokens -> Ether"
-                    />
-                </RadioButtonGroup>
-                {this.state.direction === Side.receive ?
-                    <TokenAmountInput
-                        label="Amount to convert"
-                        token={this.props.token}
-                        tokenState={this.props.tokenState}
-                        shouldShowIncompleteErrs={this.state.shouldShowIncompleteErrs}
-                        shouldCheckBalance={true}
-                        shouldCheckAllowance={false}
-                        onChange={this.onValueChange.bind(this)}
-                        amount={this.state.value}
-                        onVisitBalancesPageClick={this.props.onCancelled}
-                    /> :
-                    <EthAmountInput
-                        label="Amount to convert"
-                        balance={this.props.etherBalance}
-                        amount={this.state.value}
-                        onChange={this.onValueChange.bind(this)}
-                        shouldCheckBalance={true}
-                        shouldShowIncompleteErrs={this.state.shouldShowIncompleteErrs}
-                        onVisitBalancesPageClick={this.props.onCancelled}
-                    />
-                }
+            <div>
+                <div className="pb2">
+                    {explanation}
+                </div>
+                <div className="mx-auto" style={{maxWidth: 332}}>
+                    <div className="flex">
+                        {this.renderCurrency(isWrappedVersion)}
+                        <div style={{paddingTop: 68}}>
+                            <i
+                                style={{fontSize: 28, color: DARK_BLUE}}
+                                className="zmdi zmdi-arrow-right"
+                            />
+                        </div>
+                        {this.renderCurrency(!isWrappedVersion)}
+                    </div>
+                    <div
+                        className="pt2 mx-auto"
+                        style={{width: 235}}
+                    >
+                        {this.props.direction === Side.receive ?
+                            <TokenAmountInput
+                                token={this.props.token}
+                                tokenState={this.props.tokenState}
+                                shouldShowIncompleteErrs={this.state.shouldShowIncompleteErrs}
+                                shouldCheckBalance={true}
+                                shouldCheckAllowance={false}
+                                onChange={this.onValueChange.bind(this)}
+                                amount={this.state.value}
+                                onVisitBalancesPageClick={this.props.onCancelled}
+                            /> :
+                            <EthAmountInput
+                                balance={this.props.etherBalance}
+                                amount={this.state.value}
+                                onChange={this.onValueChange.bind(this)}
+                                shouldCheckBalance={true}
+                                shouldShowIncompleteErrs={this.state.shouldShowIncompleteErrs}
+                                onVisitBalancesPageClick={this.props.onCancelled}
+                            />
+                        }
+                        <div
+                            className="pt1"
+                            style={{fontSize: 12}}
+                        >
+                            1 ETH = 1 WETH
+                        </div>
+                    </div>
+                </div>
             </div>
         );
     }
-    private onConversionDirectionChange(e: any, direction: Side) {
-        this.setState({
-            value: undefined,
-            shouldShowIncompleteErrs: false,
-            direction,
-            hasErrors: true,
-        });
+    private renderCurrency(isWrappedVersion: boolean) {
+        const name = isWrappedVersion ? 'Wrapped Ether' : 'Ether';
+        const iconUrl = isWrappedVersion ? '/images/token_icons/ether_erc20.png' : '/images/ether.png';
+        const symbol = isWrappedVersion ? 'WETH' : 'ETH';
+        return (
+            <div className="mx-auto pt2">
+                <div
+                    className="center"
+                    style={{color: DARK_BLUE}}
+                >
+                    {name}
+                </div>
+                <div className="center py2">
+                    <img src={iconUrl} style={{width: 60}} />
+                </div>
+                <div className="center">
+                    ({symbol})
+                </div>
+            </div>
+        );
     }
     private onValueChange(isValid: boolean, amount?: BigNumber) {
         this.setState({
@@ -127,7 +153,7 @@ export class EthWethConversionDialog extends
             this.setState({
                 value: undefined,
             });
-            this.props.onComplete(this.state.direction, value);
+            this.props.onComplete(this.props.direction, value);
         }
     }
     private onCancel() {
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index a83b1543fd..bf686d44b5 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -12,12 +12,15 @@ import {errorReporter} from 'ts/utils/error_reporter';
 import {utils} from 'ts/utils/utils';
 
 interface EthWethConversionButtonProps {
+    direction: Side;
     ethToken: Token;
     ethTokenState: TokenState;
     dispatcher: Dispatcher;
     blockchain: Blockchain;
     userEtherBalance: BigNumber;
-    onError: () => void;
+    isOutdatedWrappedEther: boolean;
+    onConversionSuccessful?: () => void;
+    isDisabled?: boolean;
 }
 
 interface EthWethConversionButtonState {
@@ -27,6 +30,9 @@ interface EthWethConversionButtonState {
 
 export class EthWethConversionButton extends
     React.Component<EthWethConversionButtonProps, EthWethConversionButtonState> {
+    public static defaultProps: Partial<EthWethConversionButtonProps> = {
+        isDisabled: false,
+    };
     public constructor(props: EthWethConversionButtonProps) {
         super(props);
         this.state = {
@@ -36,16 +42,26 @@ export class EthWethConversionButton extends
     }
     public render() {
         const labelStyle = this.state.isEthConversionHappening ? {fontSize: 10} : {};
+        let callToActionLabel;
+        let inProgressLabel;
+        if (this.props.direction === Side.deposit) {
+            callToActionLabel = 'Wrap';
+            inProgressLabel = 'Wrapping...';
+        } else {
+            callToActionLabel = 'Unwrap';
+            inProgressLabel = 'Unwrapping...';
+        }
         return (
             <div>
                 <RaisedButton
                     style={{width: '100%'}}
                     labelStyle={labelStyle}
-                    disabled={this.state.isEthConversionHappening}
-                    label={this.state.isEthConversionHappening ? 'Converting...' : 'Convert'}
+                    disabled={this.props.isDisabled || this.state.isEthConversionHappening}
+                    label={this.state.isEthConversionHappening ? inProgressLabel : callToActionLabel}
                     onClick={this.toggleConversionDialog.bind(this)}
                 />
                 <EthWethConversionDialog
+                    direction={this.props.direction}
                     isOpen={this.state.isEthConversionDialogVisible}
                     onComplete={this.onConversionAmountSelectedAsync.bind(this)}
                     onCancelled={this.toggleConversionDialog.bind(this)}
@@ -73,15 +89,20 @@ export class EthWethConversionButton extends
             if (direction === Side.deposit) {
                 await this.props.blockchain.convertEthToWrappedEthTokensAsync(value);
                 const ethAmount = ZeroEx.toUnitAmount(value, constants.ETH_DECIMAL_PLACES);
-                this.props.dispatcher.showFlashMessage(`Successfully converted ${ethAmount.toString()} ETH to WETH`);
+                this.props.dispatcher.showFlashMessage(`Successfully wrapped ${ethAmount.toString()} ETH to WETH`);
                 balance = balance.plus(value);
             } else {
                 await this.props.blockchain.convertWrappedEthTokensToEthAsync(value);
                 const tokenAmount = ZeroEx.toUnitAmount(value, token.decimals);
-                this.props.dispatcher.showFlashMessage(`Successfully converted ${tokenAmount.toString()} WETH to ETH`);
+                this.props.dispatcher.showFlashMessage(`Successfully unwrapped ${tokenAmount.toString()} WETH to ETH`);
                 balance = balance.minus(value);
             }
-            this.props.dispatcher.replaceTokenBalanceByAddress(token.address, balance);
+            if (!this.props.isOutdatedWrappedEther) {
+                this.props.dispatcher.replaceTokenBalanceByAddress(token.address, balance);
+            }
+            if (!_.isUndefined(this.props.onConversionSuccessful)) {
+                this.props.onConversionSuccessful();
+            }
         } catch (err) {
             const errMsg = '' + err;
             if (_.includes(errMsg, BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES)) {
@@ -90,7 +111,10 @@ export class EthWethConversionButton extends
                 utils.consoleLog(`Unexpected error encountered: ${err}`);
                 utils.consoleLog(err.stack);
                 await errorReporter.reportAsync(err);
-                this.props.onError();
+                const errorMsg = direction === Side.deposit ?
+                                 'Failed to wrap your ETH. Please try again.' :
+                                 'Failed to unwrap your WETH. Please try again.';
+                this.props.dispatcher.showFlashMessage(errorMsg);
             }
         }
         this.setState({

From 6d386220d93f6fb609f8f05e27d093614a39b459 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 14 Dec 2017 10:43:20 -0600
Subject: [PATCH 008/125] Use new wrap/unwrap buttons, fetch outdated WETH
 balances and re-fetch after a successful unwrap.

---
 .../website/ts/components/eth_wrappers.tsx    | 249 +++++++++++++-----
 packages/website/ts/types.ts                  |   8 +-
 packages/website/ts/utils/configs.ts          |  23 +-
 3 files changed, 208 insertions(+), 72 deletions(-)

diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 2779298706..c2f9b7b455 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -16,12 +16,16 @@ import {
 import * as moment from 'moment';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
+import {EthWethConversionButton} from 'ts/components/eth_weth_conversion_button';
 import {LifeCycleRaisedButton} from 'ts/components/ui/lifecycle_raised_button';
 import {trackedTokenStorage} from 'ts/local_storage/tracked_token_storage';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {
-    OutdatedWrappedEther,
+    OutdatedWrappedEtherByNetworkId,
+    Side,
+    Token,
     TokenByAddress,
+    TokenState,
     TokenStateByAddress,
 } from 'ts/types';
 import {configs} from 'ts/utils/configs';
@@ -31,11 +35,19 @@ import {utils} from 'ts/utils/utils';
 
 const PRECISION = 5;
 const DATE_FORMAT = 'D/M/YY';
+const LIGHT_GRAY = '#A5A5A5';
 const ICON_DIMENSION = 40;
 const ETHER_ICON_PATH = '/images/ether.png';
 const OUTDATED_WETH_ICON_PATH = '/images/wrapped_eth_gray.png';
 const ETHER_TOKEN_SYMBOL = 'WETH';
 
+interface OutdatedWETHAddressToIsStateLoaded {
+    [address: string]: boolean;
+}
+interface OutdatedWETHStateByAddress {
+    [address: string]: TokenState;
+}
+
 interface EthWrappersProps {
     networkId: number;
     blockchain: Blockchain;
@@ -46,24 +58,58 @@ interface EthWrappersProps {
     userEtherBalance: BigNumber;
 }
 
-interface EthWrappersState {}
+interface EthWrappersState {
+    outdatedWETHAddressToIsStateLoaded: OutdatedWETHAddressToIsStateLoaded;
+    outdatedWETHStateByAddress: OutdatedWETHStateByAddress;
+}
 
 export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersState> {
     constructor(props: EthWrappersProps) {
         super(props);
-        this.state = {};
+        const outdatedWETHAddresses = this.getOutdatedWETHAddresses();
+        const outdatedWETHAddressToIsStateLoaded: OutdatedWETHAddressToIsStateLoaded = {};
+        const outdatedWETHStateByAddress: OutdatedWETHStateByAddress = {};
+        _.each(outdatedWETHAddresses, outdatedWETHAddress => {
+            outdatedWETHAddressToIsStateLoaded[outdatedWETHAddress] = false;
+            outdatedWETHStateByAddress[outdatedWETHAddress] = {
+                balance: new BigNumber(0),
+                allowance: new BigNumber(0),
+            };
+        });
+        this.state = {
+            outdatedWETHAddressToIsStateLoaded,
+            outdatedWETHStateByAddress,
+        };
     }
     public componentDidMount() {
         window.scrollTo(0, 0);
+        // tslint:disable-next-line:no-floating-promises
+        this.fetchOutdatedWETHStateAsync();
     }
     public render() {
         const tokens = _.values(this.props.tokenByAddress);
-        const wethToken = _.find(tokens, {symbol: 'WETH'});
-        const wethState = this.props.tokenStateByAddress[wethToken.address];
-        const wethBalance = ZeroEx.toUnitAmount(wethState.balance, 18);
+        const etherToken = _.find(tokens, {symbol: 'WETH'});
+        const etherTokenState = this.props.tokenStateByAddress[etherToken.address];
+        const wethBalance = ZeroEx.toUnitAmount(etherTokenState.balance, 18);
         return (
             <div className="clearfix lg-px4 md-px4 sm-px2" style={{minHeight: 600}}>
-                <h3>ETH Wrapper</h3>
+                <div className="relative">
+                    <h3>ETH Wrapper</h3>
+                    <div className="absolute" style={{top: 0, right: 0}}>
+                        <a
+                            target="_blank"
+                            href="https://weth.io/"
+                            style={{color: LIGHT_GRAY}}
+                        >
+                            <div className="flex">
+                                <div>About Wrapped ETH</div>
+                                <div className="pl1">
+                                    <i className="zmdi zmdi-open-in-new" />
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                </div>
                 <Divider />
                 <div>
                     <div className="py2">
@@ -100,11 +146,14 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                         {this.props.userEtherBalance.toFixed(PRECISION)} ETH
                                     </TableRowColumn>
                                     <TableRowColumn style={{paddingLeft: 3}}>
-                                        <LifeCycleRaisedButton
-                                            labelReady="Wrap"
-                                            labelLoading="Wrapping..."
-                                            labelComplete="Wrapped!"
-                                            onClickAsyncFn={this.wrapEthAsync.bind(this, true)}
+                                        <EthWethConversionButton
+                                            isOutdatedWrappedEther={false}
+                                            direction={Side.deposit}
+                                            ethToken={etherToken}
+                                            ethTokenState={etherTokenState}
+                                            dispatcher={this.props.dispatcher}
+                                            blockchain={this.props.blockchain}
+                                            userEtherBalance={this.props.userEtherBalance}
                                         />
                                     </TableRowColumn>
                                 </TableRow>
@@ -124,11 +173,14 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                         {wethBalance.toFixed(PRECISION)} WETH
                                     </TableRowColumn>
                                     <TableRowColumn style={{paddingLeft: 3}}>
-                                        <LifeCycleRaisedButton
-                                            labelReady="Unwrap"
-                                            labelLoading="Unwrapping..."
-                                            labelComplete="Unwrapped!"
-                                            onClickAsyncFn={this.unwrapEthAsync.bind(this, true)}
+                                        <EthWethConversionButton
+                                            isOutdatedWrappedEther={false}
+                                            direction={Side.receive}
+                                            ethToken={etherToken}
+                                            ethTokenState={etherTokenState}
+                                            dispatcher={this.props.dispatcher}
+                                            blockchain={this.props.blockchain}
+                                            userEtherBalance={this.props.userEtherBalance}
                                         />
                                     </TableRowColumn>
                                 </TableRow>
@@ -136,46 +188,66 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                         </Table>
                     </div>
                 </div>
-                <h4>Outdated WETH</h4>
-                <Divider />
-                <div className="pt2" style={{lineHeight: 1.5}}>
-                    The{' '}
-                    <a
-                        href="https://blog.0xproject.com/canonical-weth-a9aa7d0279dd"
-                        target="_blank"
-                    >
-                        canonical WETH
-                    </a> contract is updated when necessary.
-                    Unwrap outdated WETH in order to
 retrieve your ETH and move it
-                    to the updated WETH token.
-                </div>
                 <div>
-                    <Table
-                        selectable={false}
-                        style={{backgroundColor: colors.grey50}}
-                    >
-                        <TableHeader displaySelectAll={false} adjustForCheckbox={false}>
-                            <TableRow>
-                                <TableHeaderColumn>WETH Version</TableHeaderColumn>
-                                <TableHeaderColumn>Balance</TableHeaderColumn>
-                                <TableHeaderColumn>
-                                    {'WETH -> ETH'}
-                                </TableHeaderColumn>
-                            </TableRow>
-                        </TableHeader>
-                        <TableBody displayRowCheckbox={false}>
-                            {this.renderOutdatedWeths()}
-                        </TableBody>
-                    </Table>
+                    <h4>Outdated WETH</h4>
+                    <Divider />
+                    <div className="pt2" style={{lineHeight: 1.5}}>
+                        The{' '}
+                        <a
+                            href="https://blog.0xproject.com/canonical-weth-a9aa7d0279dd"
+                            target="_blank"
+                        >
+                            canonical WETH
+                        </a> contract is updated when necessary.
+                        Unwrap outdated WETH in order to
 retrieve your ETH and move it
+                        to the updated WETH token.
+                    </div>
+                    <div>
+                        <Table
+                            selectable={false}
+                            style={{backgroundColor: colors.grey50}}
+                        >
+                            <TableHeader displaySelectAll={false} adjustForCheckbox={false}>
+                                <TableRow>
+                                    <TableHeaderColumn>WETH Version</TableHeaderColumn>
+                                    <TableHeaderColumn>Balance</TableHeaderColumn>
+                                    <TableHeaderColumn>
+                                        {'WETH -> ETH'}
+                                    </TableHeaderColumn>
+                                </TableRow>
+                            </TableHeader>
+                            <TableBody displayRowCheckbox={false}>
+                                {this.renderOutdatedWeths(etherToken, etherTokenState)}
+                            </TableBody>
+                        </Table>
+                    </div>
                 </div>
             </div>
         );
     }
-    private renderOutdatedWeths() {
-        const rows = _.map(configs.outdatedWrappedEthers, (outdatedWETH: OutdatedWrappedEther) => {
-            const timestampMsRange = outdatedWETH.timestampMsRangeByNetworkId[this.props.networkId];
-            const startMoment = moment(timestampMsRange.startTimestampMs);
-            const endMoment = moment(timestampMsRange.endTimestampMs);
+    private renderOutdatedWeths(etherToken: Token, etherTokenState: TokenState) {
+        const rows = _.map(configs.outdatedWrappedEthers,
+                        (outdatedWETHByNetworkId: OutdatedWrappedEtherByNetworkId) => {
+            const outdatedWETH = outdatedWETHByNetworkId[this.props.networkId];
+            const timestampMsRange = outdatedWETH.timestampMsRange;
+            let dateRange: string;
+            if (!_.isUndefined(timestampMsRange)) {
+                const startMoment = moment(timestampMsRange.startTimestampMs);
+                const endMoment = moment(timestampMsRange.endTimestampMs);
+                dateRange = `${startMoment.format(DATE_FORMAT)}-${endMoment.format(DATE_FORMAT)}`;
+            } else {
+                dateRange = '-';
+            }
+            const outdatedEtherToken = {
+                ...etherToken,
+                address: outdatedWETH.address,
+            };
+            const isStateLoaded = this.state.outdatedWETHAddressToIsStateLoaded[outdatedWETH.address];
+            const outdatedEtherTokenState = this.state.outdatedWETHStateByAddress[outdatedWETH.address];
+            const balanceInEthIfExists = isStateLoaded ?
+                                         ZeroEx.toUnitAmount(outdatedEtherTokenState.balance, 18).toFixed(PRECISION) :
+                                         undefined;
+            const onConversionSuccessful = this.onOutdatedConversionSuccessfulAsync.bind(this, outdatedWETH.address);
             return (
                 <TableRow key={`weth-${outdatedWETH.address}`}>
                     <TableRowColumn className="py1">
@@ -185,19 +257,27 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                 src={OUTDATED_WETH_ICON_PATH}
                             />
                             <div className="mt2 ml2 sm-hide xs-hide">
-                                {startMoment.format(DATE_FORMAT)}-{endMoment.format(DATE_FORMAT)}
+                                {dateRange}
                             </div>
                         </div>
                     </TableRowColumn>
                     <TableRowColumn>
-                        0 WETH
+                        {isStateLoaded ?
+                            `${balanceInEthIfExists} WETH` :
+                            <i className="zmdi zmdi-spinner zmdi-hc-spin" />
+                        }
                     </TableRowColumn>
                     <TableRowColumn style={{paddingLeft: 3}}>
-                        <LifeCycleRaisedButton
-                            labelReady="Unwrap"
-                            labelLoading="Unwrapping..."
-                            labelComplete="Unwrapped!"
-                            onClickAsyncFn={this.unwrapEthAsync.bind(this, true)}
+                        <EthWethConversionButton
+                            isDisabled={!isStateLoaded}
+                            isOutdatedWrappedEther={true}
+                            direction={Side.receive}
+                            ethToken={outdatedEtherToken}
+                            ethTokenState={outdatedEtherTokenState}
+                            dispatcher={this.props.dispatcher}
+                            blockchain={this.props.blockchain}
+                            userEtherBalance={this.props.userEtherBalance}
+                            onConversionSuccessful={onConversionSuccessful}
                         />
                     </TableRowColumn>
                 </TableRow>
@@ -205,10 +285,53 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         });
         return rows;
     }
-    private async wrapEthAsync() {
-        // TODO
+    private async onOutdatedConversionSuccessfulAsync(outdatedWETHAddress: string) {
+        this.setState({
+            outdatedWETHAddressToIsStateLoaded: {
+                ...this.state.outdatedWETHAddressToIsStateLoaded,
+                [outdatedWETHAddress]: false,
+            },
+        });
+        const [balance, allowance] = await this.props.blockchain.getTokenBalanceAndAllowanceAsync(
+            this.props.userAddress, outdatedWETHAddress,
+        );
+        this.setState({
+            outdatedWETHAddressToIsStateLoaded: {
+                ...this.state.outdatedWETHAddressToIsStateLoaded,
+                [outdatedWETHAddress]: true,
+            },
+            outdatedWETHStateByAddress: {
+                ...this.state.outdatedWETHStateByAddress,
+                [outdatedWETHAddress]: {
+                    balance,
+                    allowance,
+                },
+            },
+        });
     }
-    private async unwrapEthAsync() {
-        // TODO
+    private async fetchOutdatedWETHStateAsync() {
+        const outdatedWETHAddresses = this.getOutdatedWETHAddresses();
+        const outdatedWETHAddressToIsStateLoaded: OutdatedWETHAddressToIsStateLoaded = {};
+        const outdatedWETHStateByAddress: OutdatedWETHStateByAddress = {};
+        for (const address of outdatedWETHAddresses) {
+            const [balance, allowance] = await this.props.blockchain.getTokenBalanceAndAllowanceAsync(
+                this.props.userAddress, address,
+            );
+            outdatedWETHStateByAddress[address] = {
+                balance,
+                allowance,
+            };
+            outdatedWETHAddressToIsStateLoaded[address] = true;
+        }
+        this.setState({
+            outdatedWETHStateByAddress,
+            outdatedWETHAddressToIsStateLoaded,
+        });
+    }
+    private getOutdatedWETHAddresses(): string[] {
+        const outdatedWETHAddresses = _.map(configs.outdatedWrappedEthers, outdatedWrappedEther => {
+            return outdatedWrappedEther[this.props.networkId].address;
+        });
+        return outdatedWETHAddresses;
     }
 } // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 4caa090259..2005cf2655 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -687,9 +687,11 @@ export interface TimestampMsRange {
     endTimestampMs: number;
 }
 
-export interface OutdatedWrappedEther {
-    address: string;
-    timestampMsRangeByNetworkId: {[networkId: number]: TimestampMsRange};
+export interface OutdatedWrappedEtherByNetworkId {
+    [networkId: number]: {
+        address: string;
+        timestampMsRange: TimestampMsRange;
+    };
 }
 
 // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index c887d176fa..adc51374f3 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -1,5 +1,9 @@
 import * as _ from 'lodash';
-import {Environments, OutdatedWrappedEther} from 'ts/types';
+import {
+    Environments,
+    OutdatedWrappedEtherByNetworkId,
+    TimestampMsRange,
+} from 'ts/types';
 
 const BASE_URL = window.location.origin;
 const isDevelopment = _.includes(BASE_URL, 'https://0xproject.dev:3572') ||
@@ -18,13 +22,20 @@ export const configs = {
     isMainnetEnabled: true,
     outdatedWrappedEthers: [
         {
-            address: '0x05d090b51c40b020eab3bfcb6a2dff130df22e9c',
-            timestampMsRangeByNetworkId: {
-                42: {
+            42: {
+                address: '0x05d090b51c40b020eab3bfcb6a2dff130df22e9c',
+                timestampMsRange: {
                     startTimestampMs: 1501614680000,
                     endTimestampMs: 1513106129000,
                 },
             },
-        } as OutdatedWrappedEther,
-    ],
+            1: {
+                address: '0x2956356cd2a2bf3202f771f50d3d14a367b48070',
+                timestampMsRange: {
+                    startTimestampMs: 1513123415000,
+                    endTimestampMs: 1513106129000,
+                },
+            },
+        },
+    ] as OutdatedWrappedEtherByNetworkId[],
 };

From ac1fbeb9623682ce678990d1815fcff63a6c40ae Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 14 Dec 2017 19:28:49 -0600
Subject: [PATCH 009/125] Improve WETH page styling

---
 .../dialogs/eth_weth_conversion_dialog.tsx    |  8 ++--
 .../website/ts/components/eth_wrappers.tsx    | 39 +++++++++++++++----
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index 4904ee9e23..c8bdced9bd 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -53,7 +53,7 @@ export class EthWethConversionDialog extends
                 title={title}
                 titleStyle={{fontWeight: 100}}
                 actions={convertDialogActions}
-                contentStyle={{width: 600}}
+                contentStyle={{width: 448}}
                 open={this.props.isOpen}
             >
                 {this.renderConversionDialogBody()}
@@ -70,7 +70,7 @@ export class EthWethConversionDialog extends
                 <div className="pb2">
                     {explanation}
                 </div>
-                <div className="mx-auto" style={{maxWidth: 332}}>
+                <div className="mx-auto" style={{maxWidth: 312}}>
                     <div className="flex">
                         {this.renderCurrency(isWrappedVersion)}
                         <div style={{paddingTop: 68}}>
@@ -83,7 +83,7 @@ export class EthWethConversionDialog extends
                     </div>
                     <div
                         className="pt2 mx-auto"
-                        style={{width: 235}}
+                        style={{width: 245}}
                     >
                         {this.props.direction === Side.receive ?
                             <TokenAmountInput
@@ -131,7 +131,7 @@ export class EthWethConversionDialog extends
                 <div className="center py2">
                     <img src={iconUrl} style={{width: 60}} />
                 </div>
-                <div className="center">
+                <div className="center" style={{fontSize: 12}}>
                     ({symbol})
                 </div>
             </div>
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index c2f9b7b455..ccbed41882 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -91,6 +91,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         const etherToken = _.find(tokens, {symbol: 'WETH'});
         const etherTokenState = this.props.tokenStateByAddress[etherToken.address];
         const wethBalance = ZeroEx.toUnitAmount(etherTokenState.balance, 18);
+        const isBidirectional = true;
         return (
             <div className="clearfix lg-px4 md-px4 sm-px2" style={{minHeight: 600}}>
                 <div className="relative">
@@ -113,7 +114,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                 <Divider />
                 <div>
                     <div className="py2">
-                        Wrap ETH into an ERC20-compliant Ether token
+                        Wrap ETH into an ERC20-compliant Ether token. 1 ETH = 1 WETH.
                     </div>
                     <div>
                         <Table
@@ -124,8 +125,8 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                 <TableRow>
                                     <TableHeaderColumn>ETH Token</TableHeaderColumn>
                                     <TableHeaderColumn>Balance</TableHeaderColumn>
-                                    <TableHeaderColumn>
-                                        {'ETH <-> WETH'}
+                                    <TableHeaderColumn className="center">
+                                        {this.renderActionColumnTitle(isBidirectional)}
                                     </TableHeaderColumn>
                                 </TableRow>
                             </TableHeader>
@@ -145,7 +146,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                     <TableRowColumn>
                                         {this.props.userEtherBalance.toFixed(PRECISION)} ETH
                                     </TableRowColumn>
-                                    <TableRowColumn style={{paddingLeft: 3}}>
+                                    <TableRowColumn>
                                         <EthWethConversionButton
                                             isOutdatedWrappedEther={false}
                                             direction={Side.deposit}
@@ -172,7 +173,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                     <TableRowColumn>
                                         {wethBalance.toFixed(PRECISION)} WETH
                                     </TableRowColumn>
-                                    <TableRowColumn style={{paddingLeft: 3}}>
+                                    <TableRowColumn>
                                         <EthWethConversionButton
                                             isOutdatedWrappedEther={false}
                                             direction={Side.receive}
@@ -211,8 +212,8 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                 <TableRow>
                                     <TableHeaderColumn>WETH Version</TableHeaderColumn>
                                     <TableHeaderColumn>Balance</TableHeaderColumn>
-                                    <TableHeaderColumn>
-                                        {'WETH -> ETH'}
+                                    <TableHeaderColumn className="center">
+                                        {this.renderActionColumnTitle(!isBidirectional)}
                                     </TableHeaderColumn>
                                 </TableRow>
                             </TableHeader>
@@ -225,6 +226,28 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
             </div>
         );
     }
+    private renderActionColumnTitle(isBidirectional: boolean) {
+        let iconClass = 'zmdi-long-arrow-right';
+        let leftSymbol = 'WETH';
+        let rightSymbol = 'ETH';
+        if (isBidirectional) {
+            iconClass = 'zmdi-swap';
+            leftSymbol = 'ETH';
+            rightSymbol = 'WETH';
+        }
+        return (
+            <div className="flex mx-auto" style={{width: 85}}>
+                <div style={{paddingTop: 3}}>{leftSymbol}</div>
+                <div className="px1">
+                    <i
+                        style={{fontSize: 18}}
+                        className={`zmdi ${iconClass}`}
+                    />
+                </div>
+                <div style={{paddingTop: 3}}>{rightSymbol}</div>
+            </div>
+        );
+    }
     private renderOutdatedWeths(etherToken: Token, etherTokenState: TokenState) {
         const rows = _.map(configs.outdatedWrappedEthers,
                         (outdatedWETHByNetworkId: OutdatedWrappedEtherByNetworkId) => {
@@ -267,7 +290,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                             <i className="zmdi zmdi-spinner zmdi-hc-spin" />
                         }
                     </TableRowColumn>
-                    <TableRowColumn style={{paddingLeft: 3}}>
+                    <TableRowColumn>
                         <EthWethConversionButton
                             isDisabled={!isStateLoaded}
                             isOutdatedWrappedEther={true}

From c36d85a46c946b5d52164642336f39c90b732376 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 15 Dec 2017 13:14:44 +0100
Subject: [PATCH 010/125] Dissallow unused vars/imports

---
 packages/tslint-config/tslint.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/tslint-config/tslint.json b/packages/tslint-config/tslint.json
index d3ee51a63c..91185bddbb 100644
--- a/packages/tslint-config/tslint.json
+++ b/packages/tslint-config/tslint.json
@@ -51,6 +51,7 @@
     "no-string-throw": true,
     "no-submodule-imports": false,
     "no-unnecessary-type-assertion": true,
+    "no-unused-variable": [true, {"ignore-pattern": "^_\\d*"}],
     "no-implicit-dependencies": [true, "dev"],
     "number-literal-format": true,
     "object-literal-sort-keys": false,

From 274aa50d740e4f3af9e3d50468843ed19b555aa3 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 15 Dec 2017 13:14:57 +0100
Subject: [PATCH 011/125] Fix 0x.js unused vars

---
 .../contract_templates/contract.mustache      |  1 +
 packages/0x.js/src/0x.ts                      |  2 --
 .../src/contract_wrappers/exchange_wrapper.ts |  5 +---
 .../token_registry_wrapper.ts                 |  4 +--
 .../token_transfer_proxy_wrapper.ts           |  1 -
 .../src/contract_wrappers/token_wrapper.ts    |  2 --
 .../0x.js/src/order_watcher/event_watcher.ts  |  3 ---
 .../src/order_watcher/expiration_watcher.ts   |  3 +--
 .../src/order_watcher/order_state_watcher.ts  |  2 --
 .../balance_proxy_allowance_lazy_store.ts     |  1 -
 .../order_filled_cancelled_lazy_store.ts      |  1 -
 packages/0x.js/src/utils/assert.ts            | 10 +++----
 packages/0x.js/src/utils/order_state_utils.ts |  5 ----
 .../0x.js/src/utils/order_validation_utils.ts |  5 +---
 packages/0x.js/test/0x.js_test.ts             |  2 +-
 packages/0x.js/test/artifacts_test.ts         |  2 --
 packages/0x.js/test/event_watcher_test.ts     |  5 ----
 packages/0x.js/test/exchange_wrapper_test.ts  |  1 -
 .../0x.js/test/expiration_watcher_test.ts     |  1 -
 .../0x.js/test/order_state_watcher_test.ts    | 27 -------------------
 packages/0x.js/test/order_validation_test.ts  |  5 ----
 .../remaining_fillable_calculator_test.ts     |  1 -
 packages/0x.js/test/subscription_test.ts      |  8 +-----
 .../test/token_transfer_proxy_wrapper_test.ts |  1 -
 packages/0x.js/test/token_wrapper_test.ts     |  9 +------
 25 files changed, 13 insertions(+), 94 deletions(-)

diff --git a/packages/0x.js/contract_templates/contract.mustache b/packages/0x.js/contract_templates/contract.mustache
index 4c59d4f585..693fbe4ee5 100644
--- a/packages/0x.js/contract_templates/contract.mustache
+++ b/packages/0x.js/contract_templates/contract.mustache
@@ -2,6 +2,7 @@
  * This file is auto-generated using abi-gen. Don't edit directly.
  * Templates can be found at https://github.com/0xProject/0x.js/tree/development/packages/abi-gen-templates.
  */
+// tslint:disable-next-line:no-unused-variable
 import {TxData, TxDataPayable} from '@0xproject/types';
 import {classUtils, promisify} from '@0xproject/utils';
 import {BigNumber} from 'bignumber.js';
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 83d4708458..5a2d6cb059 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -16,7 +16,6 @@ import {zeroExConfigSchema} from './schemas/zero_ex_config_schema';
 import {
     ECSignature,
     Order,
-    OrderStateWatcherConfig,
     SignedOrder,
     TransactionReceiptWithDecodedLogs,
     Web3Provider,
@@ -26,7 +25,6 @@ import {
 import {AbiDecoder} from './utils/abi_decoder';
 import {assert} from './utils/assert';
 import {constants} from './utils/constants';
-import {OrderStateUtils} from './utils/order_state_utils';
 import {signatureUtils} from './utils/signature_utils';
 import {utils} from './utils/utils';
 
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index 1e9865395b..9bed400799 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -15,9 +15,7 @@ import {
     ExchangeContractEventArgs,
     ExchangeEvents,
     IndexedFilterValues,
-    LogCancelContractEventArgs,
     LogErrorContractEventArgs,
-    LogFillContractEventArgs,
     LogWithDecodedArgs,
     MethodOpts,
     Order,
@@ -26,7 +24,6 @@ import {
     OrderFillRequest,
     OrderTransactionOpts,
     OrderValues,
-    RawLog,
     SignedOrder,
     SubscriptionOpts,
     ValidateOrderFillableOpts,
@@ -88,7 +85,7 @@ export class ExchangeWrapper extends ContractWrapper {
                 tokenWrapper: TokenWrapper, contractAddressIfExists?: string) {
         super(web3Wrapper, networkId, abiDecoder);
         this._tokenWrapper = tokenWrapper;
-        this._orderValidationUtils = new OrderValidationUtils(tokenWrapper, this);
+        this._orderValidationUtils = new OrderValidationUtils(this);
         this._contractAddressIfExists = contractAddressIfExists;
     }
     /**
diff --git a/packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts b/packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts
index 064b826d88..69e9d7e21c 100644
--- a/packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts
@@ -2,7 +2,7 @@ import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 
 import {artifacts} from '../artifacts';
-import {Token, TokenMetadata, ZeroExError} from '../types';
+import {Token, TokenMetadata} from '../types';
 import {assert} from '../utils/assert';
 import {constants} from '../utils/constants';
 
@@ -36,8 +36,6 @@ export class TokenRegistryWrapper extends ContractWrapper {
      * @return  An array of objects that conform to the Token interface.
      */
     public async getTokensAsync(): Promise<Token[]> {
-        const tokenRegistryContract = await this._getTokenRegistryContractAsync();
-
         const addresses = await this.getTokenAddressesAsync();
         const tokenPromises: Array<Promise<Token|undefined>> = _.map(
             addresses,
diff --git a/packages/0x.js/src/contract_wrappers/token_transfer_proxy_wrapper.ts b/packages/0x.js/src/contract_wrappers/token_transfer_proxy_wrapper.ts
index 1a16e35402..c67ef87dff 100644
--- a/packages/0x.js/src/contract_wrappers/token_transfer_proxy_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_transfer_proxy_wrapper.ts
@@ -2,7 +2,6 @@ import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 
 import {artifacts} from '../artifacts';
-import {ZeroExError} from '../types';
 
 import {ContractWrapper} from './contract_wrapper';
 import {TokenTransferProxyContract} from './generated/token_transfer_proxy';
diff --git a/packages/0x.js/src/contract_wrappers/token_wrapper.ts b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
index 684f291a53..d1553fa7b1 100644
--- a/packages/0x.js/src/contract_wrappers/token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
@@ -23,8 +23,6 @@ import {ContractWrapper} from './contract_wrapper';
 import {TokenContract} from './generated/token';
 import {TokenTransferProxyWrapper} from './token_transfer_proxy_wrapper';
 
-const ALLOWANCE_TO_ZERO_GAS_AMOUNT = 47275;
-
 /**
  * This class includes all the functionality related to interacting with ERC20 token contracts.
  * All ERC20 method calls are supported, along with some convenience methods for getting/setting allowances
diff --git a/packages/0x.js/src/order_watcher/event_watcher.ts b/packages/0x.js/src/order_watcher/event_watcher.ts
index c110792086..197dfae659 100644
--- a/packages/0x.js/src/order_watcher/event_watcher.ts
+++ b/packages/0x.js/src/order_watcher/event_watcher.ts
@@ -5,13 +5,10 @@ import * as Web3 from 'web3';
 
 import {
     BlockParamLiteral,
-    EventCallback,
     EventWatcherCallback,
     ZeroExError,
 } from '../types';
-import {AbiDecoder} from '../utils/abi_decoder';
 import {assert} from '../utils/assert';
-import {utils} from '../utils/utils';
 
 const DEFAULT_EVENT_POLLING_INTERVAL_MS = 200;
 
diff --git a/packages/0x.js/src/order_watcher/expiration_watcher.ts b/packages/0x.js/src/order_watcher/expiration_watcher.ts
index 5faac43cfc..91e8151fdc 100644
--- a/packages/0x.js/src/order_watcher/expiration_watcher.ts
+++ b/packages/0x.js/src/order_watcher/expiration_watcher.ts
@@ -3,8 +3,7 @@ import {BigNumber} from 'bignumber.js';
 import {RBTree} from 'bintrees';
 import * as _ from 'lodash';
 
-import {ZeroEx} from '../0x';
-import {SignedOrder, ZeroExError} from '../types';
+import {ZeroExError} from '../types';
 import {utils} from '../utils/utils';
 
 const DEFAULT_EXPIRATION_MARGIN_MS = 0;
diff --git a/packages/0x.js/src/order_watcher/order_state_watcher.ts b/packages/0x.js/src/order_watcher/order_state_watcher.ts
index 9ae1579c6e..c4a9eb1ad0 100644
--- a/packages/0x.js/src/order_watcher/order_state_watcher.ts
+++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts
@@ -4,7 +4,6 @@ import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 
 import {ZeroEx} from '../0x';
-import {artifacts} from '../artifacts';
 import {ExchangeWrapper} from '../contract_wrappers/exchange_wrapper';
 import {TokenWrapper} from '../contract_wrappers/token_wrapper';
 import {BalanceAndProxyAllowanceLazyStore} from '../stores/balance_proxy_allowance_lazy_store';
@@ -25,7 +24,6 @@ import {
     SignedOrder,
     TokenEvents,
     TransferContractEventArgs,
-    Web3Provider,
     ZeroExError,
 } from '../types';
 import {AbiDecoder} from '../utils/abi_decoder';
diff --git a/packages/0x.js/src/stores/balance_proxy_allowance_lazy_store.ts b/packages/0x.js/src/stores/balance_proxy_allowance_lazy_store.ts
index 6225e9e724..cde1ef095d 100644
--- a/packages/0x.js/src/stores/balance_proxy_allowance_lazy_store.ts
+++ b/packages/0x.js/src/stores/balance_proxy_allowance_lazy_store.ts
@@ -1,6 +1,5 @@
 import {BigNumber} from 'bignumber.js';
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
 
 import {TokenWrapper} from '../contract_wrappers/token_wrapper';
 import {BlockParamLiteral} from '../types';
diff --git a/packages/0x.js/src/stores/order_filled_cancelled_lazy_store.ts b/packages/0x.js/src/stores/order_filled_cancelled_lazy_store.ts
index 28b32f9e2c..b35355e38c 100644
--- a/packages/0x.js/src/stores/order_filled_cancelled_lazy_store.ts
+++ b/packages/0x.js/src/stores/order_filled_cancelled_lazy_store.ts
@@ -1,6 +1,5 @@
 import {BigNumber} from 'bignumber.js';
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
 
 import {ExchangeWrapper} from '../contract_wrappers/exchange_wrapper';
 import {BlockParamLiteral} from '../types';
diff --git a/packages/0x.js/src/utils/assert.ts b/packages/0x.js/src/utils/assert.ts
index 4cf6caf775..86a6a7c010 100644
--- a/packages/0x.js/src/utils/assert.ts
+++ b/packages/0x.js/src/utils/assert.ts
@@ -1,15 +1,15 @@
 import {assert as sharedAssert} from '@0xproject/assert';
-import {Schema, SchemaValidator} from '@0xproject/json-schemas';
+// We need those two unused imports because they're actually used by sharedAssert which gets injected here
+// tslint:disable-next-line:no-unused-variable
+import {Schema} from '@0xproject/json-schemas';
 import {Web3Wrapper} from '@0xproject/web3-wrapper';
-import BigNumber from 'bignumber.js';
+// tslint:disable-next-line:no-unused-variable
+import * as BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
 
 import {ECSignature} from '../types';
 import {signatureUtils} from '../utils/signature_utils';
 
-const HEX_REGEX = /^0x[0-9A-F]*$/i;
-
 export const assert = {
     ...sharedAssert,
     isValidSignature(orderHash: string, ecSignature: ECSignature, signerAddress: string) {
diff --git a/packages/0x.js/src/utils/order_state_utils.ts b/packages/0x.js/src/utils/order_state_utils.ts
index 6b7f811aea..a0985d028f 100644
--- a/packages/0x.js/src/utils/order_state_utils.ts
+++ b/packages/0x.js/src/utils/order_state_utils.ts
@@ -1,24 +1,19 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
 
 import {ZeroEx} from '../0x';
 import {ExchangeWrapper} from '../contract_wrappers/exchange_wrapper';
-import {TokenWrapper} from '../contract_wrappers/token_wrapper';
 import {RemainingFillableCalculator} from '../order_watcher/remaining_fillable_calculator';
 import {BalanceAndProxyAllowanceLazyStore} from '../stores/balance_proxy_allowance_lazy_store';
 import {OrderFilledCancelledLazyStore} from '../stores/order_filled_cancelled_lazy_store';
 import {
     ExchangeContractErrs,
-    MethodOpts,
     OrderRelevantState,
     OrderState,
     OrderStateInvalid,
     OrderStateValid,
     SignedOrder,
 } from '../types';
-import {constants} from '../utils/constants';
-import {utils} from '../utils/utils';
 
 const ACCEPTABLE_RELATIVE_ROUNDING_ERROR = 0.0001;
 
diff --git a/packages/0x.js/src/utils/order_validation_utils.ts b/packages/0x.js/src/utils/order_validation_utils.ts
index d514483e07..9185eef2b6 100644
--- a/packages/0x.js/src/utils/order_validation_utils.ts
+++ b/packages/0x.js/src/utils/order_validation_utils.ts
@@ -3,7 +3,6 @@ import * as _ from 'lodash';
 
 import {ZeroEx} from '../0x';
 import {ExchangeWrapper} from '../contract_wrappers/exchange_wrapper';
-import {TokenWrapper} from '../contract_wrappers/token_wrapper';
 import {ExchangeContractErrs, Order, SignedOrder, TradeSide, TransferType, ZeroExError} from '../types';
 import {constants} from '../utils/constants';
 import {utils} from '../utils/utils';
@@ -11,7 +10,6 @@ import {utils} from '../utils/utils';
 import {ExchangeTransferSimulator} from './exchange_transfer_simulator';
 
 export class OrderValidationUtils {
-    private tokenWrapper: TokenWrapper;
     private exchangeWrapper: ExchangeWrapper;
     public static validateCancelOrderThrowIfInvalid(
         order: Order, cancelTakerTokenAmount: BigNumber, unavailableTakerTokenAmount: BigNumber,
@@ -84,8 +82,7 @@ export class OrderValidationUtils {
                                      .round(0);
         return fillMakerTokenAmount;
     }
-    constructor(tokenWrapper: TokenWrapper, exchangeWrapper: ExchangeWrapper) {
-        this.tokenWrapper = tokenWrapper;
+    constructor(exchangeWrapper: ExchangeWrapper) {
         this.exchangeWrapper = exchangeWrapper;
     }
     public async validateOrderFillableOrThrowAsync(
diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts
index 52f9566dc1..e1ceb12c85 100644
--- a/packages/0x.js/test/0x.js_test.ts
+++ b/packages/0x.js/test/0x.js_test.ts
@@ -5,7 +5,7 @@ import * as _ from 'lodash';
 import 'mocha';
 import * as Sinon from 'sinon';
 
-import {ApprovalContractEventArgs, LogWithDecodedArgs, Order, TokenEvents, ZeroEx, ZeroExError} from '../src';
+import {ApprovalContractEventArgs, LogWithDecodedArgs, Order, TokenEvents, ZeroEx} from '../src';
 
 import {chaiSetup} from './utils/chai_setup';
 import {constants} from './utils/constants';
diff --git a/packages/0x.js/test/artifacts_test.ts b/packages/0x.js/test/artifacts_test.ts
index f4599a24d6..d12346db32 100644
--- a/packages/0x.js/test/artifacts_test.ts
+++ b/packages/0x.js/test/artifacts_test.ts
@@ -1,4 +1,3 @@
-import * as chai from 'chai';
 import * as fs from 'fs';
 import HDWalletProvider = require('truffle-hdwallet-provider');
 
@@ -8,7 +7,6 @@ import {chaiSetup} from './utils/chai_setup';
 import {constants} from './utils/constants';
 
 chaiSetup.configure();
-const expect = chai.expect;
 
 // Those tests are slower cause they're talking to a remote node
 const TIMEOUT = 10000;
diff --git a/packages/0x.js/test/event_watcher_test.ts b/packages/0x.js/test/event_watcher_test.ts
index 3d92c62a37..95af99268b 100644
--- a/packages/0x.js/test/event_watcher_test.ts
+++ b/packages/0x.js/test/event_watcher_test.ts
@@ -1,5 +1,4 @@
 import {Web3Wrapper} from '@0xproject/web3-wrapper';
-import BigNumber from 'bignumber.js';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 import 'mocha';
@@ -7,15 +6,12 @@ import * as Sinon from 'sinon';
 import * as Web3 from 'web3';
 
 import {
-    DecodedLogEvent,
     LogEvent,
-    ZeroEx,
 } from '../src';
 import {EventWatcher} from '../src/order_watcher/event_watcher';
 import {DoneCallback} from '../src/types';
 
 import {chaiSetup} from './utils/chai_setup';
-import {constants} from './utils/constants';
 import {web3Factory} from './utils/web3_factory';
 
 chaiSetup.configure();
@@ -26,7 +22,6 @@ describe('EventWatcher', () => {
     let stubs: Sinon.SinonStub[] = [];
     let eventWatcher: EventWatcher;
     let web3Wrapper: Web3Wrapper;
-    const numConfirmations = 0;
     const logA: Web3.LogEntry = {
         address: '0x71d271f8b14adef568f8f28f1587ce7271ac4ca5',
         blockHash: null,
diff --git a/packages/0x.js/test/exchange_wrapper_test.ts b/packages/0x.js/test/exchange_wrapper_test.ts
index dea9610265..51b511dbf6 100644
--- a/packages/0x.js/test/exchange_wrapper_test.ts
+++ b/packages/0x.js/test/exchange_wrapper_test.ts
@@ -9,7 +9,6 @@ import {
     ExchangeContractErrs,
     ExchangeEvents,
     LogCancelContractEventArgs,
-    LogEvent,
     LogFillContractEventArgs,
     OrderCancellationRequest,
     OrderFillRequest,
diff --git a/packages/0x.js/test/expiration_watcher_test.ts b/packages/0x.js/test/expiration_watcher_test.ts
index c1618ce9da..30c395f008 100644
--- a/packages/0x.js/test/expiration_watcher_test.ts
+++ b/packages/0x.js/test/expiration_watcher_test.ts
@@ -1,5 +1,4 @@
 import {BlockchainLifecycle} from '@0xproject/dev-utils';
-import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import BigNumber from 'bignumber.js';
 import * as chai from 'chai';
 import * as _ from 'lodash';
diff --git a/packages/0x.js/test/order_state_watcher_test.ts b/packages/0x.js/test/order_state_watcher_test.ts
index 99e6646a34..4d9a96502c 100644
--- a/packages/0x.js/test/order_state_watcher_test.ts
+++ b/packages/0x.js/test/order_state_watcher_test.ts
@@ -1,5 +1,4 @@
 import {BlockchainLifecycle} from '@0xproject/dev-utils';
-import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import BigNumber from 'bignumber.js';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -7,19 +6,15 @@ import 'mocha';
 import * as Web3 from 'web3';
 
 import {
-    DecodedLogEvent,
     ExchangeContractErrs,
-    LogEvent,
     OrderState,
     OrderStateInvalid,
     OrderStateValid,
     SignedOrder,
     Token,
     ZeroEx,
-    ZeroExConfig,
     ZeroExError,
 } from '../src';
-import {OrderStateWatcher} from '../src/order_watcher/order_state_watcher';
 import {DoneCallback} from '../src/types';
 
 import {chaiSetup} from './utils/chai_setup';
@@ -48,7 +43,6 @@ describe('OrderStateWatcher', () => {
     let takerToken: Token;
     let maker: string;
     let taker: string;
-    let web3Wrapper: Web3Wrapper;
     let signedOrder: SignedOrder;
     const config = {
         networkId: constants.TESTRPC_NETWORK_ID,
@@ -67,7 +61,6 @@ describe('OrderStateWatcher', () => {
         fillScenarios = new FillScenarios(zeroEx, userAddresses, tokens, zrxTokenAddress, exchangeContractAddress);
         await fillScenarios.initTokenBalancesAsync();
         [makerToken, takerToken] = tokenUtils.getDummyTokens();
-        web3Wrapper = (zeroEx as any)._web3Wrapper;
     });
     beforeEach(async () => {
         await blockchainLifecycle.startAsync();
@@ -142,7 +135,6 @@ describe('OrderStateWatcher', () => {
                 signedOrder = await fillScenarios.createFillableSignedOrderAsync(
                     makerToken.address, takerToken.address, maker, taker, fillableAmount,
                 );
-                const orderHash = ZeroEx.getOrderHashHex(signedOrder);
                 zeroEx.orderStateWatcher.addOrder(signedOrder);
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                     throw new Error('OrderState callback fired for irrelevant order');
@@ -151,7 +143,6 @@ describe('OrderStateWatcher', () => {
                 const notTheMaker = userAddresses[0];
                 const anyRecipient = taker;
                 const transferAmount = new BigNumber(2);
-                const notTheMakerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, notTheMaker);
                 await zeroEx.token.transferAsync(makerToken.address, notTheMaker, anyRecipient, transferAmount);
                 setTimeout(() => {
                     done();
@@ -208,8 +199,6 @@ describe('OrderStateWatcher', () => {
                 );
 
                 const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
-                const takerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, taker);
-
                 const fillAmountInBaseUnits = new BigNumber(2);
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
                 zeroEx.orderStateWatcher.addOrder(signedOrder);
@@ -242,8 +231,6 @@ describe('OrderStateWatcher', () => {
                 signedOrder = await fillScenarios.createFillableSignedOrderWithFeesAsync(
                     makerToken.address, takerToken.address, makerFee, takerFee, maker, taker, fillableAmount,
                     taker);
-                const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                     done();
                 });
@@ -260,8 +247,6 @@ describe('OrderStateWatcher', () => {
                         makerToken.address, takerToken.address, maker, taker, makerFillableAmount,
                         takerFillableAmount,
                     );
-                    const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
-                    const takerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, taker);
                     const fillAmountInBaseUnits = ZeroEx.toBaseUnitAmount(new BigNumber(2), decimals);
                     const orderHash = ZeroEx.getOrderHashHex(signedOrder);
                     zeroEx.orderStateWatcher.addOrder(signedOrder);
@@ -289,8 +274,6 @@ describe('OrderStateWatcher', () => {
                         makerToken.address, takerToken.address, maker, taker, fillableAmount,
                     );
 
-                    const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
-
                     const changedMakerApprovalAmount = ZeroEx.toBaseUnitAmount(new BigNumber(3), decimals);
                     zeroEx.orderStateWatcher.addOrder(signedOrder);
 
@@ -343,8 +326,6 @@ describe('OrderStateWatcher', () => {
                         makerToken.address, takerToken.address, makerFee, takerFee, maker,
                         taker, fillableAmount, feeRecipient);
 
-                    const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
-
                     const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(4), decimals);
                     const transferTokenAmount = makerFee.sub(remainingTokenAmount);
                     zeroEx.orderStateWatcher.addOrder(signedOrder);
@@ -370,10 +351,7 @@ describe('OrderStateWatcher', () => {
                         makerToken.address, takerToken.address, makerFee, takerFee, maker,
                         taker, fillableAmount, feeRecipient);
 
-                    const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
-
                     const remainingFeeAmount = ZeroEx.toBaseUnitAmount(new BigNumber(3), decimals);
-                    const transferFeeAmount = makerFee.sub(remainingFeeAmount);
 
                     const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(4), decimals);
                     const transferTokenAmount = makerFee.sub(remainingTokenAmount);
@@ -401,7 +379,6 @@ describe('OrderStateWatcher', () => {
                         makerToken.address, takerToken.address, makerFee, takerFee, maker,
                         taker, fillableAmount, feeRecipient);
 
-                    const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
                     zeroEx.orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportCallbackErrors(done)((orderState: OrderState) => {
@@ -434,7 +411,6 @@ describe('OrderStateWatcher', () => {
                 });
                 zeroEx.orderStateWatcher.subscribe(callback);
 
-                const shouldThrowOnInsufficientBalanceOrAllowance = true;
                 await zeroEx.exchange.cancelOrderAsync(signedOrder, fillableAmount);
             })().catch(done);
         });
@@ -466,9 +442,6 @@ describe('OrderStateWatcher', () => {
                     makerToken.address, takerToken.address, maker, taker, fillableAmount,
                 );
 
-                const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
-                const takerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, taker);
-
                 const cancelAmountInBaseUnits = new BigNumber(2);
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
                 zeroEx.orderStateWatcher.addOrder(signedOrder);
diff --git a/packages/0x.js/test/order_validation_test.ts b/packages/0x.js/test/order_validation_test.ts
index c6d5d33927..b36a513fed 100644
--- a/packages/0x.js/test/order_validation_test.ts
+++ b/packages/0x.js/test/order_validation_test.ts
@@ -34,7 +34,6 @@ describe('OrderValidation', () => {
     let makerAddress: string;
     let takerAddress: string;
     let feeRecipient: string;
-    let orderValidationUtils: OrderValidationUtils;
     const fillableAmount = new BigNumber(5);
     const fillTakerAmount = new BigNumber(5);
     const config = {
@@ -53,7 +52,6 @@ describe('OrderValidation', () => {
         const [makerToken, takerToken] = tokenUtils.getDummyTokens();
         makerTokenAddress = makerToken.address;
         takerTokenAddress = takerToken.address;
-        orderValidationUtils = new OrderValidationUtils(zeroEx.token, zeroEx.exchange);
     });
     beforeEach(async () => {
         await blockchainLifecycle.startAsync();
@@ -181,7 +179,6 @@ describe('OrderValidation', () => {
     });
     describe('validateCancelOrderAndThrowIfInvalidAsync', () => {
         let signedOrder: SignedOrder;
-        let orderHashHex: string;
         const cancelAmount = new BigNumber(3);
         beforeEach(async () => {
             [coinbase, makerAddress, takerAddress] = userAddresses;
@@ -191,7 +188,6 @@ describe('OrderValidation', () => {
             signedOrder = await fillScenarios.createFillableSignedOrderAsync(
                 makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
             );
-            orderHashHex = ZeroEx.getOrderHashHex(signedOrder);
         });
         it('should throw when cancel amount is zero', async () => {
             const zeroCancelAmount = new BigNumber(0);
@@ -204,7 +200,6 @@ describe('OrderValidation', () => {
                 makerTokenAddress, takerTokenAddress, makerAddress, takerAddress,
                 fillableAmount, expirationInPast,
             );
-            orderHashHex = ZeroEx.getOrderHashHex(expiredSignedOrder);
             return expect(zeroEx.exchange.validateCancelOrderThrowIfInvalidAsync(expiredSignedOrder, cancelAmount))
                 .to.be.rejectedWith(ExchangeContractErrs.OrderCancelExpired);
         });
diff --git a/packages/0x.js/test/remaining_fillable_calculator_test.ts b/packages/0x.js/test/remaining_fillable_calculator_test.ts
index 610bf9b1aa..47ba13cd79 100644
--- a/packages/0x.js/test/remaining_fillable_calculator_test.ts
+++ b/packages/0x.js/test/remaining_fillable_calculator_test.ts
@@ -7,7 +7,6 @@ import { RemainingFillableCalculator } from '../src/order_watcher/remaining_fill
 import { ECSignature, SignedOrder } from '../src/types';
 
 import { chaiSetup } from './utils/chai_setup';
-import { TokenUtils } from './utils/token_utils';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/packages/0x.js/test/subscription_test.ts b/packages/0x.js/test/subscription_test.ts
index d280d720a8..43e6b63b66 100644
--- a/packages/0x.js/test/subscription_test.ts
+++ b/packages/0x.js/test/subscription_test.ts
@@ -12,14 +12,12 @@ import {
     Token,
     TokenEvents,
     ZeroEx,
-    ZeroExError,
 } from '../src';
-import {BlockParamLiteral, DoneCallback} from '../src/types';
+import {DoneCallback} from '../src/types';
 
 import {chaiSetup} from './utils/chai_setup';
 import {constants} from './utils/constants';
 import {reportCallbackErrors} from './utils/report_callback_errors';
-import {TokenUtils} from './utils/token_utils';
 import {web3Factory} from './utils/web3_factory';
 
 chaiSetup.configure();
@@ -31,7 +29,6 @@ describe('SubscriptionTest', () => {
     let zeroEx: ZeroEx;
     let userAddresses: string[];
     let tokens: Token[];
-    let tokenUtils: TokenUtils;
     let coinbase: string;
     let addressWithoutFunds: string;
     const config = {
@@ -42,7 +39,6 @@ describe('SubscriptionTest', () => {
         zeroEx = new ZeroEx(web3.currentProvider, config);
         userAddresses = await zeroEx.getAvailableAddressesAsync();
         tokens = await zeroEx.tokenRegistry.getTokensAsync();
-        tokenUtils = new TokenUtils(tokens);
         coinbase = userAddresses[0];
         addressWithoutFunds = userAddresses[1];
     });
@@ -54,9 +50,7 @@ describe('SubscriptionTest', () => {
     });
     describe('#subscribe', () => {
         const indexFilterValues = {};
-        const shouldThrowOnInsufficientBalanceOrAllowance = true;
         let tokenAddress: string;
-        const transferAmount = new BigNumber(42);
         const allowanceAmount = new BigNumber(42);
         let stubs: Sinon.SinonStub[] = [];
         before(() => {
diff --git a/packages/0x.js/test/token_transfer_proxy_wrapper_test.ts b/packages/0x.js/test/token_transfer_proxy_wrapper_test.ts
index 05861d112a..9674b64ac5 100644
--- a/packages/0x.js/test/token_transfer_proxy_wrapper_test.ts
+++ b/packages/0x.js/test/token_transfer_proxy_wrapper_test.ts
@@ -1,7 +1,6 @@
 import * as chai from 'chai';
 
 import {ZeroEx} from '../src';
-import {TokenTransferProxyWrapper} from '../src/contract_wrappers/token_transfer_proxy_wrapper';
 
 import {chaiSetup} from './utils/chai_setup';
 import {constants} from './utils/constants';
diff --git a/packages/0x.js/test/token_wrapper_test.ts b/packages/0x.js/test/token_wrapper_test.ts
index 1ee2b25fcb..70637dbfed 100644
--- a/packages/0x.js/test/token_wrapper_test.ts
+++ b/packages/0x.js/test/token_wrapper_test.ts
@@ -1,5 +1,4 @@
 import {BlockchainLifecycle} from '@0xproject/dev-utils';
-import {promisify} from '@0xproject/utils';
 import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import BigNumber from 'bignumber.js';
 import * as chai from 'chai';
@@ -8,13 +7,9 @@ import * as Web3 from 'web3';
 
 import {
     ApprovalContractEventArgs,
-    ContractEvent,
     DecodedLogEvent,
-    LogEvent,
-    LogWithDecodedArgs,
     SubscriptionOpts,
     Token,
-    TokenContractEventArgs,
     TokenEvents,
     TransferContractEventArgs,
     ZeroEx,
@@ -71,8 +66,7 @@ describe('TokenWrapper', () => {
             const toAddress = addressWithoutFunds;
             const preBalance = await zeroEx.token.getBalanceAsync(token.address, toAddress);
             expect(preBalance).to.be.bignumber.equal(0);
-            const txHash = await zeroEx.token.transferAsync(token.address, fromAddress, toAddress, transferAmount);
-            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
+            await zeroEx.token.transferAsync(token.address, fromAddress, toAddress, transferAmount);
             const postBalance = await zeroEx.token.getBalanceAsync(token.address, toAddress);
             return expect(postBalance).to.be.bignumber.equal(transferAmount);
         });
@@ -354,7 +348,6 @@ describe('TokenWrapper', () => {
     });
     describe('#subscribe', () => {
         const indexFilterValues = {};
-        const shouldThrowOnInsufficientBalanceOrAllowance = true;
         let tokenAddress: string;
         const transferAmount = new BigNumber(42);
         const allowanceAmount = new BigNumber(42);

From 126048bac9f52871b841d9898cabe7cfd265ebb6 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 15 Dec 2017 13:58:30 +0100
Subject: [PATCH 012/125] Fix connect unused vars

---
 .../utils/orderbook_channel_message_parsers.ts    |  1 -
 packages/connect/src/ws_orderbook_channel.ts      |  2 --
 packages/contracts/deploy/migrations/migrate.ts   |  2 --
 packages/contracts/deploy/src/compiler.ts         |  2 --
 packages/contracts/deploy/src/deployer.ts         |  1 -
 packages/contracts/deploy/test/deploy_test.ts     |  2 +-
 .../migrations/2_deploy_independent_contracts.ts  |  2 +-
 .../contracts/migrations/3_register_tokens.ts     |  2 +-
 packages/contracts/test/ts/ether_token_v2.ts      |  5 ++---
 packages/contracts/test/ts/exchange/core.ts       |  1 -
 packages/contracts/test/ts/exchange/wrapper.ts    |  4 +---
 packages/contracts/util/crypto.ts                 |  1 -
 packages/dev-utils/src/rpc.ts                     |  1 -
 packages/json-schemas/test/schema_test.ts         |  2 --
 packages/kovan-faucets/src/ts/error_reporter.ts   |  1 -
 packages/kovan-faucets/src/ts/utils.ts            |  3 ---
 .../kovan-faucets/src/ts/zrx_request_queue.ts     |  1 -
 packages/subproviders/src/subproviders/ledger.ts  | 15 ---------------
 .../subproviders/src/subproviders/subprovider.ts  |  4 ----
 packages/subproviders/src/types.ts                |  1 -
 .../test/integration/ledger_subprovider_test.ts   |  4 ----
 .../test/unit/ledger_subprovider_test.ts          |  3 ---
 .../test/unit/redundant_rpc_subprovider_test.ts   |  1 +
 .../tslint-config/rules/walkers/async_suffix.ts   |  1 +
 24 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/packages/connect/src/utils/orderbook_channel_message_parsers.ts b/packages/connect/src/utils/orderbook_channel_message_parsers.ts
index 486a416ef2..d9a84cca21 100644
--- a/packages/connect/src/utils/orderbook_channel_message_parsers.ts
+++ b/packages/connect/src/utils/orderbook_channel_message_parsers.ts
@@ -5,7 +5,6 @@ import * as _ from 'lodash';
 import {
     OrderbookChannelMessage,
     OrderbookChannelMessageTypes,
-    SignedOrder,
 } from '../types';
 
 import {typeConverters} from './type_converters';
diff --git a/packages/connect/src/ws_orderbook_channel.ts b/packages/connect/src/ws_orderbook_channel.ts
index 6687025c04..f585934848 100644
--- a/packages/connect/src/ws_orderbook_channel.ts
+++ b/packages/connect/src/ws_orderbook_channel.ts
@@ -8,7 +8,6 @@ import {
     OrderbookChannelHandler,
     OrderbookChannelMessageTypes,
     OrderbookChannelSubscriptionOpts,
-    SignedOrder,
     WebsocketClientEventType,
     WebsocketConnectionEventType,
 } from './types';
@@ -99,7 +98,6 @@ export class WebSocketOrderbookChannel implements OrderbookChannel {
             try {
                 const utf8Data = message.utf8Data;
                 const parserResult = orderbookChannelMessageParsers.parser(utf8Data);
-                const type = parserResult.type;
                 if (parserResult.requestId === requestId) {
                     switch (parserResult.type) {
                         case (OrderbookChannelMessageTypes.Snapshot): {
diff --git a/packages/contracts/deploy/migrations/migrate.ts b/packages/contracts/deploy/migrations/migrate.ts
index f40b7c4ba6..e893e6a6f7 100644
--- a/packages/contracts/deploy/migrations/migrate.ts
+++ b/packages/contracts/deploy/migrations/migrate.ts
@@ -1,11 +1,9 @@
 import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import {BigNumber} from 'bignumber.js';
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
 
 import {Deployer} from './../src/deployer';
 import {constants} from './../src/utils/constants';
-import {Token} from './../src/utils/types';
 import {tokenInfo} from './config/token_info';
 
 export const migrator = {
diff --git a/packages/contracts/deploy/src/compiler.ts b/packages/contracts/deploy/src/compiler.ts
index 8a44e94a3e..333a2d0cea 100644
--- a/packages/contracts/deploy/src/compiler.ts
+++ b/packages/contracts/deploy/src/compiler.ts
@@ -1,4 +1,3 @@
-import {promisify} from '@0xproject/utils';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 import * as path from 'path';
@@ -14,7 +13,6 @@ import {
     ContractNetworks,
     ContractSources,
     ImportContents,
-    SolcErrors,
 } from './utils/types';
 import {utils} from './utils/utils';
 
diff --git a/packages/contracts/deploy/src/deployer.ts b/packages/contracts/deploy/src/deployer.ts
index 4c8018ecc7..991504972f 100644
--- a/packages/contracts/deploy/src/deployer.ts
+++ b/packages/contracts/deploy/src/deployer.ts
@@ -1,5 +1,4 @@
 import {TxData} from '@0xproject/types';
-import {promisify} from '@0xproject/utils';
 import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';
diff --git a/packages/contracts/deploy/test/deploy_test.ts b/packages/contracts/deploy/test/deploy_test.ts
index 7e7b98f90b..263174a948 100644
--- a/packages/contracts/deploy/test/deploy_test.ts
+++ b/packages/contracts/deploy/test/deploy_test.ts
@@ -4,7 +4,7 @@ import 'mocha';
 import {Compiler} from './../src/compiler';
 import {Deployer} from './../src/deployer';
 import {fsWrapper} from './../src/utils/fs_wrapper';
-import {CompilerOptions, ContractArtifact, ContractData, DeployerOptions, DoneCallback} from './../src/utils/types';
+import {CompilerOptions, ContractArtifact, ContractData, DoneCallback} from './../src/utils/types';
 import {constructor_args, exchange_binary} from './fixtures/exchange_bin';
 import {constants} from './util/constants';
 
diff --git a/packages/contracts/migrations/2_deploy_independent_contracts.ts b/packages/contracts/migrations/2_deploy_independent_contracts.ts
index db9fc370d6..4bf316be6e 100644
--- a/packages/contracts/migrations/2_deploy_independent_contracts.ts
+++ b/packages/contracts/migrations/2_deploy_independent_contracts.ts
@@ -1,5 +1,5 @@
 import {Artifacts} from '../util/artifacts';
-import {ContractInstance, MultiSigConfigByNetwork} from '../util/types';
+import {MultiSigConfigByNetwork} from '../util/types';
 const {
     MultiSigWalletWithTimeLock,
     TokenTransferProxy,
diff --git a/packages/contracts/migrations/3_register_tokens.ts b/packages/contracts/migrations/3_register_tokens.ts
index c72ac15100..f816936283 100644
--- a/packages/contracts/migrations/3_register_tokens.ts
+++ b/packages/contracts/migrations/3_register_tokens.ts
@@ -3,7 +3,7 @@ import * as _ from 'lodash';
 
 import {Artifacts} from '../util/artifacts';
 import {constants} from '../util/constants';
-import {ContractInstance, Token, TokenInfoByNetwork} from '../util/types';
+import {ContractInstance, Token} from '../util/types';
 
 import {tokenInfo} from './config/token_info';
 const {
diff --git a/packages/contracts/test/ts/ether_token_v2.ts b/packages/contracts/test/ts/ether_token_v2.ts
index b88fef579c..61ac4cb578 100644
--- a/packages/contracts/test/ts/ether_token_v2.ts
+++ b/packages/contracts/test/ts/ether_token_v2.ts
@@ -81,7 +81,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
             const logArgs = (logs[0] as any).args;
             expect(logArgs._from).to.equal(expectedFrom);
             expect(logArgs._to).to.equal(expectedTo);
-            expect(logArgs._value).to.be.bignumber.equal(ethToDeposit);
+            expect(logArgs._value).to.be.bignumber.equal(expectedValue);
         });
     });
 
@@ -120,7 +120,6 @@ contract('EtherTokenV2', (accounts: string[]) => {
 
         it('should log 1 event with correct arguments', async () => {
             const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-            const initEthBalance = await getEthBalanceAsync(account);
             const ethTokensToWithdraw = initEthTokenBalance;
             expect(ethTokensToWithdraw).to.not.be.bignumber.equal(0);
             const txHash = await zeroEx.etherToken.withdrawAsync(ethTokensToWithdraw, account, {
@@ -137,7 +136,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
             const logArgs = (logs[0] as any).args;
             expect(logArgs._from).to.equal(expectedFrom);
             expect(logArgs._to).to.equal(expectedTo);
-            expect(logArgs._value).to.be.bignumber.equal(ethTokensToWithdraw);
+            expect(logArgs._value).to.be.bignumber.equal(expectedValue);
         });
     });
 
diff --git a/packages/contracts/test/ts/exchange/core.ts b/packages/contracts/test/ts/exchange/core.ts
index 641084937b..aef2b5a5db 100644
--- a/packages/contracts/test/ts/exchange/core.ts
+++ b/packages/contracts/test/ts/exchange/core.ts
@@ -748,7 +748,6 @@ contract('Exchange', (accounts: string[]) => {
 
             const res = await exWrapper.cancelOrderAsync(order, maker);
             expect(res.logs).to.have.length(1);
-            const errId = res.logs[0].args.errorId.toNumber();
             const errCode = res.logs[0].args.errorId.toNumber();
             expect(errCode).to.be.equal(ExchangeContractErrs.ERROR_ORDER_FULLY_FILLED_OR_CANCELLED);
         });
diff --git a/packages/contracts/test/ts/exchange/wrapper.ts b/packages/contracts/test/ts/exchange/wrapper.ts
index 3097f68876..13a0b60582 100644
--- a/packages/contracts/test/ts/exchange/wrapper.ts
+++ b/packages/contracts/test/ts/exchange/wrapper.ts
@@ -227,8 +227,6 @@ contract('Exchange', (accounts: string[]) => {
 
             it('should throw if a single order does not fill the expected amount', async () => {
                 const fillTakerTokenAmounts: BigNumber[] = [];
-                const makerToken = rep.address;
-                const takerToken = dgd.address;
                 orders.forEach(order => {
                     const fillTakerTokenAmount = order.params.takerTokenAmount.div(2);
                     fillTakerTokenAmounts.push(fillTakerTokenAmount);
@@ -311,7 +309,7 @@ contract('Exchange', (accounts: string[]) => {
                 const cancelTakerTokenAmounts = _.map(orders, order => order.params.takerTokenAmount);
                 await exWrapper.batchCancelOrdersAsync(orders, maker, {cancelTakerTokenAmounts});
 
-                const res = await exWrapper.batchFillOrdersAsync(
+                await exWrapper.batchFillOrdersAsync(
                         orders, taker, {fillTakerTokenAmounts: cancelTakerTokenAmounts});
                 const newBalances = await dmyBalances.getAsync();
                 expect(balances).to.be.deep.equal(newBalances);
diff --git a/packages/contracts/util/crypto.ts b/packages/contracts/util/crypto.ts
index 5253b8c159..2e43ae816e 100644
--- a/packages/contracts/util/crypto.ts
+++ b/packages/contracts/util/crypto.ts
@@ -1,4 +1,3 @@
-import {BigNumber} from 'bignumber.js';
 import BN = require('bn.js');
 import ABI = require('ethereumjs-abi');
 import ethUtil = require('ethereumjs-util');
diff --git a/packages/dev-utils/src/rpc.ts b/packages/dev-utils/src/rpc.ts
index c276b24523..19834dbb4e 100644
--- a/packages/dev-utils/src/rpc.ts
+++ b/packages/dev-utils/src/rpc.ts
@@ -3,7 +3,6 @@ import * as request from 'request-promise-native';
 
 export class RPC {
     private url: string;
-    private port: number;
     private id: number;
     constructor(url: string) {
         this.url = url;
diff --git a/packages/json-schemas/test/schema_test.ts b/packages/json-schemas/test/schema_test.ts
index 8a2f9407d7..067b02827e 100644
--- a/packages/json-schemas/test/schema_test.ts
+++ b/packages/json-schemas/test/schema_test.ts
@@ -1,4 +1,3 @@
-import {promisify} from '@0xproject/utils';
 import BigNumber from 'bignumber.js';
 import * as chai from 'chai';
 import * as dirtyChai from 'dirty-chai';
@@ -16,7 +15,6 @@ const {
     addressSchema,
     ecSignatureSchema,
     ecSignatureParameterSchema,
-    indexFilterValuesSchema,
     orderCancellationRequestsSchema,
     orderFillOrKillRequestsSchema,
     orderFillRequestsSchema,
diff --git a/packages/kovan-faucets/src/ts/error_reporter.ts b/packages/kovan-faucets/src/ts/error_reporter.ts
index db21647c04..bc1844aa2b 100644
--- a/packages/kovan-faucets/src/ts/error_reporter.ts
+++ b/packages/kovan-faucets/src/ts/error_reporter.ts
@@ -1,5 +1,4 @@
 import * as express from 'express';
-import * as fs from 'fs';
 import rollbar = require('rollbar');
 
 import {configs} from './configs';
diff --git a/packages/kovan-faucets/src/ts/utils.ts b/packages/kovan-faucets/src/ts/utils.ts
index 6a0b262e60..893f82ca38 100644
--- a/packages/kovan-faucets/src/ts/utils.ts
+++ b/packages/kovan-faucets/src/ts/utils.ts
@@ -1,6 +1,3 @@
-import * as express from 'express';
-import * as _ from 'lodash';
-
 export const utils = {
     consoleLog(message: string) {
         /* tslint:disable */
diff --git a/packages/kovan-faucets/src/ts/zrx_request_queue.ts b/packages/kovan-faucets/src/ts/zrx_request_queue.ts
index 6e6590e7c5..3b505690f3 100644
--- a/packages/kovan-faucets/src/ts/zrx_request_queue.ts
+++ b/packages/kovan-faucets/src/ts/zrx_request_queue.ts
@@ -1,5 +1,4 @@
 import {ZeroEx} from '0x.js';
-import {promisify} from '@0xproject/utils';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 
diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts
index 578f6ff6f8..9ffc105a45 100644
--- a/packages/subproviders/src/subproviders/ledger.ts
+++ b/packages/subproviders/src/subproviders/ledger.ts
@@ -1,9 +1,7 @@
 import {assert} from '@0xproject/assert';
 import {addressUtils} from '@0xproject/utils';
-import promisify = require('es6-promisify');
 import EthereumTx = require('ethereumjs-tx');
 import ethUtil = require('ethereumjs-util');
-import * as ledger from 'ledgerco';
 import * as _ from 'lodash';
 import Semaphore from 'semaphore-async-await';
 import Web3 = require('web3');
@@ -23,7 +21,6 @@ const DEFAULT_DERIVATION_PATH = `44'/60'/0'`;
 const NUM_ADDRESSES_TO_FETCH = 10;
 const ASK_FOR_ON_DEVICE_CONFIRMATION = false;
 const SHOULD_GET_CHAIN_CODE = false;
-const HEX_REGEX = /^[0-9A-Fa-f]+$/g;
 
 export class LedgerSubprovider extends Subprovider {
     private _nonceLock: Semaphore;
@@ -34,18 +31,6 @@ export class LedgerSubprovider extends Subprovider {
     private _ledgerEthereumClientFactoryAsync: LedgerEthereumClientFactoryAsync;
     private _ledgerClientIfExists?: LedgerEthereumClient;
     private _shouldAlwaysAskForConfirmation: boolean;
-    private static isValidHex(data: string) {
-        if (!_.isString(data)) {
-            return false;
-        }
-        const isHexPrefixed = data.slice(0, 2) === '0x';
-        if (!isHexPrefixed) {
-            return false;
-        }
-        const nonPrefixed = data.slice(2);
-        const isValid = nonPrefixed.match(HEX_REGEX);
-        return isValid;
-    }
     private static validateSender(sender: string) {
         if (_.isUndefined(sender) || !addressUtils.isAddress(sender)) {
             throw new Error(LedgerSubproviderErrors.SenderInvalidOrNotSupplied);
diff --git a/packages/subproviders/src/subproviders/subprovider.ts b/packages/subproviders/src/subproviders/subprovider.ts
index 64d97b9589..41dde42384 100644
--- a/packages/subproviders/src/subproviders/subprovider.ts
+++ b/packages/subproviders/src/subproviders/subprovider.ts
@@ -11,7 +11,6 @@ import {
  */
 export class Subprovider {
     private engine: any;
-    private currentBlock: any;
     // Ported from: https://github.com/MetaMask/provider-engine/blob/master/util/random-id.js
     private static getRandomId() {
         const extraDigits = 3;
@@ -34,9 +33,6 @@ export class Subprovider {
     }
     public setEngine(engine: any): void {
         this.engine = engine;
-        engine.on('block', (block: any) => {
-            this.currentBlock = block;
-        });
     }
     public async emitPayloadAsync(payload: JSONRPCPayload): Promise<any> {
         const finalPayload = Subprovider.createFinalPayload(payload);
diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts
index 38dc1e67e4..1e7d3eab09 100644
--- a/packages/subproviders/src/types.ts
+++ b/packages/subproviders/src/types.ts
@@ -1,5 +1,4 @@
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
 
 export interface LedgerCommunicationClient {
     close_async: () => Promise<void>;
diff --git a/packages/subproviders/test/integration/ledger_subprovider_test.ts b/packages/subproviders/test/integration/ledger_subprovider_test.ts
index 75f6d47fe5..ab4ffb19ab 100644
--- a/packages/subproviders/test/integration/ledger_subprovider_test.ts
+++ b/packages/subproviders/test/integration/ledger_subprovider_test.ts
@@ -2,20 +2,16 @@ import * as chai from 'chai';
 import promisify = require('es6-promisify');
 import * as ethUtils from 'ethereumjs-util';
 import * as _ from 'lodash';
-import * as mocha from 'mocha';
 import Web3 = require('web3');
 import Web3ProviderEngine = require('web3-provider-engine');
 import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
 
 import {
-    ECSignature,
     ledgerEthereumNodeJsClientFactoryAsync,
     LedgerSubprovider,
 } from '../../src';
 import {
     DoneCallback,
-    LedgerGetAddressResult,
-    PartialTxParams,
 } from '../../src/types';
 import {chaiSetup} from '../chai_setup';
 import {reportCallbackErrors} from '../utils/report_callback_errors';
diff --git a/packages/subproviders/test/unit/ledger_subprovider_test.ts b/packages/subproviders/test/unit/ledger_subprovider_test.ts
index 964df5db9a..bd4d933253 100644
--- a/packages/subproviders/test/unit/ledger_subprovider_test.ts
+++ b/packages/subproviders/test/unit/ledger_subprovider_test.ts
@@ -6,14 +6,11 @@ import Web3ProviderEngine = require('web3-provider-engine');
 import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
 
 import {
-    ECSignature,
     LedgerSubprovider,
 } from '../../src';
 import {
     DoneCallback,
-    ECSignatureString,
     LedgerCommunicationClient,
-    LedgerGetAddressResult,
     LedgerSubproviderErrors,
 } from '../../src/types';
 import {chaiSetup} from '../chai_setup';
diff --git a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
index edeb1d5a20..2f1676915e 100644
--- a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
+++ b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
@@ -11,6 +11,7 @@ import {chaiSetup} from '../chai_setup';
 import {reportCallbackErrors} from '../utils/report_callback_errors';
 
 const expect = chai.expect;
+chaiSetup.configure();
 
 describe('RedundantRpcSubprovider', () => {
     let provider: Web3ProviderEngine;
diff --git a/packages/tslint-config/rules/walkers/async_suffix.ts b/packages/tslint-config/rules/walkers/async_suffix.ts
index 0c89bd99f6..7fa7a78b80 100644
--- a/packages/tslint-config/rules/walkers/async_suffix.ts
+++ b/packages/tslint-config/rules/walkers/async_suffix.ts
@@ -9,6 +9,7 @@ export class AsyncSuffixWalker extends Lint.RuleWalker {
         const methodName = methodNameNode.getText();
         if (!_.isUndefined(node.type)) {
             if (node.type.kind === ts.SyntaxKind.TypeReference) {
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const returnTypeName = (node.type as ts.TypeReferenceNode).typeName.getText();
                 if (returnTypeName === 'Promise' && !methodName.endsWith('Async')) {
                     const failure = this.createFailure(

From 2041e9945edf6f5255185de73c0dc332270e4bbb Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 15 Dec 2017 15:19:19 +0100
Subject: [PATCH 013/125] Fix website unused vars

---
 packages/website/ts/blockchain.ts             | 12 +------
 .../dialogs/portal_disclaimer_dialog.tsx      |  1 -
 .../ts/components/dialogs/send_dialog.tsx     |  5 +--
 .../track_token_confirmation_dialog.tsx       |  2 --
 packages/website/ts/components/fill_order.tsx | 10 ------
 packages/website/ts/components/footer.tsx     | 33 +------------------
 .../generate_order/asset_picker.tsx           | 21 ------------
 .../generate_order/generate_order_form.tsx    | 13 ++------
 .../generate_order/new_token_form.tsx         |  1 -
 .../ts/components/inputs/address_input.tsx    |  1 -
 .../inputs/identicon_address_input.tsx        |  2 --
 .../ts/components/inputs/token_input.tsx      |  2 +-
 packages/website/ts/components/order_json.tsx |  4 +--
 packages/website/ts/components/portal.tsx     | 27 ---------------
 .../website/ts/components/portal_menu.tsx     |  1 -
 .../website/ts/components/send_button.tsx     |  2 --
 .../website/ts/components/token_balances.tsx  |  1 -
 packages/website/ts/components/top_bar.tsx    | 10 +-----
 .../ts/components/top_bar_menu_item.tsx       |  1 -
 .../components/track_token_confirmation.tsx   |  2 --
 packages/website/ts/components/ui/badge.tsx   |  1 -
 .../ts/components/ui/drop_down_menu_item.tsx  |  6 ----
 .../ts/components/ui/fake_text_field.tsx      |  1 -
 .../components/ui/lifecycle_raised_button.tsx |  2 --
 .../website/ts/components/ui/menu_item.tsx    |  3 --
 packages/website/ts/components/ui/party.tsx   |  4 ---
 .../ts/components/ui/simple_loading.tsx       |  1 -
 .../website/ts/components/ui/swap_icon.tsx    |  1 -
 .../website/ts/components/visual_order.tsx    |  1 -
 .../ts/containers/connect_documentation.tsx   |  4 +--
 .../ts/containers/generate_order_form.tsx     |  2 --
 packages/website/ts/containers/portal.tsx     | 12 +++----
 .../smart_contracts_documentation.tsx         |  2 +-
 .../containers/zero_ex_js_documentation.tsx   |  4 +--
 packages/website/ts/index.tsx                 |  2 +-
 packages/website/ts/pages/about/about.tsx     |  6 +---
 packages/website/ts/pages/about/profile.tsx   |  3 --
 .../ts/pages/documentation/comment.tsx        |  2 ++
 .../ts/pages/documentation/documentation.tsx  |  8 -----
 .../website/ts/pages/documentation/enum.tsx   |  6 +---
 .../pages/documentation/event_definition.tsx  |  3 --
 .../ts/pages/documentation/method_block.tsx   |  4 ---
 .../pages/documentation/method_signature.tsx  |  2 ++
 .../ts/pages/documentation/source_link.tsx    |  1 -
 .../website/ts/pages/documentation/type.tsx   |  3 --
 .../pages/documentation/type_definition.tsx   |  2 --
 packages/website/ts/pages/faq/faq.tsx         |  2 --
 packages/website/ts/pages/landing/landing.tsx | 26 ++-------------
 packages/website/ts/pages/not_found.tsx       |  1 -
 .../ts/pages/shared/nested_sidebar_menu.tsx   |  3 +-
 .../ts/pages/shared/version_drop_down.tsx     |  2 --
 packages/website/ts/redux/dispatcher.ts       |  1 -
 packages/website/ts/utils/constants.ts        |  1 -
 packages/website/ts/utils/doc_utils.ts        |  1 -
 packages/website/ts/utils/typedoc_utils.ts    |  4 ---
 packages/website/ts/utils/utils.ts            |  6 ++--
 56 files changed, 28 insertions(+), 256 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 321a603efc..331bafa717 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -1,7 +1,6 @@
 import {
     BlockParam,
     DecodedLogEvent,
-    ExchangeContractErrs,
     ExchangeContractEventArgs,
     ExchangeEvents,
     IndexedFilterValues,
@@ -14,7 +13,6 @@ import {
     Token as ZeroExToken,
     TransactionReceiptWithDecodedLogs,
     ZeroEx,
-    ZeroExError,
 } from '0x.js';
 import {
     InjectedWeb3Subprovider,
@@ -25,9 +23,6 @@ import {
 } from '@0xproject/subproviders';
 import {intervalUtils, promisify} from '@0xproject/utils';
 import BigNumber from 'bignumber.js';
-import compareVersions = require('compare-versions');
-import ethUtil = require('ethereumjs-util');
-import findVersions = require('find-versions');
 import * as _ from 'lodash';
 import * as React from 'react';
 import contract = require('truffle-contract');
@@ -40,7 +35,6 @@ import {
     BlockchainCallErrs,
     BlockchainErrs,
     ContractInstance,
-    ContractResponse,
     EtherscanLinkSuffixes,
     ProviderType,
     Side,
@@ -60,7 +54,6 @@ import FilterSubprovider = require('web3-provider-engine/subproviders/filters');
 
 import * as MintableArtifacts from '../contracts/Mintable.json';
 
-const ALLOWANCE_TO_ZERO_GAS_AMOUNT = 45730;
 const BLOCK_NUMBER_BACK_TRACK = 50;
 
 export class Blockchain {
@@ -70,8 +63,6 @@ export class Blockchain {
     private dispatcher: Dispatcher;
     private web3Wrapper?: Web3Wrapper;
     private exchangeAddress: string;
-    private tokenTransferProxy: ContractInstance;
-    private tokenRegistry: ContractInstance;
     private userAddress: string;
     private cachedProvider: Web3.Provider;
     private ledgerSubprovider: LedgerWalletSubprovider;
@@ -506,8 +497,7 @@ export class Blockchain {
         await this.fetchHistoricalExchangeLogFillEventsAsync(indexFilterValues);
 
         // Start a subscription for new logs
-        const exchangeAddress = this.getExchangeContractAddressIfExists();
-        const subscriptionId = this.zeroEx.exchange.subscribe(
+        this.zeroEx.exchange.subscribe(
             ExchangeEvents.LogFill, indexFilterValues,
             async (err: Error, decodedLogEvent: DecodedLogEvent<LogFillContractEventArgs>) => {
             if (err) {
diff --git a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
index 1d90624ee6..bfff7fbb57 100644
--- a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
+++ b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
@@ -2,7 +2,6 @@ import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
-import {constants} from 'ts/utils/constants';
 
 interface PortalDisclaimerDialogProps {
     isOpen: boolean;
diff --git a/packages/website/ts/components/dialogs/send_dialog.tsx b/packages/website/ts/components/dialogs/send_dialog.tsx
index 31afc3386e..0f35169938 100644
--- a/packages/website/ts/components/dialogs/send_dialog.tsx
+++ b/packages/website/ts/components/dialogs/send_dialog.tsx
@@ -2,13 +2,10 @@ import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import RadioButton from 'material-ui/RadioButton';
-import RadioButtonGroup from 'material-ui/RadioButton/RadioButtonGroup';
 import * as React from 'react';
 import {AddressInput} from 'ts/components/inputs/address_input';
-import {EthAmountInput} from 'ts/components/inputs/eth_amount_input';
 import {TokenAmountInput} from 'ts/components/inputs/token_amount_input';
-import {Side, Token, TokenState} from 'ts/types';
+import {Token, TokenState} from 'ts/types';
 
 interface SendDialogProps {
     onComplete: (recipient: string, value: BigNumber) => void;
diff --git a/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx b/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
index 70c7d1ab6c..2d45009d50 100644
--- a/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
+++ b/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
@@ -1,14 +1,12 @@
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
 import {TrackTokenConfirmation} from 'ts/components/track_token_confirmation';
 import {trackedTokenStorage} from 'ts/local_storage/tracked_token_storage';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {Token, TokenByAddress} from 'ts/types';
-import {constants} from 'ts/utils/constants';
 
 interface TrackTokenConfirmationDialogProps {
     tokens: Token[];
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index 388c72d8e5..40a9b87d67 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -4,10 +4,7 @@ import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import {Card, CardHeader, CardText} from 'material-ui/Card';
 import Divider from 'material-ui/Divider';
-import Paper from 'material-ui/Paper';
 import RaisedButton from 'material-ui/RaisedButton';
-import TextField from 'material-ui/TextField';
-import * as moment from 'moment';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
 import {Blockchain} from 'ts/blockchain';
@@ -19,18 +16,13 @@ import {Alert} from 'ts/components/ui/alert';
 import {EthereumAddress} from 'ts/components/ui/ethereum_address';
 import {Identicon} from 'ts/components/ui/identicon';
 import {VisualOrder} from 'ts/components/visual_order';
-import {trackedTokenStorage} from 'ts/local_storage/tracked_token_storage';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {orderSchema} from 'ts/schemas/order_schema';
 import {SchemaValidator} from 'ts/schemas/validator';
 import {
     AlertTypes,
     BlockchainErrs,
-    ContractResponse,
-    ExchangeContractErrs,
     Order,
-    OrderToken,
-    Side,
     Token,
     TokenByAddress,
     TokenStateByAddress,
@@ -531,8 +523,6 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
         });
 
         const parsedOrder = this.state.parsedOrder;
-        const orderHash = parsedOrder.signature.hash;
-        const unavailableTakerAmount = await this.props.blockchain.getUnavailableTakerAmountAsync(orderHash);
         const takerFillAmount = this.props.orderFillAmount;
 
         if (_.isUndefined(this.props.userAddress)) {
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 5e3c0479ad..b265230945 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -3,11 +3,7 @@ import * as React from 'react';
 import {
   Link,
 } from 'react-router-dom';
-import {HashLink} from 'react-router-hash-link';
-import {
-    Link as ScrollLink,
-} from 'react-scroll';
-import {Styles, WebsitePaths} from 'ts/types';
+import {WebsitePaths} from 'ts/types';
 import {constants} from 'ts/utils/constants';
 
 interface MenuItemsBySection {
@@ -229,31 +225,4 @@ export class Footer extends React.Component<FooterProps, FooterState> {
             </div>
         );
     }
-    private renderHomepageLink(title: string) {
-        const hash = title.toLowerCase();
-        if (this.props.location.pathname === WebsitePaths.Home) {
-            return (
-                <ScrollLink
-                    style={linkStyle}
-                    to={hash}
-                    smooth={true}
-                    offset={0}
-                    duration={constants.HOME_SCROLL_DURATION_MS}
-                    containerId="home"
-                >
-                    {title}
-                </ScrollLink>
-            );
-        } else {
-            return (
-                <HashLink
-                    to={`/#${hash}`}
-                    className="text-decoration-none"
-                    style={linkStyle}
-                >
-                    {title}
-                </HashLink>
-            );
-        }
-    }
 }
diff --git a/packages/website/ts/components/generate_order/asset_picker.tsx b/packages/website/ts/components/generate_order/asset_picker.tsx
index 633d6a017b..08b4a909ee 100644
--- a/packages/website/ts/components/generate_order/asset_picker.tsx
+++ b/packages/website/ts/components/generate_order/asset_picker.tsx
@@ -1,9 +1,6 @@
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import GridList from 'material-ui/GridList/GridList';
-import GridTile from 'material-ui/GridList/GridTile';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
 import {NewTokenForm} from 'ts/components/generate_order/new_token_form';
@@ -12,15 +9,12 @@ import {TokenIcon} from 'ts/components/ui/token_icon';
 import {trackedTokenStorage} from 'ts/local_storage/tracked_token_storage';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {
-    AssetToken,
     DialogConfigs,
-    Styles,
     Token,
     TokenByAddress,
     TokenState,
     TokenVisibility,
 } from 'ts/types';
-import {utils} from 'ts/utils/utils';
 
 const TOKEN_ICON_DIMENSION = 100;
 const TILE_DIMENSION = 146;
@@ -219,21 +213,6 @@ export class AssetPicker extends React.Component<AssetPickerProps, AssetPickerSt
             });
         }
     }
-    private getTitle() {
-        switch (this.state.assetView) {
-            case AssetViews.ASSET_PICKER:
-                return 'Select token';
-
-            case AssetViews.NEW_TOKEN_FORM:
-                return 'Add an ERC20 token';
-
-            case AssetViews.CONFIRM_TRACK_TOKEN:
-                return 'Tracking confirmation';
-
-            default:
-                throw utils.spawnSwitchErr('assetView', this.state.assetView);
-        }
-    }
     private onCustomAssetChosen() {
         this.setState({
             assetView: AssetViews.NEW_TOKEN_FORM,
diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx
index 72edf08cfd..59970b10c5 100644
--- a/packages/website/ts/components/generate_order/generate_order_form.tsx
+++ b/packages/website/ts/components/generate_order/generate_order_form.tsx
@@ -62,16 +62,7 @@ interface GenerateOrderFormState {
     signingState: SigningState;
 }
 
-const style = {
-    paper: {
-        display: 'inline-block',
-        position: 'relative',
-        textAlign: 'center',
-        width: '100%',
-    },
-};
-
-export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, any> {
+export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, GenerateOrderFormState> {
     private validator: SchemaValidator;
     constructor(props: GenerateOrderFormProps) {
         super(props);
@@ -287,7 +278,7 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, a
         if (_.isUndefined(exchangeContractAddr)) {
             this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
             this.setState({
-                isSigning: false,
+                signingState: SigningState.UNSIGNED,
             });
             return false;
         }
diff --git a/packages/website/ts/components/generate_order/new_token_form.tsx b/packages/website/ts/components/generate_order/new_token_form.tsx
index 7e2c61ae8c..1be9f5ece1 100644
--- a/packages/website/ts/components/generate_order/new_token_form.tsx
+++ b/packages/website/ts/components/generate_order/new_token_form.tsx
@@ -9,7 +9,6 @@ import {Alert} from 'ts/components/ui/alert';
 import {LifeCycleRaisedButton} from 'ts/components/ui/lifecycle_raised_button';
 import {RequiredLabel} from 'ts/components/ui/required_label';
 import {AlertTypes, Token, TokenByAddress, TokenState} from 'ts/types';
-import {constants} from 'ts/utils/constants';
 
 interface NewTokenFormProps {
     blockchain: Blockchain;
diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx
index 40ae722d9c..bd9e24c806 100644
--- a/packages/website/ts/components/inputs/address_input.tsx
+++ b/packages/website/ts/components/inputs/address_input.tsx
@@ -3,7 +3,6 @@ import * as _ from 'lodash';
 import {colors} from 'material-ui/styles';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
-import {Blockchain} from 'ts/blockchain';
 import {RequiredLabel} from 'ts/components/ui/required_label';
 
 interface AddressInputProps {
diff --git a/packages/website/ts/components/inputs/identicon_address_input.tsx b/packages/website/ts/components/inputs/identicon_address_input.tsx
index 692a092d94..9e4bc58eaa 100644
--- a/packages/website/ts/components/inputs/identicon_address_input.tsx
+++ b/packages/website/ts/components/inputs/identicon_address_input.tsx
@@ -1,7 +1,5 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
-import {Blockchain} from 'ts/blockchain';
 import {AddressInput} from 'ts/components/inputs/address_input';
 import {Identicon} from 'ts/components/ui/identicon';
 import {InputLabel} from 'ts/components/ui/input_label';
diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx
index 8daa84650e..67f697f05c 100644
--- a/packages/website/ts/components/inputs/token_input.tsx
+++ b/packages/website/ts/components/inputs/token_input.tsx
@@ -7,7 +7,7 @@ import {AssetPicker} from 'ts/components/generate_order/asset_picker';
 import {InputLabel} from 'ts/components/ui/input_label';
 import {TokenIcon} from 'ts/components/ui/token_icon';
 import {Dispatcher} from 'ts/redux/dispatcher';
-import {AssetToken, BlockchainErrs, Side, Token, TokenByAddress, TokenState} from 'ts/types';
+import {AssetToken, BlockchainErrs, Side, Token, TokenByAddress} from 'ts/types';
 
 const TOKEN_ICON_DIMENSION = 80;
 
diff --git a/packages/website/ts/components/order_json.tsx b/packages/website/ts/components/order_json.tsx
index 073abe4191..c499ee9c2e 100644
--- a/packages/website/ts/components/order_json.tsx
+++ b/packages/website/ts/components/order_json.tsx
@@ -1,11 +1,9 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import Paper from 'material-ui/Paper';
-import {colors} from 'material-ui/styles';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {CopyIcon} from 'ts/components/ui/copy_icon';
-import {Order, SideToAssetToken, SignatureData, TokenByAddress, WebsitePaths} from 'ts/types';
+import {SideToAssetToken, SignatureData, TokenByAddress, WebsitePaths} from 'ts/types';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {errorReporter} from 'ts/utils/error_reporter';
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index 62a5d2eacf..90549e0e38 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
-import RaisedButton from 'material-ui/RaisedButton';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
@@ -20,17 +19,13 @@ import {Loading} from 'ts/components/ui/loading';
 import {GenerateOrderForm} from 'ts/containers/generate_order_form';
 import {localStorage} from 'ts/local_storage/local_storage';
 import {Dispatcher} from 'ts/redux/dispatcher';
-import {State} from 'ts/redux/reducer';
 import {orderSchema} from 'ts/schemas/order_schema';
 import {SchemaValidator} from 'ts/schemas/validator';
 import {
     BlockchainErrs,
-    Fill,
     HashData,
     Order,
     ScreenWidths,
-    Side,
-    Styles,
     Token,
     TokenByAddress,
     TokenStateByAddress,
@@ -70,28 +65,6 @@ interface PortalAllState {
     hasAcceptedDisclaimer: boolean;
 }
 
-const styles: Styles = {
-    button: {
-        color: 'white',
-    },
-    headline: {
-        fontSize: 20,
-        fontWeight: 400,
-        marginBottom: 12,
-        paddingTop: 16,
-    },
-    inkBar: {
-        background: colors.amber600,
-    },
-    menuItem: {
-        padding: '0px 16px 0px 48px',
-    },
-    tabItemContainer: {
-        background: colors.blueGrey500,
-        borderRadius: '4px 4px 0 0',
-    },
-};
-
 export class Portal extends React.Component<PortalAllProps, PortalAllState> {
     private blockchain: Blockchain;
     private sharedOrderIfExists: Order;
diff --git a/packages/website/ts/components/portal_menu.tsx b/packages/website/ts/components/portal_menu.tsx
index 869df3e716..7b9a31a150 100644
--- a/packages/website/ts/components/portal_menu.tsx
+++ b/packages/website/ts/components/portal_menu.tsx
@@ -1,6 +1,5 @@
 import * as _ from 'lodash';
 import * as React from 'react';
-import {Link} from 'react-router-dom';
 import {MenuItem} from 'ts/components/ui/menu_item';
 import {WebsitePaths} from 'ts/types';
 
diff --git a/packages/website/ts/components/send_button.tsx b/packages/website/ts/components/send_button.tsx
index da8dd2a9b2..b3fd2aebae 100644
--- a/packages/website/ts/components/send_button.tsx
+++ b/packages/website/ts/components/send_button.tsx
@@ -1,4 +1,3 @@
-import {ZeroEx} from '0x.js';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
@@ -7,7 +6,6 @@ import {Blockchain} from 'ts/blockchain';
 import {SendDialog} from 'ts/components/dialogs/send_dialog';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {BlockchainCallErrs, Token, TokenState} from 'ts/types';
-import {constants} from 'ts/utils/constants';
 import {errorReporter} from 'ts/utils/error_reporter';
 import {utils} from 'ts/utils/utils';
 
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index ae5ef9222f..4781145167 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -18,7 +18,6 @@ import {
     TableRow,
     TableRowColumn,
 } from 'material-ui/Table';
-import QueryString = require('query-string');
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
 import firstBy = require('thenby');
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index 4398fe6672..488eef9141 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -1,15 +1,9 @@
 import * as _ from 'lodash';
-import AppBar from 'material-ui/AppBar';
 import Drawer from 'material-ui/Drawer';
 import MenuItem from 'material-ui/MenuItem';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
-import {HashLink} from 'react-router-hash-link';
-import {
-    animateScroll,
-    Link as ScrollLink,
-} from 'react-scroll';
 import ReactTooltip = require('react-tooltip');
 import {PortalMenu} from 'ts/components/portal_menu';
 import {TopBarMenuItem} from 'ts/components/top_bar_menu_item';
@@ -17,10 +11,8 @@ import {DropDownMenuItem} from 'ts/components/ui/drop_down_menu_item';
 import {Identicon} from 'ts/components/ui/identicon';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {NestedSidebarMenu} from 'ts/pages/shared/nested_sidebar_menu';
-import {DocsMenu, MenuSubsectionsBySection, Styles, TypeDocNode, WebsitePaths} from 'ts/types';
-import {configs} from 'ts/utils/configs';
+import {DocsMenu, MenuSubsectionsBySection, Styles, WebsitePaths} from 'ts/types';
 import {constants} from 'ts/utils/constants';
-import {typeDocUtils} from 'ts/utils/typedoc_utils';
 
 const CUSTOM_DARK_GRAY = '#231F20';
 const SECTION_HEADER_COLOR = 'rgb(234, 234, 234)';
diff --git a/packages/website/ts/components/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar_menu_item.tsx
index de429fba6f..38dc911940 100644
--- a/packages/website/ts/components/top_bar_menu_item.tsx
+++ b/packages/website/ts/components/top_bar_menu_item.tsx
@@ -1,7 +1,6 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
-import {Styles} from 'ts/types';
 
 const CUSTOM_DARK_GRAY = '#231F20';
 const DEFAULT_STYLE = {
diff --git a/packages/website/ts/components/track_token_confirmation.tsx b/packages/website/ts/components/track_token_confirmation.tsx
index b9b2ef18a3..cd588f239d 100644
--- a/packages/website/ts/components/track_token_confirmation.tsx
+++ b/packages/website/ts/components/track_token_confirmation.tsx
@@ -1,6 +1,4 @@
 import * as _ from 'lodash';
-import Dialog from 'material-ui/Dialog';
-import FlatButton from 'material-ui/FlatButton';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Party} from 'ts/components/ui/party';
diff --git a/packages/website/ts/components/ui/badge.tsx b/packages/website/ts/components/ui/badge.tsx
index 15d5ea2278..cf43960470 100644
--- a/packages/website/ts/components/ui/badge.tsx
+++ b/packages/website/ts/components/ui/badge.tsx
@@ -1,5 +1,4 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Styles} from 'ts/types';
 
diff --git a/packages/website/ts/components/ui/drop_down_menu_item.tsx b/packages/website/ts/components/ui/drop_down_menu_item.tsx
index 05b88f7ce0..041688a9de 100644
--- a/packages/website/ts/components/ui/drop_down_menu_item.tsx
+++ b/packages/website/ts/components/ui/drop_down_menu_item.tsx
@@ -1,13 +1,7 @@
 import * as _ from 'lodash';
 import Menu from 'material-ui/Menu';
-import MenuItem from 'material-ui/MenuItem';
 import Popover from 'material-ui/Popover';
 import * as React from 'react';
-import {Link} from 'react-router-dom';
-import {
-    Link as ScrollLink,
-} from 'react-scroll';
-import {Styles, WebsitePaths} from 'ts/types';
 
 const CHECK_CLOSE_POPOVER_INTERVAL_MS = 300;
 const CUSTOM_LIGHT_GRAY = '#848484';
diff --git a/packages/website/ts/components/ui/fake_text_field.tsx b/packages/website/ts/components/ui/fake_text_field.tsx
index 90bc47f018..8ee4349a2f 100644
--- a/packages/website/ts/components/ui/fake_text_field.tsx
+++ b/packages/website/ts/components/ui/fake_text_field.tsx
@@ -1,4 +1,3 @@
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {InputLabel} from 'ts/components/ui/input_label';
 import {Styles} from 'ts/types';
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
index cba94ca8ce..2d668fb827 100644
--- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx
+++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
@@ -1,8 +1,6 @@
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
-import {Blockchain} from 'ts/blockchain';
-import {Token} from 'ts/types';
 import {utils} from 'ts/utils/utils';
 
 const COMPLETE_STATE_SHOW_LENGTH_MS = 2000;
diff --git a/packages/website/ts/components/ui/menu_item.tsx b/packages/website/ts/components/ui/menu_item.tsx
index 862f284576..c7ce7439f9 100644
--- a/packages/website/ts/components/ui/menu_item.tsx
+++ b/packages/website/ts/components/ui/menu_item.tsx
@@ -1,9 +1,6 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
-import {Styles} from 'ts/types';
-import {constants} from 'ts/utils/constants';
 
 interface MenuItemProps {
     to: string;
diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx
index 5bafa6071b..e6b6ea9e26 100644
--- a/packages/website/ts/components/ui/party.tsx
+++ b/packages/website/ts/components/ui/party.tsx
@@ -7,7 +7,6 @@ import {Identicon} from 'ts/components/ui/identicon';
 import {EtherscanLinkSuffixes} from 'ts/types';
 import {utils} from 'ts/utils/utils';
 
-const MIN_ADDRESS_WIDTH = 60;
 const IMAGE_DIMENSION = 100;
 const IDENTICON_DIAMETER = 95;
 const CHECK_MARK_GREEN = 'rgb(0, 195, 62)';
@@ -33,10 +32,7 @@ export class Party extends React.Component<PartyProps, PartyState> {
     public render() {
         const label = this.props.label;
         const address = this.props.address;
-        const tooltipId = `${label}-${address}-tooltip`;
         const identiconDiameter = this.props.identiconDiameter;
-        const addressWidth = identiconDiameter > MIN_ADDRESS_WIDTH ?
-                             identiconDiameter : MIN_ADDRESS_WIDTH;
         const emptyIdenticonStyles = {
             width: identiconDiameter,
             height: identiconDiameter,
diff --git a/packages/website/ts/components/ui/simple_loading.tsx b/packages/website/ts/components/ui/simple_loading.tsx
index d55d7851d0..fa548f996a 100644
--- a/packages/website/ts/components/ui/simple_loading.tsx
+++ b/packages/website/ts/components/ui/simple_loading.tsx
@@ -1,5 +1,4 @@
 import CircularProgress from 'material-ui/CircularProgress';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 
 export interface SimpleLoadingProps {
diff --git a/packages/website/ts/components/ui/swap_icon.tsx b/packages/website/ts/components/ui/swap_icon.tsx
index 2e6ae89bb0..b5d4b0caad 100644
--- a/packages/website/ts/components/ui/swap_icon.tsx
+++ b/packages/website/ts/components/ui/swap_icon.tsx
@@ -1,7 +1,6 @@
 import * as _ from 'lodash';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
-import {constants} from 'ts/utils/constants';
 
 interface SwapIconProps {
     swapTokensFn: () => void;
diff --git a/packages/website/ts/components/visual_order.tsx b/packages/website/ts/components/visual_order.tsx
index 037a321ffa..a7be6f7808 100644
--- a/packages/website/ts/components/visual_order.tsx
+++ b/packages/website/ts/components/visual_order.tsx
@@ -3,7 +3,6 @@ import * as _ from 'lodash';
 import * as React from 'react';
 import {Party} from 'ts/components/ui/party';
 import {AssetToken, Token, TokenByAddress} from 'ts/types';
-import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
 const PRECISION = 5;
diff --git a/packages/website/ts/containers/connect_documentation.tsx b/packages/website/ts/containers/connect_documentation.tsx
index 8ecc1e37c5..3b181a814e 100644
--- a/packages/website/ts/containers/connect_documentation.tsx
+++ b/packages/website/ts/containers/connect_documentation.tsx
@@ -1,9 +1,7 @@
-import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {Dispatch, Store as ReduxStore} from 'redux';
-import {Blockchain} from 'ts/blockchain';
+import {Dispatch} from 'redux';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {
     Documentation as DocumentationComponent,
diff --git a/packages/website/ts/containers/generate_order_form.tsx b/packages/website/ts/containers/generate_order_form.tsx
index 864d2702e8..134c84859c 100644
--- a/packages/website/ts/containers/generate_order_form.tsx
+++ b/packages/website/ts/containers/generate_order_form.tsx
@@ -1,8 +1,6 @@
-import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {Dispatch, Store as ReduxStore} from 'redux';
 import {Blockchain} from 'ts/blockchain';
 import {GenerateOrderForm as GenerateOrderFormComponent} from 'ts/components/generate_order/generate_order_form';
 import {Dispatcher} from 'ts/redux/dispatcher';
diff --git a/packages/website/ts/containers/portal.tsx b/packages/website/ts/containers/portal.tsx
index 2987764f4c..7588a1535d 100644
--- a/packages/website/ts/containers/portal.tsx
+++ b/packages/website/ts/containers/portal.tsx
@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {Dispatch, Store as ReduxStore} from 'redux';
+import {Dispatch} from 'redux';
 import {
     Portal as PortalComponent,
     PortalAllProps as PortalComponentAllProps,
@@ -12,7 +12,6 @@ import {Dispatcher} from 'ts/redux/dispatcher';
 import {State} from 'ts/redux/reducer';
 import {
     BlockchainErrs,
-    Fill,
     HashData,
     Order,
     ScreenWidths,
@@ -22,24 +21,23 @@ import {
 } from 'ts/types';
 import {constants} from 'ts/utils/constants';
 
-interface MapStateToProps {
+interface ConnectedState {
     blockchainErr: BlockchainErrs;
     blockchainIsLoaded: boolean;
     hashData: HashData;
     networkId: number;
     nodeVersion: string;
-    orderFillAmount: number;
+    orderFillAmount: BigNumber;
     tokenByAddress: TokenByAddress;
     tokenStateByAddress: TokenStateByAddress;
-    userEtherBalance: number;
+    userEtherBalance: BigNumber;
     screenWidth: ScreenWidths;
     shouldBlockchainErrDialogBeOpen: boolean;
     userAddress: string;
     userSuppliedOrderCache: Order;
+    flashMessage?: string|React.ReactNode;
 }
 
-interface ConnectedState {}
-
 interface ConnectedDispatch {
     dispatcher: Dispatcher;
 }
diff --git a/packages/website/ts/containers/smart_contracts_documentation.tsx b/packages/website/ts/containers/smart_contracts_documentation.tsx
index ea2b19b8c9..1f82bda0f3 100644
--- a/packages/website/ts/containers/smart_contracts_documentation.tsx
+++ b/packages/website/ts/containers/smart_contracts_documentation.tsx
@@ -1,7 +1,7 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {Dispatch, Store as ReduxStore} from 'redux';
+import {Dispatch} from 'redux';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {
     Documentation as DocumentationComponent,
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.tsx b/packages/website/ts/containers/zero_ex_js_documentation.tsx
index 58c0ee186d..1ce9ba139d 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.tsx
+++ b/packages/website/ts/containers/zero_ex_js_documentation.tsx
@@ -1,9 +1,7 @@
-import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {Dispatch, Store as ReduxStore} from 'redux';
-import {Blockchain} from 'ts/blockchain';
+import {Dispatch} from 'redux';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {
     Documentation as DocumentationComponent,
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 922102d969..cbefac8bd8 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -6,7 +6,7 @@ import {colors, getMuiTheme, MuiThemeProvider} from 'material-ui/styles';
 import * as React from 'react';
 import {render} from 'react-dom';
 import {Provider} from 'react-redux';
-import {BrowserRouter as Router, Link, Redirect, Route, Switch} from 'react-router-dom';
+import {BrowserRouter as Router, Redirect, Route, Switch} from 'react-router-dom';
 import * as injectTapEventPlugin from 'react-tap-event-plugin';
 import {createStore, Store as ReduxStore} from 'redux';
 import {createLazyComponent} from 'ts/lazy_component';
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 3af05e8a40..011bbb9d9a 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -1,15 +1,11 @@
 import * as _ from 'lodash';
-import RaisedButton from 'material-ui/RaisedButton';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
-import {Link} from 'react-router-dom';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
 import {Profile} from 'ts/pages/about/profile';
-import {Question} from 'ts/pages/faq/question';
 import {ProfileInfo, Styles} from 'ts/types';
-import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
@@ -236,7 +232,7 @@ export class About extends React.Component<AboutProps, AboutState> {
     }
     private renderProfiles(profiles: ProfileInfo[]) {
         const numIndiv = profiles.length;
-        const colSize = utils.getColSize(profiles.length);
+        const colSize = utils.getColSize(numIndiv);
         return _.map(profiles, profile => {
             return (
                 <div
diff --git a/packages/website/ts/pages/about/profile.tsx b/packages/website/ts/pages/about/profile.tsx
index 71dbd09b5a..86aa788b22 100644
--- a/packages/website/ts/pages/about/profile.tsx
+++ b/packages/website/ts/pages/about/profile.tsx
@@ -1,9 +1,6 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
-import {Element as ScrollElement} from 'react-scroll';
 import {ProfileInfo, Styles} from 'ts/types';
-import {utils} from 'ts/utils/utils';
 
 const IMAGE_DIMENSION = 149;
 const styles: Styles = {
diff --git a/packages/website/ts/pages/documentation/comment.tsx b/packages/website/ts/pages/documentation/comment.tsx
index 78bbdc069f..9627fdcdc0 100644
--- a/packages/website/ts/pages/documentation/comment.tsx
+++ b/packages/website/ts/pages/documentation/comment.tsx
@@ -22,3 +22,5 @@ export const Comment: React.SFC<CommentProps> = (props: CommentProps) => {
         </div>
     );
 };
+
+Comment.defaultProps = defaultProps;
diff --git a/packages/website/ts/pages/documentation/documentation.tsx b/packages/website/ts/pages/documentation/documentation.tsx
index be99e77a2c..0ca8ae9d3a 100644
--- a/packages/website/ts/pages/documentation/documentation.tsx
+++ b/packages/website/ts/pages/documentation/documentation.tsx
@@ -17,35 +17,27 @@ import {MethodBlock} from 'ts/pages/documentation/method_block';
 import {SourceLink} from 'ts/pages/documentation/source_link';
 import {Type} from 'ts/pages/documentation/type';
 import {TypeDefinition} from 'ts/pages/documentation/type_definition';
-import {AnchorTitle} from 'ts/pages/shared/anchor_title';
 import {MarkdownSection} from 'ts/pages/shared/markdown_section';
 import {NestedSidebarMenu} from 'ts/pages/shared/nested_sidebar_menu';
 import {SectionHeader} from 'ts/pages/shared/section_header';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {
     AddressByContractName,
-    CustomType,
     DocAgnosticFormat,
-    Docs,
-    DocsInfoConfig,
     DoxityDocObj,
     EtherscanLinkSuffixes,
     Event,
-    MenuSubsectionsBySection,
     Networks,
     Property,
     SolidityMethod,
     Styles,
     TypeDefinitionByName,
-    TypeDocNode,
     TypescriptMethod,
-    WebsitePaths,
 } from 'ts/types';
 import {constants} from 'ts/utils/constants';
 import {docUtils} from 'ts/utils/doc_utils';
 import {utils} from 'ts/utils/utils';
 
-const SCROLL_TO_TIMEOUT = 500;
 const SCROLL_TOP_ID = 'docsScrollTop';
 const CUSTOM_PURPLE = '#690596';
 const CUSTOM_RED = '#e91751';
diff --git a/packages/website/ts/pages/documentation/enum.tsx b/packages/website/ts/pages/documentation/enum.tsx
index 8fcd2c252a..b5fbc4bd25 100644
--- a/packages/website/ts/pages/documentation/enum.tsx
+++ b/packages/website/ts/pages/documentation/enum.tsx
@@ -1,9 +1,6 @@
 import * as _ from 'lodash';
 import * as React from 'react';
-import {EnumValue, TypeDocNode} from 'ts/types';
-import {utils} from 'ts/utils/utils';
-
-const STRING_ENUM_CODE_PREFIX = ' strEnum(';
+import {EnumValue} from 'ts/types';
 
 interface EnumProps {
     values: EnumValue[];
@@ -11,7 +8,6 @@ interface EnumProps {
 
 export function Enum(props: EnumProps) {
     const values = _.map(props.values, (value, i) => {
-        const isLast = i === props.values.length - 1;
         const defaultValueIfAny = !_.isUndefined(value.defaultValue) ? ` = ${value.defaultValue}` : '';
         return `\n\t${value.name}${defaultValueIfAny},`;
     });
diff --git a/packages/website/ts/pages/documentation/event_definition.tsx b/packages/website/ts/pages/documentation/event_definition.tsx
index 469e6bb37d..3c57666e70 100644
--- a/packages/website/ts/pages/documentation/event_definition.tsx
+++ b/packages/website/ts/pages/documentation/event_definition.tsx
@@ -4,10 +4,7 @@ import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {Type} from 'ts/pages/documentation/type';
 import {AnchorTitle} from 'ts/pages/shared/anchor_title';
 import {Event, EventArg, HeaderSizes} from 'ts/types';
-import {constants} from 'ts/utils/constants';
-import {utils} from 'ts/utils/utils';
 
-const KEYWORD_COLOR = '#a81ca6';
 const CUSTOM_GREEN = 'rgb(77, 162, 75)';
 
 interface EventDefinitionProps {
diff --git a/packages/website/ts/pages/documentation/method_block.tsx b/packages/website/ts/pages/documentation/method_block.tsx
index 44e549211a..9505f2aa4b 100644
--- a/packages/website/ts/pages/documentation/method_block.tsx
+++ b/packages/website/ts/pages/documentation/method_block.tsx
@@ -1,8 +1,6 @@
 import * as _ from 'lodash';
-import {Chip} from 'material-ui/Chip';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
-import * as ReactMarkdown from 'react-markdown';
 import {Comment} from 'ts/pages/documentation/comment';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {MethodSignature} from 'ts/pages/documentation/method_signature';
@@ -14,11 +12,9 @@ import {
     SolidityMethod,
     Styles,
     TypeDefinitionByName,
-    TypeDocNode,
     TypescriptMethod,
 } from 'ts/types';
 import {typeDocUtils} from 'ts/utils/typedoc_utils';
-import {utils} from 'ts/utils/utils';
 
 interface MethodBlockProps {
     method: SolidityMethod|TypescriptMethod;
diff --git a/packages/website/ts/pages/documentation/method_signature.tsx b/packages/website/ts/pages/documentation/method_signature.tsx
index 846c9fa4f3..df3b618144 100644
--- a/packages/website/ts/pages/documentation/method_signature.tsx
+++ b/packages/website/ts/pages/documentation/method_signature.tsx
@@ -42,6 +42,8 @@ export const MethodSignature: React.SFC<MethodSignatureProps> = (props: MethodSi
     );
 };
 
+MethodSignature.defaultProps = defaultProps;
+
 function renderParameters(
     method: TypescriptMethod|SolidityMethod, docsInfo: DocsInfo, typeDefinitionByName?: TypeDefinitionByName,
 ) {
diff --git a/packages/website/ts/pages/documentation/source_link.tsx b/packages/website/ts/pages/documentation/source_link.tsx
index 74fc6d4d5f..9abf01706d 100644
--- a/packages/website/ts/pages/documentation/source_link.tsx
+++ b/packages/website/ts/pages/documentation/source_link.tsx
@@ -2,7 +2,6 @@ import * as _ from 'lodash';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Source} from 'ts/types';
-import {constants} from 'ts/utils/constants';
 
 interface SourceLinkProps {
     source: Source;
diff --git a/packages/website/ts/pages/documentation/type.tsx b/packages/website/ts/pages/documentation/type.tsx
index c564429d0e..74b146d910 100644
--- a/packages/website/ts/pages/documentation/type.tsx
+++ b/packages/website/ts/pages/documentation/type.tsx
@@ -7,7 +7,6 @@ import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {TypeDefinition} from 'ts/pages/documentation/type_definition';
 import {Type as TypeDef, TypeDefinitionByName, TypeDocTypes} from 'ts/types';
 import {constants} from 'ts/utils/constants';
-import {typeDocUtils} from 'ts/utils/typedoc_utils';
 import {utils} from 'ts/utils/utils';
 
 const BUILT_IN_TYPE_COLOR = '#e69d00';
@@ -48,10 +47,8 @@ interface TypeProps {
 // <Type /> components (e.g when rendering the union type).
 export function Type(props: TypeProps): any {
     const type = props.type;
-    const isIntrinsic = type.typeDocType === TypeDocTypes.Intrinsic;
     const isReference = type.typeDocType === TypeDocTypes.Reference;
     const isArray = type.typeDocType === TypeDocTypes.Array;
-    const isStringLiteral = type.typeDocType === TypeDocTypes.StringLiteral;
     let typeNameColor = 'inherit';
     let typeName: string|React.ReactNode;
     let typeArgs: React.ReactNode[] = [];
diff --git a/packages/website/ts/pages/documentation/type_definition.tsx b/packages/website/ts/pages/documentation/type_definition.tsx
index 17b182c70d..edcf7bf477 100644
--- a/packages/website/ts/pages/documentation/type_definition.tsx
+++ b/packages/website/ts/pages/documentation/type_definition.tsx
@@ -9,8 +9,6 @@ import {MethodSignature} from 'ts/pages/documentation/method_signature';
 import {Type} from 'ts/pages/documentation/type';
 import {AnchorTitle} from 'ts/pages/shared/anchor_title';
 import {CustomType, CustomTypeChild, HeaderSizes, KindString, TypeDocTypes} from 'ts/types';
-import {constants} from 'ts/utils/constants';
-import {typeDocUtils} from 'ts/utils/typedoc_utils';
 import {utils} from 'ts/utils/utils';
 
 const KEYWORD_COLOR = '#a81ca6';
diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index c53ed28b85..b3fe21da70 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -1,9 +1,7 @@
 import * as _ from 'lodash';
-import RaisedButton from 'material-ui/RaisedButton';
 import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
-import {Link} from 'react-router-dom';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
 import {Question} from 'ts/pages/faq/question';
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index f3c46b8c78..7992c7a6c5 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -6,8 +6,7 @@ import DocumentTitle = require('react-document-title');
 import {Link} from 'react-router-dom';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
-import {ScreenWidths, Styles, WebsitePaths} from 'ts/types';
-import {configs} from 'ts/utils/configs';
+import {ScreenWidths, WebsitePaths} from 'ts/types';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
@@ -269,7 +268,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
         const isMediumScreen = this.state.screenWidth === ScreenWidths.MD;
         const projectList = _.map(projects, (project: Project, i: number) => {
-            const colWidth = isSmallScreen ? 3 : isMediumScreen ? 4 : 2 - (i % 2);
+            const colWidth = isSmallScreen ? 3 : (isMediumScreen ? 4 : 2 - (i % 2));
             return (
                 <div
                     key={`project-${project.logoFileName}`}
@@ -470,11 +469,6 @@ export class Landing extends React.Component<LandingProps, LandingState> {
     }
     private renderBuildingBlocksSection() {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
-        const underlineStyle: React.CSSProperties = {
-            height: isSmallScreen ? 18 : 23,
-            lineHeight: 'none',
-            borderBottom: '2px solid #979797',
-        };
         const descriptionStyle: React.CSSProperties = {
             fontFamily: 'Roboto Mono',
             lineHeight: isSmallScreen ? 1.5 : 2,
@@ -606,21 +600,6 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         });
         return assets;
     }
-    private renderLink(label: string, path: string, color: string, style?: React.CSSProperties) {
-        return (
-            <div
-                style={{borderBottom: `1px solid ${color}`, paddingBottom: 1, height: 20, lineHeight: 1.7, ...style}}
-            >
-                <Link
-                    to={path}
-                    className="text-decoration-none"
-                    style={{color, fontFamily: 'Roboto Mono'}}
-                >
-                    {label}
-                </Link>
-            </div>
-        );
-    }
     private renderInfoBoxes() {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
         const boxStyle: React.CSSProperties = {
@@ -676,7 +655,6 @@ export class Landing extends React.Component<LandingProps, LandingState> {
     }
     private renderUseCases() {
         const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
-        const isMediumScreen = this.state.screenWidth === ScreenWidths.MD;
 
         const useCases: UseCase[] = [
             {
diff --git a/packages/website/ts/pages/not_found.tsx b/packages/website/ts/pages/not_found.tsx
index 075bcf91e0..df505792d8 100644
--- a/packages/website/ts/pages/not_found.tsx
+++ b/packages/website/ts/pages/not_found.tsx
@@ -1,6 +1,5 @@
 import * as _ from 'lodash';
 import * as React from 'react';
-import {Link} from 'react-router-dom';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
 import {Styles} from 'ts/types';
diff --git a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
index cbb863f3e5..15ec443998 100644
--- a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
+++ b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
@@ -4,9 +4,8 @@ import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Link as ScrollLink} from 'react-scroll';
 import {VersionDropDown} from 'ts/pages/shared/version_drop_down';
-import {Docs, MenuSubsectionsBySection, Styles} from 'ts/types';
+import {MenuSubsectionsBySection, Styles} from 'ts/types';
 import {constants} from 'ts/utils/constants';
-import {typeDocUtils} from 'ts/utils/typedoc_utils';
 import {utils} from 'ts/utils/utils';
 
 interface NestedSidebarMenuProps {
diff --git a/packages/website/ts/pages/shared/version_drop_down.tsx b/packages/website/ts/pages/shared/version_drop_down.tsx
index 4af9a834f9..e63ad19cd6 100644
--- a/packages/website/ts/pages/shared/version_drop_down.tsx
+++ b/packages/website/ts/pages/shared/version_drop_down.tsx
@@ -2,8 +2,6 @@ import * as _ from 'lodash';
 import DropDownMenu from 'material-ui/DropDownMenu';
 import MenuItem from 'material-ui/MenuItem';
 import * as React from 'react';
-import {Docs} from 'ts/types';
-import {constants} from 'ts/utils/constants';
 
 interface VersionDropDownProps {
     selectedVersion: string;
diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts
index a0a1da21bc..cbcee65993 100644
--- a/packages/website/ts/redux/dispatcher.ts
+++ b/packages/website/ts/redux/dispatcher.ts
@@ -6,7 +6,6 @@ import {
     AssetToken,
     BlockchainErrs,
     Direction,
-    Fill,
     Order,
     ProviderType,
     ScreenWidths,
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index cae59af5fb..fb81dd9a9a 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -2,7 +2,6 @@ import BigNumber from 'bignumber.js';
 import {
     ContractAddresses,
     Docs,
-    ExchangeContractErrs,
     Networks,
     PublicNodeUrlsByNetworkId,
     WebsitePaths,
diff --git a/packages/website/ts/utils/doc_utils.ts b/packages/website/ts/utils/doc_utils.ts
index 594e3bae6e..ea210a3fa4 100644
--- a/packages/website/ts/utils/doc_utils.ts
+++ b/packages/website/ts/utils/doc_utils.ts
@@ -1,7 +1,6 @@
 import findVersions = require('find-versions');
 import * as _ from 'lodash';
 import {DoxityDocObj, S3FileObject, TypeDocNode, VersionToFileName} from 'ts/types';
-import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 import convert = require('xml-js');
 
diff --git a/packages/website/ts/utils/typedoc_utils.ts b/packages/website/ts/utils/typedoc_utils.ts
index ff8060781c..9d3b9f8d7a 100644
--- a/packages/website/ts/utils/typedoc_utils.ts
+++ b/packages/website/ts/utils/typedoc_utils.ts
@@ -5,21 +5,17 @@ import {
     CustomTypeChild,
     DocAgnosticFormat,
     DocSection,
-    DocsMenu,
     IndexSignature,
     KindString,
-    MenuSubsectionsBySection,
     Parameter,
     Property,
     SectionsMap,
     Type,
     TypeDocNode,
     TypeDocType,
-    TypeDocTypes,
     TypeParameter,
     TypescriptMethod,
 } from 'ts/types';
-import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
 export const typeDocUtils = {
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 8b23b6a40e..abc2fb2d4d 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -1,7 +1,6 @@
 import {ExchangeContractErrs, ZeroExError} from '0x.js';
 import BigNumber from 'bignumber.js';
 import deepEqual = require('deep-equal');
-import ethUtil = require('ethereumjs-util');
 import isMobile = require('is-mobile');
 import * as _ from 'lodash';
 import * as moment from 'moment';
@@ -9,7 +8,6 @@ import {
     EtherscanLinkSuffixes,
     Networks,
     Order,
-    OrderParty,
     ScreenWidths,
     Side,
     SideToAssetToken,
@@ -110,9 +108,9 @@ export const utils = {
     },
     getColSize(items: number) {
         const bassCssGridSize = 12; // Source: http://basscss.com/#basscss-grid
-        const colSize = 12 / items;
+        const colSize = bassCssGridSize / items;
         if (!_.isInteger(colSize)) {
-            throw new Error('Number of cols must be divisible by 12');
+            throw new Error(`Number of cols must be divisible by ${bassCssGridSize}`);
         }
         return colSize;
     },

From 818a50a3fb0b78992919e0366c73b36cbffa69b0 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 15 Dec 2017 15:32:10 +0100
Subject: [PATCH 014/125] Fix tests

---
 packages/0x.js/test/order_state_watcher_test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/0x.js/test/order_state_watcher_test.ts b/packages/0x.js/test/order_state_watcher_test.ts
index 4d9a96502c..df32c7f141 100644
--- a/packages/0x.js/test/order_state_watcher_test.ts
+++ b/packages/0x.js/test/order_state_watcher_test.ts
@@ -234,6 +234,7 @@ describe('OrderStateWatcher', () => {
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                     done();
                 });
+                zeroEx.orderStateWatcher.addOrder(signedOrder);
                 zeroEx.orderStateWatcher.subscribe(callback);
                 await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, maker, new BigNumber(0));
             })().catch(done);

From 94f40a54b42d467d9588862e11b2be45eb8f232c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 15 Dec 2017 11:05:53 -0600
Subject: [PATCH 015/125] Add default value for onConversionSuccessful

---
 .../website/ts/components/eth_weth_conversion_button.tsx     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index bf686d44b5..b017de27b5 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -32,6 +32,7 @@ export class EthWethConversionButton extends
     React.Component<EthWethConversionButtonProps, EthWethConversionButtonState> {
     public static defaultProps: Partial<EthWethConversionButtonProps> = {
         isDisabled: false,
+        onConversionSuccessful: _.noop,
     };
     public constructor(props: EthWethConversionButtonProps) {
         super(props);
@@ -100,9 +101,7 @@ export class EthWethConversionButton extends
             if (!this.props.isOutdatedWrappedEther) {
                 this.props.dispatcher.replaceTokenBalanceByAddress(token.address, balance);
             }
-            if (!_.isUndefined(this.props.onConversionSuccessful)) {
-                this.props.onConversionSuccessful();
-            }
+            this.props.onConversionSuccessful();
         } catch (err) {
             const errMsg = '' + err;
             if (_.includes(errMsg, BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES)) {

From 484dd4c33aa5786def1f0b159f5b51f99a585aa8 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 15 Dec 2017 11:06:18 -0600
Subject: [PATCH 016/125] Update name to be a call to action

---
 packages/website/ts/components/portal_menu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/ts/components/portal_menu.tsx b/packages/website/ts/components/portal_menu.tsx
index e00fbd40ce..db8e3a9f17 100644
--- a/packages/website/ts/components/portal_menu.tsx
+++ b/packages/website/ts/components/portal_menu.tsx
@@ -56,7 +56,7 @@ export class PortalMenu extends React.Component<PortalMenuProps, PortalMenuState
                     to={`${WebsitePaths.Portal}/weth`}
                     onClick={this.props.onClick.bind(this)}
                 >
-                    {this.renderMenuItemWithIcon('ETH wrapper', 'zmdi-circle-o')}
+                    {this.renderMenuItemWithIcon('Wrap ETH', 'zmdi-circle-o')}
                 </MenuItem>
             </div>
         );

From c8e52882ca556ea06696a56e312f69284f99aa29 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 15 Dec 2017 18:26:45 +0100
Subject: [PATCH 017/125] Fix redundant spaces

---
 .../remaining_fillable_calculator_test.ts     | 10 +++----
 .../test/utils/report_callback_errors.ts      |  2 +-
 packages/assert/test/assert_test.ts           | 30 +++++++++----------
 .../test/utils/report_callback_errors.ts      |  2 +-
 packages/tslint-config/package.json           |  7 +++--
 packages/tslint-config/tslint.json            |  4 ++-
 .../website/ts/components/token_balances.tsx  |  2 +-
 packages/website/ts/components/top_bar.tsx    |  2 +-
 yarn.lock                                     | 27 +++++++++++++++++
 9 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/packages/0x.js/test/remaining_fillable_calculator_test.ts b/packages/0x.js/test/remaining_fillable_calculator_test.ts
index 47ba13cd79..95ef0a4f1a 100644
--- a/packages/0x.js/test/remaining_fillable_calculator_test.ts
+++ b/packages/0x.js/test/remaining_fillable_calculator_test.ts
@@ -2,11 +2,11 @@ import BigNumber from 'bignumber.js';
 import * as chai from 'chai';
 import 'mocha';
 
-import { ZeroEx } from '../src/0x';
-import { RemainingFillableCalculator } from '../src/order_watcher/remaining_fillable_calculator';
-import { ECSignature, SignedOrder } from '../src/types';
+import {ZeroEx} from '../src/0x';
+import {RemainingFillableCalculator} from '../src/order_watcher/remaining_fillable_calculator';
+import {ECSignature, SignedOrder} from '../src/types';
 
-import { chaiSetup } from './utils/chai_setup';
+import {chaiSetup} from './utils/chai_setup';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -26,7 +26,7 @@ describe('RemainingFillableCalculator', () => {
     const decimals: number = 4;
     const zero: BigNumber = new BigNumber(0);
     const zeroAddress = '0x0';
-    const signature: ECSignature = { v: 27, r: '', s: ''};
+    const signature: ECSignature = {v: 27, r: '', s: ''};
     beforeEach(async () => {
         [makerAmount, takerAmount, makerFeeAmount] = [ZeroEx.toBaseUnitAmount(new BigNumber(50), decimals),
                                                       ZeroEx.toBaseUnitAmount(new BigNumber(5), decimals),
diff --git a/packages/0x.js/test/utils/report_callback_errors.ts b/packages/0x.js/test/utils/report_callback_errors.ts
index 8a8f4d966b..0aaef3f05b 100644
--- a/packages/0x.js/test/utils/report_callback_errors.ts
+++ b/packages/0x.js/test/utils/report_callback_errors.ts
@@ -1,4 +1,4 @@
-import { DoneCallback } from '../../src/types';
+import {DoneCallback} from '../../src/types';
 
 export const reportCallbackErrors = (done: DoneCallback) => {
     return (f: (...args: any[]) => void) => {
diff --git a/packages/assert/test/assert_test.ts b/packages/assert/test/assert_test.ts
index 5fa96e49a0..6a9efc7482 100644
--- a/packages/assert/test/assert_test.ts
+++ b/packages/assert/test/assert_test.ts
@@ -25,7 +25,7 @@ describe('Assertions', () => {
                 'test',
                 42,
                 false,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
             ];
             invalidInputs.forEach(input => expect(assert.isBigNumber.bind(assert, variableName, input)).to.throw());
@@ -43,7 +43,7 @@ describe('Assertions', () => {
                 'test',
                 42,
                 false,
-                { random: 'test' },
+                {random: 'test'},
             ];
             invalidInputs.forEach(input => expect(assert.isUndefined.bind(assert, input, variableName)).to.throw());
         });
@@ -60,7 +60,7 @@ describe('Assertions', () => {
             const invalidInputs = [
                 42,
                 false,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
             ];
@@ -79,7 +79,7 @@ describe('Assertions', () => {
             const invalidInputs = [
                 42,
                 false,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
             ];
@@ -98,7 +98,7 @@ describe('Assertions', () => {
             const invalidInputs = [
                 42,
                 false,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
                 '0x61a3ed31B43c8780e905a260a35faYfEc527be7516aa11c0256729b5b351bc33',
@@ -121,7 +121,7 @@ describe('Assertions', () => {
             const invalidInputs = [
                 42,
                 false,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
                 '0x6FFFd0ae3f7d88c9b4925323f54c6e4b2918c5fd',
@@ -150,7 +150,7 @@ describe('Assertions', () => {
             const invalidInputs = [
                 42,
                 false,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
             ];
@@ -192,7 +192,7 @@ describe('Assertions', () => {
         it('should throw for invalid input', () => {
             const invalidInputs = [
                 false,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
             ];
@@ -210,7 +210,7 @@ describe('Assertions', () => {
         it('should throw for invalid input', () => {
             const invalidInputs = [
                 42,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
             ];
@@ -220,8 +220,8 @@ describe('Assertions', () => {
     describe('#isWeb3Provider', () => {
         it('should not throw for valid input', () => {
             const validInputs = [
-                { send: () => 45 },
-                { sendAsync: () => 45 },
+                {send: () => 45},
+                {sendAsync: () => 45},
             ];
             validInputs.forEach(input =>
                 expect(assert.isWeb3Provider.bind(assert, variableName, input)).to.not.throw(),
@@ -230,7 +230,7 @@ describe('Assertions', () => {
         it('should throw for invalid input', () => {
             const invalidInputs = [
                 42,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
             ];
@@ -253,7 +253,7 @@ describe('Assertions', () => {
         it('should throw for invalid input', () => {
             const invalidInputs = [
                 42,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
             ];
@@ -277,7 +277,7 @@ describe('Assertions', () => {
         it('should throw for invalid input', () => {
             const invalidInputs = [
                 42,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
                 'ws://www.api.example-relayer.net',
@@ -309,7 +309,7 @@ describe('Assertions', () => {
         it('should throw for invalid input', () => {
             const invalidInputs = [
                 42,
-                { random: 'test' },
+                {random: 'test'},
                 undefined,
                 new BigNumber(45),
                 'www.google.com',
diff --git a/packages/subproviders/test/utils/report_callback_errors.ts b/packages/subproviders/test/utils/report_callback_errors.ts
index 8a8f4d966b..0aaef3f05b 100644
--- a/packages/subproviders/test/utils/report_callback_errors.ts
+++ b/packages/subproviders/test/utils/report_callback_errors.ts
@@ -1,4 +1,4 @@
-import { DoneCallback } from '../../src/types';
+import {DoneCallback} from '../../src/types';
 
 export const reportCallbackErrors = (done: DoneCallback) => {
     return (f: (...args: any[]) => void) => {
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 3b320e774e..888ff675a8 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -4,9 +4,9 @@
   "description": "Lint rules related to 0xProject for TSLint",
   "main": "tslint.json",
   "scripts": {
-      "build": "tsc",
-      "clean": "shx rm -rf lib",
-      "lint": "tslint --project . 'rules/**/*.ts'"
+    "build": "tsc",
+    "clean": "shx rm -rf lib",
+    "lint": "tslint --project . 'rules/**/*.ts'"
   },
   "files": [
     "tslint.js",
@@ -37,6 +37,7 @@
     "@types/lodash": "^4.14.86",
     "shx": "^0.2.2",
     "tslint": "5.8.0",
+    "tslint-eslint-rules": "^4.1.1",
     "typescript": "~2.6.1"
   },
   "dependencies": {
diff --git a/packages/tslint-config/tslint.json b/packages/tslint-config/tslint.json
index 91185bddbb..acb6876c34 100644
--- a/packages/tslint-config/tslint.json
+++ b/packages/tslint-config/tslint.json
@@ -1,7 +1,8 @@
 {
   "extends": [
     "tslint:latest",
-    "tslint-react"
+    "tslint-react",
+    "tslint-eslint-rules"
   ],
   "rules": {
     "adjacent-overload-signatures": true,
@@ -54,6 +55,7 @@
     "no-unused-variable": [true, {"ignore-pattern": "^_\\d*"}],
     "no-implicit-dependencies": [true, "dev"],
     "number-literal-format": true,
+    "object-curly-spacing": [true, "never"],
     "object-literal-sort-keys": false,
     "ordered-imports": [
         true,
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 4781145167..b68081c37d 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -576,7 +576,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
     private renderDharmaLoanFrame() {
         if (utils.isUserOnMobile()) {
             return (
-                <h4 style={{ textAlign: 'center' }}>
+                <h4 style={{textAlign: 'center'}}>
                     We apologize -- Dharma loan requests are not available on
                     mobile yet.  Please try again through your desktop browser.
                 </h4>
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index 488eef9141..27de496208 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -124,7 +124,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                 className="text-decoration-none"
                 href={constants.GITHUB_URL}
             >
-                <MenuItem style={{ fontSize: styles.menuItem.fontSize }} primaryText="GitHub" />
+                <MenuItem style={{fontSize: styles.menuItem.fontSize}} primaryText="GitHub" />
             </a>,
             <a
                 key="subMenuItem-whitePaper"
diff --git a/yarn.lock b/yarn.lock
index 5c084bacef..2a7e12949e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2753,6 +2753,13 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
+doctrine@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
+  dependencies:
+    esutils "^1.1.6"
+    isarray "0.0.1"
+
 dom-helpers@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
@@ -3017,6 +3024,10 @@ estraverse@^4.1.0, estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
+esutils@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -8908,6 +8919,10 @@ truffle@^4.0.1:
     original-require "^1.0.1"
     solc "0.4.18"
 
+tslib@^1.0.0:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac"
+
 tslib@^1.7.1:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.0.tgz#dc604ebad64bcbf696d613da6c954aa0e7ea1eb6"
@@ -8918,6 +8933,14 @@ tslint-config-0xproject@^0.0.2:
   dependencies:
     tslint-react "^3.0.0"
 
+tslint-eslint-rules@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba"
+  dependencies:
+    doctrine "^0.7.2"
+    tslib "^1.0.0"
+    tsutils "^1.4.0"
+
 tslint-react@^3.0.0, tslint-react@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.2.0.tgz#851fb505201c63d0343c51726e6364f7e9ad2e99"
@@ -8940,6 +8963,10 @@ tslint@5.8.0:
     tslib "^1.7.1"
     tsutils "^2.12.1"
 
+tsutils@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
+
 tsutils@^2.12.1, tsutils@^2.8.0:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.2.tgz#ad58a4865d17ec3ddb6631b6ca53be14a5656ff3"

From 13279f1f20cb0eeb95c09781bba4280b31ffd210 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 15 Dec 2017 12:47:16 -0600
Subject: [PATCH 018/125] Fix linter errors

---
 packages/website/ts/components/eth_wrappers.tsx   | 7 -------
 packages/website/ts/components/token_balances.tsx | 5 -----
 packages/website/ts/utils/configs.ts              | 1 -
 3 files changed, 13 deletions(-)

diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index ccbed41882..58b73b11cf 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -2,8 +2,6 @@ import {ZeroEx} from '0x.js';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Divider from 'material-ui/Divider';
-import Paper from 'material-ui/Paper';
-import RaisedButton from 'material-ui/RaisedButton';
 import {colors} from 'material-ui/styles';
 import {
     Table,
@@ -17,8 +15,6 @@ import * as moment from 'moment';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
 import {EthWethConversionButton} from 'ts/components/eth_weth_conversion_button';
-import {LifeCycleRaisedButton} from 'ts/components/ui/lifecycle_raised_button';
-import {trackedTokenStorage} from 'ts/local_storage/tracked_token_storage';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {
     OutdatedWrappedEtherByNetworkId,
@@ -30,8 +26,6 @@ import {
 } from 'ts/types';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
-import {errorReporter} from 'ts/utils/error_reporter';
-import {utils} from 'ts/utils/utils';
 
 const PRECISION = 5;
 const DATE_FORMAT = 'D/M/YY';
@@ -39,7 +33,6 @@ const LIGHT_GRAY = '#A5A5A5';
 const ICON_DIMENSION = 40;
 const ETHER_ICON_PATH = '/images/ether.png';
 const OUTDATED_WETH_ICON_PATH = '/images/wrapped_eth_gray.png';
-const ETHER_TOKEN_SYMBOL = 'WETH';
 
 interface OutdatedWETHAddressToIsStateLoaded {
     [address: string]: boolean;
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index ab232326a9..db4a35062c 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -655,11 +655,6 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
             isDharmaDialogVisible: !this.state.isDharmaDialogVisible,
         });
     }
-    private getWrappedEthToken() {
-        const tokens = _.values(this.props.tokenByAddress);
-        const wrappedEthToken = _.find(tokens, {symbol: ETHER_TOKEN_SYMBOL});
-        return wrappedEthToken;
-    }
     private onAddTokenClicked() {
         this.setState({
             isTokenPickerOpen: true,
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index adc51374f3..4a08929cf7 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -2,7 +2,6 @@ import * as _ from 'lodash';
 import {
     Environments,
     OutdatedWrappedEtherByNetworkId,
-    TimestampMsRange,
 } from 'ts/types';
 
 const BASE_URL = window.location.origin;

From a71a1edf2c7d4acdf62836e19103c2867eb1e105 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 15 Dec 2017 13:01:45 -0600
Subject: [PATCH 019/125] Two mysteriously missing imports

---
 packages/website/ts/components/order_json.tsx          | 1 +
 packages/website/ts/containers/generate_order_form.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/website/ts/components/order_json.tsx b/packages/website/ts/components/order_json.tsx
index c499ee9c2e..83f25fd5ac 100644
--- a/packages/website/ts/components/order_json.tsx
+++ b/packages/website/ts/components/order_json.tsx
@@ -1,5 +1,6 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
+import {Paper} from 'material-ui/Paper';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {CopyIcon} from 'ts/components/ui/copy_icon';
diff --git a/packages/website/ts/containers/generate_order_form.tsx b/packages/website/ts/containers/generate_order_form.tsx
index 134c84859c..a47895d942 100644
--- a/packages/website/ts/containers/generate_order_form.tsx
+++ b/packages/website/ts/containers/generate_order_form.tsx
@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import * as React from 'react';
 import {connect} from 'react-redux';

From fe8f2d87c79cb25a7879c2e737dbdd64b7c40f60 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 15 Dec 2017 14:07:14 -0600
Subject: [PATCH 020/125] Temporary hack to alleviate issues with updating
 tokenRegistry with new WETH address

---
 packages/website/ts/blockchain.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 331bafa717..6877a301a8 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -592,9 +592,22 @@ export class Blockchain {
             // HACK: For now we have a hard-coded list of iconUrls for the dummyTokens
             // TODO: Refactor this out and pull the iconUrl directly from the TokenRegistry
             const iconUrl = constants.iconUrlBySymbol[t.symbol];
+            // HACK: Temporarily we hijack the WETH addresses fetched from the tokenRegistry
+            // so that we can take our time with actually updating it. This ensures that when
+            // we deploy the new WETH page, everyone will re-fill their trackedTokens with the
+            // new canonical WETH.
+            // TODO: Remove this hack once we've updated the TokenRegistries
+            let address = t.address;
+            if (t.symbol === 'WETH') {
+                if (this.networkId === 1) {
+                    address = '0xe495bcacaf29a0eb00fb67b86e9cd2a994dd55d8';
+                } else if (this.networkId === 42) {
+                    address = '0x739e78d6bebbdf24105a5145fa04436589d1cbd9';
+                }
+            }
             const token: Token = {
                 iconUrl,
-                address: t.address,
+                address,
                 name: t.name,
                 symbol: t.symbol,
                 decimals: t.decimals,

From 4a73c05435a653565a92aedfbf56d45997f0673f Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 00:19:15 -0600
Subject: [PATCH 021/125] Fix documentation issue where `unsubscribeAll` shown
 as method on every contractWrapper instance even though it's only used by
 Exchange and Token wrappers.

---
 packages/0x.js/src/contract_wrappers/contract_wrapper.ts | 5 +----
 packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | 6 ++++++
 packages/0x.js/src/contract_wrappers/token_wrapper.ts    | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
index a796dc1ec6..46916ebf47 100644
--- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
@@ -50,10 +50,7 @@ export class ContractWrapper {
         this._onLogAddedSubscriptionToken = undefined;
         this._onLogRemovedSubscriptionToken = undefined;
     }
-    /**
-     * Cancels all existing subscriptions
-     */
-    public unsubscribeAll(): void {
+    protected unsubscribeAll(): void {
         const filterTokens = _.keys(this._filterCallbacks);
         _.each(filterTokens, filterToken => {
             this._unsubscribe(filterToken);
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index 9bed400799..3ca5695c44 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -607,6 +607,12 @@ export class ExchangeWrapper extends ContractWrapper {
     public unsubscribe(subscriptionToken: string): void {
         this._unsubscribe(subscriptionToken);
     }
+    /**
+     * Cancels all existing subscriptions
+     */
+    public unsubscribeAll(): void {
+        super.unsubscribeAll();
+    }
     /**
      * Gets historical logs without creating a subscription
      * @param   eventName           The exchange contract event you would like to subscribe to.
diff --git a/packages/0x.js/src/contract_wrappers/token_wrapper.ts b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
index d1553fa7b1..eccb748713 100644
--- a/packages/0x.js/src/contract_wrappers/token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
@@ -281,6 +281,12 @@ export class TokenWrapper extends ContractWrapper {
     public unsubscribe(subscriptionToken: string): void {
         this._unsubscribe(subscriptionToken);
     }
+    /**
+     * Cancels all existing subscriptions
+     */
+    public unsubscribeAll(): void {
+        super.unsubscribeAll();
+    }
     /**
      * Gets historical logs without creating a subscription
      * @param   tokenAddress        An address of the token that emmited the logs.

From 1f748afed96ed40d1ee61b970e8c6fe2a75fa382 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 00:32:53 -0600
Subject: [PATCH 022/125] Modify the etherToken wrapper methods to accept an
 etherTokenAddress as the first arg. Since it is becoming apparent we will be
 updating the canonical WETH contract, we want users of 0x.js to be able to
 interact with n number of etherTokens without re-instantiating for each one.

---
 packages/0x.js/src/0x.ts                      |  2 +-
 .../contract_wrappers/ether_token_wrapper.ts  | 41 ++++++-------------
 .../src/schemas/zero_ex_config_schema.ts      |  1 -
 packages/0x.js/src/types.ts                   |  2 -
 packages/0x.js/test/0x.js_test.ts             |  8 ----
 .../0x.js/test/ether_token_wrapper_test.ts    | 13 +++---
 6 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 5a2d6cb059..41fefb9934 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -199,7 +199,7 @@ export class ZeroEx {
             this._web3Wrapper, config.networkId, config.tokenRegistryContractAddress,
         );
         this.etherToken = new EtherTokenWrapper(
-            this._web3Wrapper, config.networkId, this.token, config.etherTokenContractAddress,
+            this._web3Wrapper, config.networkId, this.token,
         );
         this.orderStateWatcher = new OrderStateWatcher(
             this._web3Wrapper, this._abiDecoder, this.token, this.exchange, config.orderWatcherConfig,
diff --git a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
index 896cfde3d7..a6acbe45d8 100644
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -17,24 +17,22 @@ import {TokenWrapper} from './token_wrapper';
 export class EtherTokenWrapper extends ContractWrapper {
     private _etherTokenContractIfExists?: EtherTokenContract;
     private _tokenWrapper: TokenWrapper;
-    private _contractAddressIfExists?: string;
-    constructor(web3Wrapper: Web3Wrapper, networkId: number, tokenWrapper: TokenWrapper,
-                contractAddressIfExists?: string) {
+    constructor(web3Wrapper: Web3Wrapper, networkId: number, tokenWrapper: TokenWrapper) {
         super(web3Wrapper, networkId);
         this._tokenWrapper = tokenWrapper;
-        this._contractAddressIfExists = contractAddressIfExists;
     }
     /**
      * Deposit ETH into the Wrapped ETH smart contract and issues the equivalent number of wrapped ETH tokens
      * to the depositor address. These wrapped ETH tokens can be used in 0x trades and are redeemable for 1-to-1
      * for ETH.
-     * @param   amountInWei      Amount of ETH in Wei the caller wishes to deposit.
-     * @param   depositor        The hex encoded user Ethereum address that would like to make the deposit.
-     * @param   txOpts           Transaction parameters.
+     * @param   etherTokenAddress   EtherToken address you wish to deposit into.
+     * @param   amountInWei         Amount of ETH in Wei the caller wishes to deposit.
+     * @param   depositor           The hex encoded user Ethereum address that would like to make the deposit.
+     * @param   txOpts              Transaction parameters.
      * @return Transaction hash.
      */
     public async depositAsync(
-        amountInWei: BigNumber, depositor: string, txOpts: TransactionOpts = {},
+        etherTokenAddress: string, amountInWei: BigNumber, depositor: string, txOpts: TransactionOpts = {},
     ): Promise<string> {
         assert.isValidBaseUnitAmount('amountInWei', amountInWei);
         await assert.isSenderAddressAsync('depositor', depositor, this._web3Wrapper);
@@ -42,7 +40,7 @@ export class EtherTokenWrapper extends ContractWrapper {
         const ethBalanceInWei = await this._web3Wrapper.getBalanceInWeiAsync(depositor);
         assert.assert(ethBalanceInWei.gte(amountInWei), ZeroExError.InsufficientEthBalanceForDeposit);
 
-        const wethContract = await this._getEtherTokenContractAsync();
+        const wethContract = await this._getEtherTokenContractAsync(etherTokenAddress);
         const txHash = await wethContract.deposit.sendTransactionAsync({
             from: depositor,
             value: amountInWei,
@@ -54,22 +52,22 @@ export class EtherTokenWrapper extends ContractWrapper {
     /**
      * Withdraw ETH to the withdrawer's address from the wrapped ETH smart contract in exchange for the
      * equivalent number of wrapped ETH tokens.
+     * @param   etherTokenAddress   EtherToken address you wish to withdraw from.
      * @param   amountInWei  Amount of ETH in Wei the caller wishes to withdraw.
      * @param   withdrawer   The hex encoded user Ethereum address that would like to make the withdrawl.
      * @param   txOpts       Transaction parameters.
      * @return Transaction hash.
      */
     public async withdrawAsync(
-        amountInWei: BigNumber, withdrawer: string, txOpts: TransactionOpts = {},
+        etherTokenAddress: string, amountInWei: BigNumber, withdrawer: string, txOpts: TransactionOpts = {},
     ): Promise<string> {
         assert.isValidBaseUnitAmount('amountInWei', amountInWei);
         await assert.isSenderAddressAsync('withdrawer', withdrawer, this._web3Wrapper);
 
-        const wethContractAddress = this.getContractAddress();
-        const WETHBalanceInBaseUnits = await this._tokenWrapper.getBalanceAsync(wethContractAddress, withdrawer);
+        const WETHBalanceInBaseUnits = await this._tokenWrapper.getBalanceAsync(etherTokenAddress, withdrawer);
         assert.assert(WETHBalanceInBaseUnits.gte(amountInWei), ZeroExError.InsufficientWEthBalanceForWithdrawal);
 
-        const wethContract = await this._getEtherTokenContractAsync();
+        const wethContract = await this._getEtherTokenContractAsync(etherTokenAddress);
         const txHash = await wethContract.withdraw.sendTransactionAsync(amountInWei, {
             from: withdrawer,
             gas: txOpts.gasLimit,
@@ -77,25 +75,12 @@ export class EtherTokenWrapper extends ContractWrapper {
         });
         return txHash;
     }
-    /**
-     * Retrieves the Wrapped Ether token contract address
-     * @return  The Wrapped Ether token contract address
-     */
-    public getContractAddress(): string {
-        const contractAddress = this._getContractAddress(
-            artifacts.EtherTokenArtifact, this._contractAddressIfExists,
-        );
-        return contractAddress;
-    }
     private _invalidateContractInstance(): void {
         delete this._etherTokenContractIfExists;
     }
-    private async _getEtherTokenContractAsync(): Promise<EtherTokenContract> {
-        if (!_.isUndefined(this._etherTokenContractIfExists)) {
-            return this._etherTokenContractIfExists;
-        }
+    private async _getEtherTokenContractAsync(etherTokenAddress: string): Promise<EtherTokenContract> {
         const web3ContractInstance = await this._instantiateContractIfExistsAsync(
-            artifacts.EtherTokenArtifact, this._contractAddressIfExists,
+            artifacts.EtherTokenArtifact, etherTokenAddress,
         );
         const contractInstance = new EtherTokenContract(web3ContractInstance, this._web3Wrapper.getContractDefaults());
         this._etherTokenContractIfExists = contractInstance;
diff --git a/packages/0x.js/src/schemas/zero_ex_config_schema.ts b/packages/0x.js/src/schemas/zero_ex_config_schema.ts
index 121d812574..e0d985749f 100644
--- a/packages/0x.js/src/schemas/zero_ex_config_schema.ts
+++ b/packages/0x.js/src/schemas/zero_ex_config_schema.ts
@@ -8,7 +8,6 @@ export const zeroExConfigSchema = {
         gasPrice: {$ref: '/Number'},
         exchangeContractAddress: {$ref: '/Address'},
         tokenRegistryContractAddress: {$ref: '/Address'},
-        etherTokenContractAddress: {$ref: '/Address'},
         orderWatcherConfig: {
             type: 'object',
             properties: {
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index f33e05bb8b..fb3cfa6dff 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -268,7 +268,6 @@ export interface OrderStateWatcherConfig {
  * gasPrice: Gas price to use with every transaction
  * exchangeContractAddress: The address of an exchange contract to use
  * tokenRegistryContractAddress: The address of a token registry contract to use
- * etherTokenContractAddress: The address of an ether token contract to use
  * tokenTransferProxyContractAddress: The address of the token transfer proxy contract to use
  * orderWatcherConfig: All the configs related to the orderWatcher
  */
@@ -277,7 +276,6 @@ export interface ZeroExConfig {
     gasPrice?: BigNumber;
     exchangeContractAddress?: string;
     tokenRegistryContractAddress?: string;
-    etherTokenContractAddress?: string;
     tokenTransferProxyContractAddress?: string;
     orderWatcherConfig?: OrderStateWatcherConfig;
 }
diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts
index e1ceb12c85..c5aa1926f4 100644
--- a/packages/0x.js/test/0x.js_test.ts
+++ b/packages/0x.js/test/0x.js_test.ts
@@ -244,14 +244,6 @@ describe('ZeroEx library', () => {
             const zeroExWithWrongExchangeAddress = new ZeroEx(web3.currentProvider, zeroExConfig);
             expect(zeroExWithWrongExchangeAddress.exchange.getContractAddress()).to.be.equal(ZeroEx.NULL_ADDRESS);
         });
-        it('allows to specify ether token contract address', async () => {
-            const zeroExConfig = {
-                etherTokenContractAddress: ZeroEx.NULL_ADDRESS,
-                networkId: constants.TESTRPC_NETWORK_ID,
-            };
-            const zeroExWithWrongEtherTokenAddress = new ZeroEx(web3.currentProvider, zeroExConfig);
-            expect(zeroExWithWrongEtherTokenAddress.etherToken.getContractAddress()).to.be.equal(ZeroEx.NULL_ADDRESS);
-        });
         it('allows to specify token registry token contract address', async () => {
             const zeroExConfig = {
                 tokenRegistryContractAddress: ZeroEx.NULL_ADDRESS,
diff --git a/packages/0x.js/test/ether_token_wrapper_test.ts b/packages/0x.js/test/ether_token_wrapper_test.ts
index e0d738f840..b5ed193082 100644
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -5,6 +5,7 @@ import 'mocha';
 import * as Web3 from 'web3';
 
 import {ZeroEx, ZeroExError} from '../src';
+import {artifacts} from '../src/artifacts';
 
 import {chaiSetup} from './utils/chai_setup';
 import {constants} from './utils/constants';
@@ -38,7 +39,7 @@ describe('EtherTokenWrapper', () => {
         zeroEx = new ZeroEx(web3.currentProvider, zeroExConfig);
         userAddresses = await zeroEx.getAvailableAddressesAsync();
         addressWithETH = userAddresses[0];
-        wethContractAddress = zeroEx.etherToken.getContractAddress();
+        wethContractAddress = (zeroEx.etherToken as any)._getContractAddress(artifacts.EtherTokenArtifact);
         depositWeiAmount = (zeroEx as any)._web3Wrapper.toWei(new BigNumber(5));
         decimalPlaces = 7;
     });
@@ -55,7 +56,7 @@ describe('EtherTokenWrapper', () => {
             expect(preETHBalance).to.be.bignumber.gt(0);
             expect(preWETHBalance).to.be.bignumber.equal(0);
 
-            const txHash = await zeroEx.etherToken.depositAsync(depositWeiAmount, addressWithETH);
+            const txHash = await zeroEx.etherToken.depositAsync(wethContractAddress, depositWeiAmount, addressWithETH);
             await zeroEx.awaitTransactionMinedAsync(txHash);
 
             const postETHBalanceInWei = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH);
@@ -73,7 +74,7 @@ describe('EtherTokenWrapper', () => {
             const overETHBalanceinWei = preETHBalance.add(extraETHBalance);
 
             return expect(
-                zeroEx.etherToken.depositAsync(overETHBalanceinWei, addressWithETH),
+                zeroEx.etherToken.depositAsync(wethContractAddress, overETHBalanceinWei, addressWithETH),
             ).to.be.rejectedWith(ZeroExError.InsufficientEthBalanceForDeposit);
         });
     });
@@ -81,7 +82,7 @@ describe('EtherTokenWrapper', () => {
         it('should successfully withdraw ETH in return for Wrapped ETH tokens', async () => {
             const ETHBalanceInWei = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH);
 
-            await zeroEx.etherToken.depositAsync(depositWeiAmount, addressWithETH);
+            await zeroEx.etherToken.depositAsync(wethContractAddress, depositWeiAmount, addressWithETH);
 
             const expectedPreETHBalance = ETHBalanceInWei.minus(depositWeiAmount);
             const preETHBalance = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH);
@@ -90,7 +91,7 @@ describe('EtherTokenWrapper', () => {
             expect(gasCost).to.be.bignumber.lte(MAX_REASONABLE_GAS_COST_IN_WEI);
             expect(preWETHBalance).to.be.bignumber.equal(depositWeiAmount);
 
-            const txHash = await zeroEx.etherToken.withdrawAsync(depositWeiAmount, addressWithETH);
+            const txHash = await zeroEx.etherToken.withdrawAsync(wethContractAddress, depositWeiAmount, addressWithETH);
             await zeroEx.awaitTransactionMinedAsync(txHash);
 
             const postETHBalance = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH);
@@ -108,7 +109,7 @@ describe('EtherTokenWrapper', () => {
             const overWETHBalance = preWETHBalance.add(999999999);
 
             return expect(
-                zeroEx.etherToken.withdrawAsync(overWETHBalance, addressWithETH),
+                zeroEx.etherToken.withdrawAsync(wethContractAddress, overWETHBalance, addressWithETH),
             ).to.be.rejectedWith(ZeroExError.InsufficientWEthBalanceForWithdrawal);
         });
     });

From ac78c64f9ec0c1894dce051154a675428c5540e0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 00:40:19 -0600
Subject: [PATCH 023/125] Fix tests in contracts

---
 packages/contracts/test/ts/ether_token.ts    |  9 ++++-----
 packages/contracts/test/ts/ether_token_v2.ts | 15 +++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/contracts/test/ts/ether_token.ts b/packages/contracts/test/ts/ether_token.ts
index 2f9df59a41..99630583fb 100644
--- a/packages/contracts/test/ts/ether_token.ts
+++ b/packages/contracts/test/ts/ether_token.ts
@@ -28,7 +28,6 @@ contract('EtherToken', (accounts: string[]) => {
         etherTokenAddress = EtherToken.address;
         zeroEx = new ZeroEx(web3.currentProvider, {
             gasPrice,
-            etherTokenContractAddress: etherTokenAddress,
             networkId: constants.TESTRPC_NETWORK_ID,
         });
     });
@@ -45,7 +44,7 @@ contract('EtherToken', (accounts: string[]) => {
             const initEthBalance = await getEthBalanceAsync(account);
             const ethToDeposit = initEthBalance.plus(1);
 
-            return expect(zeroEx.etherToken.depositAsync(ethToDeposit, account))
+            return expect(zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account))
                 .to.be.rejectedWith(ZeroExError.InsufficientEthBalanceForDeposit);
         });
 
@@ -55,7 +54,7 @@ contract('EtherToken', (accounts: string[]) => {
 
             const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
 
-            const txHash = await zeroEx.etherToken.depositAsync(ethToDeposit, account);
+            const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
             const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
 
             const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
@@ -72,7 +71,7 @@ contract('EtherToken', (accounts: string[]) => {
             const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
             const ethTokensToWithdraw = initEthTokenBalance.plus(1);
 
-            return expect(zeroEx.etherToken.withdrawAsync(ethTokensToWithdraw, account))
+            return expect(zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account))
                 .to.be.rejectedWith(ZeroExError.InsufficientWEthBalanceForWithdrawal);
         });
 
@@ -81,7 +80,7 @@ contract('EtherToken', (accounts: string[]) => {
             const initEthBalance = await getEthBalanceAsync(account);
             const ethTokensToWithdraw = initEthTokenBalance;
             expect(ethTokensToWithdraw).to.not.be.bignumber.equal(0);
-            const txHash = await zeroEx.etherToken.withdrawAsync(ethTokensToWithdraw, account, {
+            const txHash = await zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account, {
                 gasLimit: constants.MAX_ETHERTOKEN_WITHDRAW_GAS,
             });
             const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
diff --git a/packages/contracts/test/ts/ether_token_v2.ts b/packages/contracts/test/ts/ether_token_v2.ts
index 61ac4cb578..480c4035bc 100644
--- a/packages/contracts/test/ts/ether_token_v2.ts
+++ b/packages/contracts/test/ts/ether_token_v2.ts
@@ -28,7 +28,6 @@ contract('EtherTokenV2', (accounts: string[]) => {
         etherTokenAddress = etherToken.address;
         zeroEx = new ZeroEx(web3.currentProvider, {
             gasPrice,
-            etherTokenContractAddress: etherTokenAddress,
             networkId: constants.TESTRPC_NETWORK_ID,
         });
     });
@@ -45,7 +44,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
             const initEthBalance = await getEthBalanceAsync(account);
             const ethToDeposit = initEthBalance.plus(1);
 
-            return expect(zeroEx.etherToken.depositAsync(ethToDeposit, account))
+            return expect(zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account))
                 .to.be.rejectedWith(ZeroExError.InsufficientEthBalanceForDeposit);
         });
 
@@ -55,7 +54,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
 
             const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
 
-            const txHash = await zeroEx.etherToken.depositAsync(ethToDeposit, account);
+            const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
             const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
 
             const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
@@ -69,7 +68,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
         it('should log 1 event with correct arguments', async () => {
             const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
 
-            const txHash = await zeroEx.etherToken.depositAsync(ethToDeposit, account);
+            const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
             const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
 
             const logs = receipt.logs;
@@ -88,14 +87,14 @@ contract('EtherTokenV2', (accounts: string[]) => {
     describe('withdraw', () => {
         beforeEach(async () => {
             const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
-            await zeroEx.etherToken.depositAsync(ethToDeposit, account);
+            await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
         });
 
         it('should throw if caller attempts to withdraw greater than caller balance', async () => {
             const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
             const ethTokensToWithdraw = initEthTokenBalance.plus(1);
 
-            return expect(zeroEx.etherToken.withdrawAsync(ethTokensToWithdraw, account))
+            return expect(zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account))
                 .to.be.rejectedWith(ZeroExError.InsufficientWEthBalanceForWithdrawal);
         });
 
@@ -104,7 +103,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
             const initEthBalance = await getEthBalanceAsync(account);
             const ethTokensToWithdraw = initEthTokenBalance;
             expect(ethTokensToWithdraw).to.not.be.bignumber.equal(0);
-            const txHash = await zeroEx.etherToken.withdrawAsync(ethTokensToWithdraw, account, {
+            const txHash = await zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account, {
                 gasLimit: constants.MAX_ETHERTOKEN_WITHDRAW_GAS,
             });
             const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
@@ -122,7 +121,7 @@ contract('EtherTokenV2', (accounts: string[]) => {
             const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
             const ethTokensToWithdraw = initEthTokenBalance;
             expect(ethTokensToWithdraw).to.not.be.bignumber.equal(0);
-            const txHash = await zeroEx.etherToken.withdrawAsync(ethTokensToWithdraw, account, {
+            const txHash = await zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account, {
                 gasLimit: constants.MAX_ETHERTOKEN_WITHDRAW_GAS,
             });
             const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);

From 5664333490474d1d9a793e887864f125869bf6fa Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 00:44:34 -0600
Subject: [PATCH 024/125] Since sending the error report could take some time,
 we first trigger `onError` so that the user gets notified immediately

---
 packages/website/ts/components/send_button.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/ts/components/send_button.tsx b/packages/website/ts/components/send_button.tsx
index b3fd2aebae..d8d3c7f56d 100644
--- a/packages/website/ts/components/send_button.tsx
+++ b/packages/website/ts/components/send_button.tsx
@@ -76,8 +76,8 @@ export class SendButton extends React.Component<SendButtonProps, SendButtonState
             } else if (!_.includes(errMsg, 'User denied transaction')) {
                 utils.consoleLog(`Unexpected error encountered: ${err}`);
                 utils.consoleLog(err.stack);
-                await errorReporter.reportAsync(err);
                 this.props.onError();
+                await errorReporter.reportAsync(err);
             }
         }
         this.setState({

From 054c00e3232b03fe6298b1d6fd203ea5a55b1607 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 01:07:28 -0600
Subject: [PATCH 025/125] Add entry to CHANGELOG

---
 packages/0x.js/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 963b3d56ca..0ef433fe99 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+v0.28.0 - _TBD_
+------------------------
+* Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `EtherToken` wrapper. (#267)
+
 v0.27.1 - _November 28, 2017_
 ------------------------
     * Export `TransactionOpts` type

From 51af6de6249ac8d7656052f2a7198ae4341061b6 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 12:36:50 -0600
Subject: [PATCH 026/125] Update to passing etherTokenAddress into withdraw and
 deposit calls

---
 packages/website/ts/blockchain.ts                         | 8 ++++----
 .../website/ts/components/eth_weth_conversion_button.tsx  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 6877a301a8..a42b19cffe 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -388,18 +388,18 @@ export class Blockchain {
         const balance = await this.web3Wrapper.getBalanceInEthAsync(owner);
         return balance;
     }
-    public async convertEthToWrappedEthTokensAsync(amount: BigNumber): Promise<void> {
+    public async convertEthToWrappedEthTokensAsync(etherTokenAddress: string, amount: BigNumber): Promise<void> {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
         utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
 
-        const txHash = await this.zeroEx.etherToken.depositAsync(amount, this.userAddress);
+        const txHash = await this.zeroEx.etherToken.depositAsync(etherTokenAddress, amount, this.userAddress);
         await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
     }
-    public async convertWrappedEthTokensToEthAsync(amount: BigNumber): Promise<void> {
+    public async convertWrappedEthTokensToEthAsync(etherTokenAddress: string, amount: BigNumber): Promise<void> {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
         utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
 
-        const txHash = await this.zeroEx.etherToken.withdrawAsync(amount, this.userAddress);
+        const txHash = await this.zeroEx.etherToken.withdrawAsync(etherTokenAddress, amount, this.userAddress);
         await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
     }
     public async doesContractExistAtAddressAsync(address: string) {
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index b017de27b5..c8a279de97 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -88,12 +88,12 @@ export class EthWethConversionButton extends
         let balance = tokenState.balance;
         try {
             if (direction === Side.deposit) {
-                await this.props.blockchain.convertEthToWrappedEthTokensAsync(value);
+                await this.props.blockchain.convertEthToWrappedEthTokensAsync(token.address, value);
                 const ethAmount = ZeroEx.toUnitAmount(value, constants.ETH_DECIMAL_PLACES);
                 this.props.dispatcher.showFlashMessage(`Successfully wrapped ${ethAmount.toString()} ETH to WETH`);
                 balance = balance.plus(value);
             } else {
-                await this.props.blockchain.convertWrappedEthTokensToEthAsync(value);
+                await this.props.blockchain.convertWrappedEthTokensToEthAsync(token.address, value);
                 const tokenAmount = ZeroEx.toUnitAmount(value, token.decimals);
                 this.props.dispatcher.showFlashMessage(`Successfully unwrapped ${tokenAmount.toString()} WETH to ETH`);
                 balance = balance.minus(value);

From b640e2cc4990e83511e1f796a06cdc890ceec396 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 12:40:04 -0600
Subject: [PATCH 027/125] Update website calls to deposit/withdraw

---
 packages/website/ts/blockchain.ts                         | 8 ++++----
 .../website/ts/components/eth_weth_conversion_button.tsx  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 6877a301a8..a42b19cffe 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -388,18 +388,18 @@ export class Blockchain {
         const balance = await this.web3Wrapper.getBalanceInEthAsync(owner);
         return balance;
     }
-    public async convertEthToWrappedEthTokensAsync(amount: BigNumber): Promise<void> {
+    public async convertEthToWrappedEthTokensAsync(etherTokenAddress: string, amount: BigNumber): Promise<void> {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
         utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
 
-        const txHash = await this.zeroEx.etherToken.depositAsync(amount, this.userAddress);
+        const txHash = await this.zeroEx.etherToken.depositAsync(etherTokenAddress, amount, this.userAddress);
         await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
     }
-    public async convertWrappedEthTokensToEthAsync(amount: BigNumber): Promise<void> {
+    public async convertWrappedEthTokensToEthAsync(etherTokenAddress: string, amount: BigNumber): Promise<void> {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
         utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
 
-        const txHash = await this.zeroEx.etherToken.withdrawAsync(amount, this.userAddress);
+        const txHash = await this.zeroEx.etherToken.withdrawAsync(etherTokenAddress, amount, this.userAddress);
         await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
     }
     public async doesContractExistAtAddressAsync(address: string) {
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index b017de27b5..c8a279de97 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -88,12 +88,12 @@ export class EthWethConversionButton extends
         let balance = tokenState.balance;
         try {
             if (direction === Side.deposit) {
-                await this.props.blockchain.convertEthToWrappedEthTokensAsync(value);
+                await this.props.blockchain.convertEthToWrappedEthTokensAsync(token.address, value);
                 const ethAmount = ZeroEx.toUnitAmount(value, constants.ETH_DECIMAL_PLACES);
                 this.props.dispatcher.showFlashMessage(`Successfully wrapped ${ethAmount.toString()} ETH to WETH`);
                 balance = balance.plus(value);
             } else {
-                await this.props.blockchain.convertWrappedEthTokensToEthAsync(value);
+                await this.props.blockchain.convertWrappedEthTokensToEthAsync(token.address, value);
                 const tokenAmount = ZeroEx.toUnitAmount(value, token.decimals);
                 this.props.dispatcher.showFlashMessage(`Successfully unwrapped ${tokenAmount.toString()} WETH to ETH`);
                 balance = balance.minus(value);

From fd3e8cd8133510a02aa6779a780c20018bebabe0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 13:20:27 -0600
Subject: [PATCH 028/125] Add convenience `rebuild` command

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index e6230bf189..e702c1d90e 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "scripts": {
         "testrpc": "testrpc -p 8545 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
         "lerna:run": "lerna run",
+        "lerna:rebuild": "lerna run clean; lerna run build;",
         "lerna:publish": "yarn install; lerna run clean; lerna run build; lerna publish --registry=https://registry.npmjs.org/"
     },
     "config": {

From edbe6915e07a516f5fad2a38eb8ffe96a7b28318 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 13:22:54 -0600
Subject: [PATCH 029/125] Fixed https://github.com/0xProject/wiki/issues/19 by
 disabling re-rendering of markdownCodeBlock renderer if props haven't updated

---
 .../ts/pages/shared/markdown_code_block.tsx   | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/website/ts/pages/shared/markdown_code_block.tsx b/packages/website/ts/pages/shared/markdown_code_block.tsx
index 621e5b6062..aded15f0ce 100644
--- a/packages/website/ts/pages/shared/markdown_code_block.tsx
+++ b/packages/website/ts/pages/shared/markdown_code_block.tsx
@@ -7,14 +7,23 @@ interface MarkdownCodeBlockProps {
     language: string;
 }
 
-export function MarkdownCodeBlock(props: MarkdownCodeBlockProps) {
-    return (
-        <span style={{fontSize: 16}}>
-            <HighLight
-                className={props.language || 'js'}
-            >
-                {props.literal}
-            </HighLight>
-        </span>
-    );
+interface MarkdownCodeBlockState {}
+
+export class MarkdownCodeBlock extends React.Component<MarkdownCodeBlockProps, MarkdownCodeBlockState> {
+    // Re-rendering a codeblock causes any use selection to become de-selected. This is annoying when trying
+    // to copy-paste code examples. We therefore noop re-renders on this component if it's props haven't changed.
+    public shouldComponentUpdate(nextProps: MarkdownCodeBlockProps, nextState: MarkdownCodeBlockState) {
+        return nextProps.literal !== this.props.literal || nextProps.language !== this.props.language;
+    }
+    public render() {
+        return (
+            <span style={{fontSize: 16}}>
+                <HighLight
+                    className={this.props.language || 'javascript'}
+                >
+                    {this.props.literal}
+                </HighLight>
+            </span>
+        );
+    }
 }

From 9e914be975e20771e0f442eb4b4b025d44eb1994 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 14:14:23 -0600
Subject: [PATCH 030/125] Link all EtherTokens to Etherscan and add address
 tooltip

---
 .../website/ts/components/eth_wrappers.tsx    | 73 ++++++++++++++-----
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 58b73b11cf..a6a1df7511 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -13,10 +13,12 @@ import {
 } from 'material-ui/Table';
 import * as moment from 'moment';
 import * as React from 'react';
+import ReactTooltip = require('react-tooltip');
 import {Blockchain} from 'ts/blockchain';
 import {EthWethConversionButton} from 'ts/components/eth_weth_conversion_button';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {
+    EtherscanLinkSuffixes,
     OutdatedWrappedEtherByNetworkId,
     Side,
     Token,
@@ -26,6 +28,7 @@ import {
 } from 'ts/types';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
+import {utils} from 'ts/utils/utils';
 
 const PRECISION = 5;
 const DATE_FORMAT = 'D/M/YY';
@@ -85,6 +88,10 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         const etherTokenState = this.props.tokenStateByAddress[etherToken.address];
         const wethBalance = ZeroEx.toUnitAmount(etherTokenState.balance, 18);
         const isBidirectional = true;
+        const etherscanUrl = utils.getEtherScanLinkIfExists(
+            etherToken.address, this.props.networkId, EtherscanLinkSuffixes.address,
+        );
+        const tokenLabel = this.renderToken('Wrapped Ether', etherToken.address, constants.iconUrlBySymbol.WETH);
         return (
             <div className="clearfix lg-px4 md-px4 sm-px2" style={{minHeight: 600}}>
                 <div className="relative">
@@ -131,8 +138,11 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                                 style={{width: ICON_DIMENSION, height: ICON_DIMENSION}}
                                                 src={ETHER_ICON_PATH}
                                             />
-                                            <div className="mt2 ml2 sm-hide xs-hide">
-                                                Ether
+                                            <div
+                                                className="ml2 sm-hide xs-hide"
+                                                style={{marginTop: 12}}
+                                            >
+                                                ETH
                                             </div>
                                         </div>
                                     </TableRowColumn>
@@ -153,15 +163,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                 </TableRow>
                                 <TableRow key="WETH">
                                     <TableRowColumn className="py1">
-                                        <div className="flex">
-                                            <img
-                                                style={{width: ICON_DIMENSION, height: ICON_DIMENSION}}
-                                                src={constants.iconUrlBySymbol.WETH}
-                                            />
-                                            <div className="mt2 ml2 sm-hide xs-hide">
-                                                Wrapped Ether
-                                            </div>
-                                        </div>
+                                        {this.renderTokenLink(tokenLabel, etherscanUrl)}
                                     </TableRowColumn>
                                     <TableRowColumn>
                                         {wethBalance.toFixed(PRECISION)} WETH
@@ -264,18 +266,14 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                          ZeroEx.toUnitAmount(outdatedEtherTokenState.balance, 18).toFixed(PRECISION) :
                                          undefined;
             const onConversionSuccessful = this.onOutdatedConversionSuccessfulAsync.bind(this, outdatedWETH.address);
+            const etherscanUrl = utils.getEtherScanLinkIfExists(
+                outdatedWETH.address, this.props.networkId, EtherscanLinkSuffixes.address,
+            );
+            const tokenLabel = this.renderToken(dateRange, outdatedEtherToken.address, OUTDATED_WETH_ICON_PATH);
             return (
                 <TableRow key={`weth-${outdatedWETH.address}`}>
                     <TableRowColumn className="py1">
-                        <div className="flex">
-                            <img
-                                style={{width: ICON_DIMENSION, height: ICON_DIMENSION}}
-                                src={OUTDATED_WETH_ICON_PATH}
-                            />
-                            <div className="mt2 ml2 sm-hide xs-hide">
-                                {dateRange}
-                            </div>
-                        </div>
+                        {this.renderTokenLink(tokenLabel, etherscanUrl)}
                     </TableRowColumn>
                     <TableRowColumn>
                         {isStateLoaded ?
@@ -301,6 +299,41 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         });
         return rows;
     }
+    private renderTokenLink(tokenLabel: React.ReactNode, etherscanUrl: string) {
+        return (
+            <span>
+                {_.isUndefined(etherscanUrl) ?
+                    tokenLabel :
+                    <a href={etherscanUrl} target="_blank" style={{textDecoration: 'none'}}>
+                        {tokenLabel}
+                    </a>
+                }
+            </span>
+        );
+    }
+    private renderToken(name: string, address: string, imgPath: string) {
+        const tooltipId = `tooltip-${address}`;
+        return (
+            <div className="flex">
+                <img
+                    style={{width: ICON_DIMENSION, height: ICON_DIMENSION}}
+                    src={imgPath}
+                />
+                <div
+                    className="ml2 sm-hide xs-hide"
+                    style={{marginTop: 12}}
+                >
+                    <span
+                        data-tip={true}
+                        data-for={tooltipId}
+                    >
+                        {name}
+                    </span>
+                    <ReactTooltip id={tooltipId}>{address}</ReactTooltip>
+                </div>
+            </div>
+        );
+    }
     private async onOutdatedConversionSuccessfulAsync(outdatedWETHAddress: string) {
         this.setState({
             outdatedWETHAddressToIsStateLoaded: {

From b2256679bef6c39ee5889f12838d1c2e9d4dd832 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 15:41:24 -0500
Subject: [PATCH 031/125] Add `Max` convenience button in unwrap WETH dialog

---
 .../dialogs/eth_weth_conversion_dialog.tsx       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index c8bdced9bd..230ac51839 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -109,7 +109,16 @@ export class EthWethConversionDialog extends
                             className="pt1"
                             style={{fontSize: 12}}
                         >
-                            1 ETH = 1 WETH
+                            <div className="left">1 ETH = 1 WETH</div>
+                            {this.props.direction === Side.receive &&
+                                <div
+                                    className="right"
+                                    onClick={this.onMaxClick.bind(this)}
+                                    style={{color: DARK_BLUE, textDecoration: 'underline', cursor: 'pointer'}}
+                                >
+                                    Max
+                                </div>
+                            }
                         </div>
                     </div>
                 </div>
@@ -137,6 +146,11 @@ export class EthWethConversionDialog extends
             </div>
         );
     }
+    private onMaxClick() {
+        this.setState({
+            value: this.props.tokenState.balance,
+        });
+    }
     private onValueChange(isValid: boolean, amount?: BigNumber) {
         this.setState({
             value: amount,

From 95dfac6f9bbf8cf0de2038cfbd4eabb53b979fcd Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 17:09:16 -0500
Subject: [PATCH 032/125] Make it such that Wrapped Ether page works on
 networks without any outdated WETH tokens

---
 .../website/ts/components/eth_wrappers.tsx    | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index a6a1df7511..3ffb05ce02 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -246,8 +246,11 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
     private renderOutdatedWeths(etherToken: Token, etherTokenState: TokenState) {
         const rows = _.map(configs.outdatedWrappedEthers,
                         (outdatedWETHByNetworkId: OutdatedWrappedEtherByNetworkId) => {
-            const outdatedWETH = outdatedWETHByNetworkId[this.props.networkId];
-            const timestampMsRange = outdatedWETH.timestampMsRange;
+            const outdatedWETHIfExists = outdatedWETHByNetworkId[this.props.networkId];
+            if (_.isUndefined(outdatedWETHIfExists)) {
+                return null; // noop
+            }
+            const timestampMsRange = outdatedWETHIfExists.timestampMsRange;
             let dateRange: string;
             if (!_.isUndefined(timestampMsRange)) {
                 const startMoment = moment(timestampMsRange.startTimestampMs);
@@ -258,20 +261,20 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
             }
             const outdatedEtherToken = {
                 ...etherToken,
-                address: outdatedWETH.address,
+                address: outdatedWETHIfExists.address,
             };
-            const isStateLoaded = this.state.outdatedWETHAddressToIsStateLoaded[outdatedWETH.address];
-            const outdatedEtherTokenState = this.state.outdatedWETHStateByAddress[outdatedWETH.address];
+            const isStateLoaded = this.state.outdatedWETHAddressToIsStateLoaded[outdatedWETHIfExists.address];
+            const outdatedEtherTokenState = this.state.outdatedWETHStateByAddress[outdatedWETHIfExists.address];
             const balanceInEthIfExists = isStateLoaded ?
                                          ZeroEx.toUnitAmount(outdatedEtherTokenState.balance, 18).toFixed(PRECISION) :
                                          undefined;
-            const onConversionSuccessful = this.onOutdatedConversionSuccessfulAsync.bind(this, outdatedWETH.address);
+            const onConversionSuccessful = this.onOutdatedConversionSuccessfulAsync.bind(this, outdatedWETHIfExists.address);
             const etherscanUrl = utils.getEtherScanLinkIfExists(
-                outdatedWETH.address, this.props.networkId, EtherscanLinkSuffixes.address,
+                outdatedWETHIfExists.address, this.props.networkId, EtherscanLinkSuffixes.address,
             );
             const tokenLabel = this.renderToken(dateRange, outdatedEtherToken.address, OUTDATED_WETH_ICON_PATH);
             return (
-                <TableRow key={`weth-${outdatedWETH.address}`}>
+                <TableRow key={`weth-${outdatedWETHIfExists.address}`}>
                     <TableRowColumn className="py1">
                         {this.renderTokenLink(tokenLabel, etherscanUrl)}
                     </TableRowColumn>
@@ -378,9 +381,14 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         });
     }
     private getOutdatedWETHAddresses(): string[] {
-        const outdatedWETHAddresses = _.map(configs.outdatedWrappedEthers, outdatedWrappedEther => {
-            return outdatedWrappedEther[this.props.networkId].address;
-        });
+        const outdatedWETHAddresses = _.compact(_.map(configs.outdatedWrappedEthers, outdatedWrappedEtherByNetwork => {
+            const  outdatedWrappedEtherIfExists = outdatedWrappedEtherByNetwork[this.props.networkId];
+            if (_.isUndefined(outdatedWrappedEtherIfExists)) {
+                return undefined
+            }
+            const address = outdatedWrappedEtherIfExists.address;
+            return address;
+        }));
         return outdatedWETHAddresses;
     }
 } // tslint:disable:max-file-line-count

From 681617480ab8323cc81e1fc1e7a4f31a84b8b548 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 17:10:51 -0500
Subject: [PATCH 033/125] Move weth.io url to constants

---
 packages/website/ts/components/eth_wrappers.tsx | 2 +-
 packages/website/ts/utils/constants.ts          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 3ffb05ce02..1a223a05ed 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -99,7 +99,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                     <div className="absolute" style={{top: 0, right: 0}}>
                         <a
                             target="_blank"
-                            href="https://weth.io/"
+                            href={constants.WETH_IO_URL}
                             style={{color: LIGHT_GRAY}}
                         >
                             <div className="flex">
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index fb81dd9a9a..8f645c770c 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -83,6 +83,7 @@ export const constants = {
     WEB3_DECODED_LOG_ENTRY_EVENT_URL:
         'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L123',
     WEB3_LOG_ENTRY_EVENT_URL: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L127',
+    WETH_IO_URL: 'https://weth.io/',
     ZEROEX_CHAT_URL: 'https://chat.0xproject.com',
     // Projects
     ETHFINEX_URL: 'https://www.bitfinex.com/ethfinex',

From 672c8acaca76851306276d0d03c5df0c75aa8bc6 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 17:21:33 -0500
Subject: [PATCH 034/125] Fix linter errors

---
 packages/website/ts/components/eth_wrappers.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 1a223a05ed..a10313597d 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -268,7 +268,9 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
             const balanceInEthIfExists = isStateLoaded ?
                                          ZeroEx.toUnitAmount(outdatedEtherTokenState.balance, 18).toFixed(PRECISION) :
                                          undefined;
-            const onConversionSuccessful = this.onOutdatedConversionSuccessfulAsync.bind(this, outdatedWETHIfExists.address);
+            const onConversionSuccessful = this.onOutdatedConversionSuccessfulAsync.bind(
+                this, outdatedWETHIfExists.address,
+            );
             const etherscanUrl = utils.getEtherScanLinkIfExists(
                 outdatedWETHIfExists.address, this.props.networkId, EtherscanLinkSuffixes.address,
             );
@@ -384,7 +386,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         const outdatedWETHAddresses = _.compact(_.map(configs.outdatedWrappedEthers, outdatedWrappedEtherByNetwork => {
             const  outdatedWrappedEtherIfExists = outdatedWrappedEtherByNetwork[this.props.networkId];
             if (_.isUndefined(outdatedWrappedEtherIfExists)) {
-                return undefined
+                return undefined;
             }
             const address = outdatedWrappedEtherIfExists.address;
             return address;

From 89f368a8b8b2419f9f347ad20da94199d533fa26 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 18:58:12 -0500
Subject: [PATCH 035/125] Add notice dialog to balances page about updating the
 WETH contract. We also draw attention to the new dedicated section for
 unwrapping from outdated WETH tokens

---
 .../wrapped_eth_section_notice_dialog.tsx     | 38 ++++++++++++++
 packages/website/ts/components/portal.tsx     | 50 +++++++++++++++----
 packages/website/ts/utils/constants.ts        |  1 +
 3 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx

diff --git a/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx b/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
new file mode 100644
index 0000000000..d13b2e8ce1
--- /dev/null
+++ b/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
@@ -0,0 +1,38 @@
+import Dialog from 'material-ui/Dialog';
+import FlatButton from 'material-ui/FlatButton';
+import {colors} from 'material-ui/styles';
+import * as React from 'react';
+
+interface WrappedEthSectionNoticeDialogProps {
+    isOpen: boolean;
+    onToggleDialog: () => void;
+}
+
+export function WrappedEthSectionNoticeDialog(props: WrappedEthSectionNoticeDialogProps) {
+    return (
+        <Dialog
+            title="Dedicated Wrapped Ether Section"
+            titleStyle={{fontWeight: 100}}
+            actions={[
+                <FlatButton
+                    key="acknowledgeWrapEthSection"
+                    label="Sounds good"
+                    onTouchTap={props.onToggleDialog.bind(this)}
+                />,
+            ]}
+            open={props.isOpen}
+            onRequestClose={props.onToggleDialog.bind(this)}
+            autoScrollBodyContent={true}
+            modal={true}
+        >
+            <div className="pt2" style={{color: colors.grey700}}>
+                <div>
+                    We have recently updated the Wrapped Ether token used by 0x Portal.
+                    Don't worry, unwrapping Ether tied to the old Wrapped Ether token can
+                    be done at any time by clicking on the "Wrap ETH" section in the menu
+                    to the left.
+                </div>
+            </div>
+        </Dialog>
+    );
+}
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index 74b1bdec68..69a7c1e7f0 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -8,6 +8,7 @@ import {Route, Switch} from 'react-router-dom';
 import {Blockchain} from 'ts/blockchain';
 import {BlockchainErrDialog} from 'ts/components/dialogs/blockchain_err_dialog';
 import {PortalDisclaimerDialog} from 'ts/components/dialogs/portal_disclaimer_dialog';
+import {WrappedEthSectionNoticeDialog} from 'ts/components/dialogs/wrapped_eth_section_notice_dialog';
 import {EthWrappers} from 'ts/components/eth_wrappers';
 import {FillOrder} from 'ts/components/fill_order';
 import {Footer} from 'ts/components/footer';
@@ -63,22 +64,39 @@ interface PortalAllState {
     prevNetworkId: number;
     prevNodeVersion: string;
     prevUserAddress: string;
-    hasAcceptedDisclaimer: boolean;
+    prevPathname: string;
+    isDisclaimerDialogOpen: boolean;
+    isWethNoticeDialogOpen: boolean;
 }
 
 export class Portal extends React.Component<PortalAllProps, PortalAllState> {
     private blockchain: Blockchain;
     private sharedOrderIfExists: Order;
     private throttledScreenWidthUpdate: () => void;
+    public static hasAlreadyDismissedWethNotice() {
+        const didDismissWethNotice = localStorage.getItemIfExists(constants.DISMISS_WETH_NOTICE_LOCAL_STORAGE_KEY);
+        const hasAlreadyDismissedWethNotice = !_.isUndefined(didDismissWethNotice) &&
+                                              !_.isEmpty(didDismissWethNotice);
+        return hasAlreadyDismissedWethNotice;
+    }
     constructor(props: PortalAllProps) {
         super(props);
         this.sharedOrderIfExists = this.getSharedOrderIfExists();
         this.throttledScreenWidthUpdate = _.throttle(this.updateScreenWidth.bind(this), THROTTLE_TIMEOUT);
+
+        const isViewingBalances = _.includes(props.location.pathname, `${WebsitePaths.Portal}/balances`);
+        const hasAlreadyDismissedWethNotice = Portal.hasAlreadyDismissedWethNotice();
+
+        const didAcceptPortalDisclaimer = localStorage.getItemIfExists(constants.ACCEPT_DISCLAIMER_LOCAL_STORAGE_KEY);
+        const hasAcceptedDisclaimer = !_.isUndefined(didAcceptPortalDisclaimer) &&
+                                      !_.isEmpty(didAcceptPortalDisclaimer);
         this.state = {
             prevNetworkId: this.props.networkId,
             prevNodeVersion: this.props.nodeVersion,
             prevUserAddress: this.props.userAddress,
-            hasAcceptedDisclaimer: false,
+            prevPathname: this.props.location.pathname,
+            isDisclaimerDialogOpen: !hasAcceptedDisclaimer,
+            isWethNoticeDialogOpen: !hasAlreadyDismissedWethNotice && isViewingBalances,
         };
     }
     public componentDidMount() {
@@ -87,12 +105,6 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
     }
     public componentWillMount() {
         this.blockchain = new Blockchain(this.props.dispatcher);
-        const didAcceptPortalDisclaimer = localStorage.getItemIfExists(constants.ACCEPT_DISCLAIMER_LOCAL_STORAGE_KEY);
-        const hasAcceptedDisclaimer = !_.isUndefined(didAcceptPortalDisclaimer) &&
-                                      !_.isEmpty(didAcceptPortalDisclaimer);
-        this.setState({
-            hasAcceptedDisclaimer,
-        });
     }
     public componentWillUnmount() {
         this.blockchain.destroy();
@@ -128,6 +140,14 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
             // tslint:disable-next-line:no-floating-promises
             this.blockchain.nodeVersionUpdatedFireAndForgetAsync(nextProps.nodeVersion);
         }
+        if (nextProps.location.pathname !== this.state.prevPathname) {
+            const isViewingBalances = _.includes(nextProps.location.pathname, `${WebsitePaths.Portal}/balances`);
+            const hasAlreadyDismissedWethNotice = Portal.hasAlreadyDismissedWethNotice();
+            this.setState({
+                prevPathname: nextProps.location.pathname,
+                isWethNoticeDialogOpen: !hasAlreadyDismissedWethNotice && isViewingBalances,
+            });
+        }
     }
     public render() {
         const updateShouldBlockchainErrDialogBeOpen = this.props.dispatcher
@@ -215,8 +235,12 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
                         toggleDialogFn={updateShouldBlockchainErrDialogBeOpen}
                         networkId={this.props.networkId}
                     />
+                    <WrappedEthSectionNoticeDialog
+                        isOpen={this.state.isWethNoticeDialogOpen}
+                        onToggleDialog={this.onWethNoticeAccepted.bind(this)}
+                    />
                     <PortalDisclaimerDialog
-                        isOpen={!this.state.hasAcceptedDisclaimer}
+                        isOpen={this.state.isDisclaimerDialogOpen}
                         onToggleDialog={this.onPortalDisclaimerAccepted.bind(this)}
                     />
                     <FlashMessage
@@ -297,7 +321,13 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
     private onPortalDisclaimerAccepted() {
         localStorage.setItem(constants.ACCEPT_DISCLAIMER_LOCAL_STORAGE_KEY, 'set');
         this.setState({
-            hasAcceptedDisclaimer: true,
+            isDisclaimerDialogOpen: false,
+        });
+    }
+    private onWethNoticeAccepted() {
+        localStorage.setItem(constants.DISMISS_WETH_NOTICE_LOCAL_STORAGE_KEY, 'set');
+        this.setState({
+            isWethNoticeDialogOpen: false,
         });
     }
     private getSharedOrderIfExists(): Order {
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index 8f645c770c..cb2dbef884 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -34,6 +34,7 @@ export const constants = {
     GITHUB_URL: 'https://github.com/0xProject',
     GITHUB_WIKI_URL: 'https://github.com/0xProject/wiki',
     HTTP_NO_CONTENT_STATUS_CODE: 204,
+    DISMISS_WETH_NOTICE_LOCAL_STORAGE_KEY: 'hasDismissedWethNotice',
     ACCEPT_DISCLAIMER_LOCAL_STORAGE_KEY: 'didAcceptPortalDisclaimer',
     LINKEDIN_0X_URL: 'https://www.linkedin.com/company/0x',
     LEDGER_PROVIDER_NAME: 'Ledger',

From 951fbc9b76faf6b0f9f44fd2b729bcb54cf9d565 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 19:18:33 -0500
Subject: [PATCH 036/125] Temporarily pretend as if new WETH contracts are
 already whitelisted by tokenRegistry and put hacks behind the
 shouldDeprecateOldWethToken flag

---
 packages/website/ts/blockchain.ts    | 17 +++++++++++------
 packages/website/ts/utils/configs.ts |  7 +++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index a42b19cffe..7a0d546b4d 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -158,6 +158,12 @@ export class Blockchain {
     }
     public async isAddressInTokenRegistryAsync(tokenAddress: string): Promise<boolean> {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
+        // HACK: temporarily whitelist the new WETH token address `as if` they were
+        // already in the tokenRegistry.
+        if (configs.shouldDeprecateOldWethToken &&
+            tokenAddress === configs.newWrappedEthers[this.networkId]) {
+            return true;
+        }
         const tokenIfExists = await this.zeroEx.tokenRegistry.getTokenIfExistsAsync(tokenAddress);
         return !_.isUndefined(tokenIfExists);
     }
@@ -598,12 +604,11 @@ export class Blockchain {
             // new canonical WETH.
             // TODO: Remove this hack once we've updated the TokenRegistries
             let address = t.address;
-            if (t.symbol === 'WETH') {
-                if (this.networkId === 1) {
-                    address = '0xe495bcacaf29a0eb00fb67b86e9cd2a994dd55d8';
-                } else if (this.networkId === 42) {
-                    address = '0x739e78d6bebbdf24105a5145fa04436589d1cbd9';
-                }
+            if (configs.shouldDeprecateOldWethToken && t.symbol === 'WETH') {
+                    const newEtherTokenAddressIfExists = configs.newWrappedEthers[this.networkId];
+                    if (!_.isUndefined(newEtherTokenAddressIfExists)) {
+                        address = newEtherTokenAddressIfExists;
+                    }
             }
             const token: Token = {
                 iconUrl,
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index 4a08929cf7..20efc66bed 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -19,6 +19,13 @@ export const configs = {
     lastLocalStorageFillClearanceDate: '2017-11-22',
     lastLocalStorageTrackedTokenClearanceDate: '2017-12-13',
     isMainnetEnabled: true,
+    shouldDeprecateOldWethToken: true,
+    // newWrappedEthers is temporary until we remove the shouldDeprecateOldWethToken flag
+    // and add the new WETHs to the tokenRegistry
+    newWrappedEthers: {
+        1: '0xe495bcacaf29a0eb00fb67b86e9cd2a994dd55d8',
+        42: '0x739e78d6bebbdf24105a5145fa04436589d1cbd9',
+    } as {[networkId: string]: string},
     outdatedWrappedEthers: [
         {
             42: {

From 22c4ee6ef709610155191c4b0629ba0c41ce908f Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 19:35:24 -0500
Subject: [PATCH 037/125] Update first two string enums to native type

---
 packages/website/ts/blockchain.ts             |  8 +++---
 .../dialogs/blockchain_err_dialog.tsx         |  8 +++---
 .../dialogs/eth_weth_conversion_dialog.tsx    |  8 +++---
 .../components/eth_weth_conversion_button.tsx |  6 ++---
 .../website/ts/components/eth_wrappers.tsx    |  6 ++---
 .../website/ts/components/fill_order_json.tsx |  4 +--
 .../generate_order/generate_order_form.tsx    | 26 +++++++++----------
 .../ts/components/inputs/token_input.tsx      |  2 +-
 .../website/ts/components/token_balances.tsx  |  2 +-
 packages/website/ts/containers/portal.tsx     |  4 +--
 packages/website/ts/redux/reducer.ts          | 10 +++----
 packages/website/ts/types.ts                  | 22 +++++++---------
 packages/website/ts/utils/utils.ts            |  8 +++---
 13 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 6877a301a8..336397f7f5 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -135,11 +135,11 @@ export class Blockchain {
         const isConnected = !_.isUndefined(newNetworkId);
         if (!isConnected) {
             this.networkId = newNetworkId;
-            this.dispatcher.encounteredBlockchainError(BlockchainErrs.DISCONNECTED_FROM_ETHEREUM_NODE);
+            this.dispatcher.encounteredBlockchainError(BlockchainErrs.DisconnectedFromEthereumNode);
             this.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
         } else if (this.networkId !== newNetworkId) {
             this.networkId = newNetworkId;
-            this.dispatcher.encounteredBlockchainError('');
+            this.dispatcher.encounteredBlockchainError(BlockchainErrs.NoError);
             await this.fetchTokenInformationAsync();
             await this.rehydrateStoreWithContractEvents();
         }
@@ -712,8 +712,8 @@ export class Blockchain {
             _.find(allTokens, {symbol: configs.defaultTrackedTokenSymbols[0]}),
             _.find(allTokens, {symbol: configs.defaultTrackedTokenSymbols[1]}),
         ];
-        this.dispatcher.updateChosenAssetTokenAddress(Side.deposit, mostPopularTradingPairTokens[0].address);
-        this.dispatcher.updateChosenAssetTokenAddress(Side.receive, mostPopularTradingPairTokens[1].address);
+        this.dispatcher.updateChosenAssetTokenAddress(Side.Deposit, mostPopularTradingPairTokens[0].address);
+        this.dispatcher.updateChosenAssetTokenAddress(Side.Receive, mostPopularTradingPairTokens[1].address);
         this.dispatcher.updateBlockchainIsLoaded(true);
     }
     private async instantiateContractIfExistsAsync(artifact: any, address?: string): Promise<ContractInstance> {
diff --git a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
index 963bd43889..afc89be1ae 100644
--- a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
+++ b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
@@ -46,22 +46,22 @@ export class BlockchainErrDialog extends React.Component<BlockchainErrDialogProp
         );
     }
     private getTitle(hasWalletAddress: boolean) {
-        if (this.props.blockchainErr === BlockchainErrs.A_CONTRACT_NOT_DEPLOYED_ON_NETWORK) {
+        if (this.props.blockchainErr === BlockchainErrs.AContractNotDeployedOnNetwork) {
             return '0x smart contracts not found';
         } else if (!hasWalletAddress) {
             return 'Enable wallet communication';
-        } else if (this.props.blockchainErr === BlockchainErrs.DISCONNECTED_FROM_ETHEREUM_NODE) {
+        } else if (this.props.blockchainErr === BlockchainErrs.DisconnectedFromEthereumNode) {
             return 'Disconnected from Ethereum network';
         } else {
             return 'Unexpected error';
         }
     }
     private renderExplanation(hasWalletAddress: boolean) {
-        if (this.props.blockchainErr === BlockchainErrs.A_CONTRACT_NOT_DEPLOYED_ON_NETWORK) {
+        if (this.props.blockchainErr === BlockchainErrs.AContractNotDeployedOnNetwork) {
             return this.renderContractsNotDeployedExplanation();
         } else if (!hasWalletAddress) {
             return this.renderNoWalletFoundExplanation();
-        } else if (this.props.blockchainErr === BlockchainErrs.DISCONNECTED_FROM_ETHEREUM_NODE) {
+        } else if (this.props.blockchainErr === BlockchainErrs.DisconnectedFromEthereumNode) {
             return this.renderDisconnectedFromNode();
         } else {
             return this.renderUnexpectedErrorExplanation();
diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index c8bdced9bd..e499bdcbe4 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -47,7 +47,7 @@ export class EthWethConversionDialog extends
                 onTouchTap={this.onConvertClick.bind(this)}
             />,
         ];
-        const title = this.props.direction === Side.deposit ?  'Wrap ETH' : 'Unwrap WETH';
+        const title = this.props.direction === Side.Deposit ?  'Wrap ETH' : 'Unwrap WETH';
         return (
             <Dialog
                 title={title}
@@ -61,10 +61,10 @@ export class EthWethConversionDialog extends
         );
     }
     private renderConversionDialogBody() {
-        const explanation = this.props.direction === Side.deposit ?
+        const explanation = this.props.direction === Side.Deposit ?
                             'Convert your Ether into a tokenized, tradable form.' :
                             'Convert your Wrapped Ether back into it\'s native form.';
-        const isWrappedVersion = this.props.direction === Side.receive;
+        const isWrappedVersion = this.props.direction === Side.Receive;
         return (
             <div>
                 <div className="pb2">
@@ -85,7 +85,7 @@ export class EthWethConversionDialog extends
                         className="pt2 mx-auto"
                         style={{width: 245}}
                     >
-                        {this.props.direction === Side.receive ?
+                        {this.props.direction === Side.Receive ?
                             <TokenAmountInput
                                 token={this.props.token}
                                 tokenState={this.props.tokenState}
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index b017de27b5..ae919921d3 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -45,7 +45,7 @@ export class EthWethConversionButton extends
         const labelStyle = this.state.isEthConversionHappening ? {fontSize: 10} : {};
         let callToActionLabel;
         let inProgressLabel;
-        if (this.props.direction === Side.deposit) {
+        if (this.props.direction === Side.Deposit) {
             callToActionLabel = 'Wrap';
             inProgressLabel = 'Wrapping...';
         } else {
@@ -87,7 +87,7 @@ export class EthWethConversionButton extends
         const tokenState = this.props.ethTokenState;
         let balance = tokenState.balance;
         try {
-            if (direction === Side.deposit) {
+            if (direction === Side.Deposit) {
                 await this.props.blockchain.convertEthToWrappedEthTokensAsync(value);
                 const ethAmount = ZeroEx.toUnitAmount(value, constants.ETH_DECIMAL_PLACES);
                 this.props.dispatcher.showFlashMessage(`Successfully wrapped ${ethAmount.toString()} ETH to WETH`);
@@ -110,7 +110,7 @@ export class EthWethConversionButton extends
                 utils.consoleLog(`Unexpected error encountered: ${err}`);
                 utils.consoleLog(err.stack);
                 await errorReporter.reportAsync(err);
-                const errorMsg = direction === Side.deposit ?
+                const errorMsg = direction === Side.Deposit ?
                                  'Failed to wrap your ETH. Please try again.' :
                                  'Failed to unwrap your WETH. Please try again.';
                 this.props.dispatcher.showFlashMessage(errorMsg);
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 58b73b11cf..9bb05becf1 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -142,7 +142,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                     <TableRowColumn>
                                         <EthWethConversionButton
                                             isOutdatedWrappedEther={false}
-                                            direction={Side.deposit}
+                                            direction={Side.Deposit}
                                             ethToken={etherToken}
                                             ethTokenState={etherTokenState}
                                             dispatcher={this.props.dispatcher}
@@ -169,7 +169,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                     <TableRowColumn>
                                         <EthWethConversionButton
                                             isOutdatedWrappedEther={false}
-                                            direction={Side.receive}
+                                            direction={Side.Receive}
                                             ethToken={etherToken}
                                             ethTokenState={etherTokenState}
                                             dispatcher={this.props.dispatcher}
@@ -287,7 +287,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                         <EthWethConversionButton
                             isDisabled={!isStateLoaded}
                             isOutdatedWrappedEther={true}
-                            direction={Side.receive}
+                            direction={Side.Receive}
                             ethToken={outdatedEtherToken}
                             ethTokenState={outdatedEtherTokenState}
                             dispatcher={this.props.dispatcher}
diff --git a/packages/website/ts/components/fill_order_json.tsx b/packages/website/ts/components/fill_order_json.tsx
index f4db1f74e3..393e46bee3 100644
--- a/packages/website/ts/components/fill_order_json.tsx
+++ b/packages/website/ts/components/fill_order_json.tsx
@@ -24,11 +24,11 @@ export class FillOrderJSON extends React.Component<FillOrderJSONProps, FillOrder
         const tokenAddresses = _.keys(this.props.tokenByAddress);
         const exchangeContract = this.props.blockchain.getExchangeContractAddressIfExists();
         const hintSideToAssetToken = {
-            [Side.deposit]: {
+            [Side.Deposit]: {
                 amount: new BigNumber(35),
                 address: tokenAddresses[0],
             },
-            [Side.receive]: {
+            [Side.Receive]: {
                 amount: new BigNumber(89),
                 address: tokenAddresses[1],
             },
diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx
index 59970b10c5..f273045a84 100644
--- a/packages/website/ts/components/generate_order/generate_order_form.tsx
+++ b/packages/website/ts/components/generate_order/generate_order_form.tsx
@@ -78,10 +78,10 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
     }
     public render() {
         const dispatcher = this.props.dispatcher;
-        const depositTokenAddress = this.props.sideToAssetToken[Side.deposit].address;
+        const depositTokenAddress = this.props.sideToAssetToken[Side.Deposit].address;
         const depositToken = this.props.tokenByAddress[depositTokenAddress];
         const depositTokenState = this.props.tokenStateByAddress[depositTokenAddress];
-        const receiveTokenAddress = this.props.sideToAssetToken[Side.receive].address;
+        const receiveTokenAddress = this.props.sideToAssetToken[Side.Receive].address;
         const receiveToken = this.props.tokenByAddress[receiveTokenAddress];
         const receiveTokenState = this.props.tokenStateByAddress[receiveTokenAddress];
         const takerExplanation = 'If a taker is specified, only they are<br> \
@@ -102,9 +102,9 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
                                     blockchainErr={this.props.blockchainErr}
                                     dispatcher={this.props.dispatcher}
                                     label="Selling"
-                                    side={Side.deposit}
+                                    side={Side.Deposit}
                                     networkId={this.props.networkId}
-                                    assetToken={this.props.sideToAssetToken[Side.deposit]}
+                                    assetToken={this.props.sideToAssetToken[Side.Deposit]}
                                     updateChosenAssetToken={dispatcher.updateChosenAssetToken.bind(dispatcher)}
                                     tokenByAddress={this.props.tokenByAddress}
                                 />
@@ -112,8 +112,8 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
                                     label="Sell amount"
                                     token={depositToken}
                                     tokenState={depositTokenState}
-                                    amount={this.props.sideToAssetToken[Side.deposit].amount}
-                                    onChange={this.onTokenAmountChange.bind(this, depositToken, Side.deposit)}
+                                    amount={this.props.sideToAssetToken[Side.Deposit].amount}
+                                    onChange={this.onTokenAmountChange.bind(this, depositToken, Side.Deposit)}
                                     shouldShowIncompleteErrs={this.state.shouldShowIncompleteErrs}
                                     shouldCheckBalance={true}
                                     shouldCheckAllowance={true}
@@ -133,9 +133,9 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
                                     blockchainErr={this.props.blockchainErr}
                                     dispatcher={this.props.dispatcher}
                                     label="Buying"
-                                    side={Side.receive}
+                                    side={Side.Receive}
                                     networkId={this.props.networkId}
-                                    assetToken={this.props.sideToAssetToken[Side.receive]}
+                                    assetToken={this.props.sideToAssetToken[Side.Receive]}
                                     updateChosenAssetToken={dispatcher.updateChosenAssetToken.bind(dispatcher)}
                                     tokenByAddress={this.props.tokenByAddress}
                                 />
@@ -143,8 +143,8 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
                                     label="Receive amount"
                                     token={receiveToken}
                                     tokenState={receiveTokenState}
-                                    amount={this.props.sideToAssetToken[Side.receive].amount}
-                                    onChange={this.onTokenAmountChange.bind(this, receiveToken, Side.receive)}
+                                    amount={this.props.sideToAssetToken[Side.Receive].amount}
+                                    onChange={this.onTokenAmountChange.bind(this, receiveToken, Side.Receive)}
                                     shouldShowIncompleteErrs={this.state.shouldShowIncompleteErrs}
                                     shouldCheckBalance={false}
                                     shouldCheckAllowance={false}
@@ -235,16 +235,16 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
         });
     }
     private async onSignClickedAsync(): Promise<boolean> {
-        if (this.props.blockchainErr !== '') {
+        if (this.props.blockchainErr !== BlockchainErrs.NoError) {
             this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
             return false;
         }
 
         // Check if all required inputs were supplied
-        const debitToken = this.props.sideToAssetToken[Side.deposit];
+        const debitToken = this.props.sideToAssetToken[Side.Deposit];
         const debitBalance = this.props.tokenStateByAddress[debitToken.address].balance;
         const debitAllowance = this.props.tokenStateByAddress[debitToken.address].allowance;
-        const receiveAmount = this.props.sideToAssetToken[Side.receive].amount;
+        const receiveAmount = this.props.sideToAssetToken[Side.Receive].amount;
         if (!_.isUndefined(debitToken.amount) && !_.isUndefined(receiveAmount) &&
             debitToken.amount.gt(0) && receiveAmount.gt(0) &&
             this.props.userAddress !== '' &&
diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx
index 67f697f05c..40fdf9689c 100644
--- a/packages/website/ts/components/inputs/token_input.tsx
+++ b/packages/website/ts/components/inputs/token_input.tsx
@@ -95,7 +95,7 @@ export class TokenInput extends React.Component<TokenInputProps, TokenInputState
         });
     }
     private onAssetClicked() {
-        if (this.props.blockchainErr !== '') {
+        if (this.props.blockchainErr !== BlockchainErrs.NoError) {
             this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
             return;
         }
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index db4a35062c..dd7a722f58 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -357,7 +357,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
         );
     }
     private renderTokenTableRows() {
-        if (!this.props.blockchainIsLoaded || this.props.blockchainErr !== '') {
+        if (!this.props.blockchainIsLoaded || this.props.blockchainErr !== BlockchainErrs.NoError) {
             return '';
         }
         const isSmallScreen = this.props.screenWidth === ScreenWidths.SM;
diff --git a/packages/website/ts/containers/portal.tsx b/packages/website/ts/containers/portal.tsx
index 7588a1535d..fb330c06ca 100644
--- a/packages/website/ts/containers/portal.tsx
+++ b/packages/website/ts/containers/portal.tsx
@@ -43,8 +43,8 @@ interface ConnectedDispatch {
 }
 
 const mapStateToProps = (state: State, ownProps: PortalComponentAllProps): ConnectedState => {
-    const receiveAssetToken = state.sideToAssetToken[Side.receive];
-    const depositAssetToken = state.sideToAssetToken[Side.deposit];
+    const receiveAssetToken = state.sideToAssetToken[Side.Receive];
+    const depositAssetToken = state.sideToAssetToken[Side.Deposit];
     const receiveAddress = !_.isUndefined(receiveAssetToken.address) ?
                           receiveAssetToken.address : constants.NULL_ADDRESS;
     const depositAddress = !_.isUndefined(depositAssetToken.address) ?
diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts
index da69a9d006..9bd8899ada 100644
--- a/packages/website/ts/redux/reducer.ts
+++ b/packages/website/ts/redux/reducer.ts
@@ -58,7 +58,7 @@ export interface State {
 
 const INITIAL_STATE: State = {
     // Portal
-    blockchainErr: '',
+    blockchainErr: BlockchainErrs.NoError,
     blockchainIsLoaded: false,
     generateOrderStep: GenerateOrderSteps.ChooseAssets,
     networkId: undefined,
@@ -76,8 +76,8 @@ const INITIAL_STATE: State = {
     screenWidth: utils.getScreenWidth(),
     shouldBlockchainErrDialogBeOpen: false,
     sideToAssetToken: {
-        [Side.deposit]: {},
-        [Side.receive]: {},
+        [Side.Deposit]: {},
+        [Side.Receive]: {},
     },
     tokenByAddress: {},
     tokenStateByAddress: {},
@@ -294,8 +294,8 @@ export function reducer(state: State = INITIAL_STATE, action: Action) {
 
         case ActionTypes.SWAP_ASSET_TOKENS: {
             const newSideToAssetToken = _.assign({}, state.sideToAssetToken, {
-                [Side.deposit]: state.sideToAssetToken[Side.receive],
-                [Side.receive]: state.sideToAssetToken[Side.deposit],
+                [Side.Deposit]: state.sideToAssetToken[Side.Receive],
+                [Side.Receive]: state.sideToAssetToken[Side.Deposit],
             });
             return _.assign({}, state, {
                 sideToAssetToken: newSideToAssetToken,
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 2005cf2655..085b467892 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -18,18 +18,10 @@ export enum GenerateOrderSteps {
   CopyAndShare,
 }
 
-export const Side = strEnum([
-  'receive',
-  'deposit',
-]);
-export type Side = keyof typeof Side;
-
-export const BlockchainErrs = strEnum([
-  'A_CONTRACT_NOT_DEPLOYED_ON_NETWORK',
-  'DISCONNECTED_FROM_ETHEREUM_NODE',
-  'UNHANDLED_ERROR',
-]);
-export type BlockchainErrs = keyof typeof BlockchainErrs;
+export enum Side {
+    Receive = 'RECEIVE',
+    Deposit = 'DEPOSIT',
+}
 
 export const Direction = strEnum([
   'forward',
@@ -271,6 +263,12 @@ export const EtherscanLinkSuffixes = strEnum([
 ]);
 export type EtherscanLinkSuffixes = keyof typeof EtherscanLinkSuffixes;
 
+export enum BlockchainErrs {
+    AContractNotDeployedOnNetwork = 'A_CONTRACT_NOT_DEPLOYED_ON_NETWORK',
+    DisconnectedFromEthereumNode = 'DISCONNECTED_FROM_ETHEREUM_NODE',
+    NoError = 'NO_ERROR',
+}
+
 export const BlockchainCallErrs = strEnum([
   'CONTRACT_DOES_NOT_EXIST',
   'USER_HAS_NO_ASSOCIATED_ADDRESSES',
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index abc2fb2d4d..a6f80c2ab5 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -61,8 +61,8 @@ export const utils = {
                   orderExpiryTimestamp: BigNumber, orderTakerAddress: string, orderMakerAddress: string,
                   makerFee: BigNumber, takerFee: BigNumber, feeRecipient: string,
                   signatureData: SignatureData, tokenByAddress: TokenByAddress, orderSalt: BigNumber): Order {
-        const makerToken = tokenByAddress[sideToAssetToken[Side.deposit].address];
-        const takerToken = tokenByAddress[sideToAssetToken[Side.receive].address];
+        const makerToken = tokenByAddress[sideToAssetToken[Side.Deposit].address];
+        const takerToken = tokenByAddress[sideToAssetToken[Side.Receive].address];
         const order = {
             maker: {
                 address: orderMakerAddress,
@@ -72,7 +72,7 @@ export const utils = {
                     decimals: makerToken.decimals,
                     address: makerToken.address,
                 },
-                amount: sideToAssetToken[Side.deposit].amount.toString(),
+                amount: sideToAssetToken[Side.Deposit].amount.toString(),
                 feeAmount: makerFee.toString(),
             },
             taker: {
@@ -83,7 +83,7 @@ export const utils = {
                     decimals: takerToken.decimals,
                     address: takerToken.address,
                 },
-                amount: sideToAssetToken[Side.receive].amount.toString(),
+                amount: sideToAssetToken[Side.Receive].amount.toString(),
                 feeAmount: takerFee.toString(),
             },
             expiration: orderExpiryTimestamp.toString(),

From 449fd9f0242b031c7427ae9a95430008c3171d1c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 19:38:59 -0500
Subject: [PATCH 038/125] Remove unused enums

---
 packages/website/ts/redux/dispatcher.ts |  7 -------
 packages/website/ts/redux/reducer.ts    | 17 -----------------
 packages/website/ts/types.ts            | 15 ---------------
 3 files changed, 39 deletions(-)

diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts
index cbcee65993..e37e1fa6c4 100644
--- a/packages/website/ts/redux/dispatcher.ts
+++ b/packages/website/ts/redux/dispatcher.ts
@@ -5,7 +5,6 @@ import {
     ActionTypes,
     AssetToken,
     BlockchainErrs,
-    Direction,
     Order,
     ProviderType,
     ScreenWidths,
@@ -43,12 +42,6 @@ export class Dispatcher {
             type: ActionTypes.SWAP_ASSET_TOKENS,
         });
     }
-    public updateGenerateOrderStep(direction: Direction) {
-        this.dispatch({
-            data: direction,
-            type: ActionTypes.UPDATE_GENERATE_ORDER_STEP,
-        });
-    }
     public updateOrderSalt(salt: BigNumber) {
         this.dispatch({
             data: salt,
diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts
index 9bd8899ada..361e5f8c67 100644
--- a/packages/website/ts/redux/reducer.ts
+++ b/packages/website/ts/redux/reducer.ts
@@ -5,8 +5,6 @@ import {
     Action,
     ActionTypes,
     BlockchainErrs,
-    Direction,
-    GenerateOrderSteps,
     Order,
     ProviderType,
     ScreenWidths,
@@ -28,7 +26,6 @@ export interface State {
     // Portal
     blockchainErr: BlockchainErrs;
     blockchainIsLoaded: boolean;
-    generateOrderStep: GenerateOrderSteps;
     networkId: number;
     orderExpiryTimestamp: BigNumber;
     orderFillAmount: BigNumber;
@@ -60,7 +57,6 @@ const INITIAL_STATE: State = {
     // Portal
     blockchainErr: BlockchainErrs.NoError,
     blockchainIsLoaded: false,
-    generateOrderStep: GenerateOrderSteps.ChooseAssets,
     networkId: undefined,
     orderExpiryTimestamp: utils.initialOrderExpiryUnixTimestampSec(),
     orderFillAmount: undefined,
@@ -259,19 +255,6 @@ export function reducer(state: State = INITIAL_STATE, action: Action) {
             });
         }
 
-        case ActionTypes.UPDATE_GENERATE_ORDER_STEP: {
-            const direction = action.data;
-            let nextGenerateOrderStep = state.generateOrderStep;
-            if (direction === Direction.forward) {
-                nextGenerateOrderStep += 1;
-            } else if (state.generateOrderStep !== 0) {
-                nextGenerateOrderStep -= 1;
-            }
-            return _.assign({}, state, {
-                generateOrderStep: nextGenerateOrderStep,
-            });
-        }
-
         case ActionTypes.UPDATE_CHOSEN_ASSET_TOKEN: {
             const newSideToAssetToken = _.assign({}, state.sideToAssetToken, {
                 [action.data.side]: action.data.token,
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 085b467892..52d30ae351 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -10,25 +10,11 @@ function strEnum(values: string[]): {[key: string]: string} {
     }, Object.create(null));
 }
 
-export enum GenerateOrderSteps {
-  ChooseAssets,
-  GrantAllowance,
-  RemainingConfigs,
-  SignTransaction,
-  CopyAndShare,
-}
-
 export enum Side {
     Receive = 'RECEIVE',
     Deposit = 'DEPOSIT',
 }
 
-export const Direction = strEnum([
-  'forward',
-  'backward',
-]);
-export type Direction = keyof typeof Direction;
-
 export interface Token {
     iconUrl?: string;
     name: string;
@@ -141,7 +127,6 @@ export const ActionTypes = strEnum([
     'CLEAR_TOKEN_BY_ADDRESS',
     'UPDATE_BLOCKCHAIN_IS_LOADED',
     'UPDATE_NETWORK_ID',
-    'UPDATE_GENERATE_ORDER_STEP',
     'UPDATE_CHOSEN_ASSET_TOKEN',
     'UPDATE_CHOSEN_ASSET_TOKEN_ADDRESS',
     'UPDATE_ORDER_TAKER_ADDRESS',

From 90d274ffc4cce36c1ff572fad10bd7896e255ada Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 20:06:49 -0500
Subject: [PATCH 039/125] Update ActionType enum and move from using _.assign
 in reducer

---
 packages/website/ts/redux/dispatcher.ts |  66 +++---
 packages/website/ts/redux/reducer.ts    | 265 ++++++++++++++----------
 packages/website/ts/types.ts            |  71 ++++---
 3 files changed, 222 insertions(+), 180 deletions(-)

diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts
index e37e1fa6c4..ad5553c58b 100644
--- a/packages/website/ts/redux/dispatcher.ts
+++ b/packages/website/ts/redux/dispatcher.ts
@@ -22,42 +22,42 @@ export class Dispatcher {
     // Portal
     public resetState() {
         this.dispatch({
-            type: ActionTypes.RESET_STATE,
+            type: ActionTypes.ResetState,
         });
     }
     public updateNodeVersion(nodeVersion: string) {
         this.dispatch({
             data: nodeVersion,
-            type: ActionTypes.UPDATE_NODE_VERSION,
+            type: ActionTypes.UpdateNodeVersion,
         });
     }
     public updateScreenWidth(screenWidth: ScreenWidths) {
         this.dispatch({
             data: screenWidth,
-            type: ActionTypes.UPDATE_SCREEN_WIDTH,
+            type: ActionTypes.UpdateScreenWidth,
         });
     }
     public swapAssetTokenSymbols() {
         this.dispatch({
-            type: ActionTypes.SWAP_ASSET_TOKENS,
+            type: ActionTypes.SwapAssetTokens,
         });
     }
     public updateOrderSalt(salt: BigNumber) {
         this.dispatch({
             data: salt,
-            type: ActionTypes.UPDATE_ORDER_SALT,
+            type: ActionTypes.UpdateOrderSalt,
         });
     }
     public updateUserSuppliedOrderCache(order: Order) {
         this.dispatch({
             data: order,
-            type: ActionTypes.UPDATE_USER_SUPPLIED_ORDER_CACHE,
+            type: ActionTypes.UpdateUserSuppliedOrderCache,
         });
     }
     public updateShouldBlockchainErrDialogBeOpen(shouldBeOpen: boolean) {
         this.dispatch({
             data: shouldBeOpen,
-            type: ActionTypes.UPDATE_SHOULD_BLOCKCHAIN_ERR_DIALOG_BE_OPEN,
+            type: ActionTypes.UpdateShouldBlockchainErrDialogBeOpen,
         });
     }
     public updateChosenAssetToken(side: Side, token: AssetToken) {
@@ -66,7 +66,7 @@ export class Dispatcher {
                 side,
                 token,
             },
-            type: ActionTypes.UPDATE_CHOSEN_ASSET_TOKEN,
+            type: ActionTypes.UpdateChosenAssetToken,
         });
     }
     public updateChosenAssetTokenAddress(side: Side, address: string) {
@@ -75,72 +75,72 @@ export class Dispatcher {
                 address,
                 side,
             },
-            type: ActionTypes.UPDATE_CHOSEN_ASSET_TOKEN_ADDRESS,
+            type: ActionTypes.UpdateChosenAssetTokenAddress,
         });
     }
     public updateOrderTakerAddress(address: string) {
         this.dispatch({
             data: address,
-            type: ActionTypes.UPDATE_ORDER_TAKER_ADDRESS,
+            type: ActionTypes.UpdateOrderTakerAddress,
         });
     }
     public updateUserAddress(address: string) {
         this.dispatch({
             data: address,
-            type: ActionTypes.UPDATE_USER_ADDRESS,
+            type: ActionTypes.UpdateUserAddress,
         });
     }
     public updateOrderExpiry(unixTimestampSec: BigNumber) {
         this.dispatch({
             data: unixTimestampSec,
-            type: ActionTypes.UPDATE_ORDER_EXPIRY,
+            type: ActionTypes.UpdateOrderExpiry,
         });
     }
     public encounteredBlockchainError(err: BlockchainErrs) {
         this.dispatch({
              data: err,
-             type: ActionTypes.BLOCKCHAIN_ERR_ENCOUNTERED,
+             type: ActionTypes.BlockchainErrEncountered,
          });
     }
     public updateBlockchainIsLoaded(isLoaded: boolean) {
         this.dispatch({
              data: isLoaded,
-             type: ActionTypes.UPDATE_BLOCKCHAIN_IS_LOADED,
+             type: ActionTypes.UpdateBlockchainIsLoaded,
          });
     }
     public addTokenToTokenByAddress(token: Token) {
         this.dispatch({
              data: token,
-             type: ActionTypes.ADD_TOKEN_TO_TOKEN_BY_ADDRESS,
+             type: ActionTypes.AddTokenToTokenByAddress,
          });
     }
     public removeTokenToTokenByAddress(token: Token) {
         this.dispatch({
              data: token,
-             type: ActionTypes.REMOVE_TOKEN_TO_TOKEN_BY_ADDRESS,
+             type: ActionTypes.RemoveTokenFromTokenByAddress,
          });
     }
     public clearTokenByAddress() {
         this.dispatch({
-            type: ActionTypes.CLEAR_TOKEN_BY_ADDRESS,
+            type: ActionTypes.ClearTokenByAddress,
          });
     }
     public updateTokenByAddress(tokens: Token[]) {
         this.dispatch({
              data: tokens,
-             type: ActionTypes.UPDATE_TOKEN_BY_ADDRESS,
+             type: ActionTypes.UpdateTokenByAddress,
          });
     }
     public updateTokenStateByAddress(tokenStateByAddress: TokenStateByAddress) {
         this.dispatch({
              data: tokenStateByAddress,
-             type: ActionTypes.UPDATE_TOKEN_STATE_BY_ADDRESS,
+             type: ActionTypes.UpdateTokenStateByAddress,
          });
     }
     public removeFromTokenStateByAddress(tokenAddress: string) {
         this.dispatch({
             data: tokenAddress,
-            type: ActionTypes.REMOVE_FROM_TOKEN_STATE_BY_ADDRESS,
+            type: ActionTypes.RemoveFromTokenStateByAddress,
         });
     }
     public replaceTokenAllowanceByAddress(address: string, allowance: BigNumber) {
@@ -149,7 +149,7 @@ export class Dispatcher {
               address,
               allowance,
             },
-            type: ActionTypes.REPLACE_TOKEN_ALLOWANCE_BY_ADDRESS,
+            type: ActionTypes.ReplaceTokenAllowanceByAddress,
         });
     }
     public replaceTokenBalanceByAddress(address: string, balance: BigNumber) {
@@ -158,7 +158,7 @@ export class Dispatcher {
                 address,
                 balance,
             },
-            type: ActionTypes.REPLACE_TOKEN_BALANCE_BY_ADDRESS,
+            type: ActionTypes.ReplaceTokenBalanceByAddress,
         });
     }
     public updateTokenBalanceByAddress(address: string, balanceDelta: BigNumber) {
@@ -167,31 +167,31 @@ export class Dispatcher {
                 address,
                 balanceDelta,
             },
-            type: ActionTypes.UPDATE_TOKEN_BALANCE_BY_ADDRESS,
+            type: ActionTypes.UpdateTokenBalanceByAddress,
         });
     }
     public updateSignatureData(signatureData: SignatureData) {
         this.dispatch({
              data: signatureData,
-             type: ActionTypes.UPDATE_ORDER_SIGNATURE_DATA,
+             type: ActionTypes.UpdateOrderSignatureData,
          });
     }
     public updateUserEtherBalance(balance: BigNumber) {
         this.dispatch({
              data: balance,
-             type: ActionTypes.UPDATE_USER_ETHER_BALANCE,
+             type: ActionTypes.UpdateUserEtherBalance,
          });
     }
     public updateNetworkId(networkId: number) {
         this.dispatch({
              data: networkId,
-             type: ActionTypes.UPDATE_NETWORK_ID,
+             type: ActionTypes.UpdateNetworkId,
          });
     }
     public updateOrderFillAmount(amount: BigNumber) {
         this.dispatch({
             data: amount,
-            type: ActionTypes.UPDATE_ORDER_FILL_AMOUNT,
+            type: ActionTypes.UpdateOrderFillAmount,
         });
     }
 
@@ -199,13 +199,13 @@ export class Dispatcher {
     public updateCurrentDocsVersion(version: string) {
         this.dispatch({
             data: version,
-            type: ActionTypes.UPDATE_LIBRARY_VERSION,
+            type: ActionTypes.UpdateLibraryVersion,
         });
     }
     public updateAvailableDocVersions(versions: string[]) {
         this.dispatch({
             data: versions,
-            type: ActionTypes.UPDATE_AVAILABLE_LIBRARY_VERSIONS,
+            type: ActionTypes.UpdateAvailableLibraryVersions,
         });
     }
 
@@ -213,23 +213,23 @@ export class Dispatcher {
     public showFlashMessage(msg: string|React.ReactNode) {
         this.dispatch({
             data: msg,
-            type: ActionTypes.SHOW_FLASH_MESSAGE,
+            type: ActionTypes.ShowFlashMessage,
         });
     }
     public hideFlashMessage() {
         this.dispatch({
-            type: ActionTypes.HIDE_FLASH_MESSAGE,
+            type: ActionTypes.HideFlashMessage,
         });
     }
     public updateProviderType(providerType: ProviderType) {
         this.dispatch({
-            type: ActionTypes.UPDATE_PROVIDER_TYPE,
+            type: ActionTypes.UpdateProviderType,
             data: providerType,
         });
     }
     public updateInjectedProviderName(injectedProviderName: string) {
         this.dispatch({
-            type: ActionTypes.UPDATE_INJECTED_PROVIDER_NAME,
+            type: ActionTypes.UpdateInjectedProviderName,
             data: injectedProviderName,
         });
     }
diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts
index 361e5f8c67..43bdeaa83a 100644
--- a/packages/website/ts/redux/reducer.ts
+++ b/packages/website/ts/redux/reducer.ts
@@ -94,250 +94,293 @@ const INITIAL_STATE: State = {
 export function reducer(state: State = INITIAL_STATE, action: Action) {
     switch (action.type) {
         // Portal
-        case ActionTypes.RESET_STATE:
+        case ActionTypes.ResetState:
             return INITIAL_STATE;
 
-        case ActionTypes.UPDATE_ORDER_SALT: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateOrderSalt: {
+            return {
+                ...state,
                 orderSalt: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_NODE_VERSION: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateNodeVersion: {
+            return {
+                ...state,
                 nodeVersion: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_ORDER_FILL_AMOUNT: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateOrderFillAmount: {
+            return {
+                ...state,
                 orderFillAmount: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_SHOULD_BLOCKCHAIN_ERR_DIALOG_BE_OPEN: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateShouldBlockchainErrDialogBeOpen: {
+            return {
+                ...state,
                 shouldBlockchainErrDialogBeOpen: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_USER_ETHER_BALANCE: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateUserEtherBalance: {
+            return {
+                ...state,
                 userEtherBalance: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_USER_SUPPLIED_ORDER_CACHE: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateUserSuppliedOrderCache: {
+            return {
+                ...state,
                 userSuppliedOrderCache: action.data,
-            });
+            };
         }
 
-        case ActionTypes.CLEAR_TOKEN_BY_ADDRESS: {
-            return _.assign({}, state, {
+        case ActionTypes.ClearTokenByAddress: {
+            return {
+                ...state,
                 tokenByAddress: {},
-            });
+            };
         }
 
-        case ActionTypes.ADD_TOKEN_TO_TOKEN_BY_ADDRESS: {
+        case ActionTypes.AddTokenToTokenByAddress: {
             const newTokenByAddress = state.tokenByAddress;
             newTokenByAddress[action.data.address] = action.data;
-            return _.assign({}, state, {
+            return {
+                ...state,
                 tokenByAddress: newTokenByAddress,
-            });
+            };
         }
 
-        case ActionTypes.REMOVE_TOKEN_TO_TOKEN_BY_ADDRESS: {
+        case ActionTypes.RemoveTokenFromTokenByAddress: {
             const newTokenByAddress = state.tokenByAddress;
             delete newTokenByAddress[action.data.address];
-            return _.assign({}, state, {
+            return {
+                ...state,
                 tokenByAddress: newTokenByAddress,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_TOKEN_BY_ADDRESS: {
+        case ActionTypes.UpdateTokenByAddress: {
             const tokenByAddress = state.tokenByAddress;
             const tokens = action.data;
             _.each(tokens, token => {
-                const updatedToken = _.assign({}, tokenByAddress[token.address], token);
+                const updatedToken = {
+                    ...tokenByAddress[token.address],
+                    ...token,
+                };
                 tokenByAddress[token.address] = updatedToken;
             });
-            return _.assign({}, state, {
+            return {
+                ...state,
                 tokenByAddress,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_TOKEN_STATE_BY_ADDRESS: {
+        case ActionTypes.UpdateTokenStateByAddress: {
             const tokenStateByAddress = state.tokenStateByAddress;
             const updatedTokenStateByAddress = action.data;
             _.each(updatedTokenStateByAddress, (tokenState: TokenState, address: string) => {
-                const updatedTokenState = _.assign({}, tokenStateByAddress[address], tokenState);
+                const updatedTokenState = {
+                    ...tokenStateByAddress[address],
+                    ...tokenState,
+                };
                 tokenStateByAddress[address] = updatedTokenState;
             });
-            return _.assign({}, state, {
+            return {
+                ...state,
                 tokenStateByAddress,
-            });
+            };
         }
 
-        case ActionTypes.REMOVE_FROM_TOKEN_STATE_BY_ADDRESS: {
+        case ActionTypes.RemoveFromTokenStateByAddress: {
             const tokenStateByAddress = state.tokenStateByAddress;
             const tokenAddress = action.data;
             delete tokenStateByAddress[tokenAddress];
-            return _.assign({}, state, {
+            return {
+                ...state,
                 tokenStateByAddress,
-            });
+            };
         }
 
-        case ActionTypes.REPLACE_TOKEN_ALLOWANCE_BY_ADDRESS: {
+        case ActionTypes.ReplaceTokenAllowanceByAddress: {
             const tokenStateByAddress = state.tokenStateByAddress;
             const allowance = action.data.allowance;
             const tokenAddress = action.data.address;
-            tokenStateByAddress[tokenAddress] = _.assign({}, tokenStateByAddress[tokenAddress], {
+            tokenStateByAddress[tokenAddress] = {
+                ...tokenStateByAddress[tokenAddress],
                 allowance,
-            });
-            return _.assign({}, state, {
+            };
+            return {
+                ...state,
                 tokenStateByAddress,
-            });
+            };
         }
 
-        case ActionTypes.REPLACE_TOKEN_BALANCE_BY_ADDRESS: {
+        case ActionTypes.ReplaceTokenBalanceByAddress: {
             const tokenStateByAddress = state.tokenStateByAddress;
             const balance = action.data.balance;
             const tokenAddress = action.data.address;
-            tokenStateByAddress[tokenAddress] = _.assign({}, tokenStateByAddress[tokenAddress], {
+            tokenStateByAddress[tokenAddress] = {
+                ...tokenStateByAddress[tokenAddress],
                 balance,
-            });
-            return _.assign({}, state, {
+            };
+            return {
+                ...state,
                 tokenStateByAddress,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_TOKEN_BALANCE_BY_ADDRESS: {
+        case ActionTypes.UpdateTokenBalanceByAddress: {
             const tokenStateByAddress = state.tokenStateByAddress;
             const balanceDelta = action.data.balanceDelta;
             const tokenAddress = action.data.address;
             const currBalance = tokenStateByAddress[tokenAddress].balance;
-            tokenStateByAddress[tokenAddress] = _.assign({}, tokenStateByAddress[tokenAddress], {
+            tokenStateByAddress[tokenAddress] = {
+                ...tokenStateByAddress[tokenAddress],
                 balance: currBalance.plus(balanceDelta),
-            });
-            return _.assign({}, state, {
+            };
+            return {
+                ...state,
                 tokenStateByAddress,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_ORDER_SIGNATURE_DATA: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateOrderSignatureData: {
+            return {
+                ...state,
                 orderSignatureData: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_SCREEN_WIDTH: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateScreenWidth: {
+            return {
+                ...state,
                 screenWidth: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_BLOCKCHAIN_IS_LOADED: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateBlockchainIsLoaded: {
+            return {
+                ...state,
                 blockchainIsLoaded: action.data,
-            });
+            };
         }
 
-        case ActionTypes.BLOCKCHAIN_ERR_ENCOUNTERED: {
-            return _.assign({}, state, {
+        case ActionTypes.BlockchainErrEncountered: {
+            return {
+                ...state,
                 blockchainErr: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_NETWORK_ID: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateNetworkId: {
+            return {
+                ...state,
                 networkId: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_CHOSEN_ASSET_TOKEN: {
-            const newSideToAssetToken = _.assign({}, state.sideToAssetToken, {
+        case ActionTypes.UpdateChosenAssetToken: {
+            const newSideToAssetToken = {
+                ...state.sideToAssetToken,
                 [action.data.side]: action.data.token,
-            });
-            return _.assign({}, state, {
+            };
+            return {
+                ...state,
                 sideToAssetToken: newSideToAssetToken,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_CHOSEN_ASSET_TOKEN_ADDRESS: {
+        case ActionTypes.UpdateChosenAssetTokenAddress: {
             const newAssetToken = state.sideToAssetToken[action.data.side];
             newAssetToken.address = action.data.address;
-            const newSideToAssetToken = _.assign({}, state.sideToAssetToken, {
+            const newSideToAssetToken = {
+                ...state.sideToAssetToken,
                 [action.data.side]: newAssetToken,
-            });
-            return _.assign({}, state, {
+            };
+            return {
+                ...state,
                 sideToAssetToken: newSideToAssetToken,
-            });
+            };
         }
 
-        case ActionTypes.SWAP_ASSET_TOKENS: {
-            const newSideToAssetToken = _.assign({}, state.sideToAssetToken, {
+        case ActionTypes.SwapAssetTokens: {
+            const newSideToAssetToken = {
                 [Side.Deposit]: state.sideToAssetToken[Side.Receive],
                 [Side.Receive]: state.sideToAssetToken[Side.Deposit],
-            });
-            return _.assign({}, state, {
+            };
+            return {
+                ...state,
                 sideToAssetToken: newSideToAssetToken,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_ORDER_EXPIRY: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateOrderExpiry: {
+            return {
+                ...state,
                 orderExpiryTimestamp: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_ORDER_TAKER_ADDRESS: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateOrderTakerAddress: {
+            return {
+                ...state,
                 orderTakerAddress: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_USER_ADDRESS: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateUserAddress: {
+            return {
+                ...state,
                 userAddress: action.data,
-            });
+            };
         }
 
         // Docs
-        case ActionTypes.UPDATE_LIBRARY_VERSION: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateLibraryVersion: {
+            return {
+                ...state,
                 docsVersion: action.data,
-            });
+            };
         }
-        case ActionTypes.UPDATE_AVAILABLE_LIBRARY_VERSIONS: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateAvailableLibraryVersions: {
+            return {
+                ...state,
                 availableDocVersions: action.data,
-            });
+            };
         }
 
         // Shared
-        case ActionTypes.SHOW_FLASH_MESSAGE: {
-            return _.assign({}, state, {
+        case ActionTypes.ShowFlashMessage: {
+            return {
+                ...state,
                 flashMessage: action.data,
-            });
+            };
         }
 
-        case ActionTypes.HIDE_FLASH_MESSAGE: {
-            return _.assign({}, state, {
+        case ActionTypes.HideFlashMessage: {
+            return {
+                ...state,
                 flashMessage: undefined,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_PROVIDER_TYPE: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateProviderType: {
+            return {
+                ...state,
                 providerType: action.data,
-            });
+            };
         }
 
-        case ActionTypes.UPDATE_INJECTED_PROVIDER_NAME: {
-            return _.assign({}, state, {
+        case ActionTypes.UpdateInjectedProviderName: {
+            return {
+                ...state,
                 injectedProviderName: action.data,
-            });
+            };
         }
 
         default:
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 52d30ae351..58f44dd458 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -117,47 +117,46 @@ export enum BalanceErrs {
     allowanceSettingFailed,
 }
 
-export const ActionTypes = strEnum([
+export enum ActionTypes {
     // Portal
-    'UPDATE_SCREEN_WIDTH',
-    'UPDATE_NODE_VERSION',
-    'RESET_STATE',
-    'ADD_TOKEN_TO_TOKEN_BY_ADDRESS',
-    'BLOCKCHAIN_ERR_ENCOUNTERED',
-    'CLEAR_TOKEN_BY_ADDRESS',
-    'UPDATE_BLOCKCHAIN_IS_LOADED',
-    'UPDATE_NETWORK_ID',
-    'UPDATE_CHOSEN_ASSET_TOKEN',
-    'UPDATE_CHOSEN_ASSET_TOKEN_ADDRESS',
-    'UPDATE_ORDER_TAKER_ADDRESS',
-    'UPDATE_ORDER_SALT',
-    'UPDATE_ORDER_SIGNATURE_DATA',
-    'UPDATE_TOKEN_BY_ADDRESS',
-    'REMOVE_TOKEN_TO_TOKEN_BY_ADDRESS',
-    'UPDATE_TOKEN_STATE_BY_ADDRESS',
-    'REMOVE_FROM_TOKEN_STATE_BY_ADDRESS',
-    'REPLACE_TOKEN_ALLOWANCE_BY_ADDRESS',
-    'REPLACE_TOKEN_BALANCE_BY_ADDRESS',
-    'UPDATE_TOKEN_BALANCE_BY_ADDRESS',
-    'UPDATE_ORDER_EXPIRY',
-    'SWAP_ASSET_TOKENS',
-    'UPDATE_USER_ADDRESS',
-    'UPDATE_USER_ETHER_BALANCE',
-    'UPDATE_USER_SUPPLIED_ORDER_CACHE',
-    'UPDATE_ORDER_FILL_AMOUNT',
-    'UPDATE_SHOULD_BLOCKCHAIN_ERR_DIALOG_BE_OPEN',
+    UpdateScreenWidth = 'UPDATE_SCREEN_WIDTH',
+    UpdateNodeVersion = 'UPDATE_NODE_VERSION',
+    ResetState = 'RESET_STATE',
+    AddTokenToTokenByAddress = 'ADD_TOKEN_TO_TOKEN_BY_ADDRESS',
+    BlockchainErrEncountered = 'BLOCKCHAIN_ERR_ENCOUNTERED',
+    ClearTokenByAddress = 'CLEAR_TOKEN_BY_ADDRESS',
+    UpdateBlockchainIsLoaded = 'UPDATE_BLOCKCHAIN_IS_LOADED',
+    UpdateNetworkId = 'UPDATE_NETWORK_ID',
+    UpdateChosenAssetToken = 'UPDATE_CHOSEN_ASSET_TOKEN',
+    UpdateChosenAssetTokenAddress = 'UPDATE_CHOSEN_ASSET_TOKEN_ADDRESS',
+    UpdateOrderTakerAddress = 'UPDATE_ORDER_TAKER_ADDRESS',
+    UpdateOrderSalt = 'UPDATE_ORDER_SALT',
+    UpdateOrderSignatureData = 'UPDATE_ORDER_SIGNATURE_DATA',
+    UpdateTokenByAddress = 'UPDATE_TOKEN_BY_ADDRESS',
+    RemoveTokenFromTokenByAddress = 'REMOVE_TOKEN_FROM_TOKEN_BY_ADDRESS',
+    UpdateTokenStateByAddress = 'UPDATE_TOKEN_STATE_BY_ADDRESS',
+    RemoveFromTokenStateByAddress = 'REMOVE_FROM_TOKEN_STATE_BY_ADDRESS',
+    ReplaceTokenAllowanceByAddress = 'REPLACE_TOKEN_ALLOWANCE_BY_ADDRESS',
+    ReplaceTokenBalanceByAddress = 'REPLACE_TOKEN_BALANCE_BY_ADDRESS',
+    UpdateTokenBalanceByAddress = 'UPDATE_TOKEN_BALANCE_BY_ADDRESS',
+    UpdateOrderExpiry = 'UPDATE_ORDER_EXPIRY',
+    SwapAssetTokens = 'SWAP_ASSET_TOKENS',
+    UpdateUserAddress = 'UPDATE_USER_ADDRESS',
+    UpdateUserEtherBalance = 'UPDATE_USER_ETHER_BALANCE',
+    UpdateUserSuppliedOrderCache = 'UPDATE_USER_SUPPLIED_ORDER_CACHE',
+    UpdateOrderFillAmount = 'UPDATE_ORDER_FILL_AMOUNT',
+    UpdateShouldBlockchainErrDialogBeOpen = 'UPDATE_SHOULD_BLOCKCHAIN_ERR_DIALOG_BE_OPEN',
 
     // Docs
-    'UPDATE_LIBRARY_VERSION',
-    'UPDATE_AVAILABLE_LIBRARY_VERSIONS',
+    UpdateLibraryVersion = 'UPDATE_LIBRARY_VERSION',
+    UpdateAvailableLibraryVersions = 'UPDATE_AVAILABLE_LIBRARY_VERSIONS',
 
     // Shared
-    'SHOW_FLASH_MESSAGE',
-    'HIDE_FLASH_MESSAGE',
-    'UPDATE_PROVIDER_TYPE',
-    'UPDATE_INJECTED_PROVIDER_NAME',
-]);
-export type ActionTypes = keyof typeof ActionTypes;
+    ShowFlashMessage = 'SHOW_FLASH_MESSAGE',
+    HideFlashMessage = 'HIDE_FLASH_MESSAGE',
+    UpdateProviderType = 'UPDATE_PROVIDER_TYPE',
+    UpdateInjectedProviderName = 'UPDATE_INJECTED_PROVIDER_NAME',
+}
 
 export interface Action {
     type: ActionTypes;

From abbad68eb838ec4611d2236a7b0036a4a4d3058e Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 20:48:23 -0500
Subject: [PATCH 040/125] Replace remaining strEnums with property TS string
 enums

---
 packages/website/ts/blockchain.ts             | 30 ++++----
 .../components/eth_weth_conversion_button.tsx |  2 +-
 .../website/ts/components/send_button.tsx     |  2 +-
 .../website/ts/components/token_balances.tsx  | 12 +--
 .../trade_history/trade_history_item.tsx      |  2 +-
 .../ts/components/ui/ethereum_address.tsx     |  2 +-
 .../ts/components/ui/etherscan_icon.tsx       |  2 +-
 packages/website/ts/components/ui/party.tsx   |  2 +-
 .../ts/pages/documentation/documentation.tsx  |  2 +-
 .../pages/documentation/type_definition.tsx   |  2 +-
 packages/website/ts/pages/landing/landing.tsx | 24 +++---
 packages/website/ts/redux/reducer.ts          |  2 +-
 packages/website/ts/types.ts                  | 75 ++++++++-----------
 packages/website/ts/utils/typedoc_utils.ts    |  4 +-
 packages/website/ts/utils/utils.ts            |  6 +-
 15 files changed, 78 insertions(+), 91 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 336397f7f5..c8ebd6b938 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -186,7 +186,7 @@ export class Blockchain {
         // later on in the logic.
         let provider;
         switch (providerType) {
-            case ProviderType.LEDGER: {
+            case ProviderType.Ledger: {
                 const isU2FSupported = await utils.isU2FSupportedAsync();
                 if (!isU2FSupported) {
                     throw new Error('Cannot update providerType to LEDGER without U2F support');
@@ -220,7 +220,7 @@ export class Blockchain {
                 break;
             }
 
-            case ProviderType.INJECTED: {
+            case ProviderType.Injected: {
                 if (_.isUndefined(this.cachedProvider)) {
                     return; // Going from injected to injected, so we noop
                 }
@@ -241,8 +241,8 @@ export class Blockchain {
         await this.fetchTokenInformationAsync();
     }
     public async setProxyAllowanceAsync(token: Token, amountInBaseUnits: BigNumber): Promise<void> {
-        utils.assert(this.isValidAddress(token.address), BlockchainCallErrs.TOKEN_ADDRESS_IS_INVALID);
-        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
+        utils.assert(this.isValidAddress(token.address), BlockchainCallErrs.TokenAddressIsInvalid);
+        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses);
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
 
         const txHash = await this.zeroEx.token.setProxyAllowanceAsync(
@@ -258,7 +258,7 @@ export class Blockchain {
             token.address, this.userAddress, toAddress, amountInBaseUnits,
         );
         await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
-        const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.tx);
+        const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.Tx);
         this.dispatcher.showFlashMessage(React.createElement(TokenSendCompleted, {
             etherScanLinkIfExists,
             token,
@@ -294,7 +294,7 @@ export class Blockchain {
     }
     public async fillOrderAsync(signedOrder: SignedOrder,
                                 fillTakerTokenAmount: BigNumber): Promise<BigNumber> {
-        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
+        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses);
 
         const shouldThrowOnInsufficientBalanceOrAllowance = true;
 
@@ -346,7 +346,7 @@ export class Blockchain {
         return this.web3Wrapper.isAddress(lowercaseAddress);
     }
     public async pollTokenBalanceAsync(token: Token) {
-        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
+        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses);
 
         const [currBalance] = await this.getTokenBalanceAndAllowanceAsync(this.userAddress, token.address);
 
@@ -375,7 +375,7 @@ export class Blockchain {
         return signatureData;
     }
     public async mintTestTokensAsync(token: Token) {
-        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
+        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses);
 
         const mintableContract = await this.instantiateContractIfExistsAsync(MintableArtifacts, token.address);
         await mintableContract.mint(constants.MINT_AMOUNT, {
@@ -390,14 +390,14 @@ export class Blockchain {
     }
     public async convertEthToWrappedEthTokensAsync(amount: BigNumber): Promise<void> {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
-        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
+        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses);
 
         const txHash = await this.zeroEx.etherToken.depositAsync(amount, this.userAddress);
         await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
     }
     public async convertWrappedEthTokensToEthAsync(amount: BigNumber): Promise<void> {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
-        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
+        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses);
 
         const txHash = await this.zeroEx.etherToken.withdrawAsync(amount, this.userAddress);
         await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
@@ -463,7 +463,7 @@ export class Blockchain {
     }
     private async showEtherScanLinkAndAwaitTransactionMinedAsync(
         txHash: string): Promise<TransactionReceiptWithDecodedLogs> {
-        const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.tx);
+        const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.Tx);
         this.dispatcher.showFlashMessage(React.createElement(TransactionSubmitted, {
             etherScanLinkIfExists,
         }));
@@ -491,7 +491,7 @@ export class Blockchain {
     }
     private async startListeningForExchangeLogFillEventsAsync(indexFilterValues: IndexedFilterValues): Promise<void> {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
-        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
+        utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses);
 
         // Fetch historical logs
         await this.fetchHistoricalExchangeLogFillEventsAsync(indexFilterValues);
@@ -733,7 +733,7 @@ export class Blockchain {
             const doesContractExist = await this.doesContractExistAtAddressAsync(contractAddress);
             if (!doesContractExist) {
                 utils.consoleLog(`Contract does not exist: ${artifact.contract_name} at ${contractAddress}`);
-                throw new Error(BlockchainCallErrs.CONTRACT_DOES_NOT_EXIST);
+                throw new Error(BlockchainCallErrs.ContractDoesNotExist);
             }
         }
 
@@ -746,10 +746,10 @@ export class Blockchain {
             const errMsg = `${err}`;
             utils.consoleLog(`Notice: Error encountered: ${err} ${err.stack}`);
             if (_.includes(errMsg, 'not been deployed to detected network')) {
-                throw new Error(BlockchainCallErrs.CONTRACT_DOES_NOT_EXIST);
+                throw new Error(BlockchainCallErrs.ContractDoesNotExist);
             } else {
                 await errorReporter.reportAsync(err);
-                throw new Error(BlockchainCallErrs.UNHANDLED_ERROR);
+                throw new Error(BlockchainCallErrs.UnhandledError);
             }
         }
     }
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index ae919921d3..5464f8df0f 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -104,7 +104,7 @@ export class EthWethConversionButton extends
             this.props.onConversionSuccessful();
         } catch (err) {
             const errMsg = '' + err;
-            if (_.includes(errMsg, BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES)) {
+            if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) {
                 this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
             } else if (!_.includes(errMsg, 'User denied transaction')) {
                 utils.consoleLog(`Unexpected error encountered: ${err}`);
diff --git a/packages/website/ts/components/send_button.tsx b/packages/website/ts/components/send_button.tsx
index b3fd2aebae..1fc3009648 100644
--- a/packages/website/ts/components/send_button.tsx
+++ b/packages/website/ts/components/send_button.tsx
@@ -70,7 +70,7 @@ export class SendButton extends React.Component<SendButtonProps, SendButtonState
             this.props.dispatcher.replaceTokenBalanceByAddress(token.address, balance);
         } catch (err) {
             const errMsg = `${err}`;
-            if (_.includes(errMsg, BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES)) {
+            if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) {
                 this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
                 return;
             } else if (!_.includes(errMsg, 'User denied transaction')) {
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index dd7a722f58..5338e96099 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -156,7 +156,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
         const tokenTableHeight = allTokenRowHeight < MAX_TOKEN_TABLE_HEIGHT ?
                                  allTokenRowHeight :
                                  MAX_TOKEN_TABLE_HEIGHT;
-        const isSmallScreen = this.props.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.props.screenWidth === ScreenWidths.Sm;
         const tokenColSpan = isSmallScreen ? TOKEN_COL_SPAN_SM : TOKEN_COL_SPAN_LG;
         const dharmaLoanExplanation = 'If you need access to larger amounts of ether,<br> \
                                      you can request a loan from the Dharma Loan<br> \
@@ -311,7 +311,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                             <TableHeaderColumn>
                                 Action
                             </TableHeaderColumn>
-                            {this.props.screenWidth !== ScreenWidths.SM &&
+                            {this.props.screenWidth !== ScreenWidths.Sm &&
                                 <TableHeaderColumn>
                                     Send
                                 </TableHeaderColumn>
@@ -360,7 +360,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
         if (!this.props.blockchainIsLoaded || this.props.blockchainErr !== BlockchainErrs.NoError) {
             return '';
         }
-        const isSmallScreen = this.props.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.props.screenWidth === ScreenWidths.Sm;
         const tokenColSpan = isSmallScreen ? TOKEN_COL_SPAN_SM : TOKEN_COL_SPAN_LG;
         const actionPaddingX = isSmallScreen ? 2 : 24;
         const allTokens = _.values(this.props.tokenByAddress);
@@ -379,7 +379,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
     private renderTokenRow(tokenColSpan: number, actionPaddingX: number, token: Token) {
         const tokenState = this.props.tokenStateByAddress[token.address];
         const tokenLink = utils.getEtherScanLinkIfExists(token.address, this.props.networkId,
-                                                         EtherscanLinkSuffixes.address);
+                                                         EtherscanLinkSuffixes.Address);
         const isMintable = _.includes(configs.symbolsOfMintableTokens, token.symbol) &&
             this.props.networkId !== constants.MAINNET_NETWORK_ID;
         return (
@@ -432,7 +432,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                         />
                     }
                 </TableRowColumn>
-                {this.props.screenWidth !== ScreenWidths.SM &&
+                {this.props.screenWidth !== ScreenWidths.Sm &&
                     <TableRowColumn
                         style={{paddingLeft: actionPaddingX, paddingRight: actionPaddingX}}
                     >
@@ -580,7 +580,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
             return true;
         } catch (err) {
             const errMsg = '' + err;
-            if (_.includes(errMsg, BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES)) {
+            if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) {
                 this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
                 return false;
             }
diff --git a/packages/website/ts/components/trade_history/trade_history_item.tsx b/packages/website/ts/components/trade_history/trade_history_item.tsx
index 4dcceadb73..f43caecc6a 100644
--- a/packages/website/ts/components/trade_history/trade_history_item.tsx
+++ b/packages/website/ts/components/trade_history/trade_history_item.tsx
@@ -87,7 +87,7 @@ export class TradeHistoryItem extends React.Component<TradeHistoryItemProps, Tra
                             <EtherScanIcon
                                 addressOrTxHash={fill.transactionHash}
                                 networkId={this.props.networkId}
-                                etherscanLinkSuffixes={EtherscanLinkSuffixes.tx}
+                                etherscanLinkSuffixes={EtherscanLinkSuffixes.Tx}
                             />
                         </div>
                     </div>
diff --git a/packages/website/ts/components/ui/ethereum_address.tsx b/packages/website/ts/components/ui/ethereum_address.tsx
index b3bc0bc592..d568406895 100644
--- a/packages/website/ts/components/ui/ethereum_address.tsx
+++ b/packages/website/ts/components/ui/ethereum_address.tsx
@@ -26,7 +26,7 @@ export const EthereumAddress = (props: EthereumAddressProps) => {
                 <EtherScanIcon
                     addressOrTxHash={props.address}
                     networkId={props.networkId}
-                    etherscanLinkSuffixes={EtherscanLinkSuffixes.address}
+                    etherscanLinkSuffixes={EtherscanLinkSuffixes.Address}
                 />
             </div>
             <ReactTooltip id={tooltipId}>{props.address}</ReactTooltip>
diff --git a/packages/website/ts/components/ui/etherscan_icon.tsx b/packages/website/ts/components/ui/etherscan_icon.tsx
index 9b4d172f12..3ccbf0bd9f 100644
--- a/packages/website/ts/components/ui/etherscan_icon.tsx
+++ b/packages/website/ts/components/ui/etherscan_icon.tsx
@@ -13,7 +13,7 @@ interface EtherScanIconProps {
 
 export const EtherScanIcon = (props: EtherScanIconProps) => {
     const etherscanLinkIfExists = utils.getEtherScanLinkIfExists(
-        props.addressOrTxHash, props.networkId, EtherscanLinkSuffixes.address,
+        props.addressOrTxHash, props.networkId, EtherscanLinkSuffixes.Address,
     );
     const transactionTooltipId = `${props.addressOrTxHash}-etherscan-icon-tooltip`;
     return (
diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx
index e6b6ea9e26..2ff5b155e8 100644
--- a/packages/website/ts/components/ui/party.tsx
+++ b/packages/website/ts/components/ui/party.tsx
@@ -45,7 +45,7 @@ export class Party extends React.Component<PartyProps, PartyState> {
             height: IMAGE_DIMENSION,
         };
         const etherscanLinkIfExists = utils.getEtherScanLinkIfExists(
-            this.props.address, this.props.networkId, EtherscanLinkSuffixes.address,
+            this.props.address, this.props.networkId, EtherscanLinkSuffixes.Address,
         );
         const isRegistered = this.props.isInTokenRegistry;
         const registeredTooltipId = `${this.props.address}-${isRegistered}-registeredTooltip`;
diff --git a/packages/website/ts/pages/documentation/documentation.tsx b/packages/website/ts/pages/documentation/documentation.tsx
index 0ca8ae9d3a..687ba0fcc6 100644
--- a/packages/website/ts/pages/documentation/documentation.tsx
+++ b/packages/website/ts/pages/documentation/documentation.tsx
@@ -281,7 +281,7 @@ export class Documentation extends
                     return null;
                 }
                 const linkIfExists = utils.getEtherScanLinkIfExists(
-                    contractAddress, constants.networkIdByName[networkName], EtherscanLinkSuffixes.address,
+                    contractAddress, constants.networkIdByName[networkName], EtherscanLinkSuffixes.Address,
                 );
                 return (
                     <a
diff --git a/packages/website/ts/pages/documentation/type_definition.tsx b/packages/website/ts/pages/documentation/type_definition.tsx
index edcf7bf477..4ad959631d 100644
--- a/packages/website/ts/pages/documentation/type_definition.tsx
+++ b/packages/website/ts/pages/documentation/type_definition.tsx
@@ -76,7 +76,7 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                 );
                 break;
 
-            case KindString['Type alias']:
+            case KindString.TypeAlias:
                 typePrefix = 'Type Alias';
                 codeSnippet = (
                     <span>
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 7992c7a6c5..b8041ece47 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -181,7 +181,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderHero() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         const buttonLabelStyle: React.CSSProperties = {
             textTransform: 'none',
             fontSize: isSmallScreen ? 12 : 14,
@@ -265,8 +265,8 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderProjects() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
-        const isMediumScreen = this.state.screenWidth === ScreenWidths.MD;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
+        const isMediumScreen = this.state.screenWidth === ScreenWidths.Md;
         const projectList = _.map(projects, (project: Project, i: number) => {
             const colWidth = isSmallScreen ? 3 : (isMediumScreen ? 4 : 2 - (i % 2));
             return (
@@ -329,7 +329,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderTokenizationSection() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         return (
             <div
                 className="clearfix lg-py4 md-py4 sm-pb4 sm-pt2"
@@ -382,7 +382,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderProtocolSection() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         return (
             <div
                 className="clearfix lg-py4 md-py4 sm-pt4"
@@ -468,7 +468,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderBuildingBlocksSection() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         const descriptionStyle: React.CSSProperties = {
             fontFamily: 'Roboto Mono',
             lineHeight: isSmallScreen ? 1.5 : 2,
@@ -540,7 +540,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderBlockChipImage() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         return (
             <div className="col lg-col-6 md-col-6 col-12 sm-center">
                 <img
@@ -551,7 +551,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderTokenCloud() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         return (
             <div className="col lg-col-6 md-col-6 col-12 center">
                 <img
@@ -562,7 +562,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderAssetTypes() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         const assetTypes: AssetType[] = [
             {
                 title: 'Currency',
@@ -601,7 +601,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return assets;
     }
     private renderInfoBoxes() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         const boxStyle: React.CSSProperties = {
             maxWidth: 252,
             height: 386,
@@ -654,7 +654,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderUseCases() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
 
         const useCases: UseCase[] = [
             {
@@ -765,7 +765,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         );
     }
     private renderCallToAction() {
-        const isSmallScreen = this.state.screenWidth === ScreenWidths.SM;
+        const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
         const buttonLabelStyle: React.CSSProperties = {
             textTransform: 'none',
             fontSize: 15,
diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts
index 43bdeaa83a..ccf87ae18e 100644
--- a/packages/website/ts/redux/reducer.ts
+++ b/packages/website/ts/redux/reducer.ts
@@ -87,7 +87,7 @@ const INITIAL_STATE: State = {
 
     // Shared
     flashMessage: undefined,
-    providerType: ProviderType.INJECTED,
+    providerType: ProviderType.Injected,
     injectedProviderName: '',
 };
 
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 58f44dd458..736aa866ce 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -1,15 +1,6 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 
-// Utility function to create a K:V from a list of strings
-// Adapted from: https://basarat.gitbooks.io/typescript/content/docs/types/literal-types.html
-function strEnum(values: string[]): {[key: string]: string} {
-    return _.reduce(values, (result, key) => {
-        result[key] = key;
-        return result;
-    }, Object.create(null));
-}
-
 export enum Side {
     Receive = 'RECEIVE',
     Deposit = 'DEPOSIT',
@@ -229,23 +220,21 @@ export interface ContractEvent {
 
 export type InputErrMsg = React.ReactNode | string | undefined;
 export type ValidatedBigNumberCallback = (isValid: boolean, amount?: BigNumber) => void;
-export const ScreenWidths = strEnum([
-  'SM',
-  'MD',
-  'LG',
-]);
-export type ScreenWidths = keyof typeof ScreenWidths;
+export enum ScreenWidths {
+  Sm = 'SM',
+  Md = 'MD',
+  Lg = 'LG',
+}
 
 export enum AlertTypes {
     ERROR,
     SUCCESS,
 }
 
-export const EtherscanLinkSuffixes = strEnum([
-  'address',
-  'tx',
-]);
-export type EtherscanLinkSuffixes = keyof typeof EtherscanLinkSuffixes;
+export enum EtherscanLinkSuffixes {
+  Address = 'address',
+  Tx = 'tx',
+}
 
 export enum BlockchainErrs {
     AContractNotDeployedOnNetwork = 'A_CONTRACT_NOT_DEPLOYED_ON_NETWORK',
@@ -253,26 +242,25 @@ export enum BlockchainErrs {
     NoError = 'NO_ERROR',
 }
 
-export const BlockchainCallErrs = strEnum([
-  'CONTRACT_DOES_NOT_EXIST',
-  'USER_HAS_NO_ASSOCIATED_ADDRESSES',
-  'UNHANDLED_ERROR',
-  'TOKEN_ADDRESS_IS_INVALID',
-  'INVALID_SIGNATURE',
-]);
-export type BlockchainCallErrs = keyof typeof BlockchainCallErrs;
+export enum BlockchainCallErrs {
+  ContractDoesNotExist = 'CONTRACT_DOES_NOT_EXIST',
+  UserHasNoAssociatedAddresses = 'USER_HAS_NO_ASSOCIATED_ADDRESSES',
+  UnhandledError = 'UNHANDLED_ERROR',
+  TokenAddressIsInvalid = 'TOKEN_ADDRESS_IS_INVALID',
+}
 
-export const KindString = strEnum([
-  'Constructor',
-  'Property',
-  'Method',
-  'Interface',
-  'Type alias',
-  'Variable',
-  'Function',
-  'Enumeration',
-]);
-export type KindString = keyof typeof KindString;
+// Exception: We don't make the values uppercase because these KindString's need to
+// match up those returned by TypeDoc
+export enum KindString {
+  Constructor = 'Constructor',
+  Property = 'Property',
+  Method = 'Method',
+  Interface = 'Interface',
+  TypeAlias = 'Type alias',
+  Variable = 'Variable',
+  Function = 'Function',
+  Enumeration = 'Enumeration',
+}
 
 export interface EnumValue {
     name: string;
@@ -468,11 +456,10 @@ export interface MenuSubsectionsBySection {
     [section: string]: string[];
 }
 
-export const ProviderType = strEnum([
-  'INJECTED',
-  'LEDGER',
-]);
-export type ProviderType = keyof typeof ProviderType;
+export enum ProviderType {
+  Injected = 'INJECTED',
+  Ledger = 'LEDGER',
+}
 
 export interface Fact {
     title: string;
diff --git a/packages/website/ts/utils/typedoc_utils.ts b/packages/website/ts/utils/typedoc_utils.ts
index 9d3b9f8d7a..ed8834a878 100644
--- a/packages/website/ts/utils/typedoc_utils.ts
+++ b/packages/website/ts/utils/typedoc_utils.ts
@@ -22,7 +22,7 @@ export const typeDocUtils = {
     isType(entity: TypeDocNode): boolean {
         return entity.kindString === KindString.Interface ||
                entity.kindString === KindString.Function ||
-               entity.kindString === KindString['Type alias'] ||
+               entity.kindString === KindString.TypeAlias ||
                entity.kindString === KindString.Variable ||
                entity.kindString === KindString.Enumeration;
     },
@@ -126,7 +126,7 @@ export const typeDocUtils = {
                 case KindString.Function:
                 case KindString.Variable:
                 case KindString.Enumeration:
-                case KindString['Type alias']:
+                case KindString.TypeAlias:
                     if (docsInfo.isPublicType(entity.name)) {
                         const customType = typeDocUtils._convertCustomType(
                             entity, docsInfo.sections, sectionName, docsInfo.subPackageName);
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index a6f80c2ab5..211a56d452 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -124,11 +124,11 @@ export const utils = {
         // This logic mirrors the CSS media queries in BassCSS for the `lg-`, `md-` and `sm-` CSS
         // class prefixes. Do not edit these.
         if (widthInEm > LG_MIN_EM) {
-            return ScreenWidths.LG;
+            return ScreenWidths.Lg;
         } else if (widthInEm > MD_MIN_EM) {
-            return ScreenWidths.MD;
+            return ScreenWidths.Md;
         } else {
-            return ScreenWidths.SM;
+            return ScreenWidths.Sm;
         }
     },
     isUserOnMobile(): boolean {

From 0578116f1dbe89a5b3c0c7e5f45948a1434b07b3 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 20:51:54 -0500
Subject: [PATCH 041/125] Fix unhoverable help tooltip by renaming `Trade
 Permissions` to `Allowance`

---
 packages/website/ts/components/token_balances.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 5338e96099..b111e1ec6c 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -164,7 +164,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                                      minutes or less.';
         const allowanceExplanation = '0x smart contracts require access to your<br> \
                                   token balances in order to execute trades.<br> \
-                                  Toggling permissions sets an allowance for the<br> \
+                                  Toggling sets an allowance for the<br> \
                                   smart contract so you can start trading that token.';
         return (
             <div className="lg-px4 md-px4 sm-px1 pb2">
@@ -302,7 +302,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                             </TableHeaderColumn>
                             <TableHeaderColumn style={{paddingLeft: 3}}>Balance</TableHeaderColumn>
                             <TableHeaderColumn>
-                                <div className="inline-block">{!isSmallScreen && 'Trade '}Permissions</div>
+                                <div className="inline-block">Allowance</div>
                                 <HelpTooltip
                                     style={{paddingLeft: 4}}
                                     explanation={allowanceExplanation}

From f698dd40772eee0b3142028f62b6c56dcfcc5a1e Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 20:55:50 -0500
Subject: [PATCH 042/125] Use bigNumberConfigs from @0xproject/utils in website
 repo

---
 packages/website/package.json | 1 +
 packages/website/ts/index.tsx | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/website/package.json b/packages/website/package.json
index a6703af7e4..235ff236e9 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -20,6 +20,7 @@
   "dependencies": {
     "0x.js": "~0.27.2",
     "@0xproject/subproviders": "^0.1.0",
+    "@0xproject/utils": "^0.1.0",
     "accounting": "^0.4.1",
     "basscss": "^8.0.3",
     "bignumber.js": "~4.1.0",
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 71565fa4d5..69bb03dce0 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -1,6 +1,7 @@
 // Polyfills
 import 'whatwg-fetch';
 
+import {bigNumberConfigs} from '@0xproject/utils';
 import BigNumber from 'bignumber.js';
 import {colors, getMuiTheme, MuiThemeProvider} from 'material-ui/styles';
 import * as React from 'react';
@@ -22,11 +23,7 @@ import {WebsitePaths} from 'ts/types';
 import {constants} from 'ts/utils/constants';
 injectTapEventPlugin();
 
-// By default BigNumber's `toString` method converts to exponential notation if the value has
-// more then 20 digits. We want to avoid this behavior, so we set EXPONENTIAL_AT to a high number
-BigNumber.config({
-    EXPONENTIAL_AT: 1000,
-});
+bigNumberConfigs.configure();
 
 // Check if we've introduced an update that requires us to clear the tradeHistory local storage entries
 tradeHistoryStorage.clearIfRequired();

From 98c01c2f8097c849c53d87a4946edfd4fba94495 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Sun, 17 Dec 2017 20:57:39 -0500
Subject: [PATCH 043/125] Remove unused `location` prop

---
 packages/website/ts/components/footer.tsx     | 4 +---
 packages/website/ts/components/portal.tsx     | 2 +-
 packages/website/ts/pages/about/about.tsx     | 2 +-
 packages/website/ts/pages/faq/faq.tsx         | 2 +-
 packages/website/ts/pages/landing/landing.tsx | 2 +-
 packages/website/ts/pages/not_found.tsx       | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index b265230945..7cd9128dff 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -111,9 +111,7 @@ const titleToIcon: {[title: string]: string} = {
     'Reddit': 'reddit.png',
 };
 
-export interface FooterProps {
-    location: Location;
-}
+export interface FooterProps {}
 
 interface FooterState {}
 
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index 74b1bdec68..4397722881 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -224,7 +224,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
                         flashMessage={this.props.flashMessage}
                     />
                 </div>
-                <Footer location={this.props.location} />
+                <Footer />
             </div>
         );
     }
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 011bbb9d9a..6aeb4ae2d6 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -226,7 +226,7 @@ export class About extends React.Component<AboutProps, AboutState> {
                         </div>
                     </div>
                 </div>
-                <Footer location={this.props.location} />
+                <Footer />
             </div>
         );
     }
diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index b3fe21da70..630a483462 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -462,7 +462,7 @@ export class FAQ extends React.Component<FAQProps, FAQState> {
                         {this.renderSections()}
                     </div>
                 </div>
-                <Footer location={this.props.location} />
+                <Footer />
             </div>
         );
     }
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index b8041ece47..cf373bbf81 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -176,7 +176,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                 {this.renderBuildingBlocksSection()}
                 {this.renderUseCases()}
                 {this.renderCallToAction()}
-                <Footer location={this.props.location} />
+                <Footer />
             </div>
         );
     }
diff --git a/packages/website/ts/pages/not_found.tsx b/packages/website/ts/pages/not_found.tsx
index df505792d8..bdf9ad6885 100644
--- a/packages/website/ts/pages/not_found.tsx
+++ b/packages/website/ts/pages/not_found.tsx
@@ -38,7 +38,7 @@ export class NotFound extends React.Component<NotFoundProps, NotFoundState> {
                         </div>
                     </div>
                 </div>
-                <Footer location={this.props.location} />
+                <Footer />
             </div>
         );
     }

From 4dc6694651a5fba5b4e280f9eb3d5da528057cc2 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Sun, 17 Dec 2017 23:30:14 -0500
Subject: [PATCH 044/125] Move web3 import after subprovider imports in test
 web3_factory

---
 packages/0x.js/test/0x.js_test.ts                  | 6 +++---
 packages/0x.js/test/utils/web3_factory.ts          | 8 +++++++-
 packages/kovan-faucets/src/ts/handler.ts           | 2 +-
 packages/kovan-faucets/src/ts/request_queue.ts     | 2 +-
 packages/kovan-faucets/src/ts/zrx_request_queue.ts | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts
index e1ceb12c85..56585fea00 100644
--- a/packages/0x.js/test/0x.js_test.ts
+++ b/packages/0x.js/test/0x.js_test.ts
@@ -82,9 +82,9 @@ describe('ZeroEx library', () => {
         it('should return true if the signature does pertain to the dataHex & address', async () => {
             const isValidSignatureLocal = ZeroEx.isValidSignature(dataHex, signature, address);
             expect(isValidSignatureLocal).to.be.true();
-            const isValidSignatureOnContract = await (zeroEx.exchange as any)
-                ._isValidSignatureUsingContractCallAsync(dataHex, signature, address);
-            return expect(isValidSignatureOnContract).to.be.true();
+            return expect(
+                (zeroEx.exchange as any)._isValidSignatureUsingContractCallAsync(dataHex, signature, address),
+            ).to.become(true);
         });
     });
     describe('#generateSalt', () => {
diff --git a/packages/0x.js/test/utils/web3_factory.ts b/packages/0x.js/test/utils/web3_factory.ts
index 6f72cec583..7e65a43816 100644
--- a/packages/0x.js/test/utils/web3_factory.ts
+++ b/packages/0x.js/test/utils/web3_factory.ts
@@ -3,7 +3,6 @@
 // we are not running in a browser env.
 // Filed issue: https://github.com/ethereum/web3.js/issues/844
 (global as any).XMLHttpRequest = undefined;
-import * as Web3 from 'web3';
 import ProviderEngine = require('web3-provider-engine');
 import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
 
@@ -12,6 +11,13 @@ import {FakeGasEstimateSubprovider} from './subproviders/fake_gas_estimate_subpr
 
 import {constants} from './constants';
 
+// HACK: web3 leaks XMLHttpRequest into the global scope and causes requests to hang
+// because they are using the wrong XHR package.
+// importing web3 after subproviders fixes this issue
+// Filed issue: https://github.com/ethereum/web3.js/issues/844
+// tslint:disable-next-line:ordered-imports
+import * as Web3 from 'web3';
+
 export const web3Factory = {
     create(hasAddresses: boolean = true): Web3 {
         const provider = this.getRpcProvider(hasAddresses);
diff --git a/packages/kovan-faucets/src/ts/handler.ts b/packages/kovan-faucets/src/ts/handler.ts
index 1c6866a1c6..d31d1478d8 100644
--- a/packages/kovan-faucets/src/ts/handler.ts
+++ b/packages/kovan-faucets/src/ts/handler.ts
@@ -13,7 +13,7 @@ import {ZRXRequestQueue} from './zrx_request_queue';
 
 // HACK: web3 leaks XMLHttpRequest into the global scope and causes requests to hang
 // because they are using the wrong XHR package.
-// Issue: https://github.com/trufflesuite/truffle-contract/issues/14
+// Filed issue: https://github.com/ethereum/web3.js/issues/844
 // tslint:disable-next-line:ordered-imports
 import * as Web3 from 'web3';
 
diff --git a/packages/kovan-faucets/src/ts/request_queue.ts b/packages/kovan-faucets/src/ts/request_queue.ts
index 0b5e66ae93..1ad7e68be4 100644
--- a/packages/kovan-faucets/src/ts/request_queue.ts
+++ b/packages/kovan-faucets/src/ts/request_queue.ts
@@ -3,7 +3,7 @@ import * as timers from 'timers';
 
 // HACK: web3 leaks XMLHttpRequest into the global scope and causes requests to hang
 // because they are using the wrong XHR package.
-// Issue: https://github.com/trufflesuite/truffle-contract/issues/14
+// Filed issue: https://github.com/ethereum/web3.js/issues/844
 // tslint:disable-next-line:ordered-imports
 import * as Web3 from 'web3';
 
diff --git a/packages/kovan-faucets/src/ts/zrx_request_queue.ts b/packages/kovan-faucets/src/ts/zrx_request_queue.ts
index 3b505690f3..717adc3c43 100644
--- a/packages/kovan-faucets/src/ts/zrx_request_queue.ts
+++ b/packages/kovan-faucets/src/ts/zrx_request_queue.ts
@@ -9,7 +9,7 @@ import {utils} from './utils';
 
 // HACK: web3 leaks XMLHttpRequest into the global scope and causes requests to hang
 // because they are using the wrong XHR package.
-// Issue: https://github.com/trufflesuite/truffle-contract/issues/14
+// Filed issue: https://github.com/ethereum/web3.js/issues/844
 // tslint:disable-next-line:ordered-imports
 import * as Web3 from 'web3';
 

From df9d3e3e16e5a00ea84369691c46a6e4a6a53049 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Dec 2017 09:15:12 +0100
Subject: [PATCH 045/125] Consolidate all custom colors and material-ui colors
 into a colors module

---
 .../dialogs/blockchain_err_dialog.tsx         |  2 +-
 .../dialogs/eth_weth_conversion_dialog.tsx    |  8 +-
 .../dialogs/ledger_config_dialog.tsx          |  2 +-
 .../dialogs/portal_disclaimer_dialog.tsx      |  2 +-
 .../dialogs/u2f_not_supported_dialog.tsx      |  2 +-
 .../components/eth_weth_conversion_button.tsx |  1 +
 .../website/ts/components/eth_wrappers.tsx    |  5 +-
 packages/website/ts/components/fill_order.tsx |  7 +-
 .../ts/components/fill_warning_dialog.tsx     |  2 +-
 packages/website/ts/components/footer.tsx     | 12 +--
 .../generate_order/generate_order_form.tsx    |  2 +-
 .../generate_order/new_token_form.tsx         |  2 +-
 .../ts/components/inputs/address_input.tsx    |  2 +-
 .../inputs/balance_bounded_input.tsx          |  2 +-
 .../components/inputs/token_amount_input.tsx  |  2 +-
 .../ts/components/inputs/token_input.tsx      |  2 +-
 packages/website/ts/components/portal.tsx     |  4 +-
 .../website/ts/components/token_balances.tsx  |  8 +-
 packages/website/ts/components/top_bar.tsx    | 16 ++--
 .../ts/components/top_bar_menu_item.tsx       |  8 +-
 .../components/track_token_confirmation.tsx   |  2 +-
 .../trade_history/trade_history_item.tsx      |  2 +-
 packages/website/ts/components/ui/alert.tsx   |  8 +-
 .../website/ts/components/ui/copy_icon.tsx    |  2 +-
 .../ts/components/ui/drop_down_menu_item.tsx  |  4 +-
 .../ts/components/ui/etherscan_icon.tsx       |  2 +-
 .../website/ts/components/ui/input_label.tsx  |  2 +-
 .../ts/components/ui/labeled_switcher.tsx     | 73 -------------------
 .../components/ui/lifecycle_raised_button.tsx |  3 +-
 packages/website/ts/components/ui/party.tsx   |  5 +-
 .../ts/components/ui/required_label.tsx       |  2 +-
 .../website/ts/components/ui/swap_icon.tsx    |  2 +-
 packages/website/ts/index.tsx                 | 39 +++++-----
 packages/website/ts/pages/about/about.tsx     | 19 +++--
 packages/website/ts/pages/about/profile.tsx   |  3 +-
 .../ts/pages/documentation/documentation.tsx  | 12 ++-
 .../pages/documentation/event_definition.tsx  |  5 +-
 .../ts/pages/documentation/method_block.tsx   |  2 +-
 .../ts/pages/documentation/source_link.tsx    |  2 +-
 .../website/ts/pages/documentation/type.tsx   | 10 +--
 .../pages/documentation/type_definition.tsx   |  9 ++-
 packages/website/ts/pages/faq/faq.tsx         |  2 +-
 packages/website/ts/pages/faq/question.tsx    |  3 +-
 packages/website/ts/pages/landing/landing.tsx | 54 +++++++-------
 .../ts/pages/shared/nested_sidebar_menu.tsx   |  2 +-
 packages/website/ts/pages/wiki/wiki.tsx       |  4 +-
 packages/website/ts/utils/colors.ts           | 30 ++++++++
 packages/website/ts/utils/constants.ts        |  1 -
 48 files changed, 169 insertions(+), 226 deletions(-)
 delete mode 100644 packages/website/ts/components/ui/labeled_switcher.tsx
 create mode 100644 packages/website/ts/utils/colors.ts

diff --git a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
index afc89be1ae..aea5fcdd13 100644
--- a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
+++ b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
@@ -1,10 +1,10 @@
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
 import {BlockchainErrs} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 
diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index e499bdcbe4..96533defc0 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -5,8 +5,8 @@ import * as React from 'react';
 import {EthAmountInput} from 'ts/components/inputs/eth_amount_input';
 import {TokenAmountInput} from 'ts/components/inputs/token_amount_input';
 import {Side, Token, TokenState} from 'ts/types';
-
-const DARK_BLUE = '#4D5481';
+import {colors} from 'ts/utils/colors';
+import {constants} from 'ts/utils/constants';
 
 interface EthWethConversionDialogProps {
     direction: Side;
@@ -75,7 +75,7 @@ export class EthWethConversionDialog extends
                         {this.renderCurrency(isWrappedVersion)}
                         <div style={{paddingTop: 68}}>
                             <i
-                                style={{fontSize: 28, color: DARK_BLUE}}
+                                style={{fontSize: 28, color: colors.darkBlue}}
                                 className="zmdi zmdi-arrow-right"
                             />
                         </div>
@@ -124,7 +124,7 @@ export class EthWethConversionDialog extends
             <div className="mx-auto pt2">
                 <div
                     className="center"
-                    style={{color: DARK_BLUE}}
+                    style={{color: colors.darkBlue}}
                 >
                     {name}
                 </div>
diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
index d3c95a0112..e2a8b932a4 100644
--- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
+++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
@@ -2,7 +2,6 @@ import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import {colors} from 'material-ui/styles';
 import {
     Table,
     TableBody,
@@ -17,6 +16,7 @@ import ReactTooltip = require('react-tooltip');
 import {Blockchain} from 'ts/blockchain';
 import {LifeCycleRaisedButton} from 'ts/components/ui/lifecycle_raised_button';
 import {Dispatcher} from 'ts/redux/dispatcher';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
diff --git a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
index bfff7fbb57..2f824ab44b 100644
--- a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
+++ b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
@@ -1,7 +1,7 @@
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 
 interface PortalDisclaimerDialogProps {
     isOpen: boolean;
diff --git a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
index 09c32c997d..e2bef63c78 100644
--- a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
+++ b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
@@ -1,6 +1,6 @@
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {constants} from 'ts/utils/constants';
 
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index 5464f8df0f..4f218286d7 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -7,6 +7,7 @@ import {Blockchain} from 'ts/blockchain';
 import {EthWethConversionDialog} from 'ts/components/dialogs/eth_weth_conversion_dialog';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {BlockchainCallErrs, Side, Token, TokenState} from 'ts/types';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {errorReporter} from 'ts/utils/error_reporter';
 import {utils} from 'ts/utils/utils';
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 9bb05becf1..e32311e9e3 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -2,7 +2,7 @@ import {ZeroEx} from '0x.js';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Divider from 'material-ui/Divider';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import {
     Table,
     TableBody,
@@ -29,7 +29,6 @@ import {constants} from 'ts/utils/constants';
 
 const PRECISION = 5;
 const DATE_FORMAT = 'D/M/YY';
-const LIGHT_GRAY = '#A5A5A5';
 const ICON_DIMENSION = 40;
 const ETHER_ICON_PATH = '/images/ether.png';
 const OUTDATED_WETH_ICON_PATH = '/images/wrapped_eth_gray.png';
@@ -93,7 +92,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                         <a
                             target="_blank"
                             href="https://weth.io/"
-                            style={{color: LIGHT_GRAY}}
+                            style={{color: colors.gray}}
                         >
                             <div className="flex">
                                 <div>About Wrapped ETH</div>
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index 40a9b87d67..f7473b79e1 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -28,12 +28,11 @@ import {
     TokenStateByAddress,
     WebsitePaths,
 } from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 import {errorReporter} from 'ts/utils/error_reporter';
 import {utils} from 'ts/utils/utils';
 
-const CUSTOM_LIGHT_GRAY = '#BBBBBB';
-
 interface FillOrderProps {
     blockchain: Blockchain;
     blockchainErr: BlockchainErrs;
@@ -222,7 +221,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
                 <div className="clearfix pb2" style={{width: '100%'}}>
                     <div className="inline left">Order details</div>
                     <div className="inline right" style={{minWidth: 208}}>
-                        <div className="col col-4 pl2" style={{color: '#BEBEBE'}}>
+                        <div className="col col-4 pl2" style={{color: colors.gray}}>
                             Maker:
                         </div>
                         <div className="col col-2 pr1">
@@ -274,7 +273,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
                        </div>
                        <div
                            className="col col-5 pl1"
-                           style={{color: CUSTOM_LIGHT_GRAY, paddingTop: 39}}
+                           style={{color: colors.lightGray, paddingTop: 39}}
                        >
                            = {accounting.formatNumber(orderReceiveAmount, 6)} {makerToken.symbol}
                        </div>
diff --git a/packages/website/ts/components/fill_warning_dialog.tsx b/packages/website/ts/components/fill_warning_dialog.tsx
index 83e46cc8f6..e6642d4502 100644
--- a/packages/website/ts/components/fill_warning_dialog.tsx
+++ b/packages/website/ts/components/fill_warning_dialog.tsx
@@ -1,6 +1,6 @@
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 
 interface FillWarningDialogProps {
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 7cd9128dff..67e9660331 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -4,6 +4,7 @@ import {
   Link,
 } from 'react-router-dom';
 import {WebsitePaths} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 
 interface MenuItemsBySection {
@@ -24,9 +25,6 @@ enum Sections {
 }
 
 const ICON_DIMENSION = 16;
-const CUSTOM_DARK_GRAY = '#393939';
-const CUSTOM_LIGHT_GRAY = '#CACACA';
-const CUSTOM_LIGHTEST_GRAY = '#9E9E9E';
 const menuItemsBySection: MenuItemsBySection = {
     Documentation: [
         {
@@ -118,14 +116,16 @@ interface FooterState {}
 export class Footer extends React.Component<FooterProps, FooterState> {
     public render() {
         return (
-            <div className="relative pb4 pt2" style={{backgroundColor: CUSTOM_DARK_GRAY}}>
+            <div className="relative pb4 pt2" style={{backgroundColor: colors.darkerGray}}>
                 <div className="mx-auto max-width-4 md-px2 lg-px0 py4 clearfix" style={{color: 'white'}}>
                     <div className="col lg-col-4 md-col-4 col-12 left">
                         <div className="sm-mx-auto" style={{width: 148}}>
                             <div>
                                 <img src="/images/protocol_logo_white.png" height="30" />
                             </div>
-                            <div style={{fontSize: 11, color: CUSTOM_LIGHTEST_GRAY, paddingLeft: 37, paddingTop: 2}}>
+                            <div
+                                style={{fontSize: 11, color: colors.gray, paddingLeft: 37, paddingTop: 2}}
+                            >
                                 © ZeroEx, Intl.
                             </div>
                         </div>
@@ -209,7 +209,7 @@ export class Footer extends React.Component<FooterProps, FooterState> {
     private renderHeader(title: string) {
         const headerStyle = {
             textTransform: 'uppercase',
-            color: CUSTOM_LIGHT_GRAY,
+            color: colors.lightGray,
             letterSpacing: 2,
             fontFamily: 'Roboto Mono',
             fontSize: 13,
diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx
index f273045a84..7f4c257184 100644
--- a/packages/website/ts/components/generate_order/generate_order_form.tsx
+++ b/packages/website/ts/components/generate_order/generate_order_form.tsx
@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import Divider from 'material-ui/Divider';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
 import {ExpirationInput} from 'ts/components/inputs/expiration_input';
diff --git a/packages/website/ts/components/generate_order/new_token_form.tsx b/packages/website/ts/components/generate_order/new_token_form.tsx
index 1be9f5ece1..8b04919e07 100644
--- a/packages/website/ts/components/generate_order/new_token_form.tsx
+++ b/packages/website/ts/components/generate_order/new_token_form.tsx
@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx
index bd9e24c806..f5ebb41122 100644
--- a/packages/website/ts/components/inputs/address_input.tsx
+++ b/packages/website/ts/components/inputs/address_input.tsx
@@ -1,6 +1,6 @@
 import {addressUtils} from '@0xproject/utils';
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {RequiredLabel} from 'ts/components/ui/required_label';
diff --git a/packages/website/ts/components/inputs/balance_bounded_input.tsx b/packages/website/ts/components/inputs/balance_bounded_input.tsx
index 7ddefc3b99..d027783928 100644
--- a/packages/website/ts/components/inputs/balance_bounded_input.tsx
+++ b/packages/website/ts/components/inputs/balance_bounded_input.tsx
@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx
index 1ae9bc85eb..363904e4da 100644
--- a/packages/website/ts/components/inputs/token_amount_input.tsx
+++ b/packages/website/ts/components/inputs/token_amount_input.tsx
@@ -1,7 +1,7 @@
 import {ZeroEx} from '0x.js';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
 import {BalanceBoundedInput} from 'ts/components/inputs/balance_bounded_input';
diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx
index 40fdf9689c..e406ca27ba 100644
--- a/packages/website/ts/components/inputs/token_input.tsx
+++ b/packages/website/ts/components/inputs/token_input.tsx
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
 import {AssetPicker} from 'ts/components/generate_order/asset_picker';
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index 4397722881..ea076205e1 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
 import {Route, Switch} from 'react-router-dom';
@@ -171,7 +171,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
                             <div className="mx-auto flex">
                                 <div
                                     className="col col-2 pr2 pt1 sm-hide xs-hide"
-                                    style={{overflow: 'hidden', backgroundColor: 'rgb(39, 39, 39)', color: 'white'}}
+                                    style={{overflow: 'hidden', backgroundColor: colors.darkestGray, color: 'white'}}
                                 >
                                     <PortalMenu menuItemStyle={{color: 'white'}} />
                                 </div>
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index b111e1ec6c..a3c577a2e7 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -7,7 +7,7 @@ import Divider from 'material-ui/Divider';
 import FlatButton from 'material-ui/FlatButton';
 import FloatingActionButton from 'material-ui/FloatingActionButton';
 import RaisedButton from 'material-ui/RaisedButton';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import ContentAdd from 'material-ui/svg-icons/content/add';
 import ContentRemove from 'material-ui/svg-icons/content/remove';
 import {
@@ -333,9 +333,9 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                 </Dialog>
                 <Dialog
                     title="Request Dharma Loan"
-                    titleStyle={{fontWeight: 100, backgroundColor: 'rgb(250, 250, 250)'}}
-                    bodyStyle={{backgroundColor: 'rgb(37, 37, 37)'}}
-                    actionsContainerStyle={{backgroundColor: 'rgb(250, 250, 250)'}}
+                    titleStyle={{fontWeight: 100, backgroundColor: colors.white}}
+                    bodyStyle={{backgroundColor: colors.dharmaDarkGray}}
+                    actionsContainerStyle={{backgroundColor: colors.white}}
                     autoScrollBodyContent={true}
                     actions={dharmaDialogActions}
                     open={this.state.isDharmaDialogVisible}
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index 27de496208..82ce0dee20 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -1,7 +1,6 @@
 import * as _ from 'lodash';
 import Drawer from 'material-ui/Drawer';
 import MenuItem from 'material-ui/MenuItem';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
 import ReactTooltip = require('react-tooltip');
@@ -12,11 +11,10 @@ import {Identicon} from 'ts/components/ui/identicon';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {NestedSidebarMenu} from 'ts/pages/shared/nested_sidebar_menu';
 import {DocsMenu, MenuSubsectionsBySection, Styles, WebsitePaths} from 'ts/types';
+import {colors} from 'ts/utils/colors';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 
-const CUSTOM_DARK_GRAY = '#231F20';
-const SECTION_HEADER_COLOR = 'rgb(234, 234, 234)';
-
 interface TopBarProps {
     userAddress?: string;
     blockchainIsLoaded: boolean;
@@ -63,7 +61,7 @@ const styles: Styles = {
     },
     menuItem: {
         fontSize: 14,
-        color: CUSTOM_DARK_GRAY,
+        color: colors.darkestGray,
         paddingTop: 6,
         paddingBottom: 6,
         marginTop: 17,
@@ -222,7 +220,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                 {this.renderPortalMenu()}
                 {this.renderDocsMenu()}
                 {this.renderWiki()}
-                <div className="pl1 py1 mt3" style={{backgroundColor: SECTION_HEADER_COLOR}}>Website</div>
+                <div className="pl1 py1 mt3" style={{backgroundColor: colors.lightestGray}}>Website</div>
                 <Link to={WebsitePaths.Home} className="text-decoration-none">
                     <MenuItem className="py2">Home</MenuItem>
                 </Link>
@@ -286,7 +284,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
         const sectionTitle = `${this.props.docsInfo.displayName} Docs`;
         return (
             <div className="lg-hide md-hide">
-                <div className="pl1 py1" style={{backgroundColor: SECTION_HEADER_COLOR}}>{sectionTitle}</div>
+                <div className="pl1 py1" style={{backgroundColor: colors.lightestGray}}>{sectionTitle}</div>
                 <NestedSidebarMenu
                     topLevelMenu={this.props.menu}
                     menuSubsectionsBySection={this.props.menuSubsectionsBySection}
@@ -306,7 +304,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
 
         return (
             <div className="lg-hide md-hide">
-                <div className="pl1 py1" style={{backgroundColor: SECTION_HEADER_COLOR}}>0x Protocol Wiki</div>
+                <div className="pl1 py1" style={{backgroundColor: colors.lightestGray}}>0x Protocol Wiki</div>
                 <NestedSidebarMenu
                     topLevelMenu={this.props.menuSubsectionsBySection}
                     menuSubsectionsBySection={this.props.menuSubsectionsBySection}
@@ -323,7 +321,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
 
         return (
             <div className="lg-hide md-hide">
-                <div className="pl1 py1" style={{backgroundColor: SECTION_HEADER_COLOR}}>Portal DApp</div>
+                <div className="pl1 py1" style={{backgroundColor: colors.lightestGray}}>Portal DApp</div>
                 <PortalMenu
                     menuItemStyle={{color: 'black'}}
                     onClick={this.onMenuButtonClick.bind(this)}
diff --git a/packages/website/ts/components/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar_menu_item.tsx
index 38dc911940..83e4cbc351 100644
--- a/packages/website/ts/components/top_bar_menu_item.tsx
+++ b/packages/website/ts/components/top_bar_menu_item.tsx
@@ -1,10 +1,10 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
+import {colors} from 'ts/utils/colors';
 
-const CUSTOM_DARK_GRAY = '#231F20';
 const DEFAULT_STYLE = {
-    color: CUSTOM_DARK_GRAY,
+    color: colors.darkestGray,
 };
 
 interface TopBarMenuItemProps {
@@ -28,7 +28,7 @@ export class TopBarMenuItem extends React.Component<TopBarMenuItemProps, TopBarM
     public render() {
         const primaryStyles = this.props.isPrimary ? {
             borderRadius: 4,
-            border: `1px solid ${this.props.isNightVersion ? '#979797' : 'rgb(230, 229, 229)'}`,
+            border: `1px solid ${this.props.isNightVersion ? colors.gray : colors.grayishPink}`,
             marginTop: 15,
             paddingLeft: 9,
             paddingRight: 9,
@@ -36,7 +36,7 @@ export class TopBarMenuItem extends React.Component<TopBarMenuItemProps, TopBarM
         } : {};
         const menuItemColor = this.props.isNightVersion ? 'white' : this.props.style.color;
         const linkColor = _.isUndefined(menuItemColor) ?
-            CUSTOM_DARK_GRAY :
+            colors.darkestGray :
             menuItemColor;
         return (
             <div
diff --git a/packages/website/ts/components/track_token_confirmation.tsx b/packages/website/ts/components/track_token_confirmation.tsx
index cd588f239d..2cda34c1a0 100644
--- a/packages/website/ts/components/track_token_confirmation.tsx
+++ b/packages/website/ts/components/track_token_confirmation.tsx
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Party} from 'ts/components/ui/party';
 import {Token, TokenByAddress} from 'ts/types';
diff --git a/packages/website/ts/components/trade_history/trade_history_item.tsx b/packages/website/ts/components/trade_history/trade_history_item.tsx
index f43caecc6a..27d5c1e035 100644
--- a/packages/website/ts/components/trade_history/trade_history_item.tsx
+++ b/packages/website/ts/components/trade_history/trade_history_item.tsx
@@ -2,7 +2,7 @@ import {ZeroEx} from '0x.js';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as moment from 'moment';
 import * as React from 'react';
 import * as ReactTooltip from 'react-tooltip';
diff --git a/packages/website/ts/components/ui/alert.tsx b/packages/website/ts/components/ui/alert.tsx
index 71d2388f2a..bc65d0f0f5 100644
--- a/packages/website/ts/components/ui/alert.tsx
+++ b/packages/website/ts/components/ui/alert.tsx
@@ -1,8 +1,6 @@
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import {AlertTypes} from 'ts/types';
-
-const CUSTOM_GREEN = 'rgb(137, 199, 116)';
+import {colors} from 'ts/utils/colors';
 
 interface AlertProps {
     type: AlertTypes;
@@ -12,8 +10,8 @@ interface AlertProps {
 export function Alert(props: AlertProps) {
     const isAlert = props.type === AlertTypes.ERROR;
     const errMsgStyles = {
-        background: isAlert ? colors.red200 : CUSTOM_GREEN,
-        color: 'white',
+        background: isAlert ? colors.red200 : colors.lightestGreen,
+        color: colors.white,
         marginTop: 10,
         padding: 4,
         paddingLeft: 8,
diff --git a/packages/website/ts/components/ui/copy_icon.tsx b/packages/website/ts/components/ui/copy_icon.tsx
index 5f8e6a060d..d3a0f47ee1 100644
--- a/packages/website/ts/components/ui/copy_icon.tsx
+++ b/packages/website/ts/components/ui/copy_icon.tsx
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import * as ReactDOM from 'react-dom';
diff --git a/packages/website/ts/components/ui/drop_down_menu_item.tsx b/packages/website/ts/components/ui/drop_down_menu_item.tsx
index 041688a9de..39a667d74f 100644
--- a/packages/website/ts/components/ui/drop_down_menu_item.tsx
+++ b/packages/website/ts/components/ui/drop_down_menu_item.tsx
@@ -2,9 +2,9 @@ import * as _ from 'lodash';
 import Menu from 'material-ui/Menu';
 import Popover from 'material-ui/Popover';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 
 const CHECK_CLOSE_POPOVER_INTERVAL_MS = 300;
-const CUSTOM_LIGHT_GRAY = '#848484';
 const DEFAULT_STYLE = {
     fontSize: 14,
 };
@@ -72,7 +72,7 @@ export class DropDownMenuItem extends React.Component<DropDownMenuItemProps, Dro
                         onMouseEnter={this.onHover.bind(this)}
                         onMouseLeave={this.onHoverOff.bind(this)}
                     >
-                        <Menu style={{color: CUSTOM_LIGHT_GRAY}}>
+                        <Menu style={{color: colors.gray}}>
                             {this.props.subMenuItems}
                         </Menu>
                     </div>
diff --git a/packages/website/ts/components/ui/etherscan_icon.tsx b/packages/website/ts/components/ui/etherscan_icon.tsx
index 3ccbf0bd9f..2778fc0858 100644
--- a/packages/website/ts/components/ui/etherscan_icon.tsx
+++ b/packages/website/ts/components/ui/etherscan_icon.tsx
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
 import {EtherscanLinkSuffixes} from 'ts/types';
diff --git a/packages/website/ts/components/ui/input_label.tsx b/packages/website/ts/components/ui/input_label.tsx
index 852097519b..1f26f5fd22 100644
--- a/packages/website/ts/components/ui/input_label.tsx
+++ b/packages/website/ts/components/ui/input_label.tsx
@@ -1,4 +1,4 @@
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 
 export interface InputLabelProps {
diff --git a/packages/website/ts/components/ui/labeled_switcher.tsx b/packages/website/ts/components/ui/labeled_switcher.tsx
deleted file mode 100644
index 80a8fbe943..0000000000
--- a/packages/website/ts/components/ui/labeled_switcher.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
-import * as React from 'react';
-
-const CUSTOM_BLUE = '#63A6F1';
-
-interface LabeledSwitcherProps {
-    labelLeft: string;
-    labelRight: string;
-    isLeftInitiallySelected: boolean;
-    onLeftLabelClickAsync: () => Promise<boolean>;
-    onRightLabelClickAsync: () => Promise<boolean>;
-}
-
-interface LabeledSwitcherState {
-    isLeftSelected: boolean;
-}
-
-export class LabeledSwitcher extends React.Component<LabeledSwitcherProps, LabeledSwitcherState> {
-    constructor(props: LabeledSwitcherProps) {
-        super(props);
-        this.state = {
-            isLeftSelected: props.isLeftInitiallySelected,
-        };
-    }
-    public render() {
-        const isLeft = true;
-        return (
-            <div
-                className="rounded clearfix"
-            >
-                {this.renderLabel(this.props.labelLeft, isLeft, this.state.isLeftSelected)}
-                {this.renderLabel(this.props.labelRight, !isLeft, !this.state.isLeftSelected)}
-            </div>
-        );
-    }
-    private renderLabel(title: string, isLeft: boolean, isSelected: boolean) {
-        const borderStyle = `2px solid ${isSelected ? '#4F8BCF' : '#DADADA'}`;
-        const style = {
-            cursor: 'pointer',
-            backgroundColor: isSelected ? CUSTOM_BLUE : colors.grey200,
-            color: isSelected ? 'white' : '#A5A5A5',
-            boxShadow: isSelected ? `inset 0px 0px 4px #4083CE` : 'inset 0px 0px 4px #F7F6F6',
-            borderTop: borderStyle,
-            borderBottom: borderStyle,
-            [isLeft ? 'borderLeft' : 'borderRight']: borderStyle,
-            paddingTop: 12,
-            paddingBottom: 12,
-        };
-        return (
-            <div
-                className={`col col-6 center p1 ${isLeft ? 'rounded-left' : 'rounded-right'}`}
-                style={style}
-                onClick={this.onLabelClickAsync.bind(this, isLeft)}
-            >
-                {title}
-            </div>
-        );
-    }
-    private async onLabelClickAsync(isLeft: boolean): Promise<void> {
-        this.setState({
-            isLeftSelected: isLeft,
-        });
-        const didSucceed = isLeft ?
-                           await this.props.onLeftLabelClickAsync() :
-                           await this.props.onRightLabelClickAsync();
-        if (!didSucceed) {
-            this.setState({
-                isLeftSelected: !isLeft,
-            });
-        }
-    }
-}
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
index 2d668fb827..1856a6b505 100644
--- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx
+++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
@@ -1,6 +1,7 @@
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 import {utils} from 'ts/utils/utils';
 
 const COMPLETE_STATE_SHOW_LENGTH_MS = 2000;
@@ -32,7 +33,7 @@ export class LifeCycleRaisedButton extends
     public static defaultProps: Partial<LifeCycleRaisedButtonProps> = {
         isDisabled: false,
         backgroundColor: 'white',
-        labelColor: 'rgb(97, 97, 97)',
+        labelColor: colors.darkGray,
     };
     private buttonTimeoutId: number;
     private didUnmount: boolean;
diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx
index 2ff5b155e8..918d42a3bd 100644
--- a/packages/website/ts/components/ui/party.tsx
+++ b/packages/website/ts/components/ui/party.tsx
@@ -1,15 +1,14 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
 import {EthereumAddress} from 'ts/components/ui/ethereum_address';
 import {Identicon} from 'ts/components/ui/identicon';
 import {EtherscanLinkSuffixes} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {utils} from 'ts/utils/utils';
 
 const IMAGE_DIMENSION = 100;
 const IDENTICON_DIAMETER = 95;
-const CHECK_MARK_GREEN = 'rgb(0, 195, 62)';
 
 interface PartyProps {
     label: string;
@@ -94,7 +93,7 @@ export class Party extends React.Component<PartyProps, PartyState> {
                                 className="mx-auto"
                                 style={{fontSize: 13, width: 127}}
                             >
-                                <span style={{color: isRegistered ? CHECK_MARK_GREEN : colors.red500}}>
+                                <span style={{color: isRegistered ? colors.brightGreen : colors.red500}}>
                                     <i
                                         className={`zmdi ${isRegistered ? 'zmdi-check-circle' : 'zmdi-alert-triangle'}`}
                                     />
diff --git a/packages/website/ts/components/ui/required_label.tsx b/packages/website/ts/components/ui/required_label.tsx
index db69d7278f..3166ae0e73 100644
--- a/packages/website/ts/components/ui/required_label.tsx
+++ b/packages/website/ts/components/ui/required_label.tsx
@@ -1,4 +1,4 @@
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 
 export interface RequiredLabelProps {
diff --git a/packages/website/ts/components/ui/swap_icon.tsx b/packages/website/ts/components/ui/swap_icon.tsx
index b5d4b0caad..0f65bf449e 100644
--- a/packages/website/ts/components/ui/swap_icon.tsx
+++ b/packages/website/ts/components/ui/swap_icon.tsx
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 
 interface SwapIconProps {
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 69bb03dce0..ba08eef16f 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -3,7 +3,7 @@ import 'whatwg-fetch';
 
 import {bigNumberConfigs} from '@0xproject/utils';
 import BigNumber from 'bignumber.js';
-import {colors, getMuiTheme, MuiThemeProvider} from 'material-ui/styles';
+import {getMuiTheme, MuiThemeProvider} from 'material-ui/styles';
 import * as React from 'react';
 import {render} from 'react-dom';
 import {Provider} from 'react-redux';
@@ -20,6 +20,7 @@ import {NotFound} from 'ts/pages/not_found';
 import {Wiki} from 'ts/pages/wiki/wiki';
 import {reducer, State} from 'ts/redux/reducer';
 import {WebsitePaths} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 injectTapEventPlugin();
 
@@ -29,43 +30,39 @@ bigNumberConfigs.configure();
 tradeHistoryStorage.clearIfRequired();
 trackedTokenStorage.clearIfRequired();
 
-const CUSTOM_GREY = 'rgb(39, 39, 39)';
-const CUSTOM_GREEN = 'rgb(102, 222, 117)';
-const CUSTOM_DARKER_GREEN = 'rgb(77, 197, 92)';
-
 import 'basscss/css/basscss.css';
 import 'less/all.less';
 
 const muiTheme = getMuiTheme({
     appBar: {
         height: 45,
-        color: 'white',
-        textColor: 'black',
+        color: colors.white,
+        textColor: colors.black,
     },
     palette: {
-        pickerHeaderColor: constants.CUSTOM_BLUE,
-        primary1Color: constants.CUSTOM_BLUE,
-        primary2Color: constants.CUSTOM_BLUE,
+        pickerHeaderColor: colors.lightBlue,
+        primary1Color: colors.lightBlue,
+        primary2Color: colors.lightBlue,
         textColor: colors.grey700,
     },
     datePicker: {
         color: colors.grey700,
-        textColor: 'white',
-        calendarTextColor: 'white',
-        selectColor: CUSTOM_GREY,
-        selectTextColor: 'white',
+        textColor: colors.white,
+        calendarTextColor: colors.white,
+        selectColor: colors.darkestGray,
+        selectTextColor: colors.white,
     },
     timePicker: {
         color: colors.grey700,
-        textColor: 'white',
-        accentColor: 'white',
-        headerColor: CUSTOM_GREY,
-        selectColor: CUSTOM_GREY,
-        selectTextColor: CUSTOM_GREY,
+        textColor: colors.white,
+        accentColor: colors.white,
+        headerColor: colors.darkestGray,
+        selectColor: colors.darkestGray,
+        selectTextColor: colors.darkestGray,
     },
     toggle: {
-        thumbOnColor: CUSTOM_GREEN,
-        trackOnColor: CUSTOM_DARKER_GREEN,
+        thumbOnColor: colors.limeGreen,
+        trackOnColor: colors.lightGreen,
     },
 });
 
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 6aeb4ae2d6..e0780c2201 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -1,17 +1,16 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
 import {Profile} from 'ts/pages/about/profile';
 import {ProfileInfo, Styles} from 'ts/types';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
-const CUSTOM_BACKGROUND_COLOR = '#F0F0F0';
-const CUSTOM_GRAY = '#4C4C4C';
-const CUSTOM_LIGHT_GRAY = '#A2A2A2';
+const DARKEST_GRAY = colors.darkestGray;
 
 const teamRow1: ProfileInfo[] = [
     {
@@ -153,12 +152,12 @@ export class About extends React.Component<AboutProps, AboutState> {
     }
     public render() {
         return (
-            <div style={{backgroundColor: CUSTOM_BACKGROUND_COLOR}}>
+            <div style={{backgroundColor: colors.lightestGray}}>
                 <DocumentTitle title="0x About Us"/>
                 <TopBar
                     blockchainIsLoaded={false}
                     location={this.props.location}
-                    style={{backgroundColor: CUSTOM_BACKGROUND_COLOR}}
+                    style={{backgroundColor: colors.lightestGray}}
                 />
                 <div
                     id="about"
@@ -176,7 +175,7 @@ export class About extends React.Component<AboutProps, AboutState> {
                         </div>
                         <div
                             className="pt3"
-                            style={{fontSize: 17, color: CUSTOM_GRAY, lineHeight: 1.5}}
+                            style={{fontSize: 17, color: DARKEST_GRAY, lineHeight: 1.5}}
                         >
                             Our team is a diverse and globally distributed group with backgrounds
                             in engineering, research, business and design. We are passionate about
@@ -195,7 +194,7 @@ export class About extends React.Component<AboutProps, AboutState> {
                     <div className="pt3 pb2">
                         <div
                             className="pt2 pb3 sm-center md-pl4 lg-pl0 md-ml3"
-                            style={{color: CUSTOM_LIGHT_GRAY, fontSize: 24, fontFamily: 'Roboto Mono'}}
+                            style={{color: colors.gray, fontSize: 24, fontFamily: 'Roboto Mono'}}
                         >
                             Advisors:
                         </div>
@@ -206,13 +205,13 @@ export class About extends React.Component<AboutProps, AboutState> {
                     <div className="mx-auto py4 sm-px3" style={{maxWidth: 308}}>
                         <div
                             className="pb2"
-                            style={{fontSize: 30, color: CUSTOM_GRAY, fontFamily: 'Roboto Mono', letterSpacing: 7.5}}
+                            style={{fontSize: 30, color: DARKEST_GRAY, fontFamily: 'Roboto Mono', letterSpacing: 7.5}}
                         >
                             WE'RE HIRING
                         </div>
                         <div
                             className="pb4 mb4"
-                            style={{fontSize: 16, color: CUSTOM_GRAY, lineHeight: 1.5, letterSpacing: '0.5px'}}
+                            style={{fontSize: 16, color: DARKEST_GRAY, lineHeight: 1.5, letterSpacing: '0.5px'}}
                         >
                             We are seeking outstanding candidates to{' '}
                             <a
diff --git a/packages/website/ts/pages/about/profile.tsx b/packages/website/ts/pages/about/profile.tsx
index 86aa788b22..cb87cc946b 100644
--- a/packages/website/ts/pages/about/profile.tsx
+++ b/packages/website/ts/pages/about/profile.tsx
@@ -1,6 +1,7 @@
 import * as _ from 'lodash';
 import * as React from 'react';
 import {ProfileInfo, Styles} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 
 const IMAGE_DIMENSION = 149;
 const styles: Styles = {
@@ -48,7 +49,7 @@ export function Profile(props: ProfileProps) {
                 {!_.isUndefined(props.profileInfo.title) &&
                     <div
                         className="pt1 center"
-                        style={{fontSize: 14, fontFamily: 'Roboto Mono', color: '#818181'}}
+                        style={{fontSize: 14, fontFamily: 'Roboto Mono', color: colors.darkGray}}
                     >
                         {props.profileInfo.title.toUpperCase()}
                     </div>
diff --git a/packages/website/ts/pages/documentation/documentation.tsx b/packages/website/ts/pages/documentation/documentation.tsx
index 687ba0fcc6..768c6710f3 100644
--- a/packages/website/ts/pages/documentation/documentation.tsx
+++ b/packages/website/ts/pages/documentation/documentation.tsx
@@ -1,7 +1,7 @@
 import findVersions = require('find-versions');
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
 import {
@@ -34,19 +34,17 @@ import {
     TypeDefinitionByName,
     TypescriptMethod,
 } from 'ts/types';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {docUtils} from 'ts/utils/doc_utils';
 import {utils} from 'ts/utils/utils';
 
 const SCROLL_TOP_ID = 'docsScrollTop';
-const CUSTOM_PURPLE = '#690596';
-const CUSTOM_RED = '#e91751';
-const CUSTOM_TURQUOIS = '#058789';
 
 const networkNameToColor: {[network: string]: string} = {
-    [Networks.kovan]: CUSTOM_PURPLE,
-    [Networks.ropsten]: CUSTOM_RED,
-    [Networks.mainnet]: CUSTOM_TURQUOIS,
+    [Networks.kovan]: colors.purple,
+    [Networks.ropsten]: colors.red,
+    [Networks.mainnet]: colors.turquois,
 };
 
 export interface DocumentationAllProps {
diff --git a/packages/website/ts/pages/documentation/event_definition.tsx b/packages/website/ts/pages/documentation/event_definition.tsx
index 3c57666e70..695debf5b7 100644
--- a/packages/website/ts/pages/documentation/event_definition.tsx
+++ b/packages/website/ts/pages/documentation/event_definition.tsx
@@ -4,8 +4,7 @@ import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {Type} from 'ts/pages/documentation/type';
 import {AnchorTitle} from 'ts/pages/shared/anchor_title';
 import {Event, EventArg, HeaderSizes} from 'ts/types';
-
-const CUSTOM_GREEN = 'rgb(77, 162, 75)';
+import {colors} from 'ts/utils/colors';
 
 interface EventDefinitionProps {
     event: Event;
@@ -50,7 +49,7 @@ export class EventDefinition extends React.Component<EventDefinitionProps, Event
         );
     }
     private renderEventCode() {
-        const indexed = <span style={{color: CUSTOM_GREEN}}> indexed</span>;
+        const indexed = <span style={{color: colors.green}}> indexed</span>;
         const eventArgs = _.map(this.props.event.eventArgs, (eventArg: EventArg) => {
             const type = (
                 <Type
diff --git a/packages/website/ts/pages/documentation/method_block.tsx b/packages/website/ts/pages/documentation/method_block.tsx
index 9505f2aa4b..df580fcd0d 100644
--- a/packages/website/ts/pages/documentation/method_block.tsx
+++ b/packages/website/ts/pages/documentation/method_block.tsx
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Comment} from 'ts/pages/documentation/comment';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
diff --git a/packages/website/ts/pages/documentation/source_link.tsx b/packages/website/ts/pages/documentation/source_link.tsx
index 9abf01706d..9fe919c4e3 100644
--- a/packages/website/ts/pages/documentation/source_link.tsx
+++ b/packages/website/ts/pages/documentation/source_link.tsx
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Source} from 'ts/types';
 
diff --git a/packages/website/ts/pages/documentation/type.tsx b/packages/website/ts/pages/documentation/type.tsx
index 74b146d910..393ee3a51d 100644
--- a/packages/website/ts/pages/documentation/type.tsx
+++ b/packages/website/ts/pages/documentation/type.tsx
@@ -1,17 +1,15 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Link as ScrollLink} from 'react-scroll';
 import * as ReactTooltip from 'react-tooltip';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {TypeDefinition} from 'ts/pages/documentation/type_definition';
 import {Type as TypeDef, TypeDefinitionByName, TypeDocTypes} from 'ts/types';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
-const BUILT_IN_TYPE_COLOR = '#e69d00';
-const STRING_LITERAL_COLOR = '#4da24b';
-
 // Some types reference other libraries. For these types, we want to link the user to the relevant documentation.
 const typeToUrl: {[typeName: string]: string} = {
     Web3: constants.WEB3_DOCS_URL,
@@ -56,7 +54,7 @@ export function Type(props: TypeProps): any {
         case TypeDocTypes.Intrinsic:
         case TypeDocTypes.Unknown:
             typeName = type.name;
-            typeNameColor = BUILT_IN_TYPE_COLOR;
+            typeNameColor = colors.orange;
             break;
 
         case TypeDocTypes.Reference:
@@ -90,7 +88,7 @@ export function Type(props: TypeProps): any {
 
         case TypeDocTypes.StringLiteral:
             typeName = `'${type.value}'`;
-            typeNameColor = STRING_LITERAL_COLOR;
+            typeNameColor = colors.green;
             break;
 
         case TypeDocTypes.Array:
diff --git a/packages/website/ts/pages/documentation/type_definition.tsx b/packages/website/ts/pages/documentation/type_definition.tsx
index 4ad959631d..09413faaf9 100644
--- a/packages/website/ts/pages/documentation/type_definition.tsx
+++ b/packages/website/ts/pages/documentation/type_definition.tsx
@@ -9,10 +9,9 @@ import {MethodSignature} from 'ts/pages/documentation/method_signature';
 import {Type} from 'ts/pages/documentation/type';
 import {AnchorTitle} from 'ts/pages/shared/anchor_title';
 import {CustomType, CustomTypeChild, HeaderSizes, KindString, TypeDocTypes} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {utils} from 'ts/utils/utils';
 
-const KEYWORD_COLOR = '#a81ca6';
-
 interface TypeDefinitionProps {
     customType: CustomType;
     shouldAddId?: boolean;
@@ -80,7 +79,11 @@ export class TypeDefinition extends React.Component<TypeDefinitionProps, TypeDef
                 typePrefix = 'Type Alias';
                 codeSnippet = (
                     <span>
-                        <span style={{color: KEYWORD_COLOR}}>type</span> {customType.name} ={' '}
+                        <span
+                            style={{color: colors.lightPurple}}
+                        >
+                            type
+                        </span> {customType.name} ={' '}
                         {customType.type.typeDocType !== TypeDocTypes.Reflection ?
                             <Type type={customType.type} docsInfo={this.props.docsInfo} /> :
                             <MethodSignature
diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index 630a483462..25fc9934c6 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
 import {Footer} from 'ts/components/footer';
diff --git a/packages/website/ts/pages/faq/question.tsx b/packages/website/ts/pages/faq/question.tsx
index 917863e4af..ed50f6948c 100644
--- a/packages/website/ts/pages/faq/question.tsx
+++ b/packages/website/ts/pages/faq/question.tsx
@@ -1,6 +1,7 @@
 import * as _ from 'lodash';
 import {Card, CardHeader, CardText} from 'material-ui/Card';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 
 export interface QuestionProps {
     prompt: string;
@@ -31,7 +32,7 @@ export class Question extends React.Component<QuestionProps, QuestionState> {
                     <CardHeader
                         title={this.props.prompt}
                         style={{borderBottom: this.state.isExpanded ? '1px solid rgba(0, 0, 0, 0.19)' : 'none'}}
-                        titleStyle={{color: 'rgb(66, 66, 66)'}}
+                        titleStyle={{color: colors.darkerGray}}
                         actAsExpander={true}
                         showExpandableButton={true}
                     />
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index cf373bbf81..56d021b8d0 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -1,12 +1,13 @@
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
 import {Link} from 'react-router-dom';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
 import {ScreenWidths, WebsitePaths} from 'ts/types';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
@@ -35,11 +36,6 @@ interface Project {
 }
 
 const THROTTLE_TIMEOUT = 100;
-const CUSTOM_HERO_BACKGROUND_COLOR = '#404040';
-const CUSTOM_PROJECTS_BACKGROUND_COLOR = '#343333';
-const CUSTOM_WHITE_BACKGROUND = 'rgb(245, 245, 245)';
-const CUSTOM_WHITE_TEXT = '#E4E4E4';
-const CUSTOM_GRAY_TEXT = '#919191';
 
 const boxContents: BoxContent[] = [
     {
@@ -166,7 +162,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                     blockchainIsLoaded={false}
                     location={this.props.location}
                     isNightVersion={true}
-                    style={{backgroundColor: CUSTOM_HERO_BACKGROUND_COLOR, position: 'relative'}}
+                    style={{backgroundColor: colors.heroGray, position: 'relative'}}
                 />
                 {this.renderHero()}
                 {this.renderProjects()}
@@ -197,7 +193,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix py4"
-                style={{backgroundColor: CUSTOM_HERO_BACKGROUND_COLOR}}
+                style={{backgroundColor: colors.heroGray}}
             >
                 <div
                     className="mx-auto max-width-4 clearfix"
@@ -249,7 +245,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                                 style={{borderRadius: 6, minWidth: 150}}
                                                 buttonStyle={lightButtonStyle}
                                                 labelColor="white"
-                                                backgroundColor={CUSTOM_HERO_BACKGROUND_COLOR}
+                                                backgroundColor={colors.heroGray}
                                                 labelStyle={buttonLabelStyle}
                                                 label="Join the community"
                                                 onClick={_.noop}
@@ -291,7 +287,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         });
         const titleStyle: React.CSSProperties = {
             fontFamily: 'Roboto Mono',
-            color: '#A4A4A4',
+            color: colors.gray,
             textTransform: 'uppercase',
             fontWeight: 300,
             letterSpacing: 3,
@@ -299,7 +295,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix py4"
-                style={{backgroundColor: CUSTOM_PROJECTS_BACKGROUND_COLOR}}
+                style={{backgroundColor: colors.projectsGray}}
             >
                 <div className="mx-auto max-width-4 clearfix sm-px3">
                     <div
@@ -313,13 +309,13 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                     </div>
                     <div
                         className="pt3 mx-auto center"
-                        style={{color: CUSTOM_GRAY_TEXT, fontFamily: 'Roboto Mono', maxWidth: 300, fontSize: 14}}
+                        style={{color: colors.landingLinkGray, fontFamily: 'Roboto Mono', maxWidth: 300, fontSize: 14}}
                     >
                         view the{' '}
                         <Link
                             to={`${WebsitePaths.Wiki}#List-of-Projects-Using-0x-Protocol`}
                             className="text-decoration-none underline"
-                            style={{color: CUSTOM_GRAY_TEXT}}
+                            style={{color: colors.landingLinkGray}}
                         >
                             full list
                         </Link>
@@ -333,7 +329,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix lg-py4 md-py4 sm-pb4 sm-pt2"
-                style={{backgroundColor: CUSTOM_WHITE_BACKGROUND}}
+                style={{backgroundColor: colors.offWhite}}
             >
                 <div className="mx-auto max-width-4 py4 clearfix">
                     {isSmallScreen &&
@@ -386,7 +382,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix lg-py4 md-py4 sm-pt4"
-                style={{backgroundColor: CUSTOM_HERO_BACKGROUND_COLOR}}
+                style={{backgroundColor: colors.heroGray}}
             >
                 <div className="mx-auto max-width-4 lg-py4 md-py4 sm-pt4 clearfix">
                     <div className="col lg-col-6 md-col-6 col-12 sm-center">
@@ -397,7 +393,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                     </div>
                     <div
                         className="col lg-col-6 md-col-6 col-12 lg-pr3 md-pr3 sm-mx-auto"
-                        style={{color: CUSTOM_WHITE_TEXT, paddingTop: 8, maxWidth: isSmallScreen ? 'none' : 445}}
+                        style={{color: colors.beigeWhite, paddingTop: 8, maxWidth: isSmallScreen ? 'none' : 445}}
                     >
                         <div
                             className="lg-h1 md-h1 sm-h2 pb1 sm-pt3 sm-center"
@@ -420,7 +416,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                         </div>
                         <div
                             className="pt3 sm-mx-auto sm-px3"
-                            style={{color: CUSTOM_GRAY_TEXT, maxWidth: isSmallScreen ? 412 : 'none'}}
+                            style={{color: colors.landingLinkGray, maxWidth: isSmallScreen ? 412 : 'none'}}
                         >
                             <div className="flex" style={{fontSize: 18}}>
                                 <div
@@ -433,7 +429,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                     <Link
                                         to={`${WebsitePaths.Wiki}#List-of-Projects-Using-0x-Protocol`}
                                         className="text-decoration-none underline"
-                                        style={{color: CUSTOM_GRAY_TEXT, fontFamily: 'Roboto Mono'}}
+                                        style={{color: colors.landingLinkGray, fontFamily: 'Roboto Mono'}}
                                     >
                                         view all
                                     </Link>
@@ -485,7 +481,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix lg-pt4 md-pt4"
-                style={{backgroundColor: CUSTOM_HERO_BACKGROUND_COLOR}}
+                style={{backgroundColor: colors.heroGray}}
             >
                 <div className="mx-auto max-width-4 lg-pt4 md-pt4 lg-mb4 md-mb4 sm-mb2 clearfix">
                     {isSmallScreen &&
@@ -493,7 +489,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                     }
                     <div
                         className="col lg-col-6 md-col-6 col-12 lg-pr3 md-pr3 sm-px3"
-                        style={{color: CUSTOM_WHITE_TEXT}}
+                        style={{color: colors.beigeWhite}}
                     >
                         <div
                             className="pb1 lg-pt4 md-pt4 sm-pt3 lg-h1 md-h1 sm-h2 sm-px3 sm-center"
@@ -517,7 +513,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                             <Link
                                 to={WebsitePaths.ZeroExJs}
                                 className="text-decoration-none underline"
-                                style={{color: CUSTOM_WHITE_TEXT, fontFamily: 'Roboto Mono'}}
+                                style={{color: colors.beigeWhite, fontFamily: 'Roboto Mono'}}
                             >
                                 0x.js
                             </Link>
@@ -525,7 +521,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                             <Link
                                 to={WebsitePaths.SmartContracts}
                                 className="text-decoration-none underline"
-                                style={{color: CUSTOM_WHITE_TEXT, fontFamily: 'Roboto Mono'}}
+                                style={{color: colors.beigeWhite, fontFamily: 'Roboto Mono'}}
                             >
                                 smart contract
                             </Link>
@@ -605,7 +601,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         const boxStyle: React.CSSProperties = {
             maxWidth: 252,
             height: 386,
-            backgroundColor: '#F9F9F9',
+            backgroundColor: colors.lightestGray,
             borderRadius: 5,
             padding: '10px 24px 24px',
         };
@@ -642,7 +638,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix"
-                style={{backgroundColor: CUSTOM_HERO_BACKGROUND_COLOR}}
+                style={{backgroundColor: colors.heroGray}}
             >
                 <div
                     className="mx-auto py4 sm-mt2 clearfix"
@@ -709,14 +705,14 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         const cases = _.map(useCases, (useCase: UseCase) => {
             const style = _.isUndefined(useCase.style) || isSmallScreen ? {} : useCase.style;
             const useCaseBoxStyle = {
-                color: '#A2A2A2',
+                color: colors.gray,
                 border: '1px solid #565656',
                 borderRadius: 4,
                 maxWidth: isSmallScreen ? 375 : 'none',
                 ...style,
             };
             const typeStyle: React.CSSProperties = {
-                color: '#EBEBEB',
+                color: colors.lightestGray,
                 fontSize: 13,
                 textTransform: 'uppercase',
                 fontFamily: 'Roboto Mono',
@@ -753,7 +749,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix pb4 lg-pt2 md-pt2 sm-pt4"
-                style={{backgroundColor: CUSTOM_HERO_BACKGROUND_COLOR}}
+                style={{backgroundColor: colors.heroGray}}
             >
                 <div
                     className="mx-auto pb4 pt3 mt1 sm-mt2 clearfix"
@@ -782,7 +778,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix pb4"
-                style={{backgroundColor: CUSTOM_HERO_BACKGROUND_COLOR}}
+                style={{backgroundColor: colors.heroGray}}
             >
                 <div
                     className="mx-auto max-width-4 pb4 mb3 clearfix"
@@ -799,7 +795,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                 style={{borderRadius: 6, minWidth: 150}}
                                 buttonStyle={lightButtonStyle}
                                 labelColor={colors.white}
-                                backgroundColor={CUSTOM_HERO_BACKGROUND_COLOR}
+                                backgroundColor={colors.heroGray}
                                 labelStyle={buttonLabelStyle}
                                 label="Build on 0x"
                                 onClick={_.noop}
diff --git a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
index 15ec443998..7a8c9abbd8 100644
--- a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
+++ b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 import MenuItem from 'material-ui/MenuItem';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Link as ScrollLink} from 'react-scroll';
 import {VersionDropDown} from 'ts/pages/shared/version_drop_down';
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 2447a24a22..68383ac361 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
-import {colors} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
 import {
@@ -143,7 +143,7 @@ export class Wiki extends React.Component<WikiProps, WikiState> {
                         headerSize={HeaderSizes.H2}
                         githubLink={githubLink}
                     />
-                    <div className="mb4 mt3 p3 center" style={{backgroundColor: '#f9f5ef'}}>
+                    <div className="mb4 mt3 p3 center" style={{backgroundColor: colors.lightestGray}}>
                         See a way to make this article better?{' '}
                         <a
                             href={githubLink}
diff --git a/packages/website/ts/utils/colors.ts b/packages/website/ts/utils/colors.ts
new file mode 100644
index 0000000000..c6a8547d1e
--- /dev/null
+++ b/packages/website/ts/utils/colors.ts
@@ -0,0 +1,30 @@
+import {colors as materialUiColors} from 'material-ui/styles';
+
+export const colors = {
+    ...materialUiColors,
+    offWhite: 'rgb(245, 245, 245)',
+    beigeWhite: '#E4E4E4',
+    grayishPink: 'rgb(230, 229, 229)',
+    lightestGray: '#F0F0F0',
+    lightGray: '#BBBBBB',
+    gray: '#A5A5A5',
+    darkGray: '#818181',
+    darkerGray: '#393939',
+    heroGray: '#404040',
+    projectsGray: '#343333',
+    landingLinkGray: '#919191',
+    darkestGray: 'rgb(39, 39, 39)',
+    dharmaDarkGray: 'rgb(37, 37, 37)',
+    lightBlue: '#60a4f4',
+    darkBlue: '#4D5481',
+    lightPurple: '#a81ca6',
+    purple: '#690596',
+    red: '#e91751',
+    turquois: '#058789',
+    orange: '#e69d00',
+    lightestGreen: 'rgb(137, 199, 116)',
+    lightGreen: 'rgb(77, 197, 92)',
+    limeGreen: 'rgb(102, 222, 117)',
+    green: '#4da24b',
+    brightGreen: 'rgb(0, 195, 62)',
+};
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index fb81dd9a9a..f001181ce3 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -26,7 +26,6 @@ export const constants = {
     BITLY_ACCESS_TOKEN: 'ffc4c1a31e5143848fb7c523b39f91b9b213d208',
     BITLY_ENDPOINT: 'https://api-ssl.bitly.com',
     BLOG_URL: 'https://blog.0xproject.com/latest',
-    CUSTOM_BLUE: '#60a4f4',
     DEFAULT_DERIVATION_PATH: `44'/60'/0'`,
     ETHER_FAUCET_ENDPOINT: 'https://faucet.0xproject.com',
     FEE_RECIPIENT_ADDRESS: '0x0000000000000000000000000000000000000000',

From 445ff1e28ee572236ec963a27bff227e859f685c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Dec 2017 10:06:16 +0100
Subject: [PATCH 046/125] Standardize colors to always be in uppercase hex and
 consolidate material-ui greys

---
 .../dialogs/ledger_config_dialog.tsx          |  2 +-
 .../website/ts/components/eth_wrappers.tsx    |  2 +-
 packages/website/ts/components/fill_order.tsx |  4 +--
 packages/website/ts/components/footer.tsx     |  4 +--
 .../generate_order/generate_order_form.tsx    |  2 +-
 .../generate_order/new_token_form.tsx         |  6 ++--
 .../ts/components/inputs/address_input.tsx    |  2 +-
 .../inputs/balance_bounded_input.tsx          |  4 +--
 .../components/inputs/token_amount_input.tsx  |  2 +-
 .../ts/components/inputs/token_input.tsx      |  2 +-
 packages/website/ts/components/top_bar.tsx    |  8 +++---
 .../ts/components/top_bar_menu_item.tsx       |  2 +-
 .../ts/components/ui/drop_down_menu_item.tsx  |  2 +-
 .../website/ts/components/ui/input_label.tsx  |  2 +-
 packages/website/ts/pages/about/about.tsx     |  6 ++--
 .../ts/pages/documentation/method_block.tsx   |  2 +-
 .../ts/pages/documentation/source_link.tsx    |  2 +-
 packages/website/ts/pages/landing/landing.tsx | 10 +++----
 .../ts/pages/shared/nested_sidebar_menu.tsx   |  2 +-
 packages/website/ts/pages/wiki/wiki.tsx       |  4 +--
 packages/website/ts/utils/colors.ts           | 28 +++++++++----------
 21 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
index e2a8b932a4..05a15526fd 100644
--- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
+++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
@@ -146,7 +146,7 @@ export class LedgerConfigDialog extends React.Component<LedgerConfigDialogProps,
                     <div className="overflow-hidden" style={{width: 180}}>
                         <TextField
                             floatingLabelFixed={true}
-                            floatingLabelStyle={{color: colors.grey500}}
+                            floatingLabelStyle={{color: colors.grey}}
                             floatingLabelText="Update path derivation (advanced)"
                             value={this.state.derivationPath}
                             errorText={this.state.derivationErrMsg}
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index e32311e9e3..fb1205b62a 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -92,7 +92,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                         <a
                             target="_blank"
                             href="https://weth.io/"
-                            style={{color: colors.gray}}
+                            style={{color: colors.grey}}
                         >
                             <div className="flex">
                                 <div>About Wrapped ETH</div>
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index f7473b79e1..f91540c26e 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -221,7 +221,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
                 <div className="clearfix pb2" style={{width: '100%'}}>
                     <div className="inline left">Order details</div>
                     <div className="inline right" style={{minWidth: 208}}>
-                        <div className="col col-4 pl2" style={{color: colors.gray}}>
+                        <div className="col col-4 pl2" style={{color: colors.grey}}>
                             Maker:
                         </div>
                         <div className="col col-2 pr1">
@@ -273,7 +273,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
                        </div>
                        <div
                            className="col col-5 pl1"
-                           style={{color: colors.lightGray, paddingTop: 39}}
+                           style={{color: colors.grey400, paddingTop: 39}}
                        >
                            = {accounting.formatNumber(orderReceiveAmount, 6)} {makerToken.symbol}
                        </div>
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 67e9660331..4b03c49e65 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -124,7 +124,7 @@ export class Footer extends React.Component<FooterProps, FooterState> {
                                 <img src="/images/protocol_logo_white.png" height="30" />
                             </div>
                             <div
-                                style={{fontSize: 11, color: colors.gray, paddingLeft: 37, paddingTop: 2}}
+                                style={{fontSize: 11, color: colors.grey, paddingLeft: 37, paddingTop: 2}}
                             >
                                 © ZeroEx, Intl.
                             </div>
@@ -209,7 +209,7 @@ export class Footer extends React.Component<FooterProps, FooterState> {
     private renderHeader(title: string) {
         const headerStyle = {
             textTransform: 'uppercase',
-            color: colors.lightGray,
+            color: colors.grey400,
             letterSpacing: 2,
             fontFamily: 'Roboto Mono',
             fontSize: 13,
diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx
index 7f4c257184..587fdc6f1d 100644
--- a/packages/website/ts/components/generate_order/generate_order_form.tsx
+++ b/packages/website/ts/components/generate_order/generate_order_form.tsx
@@ -154,7 +154,7 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
                     </div>
                     <div className="pt1 sm-pb2 lg-px4 md-px4">
                         <div className="lg-px3 md-px3">
-                            <div style={{fontSize: 12, color: colors.grey500}}>Expiration</div>
+                            <div style={{fontSize: 12, color: colors.grey}}>Expiration</div>
                             <ExpirationInput
                                 orderExpiryTimestamp={this.props.orderExpiryTimestamp}
                                 updateOrderExpiry={dispatcher.updateOrderExpiry.bind(dispatcher)}
diff --git a/packages/website/ts/components/generate_order/new_token_form.tsx b/packages/website/ts/components/generate_order/new_token_form.tsx
index 8b04919e07..604a54b186 100644
--- a/packages/website/ts/components/generate_order/new_token_form.tsx
+++ b/packages/website/ts/components/generate_order/new_token_form.tsx
@@ -49,7 +49,7 @@ export class NewTokenForm extends React.Component<NewTokenFormProps, NewTokenFor
                 <div>
                     <TextField
                         floatingLabelFixed={true}
-                        floatingLabelStyle={{color: colors.grey500}}
+                        floatingLabelStyle={{color: colors.grey}}
                         floatingLabelText={<RequiredLabel label="Name" />}
                         value={this.state.name}
                         errorText={this.state.nameErrText}
@@ -59,7 +59,7 @@ export class NewTokenForm extends React.Component<NewTokenFormProps, NewTokenFor
                 <div>
                     <TextField
                         floatingLabelFixed={true}
-                        floatingLabelStyle={{color: colors.grey500}}
+                        floatingLabelStyle={{color: colors.grey}}
                         floatingLabelText={<RequiredLabel label="Symbol" />}
                         value={this.state.symbol}
                         errorText={this.state.symbolErrText}
@@ -78,7 +78,7 @@ export class NewTokenForm extends React.Component<NewTokenFormProps, NewTokenFor
                 <div>
                     <TextField
                         floatingLabelFixed={true}
-                        floatingLabelStyle={{color: colors.grey500}}
+                        floatingLabelStyle={{color: colors.grey}}
                         floatingLabelText={<RequiredLabel label="Decimals" />}
                         value={this.state.decimals}
                         errorText={this.state.decimalsErrText}
diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx
index f5ebb41122..d432a038ec 100644
--- a/packages/website/ts/components/inputs/address_input.tsx
+++ b/packages/website/ts/components/inputs/address_input.tsx
@@ -50,7 +50,7 @@ export class AddressInput extends React.Component<AddressInputProps, AddressInpu
                     fullWidth={true}
                     hintText={hintText}
                     floatingLabelFixed={true}
-                    floatingLabelStyle={{color: colors.grey500, display: labelDisplay}}
+                    floatingLabelStyle={{color: colors.grey, display: labelDisplay}}
                     floatingLabelText={label}
                     errorText={this.state.errMsg}
                     value={this.state.address}
diff --git a/packages/website/ts/components/inputs/balance_bounded_input.tsx b/packages/website/ts/components/inputs/balance_bounded_input.tsx
index d027783928..0b92a5856c 100644
--- a/packages/website/ts/components/inputs/balance_bounded_input.tsx
+++ b/packages/website/ts/components/inputs/balance_bounded_input.tsx
@@ -83,7 +83,7 @@ export class BalanceBoundedInput extends
                 fullWidth={true}
                 floatingLabelText={label}
                 floatingLabelFixed={true}
-                floatingLabelStyle={{color: colors.grey500, width: 206}}
+                floatingLabelStyle={{color: colors.grey, width: 206}}
                 errorText={errorText}
                 value={this.state.amountString}
                 hintText={<span style={{textTransform: 'capitalize'}}>amount</span>}
@@ -133,7 +133,7 @@ export class BalanceBoundedInput extends
         const increaseBalanceText = 'Increase balance';
         const linkStyle = {
             cursor: 'pointer',
-            color: colors.grey900,
+            color: colors.darkestGray,
             textDecoration: 'underline',
             display: 'inline',
         };
diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx
index 363904e4da..ddf0d3307d 100644
--- a/packages/website/ts/components/inputs/token_amount_input.tsx
+++ b/packages/website/ts/components/inputs/token_amount_input.tsx
@@ -59,7 +59,7 @@ export class TokenAmountInput extends React.Component<TokenAmountInputProps, Tok
                     Insufficient allowance.{' '}
                     <Link
                         to={`${WebsitePaths.Portal}/balances`}
-                        style={{cursor: 'pointer', color: colors.grey900}}
+                        style={{cursor: 'pointer', color: colors.darkestGray}}
                     >
                             Set allowance
                     </Link>
diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx
index e406ca27ba..806c8b21fc 100644
--- a/packages/website/ts/components/inputs/token_input.tsx
+++ b/packages/website/ts/components/inputs/token_input.tsx
@@ -62,7 +62,7 @@ export class TokenInput extends React.Component<TokenInputProps, TokenInputState
                     >
                         <TokenIcon token={token} diameter={TOKEN_ICON_DIMENSION} />
                     </div>
-                    <div className="py1 center" style={{color: colors.grey500}}>
+                    <div className="py1 center" style={{color: colors.grey}}>
                         {token.name}
                     </div>
                 </Paper>
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index 82ce0dee20..179840ffcc 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -220,7 +220,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                 {this.renderPortalMenu()}
                 {this.renderDocsMenu()}
                 {this.renderWiki()}
-                <div className="pl1 py1 mt3" style={{backgroundColor: colors.lightestGray}}>Website</div>
+                <div className="pl1 py1 mt3" style={{backgroundColor: colors.lightGrey}}>Website</div>
                 <Link to={WebsitePaths.Home} className="text-decoration-none">
                     <MenuItem className="py2">Home</MenuItem>
                 </Link>
@@ -284,7 +284,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
         const sectionTitle = `${this.props.docsInfo.displayName} Docs`;
         return (
             <div className="lg-hide md-hide">
-                <div className="pl1 py1" style={{backgroundColor: colors.lightestGray}}>{sectionTitle}</div>
+                <div className="pl1 py1" style={{backgroundColor: colors.lightGrey}}>{sectionTitle}</div>
                 <NestedSidebarMenu
                     topLevelMenu={this.props.menu}
                     menuSubsectionsBySection={this.props.menuSubsectionsBySection}
@@ -304,7 +304,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
 
         return (
             <div className="lg-hide md-hide">
-                <div className="pl1 py1" style={{backgroundColor: colors.lightestGray}}>0x Protocol Wiki</div>
+                <div className="pl1 py1" style={{backgroundColor: colors.lightGrey}}>0x Protocol Wiki</div>
                 <NestedSidebarMenu
                     topLevelMenu={this.props.menuSubsectionsBySection}
                     menuSubsectionsBySection={this.props.menuSubsectionsBySection}
@@ -321,7 +321,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
 
         return (
             <div className="lg-hide md-hide">
-                <div className="pl1 py1" style={{backgroundColor: colors.lightestGray}}>Portal DApp</div>
+                <div className="pl1 py1" style={{backgroundColor: colors.lightGrey}}>Portal DApp</div>
                 <PortalMenu
                     menuItemStyle={{color: 'black'}}
                     onClick={this.onMenuButtonClick.bind(this)}
diff --git a/packages/website/ts/components/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar_menu_item.tsx
index 83e4cbc351..d912abe06e 100644
--- a/packages/website/ts/components/top_bar_menu_item.tsx
+++ b/packages/website/ts/components/top_bar_menu_item.tsx
@@ -28,7 +28,7 @@ export class TopBarMenuItem extends React.Component<TopBarMenuItemProps, TopBarM
     public render() {
         const primaryStyles = this.props.isPrimary ? {
             borderRadius: 4,
-            border: `1px solid ${this.props.isNightVersion ? colors.gray : colors.grayishPink}`,
+            border: `1px solid ${this.props.isNightVersion ? colors.grey : colors.greyishPink}`,
             marginTop: 15,
             paddingLeft: 9,
             paddingRight: 9,
diff --git a/packages/website/ts/components/ui/drop_down_menu_item.tsx b/packages/website/ts/components/ui/drop_down_menu_item.tsx
index 39a667d74f..55347cb986 100644
--- a/packages/website/ts/components/ui/drop_down_menu_item.tsx
+++ b/packages/website/ts/components/ui/drop_down_menu_item.tsx
@@ -72,7 +72,7 @@ export class DropDownMenuItem extends React.Component<DropDownMenuItemProps, Dro
                         onMouseEnter={this.onHover.bind(this)}
                         onMouseLeave={this.onHoverOff.bind(this)}
                     >
-                        <Menu style={{color: colors.gray}}>
+                        <Menu style={{color: colors.grey}}>
                             {this.props.subMenuItems}
                         </Menu>
                     </div>
diff --git a/packages/website/ts/components/ui/input_label.tsx b/packages/website/ts/components/ui/input_label.tsx
index 1f26f5fd22..43f101d110 100644
--- a/packages/website/ts/components/ui/input_label.tsx
+++ b/packages/website/ts/components/ui/input_label.tsx
@@ -7,7 +7,7 @@ export interface InputLabelProps {
 
 const styles = {
     label: {
-        color: colors.grey500,
+        color: colors.grey,
         fontSize: 12,
         pointerEvents: 'none',
         textAlign: 'left',
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index e0780c2201..60d8ac66d0 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -152,12 +152,12 @@ export class About extends React.Component<AboutProps, AboutState> {
     }
     public render() {
         return (
-            <div style={{backgroundColor: colors.lightestGray}}>
+            <div style={{backgroundColor: colors.lightGrey}}>
                 <DocumentTitle title="0x About Us"/>
                 <TopBar
                     blockchainIsLoaded={false}
                     location={this.props.location}
-                    style={{backgroundColor: colors.lightestGray}}
+                    style={{backgroundColor: colors.lightGrey}}
                 />
                 <div
                     id="about"
@@ -194,7 +194,7 @@ export class About extends React.Component<AboutProps, AboutState> {
                     <div className="pt3 pb2">
                         <div
                             className="pt2 pb3 sm-center md-pl4 lg-pl0 md-ml3"
-                            style={{color: colors.gray, fontSize: 24, fontFamily: 'Roboto Mono'}}
+                            style={{color: colors.grey, fontSize: 24, fontFamily: 'Roboto Mono'}}
                         >
                             Advisors:
                         </div>
diff --git a/packages/website/ts/pages/documentation/method_block.tsx b/packages/website/ts/pages/documentation/method_block.tsx
index df580fcd0d..b19a97e2db 100644
--- a/packages/website/ts/pages/documentation/method_block.tsx
+++ b/packages/website/ts/pages/documentation/method_block.tsx
@@ -150,7 +150,7 @@ export class MethodBlock extends React.Component<MethodBlockProps, MethodBlockSt
                         <div className="bold">
                             {parameter.name}
                         </div>
-                        <div className="pt1" style={{color: colors.grey500, fontSize: 14}}>
+                        <div className="pt1" style={{color: colors.grey, fontSize: 14}}>
                             {isOptional && 'optional'}
                         </div>
                     </div>
diff --git a/packages/website/ts/pages/documentation/source_link.tsx b/packages/website/ts/pages/documentation/source_link.tsx
index 9fe919c4e3..dceb88b7b1 100644
--- a/packages/website/ts/pages/documentation/source_link.tsx
+++ b/packages/website/ts/pages/documentation/source_link.tsx
@@ -29,7 +29,7 @@ export function SourceLink(props: SourceLinkProps) {
                 href={sourceCodeUrl}
                 target="_blank"
                 className="underline"
-                style={{color: colors.grey500}}
+                style={{color: colors.grey}}
             >
                 Source
             </a>
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 56d021b8d0..11d891e4ff 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -287,7 +287,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         });
         const titleStyle: React.CSSProperties = {
             fontFamily: 'Roboto Mono',
-            color: colors.gray,
+            color: colors.grey,
             textTransform: 'uppercase',
             fontWeight: 300,
             letterSpacing: 3,
@@ -329,7 +329,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix lg-py4 md-py4 sm-pb4 sm-pt2"
-                style={{backgroundColor: colors.offWhite}}
+                style={{backgroundColor: colors.grey100}}
             >
                 <div className="mx-auto max-width-4 py4 clearfix">
                     {isSmallScreen &&
@@ -601,7 +601,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         const boxStyle: React.CSSProperties = {
             maxWidth: 252,
             height: 386,
-            backgroundColor: colors.lightestGray,
+            backgroundColor: colors.lightGrey,
             borderRadius: 5,
             padding: '10px 24px 24px',
         };
@@ -705,14 +705,14 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         const cases = _.map(useCases, (useCase: UseCase) => {
             const style = _.isUndefined(useCase.style) || isSmallScreen ? {} : useCase.style;
             const useCaseBoxStyle = {
-                color: colors.gray,
+                color: colors.grey,
                 border: '1px solid #565656',
                 borderRadius: 4,
                 maxWidth: isSmallScreen ? 375 : 'none',
                 ...style,
             };
             const typeStyle: React.CSSProperties = {
-                color: colors.lightestGray,
+                color: colors.lightGrey,
                 fontSize: 13,
                 textTransform: 'uppercase',
                 fontFamily: 'Roboto Mono',
diff --git a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
index 7a8c9abbd8..b06c05a1a3 100644
--- a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
+++ b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
@@ -55,7 +55,7 @@ export class NestedSidebarMenu extends React.Component<NestedSidebarMenuProps, N
                             containerId={constants.DOCS_CONTAINER_ID}
                         >
                             <div
-                                style={{color: colors.grey500, cursor: 'pointer'}}
+                                style={{color: colors.grey, cursor: 'pointer'}}
                                 className="pb1"
                             >
                                 {finalSectionName.toUpperCase()}
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 68383ac361..78a97e04ac 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -1,6 +1,5 @@
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
 import {
@@ -11,6 +10,7 @@ import {MarkdownSection} from 'ts/pages/shared/markdown_section';
 import {NestedSidebarMenu} from 'ts/pages/shared/nested_sidebar_menu';
 import {SectionHeader} from 'ts/pages/shared/section_header';
 import {Article, ArticlesBySection, HeaderSizes, Styles, WebsitePaths} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
@@ -143,7 +143,7 @@ export class Wiki extends React.Component<WikiProps, WikiState> {
                         headerSize={HeaderSizes.H2}
                         githubLink={githubLink}
                     />
-                    <div className="mb4 mt3 p3 center" style={{backgroundColor: colors.lightestGray}}>
+                    <div className="mb4 mt3 p3 center" style={{backgroundColor: colors.lightGrey}}>
                         See a way to make this article better?{' '}
                         <a
                             href={githubLink}
diff --git a/packages/website/ts/utils/colors.ts b/packages/website/ts/utils/colors.ts
index c6a8547d1e..886cfe64eb 100644
--- a/packages/website/ts/utils/colors.ts
+++ b/packages/website/ts/utils/colors.ts
@@ -2,29 +2,27 @@ import {colors as materialUiColors} from 'material-ui/styles';
 
 export const colors = {
     ...materialUiColors,
-    offWhite: 'rgb(245, 245, 245)',
     beigeWhite: '#E4E4E4',
-    grayishPink: 'rgb(230, 229, 229)',
-    lightestGray: '#F0F0F0',
-    lightGray: '#BBBBBB',
+    grayishPink: '#E6E5E5',
+    lightGrey: '#BBBBBB',
     gray: '#A5A5A5',
     darkGray: '#818181',
     darkerGray: '#393939',
     heroGray: '#404040',
     projectsGray: '#343333',
     landingLinkGray: '#919191',
-    darkestGray: 'rgb(39, 39, 39)',
-    dharmaDarkGray: 'rgb(37, 37, 37)',
-    lightBlue: '#60a4f4',
+    darkestGray: '#272727',
+    dharmaDarkGray: '#252525',
+    lightBlue: '#60A4F4',
     darkBlue: '#4D5481',
-    lightPurple: '#a81ca6',
+    lightPurple: '#A81CA6',
     purple: '#690596',
-    red: '#e91751',
+    red: '#E91751',
     turquois: '#058789',
-    orange: '#e69d00',
-    lightestGreen: 'rgb(137, 199, 116)',
-    lightGreen: 'rgb(77, 197, 92)',
-    limeGreen: 'rgb(102, 222, 117)',
-    green: '#4da24b',
-    brightGreen: 'rgb(0, 195, 62)',
+    orange: '#E69D00',
+    lightestGreen: '#89C774',
+    lightGreen: '#4DC55C',
+    limeGreen: '#66DE75',
+    green: '#4DA24B',
+    brightGreen: '#00C33E',
 };

From 1aed970ce3468306f3bedbfdc29669d42e487441 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Dec 2017 10:28:34 +0100
Subject: [PATCH 047/125] standarize on `grey` over `gray` spelling and other
 color related fixes

---
 .../dialogs/eth_weth_conversion_dialog.tsx    |  1 -
 .../dialogs/u2f_not_supported_dialog.tsx      |  2 +-
 .../components/eth_weth_conversion_button.tsx |  1 -
 .../website/ts/components/eth_wrappers.tsx    |  2 +-
 packages/website/ts/components/fill_order.tsx |  2 +-
 .../ts/components/fill_warning_dialog.tsx     |  2 +-
 .../flash_messages/token_send_completed.tsx   |  3 +-
 .../flash_messages/transaction_submitted.tsx  |  3 +-
 packages/website/ts/components/footer.tsx     |  6 +--
 .../generate_order/generate_order_form.tsx    |  2 +-
 .../generate_order/new_token_form.tsx         |  2 +-
 .../ts/components/inputs/address_input.tsx    |  2 +-
 .../inputs/balance_bounded_input.tsx          |  4 +-
 .../components/inputs/token_amount_input.tsx  |  4 +-
 .../ts/components/inputs/token_input.tsx      |  2 +-
 packages/website/ts/components/portal.tsx     | 11 ++++--
 .../website/ts/components/token_balances.tsx  |  4 +-
 packages/website/ts/components/top_bar.tsx    |  7 ++--
 .../ts/components/top_bar_menu_item.tsx       |  4 +-
 .../components/track_token_confirmation.tsx   |  2 +-
 .../trade_history/trade_history_item.tsx      |  2 +-
 .../website/ts/components/ui/copy_icon.tsx    |  2 +-
 .../ts/components/ui/etherscan_icon.tsx       |  2 +-
 .../website/ts/components/ui/input_label.tsx  |  2 +-
 .../components/ui/lifecycle_raised_button.tsx |  4 +-
 .../ts/components/ui/required_label.tsx       |  2 +-
 .../website/ts/components/ui/swap_icon.tsx    |  2 +-
 packages/website/ts/index.tsx                 | 10 ++---
 packages/website/ts/pages/about/about.tsx     |  9 ++---
 packages/website/ts/pages/about/profile.tsx   |  2 +-
 .../ts/pages/documentation/documentation.tsx  |  5 +--
 .../ts/pages/documentation/method_block.tsx   |  4 +-
 .../ts/pages/documentation/source_link.tsx    |  2 +-
 .../website/ts/pages/documentation/type.tsx   |  3 +-
 packages/website/ts/pages/faq/faq.tsx         |  2 +-
 packages/website/ts/pages/faq/question.tsx    |  2 +-
 packages/website/ts/pages/landing/landing.tsx | 39 +++++++++----------
 .../ts/pages/shared/nested_sidebar_menu.tsx   |  2 +-
 packages/website/ts/pages/wiki/wiki.tsx       |  2 +-
 packages/website/ts/utils/colors.ts           | 19 ++++-----
 40 files changed, 91 insertions(+), 92 deletions(-)

diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index 96533defc0..44c23e4b07 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -6,7 +6,6 @@ import {EthAmountInput} from 'ts/components/inputs/eth_amount_input';
 import {TokenAmountInput} from 'ts/components/inputs/token_amount_input';
 import {Side, Token, TokenState} from 'ts/types';
 import {colors} from 'ts/utils/colors';
-import {constants} from 'ts/utils/constants';
 
 interface EthWethConversionDialogProps {
     direction: Side;
diff --git a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
index e2bef63c78..83042624df 100644
--- a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
+++ b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
@@ -1,7 +1,7 @@
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 
 interface U2fNotSupportedDialogProps {
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index 4f218286d7..5464f8df0f 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -7,7 +7,6 @@ import {Blockchain} from 'ts/blockchain';
 import {EthWethConversionDialog} from 'ts/components/dialogs/eth_weth_conversion_dialog';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {BlockchainCallErrs, Side, Token, TokenState} from 'ts/types';
-import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {errorReporter} from 'ts/utils/error_reporter';
 import {utils} from 'ts/utils/utils';
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index fb1205b62a..ef1379e59c 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -2,7 +2,6 @@ import {ZeroEx} from '0x.js';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Divider from 'material-ui/Divider';
-import {colors} from 'ts/utils/colors';
 import {
     Table,
     TableBody,
@@ -24,6 +23,7 @@ import {
     TokenState,
     TokenStateByAddress,
 } from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index f91540c26e..c96dfe27a1 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -323,7 +323,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
                 Order successfully filled. See the trade details in your{' '}
                 <Link
                     to={`${WebsitePaths.Portal}/trades`}
-                    style={{color: 'white'}}
+                    style={{color: colors.white}}
                 >
                     trade history
                 </Link>
diff --git a/packages/website/ts/components/fill_warning_dialog.tsx b/packages/website/ts/components/fill_warning_dialog.tsx
index e6642d4502..7370ee2d86 100644
--- a/packages/website/ts/components/fill_warning_dialog.tsx
+++ b/packages/website/ts/components/fill_warning_dialog.tsx
@@ -1,7 +1,7 @@
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 
 interface FillWarningDialogProps {
     isOpen: boolean;
diff --git a/packages/website/ts/components/flash_messages/token_send_completed.tsx b/packages/website/ts/components/flash_messages/token_send_completed.tsx
index fef7520f66..26619c54f1 100644
--- a/packages/website/ts/components/flash_messages/token_send_completed.tsx
+++ b/packages/website/ts/components/flash_messages/token_send_completed.tsx
@@ -3,6 +3,7 @@ import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import * as React from 'react';
 import {Token} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {utils} from 'ts/utils/utils';
 
 interface TokenSendCompletedProps {
@@ -19,7 +20,7 @@ export class TokenSendCompleted extends React.Component<TokenSendCompletedProps,
         const etherScanLink = !_.isUndefined(this.props.etherScanLinkIfExists) &&
                             (
                                 <a
-                                    style={{color: 'white'}}
+                                    style={{color: colors.white}}
                                     href={`${this.props.etherScanLinkIfExists}`}
                                     target="_blank"
                                 >
diff --git a/packages/website/ts/components/flash_messages/transaction_submitted.tsx b/packages/website/ts/components/flash_messages/transaction_submitted.tsx
index cef3e2b1eb..64f460e205 100644
--- a/packages/website/ts/components/flash_messages/transaction_submitted.tsx
+++ b/packages/website/ts/components/flash_messages/transaction_submitted.tsx
@@ -1,5 +1,6 @@
 import * as _ from 'lodash';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 
 interface TransactionSubmittedProps {
     etherScanLinkIfExists?: string;
@@ -16,7 +17,7 @@ export class TransactionSubmitted extends React.Component<TransactionSubmittedPr
                 <div>
                     Transaction submitted to the network:{' '}
                     <a
-                        style={{color: 'white'}}
+                        style={{color: colors.white}}
                         href={`${this.props.etherScanLinkIfExists}`}
                         target="_blank"
                     >
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 4b03c49e65..82e046a593 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -98,7 +98,7 @@ const menuItemsBySection: MenuItemsBySection = {
     ],
 };
 const linkStyle = {
-    color: 'white',
+    color: colors.white,
     cursor: 'pointer',
 };
 
@@ -116,8 +116,8 @@ interface FooterState {}
 export class Footer extends React.Component<FooterProps, FooterState> {
     public render() {
         return (
-            <div className="relative pb4 pt2" style={{backgroundColor: colors.darkerGray}}>
-                <div className="mx-auto max-width-4 md-px2 lg-px0 py4 clearfix" style={{color: 'white'}}>
+            <div className="relative pb4 pt2" style={{backgroundColor: colors.darkerGrey}}>
+                <div className="mx-auto max-width-4 md-px2 lg-px0 py4 clearfix" style={{color: colors.white}}>
                     <div className="col lg-col-4 md-col-4 col-12 left">
                         <div className="sm-mx-auto" style={{width: 148}}>
                             <div>
diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx
index 587fdc6f1d..5479f0f830 100644
--- a/packages/website/ts/components/generate_order/generate_order_form.tsx
+++ b/packages/website/ts/components/generate_order/generate_order_form.tsx
@@ -3,7 +3,6 @@ import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import Divider from 'material-ui/Divider';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
 import {ExpirationInput} from 'ts/components/inputs/expiration_input';
@@ -30,6 +29,7 @@ import {
     TokenByAddress,
     TokenStateByAddress,
 } from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {errorReporter} from 'ts/utils/error_reporter';
 import {utils} from 'ts/utils/utils';
 
diff --git a/packages/website/ts/components/generate_order/new_token_form.tsx b/packages/website/ts/components/generate_order/new_token_form.tsx
index 604a54b186..6c3c01d0df 100644
--- a/packages/website/ts/components/generate_order/new_token_form.tsx
+++ b/packages/website/ts/components/generate_order/new_token_form.tsx
@@ -1,6 +1,5 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
@@ -9,6 +8,7 @@ import {Alert} from 'ts/components/ui/alert';
 import {LifeCycleRaisedButton} from 'ts/components/ui/lifecycle_raised_button';
 import {RequiredLabel} from 'ts/components/ui/required_label';
 import {AlertTypes, Token, TokenByAddress, TokenState} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 
 interface NewTokenFormProps {
     blockchain: Blockchain;
diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx
index d432a038ec..a17b6e3f50 100644
--- a/packages/website/ts/components/inputs/address_input.tsx
+++ b/packages/website/ts/components/inputs/address_input.tsx
@@ -1,9 +1,9 @@
 import {addressUtils} from '@0xproject/utils';
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {RequiredLabel} from 'ts/components/ui/required_label';
+import {colors} from 'ts/utils/colors';
 
 interface AddressInputProps {
     disabled?: boolean;
diff --git a/packages/website/ts/components/inputs/balance_bounded_input.tsx b/packages/website/ts/components/inputs/balance_bounded_input.tsx
index 0b92a5856c..61ab34f25e 100644
--- a/packages/website/ts/components/inputs/balance_bounded_input.tsx
+++ b/packages/website/ts/components/inputs/balance_bounded_input.tsx
@@ -1,11 +1,11 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
 import {RequiredLabel} from 'ts/components/ui/required_label';
 import {InputErrMsg, ValidatedBigNumberCallback, WebsitePaths} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {utils} from 'ts/utils/utils';
 
 interface BalanceBoundedInputProps {
@@ -133,7 +133,7 @@ export class BalanceBoundedInput extends
         const increaseBalanceText = 'Increase balance';
         const linkStyle = {
             cursor: 'pointer',
-            color: colors.darkestGray,
+            color: colors.darkestGrey,
             textDecoration: 'underline',
             display: 'inline',
         };
diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx
index ddf0d3307d..c9728dc5f0 100644
--- a/packages/website/ts/components/inputs/token_amount_input.tsx
+++ b/packages/website/ts/components/inputs/token_amount_input.tsx
@@ -1,11 +1,11 @@
 import {ZeroEx} from '0x.js';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Link} from 'react-router-dom';
 import {BalanceBoundedInput} from 'ts/components/inputs/balance_bounded_input';
 import {InputErrMsg, Token, TokenState, ValidatedBigNumberCallback, WebsitePaths} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 
 interface TokenAmountInputProps {
     token: Token;
@@ -59,7 +59,7 @@ export class TokenAmountInput extends React.Component<TokenAmountInputProps, Tok
                     Insufficient allowance.{' '}
                     <Link
                         to={`${WebsitePaths.Portal}/balances`}
-                        style={{cursor: 'pointer', color: colors.darkestGray}}
+                        style={{cursor: 'pointer', color: colors.darkestGrey}}
                     >
                             Set allowance
                     </Link>
diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx
index 806c8b21fc..7008da12fd 100644
--- a/packages/website/ts/components/inputs/token_input.tsx
+++ b/packages/website/ts/components/inputs/token_input.tsx
@@ -1,6 +1,5 @@
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Blockchain} from 'ts/blockchain';
 import {AssetPicker} from 'ts/components/generate_order/asset_picker';
@@ -8,6 +7,7 @@ import {InputLabel} from 'ts/components/ui/input_label';
 import {TokenIcon} from 'ts/components/ui/token_icon';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {AssetToken, BlockchainErrs, Side, Token, TokenByAddress} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 
 const TOKEN_ICON_DIMENSION = 80;
 
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index ea076205e1..c292e0a92d 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
 import {Route, Switch} from 'react-router-dom';
@@ -32,6 +31,7 @@ import {
     TokenStateByAddress,
     WebsitePaths,
 } from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
@@ -138,6 +138,11 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
             flexDirection: 'column',
             justifyContent: 'space-between',
         };
+        const portalMenuContainerStyle: React.CSSProperties = {
+            overflow: 'hidden',
+            backgroundColor: colors.darkestGrey,
+            color: colors.white,
+        };
         return (
             <div style={portalStyle}>
                 <DocumentTitle title="0x Portal DApp"/>
@@ -171,9 +176,9 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
                             <div className="mx-auto flex">
                                 <div
                                     className="col col-2 pr2 pt1 sm-hide xs-hide"
-                                    style={{overflow: 'hidden', backgroundColor: colors.darkestGray, color: 'white'}}
+                                    style={portalMenuContainerStyle}
                                 >
-                                    <PortalMenu menuItemStyle={{color: 'white'}} />
+                                    <PortalMenu menuItemStyle={{color: colors.white}} />
                                 </div>
                                 <div className="col col-12 lg-col-10 md-col-10 sm-col sm-col-12">
                                     <div className="py2" style={{backgroundColor: colors.grey50}}>
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index a3c577a2e7..61aea6a88e 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -7,7 +7,6 @@ import Divider from 'material-ui/Divider';
 import FlatButton from 'material-ui/FlatButton';
 import FloatingActionButton from 'material-ui/FloatingActionButton';
 import RaisedButton from 'material-ui/RaisedButton';
-import {colors} from 'ts/utils/colors';
 import ContentAdd from 'material-ui/svg-icons/content/add';
 import ContentRemove from 'material-ui/svg-icons/content/remove';
 import {
@@ -42,6 +41,7 @@ import {
     TokenStateByAddress,
     TokenVisibility,
 } from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {errorReporter} from 'ts/utils/error_reporter';
@@ -334,7 +334,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                 <Dialog
                     title="Request Dharma Loan"
                     titleStyle={{fontWeight: 100, backgroundColor: colors.white}}
-                    bodyStyle={{backgroundColor: colors.dharmaDarkGray}}
+                    bodyStyle={{backgroundColor: colors.dharmaDarkGrey}}
                     actionsContainerStyle={{backgroundColor: colors.white}}
                     autoScrollBodyContent={true}
                     actions={dharmaDialogActions}
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index 179840ffcc..73bdfacca4 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -12,7 +12,6 @@ import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {NestedSidebarMenu} from 'ts/pages/shared/nested_sidebar_menu';
 import {DocsMenu, MenuSubsectionsBySection, Styles, WebsitePaths} from 'ts/types';
 import {colors} from 'ts/utils/colors';
-import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 
 interface TopBarProps {
@@ -44,11 +43,11 @@ const styles: Styles = {
     },
     addressPopover: {
         backgroundColor: colors.blueGrey500,
-        color: 'white',
+        color: colors.white,
         padding: 3,
     },
     topBar: {
-        backgroundColor: 'white',
+        backgroundcolor: colors.white,
         height: 59,
         width: '100%',
         position: 'fixed',
@@ -61,7 +60,7 @@ const styles: Styles = {
     },
     menuItem: {
         fontSize: 14,
-        color: colors.darkestGray,
+        color: colors.darkestGrey,
         paddingTop: 6,
         paddingBottom: 6,
         marginTop: 17,
diff --git a/packages/website/ts/components/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar_menu_item.tsx
index d912abe06e..64cb48b2e6 100644
--- a/packages/website/ts/components/top_bar_menu_item.tsx
+++ b/packages/website/ts/components/top_bar_menu_item.tsx
@@ -4,7 +4,7 @@ import {Link} from 'react-router-dom';
 import {colors} from 'ts/utils/colors';
 
 const DEFAULT_STYLE = {
-    color: colors.darkestGray,
+    color: colors.darkestGrey,
 };
 
 interface TopBarMenuItemProps {
@@ -36,7 +36,7 @@ export class TopBarMenuItem extends React.Component<TopBarMenuItemProps, TopBarM
         } : {};
         const menuItemColor = this.props.isNightVersion ? 'white' : this.props.style.color;
         const linkColor = _.isUndefined(menuItemColor) ?
-            colors.darkestGray :
+            colors.darkestGrey :
             menuItemColor;
         return (
             <div
diff --git a/packages/website/ts/components/track_token_confirmation.tsx b/packages/website/ts/components/track_token_confirmation.tsx
index 2cda34c1a0..ff840fe8cf 100644
--- a/packages/website/ts/components/track_token_confirmation.tsx
+++ b/packages/website/ts/components/track_token_confirmation.tsx
@@ -1,8 +1,8 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Party} from 'ts/components/ui/party';
 import {Token, TokenByAddress} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {utils} from 'ts/utils/utils';
 
 interface TrackTokenConfirmationProps {
diff --git a/packages/website/ts/components/trade_history/trade_history_item.tsx b/packages/website/ts/components/trade_history/trade_history_item.tsx
index 27d5c1e035..d2a334df94 100644
--- a/packages/website/ts/components/trade_history/trade_history_item.tsx
+++ b/packages/website/ts/components/trade_history/trade_history_item.tsx
@@ -2,13 +2,13 @@ import {ZeroEx} from '0x.js';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
-import {colors} from 'ts/utils/colors';
 import * as moment from 'moment';
 import * as React from 'react';
 import * as ReactTooltip from 'react-tooltip';
 import {EtherScanIcon} from 'ts/components/ui/etherscan_icon';
 import {Party} from 'ts/components/ui/party';
 import {EtherscanLinkSuffixes, Fill, Token, TokenByAddress} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 
 const PRECISION = 5;
 const IDENTICON_DIAMETER = 40;
diff --git a/packages/website/ts/components/ui/copy_icon.tsx b/packages/website/ts/components/ui/copy_icon.tsx
index d3a0f47ee1..3c50430df4 100644
--- a/packages/website/ts/components/ui/copy_icon.tsx
+++ b/packages/website/ts/components/ui/copy_icon.tsx
@@ -1,9 +1,9 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import * as ReactDOM from 'react-dom';
 import ReactTooltip = require('react-tooltip');
+import {colors} from 'ts/utils/colors';
 
 interface CopyIconProps {
     data: string;
diff --git a/packages/website/ts/components/ui/etherscan_icon.tsx b/packages/website/ts/components/ui/etherscan_icon.tsx
index 2778fc0858..111d5d478d 100644
--- a/packages/website/ts/components/ui/etherscan_icon.tsx
+++ b/packages/website/ts/components/ui/etherscan_icon.tsx
@@ -1,8 +1,8 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
 import {EtherscanLinkSuffixes} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {utils} from 'ts/utils/utils';
 
 interface EtherScanIconProps {
diff --git a/packages/website/ts/components/ui/input_label.tsx b/packages/website/ts/components/ui/input_label.tsx
index 43f101d110..bfa1da280a 100644
--- a/packages/website/ts/components/ui/input_label.tsx
+++ b/packages/website/ts/components/ui/input_label.tsx
@@ -1,5 +1,5 @@
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 
 export interface InputLabelProps {
     text: string | Element | React.ReactNode;
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
index 1856a6b505..08e8bc9ceb 100644
--- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx
+++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
@@ -32,8 +32,8 @@ export class LifeCycleRaisedButton extends
     React.Component<LifeCycleRaisedButtonProps, LifeCycleRaisedButtonState> {
     public static defaultProps: Partial<LifeCycleRaisedButtonProps> = {
         isDisabled: false,
-        backgroundColor: 'white',
-        labelColor: colors.darkGray,
+        backgroundColor: colors.white,
+        labelColor: colors.darkGrey,
     };
     private buttonTimeoutId: number;
     private didUnmount: boolean;
diff --git a/packages/website/ts/components/ui/required_label.tsx b/packages/website/ts/components/ui/required_label.tsx
index 3166ae0e73..979b06d66e 100644
--- a/packages/website/ts/components/ui/required_label.tsx
+++ b/packages/website/ts/components/ui/required_label.tsx
@@ -1,5 +1,5 @@
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 
 export interface RequiredLabelProps {
     label: string|React.ReactNode;
diff --git a/packages/website/ts/components/ui/swap_icon.tsx b/packages/website/ts/components/ui/swap_icon.tsx
index 0f65bf449e..124e7018ca 100644
--- a/packages/website/ts/components/ui/swap_icon.tsx
+++ b/packages/website/ts/components/ui/swap_icon.tsx
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
+import {colors} from 'ts/utils/colors';
 
 interface SwapIconProps {
     swapTokensFn: () => void;
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index ba08eef16f..2f88ec8f46 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -2,7 +2,6 @@
 import 'whatwg-fetch';
 
 import {bigNumberConfigs} from '@0xproject/utils';
-import BigNumber from 'bignumber.js';
 import {getMuiTheme, MuiThemeProvider} from 'material-ui/styles';
 import * as React from 'react';
 import {render} from 'react-dom';
@@ -21,7 +20,6 @@ import {Wiki} from 'ts/pages/wiki/wiki';
 import {reducer, State} from 'ts/redux/reducer';
 import {WebsitePaths} from 'ts/types';
 import {colors} from 'ts/utils/colors';
-import {constants} from 'ts/utils/constants';
 injectTapEventPlugin();
 
 bigNumberConfigs.configure();
@@ -49,16 +47,16 @@ const muiTheme = getMuiTheme({
         color: colors.grey700,
         textColor: colors.white,
         calendarTextColor: colors.white,
-        selectColor: colors.darkestGray,
+        selectColor: colors.darkestGrey,
         selectTextColor: colors.white,
     },
     timePicker: {
         color: colors.grey700,
         textColor: colors.white,
         accentColor: colors.white,
-        headerColor: colors.darkestGray,
-        selectColor: colors.darkestGray,
-        selectTextColor: colors.darkestGray,
+        headerColor: colors.darkestGrey,
+        selectColor: colors.darkestGrey,
+        selectTextColor: colors.darkestGrey,
     },
     toggle: {
         thumbOnColor: colors.limeGreen,
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 60d8ac66d0..8c512ee5cd 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -1,16 +1,15 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
 import {Profile} from 'ts/pages/about/profile';
 import {ProfileInfo, Styles} from 'ts/types';
-import {configs} from 'ts/utils/configs';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
-const DARKEST_GRAY = colors.darkestGray;
+const DARKEST_GRAY = colors.darkestGrey;
 
 const teamRow1: ProfileInfo[] = [
     {
@@ -152,12 +151,12 @@ export class About extends React.Component<AboutProps, AboutState> {
     }
     public render() {
         return (
-            <div style={{backgroundColor: colors.lightGrey}}>
+            <div style={{backgroundColor: colors.lightestGrey}}>
                 <DocumentTitle title="0x About Us"/>
                 <TopBar
                     blockchainIsLoaded={false}
                     location={this.props.location}
-                    style={{backgroundColor: colors.lightGrey}}
+                    style={{backgroundColor: colors.lightestGrey}}
                 />
                 <div
                     id="about"
diff --git a/packages/website/ts/pages/about/profile.tsx b/packages/website/ts/pages/about/profile.tsx
index cb87cc946b..ef74f268a7 100644
--- a/packages/website/ts/pages/about/profile.tsx
+++ b/packages/website/ts/pages/about/profile.tsx
@@ -49,7 +49,7 @@ export function Profile(props: ProfileProps) {
                 {!_.isUndefined(props.profileInfo.title) &&
                     <div
                         className="pt1 center"
-                        style={{fontSize: 14, fontFamily: 'Roboto Mono', color: colors.darkGray}}
+                        style={{fontSize: 14, fontFamily: 'Roboto Mono', color: colors.darkGrey}}
                     >
                         {props.profileInfo.title.toUpperCase()}
                     </div>
diff --git a/packages/website/ts/pages/documentation/documentation.tsx b/packages/website/ts/pages/documentation/documentation.tsx
index 768c6710f3..97e632452e 100644
--- a/packages/website/ts/pages/documentation/documentation.tsx
+++ b/packages/website/ts/pages/documentation/documentation.tsx
@@ -1,7 +1,6 @@
 import findVersions = require('find-versions');
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
 import {
@@ -34,7 +33,7 @@ import {
     TypeDefinitionByName,
     TypescriptMethod,
 } from 'ts/types';
-import {configs} from 'ts/utils/configs';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 import {docUtils} from 'ts/utils/doc_utils';
 import {utils} from 'ts/utils/utils';
@@ -286,7 +285,7 @@ export class Documentation extends
                         key={`badge-${networkName}-${sectionName}`}
                         href={linkIfExists}
                         target="_blank"
-                        style={{color: 'white', textDecoration: 'none'}}
+                        style={{color: colors.white, textDecoration: 'none'}}
                     >
                         <Badge
                             title={networkName}
diff --git a/packages/website/ts/pages/documentation/method_block.tsx b/packages/website/ts/pages/documentation/method_block.tsx
index b19a97e2db..5163e03ace 100644
--- a/packages/website/ts/pages/documentation/method_block.tsx
+++ b/packages/website/ts/pages/documentation/method_block.tsx
@@ -1,5 +1,4 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Comment} from 'ts/pages/documentation/comment';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
@@ -14,6 +13,7 @@ import {
     TypeDefinitionByName,
     TypescriptMethod,
 } from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {typeDocUtils} from 'ts/utils/typedoc_utils';
 
 interface MethodBlockProps {
@@ -31,7 +31,7 @@ const styles: Styles = {
     chip: {
         fontSize: 13,
         backgroundColor: colors.lightBlueA700,
-        color: 'white',
+        color: colors.white,
         height: 11,
         borderRadius: 14,
         marginTop: 19,
diff --git a/packages/website/ts/pages/documentation/source_link.tsx b/packages/website/ts/pages/documentation/source_link.tsx
index dceb88b7b1..1a3b58f81d 100644
--- a/packages/website/ts/pages/documentation/source_link.tsx
+++ b/packages/website/ts/pages/documentation/source_link.tsx
@@ -1,7 +1,7 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Source} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 
 interface SourceLinkProps {
     source: Source;
diff --git a/packages/website/ts/pages/documentation/type.tsx b/packages/website/ts/pages/documentation/type.tsx
index 393ee3a51d..37517afdc5 100644
--- a/packages/website/ts/pages/documentation/type.tsx
+++ b/packages/website/ts/pages/documentation/type.tsx
@@ -1,12 +1,11 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Link as ScrollLink} from 'react-scroll';
 import * as ReactTooltip from 'react-tooltip';
 import {DocsInfo} from 'ts/pages/documentation/docs_info';
 import {TypeDefinition} from 'ts/pages/documentation/type_definition';
 import {Type as TypeDef, TypeDefinitionByName, TypeDocTypes} from 'ts/types';
-import {configs} from 'ts/utils/configs';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index 25fc9934c6..8afb9e4e8b 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -1,11 +1,11 @@
 import * as _ from 'lodash';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
 import {Question} from 'ts/pages/faq/question';
 import {FAQQuestion, FAQSection, Styles, WebsitePaths} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 
diff --git a/packages/website/ts/pages/faq/question.tsx b/packages/website/ts/pages/faq/question.tsx
index ed50f6948c..534304cc8d 100644
--- a/packages/website/ts/pages/faq/question.tsx
+++ b/packages/website/ts/pages/faq/question.tsx
@@ -32,7 +32,7 @@ export class Question extends React.Component<QuestionProps, QuestionState> {
                     <CardHeader
                         title={this.props.prompt}
                         style={{borderBottom: this.state.isExpanded ? '1px solid rgba(0, 0, 0, 0.19)' : 'none'}}
-                        titleStyle={{color: colors.darkerGray}}
+                        titleStyle={{color: colors.darkerGrey}}
                         actAsExpander={true}
                         showExpandableButton={true}
                     />
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 11d891e4ff..87c8ca0b1a 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -1,13 +1,12 @@
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
 import {Link} from 'react-router-dom';
 import {Footer} from 'ts/components/footer';
 import {TopBar} from 'ts/components/top_bar';
 import {ScreenWidths, WebsitePaths} from 'ts/types';
-import {configs} from 'ts/utils/configs';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
@@ -156,13 +155,13 @@ export class Landing extends React.Component<LandingProps, LandingState> {
     }
     public render() {
         return (
-            <div id="landing" className="clearfix" style={{color: colors.grey800}}>
+            <div id="landing" className="clearfix" style={{color: colors.grey500}}>
                 <DocumentTitle title="0x Protocol"/>
                 <TopBar
                     blockchainIsLoaded={false}
                     location={this.props.location}
                     isNightVersion={true}
-                    style={{backgroundColor: colors.heroGray, position: 'relative'}}
+                    style={{backgroundColor: colors.heroGrey, position: 'relative'}}
                 />
                 {this.renderHero()}
                 {this.renderProjects()}
@@ -193,7 +192,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix py4"
-                style={{backgroundColor: colors.heroGray}}
+                style={{backgroundColor: colors.heroGrey}}
             >
                 <div
                     className="mx-auto max-width-4 clearfix"
@@ -207,7 +206,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                         </div>
                         <div
                             className={left}
-                            style={{color: 'white'}}
+                            style={{color: colors.white}}
                         >
                             <div style={{paddingLeft: isSmallScreen ? 0 : 12}}>
                                 <div
@@ -245,7 +244,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                                 style={{borderRadius: 6, minWidth: 150}}
                                                 buttonStyle={lightButtonStyle}
                                                 labelColor="white"
-                                                backgroundColor={colors.heroGray}
+                                                backgroundColor={colors.heroGrey}
                                                 labelStyle={buttonLabelStyle}
                                                 label="Join the community"
                                                 onClick={_.noop}
@@ -295,7 +294,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix py4"
-                style={{backgroundColor: colors.projectsGray}}
+                style={{backgroundColor: colors.projectsGrey}}
             >
                 <div className="mx-auto max-width-4 clearfix sm-px3">
                     <div
@@ -309,13 +308,13 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                     </div>
                     <div
                         className="pt3 mx-auto center"
-                        style={{color: colors.landingLinkGray, fontFamily: 'Roboto Mono', maxWidth: 300, fontSize: 14}}
+                        style={{color: colors.landingLinkGrey, fontFamily: 'Roboto Mono', maxWidth: 300, fontSize: 14}}
                     >
                         view the{' '}
                         <Link
                             to={`${WebsitePaths.Wiki}#List-of-Projects-Using-0x-Protocol`}
                             className="text-decoration-none underline"
-                            style={{color: colors.landingLinkGray}}
+                            style={{color: colors.landingLinkGrey}}
                         >
                             full list
                         </Link>
@@ -382,7 +381,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix lg-py4 md-py4 sm-pt4"
-                style={{backgroundColor: colors.heroGray}}
+                style={{backgroundColor: colors.heroGrey}}
             >
                 <div className="mx-auto max-width-4 lg-py4 md-py4 sm-pt4 clearfix">
                     <div className="col lg-col-6 md-col-6 col-12 sm-center">
@@ -416,7 +415,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                         </div>
                         <div
                             className="pt3 sm-mx-auto sm-px3"
-                            style={{color: colors.landingLinkGray, maxWidth: isSmallScreen ? 412 : 'none'}}
+                            style={{color: colors.landingLinkGrey, maxWidth: isSmallScreen ? 412 : 'none'}}
                         >
                             <div className="flex" style={{fontSize: 18}}>
                                 <div
@@ -429,7 +428,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                     <Link
                                         to={`${WebsitePaths.Wiki}#List-of-Projects-Using-0x-Protocol`}
                                         className="text-decoration-none underline"
-                                        style={{color: colors.landingLinkGray, fontFamily: 'Roboto Mono'}}
+                                        style={{color: colors.landingLinkGrey, fontFamily: 'Roboto Mono'}}
                                     >
                                         view all
                                     </Link>
@@ -481,7 +480,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix lg-pt4 md-pt4"
-                style={{backgroundColor: colors.heroGray}}
+                style={{backgroundColor: colors.heroGrey}}
             >
                 <div className="mx-auto max-width-4 lg-pt4 md-pt4 lg-mb4 md-mb4 sm-mb2 clearfix">
                     {isSmallScreen &&
@@ -601,7 +600,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         const boxStyle: React.CSSProperties = {
             maxWidth: 252,
             height: 386,
-            backgroundColor: colors.lightGrey,
+            backgroundColor: colors.grey50,
             borderRadius: 5,
             padding: '10px 24px 24px',
         };
@@ -638,7 +637,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix"
-                style={{backgroundColor: colors.heroGray}}
+                style={{backgroundColor: colors.heroGrey}}
             >
                 <div
                     className="mx-auto py4 sm-mt2 clearfix"
@@ -749,7 +748,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix pb4 lg-pt2 md-pt2 sm-pt4"
-                style={{backgroundColor: colors.heroGray}}
+                style={{backgroundColor: colors.heroGrey}}
             >
                 <div
                     className="mx-auto pb4 pt3 mt1 sm-mt2 clearfix"
@@ -778,14 +777,14 @@ export class Landing extends React.Component<LandingProps, LandingState> {
         return (
             <div
                 className="clearfix pb4"
-                style={{backgroundColor: colors.heroGray}}
+                style={{backgroundColor: colors.heroGrey}}
             >
                 <div
                     className="mx-auto max-width-4 pb4 mb3 clearfix"
                 >
                     <div
                         className={callToActionClassNames}
-                        style={{fontFamily: 'Roboto Mono', color: 'white', lineHeight: isSmallScreen ? 1.7 : 3}}
+                        style={{fontFamily: 'Roboto Mono', color: colors.white, lineHeight: isSmallScreen ? 1.7 : 3}}
                     >
                         Get started on building the decentralized future
                     </div>
@@ -795,7 +794,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                 style={{borderRadius: 6, minWidth: 150}}
                                 buttonStyle={lightButtonStyle}
                                 labelColor={colors.white}
-                                backgroundColor={colors.heroGray}
+                                backgroundColor={colors.heroGrey}
                                 labelStyle={buttonLabelStyle}
                                 label="Build on 0x"
                                 onClick={_.noop}
diff --git a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
index b06c05a1a3..fcbfaf1cf0 100644
--- a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
+++ b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx
@@ -1,10 +1,10 @@
 import * as _ from 'lodash';
 import MenuItem from 'material-ui/MenuItem';
-import {colors} from 'ts/utils/colors';
 import * as React from 'react';
 import {Link as ScrollLink} from 'react-scroll';
 import {VersionDropDown} from 'ts/pages/shared/version_drop_down';
 import {MenuSubsectionsBySection, Styles} from 'ts/types';
+import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 78a97e04ac..233df4f637 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -143,7 +143,7 @@ export class Wiki extends React.Component<WikiProps, WikiState> {
                         headerSize={HeaderSizes.H2}
                         githubLink={githubLink}
                     />
-                    <div className="mb4 mt3 p3 center" style={{backgroundColor: colors.lightGrey}}>
+                    <div className="mb4 mt3 p3 center" style={{backgroundColor: colors.lightestGrey}}>
                         See a way to make this article better?{' '}
                         <a
                             href={githubLink}
diff --git a/packages/website/ts/utils/colors.ts b/packages/website/ts/utils/colors.ts
index 886cfe64eb..5523f581eb 100644
--- a/packages/website/ts/utils/colors.ts
+++ b/packages/website/ts/utils/colors.ts
@@ -3,16 +3,17 @@ import {colors as materialUiColors} from 'material-ui/styles';
 export const colors = {
     ...materialUiColors,
     beigeWhite: '#E4E4E4',
-    grayishPink: '#E6E5E5',
+    greyishPink: '#E6E5E5',
+    lightestGrey: '#F0F0F0',
     lightGrey: '#BBBBBB',
-    gray: '#A5A5A5',
-    darkGray: '#818181',
-    darkerGray: '#393939',
-    heroGray: '#404040',
-    projectsGray: '#343333',
-    landingLinkGray: '#919191',
-    darkestGray: '#272727',
-    dharmaDarkGray: '#252525',
+    grey: '#A5A5A5',
+    darkGrey: '#818181',
+    darkerGrey: '#393939',
+    heroGrey: '#404040',
+    projectsGrey: '#343333',
+    landingLinkGrey: '#919191',
+    darkestGrey: '#272727',
+    dharmaDarkGrey: '#252525',
     lightBlue: '#60A4F4',
     darkBlue: '#4D5481',
     lightPurple: '#A81CA6',

From edfae324846359a9ba378de8d7d9c5c05b2c96cf Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Dec 2017 10:44:41 +0100
Subject: [PATCH 048/125] remove unused style

---
 packages/website/ts/components/top_bar.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index 73bdfacca4..bcb8efd077 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -41,11 +41,6 @@ const styles: Styles = {
         whiteSpace: 'nowrap',
         width: 70,
     },
-    addressPopover: {
-        backgroundColor: colors.blueGrey500,
-        color: colors.white,
-        padding: 3,
-    },
     topBar: {
         backgroundcolor: colors.white,
         height: 59,

From 400228e139a5c74302f1a16b8ca5c43ea4843307 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Dec 2017 10:44:55 +0100
Subject: [PATCH 049/125] Sort colors into color spectrum

---
 packages/website/ts/utils/colors.ts | 30 +++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/website/ts/utils/colors.ts b/packages/website/ts/utils/colors.ts
index 5523f581eb..c65a3a6222 100644
--- a/packages/website/ts/utils/colors.ts
+++ b/packages/website/ts/utils/colors.ts
@@ -2,28 +2,42 @@ import {colors as materialUiColors} from 'material-ui/styles';
 
 export const colors = {
     ...materialUiColors,
-    beigeWhite: '#E4E4E4',
-    greyishPink: '#E6E5E5',
+    grey50: '#FAFAFA',
+    grey100: '#F5F5F5',
     lightestGrey: '#F0F0F0',
+    greyishPink: '#E6E5E5',
+    grey300: '#E0E0E0',
+    beigeWhite: '#E4E4E4',
+    grey400: '#BDBDBD',
     lightGrey: '#BBBBBB',
+    grey500: '#9E9E9E',
     grey: '#A5A5A5',
     darkGrey: '#818181',
+    landingLinkGrey: '#919191',
+    grey700: '#616161',
+    grey800: '#424242',
     darkerGrey: '#393939',
     heroGrey: '#404040',
     projectsGrey: '#343333',
-    landingLinkGrey: '#919191',
     darkestGrey: '#272727',
     dharmaDarkGrey: '#252525',
     lightBlue: '#60A4F4',
+    lightBlueA700: '#0091EA',
     darkBlue: '#4D5481',
+    turquois: '#058789',
     lightPurple: '#A81CA6',
     purple: '#690596',
+    red200: '#EF9A9A',
     red: '#E91751',
-    turquois: '#058789',
-    orange: '#E69D00',
-    lightestGreen: '#89C774',
-    lightGreen: '#4DC55C',
+    red500: '#F44336',
+    red600: '#E53935',
     limeGreen: '#66DE75',
-    green: '#4DA24B',
+    lightGreen: '#4DC55C',
+    lightestGreen: '#89C774',
     brightGreen: '#00C33E',
+    green400: '#66BB6A',
+    green: '#4DA24B',
+    amber600: '#FFB300',
+    orange: '#E69D00',
+    amber800: '#FF8F00',
 };

From 6d447fd8a509118dca4f52c4939782e67f4f1076 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 12:30:14 +0100
Subject: [PATCH 050/125] Add hdnode dependency

---
 packages/subproviders/package.json     |  1 +
 packages/subproviders/src/globals.d.ts | 11 +++++++++++
 yarn.lock                              |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 8a222457dd..56fc9bf8b4 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -23,6 +23,7 @@
     "es6-promisify": "^5.0.0",
     "ethereumjs-tx": "^1.3.3",
     "ethereumjs-util": "^5.1.1",
+    "hdkey": "^0.7.1",
     "ledgerco": "0xProject/ledger-node-js-api",
     "lodash": "^4.17.4",
     "semaphore-async-await": "^1.5.1",
diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts
index adef238064..ce7b46155c 100644
--- a/packages/subproviders/src/globals.d.ts
+++ b/packages/subproviders/src/globals.d.ts
@@ -91,3 +91,14 @@ declare module 'web3-provider-engine' {
   }
   export = Web3ProviderEngine;
 }
+
+// hdkey declarations
+declare module 'hdkey' {
+    class HDNode {
+        public publicKey: Buffer;
+        public chainCode: Buffer;
+        public constructor();
+        public derive(path: string): HDNode;
+    }
+    export = HDNode;
+}
diff --git a/yarn.lock b/yarn.lock
index 2a7e12949e..d97a632827 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4199,7 +4199,7 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-hdkey@^0.7.0:
+hdkey@^0.7.0, hdkey@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632"
   dependencies:

From 064405126d7e198c6c3363416abf3b1bc16acc6a Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 12:30:34 +0100
Subject: [PATCH 051/125] Implement the address derivations

---
 packages/subproviders/src/globals.d.ts        |  2 +-
 .../subproviders/src/subproviders/ledger.ts   | 33 +++++++++++--------
 packages/subproviders/src/types.ts            |  4 ++-
 .../test/unit/ledger_subprovider_test.ts      | 10 ++++--
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts
index ce7b46155c..3800c970fb 100644
--- a/packages/subproviders/src/globals.d.ts
+++ b/packages/subproviders/src/globals.d.ts
@@ -48,7 +48,7 @@ declare module 'ledgerco' {
         public comm: comm;
         constructor(comm: comm);
         public getAddress_async(path: string, display?: boolean, chaincode?: boolean):
-               Promise<{publicKey: string; address: string}>;
+               Promise<{publicKey: string; address: string; chainCode: string}>;
         public signTransaction_async(path: string, rawTxHex: string): Promise<ECSignatureString>;
         public getAppConfiguration_async(): Promise<{ arbitraryDataEnabled: number; version: string }>;
         public signPersonalMessage_async(path: string, messageHex: string): Promise<ECSignature>;
diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts
index 9ffc105a45..9b2f1d1291 100644
--- a/packages/subproviders/src/subproviders/ledger.ts
+++ b/packages/subproviders/src/subproviders/ledger.ts
@@ -2,6 +2,7 @@ import {assert} from '@0xproject/assert';
 import {addressUtils} from '@0xproject/utils';
 import EthereumTx = require('ethereumjs-tx');
 import ethUtil = require('ethereumjs-util');
+import HDNode = require('hdkey');
 import * as _ from 'lodash';
 import Semaphore from 'semaphore-async-await';
 import Web3 = require('web3');
@@ -20,7 +21,7 @@ import {Subprovider} from './subprovider';
 const DEFAULT_DERIVATION_PATH = `44'/60'/0'`;
 const NUM_ADDRESSES_TO_FETCH = 10;
 const ASK_FOR_ON_DEVICE_CONFIRMATION = false;
-const SHOULD_GET_CHAIN_CODE = false;
+const SHOULD_GET_CHAIN_CODE = true;
 
 export class LedgerSubprovider extends Subprovider {
     private _nonceLock: Semaphore;
@@ -127,21 +128,27 @@ export class LedgerSubprovider extends Subprovider {
     public async getAccountsAsync(): Promise<string[]> {
         this._ledgerClientIfExists = await this.createLedgerClientAsync();
 
-        // TODO: replace with generating addresses without hitting Ledger
+        let ledgerResponse;
+        try {
+            ledgerResponse = await this._ledgerClientIfExists.getAddress_async(
+                `${this._derivationPath}`, this._shouldAlwaysAskForConfirmation, SHOULD_GET_CHAIN_CODE,
+            );
+        } finally {
+            await this.destoryLedgerClientAsync();
+        }
+
+        const hdKey = new HDNode();
+        hdKey.publicKey = new Buffer(ledgerResponse.publicKey, 'hex');
+        hdKey.chainCode = new Buffer(ledgerResponse.chainCode, 'hex');
+
         const accounts = [];
         for (let i = 0; i < NUM_ADDRESSES_TO_FETCH; i++) {
-            try {
-                const derivationPath = `${this._derivationPath}/${i + this._derivationPathIndex}`;
-                const result = await this._ledgerClientIfExists.getAddress_async(
-                    derivationPath, this._shouldAlwaysAskForConfirmation, SHOULD_GET_CHAIN_CODE,
-                );
-                accounts.push(result.address.toLowerCase());
-            } catch (err) {
-                await this.destoryLedgerClientAsync();
-                throw err;
-            }
+            const derivedHDNode = hdKey.derive(`m/${i + this._derivationPathIndex}`);
+            const derivedPublicKey = derivedHDNode.publicKey;
+            const ethereumAddressUnprefixed = ethUtil.publicToAddress(derivedPublicKey, true).toString('hex');
+            const ethereumAddressPrefixed = ethUtil.addHexPrefix(ethereumAddressUnprefixed);
+            accounts.push(ethereumAddressPrefixed.toLowerCase());
         }
-        await this.destoryLedgerClientAsync();
         return accounts;
     }
     public async signTransactionAsync(txParams: PartialTxParams): Promise<string> {
diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts
index 1e7d3eab09..02855dd4c0 100644
--- a/packages/subproviders/src/types.ts
+++ b/packages/subproviders/src/types.ts
@@ -11,7 +11,7 @@ export interface LedgerCommunicationClient {
  */
 export interface LedgerEthereumClient {
     getAddress_async: (derivationPath: string, askForDeviceConfirmation: boolean,
-                       shouldGetChainCode: boolean) => Promise<LedgerGetAddressResult>;
+                       shouldGetChainCode: true) => Promise<LedgerGetAddressResult>;
     signPersonalMessage_async: (derivationPath: string, messageHex: string) => Promise<ECSignature>;
     signTransaction_async: (derivationPath: string, txHex: string) => Promise<ECSignatureString>;
     comm: LedgerCommunicationClient;
@@ -63,6 +63,8 @@ export interface SignatureData {
 
 export interface LedgerGetAddressResult {
     address: string;
+    publicKey: string;
+    chainCode: string;
 }
 
 export interface LedgerWalletSubprovider {
diff --git a/packages/subproviders/test/unit/ledger_subprovider_test.ts b/packages/subproviders/test/unit/ledger_subprovider_test.ts
index bd4d933253..2370900511 100644
--- a/packages/subproviders/test/unit/ledger_subprovider_test.ts
+++ b/packages/subproviders/test/unit/ledger_subprovider_test.ts
@@ -18,7 +18,7 @@ import {reportCallbackErrors} from '../utils/report_callback_errors';
 
 chaiSetup.configure();
 const expect = chai.expect;
-const FAKE_ADDRESS = '0x9901c66f2d4b95f7074b553da78084d708beca70';
+const FAKE_ADDRESS = '0xb088a3bc93f71b4de97b9de773e9647645983688';
 
 describe('LedgerSubprovider', () => {
     const networkId: number = 42;
@@ -28,8 +28,14 @@ describe('LedgerSubprovider', () => {
             // tslint:disable:no-object-literal-type-assertion
             const ledgerEthClient = {
                 getAddress_async: async () => {
+                    // tslint:disable-next-line:max-line-length
+                    const publicKey = '04f428290f4c5ed6a198f71b8205f488141dbb3f0840c923bbfa798ecbee6370986c03b5575d94d506772fb48a6a44e345e4ebd4f028a6f609c44b655d6d3e71a1';
+                    const chainCode = 'ac055a5537c0c7e9e02d14a197cad6b857836da2a12043b46912a37d959b5ae8';
+                    const address = '0xBa388BA5e5EEF2c6cE42d831c2B3A28D3c99bdB1';
                     return {
-                        address: FAKE_ADDRESS,
+                        publicKey,
+                        address,
+                        chainCode,
                     };
                 },
                 signPersonalMessage_async: async () => {

From 950406f1f9ad79a60ced5f6680c33fbc4237de3b Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 14:47:39 +0100
Subject: [PATCH 052/125] Remove redundant template string

---
 packages/subproviders/src/subproviders/ledger.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts
index 9b2f1d1291..793effaebc 100644
--- a/packages/subproviders/src/subproviders/ledger.ts
+++ b/packages/subproviders/src/subproviders/ledger.ts
@@ -131,7 +131,7 @@ export class LedgerSubprovider extends Subprovider {
         let ledgerResponse;
         try {
             ledgerResponse = await this._ledgerClientIfExists.getAddress_async(
-                `${this._derivationPath}`, this._shouldAlwaysAskForConfirmation, SHOULD_GET_CHAIN_CODE,
+                this._derivationPath, this._shouldAlwaysAskForConfirmation, SHOULD_GET_CHAIN_CODE,
             );
         } finally {
             await this.destoryLedgerClientAsync();

From 90d1c3e2c98944728ac9d38f22c050a490318deb Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 14:49:13 +0100
Subject: [PATCH 053/125] Introduce a variable for true

---
 packages/subproviders/src/subproviders/ledger.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts
index 793effaebc..f9922fdda3 100644
--- a/packages/subproviders/src/subproviders/ledger.ts
+++ b/packages/subproviders/src/subproviders/ledger.ts
@@ -145,7 +145,10 @@ export class LedgerSubprovider extends Subprovider {
         for (let i = 0; i < NUM_ADDRESSES_TO_FETCH; i++) {
             const derivedHDNode = hdKey.derive(`m/${i + this._derivationPathIndex}`);
             const derivedPublicKey = derivedHDNode.publicKey;
-            const ethereumAddressUnprefixed = ethUtil.publicToAddress(derivedPublicKey, true).toString('hex');
+            const shouldSanitizePublicKey = true;
+            const ethereumAddressUnprefixed = ethUtil.publicToAddress(
+                derivedPublicKey, shouldSanitizePublicKey,
+            ).toString('hex');
             const ethereumAddressPrefixed = ethUtil.addHexPrefix(ethereumAddressUnprefixed);
             accounts.push(ethereumAddressPrefixed.toLowerCase());
         }

From a3a2df098b3a67ec2da036ae469cb54709f0fd71 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 15:56:31 +0100
Subject: [PATCH 054/125] Add a comment

---
 packages/subproviders/src/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts
index 02855dd4c0..c5ccf1fda6 100644
--- a/packages/subproviders/src/types.ts
+++ b/packages/subproviders/src/types.ts
@@ -10,6 +10,8 @@ export interface LedgerCommunicationClient {
  * NodeJs and Browser communication are supported.
  */
 export interface LedgerEthereumClient {
+    // shouldGetChainCode is defined as `true` instead of `boolean` because other types rely on the assumption
+    // that we get back the chain code and we don't have dependent types to express it properly
     getAddress_async: (derivationPath: string, askForDeviceConfirmation: boolean,
                        shouldGetChainCode: true) => Promise<LedgerGetAddressResult>;
     signPersonalMessage_async: (derivationPath: string, messageHex: string) => Promise<ECSignature>;

From a57dda2c2a47671b0766c7c28d24560e3000ca66 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 15:57:40 +0100
Subject: [PATCH 055/125] Update CHANGELOG

---
 packages/subproviders/CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index b4cce6be06..358fcfa15c 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -1,4 +1,5 @@
 # CHANGELOG
 
-vx.x.x
+v0.x.x - _TBD, 2017_
 ------------------------
+    * Improve the performance of address fetching (#271)

From fb0b7efc4563c7c561866ab8691361ce6919160b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Dec 2017 19:30:25 +0100
Subject: [PATCH 056/125] Refactor configs and constants, standardize on
 uppercase/snakecase, alphebetize, rename for logical grouping

---
 packages/website/ts/blockchain.ts             |  40 ++--
 .../dialogs/blockchain_err_dialog.tsx         |  24 +-
 .../dialogs/ledger_config_dialog.tsx          |   5 +-
 .../dialogs/u2f_not_supported_dialog.tsx      |   2 +-
 .../components/eth_weth_conversion_button.tsx |   2 +-
 .../website/ts/components/eth_wrappers.tsx    |  12 +-
 .../website/ts/components/fill_order_json.tsx |   3 +-
 packages/website/ts/components/footer.tsx     |  10 +-
 .../ts/components/inputs/eth_amount_input.tsx |   4 +-
 packages/website/ts/components/order_json.tsx |   5 +-
 packages/website/ts/components/portal.tsx     |   6 +-
 .../website/ts/components/token_balances.tsx  |  18 +-
 packages/website/ts/components/top_bar.tsx    |   6 +-
 packages/website/ts/containers/portal.tsx     |   2 +-
 .../smart_contracts_documentation.tsx         |  38 +--
 .../ts/local_storage/tracked_token_storage.ts |   4 +-
 .../local_storage/trade_history_storage.tsx   |   4 +-
 packages/website/ts/pages/about/about.tsx     |   2 +-
 .../ts/pages/documentation/documentation.tsx  |   5 +-
 .../website/ts/pages/documentation/type.tsx   |  10 +-
 packages/website/ts/pages/faq/faq.tsx         |   2 +-
 packages/website/ts/pages/landing/landing.tsx |  34 +--
 packages/website/ts/pages/wiki/wiki.tsx       |   4 +-
 packages/website/ts/types.ts                  |   9 +
 packages/website/ts/utils/configs.ts          | 109 ++++++++-
 packages/website/ts/utils/constants.ts        | 222 +++++-------------
 packages/website/ts/utils/error_reporter.ts   |   2 +-
 packages/website/ts/utils/utils.ts            |   9 +-
 28 files changed, 298 insertions(+), 295 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index c8ebd6b938..680eac0af2 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -77,21 +77,21 @@ export class Blockchain {
     }
     private static getNameGivenProvider(provider: Web3.Provider): string {
         if (!_.isUndefined((provider as any).isMetaMask)) {
-            return constants.METAMASK_PROVIDER_NAME;
+            return constants.PROVIDER_NAME_METAMASK;
         }
 
         // HACK: We use the fact that Parity Signer's provider is an instance of their
         // internal `Web3FrameProvider` class.
         const isParitySigner = _.startsWith(provider.constructor.toString(), 'function Web3FrameProvider');
         if (isParitySigner) {
-            return constants.PARITY_SIGNER_PROVIDER_NAME;
+            return constants.PROVIDER_NAME_PARITY_SIGNER;
         }
 
-        return constants.GENERIC_PROVIDER_NAME;
+        return constants.PROVIDER_NAME_GENERIC;
     }
     private static async getProviderAsync(injectedWeb3: Web3, networkIdIfExists: number) {
         const doesInjectedWeb3Exist = !_.isUndefined(injectedWeb3);
-        const publicNodeUrlsIfExistsForNetworkId = constants.PUBLIC_NODE_URLS_BY_NETWORK_ID[networkIdIfExists];
+        const publicNodeUrlsIfExistsForNetworkId = configs.PUBLIC_NODE_URLS_BY_NETWORK_ID[networkIdIfExists];
         const isPublicNodeAvailableForNetworkId = !_.isUndefined(publicNodeUrlsIfExistsForNetworkId);
 
         let provider;
@@ -114,11 +114,11 @@ export class Blockchain {
             // injected into their browser.
             provider = new ProviderEngine();
             provider.addProvider(new FilterSubprovider());
-            const networkId = configs.isMainnetEnabled ?
-                constants.MAINNET_NETWORK_ID :
-                constants.TESTNET_NETWORK_ID;
+            const networkId = configs.IS_MAINNET_ENABLED ?
+                constants.NETWORK_ID_MAINNET :
+                constants.NETWORK_ID_TESTNET;
             provider.addProvider(new RedundantRPCSubprovider(
-                constants.PUBLIC_NODE_URLS_BY_NETWORK_ID[networkId],
+                configs.PUBLIC_NODE_URLS_BY_NETWORK_ID[networkId],
             ));
             provider.start();
         }
@@ -205,11 +205,11 @@ export class Blockchain {
                 this.ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs);
                 provider.addProvider(this.ledgerSubprovider);
                 provider.addProvider(new FilterSubprovider());
-                const networkId = configs.isMainnetEnabled ?
-                    constants.MAINNET_NETWORK_ID :
-                    constants.TESTNET_NETWORK_ID;
+                const networkId = configs.IS_MAINNET_ENABLED ?
+                    constants.NETWORK_ID_MAINNET :
+                    constants.NETWORK_ID_TESTNET;
                 provider.addProvider(new RedundantRPCSubprovider(
-                    constants.PUBLIC_NODE_URLS_BY_NETWORK_ID[networkId],
+                    configs.PUBLIC_NODE_URLS_BY_NETWORK_ID[networkId],
                 ));
                 provider.start();
                 this.web3Wrapper.destroy();
@@ -591,7 +591,7 @@ export class Blockchain {
         _.each(tokenRegistryTokens, (t: ZeroExToken, i: number) => {
             // HACK: For now we have a hard-coded list of iconUrls for the dummyTokens
             // TODO: Refactor this out and pull the iconUrl directly from the TokenRegistry
-            const iconUrl = constants.iconUrlBySymbol[t.symbol];
+            const iconUrl = configs.ICON_URL_BY_SYMBOL[t.symbol];
             // HACK: Temporarily we hijack the WETH addresses fetched from the tokenRegistry
             // so that we can take our time with actually updating it. This ensures that when
             // we deploy the new WETH page, everyone will re-fill their trackedTokens with the
@@ -639,9 +639,9 @@ export class Blockchain {
 
         const provider = await Blockchain.getProviderAsync(injectedWeb3, networkIdIfExists);
         const networkId = !_.isUndefined(networkIdIfExists) ? networkIdIfExists :
-                            configs.isMainnetEnabled ?
-                                constants.MAINNET_NETWORK_ID :
-                                constants.TESTNET_NETWORK_ID;
+                            configs.IS_MAINNET_ENABLED ?
+                                constants.NETWORK_ID_MAINNET :
+                                constants.NETWORK_ID_TESTNET;
         const zeroExConfigs = {
             networkId,
         };
@@ -661,7 +661,7 @@ export class Blockchain {
         const doesInjectedWeb3Exist = !_.isUndefined(injectedWeb3);
         const providerName = doesInjectedWeb3Exist ?
                              Blockchain.getNameGivenProvider(injectedWeb3.currentProvider) :
-                             constants.PUBLIC_PROVIDER_NAME;
+                             constants.PROVIDER_NAME_PUBLIC;
         this.dispatcher.updateInjectedProviderName(providerName);
     }
     private async fetchTokenInformationAsync() {
@@ -686,7 +686,7 @@ export class Blockchain {
         let trackedTokensIfExists = trackedTokenStorage.getTrackedTokensIfExists(this.userAddress, this.networkId);
         const tokenRegistryTokens = _.values(tokenRegistryTokensByAddress);
         if (_.isUndefined(trackedTokensIfExists)) {
-            trackedTokensIfExists = _.map(configs.defaultTrackedTokenSymbols, symbol => {
+            trackedTokensIfExists = _.map(configs.DEFAULT_TRACKED_TOKEN_SYMBOLS, symbol => {
                 const token = _.find(tokenRegistryTokens, t => t.symbol === symbol);
                 token.isTracked = true;
                 return token;
@@ -709,8 +709,8 @@ export class Blockchain {
         await this.updateTokenBalancesAndAllowancesAsync(trackedTokensIfExists);
 
         const mostPopularTradingPairTokens: Token[] = [
-            _.find(allTokens, {symbol: configs.defaultTrackedTokenSymbols[0]}),
-            _.find(allTokens, {symbol: configs.defaultTrackedTokenSymbols[1]}),
+            _.find(allTokens, {symbol: configs.DEFAULT_TRACKED_TOKEN_SYMBOLS[0]}),
+            _.find(allTokens, {symbol: configs.DEFAULT_TRACKED_TOKEN_SYMBOLS[1]}),
         ];
         this.dispatcher.updateChosenAssetTokenAddress(Side.Deposit, mostPopularTradingPairTokens[0].address);
         this.dispatcher.updateChosenAssetTokenAddress(Side.Receive, mostPopularTradingPairTokens[1].address);
diff --git a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
index aea5fcdd13..9a5cd90d79 100644
--- a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
+++ b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
@@ -71,9 +71,9 @@ export class BlockchainErrDialog extends React.Component<BlockchainErrDialogProp
         return (
             <div>
                 You were disconnected from the backing Ethereum node.
-                {' '}If using <a href={constants.METAMASK_CHROME_STORE_URL} target="_blank">
+                {' '}If using <a href={constants.URL_METAMASK_CHROME_STORE} target="_blank">
                     Metamask
-                </a> or <a href={constants.MIST_DOWNLOAD_URL} target="_blank">Mist</a> try refreshing
+                </a> or <a href={constants.URL_MIST_DOWNLOAD} target="_blank">Mist</a> try refreshing
                 {' '}the page. If using a locally hosted Ethereum node, make sure it's still running.
             </div>
         );
@@ -97,7 +97,7 @@ export class BlockchainErrDialog extends React.Component<BlockchainErrDialogProp
                 <h4>1. Metamask chrome extension</h4>
                 <div>
                     You can install the{' '}
-                    <a href={constants.METAMASK_CHROME_STORE_URL} target="_blank">
+                    <a href={constants.URL_METAMASK_CHROME_STORE} target="_blank">
                         Metamask
                     </a> Chrome extension Ethereum wallet. Once installed and set up, refresh this page.
                     <div className="pt1">
@@ -107,11 +107,11 @@ export class BlockchainErrDialog extends React.Component<BlockchainErrDialogProp
                 </div>
                 <h4>Parity Signer</h4>
                 <div>
-                    The <a href={constants.PARITY_CHROME_STORE_URL} target="_blank">Parity Signer
+                    The <a href={constants.URL_PARITY_CHROME_STORE} target="_blank">Parity Signer
                     Chrome extension</a>{' '}lets you connect to a locally running Parity node.
                     Make sure you have started your local Parity node with{' '}
-                    {configs.isMainnetEnabled && '`parity ui` or'} `parity --chain kovan ui`{' '}
-                    in order to connect to {configs.isMainnetEnabled ? 'mainnet or Kovan respectively.' : 'Kovan.'}
+                    {configs.IS_MAINNET_ENABLED && '`parity ui` or'} `parity --chain kovan ui`{' '}
+                    in order to connect to {configs.IS_MAINNET_ENABLED ? 'mainnet or Kovan respectively.' : 'Kovan.'}
                 </div>
                 <div className="pt2">
                     <span className="bold">Note:</span>
@@ -130,24 +130,24 @@ export class BlockchainErrDialog extends React.Component<BlockchainErrDialogProp
                     {' '}currently connected to (network Id: {this.props.networkId}).
                     {' '}In order to use the 0x portal dApp,
                     {' '}please connect to the
-                    {' '}{constants.TESTNET_NAME} testnet (network Id: {constants.TESTNET_NETWORK_ID})
-                    {configs.isMainnetEnabled ?
-                        ` or ${constants.MAINNET_NAME} (network Id: ${constants.MAINNET_NETWORK_ID}).` :
+                    {' '}{constants.TESTNET_NAME} testnet (network Id: {constants.NETWORK_ID_TESTNET})
+                    {configs.IS_MAINNET_ENABLED ?
+                        ` or ${constants.MAINNET_NAME} (network Id: ${constants.NETWORK_ID_MAINNET}).` :
                         `.`
                     }
                 </div>
                 <h4>Metamask</h4>
                 <div>
                     If you are using{' '}
-                    <a href={constants.METAMASK_CHROME_STORE_URL} target="_blank">
+                    <a href={constants.URL_METAMASK_CHROME_STORE} target="_blank">
                         Metamask
                     </a>, you can switch networks in the top left corner of the extension popover.
                 </div>
                 <h4>Parity Signer</h4>
                 <div>
-                    If using the <a href={constants.PARITY_CHROME_STORE_URL} target="_blank">Parity Signer
+                    If using the <a href={constants.URL_PARITY_CHROME_STORE} target="_blank">Parity Signer
                     Chrome extension</a>, make sure to start your local Parity node with{' '}
-                    {configs.isMainnetEnabled ?
+                    {configs.IS_MAINNET_ENABLED ?
                         '`parity ui` or `parity --chain Kovan ui` in order to connect to mainnet \
                          or Kovan respectively.' :
                          '`parity --chain kovan ui` in order to connect to Kovan.'
diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
index 05a15526fd..ddd1f2cf29 100644
--- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
+++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
@@ -17,6 +17,7 @@ import {Blockchain} from 'ts/blockchain';
 import {LifeCycleRaisedButton} from 'ts/components/ui/lifecycle_raised_button';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {colors} from 'ts/utils/colors';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
@@ -52,7 +53,7 @@ export class LedgerConfigDialog extends React.Component<LedgerConfigDialogProps,
             stepIndex: LedgerSteps.CONNECT,
             userAddresses: [],
             addressBalances: [],
-            derivationPath: constants.DEFAULT_DERIVATION_PATH,
+            derivationPath: configs.DEFAULT_DERIVATION_PATH,
             derivationErrMsg: '',
         };
     }
@@ -170,7 +171,7 @@ export class LedgerConfigDialog extends React.Component<LedgerConfigDialogProps,
             const balance = this.state.addressBalances[i];
             const addressTooltipId = `address-${userAddress}`;
             const balanceTooltipId = `balance-${userAddress}`;
-            const networkName = constants.networkNameById[this.props.networkId];
+            const networkName = constants.NETWORK_NAME_BY_ID[this.props.networkId];
             // We specifically prefix kovan ETH.
             // TODO: We should probably add prefixes for all networks
             const isKovanNetwork = networkName === 'Kovan';
diff --git a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
index 83042624df..ff884a94e2 100644
--- a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
+++ b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
@@ -39,7 +39,7 @@ export function U2fNotSupportedDialog(props: U2fNotSupportedDialogProps) {
                         <li>
                             Firefox with{' '}
                             <a
-                                href={constants.FIREFOX_U2F_ADDON}
+                                href={constants.URL_FIREFOX_U2F_ADDON}
                                 target="_blank"
                                 style={{textDecoration: 'underline'}}
                             >
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index 5464f8df0f..351dfd9a41 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -89,7 +89,7 @@ export class EthWethConversionButton extends
         try {
             if (direction === Side.Deposit) {
                 await this.props.blockchain.convertEthToWrappedEthTokensAsync(value);
-                const ethAmount = ZeroEx.toUnitAmount(value, constants.ETH_DECIMAL_PLACES);
+                const ethAmount = ZeroEx.toUnitAmount(value, constants.DECIMAL_PLACES_ETH);
                 this.props.dispatcher.showFlashMessage(`Successfully wrapped ${ethAmount.toString()} ETH to WETH`);
                 balance = balance.plus(value);
             } else {
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index ef1379e59c..59353d18cf 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -82,7 +82,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         const tokens = _.values(this.props.tokenByAddress);
         const etherToken = _.find(tokens, {symbol: 'WETH'});
         const etherTokenState = this.props.tokenStateByAddress[etherToken.address];
-        const wethBalance = ZeroEx.toUnitAmount(etherTokenState.balance, 18);
+        const wethBalance = ZeroEx.toUnitAmount(etherTokenState.balance, constants.DECIMAL_PLACES_ETH);
         const isBidirectional = true;
         return (
             <div className="clearfix lg-px4 md-px4 sm-px2" style={{minHeight: 600}}>
@@ -155,7 +155,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                                         <div className="flex">
                                             <img
                                                 style={{width: ICON_DIMENSION, height: ICON_DIMENSION}}
-                                                src={constants.iconUrlBySymbol.WETH}
+                                                src={configs.ICON_URL_BY_SYMBOL.WETH}
                                             />
                                             <div className="mt2 ml2 sm-hide xs-hide">
                                                 Wrapped Ether
@@ -241,7 +241,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         );
     }
     private renderOutdatedWeths(etherToken: Token, etherTokenState: TokenState) {
-        const rows = _.map(configs.outdatedWrappedEthers,
+        const rows = _.map(configs.OUTDATED_WRAPPED_ETHERS,
                         (outdatedWETHByNetworkId: OutdatedWrappedEtherByNetworkId) => {
             const outdatedWETH = outdatedWETHByNetworkId[this.props.networkId];
             const timestampMsRange = outdatedWETH.timestampMsRange;
@@ -260,7 +260,9 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
             const isStateLoaded = this.state.outdatedWETHAddressToIsStateLoaded[outdatedWETH.address];
             const outdatedEtherTokenState = this.state.outdatedWETHStateByAddress[outdatedWETH.address];
             const balanceInEthIfExists = isStateLoaded ?
-                                         ZeroEx.toUnitAmount(outdatedEtherTokenState.balance, 18).toFixed(PRECISION) :
+                                         ZeroEx.toUnitAmount(
+                                             outdatedEtherTokenState.balance, constants.DECIMAL_PLACES_ETH,
+                                         ).toFixed(PRECISION) :
                                          undefined;
             const onConversionSuccessful = this.onOutdatedConversionSuccessfulAsync.bind(this, outdatedWETH.address);
             return (
@@ -344,7 +346,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         });
     }
     private getOutdatedWETHAddresses(): string[] {
-        const outdatedWETHAddresses = _.map(configs.outdatedWrappedEthers, outdatedWrappedEther => {
+        const outdatedWETHAddresses = _.map(configs.OUTDATED_WRAPPED_ETHERS, outdatedWrappedEther => {
             return outdatedWrappedEther[this.props.networkId].address;
         });
         return outdatedWETHAddresses;
diff --git a/packages/website/ts/components/fill_order_json.tsx b/packages/website/ts/components/fill_order_json.tsx
index 393e46bee3..4a4bdac9fc 100644
--- a/packages/website/ts/components/fill_order_json.tsx
+++ b/packages/website/ts/components/fill_order_json.tsx
@@ -41,9 +41,10 @@ export class FillOrderJSON extends React.Component<FillOrderJSONProps, FillOrder
             v: 27,
         };
         const hintSalt = ZeroEx.generatePseudoRandomSalt();
+        const feeRecipient = constants.NULL_ADDRESS;
         const hintOrder = utils.generateOrder(this.props.networkId, exchangeContract, hintSideToAssetToken,
                                               hintOrderExpiryTimestamp, '', '', constants.MAKER_FEE,
-                                              constants.TAKER_FEE, constants.FEE_RECIPIENT_ADDRESS,
+                                              constants.TAKER_FEE, feeRecipient,
                                               hintSignatureData, this.props.tokenByAddress, hintSalt);
         const hintOrderJSON = `${JSON.stringify(hintOrder, null, '\t').substring(0, 500)}...`;
         return (
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 82e046a593..0f65405d9c 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -57,25 +57,25 @@ const menuItemsBySection: MenuItemsBySection = {
         {
             title: 'Rocket.chat',
             isExternal: true,
-            path: constants.ZEROEX_CHAT_URL,
+            path: constants.URL_ZEROEX_CHAT,
             fileName: 'rocketchat.png',
         },
         {
             title: 'Blog',
             isExternal: true,
-            path: constants.BLOG_URL,
+            path: constants.URL_BLOG,
             fileName: 'medium.png',
         },
         {
             title: 'Twitter',
             isExternal: true,
-            path: constants.TWITTER_URL,
+            path: constants.URL_TWITTER,
             fileName: 'twitter.png',
         },
         {
             title: 'Reddit',
             isExternal: true,
-            path: constants.REDDIT_URL,
+            path: constants.URL_REDDIT,
             fileName: 'reddit.png',
         },
     ],
@@ -88,7 +88,7 @@ const menuItemsBySection: MenuItemsBySection = {
         {
             title: 'Careers',
             isExternal: true,
-            path: constants.ANGELLIST_URL,
+            path: constants.URL_ANGELLIST,
         },
         {
             title: 'Contact',
diff --git a/packages/website/ts/components/inputs/eth_amount_input.tsx b/packages/website/ts/components/inputs/eth_amount_input.tsx
index 5c5e23eef2..3dcd2b4f30 100644
--- a/packages/website/ts/components/inputs/eth_amount_input.tsx
+++ b/packages/website/ts/components/inputs/eth_amount_input.tsx
@@ -22,7 +22,7 @@ interface EthAmountInputState {}
 export class EthAmountInput extends React.Component<EthAmountInputProps, EthAmountInputState> {
     public render() {
         const amount = this.props.amount ?
-            ZeroEx.toUnitAmount(this.props.amount, constants.ETH_DECIMAL_PLACES) :
+            ZeroEx.toUnitAmount(this.props.amount, constants.DECIMAL_PLACES_ETH) :
             undefined;
         return (
             <div className="flex overflow-hidden" style={{height: 63}}>
@@ -45,7 +45,7 @@ export class EthAmountInput extends React.Component<EthAmountInputProps, EthAmou
     private onChange(isValid: boolean, amount?: BigNumber) {
         const baseUnitAmountIfExists = _.isUndefined(amount) ?
             undefined :
-            ZeroEx.toBaseUnitAmount(amount, constants.ETH_DECIMAL_PLACES);
+            ZeroEx.toBaseUnitAmount(amount, constants.DECIMAL_PLACES_ETH);
         this.props.onChange(isValid, baseUnitAmountIfExists);
     }
 }
diff --git a/packages/website/ts/components/order_json.tsx b/packages/website/ts/components/order_json.tsx
index 83f25fd5ac..c0f9b78e70 100644
--- a/packages/website/ts/components/order_json.tsx
+++ b/packages/website/ts/components/order_json.tsx
@@ -137,9 +137,8 @@ You can see and fill it here: ${this.state.shareLink}`);
     }
     private async generateShareLinkAsync(): Promise<string> {
         const longUrl = encodeURIComponent(this.getOrderUrl());
-        const bitlyRequestUrl = constants.BITLY_ENDPOINT + '/v3/shorten?' +
-                                     'access_token=' + constants.BITLY_ACCESS_TOKEN +
-                                     '&longUrl=' + longUrl;
+        const bitlyRequestUrl =
+            `${constants.URL_BITLY_API}/v3/shorten?access_token=${configs.BITLY_ACCESS_TOKEN}&longUrl=${longUrl}`;
         const response = await fetch(bitlyRequestUrl);
         const responseBody = await response.text();
         const bodyObj = JSON.parse(responseBody);
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index c292e0a92d..521dd2b5f5 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -87,7 +87,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
     }
     public componentWillMount() {
         this.blockchain = new Blockchain(this.props.dispatcher);
-        const didAcceptPortalDisclaimer = localStorage.getItemIfExists(constants.ACCEPT_DISCLAIMER_LOCAL_STORAGE_KEY);
+        const didAcceptPortalDisclaimer = localStorage.getItemIfExists(constants.LOCAL_STORAGE_KEY_ACCEPT_DISCLAIMER);
         const hasAcceptedDisclaimer = !_.isUndefined(didAcceptPortalDisclaimer) &&
                                       !_.isEmpty(didAcceptPortalDisclaimer);
         this.setState({
@@ -153,7 +153,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
                 />
                 <div id="portal" className="mx-auto max-width-4 pt4" style={{width: '100%'}}>
                     <Paper className="mb3 mt2">
-                        {!configs.isMainnetEnabled && this.props.networkId === constants.MAINNET_NETWORK_ID  ?
+                        {!configs.IS_MAINNET_ENABLED && this.props.networkId === constants.NETWORK_ID_MAINNET  ?
                             <div className="p3 center">
                                 <div className="h2 py2">Mainnet unavailable</div>
                                 <div className="mx-auto pb2 pt2">
@@ -300,7 +300,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
         );
     }
     private onPortalDisclaimerAccepted() {
-        localStorage.setItem(constants.ACCEPT_DISCLAIMER_LOCAL_STORAGE_KEY, 'set');
+        localStorage.setItem(constants.LOCAL_STORAGE_KEY_ACCEPT_DISCLAIMER, 'set');
         this.setState({
             hasAcceptedDisclaimer: true,
         });
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 61aea6a88e..ecaf63af97 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -115,7 +115,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
         if (!_.isUndefined(this.state.currentZrxBalance) && !nextZrxTokenBalance.eq(this.state.currentZrxBalance)) {
             if (this.state.isZRXSpinnerVisible) {
                 const receivedAmount = nextZrxTokenBalance.minus(this.state.currentZrxBalance);
-                const receiveAmountInUnits = ZeroEx.toUnitAmount(receivedAmount, 18);
+                const receiveAmountInUnits = ZeroEx.toUnitAmount(receivedAmount, constants.DECIMAL_PLACES_ZRX);
                 this.props.dispatcher.showFlashMessage(`Received ${receiveAmountInUnits.toString(10)} Kovan ZRX`);
             }
             this.setState({
@@ -144,7 +144,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                 onTouchTap={this.onDharmaDialogToggle.bind(this, false)}
             />,
         ];
-        const isTestNetwork = this.props.networkId === constants.TESTNET_NETWORK_ID;
+        const isTestNetwork = this.props.networkId === constants.NETWORK_ID_TESTNET;
         const dharmaButtonColumnStyle = {
             paddingLeft: 3,
             display: isTestNetwork ? 'table-cell' : 'none',
@@ -380,8 +380,8 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
         const tokenState = this.props.tokenStateByAddress[token.address];
         const tokenLink = utils.getEtherScanLinkIfExists(token.address, this.props.networkId,
                                                          EtherscanLinkSuffixes.Address);
-        const isMintable = _.includes(configs.symbolsOfMintableTokens, token.symbol) &&
-            this.props.networkId !== constants.MAINNET_NETWORK_ID;
+        const isMintable = _.includes(configs.SYMBOLS_OF_MINTABLE_TOKENS, token.symbol) &&
+            this.props.networkId !== constants.NETWORK_ID_MAINNET;
         return (
             <TableRow key={token.address} style={{height: TOKEN_TABLE_ROW_HEIGHT}}>
                 <TableRowColumn
@@ -423,7 +423,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                             onClickAsyncFn={this.onMintTestTokensAsync.bind(this, token)}
                         />
                     }
-                    {token.symbol === ZRX_TOKEN_SYMBOL && this.props.networkId === constants.TESTNET_NETWORK_ID &&
+                    {token.symbol === ZRX_TOKEN_SYMBOL && this.props.networkId === constants.NETWORK_ID_TESTNET &&
                         <LifeCycleRaisedButton
                             labelReady="Request"
                             labelLoading="Sending..."
@@ -456,7 +456,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
             return;
         }
         const token = this.props.tokenByAddress[tokenAddress];
-        const isDefaultTrackedToken = _.includes(configs.defaultTrackedTokenSymbols, token.symbol);
+        const isDefaultTrackedToken = _.includes(configs.DEFAULT_TRACKED_TOKEN_SYMBOLS, token.symbol);
         if (!this.state.isAddingToken && !isDefaultTrackedToken) {
             if (token.isRegistered) {
                 // Remove the token from tracked tokens
@@ -507,7 +507,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
                 return (
                     <div>
                         Our faucet can only send test Ether to addresses on the {constants.TESTNET_NAME}
-                        {' '}testnet (networkId {constants.TESTNET_NETWORK_ID}). Please make sure you are
+                        {' '}testnet (networkId {constants.NETWORK_ID_TESTNET}). Please make sure you are
                         {' '}connected to the {constants.TESTNET_NAME} testnet and try requesting ether again.
                     </div>
                 );
@@ -604,7 +604,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
 
         // If on another network other then the testnet our faucet serves test ether
         // from, we must show user an error message
-        if (this.props.blockchain.networkId !== constants.TESTNET_NETWORK_ID) {
+        if (this.props.blockchain.networkId !== constants.NETWORK_ID_TESTNET) {
             this.setState({
                 errorType: BalanceErrs.incorrectNetworkForFaucet,
             });
@@ -614,7 +614,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
         await utils.sleepAsync(ARTIFICIAL_FAUCET_REQUEST_DELAY);
 
         const segment = isEtherRequest ? 'ether' : 'zrx';
-        const response = await fetch(`${constants.ETHER_FAUCET_ENDPOINT}/${segment}/${this.props.userAddress}`);
+        const response = await fetch(`${constants.URL_ETHER_FAUCET}/${segment}/${this.props.userAddress}`);
         const responseBody = await response.text();
         if (response.status !== constants.SUCCESS_STATUS) {
             utils.consoleLog(`Unexpected status code: ${response.status} -> ${responseBody}`);
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index bcb8efd077..b731ee1735 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -106,7 +106,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                 key="subMenuItem-standard-relayer-api"
                 target="_blank"
                 className="text-decoration-none"
-                href={constants.STANDARD_RELAYER_API_GITHUB}
+                href={constants.URL_STANDARD_RELAYER_API_GITHUB}
             >
                 <MenuItem style={{fontSize: styles.menuItem.fontSize}} primaryText="Standard Relayer API" />
             </a>,
@@ -114,7 +114,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                 key="subMenuItem-github"
                 target="_blank"
                 className="text-decoration-none"
-                href={constants.GITHUB_URL}
+                href={constants.URL_GITHUB_ORG}
             >
                 <MenuItem style={{fontSize: styles.menuItem.fontSize}} primaryText="GitHub" />
             </a>,
@@ -254,7 +254,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
                 <a
                     className="text-decoration-none"
                     target="_blank"
-                    href={constants.BLOG_URL}
+                    href={constants.URL_BLOG}
                 >
                     <MenuItem className="py2">Blog</MenuItem>
                 </a>
diff --git a/packages/website/ts/containers/portal.tsx b/packages/website/ts/containers/portal.tsx
index fb330c06ca..ae983e0f52 100644
--- a/packages/website/ts/containers/portal.tsx
+++ b/packages/website/ts/containers/portal.tsx
@@ -56,7 +56,7 @@ const mapStateToProps = (state: State, ownProps: PortalComponentAllProps): Conne
     const hashData = {
         depositAmount,
         depositTokenContractAddr: depositAddress,
-        feeRecipientAddress: constants.FEE_RECIPIENT_ADDRESS,
+        feeRecipientAddress: constants.NULL_ADDRESS,
         makerFee: constants.MAKER_FEE,
         orderExpiryTimestamp: state.orderExpiryTimestamp,
         orderMakerAddress: state.userAddress,
diff --git a/packages/website/ts/containers/smart_contracts_documentation.tsx b/packages/website/ts/containers/smart_contracts_documentation.tsx
index 1f82bda0f3..e32abaea90 100644
--- a/packages/website/ts/containers/smart_contracts_documentation.tsx
+++ b/packages/website/ts/containers/smart_contracts_documentation.tsx
@@ -9,16 +9,13 @@ import {
 } from 'ts/pages/documentation/documentation';
 import {Dispatcher} from 'ts/redux/dispatcher';
 import {State} from 'ts/redux/reducer';
-import {DocsInfoConfig, WebsitePaths} from 'ts/types';
-import {constants} from 'ts/utils/constants';
+import {DocsInfoConfig, SmartContractDocSections as Sections, WebsitePaths} from 'ts/types';
 import {doxityUtils} from 'ts/utils/doxity_utils';
 
 /* tslint:disable:no-var-requires */
 const IntroMarkdown = require('md/docs/smart_contracts/introduction');
 /* tslint:enable:no-var-requires */
 
-const sections = constants.smartContractDocSections;
-
 const docsInfoConfig: DocsInfoConfig = {
     displayName: '0x Smart Contracts',
     packageUrl: 'https://github.com/0xProject/contracts',
@@ -26,26 +23,33 @@ const docsInfoConfig: DocsInfoConfig = {
     docsJsonRoot: 'https://s3.amazonaws.com/smart-contracts-docs-json',
     menu: {
         introduction: [
-            sections.Introduction,
+            Sections.Introduction,
         ],
         contracts: [
-            sections.Exchange,
-            sections.TokenRegistry,
-            sections.ZRXToken,
-            sections.EtherToken,
-            sections.TokenTransferProxy,
+            Sections.Exchange,
+            Sections.TokenRegistry,
+            Sections.ZRXToken,
+            Sections.EtherToken,
+            Sections.TokenTransferProxy,
         ],
     },
     sectionNameToMarkdown: {
-        [sections.Introduction]: IntroMarkdown,
+        [Sections.Introduction]: IntroMarkdown,
+    },
+    sections: {
+        Introduction: Sections.Introduction,
+        Exchange: Sections.Exchange,
+        TokenTransferProxy: Sections.TokenTransferProxy,
+        TokenRegistry: Sections.TokenRegistry,
+        ZRXToken: Sections.ZRXToken,
+        EtherToken: Sections.EtherToken,
     },
-    sections,
     visibleConstructors: [
-        sections.Exchange,
-        sections.TokenRegistry,
-        sections.ZRXToken,
-        sections.EtherToken,
-        sections.TokenTransferProxy,
+        Sections.Exchange,
+        Sections.TokenRegistry,
+        Sections.ZRXToken,
+        Sections.EtherToken,
+        Sections.TokenTransferProxy,
     ],
     convertToDocAgnosticFormatFn: doxityUtils.convertToDocAgnosticFormat.bind(doxityUtils),
 };
diff --git a/packages/website/ts/local_storage/tracked_token_storage.ts b/packages/website/ts/local_storage/tracked_token_storage.ts
index 086b06af57..f51368289a 100644
--- a/packages/website/ts/local_storage/tracked_token_storage.ts
+++ b/packages/website/ts/local_storage/tracked_token_storage.ts
@@ -11,10 +11,10 @@ export const trackedTokenStorage = {
     // that introduced a backward incompatible change requiring the tracked tokens to be re-set
     clearIfRequired() {
         const lastClearFillDate = localStorage.getItemIfExists(TRACKED_TOKENS_CLEAR_KEY);
-        if (lastClearFillDate !== configs.lastLocalStorageTrackedTokenClearanceDate) {
+        if (lastClearFillDate !== configs.LAST_LOCAL_STORAGE_TRACKED_TOKEN_CLEARANCE_DATE) {
             localStorage.removeItem(TRACKED_TOKENS_KEY);
         }
-        localStorage.setItem(TRACKED_TOKENS_CLEAR_KEY, configs.lastLocalStorageTrackedTokenClearanceDate);
+        localStorage.setItem(TRACKED_TOKENS_CLEAR_KEY, configs.LAST_LOCAL_STORAGE_TRACKED_TOKEN_CLEARANCE_DATE);
     },
     addTrackedTokenToUser(userAddress: string, networkId: number, token: Token) {
         const trackedTokensByUserAddress = this.getTrackedTokensByUserAddress();
diff --git a/packages/website/ts/local_storage/trade_history_storage.tsx b/packages/website/ts/local_storage/trade_history_storage.tsx
index 0d627e000f..a54844ea72 100644
--- a/packages/website/ts/local_storage/trade_history_storage.tsx
+++ b/packages/website/ts/local_storage/trade_history_storage.tsx
@@ -16,7 +16,7 @@ export const tradeHistoryStorage = {
     // the blockchain
     clearIfRequired() {
         const lastClearFillDate = localStorage.getItemIfExists(FILL_CLEAR_KEY);
-        if (lastClearFillDate !== configs.lastLocalStorageFillClearanceDate) {
+        if (lastClearFillDate !== configs.LAST_LOCAL_STORAGE_FILL_CLEARANCE_DATE) {
             const localStorageKeys = localStorage.getAllKeys();
             _.each(localStorageKeys, key => {
                 if (_.startsWith(key, `${FILLS_KEY}-`) || _.startsWith(key, `${FILLS_LATEST_BLOCK}-`)) {
@@ -24,7 +24,7 @@ export const tradeHistoryStorage = {
                 }
             });
         }
-        localStorage.setItem(FILL_CLEAR_KEY, configs.lastLocalStorageFillClearanceDate);
+        localStorage.setItem(FILL_CLEAR_KEY, configs.LAST_LOCAL_STORAGE_FILL_CLEARANCE_DATE);
     },
     addFillToUser(userAddress: string, networkId: number, fill: Fill) {
         const fillsByHash = this.getUserFillsByHash(userAddress, networkId);
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 8c512ee5cd..c2f291425d 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -214,7 +214,7 @@ export class About extends React.Component<AboutProps, AboutState> {
                         >
                             We are seeking outstanding candidates to{' '}
                             <a
-                                href={constants.ANGELLIST_URL}
+                                href={constants.URL_ANGELLIST}
                                 target="_blank"
                                 style={{color: 'black'}}
                             >
diff --git a/packages/website/ts/pages/documentation/documentation.tsx b/packages/website/ts/pages/documentation/documentation.tsx
index 97e632452e..aab14a52c6 100644
--- a/packages/website/ts/pages/documentation/documentation.tsx
+++ b/packages/website/ts/pages/documentation/documentation.tsx
@@ -34,6 +34,7 @@ import {
     TypescriptMethod,
 } from 'ts/types';
 import {colors} from 'ts/utils/colors';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import {docUtils} from 'ts/utils/doc_utils';
 import {utils} from 'ts/utils/utils';
@@ -270,7 +271,7 @@ export class Documentation extends
         );
     }
     private renderNetworkBadgesIfExists(sectionName: string) {
-        const networkToAddressByContractName = constants.contractAddresses[this.props.docsVersion];
+        const networkToAddressByContractName = configs.CONTRACT_ADDRESS[this.props.docsVersion];
         const badges = _.map(networkToAddressByContractName,
             (addressByContractName: AddressByContractName, networkName: string) => {
                 const contractAddress = addressByContractName[sectionName];
@@ -278,7 +279,7 @@ export class Documentation extends
                     return null;
                 }
                 const linkIfExists = utils.getEtherScanLinkIfExists(
-                    contractAddress, constants.networkIdByName[networkName], EtherscanLinkSuffixes.Address,
+                    contractAddress, constants.NETWORK_ID_BY_NAME[networkName], EtherscanLinkSuffixes.Address,
                 );
                 return (
                     <a
diff --git a/packages/website/ts/pages/documentation/type.tsx b/packages/website/ts/pages/documentation/type.tsx
index 37517afdc5..0516a5c686 100644
--- a/packages/website/ts/pages/documentation/type.tsx
+++ b/packages/website/ts/pages/documentation/type.tsx
@@ -11,11 +11,11 @@ import {utils} from 'ts/utils/utils';
 
 // Some types reference other libraries. For these types, we want to link the user to the relevant documentation.
 const typeToUrl: {[typeName: string]: string} = {
-    Web3: constants.WEB3_DOCS_URL,
-    Provider: constants.WEB3_PROVIDER_DOCS_URL,
-    BigNumber: constants.BIGNUMBERJS_GITHUB_URL,
-    DecodedLogEntryEvent: constants.WEB3_DECODED_LOG_ENTRY_EVENT_URL,
-    LogEntryEvent: constants.WEB3_LOG_ENTRY_EVENT_URL,
+    Web3: constants.URL_WEB3_DOCS,
+    Provider: constants.URL_WEB3_PROVIDER_DOCS,
+    BigNumber: constants.URL_BIGNUMBERJS_GITHUB,
+    DecodedLogEntryEvent: constants.URL_WEB3_DECODED_LOG_ENTRY_EVENT,
+    LogEntryEvent: constants.URL_WEB3_LOG_ENTRY_EVENT,
 };
 
 const typePrefix: {[typeName: string]: string} = {
diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index 8afb9e4e8b..296e63f1de 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -411,7 +411,7 @@ const sections: FAQSection[] = [
                 prompt: 'How can I get involved?',
                 answer: (
                     <div>
-                        Join our <a href={constants.ZEROEX_CHAT_URL} target="_blank">Rocket.chat</a>!
+                        Join our <a href={constants.URL_ZEROEX_CHAT} target="_blank">Rocket.chat</a>!
                         As an open source project, 0x will rely on a worldwide community of passionate
                         developers to contribute proposals, ideas and code.
                     </div>
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 87c8ca0b1a..3d9ebe0995 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -65,67 +65,67 @@ const boxContents: BoxContent[] = [
 const projects: Project[] = [
     {
         logoFileName: 'ethfinex-top.png',
-        projectUrl: constants.ETHFINEX_URL,
+        projectUrl: constants.PROJECT_URL_ETHFINEX,
     },
     {
         logoFileName: 'radar_relay_top.png',
-        projectUrl: constants.RADAR_RELAY_URL,
+        projectUrl: constants.PROJECT_URL_RADAR_RELAY,
     },
     {
         logoFileName: 'paradex_top.png',
-        projectUrl: constants.PARADEX_URL,
+        projectUrl: constants.PROJECT_URL_PARADEX,
     },
     {
         logoFileName: 'the_ocean.png',
-        projectUrl: constants.OCEAN_URL,
+        projectUrl: constants.PROJECT_URL_0CEAN,
     },
     {
         logoFileName: 'dydx.png',
-        projectUrl: constants.DYDX_URL,
+        projectUrl: constants.PROJECT_URL_DYDX,
     },
     {
         logoFileName: 'melonport.png',
-        projectUrl: constants.MELONPORT_URL,
+        projectUrl: constants.PROJECT_URL_MELONPORT,
     },
     {
         logoFileName: 'maker.png',
-        projectUrl: constants.MAKER_URL,
+        projectUrl: constants.PROJECT_URL_MAKER,
     },
     {
         logoFileName: 'dharma.png',
-        projectUrl: constants.DHARMA_URL,
+        projectUrl: constants.PROJECT_URL_DHARMA,
     },
     {
         logoFileName: 'lendroid.png',
-        projectUrl: constants.LENDROID_URL,
+        projectUrl: constants.PROJECT_URL_LENDROID,
     },
     {
         logoFileName: 'district0x.png',
-        projectUrl: constants.DISTRICT_0X_URL,
+        projectUrl: constants.PROJECT_URL_DISTRICT_0X,
     },
     {
         logoFileName: 'aragon.png',
-        projectUrl: constants.ARAGON_URL,
+        projectUrl: constants.PROJECT_URL_ARAGON,
     },
     {
         logoFileName: 'blocknet.png',
-        projectUrl: constants.BLOCKNET_URL,
+        projectUrl: constants.PROJECT_URL_BLOCKNET,
     },
     {
         logoFileName: 'status.png',
-        projectUrl: constants.STATUS_URL,
+        projectUrl: constants.PROJECT_URL_STATUS,
     },
     {
         logoFileName: 'augur.png',
-        projectUrl: constants.AUGUR_URL,
+        projectUrl: constants.PROJECT_URL_AUGUR,
     },
     {
         logoFileName: 'anx.png',
-        projectUrl: constants.OPEN_ANX_URL,
+        projectUrl: constants.PROJECT_URL_OPEN_ANX,
     },
     {
         logoFileName: 'auctus.png',
-        projectUrl: constants.AUCTUS_URL,
+        projectUrl: constants.PROJECT_URL_AUCTUS,
     },
 ];
 
@@ -236,7 +236,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
                                     </div>
                                     <div className="col col-6 sm-center">
                                         <a
-                                            href={constants.ZEROEX_CHAT_URL}
+                                            href={constants.URL_ZEROEX_CHAT}
                                             target="_blank"
                                             className="text-decoration-none"
                                         >
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 233df4f637..af5b266319 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -112,7 +112,7 @@ export class Wiki extends React.Component<WikiProps, WikiState> {
                             >
                                 <div id="0xProtocolWiki" />
                                 <h1 className="md-pl2 sm-pl3">
-                                    <a href={constants.GITHUB_WIKI_URL} target="_blank">
+                                    <a href={constants.URL_GITHUB_WIKI} target="_blank">
                                         0x Protocol Wiki
                                     </a>
                                 </h1>
@@ -134,7 +134,7 @@ export class Wiki extends React.Component<WikiProps, WikiState> {
     private renderSection(sectionName: string) {
         const articles = this.state.articlesBySection[sectionName];
         const renderedArticles = _.map(articles, (article: Article) => {
-            const githubLink = `${constants.GITHUB_WIKI_URL}/edit/master/${sectionName}/${article.fileName}`;
+            const githubLink = `${constants.URL_GITHUB_WIKI}/edit/master/${sectionName}/${article.fileName}`;
             return (
                 <div key={`markdown-section-${article.title}`}>
                     <MarkdownSection
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 736aa866ce..be8aea8325 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -663,4 +663,13 @@ export interface OutdatedWrappedEtherByNetworkId {
     };
 }
 
+export enum SmartContractDocSections {
+    Introduction = 'Introduction',
+    Exchange = 'Exchange',
+    TokenTransferProxy = 'TokenTransferProxy',
+    TokenRegistry = 'TokenRegistry',
+    ZRXToken = 'ZRXToken',
+    EtherToken = 'EtherToken',
+}
+
 // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index 4a08929cf7..8921c68a4b 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -1,25 +1,102 @@
 import * as _ from 'lodash';
 import {
+    ContractAddresses,
     Environments,
+    Networks,
     OutdatedWrappedEtherByNetworkId,
+    PublicNodeUrlsByNetworkId,
+    SmartContractDocSections,
 } from 'ts/types';
 
 const BASE_URL = window.location.origin;
-const isDevelopment = _.includes(BASE_URL, 'https://0xproject.dev:3572') ||
-                      _.includes(BASE_URL, 'https://localhost:3572') ||
-                      _.includes(BASE_URL, 'https://127.0.0.1');
+const isDevelopment = _.includes([
+                        'https://0xproject.localhost:3572',
+                        'https://localhost:3572',
+                        'https://127.0.0.1',
+                      ], BASE_URL);
+const INFURA_API_KEY = 'T5WSC8cautR4KXyYgsRs';
 
 export const configs = {
-    BASE_URL,
-    ENVIRONMENT: isDevelopment ? Environments.DEVELOPMENT : Environments.PRODUCTION,
     BACKEND_BASE_URL: isDevelopment ? 'https://localhost:3001' : 'https://website-api.0xproject.com',
-    symbolsOfMintableTokens: ['MKR', 'MLN', 'GNT', 'DGD', 'REP'],
+    BASE_URL,
+    BITLY_ACCESS_TOKEN: 'ffc4c1a31e5143848fb7c523b39f91b9b213d208',
+    CONTRACT_ADDRESS: {
+        '1.0.0': {
+            [Networks.mainnet]: {
+                [SmartContractDocSections.Exchange]: '0x12459c951127e0c374ff9105dda097662a027093',
+                [SmartContractDocSections.TokenTransferProxy]: '0x8da0d80f5007ef1e431dd2127178d224e32c2ef4',
+                [SmartContractDocSections.ZRXToken]: '0xe41d2489571d322189246dafa5ebde1f4699f498',
+                [SmartContractDocSections.EtherToken]: '0x2956356cd2a2bf3202f771f50d3d14a367b48070',
+                [SmartContractDocSections.TokenRegistry]: '0x926a74c5c36adf004c87399e65f75628b0f98d2c',
+            },
+            [Networks.ropsten]: {
+                [SmartContractDocSections.Exchange]: '0x479cc461fecd078f766ecc58533d6f69580cf3ac',
+                [SmartContractDocSections.TokenTransferProxy]: '0x4e9aad8184de8833365fea970cd9149372fdf1e6',
+                [SmartContractDocSections.ZRXToken]: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
+                [SmartContractDocSections.EtherToken]: '0xc00fd9820cd2898cc4c054b7bf142de637ad129a',
+                [SmartContractDocSections.TokenRegistry]: '0x6b1a50f0bb5a7995444bd3877b22dc89c62843ed',
+            },
+            [Networks.kovan]: {
+                [SmartContractDocSections.Exchange]: '0x90fe2af704b34e0224bf2299c838e04d4dcf1364',
+                [SmartContractDocSections.TokenTransferProxy]: '0x087Eed4Bc1ee3DE49BeFbd66C662B434B15d49d4',
+                [SmartContractDocSections.ZRXToken]: '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570',
+                [SmartContractDocSections.EtherToken]: '0x05d090b51c40b020eab3bfcb6a2dff130df22e9c',
+                [SmartContractDocSections.TokenRegistry]: '0xf18e504561f4347bea557f3d4558f559dddbae7f',
+            },
+        },
+    } as ContractAddresses,
+    DEFAULT_DERIVATION_PATH: `44'/60'/0'`,
     // WARNING: ZRX & WETH MUST always be default trackedTokens
-    defaultTrackedTokenSymbols: ['WETH', 'ZRX'],
-    lastLocalStorageFillClearanceDate: '2017-11-22',
-    lastLocalStorageTrackedTokenClearanceDate: '2017-12-13',
-    isMainnetEnabled: true,
-    outdatedWrappedEthers: [
+    DEFAULT_TRACKED_TOKEN_SYMBOLS: ['WETH', 'ZRX'],
+    DOMAIN_STAGING: 'staging-0xproject.s3-website-us-east-1.amazonaws.com',
+    DOMAIN_DEVELOPMENT: '0xproject.localhost:3572',
+    DOMAIN_PRODUCTION: '0xproject.com',
+    ENVIRONMENT: isDevelopment ? Environments.DEVELOPMENT : Environments.PRODUCTION,
+    ICON_URL_BY_SYMBOL: {
+        'REP': '/images/token_icons/augur.png',
+        'DGD': '/images/token_icons/digixdao.png',
+        'WETH': '/images/token_icons/ether_erc20.png',
+        'MLN': '/images/token_icons/melon.png',
+        'GNT': '/images/token_icons/golem.png',
+        'MKR': '/images/token_icons/makerdao.png',
+        'ZRX': '/images/token_icons/zero_ex.png',
+        'ANT': '/images/token_icons/aragon.png',
+        'BNT': '/images/token_icons/bancor.png',
+        'BAT': '/images/token_icons/basicattentiontoken.png',
+        'CVC': '/images/token_icons/civic.png',
+        'EOS': '/images/token_icons/eos.png',
+        'FUN': '/images/token_icons/funfair.png',
+        'GNO': '/images/token_icons/gnosis.png',
+        'ICN': '/images/token_icons/iconomi.png',
+        'OMG': '/images/token_icons/omisego.png',
+        'SNT': '/images/token_icons/status.png',
+        'STORJ': '/images/token_icons/storjcoinx.png',
+        'PAY': '/images/token_icons/tenx.png',
+        'QTUM': '/images/token_icons/qtum.png',
+        'DNT': '/images/token_icons/district0x.png',
+        'SNGLS': '/images/token_icons/singularity.png',
+        'EDG': '/images/token_icons/edgeless.png',
+        '1ST': '/images/token_icons/firstblood.jpg',
+        'WINGS': '/images/token_icons/wings.png',
+        'BQX': '/images/token_icons/bitquence.png',
+        'LUN': '/images/token_icons/lunyr.png',
+        'RLC': '/images/token_icons/iexec.png',
+        'MCO': '/images/token_icons/monaco.png',
+        'ADT': '/images/token_icons/adtoken.png',
+        'CFI': '/images/token_icons/cofound-it.png',
+        'ROL': '/images/token_icons/etheroll.png',
+        'WGNT': '/images/token_icons/golem.png',
+        'MTL': '/images/token_icons/metal.png',
+        'NMR': '/images/token_icons/numeraire.png',
+        'SAN': '/images/token_icons/santiment.png',
+        'TAAS': '/images/token_icons/taas.png',
+        'TKN': '/images/token_icons/tokencard.png',
+        'TRST': '/images/token_icons/trust.png',
+    } as {[symbol: string]: string},
+    IS_MAINNET_ENABLED: true,
+    LAST_LOCAL_STORAGE_FILL_CLEARANCE_DATE: '2017-11-22',
+    LAST_LOCAL_STORAGE_TRACKED_TOKEN_CLEARANCE_DATE: '2017-12-13',
+    OUTDATED_WRAPPED_ETHERS: [
         {
             42: {
                 address: '0x05d090b51c40b020eab3bfcb6a2dff130df22e9c',
@@ -37,4 +114,14 @@ export const configs = {
             },
         },
     ] as OutdatedWrappedEtherByNetworkId[],
+    // The order matters. We first try first node and only then fall back to others.
+    PUBLIC_NODE_URLS_BY_NETWORK_ID: {
+        [1]: [
+            `https://mainnet.infura.io/${INFURA_API_KEY}`,
+        ],
+        [42]: [
+            `https://kovan.infura.io/${INFURA_API_KEY}`,
+        ],
+    } as PublicNodeUrlsByNetworkId,
+    SYMBOLS_OF_MINTABLE_TOKENS: ['MKR', 'MLN', 'GNT', 'DGD', 'REP'],
 };
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index f001181ce3..0e4a1056a7 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -1,187 +1,85 @@
 import BigNumber from 'bignumber.js';
 import {
-    ContractAddresses,
-    Docs,
     Networks,
-    PublicNodeUrlsByNetworkId,
-    WebsitePaths,
 } from 'ts/types';
 
-const INFURA_API_KEY = 'T5WSC8cautR4KXyYgsRs';
-const smartContractDocSections = {
-    Introduction: 'Introduction',
-    Exchange: 'Exchange',
-    TokenTransferProxy: 'TokenTransferProxy',
-    TokenRegistry: 'TokenRegistry',
-    ZRXToken: 'ZRXToken',
-    EtherToken: 'EtherToken',
-};
-
 export const constants = {
-    ANGELLIST_URL: 'https://angel.co/0xproject/jobs',
-    STAGING_DOMAIN: 'staging-0xproject.s3-website-us-east-1.amazonaws.com',
-    PRODUCTION_DOMAIN: '0xproject.com',
-    DEVELOPMENT_DOMAIN: '0xproject.dev:3572',
-    BIGNUMBERJS_GITHUB_URL: 'http://mikemcl.github.io/bignumber.js',
-    BITLY_ACCESS_TOKEN: 'ffc4c1a31e5143848fb7c523b39f91b9b213d208',
-    BITLY_ENDPOINT: 'https://api-ssl.bitly.com',
-    BLOG_URL: 'https://blog.0xproject.com/latest',
-    DEFAULT_DERIVATION_PATH: `44'/60'/0'`,
-    ETHER_FAUCET_ENDPOINT: 'https://faucet.0xproject.com',
-    FEE_RECIPIENT_ADDRESS: '0x0000000000000000000000000000000000000000',
-    FIREFOX_U2F_ADDON: 'https://addons.mozilla.org/en-US/firefox/addon/u2f-support-add-on/',
-    GITHUB_URL: 'https://github.com/0xProject',
-    GITHUB_WIKI_URL: 'https://github.com/0xProject/wiki',
-    HTTP_NO_CONTENT_STATUS_CODE: 204,
-    ACCEPT_DISCLAIMER_LOCAL_STORAGE_KEY: 'didAcceptPortalDisclaimer',
-    LINKEDIN_0X_URL: 'https://www.linkedin.com/company/0x',
-    LEDGER_PROVIDER_NAME: 'Ledger',
-    METAMASK_PROVIDER_NAME: 'Metamask',
+    DECIMAL_PLACES_ETH: 18,
+    DECIMAL_PLACES_ZRX: 18,
+    DOCS_SCROLL_DURATION_MS: 0,
+    DOCS_CONTAINER_ID: 'documentation',
     GENESIS_ORDER_BLOCK_BY_NETWORK_ID: {
         1: 4145578,
         42: 3117574,
         50: 0,
     } as {[networkId: number]: number},
-    PUBLIC_PROVIDER_NAME: '0x Public',
-    // The order matters. We first try first node and only then fall back to others.
-    PUBLIC_NODE_URLS_BY_NETWORK_ID: {
-        [1]: [
-            `https://mainnet.infura.io/${INFURA_API_KEY}`,
-        ],
-        [42]: [
-            `https://kovan.infura.io/${INFURA_API_KEY}`,
-        ],
-    } as PublicNodeUrlsByNetworkId,
-    PARITY_SIGNER_PROVIDER_NAME: 'Parity Signer',
-    GENERIC_PROVIDER_NAME: 'Injected Web3',
+    HOME_SCROLL_DURATION_MS: 500,
+    HTTP_NO_CONTENT_STATUS_CODE: 204,
+    LOCAL_STORAGE_KEY_ACCEPT_DISCLAIMER: 'didAcceptPortalDisclaimer',
     MAKER_FEE: new BigNumber(0),
     MAINNET_NAME: 'Main network',
-    MAINNET_NETWORK_ID: 1,
-    METAMASK_CHROME_STORE_URL: 'https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn',
-    // tslint:disable-next-line:max-line-length
-    PARITY_CHROME_STORE_URL: 'https://chrome.google.com/webstore/detail/parity-ethereum-integrati/himekenlppkgeaoeddcliojfddemadig',
-    MIST_DOWNLOAD_URL: 'https://github.com/ethereum/mist/releases',
-    NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
-    ROLLBAR_ACCESS_TOKEN: 'a6619002b51c4464928201e6ea94de65',
-    DOCS_SCROLL_DURATION_MS: 0,
-    DOCS_CONTAINER_ID: 'documentation',
-    HOME_SCROLL_DURATION_MS: 500,
-    REDDIT_URL: 'https://reddit.com/r/0xproject',
-    STANDARD_RELAYER_API_GITHUB: 'https://github.com/0xProject/standard-relayer-api/blob/master/README.md',
-    SUCCESS_STATUS: 200,
-    UNAVAILABLE_STATUS: 503,
-    TAKER_FEE: new BigNumber(0),
-    TESTNET_NAME: 'Kovan',
-    TESTNET_NETWORK_ID: 42,
-    TESTRPC_NETWORK_ID: 50,
-    TWITTER_URL: 'https://twitter.com/0xproject',
-    ETH_DECIMAL_PLACES: 18,
     MINT_AMOUNT: new BigNumber('100000000000000000000'),
-    WEB3_DOCS_URL: 'https://github.com/ethereum/wiki/wiki/JavaScript-API',
-    WEB3_PROVIDER_DOCS_URL: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L150',
-    WEB3_DECODED_LOG_ENTRY_EVENT_URL:
-        'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L123',
-    WEB3_LOG_ENTRY_EVENT_URL: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L127',
-    ZEROEX_CHAT_URL: 'https://chat.0xproject.com',
-    // Projects
-    ETHFINEX_URL: 'https://www.bitfinex.com/ethfinex',
-    RADAR_RELAY_URL: 'https://radarrelay.com',
-    PARADEX_URL: 'https://paradex.io',
-    DYDX_URL: 'https://dydx.exchange',
-    MELONPORT_URL: 'https://melonport.com',
-    DISTRICT_0X_URL: 'https://district0x.io',
-    DHARMA_URL: 'https://dharma.io',
-    LENDROID_URL: 'https://lendroid.com',
-    MAKER_URL: 'https://makerdao.com',
-    ARAGON_URL: 'https://aragon.one',
-    BLOCKNET_URL: 'https://blocknet.co',
-    OCEAN_URL: 'http://the0cean.com',
-    STATUS_URL: 'https://status.im',
-    AUGUR_URL: 'https://augur.net',
-    AUCTUS_URL: 'https://auctus.org',
-    OPEN_ANX_URL: 'https://www.openanx.org',
-
-    iconUrlBySymbol: {
-        'REP': '/images/token_icons/augur.png',
-        'DGD': '/images/token_icons/digixdao.png',
-        'WETH': '/images/token_icons/ether_erc20.png',
-        'MLN': '/images/token_icons/melon.png',
-        'GNT': '/images/token_icons/golem.png',
-        'MKR': '/images/token_icons/makerdao.png',
-        'ZRX': '/images/token_icons/zero_ex.png',
-        'ANT': '/images/token_icons/aragon.png',
-        'BNT': '/images/token_icons/bancor.png',
-        'BAT': '/images/token_icons/basicattentiontoken.png',
-        'CVC': '/images/token_icons/civic.png',
-        'EOS': '/images/token_icons/eos.png',
-        'FUN': '/images/token_icons/funfair.png',
-        'GNO': '/images/token_icons/gnosis.png',
-        'ICN': '/images/token_icons/iconomi.png',
-        'OMG': '/images/token_icons/omisego.png',
-        'SNT': '/images/token_icons/status.png',
-        'STORJ': '/images/token_icons/storjcoinx.png',
-        'PAY': '/images/token_icons/tenx.png',
-        'QTUM': '/images/token_icons/qtum.png',
-        'DNT': '/images/token_icons/district0x.png',
-        'SNGLS': '/images/token_icons/singularity.png',
-        'EDG': '/images/token_icons/edgeless.png',
-        '1ST': '/images/token_icons/firstblood.jpg',
-        'WINGS': '/images/token_icons/wings.png',
-        'BQX': '/images/token_icons/bitquence.png',
-        'LUN': '/images/token_icons/lunyr.png',
-        'RLC': '/images/token_icons/iexec.png',
-        'MCO': '/images/token_icons/monaco.png',
-        'ADT': '/images/token_icons/adtoken.png',
-        'CFI': '/images/token_icons/cofound-it.png',
-        'ROL': '/images/token_icons/etheroll.png',
-        'WGNT': '/images/token_icons/golem.png',
-        'MTL': '/images/token_icons/metal.png',
-        'NMR': '/images/token_icons/numeraire.png',
-        'SAN': '/images/token_icons/santiment.png',
-        'TAAS': '/images/token_icons/taas.png',
-        'TKN': '/images/token_icons/tokencard.png',
-        'TRST': '/images/token_icons/trust.png',
-    } as {[symbol: string]: string},
-    networkNameById: {
+    NETWORK_ID_MAINNET: 1,
+    NETWORK_ID_TESTNET: 42,
+    NETWORK_ID_TESTRPC: 50,
+    NETWORK_NAME_BY_ID: {
         1: Networks.mainnet,
         3: Networks.ropsten,
         4: Networks.rinkeby,
         42: Networks.kovan,
     } as {[symbol: number]: string},
-    networkIdByName: {
+    NETWORK_ID_BY_NAME: {
         [Networks.mainnet]: 1,
         [Networks.ropsten]: 3,
         [Networks.rinkeby]: 4,
         [Networks.kovan]: 42,
     } as {[networkName: string]: number},
-    docToPath: {
-        [Docs.ZeroExJs]: WebsitePaths.ZeroExJs,
-        [Docs.SmartContracts]: WebsitePaths.SmartContracts,
-    },
-    smartContractDocSections,
-    contractAddresses: {
-        '1.0.0': {
-            [Networks.mainnet]: {
-                [smartContractDocSections.Exchange]: '0x12459c951127e0c374ff9105dda097662a027093',
-                [smartContractDocSections.TokenTransferProxy]: '0x8da0d80f5007ef1e431dd2127178d224e32c2ef4',
-                [smartContractDocSections.ZRXToken]: '0xe41d2489571d322189246dafa5ebde1f4699f498',
-                [smartContractDocSections.EtherToken]: '0x2956356cd2a2bf3202f771f50d3d14a367b48070',
-                [smartContractDocSections.TokenRegistry]: '0x926a74c5c36adf004c87399e65f75628b0f98d2c',
-            },
-            [Networks.ropsten]: {
-                [smartContractDocSections.Exchange]: '0x479cc461fecd078f766ecc58533d6f69580cf3ac',
-                [smartContractDocSections.TokenTransferProxy]: '0x4e9aad8184de8833365fea970cd9149372fdf1e6',
-                [smartContractDocSections.ZRXToken]: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
-                [smartContractDocSections.EtherToken]: '0xc00fd9820cd2898cc4c054b7bf142de637ad129a',
-                [smartContractDocSections.TokenRegistry]: '0x6b1a50f0bb5a7995444bd3877b22dc89c62843ed',
-            },
-            [Networks.kovan]: {
-                [smartContractDocSections.Exchange]: '0x90fe2af704b34e0224bf2299c838e04d4dcf1364',
-                [smartContractDocSections.TokenTransferProxy]: '0x087Eed4Bc1ee3DE49BeFbd66C662B434B15d49d4',
-                [smartContractDocSections.ZRXToken]: '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570',
-                [smartContractDocSections.EtherToken]: '0x05d090b51c40b020eab3bfcb6a2dff130df22e9c',
-                [smartContractDocSections.TokenRegistry]: '0xf18e504561f4347bea557f3d4558f559dddbae7f',
-            },
-        },
-    } as ContractAddresses,
+    NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
+    PROVIDER_NAME_LEDGER: 'Ledger',
+    PROVIDER_NAME_METAMASK: 'Metamask',
+    PROVIDER_NAME_PARITY_SIGNER: 'Parity Signer',
+    PROVIDER_NAME_GENERIC: 'Injected Web3',
+    PROVIDER_NAME_PUBLIC: '0x Public',
+    ROLLBAR_ACCESS_TOKEN: 'a6619002b51c4464928201e6ea94de65',
+    SUCCESS_STATUS: 200,
+    UNAVAILABLE_STATUS: 503,
+    TAKER_FEE: new BigNumber(0),
+    TESTNET_NAME: 'Kovan',
+    PROJECT_URL_ETHFINEX: 'https://www.bitfinex.com/ethfinex',
+    PROJECT_URL_RADAR_RELAY: 'https://radarrelay.com',
+    PROJECT_URL_PARADEX: 'https://paradex.io',
+    PROJECT_URL_DYDX: 'https://dydx.exchange',
+    PROJECT_URL_MELONPORT: 'https://melonport.com',
+    PROJECT_URL_DISTRICT_0X: 'https://district0x.io',
+    PROJECT_URL_DHARMA: 'https://dharma.io',
+    PROJECT_URL_LENDROID: 'https://lendroid.com',
+    PROJECT_URL_MAKER: 'https://makerdao.com',
+    PROJECT_URL_ARAGON: 'https://aragon.one',
+    PROJECT_URL_BLOCKNET: 'https://blocknet.co',
+    PROJECT_URL_0CEAN: 'http://the0cean.com',
+    PROJECT_URL_STATUS: 'https://status.im',
+    PROJECT_URL_AUGUR: 'https://augur.net',
+    PROJECT_URL_AUCTUS: 'https://auctus.org',
+    PROJECT_URL_OPEN_ANX: 'https://www.openanx.org',
+    URL_ANGELLIST: 'https://angel.co/0xproject/jobs',
+    URL_BIGNUMBERJS_GITHUB: 'http://mikemcl.github.io/bignumber.js',
+    URL_BITLY_API: 'https://api-ssl.bitly.com',
+    URL_BLOG: 'https://blog.0xproject.com/latest',
+    URL_FIREFOX_U2F_ADDON: 'https://addons.mozilla.org/en-US/firefox/addon/u2f-support-add-on/',
+    URL_ETHER_FAUCET: 'https://faucet.0xproject.com',
+    URL_GITHUB_ORG: 'https://github.com/0xProject',
+    URL_GITHUB_WIKI: 'https://github.com/0xProject/wiki',
+    URL_METAMASK_CHROME_STORE: 'https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn',
+    URL_MIST_DOWNLOAD: 'https://github.com/ethereum/mist/releases',
+    URL_PARITY_CHROME_STORE:
+        'https://chrome.google.com/webstore/detail/parity-ethereum-integrati/himekenlppkgeaoeddcliojfddemadig',
+    URL_REDDIT: 'https://reddit.com/r/0xproject',
+    URL_STANDARD_RELAYER_API_GITHUB: 'https://github.com/0xProject/standard-relayer-api/blob/master/README.md',
+    URL_TWITTER: 'https://twitter.com/0xproject',
+    URL_WEB3_DOCS: 'https://github.com/ethereum/wiki/wiki/JavaScript-API',
+    URL_WEB3_DECODED_LOG_ENTRY_EVENT:
+        'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L123',
+    URL_WEB3_LOG_ENTRY_EVENT: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L127',
+    URL_WEB3_PROVIDER_DOCS: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L150',
+    URL_ZEROEX_CHAT: 'https://chat.0xproject.com',
 };
diff --git a/packages/website/ts/utils/error_reporter.ts b/packages/website/ts/utils/error_reporter.ts
index 40991afbf8..67be117e03 100644
--- a/packages/website/ts/utils/error_reporter.ts
+++ b/packages/website/ts/utils/error_reporter.ts
@@ -15,7 +15,7 @@ const rollbarConfig = {
         environment: configs.ENVIRONMENT,
     },
     uncaughtErrorLevel: 'error',
-    hostWhiteList: [constants.PRODUCTION_DOMAIN, constants.STAGING_DOMAIN],
+    hostWhiteList: [configs.DOMAIN_PRODUCTION, configs.DOMAIN_STAGING],
     ignoredMessages: [
         // Errors from the third-party scripts
         'Script error',
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 211a56d452..36cc8f77bb 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -15,6 +15,7 @@ import {
     Token,
     TokenByAddress,
 } from 'ts/types';
+import {configs} from 'ts/utils/configs';
 import {constants} from 'ts/utils/constants';
 import * as u2f from 'ts/vendor/u2f_api';
 
@@ -136,7 +137,7 @@ export const utils = {
         return isUserOnMobile;
     },
     getEtherScanLinkIfExists(addressOrTxHash: string, networkId: number, suffix: EtherscanLinkSuffixes): string {
-        const networkName = constants.networkNameById[networkId];
+        const networkName = constants.NETWORK_NAME_BY_ID[networkId];
         if (_.isUndefined(networkName)) {
             return undefined;
         }
@@ -182,11 +183,11 @@ export const utils = {
     },
     getCurrentEnvironment() {
         switch (location.host) {
-            case constants.DEVELOPMENT_DOMAIN:
+            case configs.DOMAIN_DEVELOPMENT:
                 return 'development';
-            case constants.STAGING_DOMAIN:
+            case configs.DOMAIN_STAGING:
                 return 'staging';
-            case constants.PRODUCTION_DOMAIN:
+            case configs.DOMAIN_PRODUCTION:
                 return 'production';
             default:
                 return 'production';

From 7710989dee4b198bd817dca5277fffd77da7ddc4 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Dec 2017 22:04:12 +0100
Subject: [PATCH 057/125] Add additional public changes introduced to changelog

---
 packages/0x.js/CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 0ef433fe99..9874b0ca89 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 v0.28.0 - _TBD_
 ------------------------
-* Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `EtherToken` wrapper. (#267)
+* Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `zeroEx.etherToken` (#267)
+* Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry` (#267)
+* Removed `etherTokenContractAddress` from `ZeroEx` constructor arg `ZeroExConfig` (#267)
 
 v0.27.1 - _November 28, 2017_
 ------------------------

From 684542d073367ac13021262e7e69edb607629c55 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 10:36:54 +0100
Subject: [PATCH 058/125] Add airtable tasks to TODO's

---
 packages/website/ts/blockchain.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 7a0d546b4d..0f80c47a53 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -160,6 +160,8 @@ export class Blockchain {
         utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
         // HACK: temporarily whitelist the new WETH token address `as if` they were
         // already in the tokenRegistry.
+        // TODO: Remove this hack once we've updated the TokenRegistries
+        // Airtable task: https://airtable.com/tblFe0Q9JuKJPYbTn/viwsOG2Y97qdIeCIO/recv3VGmIorFzHBVz
         if (configs.shouldDeprecateOldWethToken &&
             tokenAddress === configs.newWrappedEthers[this.networkId]) {
             return true;
@@ -603,6 +605,7 @@ export class Blockchain {
             // we deploy the new WETH page, everyone will re-fill their trackedTokens with the
             // new canonical WETH.
             // TODO: Remove this hack once we've updated the TokenRegistries
+            // Airtable task: https://airtable.com/tblFe0Q9JuKJPYbTn/viwsOG2Y97qdIeCIO/recv3VGmIorFzHBVz
             let address = t.address;
             if (configs.shouldDeprecateOldWethToken && t.symbol === 'WETH') {
                     const newEtherTokenAddressIfExists = configs.newWrappedEthers[this.networkId];

From 1f85d31663092b803c8f0f2b8f00c6adf80867bf Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 10:39:25 +0100
Subject: [PATCH 059/125] Remove binding on prop passed callbacks

---
 .../ts/components/dialogs/portal_disclaimer_dialog.tsx        | 4 ++--
 .../components/dialogs/wrapped_eth_section_notice_dialog.tsx  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
index bfff7fbb57..800cb06560 100644
--- a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
+++ b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
@@ -17,11 +17,11 @@ export function PortalDisclaimerDialog(props: PortalDisclaimerDialogProps) {
                 <FlatButton
                     key="portalAgree"
                     label="I Agree"
-                    onTouchTap={props.onToggleDialog.bind(this)}
+                    onTouchTap={props.onToggleDialog}
                 />,
             ]}
             open={props.isOpen}
-            onRequestClose={props.onToggleDialog.bind(this)}
+            onRequestClose={props.onToggleDialog}
             autoScrollBodyContent={true}
             modal={true}
         >
diff --git a/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx b/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
index d13b2e8ce1..7331ebb373 100644
--- a/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
+++ b/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
@@ -17,11 +17,11 @@ export function WrappedEthSectionNoticeDialog(props: WrappedEthSectionNoticeDial
                 <FlatButton
                     key="acknowledgeWrapEthSection"
                     label="Sounds good"
-                    onTouchTap={props.onToggleDialog.bind(this)}
+                    onTouchTap={props.onToggleDialog}
                 />,
             ]}
             open={props.isOpen}
-            onRequestClose={props.onToggleDialog.bind(this)}
+            onRequestClose={props.onToggleDialog}
             autoScrollBodyContent={true}
             modal={true}
         >

From 16c91bca0a9a542c8990d3e034dda31057ca0247 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 10:41:45 +0100
Subject: [PATCH 060/125] remove extra space

---
 packages/website/ts/components/eth_wrappers.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index a10313597d..e53a4d8b09 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -384,7 +384,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
     }
     private getOutdatedWETHAddresses(): string[] {
         const outdatedWETHAddresses = _.compact(_.map(configs.outdatedWrappedEthers, outdatedWrappedEtherByNetwork => {
-            const  outdatedWrappedEtherIfExists = outdatedWrappedEtherByNetwork[this.props.networkId];
+            const outdatedWrappedEtherIfExists = outdatedWrappedEtherByNetwork[this.props.networkId];
             if (_.isUndefined(outdatedWrappedEtherIfExists)) {
                 return undefined;
             }

From 2930537a512bdaa74181fea74ce6befdf5b305b4 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 10:41:52 +0100
Subject: [PATCH 061/125] Add WETH

---
 .../ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx b/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
index 7331ebb373..3f485ce4f1 100644
--- a/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
+++ b/packages/website/ts/components/dialogs/wrapped_eth_section_notice_dialog.tsx
@@ -27,7 +27,7 @@ export function WrappedEthSectionNoticeDialog(props: WrappedEthSectionNoticeDial
         >
             <div className="pt2" style={{color: colors.grey700}}>
                 <div>
-                    We have recently updated the Wrapped Ether token used by 0x Portal.
+                    We have recently updated the Wrapped Ether token (WETH) used by 0x Portal.
                     Don't worry, unwrapping Ether tied to the old Wrapped Ether token can
                     be done at any time by clicking on the "Wrap ETH" section in the menu
                     to the left.

From c6af59a3e72d09a123a89e63e0b4ed932c5c9e99 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 11:18:02 +0100
Subject: [PATCH 062/125] Move muiTheme into it's own module

---
 packages/website/ts/index.tsx          | 37 ++------------------------
 packages/website/ts/utils/mui_theme.ts | 35 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 35 deletions(-)
 create mode 100644 packages/website/ts/utils/mui_theme.ts

diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 2f88ec8f46..685ce49625 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -2,7 +2,7 @@
 import 'whatwg-fetch';
 
 import {bigNumberConfigs} from '@0xproject/utils';
-import {getMuiTheme, MuiThemeProvider} from 'material-ui/styles';
+import {MuiThemeProvider} from 'material-ui/styles';
 import * as React from 'react';
 import {render} from 'react-dom';
 import {Provider} from 'react-redux';
@@ -19,7 +19,7 @@ import {NotFound} from 'ts/pages/not_found';
 import {Wiki} from 'ts/pages/wiki/wiki';
 import {reducer, State} from 'ts/redux/reducer';
 import {WebsitePaths} from 'ts/types';
-import {colors} from 'ts/utils/colors';
+import {muiTheme} from 'ts/utils/mui_theme';
 injectTapEventPlugin();
 
 bigNumberConfigs.configure();
@@ -31,39 +31,6 @@ trackedTokenStorage.clearIfRequired();
 import 'basscss/css/basscss.css';
 import 'less/all.less';
 
-const muiTheme = getMuiTheme({
-    appBar: {
-        height: 45,
-        color: colors.white,
-        textColor: colors.black,
-    },
-    palette: {
-        pickerHeaderColor: colors.lightBlue,
-        primary1Color: colors.lightBlue,
-        primary2Color: colors.lightBlue,
-        textColor: colors.grey700,
-    },
-    datePicker: {
-        color: colors.grey700,
-        textColor: colors.white,
-        calendarTextColor: colors.white,
-        selectColor: colors.darkestGrey,
-        selectTextColor: colors.white,
-    },
-    timePicker: {
-        color: colors.grey700,
-        textColor: colors.white,
-        accentColor: colors.white,
-        headerColor: colors.darkestGrey,
-        selectColor: colors.darkestGrey,
-        selectTextColor: colors.darkestGrey,
-    },
-    toggle: {
-        thumbOnColor: colors.limeGreen,
-        trackOnColor: colors.lightGreen,
-    },
-});
-
 // We pass modulePromise returning lambda instead of module promise,
 // cause we only want to import the module when the user navigates to the page.
 // At the same time webpack statically parses for System.import() to determine bundle chunk split points
diff --git a/packages/website/ts/utils/mui_theme.ts b/packages/website/ts/utils/mui_theme.ts
new file mode 100644
index 0000000000..60c58f5952
--- /dev/null
+++ b/packages/website/ts/utils/mui_theme.ts
@@ -0,0 +1,35 @@
+import {getMuiTheme} from 'material-ui/styles';
+import {colors} from 'ts/utils/colors';
+
+export const muiTheme = getMuiTheme({
+    appBar: {
+        height: 45,
+        color: colors.white,
+        textColor: colors.black,
+    },
+    palette: {
+        pickerHeaderColor: colors.lightBlue,
+        primary1Color: colors.lightBlue,
+        primary2Color: colors.lightBlue,
+        textColor: colors.grey700,
+    },
+    datePicker: {
+        color: colors.grey700,
+        textColor: colors.white,
+        calendarTextColor: colors.white,
+        selectColor: colors.darkestGrey,
+        selectTextColor: colors.white,
+    },
+    timePicker: {
+        color: colors.grey700,
+        textColor: colors.white,
+        accentColor: colors.white,
+        headerColor: colors.darkestGrey,
+        selectColor: colors.darkestGrey,
+        selectTextColor: colors.darkestGrey,
+    },
+    toggle: {
+        thumbOnColor: colors.limeGreen,
+        trackOnColor: colors.lightGreen,
+    },
+});

From b7004b30029f26e3a556676f5e713ba23cd5151d Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 11:25:50 +0100
Subject: [PATCH 063/125] Refactor remaining _.assign to spread operator

---
 .../dialogs/track_token_confirmation_dialog.tsx        |  4 +++-
 packages/website/ts/components/fill_order.tsx          | 10 ++++++----
 .../ts/components/generate_order/asset_picker.tsx      |  4 +++-
 packages/website/ts/components/token_balances.tsx      |  5 +++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx b/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
index 2d45009d50..f17893a837 100644
--- a/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
+++ b/packages/website/ts/components/dialogs/track_token_confirmation_dialog.tsx
@@ -73,7 +73,9 @@ export class TrackTokenConfirmationDialog extends
             isAddingTokenToTracked: true,
         });
         for (const token of this.props.tokens) {
-            const newTokenEntry = _.assign({}, token);
+            const newTokenEntry = {
+                ...token,
+            };
 
             newTokenEntry.isTracked = true;
             trackedTokenStorage.addTrackedTokenToUser(this.props.userAddress, this.props.networkId, newTokenEntry);
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index c96dfe27a1..044424fe0d 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -380,22 +380,24 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
         const isUnseenMakerToken = _.isUndefined(makerTokenIfExists);
         const isMakerTokenTracked = !_.isUndefined(makerTokenIfExists) && makerTokenIfExists.isTracked;
         if (isUnseenMakerToken) {
-            tokensToTrack.push(_.assign({}, this.state.parsedOrder.maker.token, {
+            tokensToTrack.push({
+                ...this.state.parsedOrder.maker.token,
                 iconUrl: undefined,
                 isTracked: false,
                 isRegistered: false,
-            }));
+            });
         } else if (!isMakerTokenTracked) {
             tokensToTrack.push(makerTokenIfExists);
         }
         const isUnseenTakerToken = _.isUndefined(takerTokenIfExists);
         const isTakerTokenTracked = !_.isUndefined(takerTokenIfExists) && takerTokenIfExists.isTracked;
         if (isUnseenTakerToken) {
-            tokensToTrack.push(_.assign({}, this.state.parsedOrder.taker.token, {
+            tokensToTrack.push({
+                ...this.state.parsedOrder.taker.token,
                 iconUrl: undefined,
                 isTracked: false,
                 isRegistered: false,
-            }));
+            });
         } else if (!isTakerTokenTracked) {
             tokensToTrack.push(takerTokenIfExists);
         }
diff --git a/packages/website/ts/components/generate_order/asset_picker.tsx b/packages/website/ts/components/generate_order/asset_picker.tsx
index 08b4a909ee..51edd2308a 100644
--- a/packages/website/ts/components/generate_order/asset_picker.tsx
+++ b/packages/website/ts/components/generate_order/asset_picker.tsx
@@ -244,7 +244,9 @@ export class AssetPicker extends React.Component<AssetPickerProps, AssetPickerSt
         });
         const tokenAddress = this.state.chosenTrackTokenAddress;
         const token = this.props.tokenByAddress[tokenAddress];
-        const newTokenEntry = _.assign({}, token);
+        const newTokenEntry = {
+            ...token,
+        };
 
         newTokenEntry.isTracked = true;
         trackedTokenStorage.addTrackedTokenToUser(this.props.userAddress, this.props.networkId, newTokenEntry);
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index ecaf63af97..ab4b048685 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -460,9 +460,10 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
         if (!this.state.isAddingToken && !isDefaultTrackedToken) {
             if (token.isRegistered) {
                 // Remove the token from tracked tokens
-                const newToken = _.assign({}, token, {
+                const newToken = {
+                    ...token,
                     isTracked: false,
-                });
+                };
                 this.props.dispatcher.updateTokenByAddress([newToken]);
             } else {
                 this.props.dispatcher.removeTokenToTokenByAddress(token);

From 1e4fdcf615502478cbec8711bf6710e093c0c279 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 15:35:23 +0100
Subject: [PATCH 064/125] Rename SubscriptionOpts to BlockRange

---
 packages/0x.js/CHANGELOG.md                            |  9 +++++----
 .../0x.js/src/contract_wrappers/contract_wrapper.ts    |  6 +++---
 .../0x.js/src/contract_wrappers/exchange_wrapper.ts    | 10 +++++-----
 packages/0x.js/src/contract_wrappers/token_wrapper.ts  | 10 +++++-----
 packages/0x.js/src/index.ts                            |  2 +-
 packages/0x.js/src/types.ts                            |  2 +-
 packages/0x.js/src/utils/filter_utils.ts               |  8 ++++----
 packages/0x.js/test/exchange_wrapper_test.ts           | 10 +++++-----
 packages/0x.js/test/token_wrapper_test.ts              | 10 +++++-----
 packages/json-schemas/CHANGELOG.md                     |  4 ++++
 ...bscription_opts_schema.ts => block_range_schema.ts} |  4 ++--
 packages/json-schemas/src/schemas.ts                   |  6 +++---
 packages/json-schemas/test/schema_test.ts              |  8 ++++----
 packages/website/ts/blockchain.ts                      |  6 +++---
 .../website/ts/containers/zero_ex_js_documentation.tsx |  1 +
 15 files changed, 51 insertions(+), 45 deletions(-)
 rename packages/json-schemas/schemas/{subscription_opts_schema.ts => block_range_schema.ts} (82%)

diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 9874b0ca89..962d312d30 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -1,10 +1,11 @@
 # CHANGELOG
 
-v0.28.0 - _TBD_
+v0.x.x - _TBD, 2017_
 ------------------------
-* Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `zeroEx.etherToken` (#267)
-* Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry` (#267)
-* Removed `etherTokenContractAddress` from `ZeroEx` constructor arg `ZeroExConfig` (#267)
+    * Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `zeroEx.etherToken` (#267)
+    * Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry` (#267)
+    * Removed `etherTokenContractAddress` from `ZeroEx` constructor arg `ZeroExConfig` (#267)
+    * Rename `SubscriptionOpts` to `BlockRange` (#272)
 
 v0.27.1 - _November 28, 2017_
 ------------------------
diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
index 46916ebf47..3f07e4e472 100644
--- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
@@ -7,6 +7,7 @@ import * as Web3 from 'web3';
 import {
     Artifact,
     BlockParamLiteral,
+    BlockRange,
     ContractEventArgs,
     ContractEvents,
     EventCallback,
@@ -14,7 +15,6 @@ import {
     InternalZeroExError,
     LogWithDecodedArgs,
     RawLog,
-    SubscriptionOpts,
     ZeroExError,
 } from '../types';
 import {AbiDecoder} from '../utils/abi_decoder';
@@ -83,9 +83,9 @@ export class ContractWrapper {
         return filterToken;
     }
     protected async _getLogsAsync<ArgsType extends ContractEventArgs>(
-        address: string, eventName: ContractEvents, subscriptionOpts: SubscriptionOpts,
+        address: string, eventName: ContractEvents, blockRange: BlockRange,
         indexFilterValues: IndexedFilterValues, abi: Web3.ContractAbi): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
-        const filter = filterUtils.getFilter(address, eventName, indexFilterValues, abi, subscriptionOpts);
+        const filter = filterUtils.getFilter(address, eventName, indexFilterValues, abi, blockRange);
         const logs = await this._web3Wrapper.getLogsAsync(filter);
         const logsWithDecodedArguments = _.map(logs, this._tryToDecodeLogOrNoop.bind(this));
         return logsWithDecodedArguments;
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index 3ca5695c44..7739defc03 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -25,7 +25,7 @@ import {
     OrderTransactionOpts,
     OrderValues,
     SignedOrder,
-    SubscriptionOpts,
+    BlockRange,
     ValidateOrderFillableOpts,
 } from '../types';
 import {AbiDecoder} from '../utils/abi_decoder';
@@ -616,20 +616,20 @@ export class ExchangeWrapper extends ContractWrapper {
     /**
      * Gets historical logs without creating a subscription
      * @param   eventName           The exchange contract event you would like to subscribe to.
-     * @param   subscriptionOpts    Subscriptions options that let you configure the subscription.
+     * @param   blockRange    Subscriptions options that let you configure the subscription.
      * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
      *                              the value is the value you are interested in. E.g `{_from: aUserAddressHex}`
      * @return  Array of logs that match the parameters
      */
     public async getLogsAsync<ArgsType extends ExchangeContractEventArgs>(
-        eventName: ExchangeEvents, subscriptionOpts: SubscriptionOpts, indexFilterValues: IndexedFilterValues,
+        eventName: ExchangeEvents, blockRange: BlockRange, indexFilterValues: IndexedFilterValues,
     ): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
         assert.doesBelongToStringEnum('eventName', eventName, ExchangeEvents);
-        assert.doesConformToSchema('subscriptionOpts', subscriptionOpts, schemas.subscriptionOptsSchema);
+        assert.doesConformToSchema('blockRange', blockRange, schemas.blockRangeSchema);
         assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
         const exchangeContractAddress = this.getContractAddress();
         const logs = await this._getLogsAsync<ArgsType>(
-            exchangeContractAddress, eventName, subscriptionOpts, indexFilterValues, artifacts.ExchangeArtifact.abi,
+            exchangeContractAddress, eventName, blockRange, indexFilterValues, artifacts.ExchangeArtifact.abi,
         );
         return logs;
     }
diff --git a/packages/0x.js/src/contract_wrappers/token_wrapper.ts b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
index eccb748713..419b332858 100644
--- a/packages/0x.js/src/contract_wrappers/token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
@@ -5,11 +5,11 @@ import * as _ from 'lodash';
 
 import {artifacts} from '../artifacts';
 import {
+    BlockRange,
     EventCallback,
     IndexedFilterValues,
     LogWithDecodedArgs,
     MethodOpts,
-    SubscriptionOpts,
     TokenContractEventArgs,
     TokenEvents,
     TransactionOpts,
@@ -291,20 +291,20 @@ export class TokenWrapper extends ContractWrapper {
      * Gets historical logs without creating a subscription
      * @param   tokenAddress        An address of the token that emmited the logs.
      * @param   eventName           The token contract event you would like to subscribe to.
-     * @param   subscriptionOpts    Subscriptions options that let you configure the subscription.
+     * @param   blockRange          Subscriptions options that let you configure the subscription.
      * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
      *                              the value is the value you are interested in. E.g `{_from: aUserAddressHex}`
      * @return  Array of logs that match the parameters
      */
     public async getLogsAsync<ArgsType extends TokenContractEventArgs>(
-        tokenAddress: string, eventName: TokenEvents, subscriptionOpts: SubscriptionOpts,
+        tokenAddress: string, eventName: TokenEvents, blockRange: BlockRange,
         indexFilterValues: IndexedFilterValues): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
         assert.isETHAddressHex('tokenAddress', tokenAddress);
         assert.doesBelongToStringEnum('eventName', eventName, TokenEvents);
-        assert.doesConformToSchema('subscriptionOpts', subscriptionOpts, schemas.subscriptionOptsSchema);
+        assert.doesConformToSchema('blockRange', blockRange, schemas.blockRangeSchema);
         assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
         const logs = await this._getLogsAsync<ArgsType>(
-            tokenAddress, eventName, subscriptionOpts, indexFilterValues, artifacts.TokenArtifact.abi,
+            tokenAddress, eventName, blockRange, indexFilterValues, artifacts.TokenArtifact.abi,
         );
         return logs;
     }
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 2f5296a9f0..b75ca4fa35 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -12,7 +12,7 @@ export {
     ExchangeEvents,
     TokenEvents,
     IndexedFilterValues,
-    SubscriptionOpts,
+    BlockRange,
     BlockParam,
     OrderCancellationRequest,
     OrderFillRequest,
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index fb3cfa6dff..844ac9ed9d 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -217,7 +217,7 @@ export enum BlockParamLiteral {
 
 export type BlockParam = BlockParamLiteral|number;
 
-export interface SubscriptionOpts {
+export interface BlockRange {
     fromBlock: BlockParam;
     toBlock: BlockParam;
 }
diff --git a/packages/0x.js/src/utils/filter_utils.ts b/packages/0x.js/src/utils/filter_utils.ts
index 57c3ee71ca..65161c33e8 100644
--- a/packages/0x.js/src/utils/filter_utils.ts
+++ b/packages/0x.js/src/utils/filter_utils.ts
@@ -4,7 +4,7 @@ import * as _ from 'lodash';
 import * as uuid from 'uuid/v4';
 import * as Web3 from 'web3';
 
-import {ContractEvents, IndexedFilterValues, SubscriptionOpts} from '../types';
+import {BlockRange, ContractEvents, IndexedFilterValues} from '../types';
 
 const TOPIC_LENGTH = 32;
 
@@ -14,7 +14,7 @@ export const filterUtils = {
     },
     getFilter(address: string, eventName: ContractEvents,
               indexFilterValues: IndexedFilterValues, abi: Web3.ContractAbi,
-              subscriptionOpts?: SubscriptionOpts): Web3.FilterObject {
+              blockRange?: BlockRange): Web3.FilterObject {
         const eventAbi = _.find(abi, {name: eventName}) as Web3.EventAbi;
         const eventSignature = filterUtils.getEventSignatureFromAbiByName(eventAbi, eventName);
         const topicForEventSignature = ethUtil.addHexPrefix(jsSHA3.keccak256(eventSignature));
@@ -24,9 +24,9 @@ export const filterUtils = {
             address,
             topics,
         };
-        if (!_.isUndefined(subscriptionOpts)) {
+        if (!_.isUndefined(blockRange)) {
             filter = {
-                ...subscriptionOpts,
+                ...blockRange,
                 ...filter,
             };
         }
diff --git a/packages/0x.js/test/exchange_wrapper_test.ts b/packages/0x.js/test/exchange_wrapper_test.ts
index 51b511dbf6..6605e7e52d 100644
--- a/packages/0x.js/test/exchange_wrapper_test.ts
+++ b/packages/0x.js/test/exchange_wrapper_test.ts
@@ -13,7 +13,7 @@ import {
     OrderCancellationRequest,
     OrderFillRequest,
     SignedOrder,
-    SubscriptionOpts,
+    BlockRange,
     Token,
     ZeroEx,
 } from '../src';
@@ -760,7 +760,7 @@ describe('ExchangeWrapper', () => {
         let takerAddress: string;
         const fillableAmount = new BigNumber(5);
         const shouldThrowOnInsufficientBalanceOrAllowance = true;
-        const subscriptionOpts: SubscriptionOpts = {
+        const blockRange: BlockRange = {
             fromBlock: 0,
             toBlock: BlockParamLiteral.Latest,
         };
@@ -781,7 +781,7 @@ describe('ExchangeWrapper', () => {
             await zeroEx.awaitTransactionMinedAsync(txHash);
             const eventName = ExchangeEvents.LogFill;
             const indexFilterValues = {};
-            const logs = await zeroEx.exchange.getLogsAsync(eventName, subscriptionOpts, indexFilterValues);
+            const logs = await zeroEx.exchange.getLogsAsync(eventName, blockRange, indexFilterValues);
             expect(logs).to.have.length(1);
             expect(logs[0].event).to.be.equal(eventName);
         });
@@ -795,7 +795,7 @@ describe('ExchangeWrapper', () => {
             await zeroEx.awaitTransactionMinedAsync(txHash);
             const differentEventName = ExchangeEvents.LogCancel;
             const indexFilterValues = {};
-            const logs = await zeroEx.exchange.getLogsAsync(differentEventName, subscriptionOpts, indexFilterValues);
+            const logs = await zeroEx.exchange.getLogsAsync(differentEventName, blockRange, indexFilterValues);
             expect(logs).to.have.length(0);
         });
         it('should only get the logs with the correct indexed fields', async () => {
@@ -821,7 +821,7 @@ describe('ExchangeWrapper', () => {
                 maker: differentMakerAddress,
             };
             const logs = await zeroEx.exchange.getLogsAsync<LogFillContractEventArgs>(
-                eventName, subscriptionOpts, indexFilterValues,
+                eventName, blockRange, indexFilterValues,
             );
             expect(logs).to.have.length(1);
             const args = logs[0].args;
diff --git a/packages/0x.js/test/token_wrapper_test.ts b/packages/0x.js/test/token_wrapper_test.ts
index 70637dbfed..5111a05d22 100644
--- a/packages/0x.js/test/token_wrapper_test.ts
+++ b/packages/0x.js/test/token_wrapper_test.ts
@@ -8,7 +8,7 @@ import * as Web3 from 'web3';
 import {
     ApprovalContractEventArgs,
     DecodedLogEvent,
-    SubscriptionOpts,
+    BlockRange,
     Token,
     TokenEvents,
     TransferContractEventArgs,
@@ -433,7 +433,7 @@ describe('TokenWrapper', () => {
     describe('#getLogsAsync', () => {
         let tokenAddress: string;
         let tokenTransferProxyAddress: string;
-        const subscriptionOpts: SubscriptionOpts = {
+        const blockRange: BlockRange = {
             fromBlock: 0,
             toBlock: BlockParamLiteral.Latest,
         };
@@ -449,7 +449,7 @@ describe('TokenWrapper', () => {
             const eventName = TokenEvents.Approval;
             const indexFilterValues = {};
             const logs = await zeroEx.token.getLogsAsync<ApprovalContractEventArgs>(
-                tokenAddress, eventName, subscriptionOpts, indexFilterValues,
+                tokenAddress, eventName, blockRange, indexFilterValues,
             );
             expect(logs).to.have.length(1);
             const args = logs[0].args;
@@ -464,7 +464,7 @@ describe('TokenWrapper', () => {
             const differentEventName = TokenEvents.Transfer;
             const indexFilterValues = {};
             const logs = await zeroEx.token.getLogsAsync(
-                tokenAddress, differentEventName, subscriptionOpts, indexFilterValues,
+                tokenAddress, differentEventName, blockRange, indexFilterValues,
             );
             expect(logs).to.have.length(0);
         });
@@ -478,7 +478,7 @@ describe('TokenWrapper', () => {
                 _owner: coinbase,
             };
             const logs = await zeroEx.token.getLogsAsync<ApprovalContractEventArgs>(
-                tokenAddress, eventName, subscriptionOpts, indexFilterValues,
+                tokenAddress, eventName, blockRange, indexFilterValues,
             );
             expect(logs).to.have.length(1);
             const args = logs[0].args;
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md
index 9f080adeb8..81225e5deb 100644
--- a/packages/json-schemas/CHANGELOG.md
+++ b/packages/json-schemas/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+v0.x.x - _TBD, 2017_
+------------------------
+    * Rename `subscriptionOptsSchema` to `blockRangeSchema` (#272)
+
 v0.6.7 - _Nov. 14, 2017_
 ------------------------
     * Re-publish JSON-schema previously published under NPM package 0x-json-schemas
diff --git a/packages/json-schemas/schemas/subscription_opts_schema.ts b/packages/json-schemas/schemas/block_range_schema.ts
similarity index 82%
rename from packages/json-schemas/schemas/subscription_opts_schema.ts
rename to packages/json-schemas/schemas/block_range_schema.ts
index a476e6963b..b264cb66e3 100644
--- a/packages/json-schemas/schemas/subscription_opts_schema.ts
+++ b/packages/json-schemas/schemas/block_range_schema.ts
@@ -10,8 +10,8 @@ export const blockParamSchema = {
     ],
 };
 
-export const subscriptionOptsSchema = {
-    id: '/SubscriptionOpts',
+export const blockRangeSchema = {
+    id: '/BlockRange',
     properties: {
         fromBlock: {$ref: '/BlockParam'},
         toBlock: {$ref: '/BlockParam'},
diff --git a/packages/json-schemas/src/schemas.ts b/packages/json-schemas/src/schemas.ts
index 69164cbc79..487f4fa5c0 100644
--- a/packages/json-schemas/src/schemas.ts
+++ b/packages/json-schemas/src/schemas.ts
@@ -57,8 +57,8 @@ import {
 } from '../schemas/signed_orders_schema';
 import {
     blockParamSchema,
-    subscriptionOptsSchema,
-} from '../schemas/subscription_opts_schema';
+    blockRangeSchema,
+} from '../schemas/block_range_schema';
 import {
     tokenSchema,
 } from '../schemas/token_schema';
@@ -81,7 +81,7 @@ export const schemas = {
     signedOrderSchema,
     signedOrdersSchema,
     blockParamSchema,
-    subscriptionOptsSchema,
+    blockRangeSchema,
     tokenSchema,
     jsNumber,
     txDataSchema,
diff --git a/packages/json-schemas/test/schema_test.ts b/packages/json-schemas/test/schema_test.ts
index 067b02827e..e729c19258 100644
--- a/packages/json-schemas/test/schema_test.ts
+++ b/packages/json-schemas/test/schema_test.ts
@@ -23,7 +23,7 @@ const {
     signedOrderSchema,
     signedOrdersSchema,
     blockParamSchema,
-    subscriptionOptsSchema,
+    blockRangeSchema,
     tokenSchema,
     jsNumber,
     txDataSchema,
@@ -170,21 +170,21 @@ describe('Schema', () => {
             validateAgainstSchema(testCases, blockParamSchema, shouldFail);
         });
     });
-    describe('#subscriptionOptsSchema', () => {
+    describe('#blockRangeSchema', () => {
         it('should validate valid subscription opts', () => {
             const testCases = [
                 {fromBlock: 42, toBlock: 'latest'},
                 {fromBlock: 42},
                 {},
             ];
-            validateAgainstSchema(testCases, subscriptionOptsSchema);
+            validateAgainstSchema(testCases, blockRangeSchema);
         });
         it('should fail for invalid subscription opts', () => {
             const testCases = [
                 {fromBlock: '42'},
             ];
             const shouldFail = true;
-            validateAgainstSchema(testCases, subscriptionOptsSchema, shouldFail);
+            validateAgainstSchema(testCases, blockRangeSchema, shouldFail);
         });
     });
     describe('#tokenSchema', () => {
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index a42b19cffe..2a4aabeb23 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -1,5 +1,6 @@
 import {
     BlockParam,
+    BlockRange,
     DecodedLogEvent,
     ExchangeContractEventArgs,
     ExchangeEvents,
@@ -9,7 +10,6 @@ import {
     LogWithDecodedArgs,
     Order,
     SignedOrder,
-    SubscriptionOpts,
     Token as ZeroExToken,
     TransactionReceiptWithDecodedLogs,
     ZeroEx,
@@ -524,12 +524,12 @@ export class Blockchain {
     }
     private async fetchHistoricalExchangeLogFillEventsAsync(indexFilterValues: IndexedFilterValues) {
         const fromBlock = tradeHistoryStorage.getFillsLatestBlock(this.userAddress, this.networkId);
-        const subscriptionOpts: SubscriptionOpts = {
+        const blockRange: BlockRange = {
             fromBlock,
             toBlock: 'latest' as BlockParam,
         };
         const decodedLogs = await this.zeroEx.exchange.getLogsAsync<LogFillContractEventArgs>(
-            ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues,
+            ExchangeEvents.LogFill, blockRange, indexFilterValues,
         );
         for (const decodedLog of decodedLogs) {
             if (!this.doesLogEventInvolveUser(decodedLog)) {
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.tsx b/packages/website/ts/containers/zero_ex_js_documentation.tsx
index 1ce9ba139d..ded62d2bcb 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.tsx
+++ b/packages/website/ts/containers/zero_ex_js_documentation.tsx
@@ -95,6 +95,7 @@ const docsInfoConfig: DocsInfoConfig = {
         'ExchangeEvents',
         'IndexedFilterValues',
         'SubscriptionOpts',
+        'BlockRange',
         'BlockParam',
         'OrderFillOrKillRequest',
         'OrderCancellationRequest',

From f269ecd95efdd85956f995424474184eea09616f Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 15:58:52 +0100
Subject: [PATCH 065/125] Fix linter error

---
 packages/json-schemas/src/schemas.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/json-schemas/src/schemas.ts b/packages/json-schemas/src/schemas.ts
index 487f4fa5c0..854291a717 100644
--- a/packages/json-schemas/src/schemas.ts
+++ b/packages/json-schemas/src/schemas.ts
@@ -2,6 +2,10 @@ import {
     addressSchema,
     numberSchema,
 } from '../schemas/basic_type_schemas';
+import {
+    blockParamSchema,
+    blockRangeSchema,
+} from '../schemas/block_range_schema';
 import {
     ecSignatureParameterSchema,
     ecSignatureSchema,
@@ -55,10 +59,6 @@ import {
 import {
     signedOrdersSchema,
 } from '../schemas/signed_orders_schema';
-import {
-    blockParamSchema,
-    blockRangeSchema,
-} from '../schemas/block_range_schema';
 import {
     tokenSchema,
 } from '../schemas/token_schema';

From 436d78eb93792e352049c790b10fbeddde199cab Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 17:06:00 +0100
Subject: [PATCH 066/125] Fix linter issues

---
 packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | 4 ++--
 packages/0x.js/test/exchange_wrapper_test.ts             | 2 +-
 packages/0x.js/test/token_wrapper_test.ts                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index 7739defc03..274f217c6e 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -7,6 +7,7 @@ import * as Web3 from 'web3';
 import {artifacts} from '../artifacts';
 import {
     BlockParamLiteral,
+    BlockRange,
     DecodedLogArgs,
     ECSignature,
     EventCallback,
@@ -25,7 +26,6 @@ import {
     OrderTransactionOpts,
     OrderValues,
     SignedOrder,
-    BlockRange,
     ValidateOrderFillableOpts,
 } from '../types';
 import {AbiDecoder} from '../utils/abi_decoder';
@@ -616,7 +616,7 @@ export class ExchangeWrapper extends ContractWrapper {
     /**
      * Gets historical logs without creating a subscription
      * @param   eventName           The exchange contract event you would like to subscribe to.
-     * @param   blockRange    Subscriptions options that let you configure the subscription.
+     * @param   blockRange          Subscriptions options that let you configure the subscription.
      * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
      *                              the value is the value you are interested in. E.g `{_from: aUserAddressHex}`
      * @return  Array of logs that match the parameters
diff --git a/packages/0x.js/test/exchange_wrapper_test.ts b/packages/0x.js/test/exchange_wrapper_test.ts
index 6605e7e52d..9c55069da8 100644
--- a/packages/0x.js/test/exchange_wrapper_test.ts
+++ b/packages/0x.js/test/exchange_wrapper_test.ts
@@ -5,6 +5,7 @@ import 'mocha';
 import * as Web3 from 'web3';
 
 import {
+    BlockRange,
     DecodedLogEvent,
     ExchangeContractErrs,
     ExchangeEvents,
@@ -13,7 +14,6 @@ import {
     OrderCancellationRequest,
     OrderFillRequest,
     SignedOrder,
-    BlockRange,
     Token,
     ZeroEx,
 } from '../src';
diff --git a/packages/0x.js/test/token_wrapper_test.ts b/packages/0x.js/test/token_wrapper_test.ts
index 5111a05d22..48742b6634 100644
--- a/packages/0x.js/test/token_wrapper_test.ts
+++ b/packages/0x.js/test/token_wrapper_test.ts
@@ -7,8 +7,8 @@ import * as Web3 from 'web3';
 
 import {
     ApprovalContractEventArgs,
-    DecodedLogEvent,
     BlockRange,
+    DecodedLogEvent,
     Token,
     TokenEvents,
     TransferContractEventArgs,

From 156dae1d33bd0a19c764262fbf0c9d6743425fc6 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 12:03:52 +0100
Subject: [PATCH 067/125] Fix comments

---
 packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | 2 +-
 packages/0x.js/src/contract_wrappers/token_wrapper.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index 274f217c6e..df793aa06e 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -616,7 +616,7 @@ export class ExchangeWrapper extends ContractWrapper {
     /**
      * Gets historical logs without creating a subscription
      * @param   eventName           The exchange contract event you would like to subscribe to.
-     * @param   blockRange          Subscriptions options that let you configure the subscription.
+     * @param   blockRange          Block range to get logs from.
      * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
      *                              the value is the value you are interested in. E.g `{_from: aUserAddressHex}`
      * @return  Array of logs that match the parameters
diff --git a/packages/0x.js/src/contract_wrappers/token_wrapper.ts b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
index 419b332858..a9eac10e00 100644
--- a/packages/0x.js/src/contract_wrappers/token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
@@ -291,7 +291,7 @@ export class TokenWrapper extends ContractWrapper {
      * Gets historical logs without creating a subscription
      * @param   tokenAddress        An address of the token that emmited the logs.
      * @param   eventName           The token contract event you would like to subscribe to.
-     * @param   blockRange          Subscriptions options that let you configure the subscription.
+     * @param   blockRange          Block range to get logs from.
      * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
      *                              the value is the value you are interested in. E.g `{_from: aUserAddressHex}`
      * @return  Array of logs that match the parameters

From a5d2cbfd6f9d7e86807bf2c4fb3a045722153e58 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 16:27:14 +0100
Subject: [PATCH 068/125] Install types for yargs

---
 packages/abi-gen/package.json                |  2 +-
 packages/contracts/deploy/cli.ts             | 14 +++++++-------
 packages/contracts/deploy/src/utils/types.ts |  3 ++-
 packages/contracts/globals.d.ts              |  1 -
 packages/contracts/package.json              |  2 +-
 yarn.lock                                    |  4 ++++
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index a5c27b907b..00943f0633 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -38,7 +38,7 @@
     "@types/handlebars": "^4.0.36",
     "@types/mkdirp": "^0.5.1",
     "@types/node": "^8.0.53",
-    "@types/yargs": "^8.0.2",
+    "@types/yargs": "^10.0.0",
     "npm-run-all": "^4.1.2",
     "shx": "^0.2.2",
     "tslint": "5.8.0",
diff --git a/packages/contracts/deploy/cli.ts b/packages/contracts/deploy/cli.ts
index 423523e217..6587e46f1d 100644
--- a/packages/contracts/deploy/cli.ts
+++ b/packages/contracts/deploy/cli.ts
@@ -23,12 +23,12 @@ const DEFAULT_GAS_PRICE = ((10 ** 9) * 2).toString();
  * Compiles all contracts with options passed in through CLI.
  * @param argv Instance of process.argv provided by yargs.
  */
-async function onCompileCommand(args: CliOptions): Promise<void> {
+async function onCompileCommand(argv: CliOptions): Promise<void> {
     const opts: CompilerOptions = {
-        contractsDir: args.contractsDir,
-        networkId: args.networkId,
-        optimizerEnabled: args.shouldOptimize ? 1 : 0,
-        artifactsDir: args.artifactsDir,
+        contractsDir: argv.contractsDir,
+        networkId: argv.networkId,
+        optimizerEnabled: argv.shouldOptimize ? 1 : 0,
+        artifactsDir: argv.artifactsDir,
     };
     await commands.compileAsync(opts);
 }
@@ -150,11 +150,11 @@ function deployCommandBuilder(yargsInstance: any) {
         })
         .command('compile',
                  'compile contracts',
-                 _.noop,
+                 _.identity,
                  onCompileCommand)
         .command('migrate',
                  'compile and deploy contracts using migration scripts',
-                 _.noop,
+                 _.identity,
                  onMigrateCommand)
         .command('deploy',
                  'deploy a single contract with provided arguments',
diff --git a/packages/contracts/deploy/src/utils/types.ts b/packages/contracts/deploy/src/utils/types.ts
index f6b9de6e96..6831079e69 100644
--- a/packages/contracts/deploy/src/utils/types.ts
+++ b/packages/contracts/deploy/src/utils/types.ts
@@ -1,5 +1,6 @@
 import {TxData} from '@0xproject/types';
 import * as Web3 from 'web3';
+import * as yargs from 'yargs';
 
 export enum AbiType {
     Function = 'function',
@@ -32,7 +33,7 @@ export interface SolcErrors {
     [key: string]: boolean;
 }
 
-export interface CliOptions {
+export interface CliOptions extends yargs.Arguments {
     artifactsDir: string;
     contractsDir: string;
     jsonrpcPort: number;
diff --git a/packages/contracts/globals.d.ts b/packages/contracts/globals.d.ts
index df53e93721..a2d5176f80 100644
--- a/packages/contracts/globals.d.ts
+++ b/packages/contracts/globals.d.ts
@@ -2,7 +2,6 @@ declare module 'bn.js';
 declare module 'ethereumjs-abi';
 declare module 'chai-bignumber';
 declare module 'dirty-chai';
-declare module 'yargs';
 
 // HACK: In order to merge the bignumber declaration added by chai-bignumber to the chai Assertion
 // interface we must use `namespace` as the Chai definitelyTyped definition does. Since we otherwise
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index c8ccd0a3a0..0a7b8f5efc 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.86",
     "@types/node": "^8.0.53",
     "@types/request-promise-native": "^1.0.2",
-    "@types/yargs": "^8.0.2",
+    "@types/yargs": "^10.0.0",
     "chai": "^4.0.1",
     "chai-as-promised": "^7.1.0",
     "chai-as-promised-typescript-typings": "^0.0.3",
diff --git a/yarn.lock b/yarn.lock
index d97a632827..b61c2f6070 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -266,6 +266,10 @@
   dependencies:
     "@types/node" "*"
 
+"@types/yargs@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-10.0.0.tgz#b93aa88155fe5106cddf3f934517411ca2a45939"
+
 "@types/yargs@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-8.0.2.tgz#0f9c7b236e2d78cd8f4b6502de15d0728aa29385"

From ed6756898f02f192081fa4c89b5bb2cb1ae3c637 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 16:28:28 +0100
Subject: [PATCH 069/125] Define types for ethereumjs-abi

---
 packages/contracts/globals.d.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/contracts/globals.d.ts b/packages/contracts/globals.d.ts
index a2d5176f80..05c08bd98b 100644
--- a/packages/contracts/globals.d.ts
+++ b/packages/contracts/globals.d.ts
@@ -1,5 +1,4 @@
 declare module 'bn.js';
-declare module 'ethereumjs-abi';
 declare module 'chai-bignumber';
 declare module 'dirty-chai';
 
@@ -30,6 +29,10 @@ declare module 'web3-eth-abi' {
     export function encodeParameters(typesArray: string[], parameters: any[]): string;
 }
 
+declare module 'ethereumjs-abi' {
+    const soliditySHA3: (argTypes: string[], args: any[]) => Buffer;
+}
+
 // Truffle injects the following into the global scope
 declare var artifacts: any;
 declare var contract: any;

From 786ea527380fe8f2f6461628c9dde90d61e3bc85 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 18 Dec 2017 16:35:06 +0100
Subject: [PATCH 070/125] Define types for methodID

---
 packages/contracts/globals.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contracts/globals.d.ts b/packages/contracts/globals.d.ts
index 05c08bd98b..2e58273244 100644
--- a/packages/contracts/globals.d.ts
+++ b/packages/contracts/globals.d.ts
@@ -1,4 +1,3 @@
-declare module 'bn.js';
 declare module 'chai-bignumber';
 declare module 'dirty-chai';
 
@@ -31,6 +30,7 @@ declare module 'web3-eth-abi' {
 
 declare module 'ethereumjs-abi' {
     const soliditySHA3: (argTypes: string[], args: any[]) => Buffer;
+    const methodID: (name: string, types: string[]) => Buffer;
 }
 
 // Truffle injects the following into the global scope

From e5b5fc400a4bb18b21ceb5bc6dcd648e3c2a5416 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 12:18:50 +0100
Subject: [PATCH 071/125] Introduce an identityCommandBuilder

---
 packages/contracts/deploy/cli.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/contracts/deploy/cli.ts b/packages/contracts/deploy/cli.ts
index 6587e46f1d..b02849826e 100644
--- a/packages/contracts/deploy/cli.ts
+++ b/packages/contracts/deploy/cli.ts
@@ -113,6 +113,7 @@ function deployCommandBuilder(yargsInstance: any) {
 }
 
 (() => {
+    const identityCommandBuilder = _.identity;
     return yargs
         .option('contracts-dir', {
             type: 'string',
@@ -150,11 +151,11 @@ function deployCommandBuilder(yargsInstance: any) {
         })
         .command('compile',
                  'compile contracts',
-                 _.identity,
+                 identityCommandBuilder,
                  onCompileCommand)
         .command('migrate',
                  'compile and deploy contracts using migration scripts',
-                 _.identity,
+                 identityCommandBuilder,
                  onMigrateCommand)
         .command('deploy',
                  'deploy a single contract with provided arguments',

From 16179d2f8ec508388de8f057c9a79ff684c63fb0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 12:37:51 +0100
Subject: [PATCH 072/125] Fix faulty import

---
 packages/website/ts/components/order_json.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/website/ts/components/order_json.tsx b/packages/website/ts/components/order_json.tsx
index c0f9b78e70..340e5d91f9 100644
--- a/packages/website/ts/components/order_json.tsx
+++ b/packages/website/ts/components/order_json.tsx
@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
-import {Paper} from 'material-ui/Paper';
+import Paper from 'material-ui/Paper';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
 import {CopyIcon} from 'ts/components/ui/copy_icon';

From 66fe7b88b0892b5a5c7a06d66bec9035dd7782f0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 12:38:41 +0100
Subject: [PATCH 073/125] Fix overflow issue on calculated fillAmount

---
 packages/website/ts/components/fill_order.tsx | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index 044424fe0d..ac826fdf6d 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -258,22 +258,20 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
                     </div>
                 </div>
                 {!isUserMaker &&
-                    <div className="clearfix mx-auto" style={{width: 315, height: 108}}>
-                       <div className="col col-7" style={{maxWidth: 235}}>
-                           <TokenAmountInput
-                               label="Fill amount"
-                               onChange={this.onFillAmountChange.bind(this)}
-                               shouldShowIncompleteErrs={false}
-                               token={fillToken}
-                               tokenState={fillTokenState}
-                               amount={fillAssetToken.amount}
-                               shouldCheckBalance={true}
-                               shouldCheckAllowance={true}
-                           />
-                       </div>
+                    <div className="clearfix mx-auto relative" style={{width: 235, height: 108}}>
+                       <TokenAmountInput
+                           label="Fill amount"
+                           onChange={this.onFillAmountChange.bind(this)}
+                           shouldShowIncompleteErrs={false}
+                           token={fillToken}
+                           tokenState={fillTokenState}
+                           amount={fillAssetToken.amount}
+                           shouldCheckBalance={true}
+                           shouldCheckAllowance={true}
+                       />
                        <div
-                           className="col col-5 pl1"
-                           style={{color: colors.grey400, paddingTop: 39}}
+                           className="absolute sm-hide xs-hide"
+                           style={{color: colors.grey400, right: -247, top: 39, width: 242}}
                        >
                            = {accounting.formatNumber(orderReceiveAmount, 6)} {makerToken.symbol}
                        </div>

From e38c7ff0760c766b92a7d19261a3a6f480adf567 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 12:42:16 +0100
Subject: [PATCH 074/125] Fix scrolling topBar on Portal

---
 packages/website/ts/components/portal.tsx  | 2 +-
 packages/website/ts/components/top_bar.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index 521dd2b5f5..2f6f9912aa 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -151,7 +151,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
                     blockchainIsLoaded={this.props.blockchainIsLoaded}
                     location={this.props.location}
                 />
-                <div id="portal" className="mx-auto max-width-4 pt4" style={{width: '100%'}}>
+                <div id="portal" className="mx-auto max-width-4" style={{width: '100%'}}>
                     <Paper className="mb3 mt2">
                         {!configs.IS_MAINNET_ENABLED && this.props.networkId === constants.NETWORK_ID_MAINNET  ?
                             <div className="p3 center">
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx
index b731ee1735..025ed36355 100644
--- a/packages/website/ts/components/top_bar.tsx
+++ b/packages/website/ts/components/top_bar.tsx
@@ -45,7 +45,7 @@ const styles: Styles = {
         backgroundcolor: colors.white,
         height: 59,
         width: '100%',
-        position: 'fixed',
+        position: 'relative',
         top: 0,
         zIndex: 1100,
         paddingBottom: 1,

From 75f637bd756fd7d4480792ead7bd86dd8326e622 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 16:22:57 +0100
Subject: [PATCH 075/125] Throw a better error message when taker is
 null|undefined or anything but not a string

---
 packages/0x.js/src/0x.ts                      |  2 +
 .../src/contract_wrappers/exchange_wrapper.ts | 14 ++--
 packages/0x.js/src/types.ts                   |  1 +
 packages/0x.js/src/utils/constants.ts         |  1 +
 packages/0x.js/src/utils/decorators.ts        | 84 +++++++++++++++----
 packages/0x.js/test/0x.js_test.ts             |  9 ++
 6 files changed, 87 insertions(+), 24 deletions(-)

diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 41fefb9934..e4965f9a2a 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -25,6 +25,7 @@ import {
 import {AbiDecoder} from './utils/abi_decoder';
 import {assert} from './utils/assert';
 import {constants} from './utils/constants';
+import {decorators} from './utils/decorators';
 import {signatureUtils} from './utils/signature_utils';
 import {utils} from './utils/utils';
 
@@ -155,6 +156,7 @@ export class ZeroEx {
      * @param   order   An object that conforms to the Order or SignedOrder interface definitions.
      * @return  The resulting orderHash from hashing the supplied order.
      */
+    @decorators.syncZeroExErrorHandler
     public static getOrderHashHex(order: Order|SignedOrder): string {
         assert.doesConformToSchema('order', order, schemas.orderSchema);
         const orderHashHex = utils.getOrderHashHex(order);
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index df793aa06e..70d2be7e93 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -162,7 +162,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param   orderTransactionOpts                        Optional arguments this method accepts.
      * @return  Transaction hash.
      */
-    @decorators.contractCallErrorHandler
+    @decorators.asyncZeroExErrorHandler
     public async fillOrderAsync(signedOrder: SignedOrder, fillTakerTokenAmount: BigNumber,
                                 shouldThrowOnInsufficientBalanceOrAllowance: boolean,
                                 takerAddress: string,
@@ -218,7 +218,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param   orderTransactionOpts                        Optional arguments this method accepts.
      * @return  Transaction hash.
      */
-    @decorators.contractCallErrorHandler
+    @decorators.asyncZeroExErrorHandler
     public async fillOrdersUpToAsync(signedOrders: SignedOrder[], fillTakerTokenAmount: BigNumber,
                                      shouldThrowOnInsufficientBalanceOrAllowance: boolean,
                                      takerAddress: string,
@@ -299,7 +299,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param   orderTransactionOpts                            Optional arguments this method accepts.
      * @return  Transaction hash.
      */
-    @decorators.contractCallErrorHandler
+    @decorators.asyncZeroExErrorHandler
     public async batchFillOrdersAsync(orderFillRequests: OrderFillRequest[],
                                       shouldThrowOnInsufficientBalanceOrAllowance: boolean,
                                       takerAddress: string,
@@ -372,7 +372,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param   orderTransactionOpts    Optional arguments this method accepts.
      * @return  Transaction hash.
      */
-    @decorators.contractCallErrorHandler
+    @decorators.asyncZeroExErrorHandler
     public async fillOrKillOrderAsync(signedOrder: SignedOrder, fillTakerTokenAmount: BigNumber,
                                       takerAddress: string,
                                       orderTransactionOpts: OrderTransactionOpts = {}): Promise<string> {
@@ -417,7 +417,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param   orderTransactionOpts        Optional arguments this method accepts.
      * @return  Transaction hash.
      */
-    @decorators.contractCallErrorHandler
+    @decorators.asyncZeroExErrorHandler
     public async batchFillOrKillAsync(orderFillRequests: OrderFillRequest[],
                                       takerAddress: string,
                                       orderTransactionOpts: OrderTransactionOpts = {}): Promise<string> {
@@ -485,7 +485,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param   transactionOpts         Optional arguments this method accepts.
      * @return  Transaction hash.
      */
-    @decorators.contractCallErrorHandler
+    @decorators.asyncZeroExErrorHandler
     public async cancelOrderAsync(order: Order|SignedOrder,
                                   cancelTakerTokenAmount: BigNumber,
                                   orderTransactionOpts: OrderTransactionOpts = {}): Promise<string> {
@@ -526,7 +526,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param   transactionOpts             Optional arguments this method accepts.
      * @return  Transaction hash.
      */
-    @decorators.contractCallErrorHandler
+    @decorators.asyncZeroExErrorHandler
     public async batchCancelOrdersAsync(orderCancellationRequests: OrderCancellationRequest[],
                                         orderTransactionOpts: OrderTransactionOpts = {}): Promise<string> {
         assert.doesConformToSchema('orderCancellationRequests', orderCancellationRequests,
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index 844ac9ed9d..704e59ce53 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -235,6 +235,7 @@ export interface OrderFillRequest {
 }
 
 export type AsyncMethod = (...args: any[]) => Promise<any>;
+export type SyncMethod = (...args: any[]) => any;
 
 /**
  * We re-export the `Web3.Provider` type specified in the Web3 Typescript typings
diff --git a/packages/0x.js/src/utils/constants.ts b/packages/0x.js/src/utils/constants.ts
index 3de3f5bc13..6001e1c7f7 100644
--- a/packages/0x.js/src/utils/constants.ts
+++ b/packages/0x.js/src/utils/constants.ts
@@ -6,6 +6,7 @@ export const constants = {
     MAX_DIGITS_IN_UNSIGNED_256_INT: 78,
     INVALID_JUMP_PATTERN: 'invalid JUMP at',
     OUT_OF_GAS_PATTERN: 'out of gas',
+    INVALID_TAKER_FORMAT: 'instance.taker is not of a type(s) string',
     UNLIMITED_ALLOWANCE_IN_BASE_UNITS: new BigNumber(2).pow(256).minus(1),
     DEFAULT_BLOCK_POLLING_INTERVAL: 1000,
 };
diff --git a/packages/0x.js/src/utils/decorators.ts b/packages/0x.js/src/utils/decorators.ts
index 1760d88720..060a26df91 100644
--- a/packages/0x.js/src/utils/decorators.ts
+++ b/packages/0x.js/src/utils/decorators.ts
@@ -1,17 +1,37 @@
 import * as _ from 'lodash';
 
-import {AsyncMethod, ZeroExError} from '../types';
+import {AsyncMethod, SyncMethod, ZeroExError} from '../types';
 
 import {constants} from './constants';
 
-export const decorators = {
-    /**
-     * Source: https://stackoverflow.com/a/29837695/3546986
-     */
-    contractCallErrorHandler(target: object,
-                             key: string|symbol,
-                             descriptor: TypedPropertyDescriptor<AsyncMethod>,
-    ): TypedPropertyDescriptor<AsyncMethod> {
+type ErrorTransformer = (err: Error) => Error;
+
+const contractCallErrorTransformer = (error: Error) => {
+    if (_.includes(error.message, constants.INVALID_JUMP_PATTERN)) {
+        return new Error(ZeroExError.InvalidJump);
+    }
+    if (_.includes(error.message, constants.OUT_OF_GAS_PATTERN)) {
+        return new Error(ZeroExError.OutOfGas);
+    }
+    return error;
+};
+
+const schemaErrorTransformer = (error: Error) => {
+    if (_.includes(error.message, constants.INVALID_TAKER_FORMAT)) {
+        // tslint:disable-next-line:max-line-length
+        const errMsg = 'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS';
+        throw new Error(errMsg);
+    }
+    return error;
+};
+
+/**
+ * Source: https://stackoverflow.com/a/29837695/3546986
+ */
+const asyncErrorHandlerFactory = (errorTransformer: ErrorTransformer) => {
+    const asyncErrorHandlingDecorator = (
+        target: object, key: string|symbol, descriptor: TypedPropertyDescriptor<AsyncMethod>,
+    ) => {
         const originalMethod = (descriptor.value as AsyncMethod);
 
         // Do not use arrow syntax here. Use a function expression in
@@ -22,16 +42,46 @@ export const decorators = {
                 const result = await originalMethod.apply(this, args);
                 return result;
             } catch (error) {
-                if (_.includes(error.message, constants.INVALID_JUMP_PATTERN)) {
-                    throw new Error(ZeroExError.InvalidJump);
-                }
-                if (_.includes(error.message, constants.OUT_OF_GAS_PATTERN)) {
-                    throw new Error(ZeroExError.OutOfGas);
-                }
-                throw error;
+                const transformedError = errorTransformer(error);
+                throw transformedError;
             }
         };
 
         return descriptor;
-    },
+    };
+
+    return asyncErrorHandlingDecorator;
+};
+
+const syncErrorHandlerFactory = (errorTransformer: ErrorTransformer) => {
+    const syncErrorHandlingDecorator = (
+        target: object, key: string|symbol, descriptor: TypedPropertyDescriptor<SyncMethod>,
+    ) => {
+        const originalMethod = (descriptor.value as SyncMethod);
+
+        // Do not use arrow syntax here. Use a function expression in
+        // order to use the correct value of `this` in this method
+        // tslint:disable-next-line:only-arrow-functions
+        descriptor.value = function(...args: any[]) {
+            try {
+                const result = originalMethod.apply(this, args);
+                return result;
+            } catch (error) {
+                const transformedError = errorTransformer(error);
+                throw transformedError;
+            }
+        };
+
+        return descriptor;
+    };
+
+    return syncErrorHandlingDecorator;
+};
+
+// _.flow(f, g) = f ∘ g
+const zeroExErrorTransformer = _.flow(schemaErrorTransformer, contractCallErrorTransformer);
+
+export const decorators = {
+    asyncZeroExErrorHandler: asyncErrorHandlerFactory(zeroExErrorTransformer),
+    syncZeroExErrorHandler: syncErrorHandlerFactory(zeroExErrorTransformer),
 };
diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts
index 819ac12f9d..8d62b35186 100644
--- a/packages/0x.js/test/0x.js_test.ts
+++ b/packages/0x.js/test/0x.js_test.ts
@@ -152,6 +152,15 @@ describe('ZeroEx library', () => {
             const orderHash = ZeroEx.getOrderHashHex(order);
             expect(orderHash).to.be.equal(expectedOrderHash);
         });
+        it('throws a readable error message if taker format is invalid', async () => {
+            const orderWithInvalidtakerFormat = {
+                ...order,
+                taker: null as any as string,
+            };
+            // tslint:disable-next-line:max-line-length
+            const expectedErrorMessage = 'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS';
+            expect(() => ZeroEx.getOrderHashHex(orderWithInvalidtakerFormat)).to.throw(expectedErrorMessage);
+        });
     });
     describe('#signOrderHashAsync', () => {
         let stubs: Sinon.SinonStub[] = [];

From 93518802d6d5baf76c8c66e825eddd4241d4fa7c Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 16:26:05 +0100
Subject: [PATCH 076/125] Update CHANGELOG

---
 packages/0x.js/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 962d312d30..c69edd88c8 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -6,6 +6,7 @@ v0.x.x - _TBD, 2017_
     * Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry` (#267)
     * Removed `etherTokenContractAddress` from `ZeroEx` constructor arg `ZeroExConfig` (#267)
     * Rename `SubscriptionOpts` to `BlockRange` (#272)
+    * Improve the error message when taker is not a string (#278)
 
 v0.27.1 - _November 28, 2017_
 ------------------------

From 8a940a800aa6f042f7932df6de83148c3cc3f268 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 18:06:41 +0100
Subject: [PATCH 077/125] Remove re-assignment

---
 packages/website/ts/pages/about/about.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index c2f291425d..e9e876f45b 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -9,8 +9,6 @@ import {colors} from 'ts/utils/colors';
 import {constants} from 'ts/utils/constants';
 import {utils} from 'ts/utils/utils';
 
-const DARKEST_GRAY = colors.darkestGrey;
-
 const teamRow1: ProfileInfo[] = [
     {
         name: 'Will Warren',
@@ -143,6 +141,12 @@ const styles: Styles = {
         color: 'black',
         paddingTop: 110,
     },
+    weAreHiring: {
+        fontSize: 30,
+        color: colors.darkestGrey,
+        fontFamily: 'Roboto Mono',
+        letterSpacing: 7.5,
+    },
 };
 
 export class About extends React.Component<AboutProps, AboutState> {
@@ -174,7 +178,7 @@ export class About extends React.Component<AboutProps, AboutState> {
                         </div>
                         <div
                             className="pt3"
-                            style={{fontSize: 17, color: DARKEST_GRAY, lineHeight: 1.5}}
+                            style={{fontSize: 17, color: colors.darkestGrey, lineHeight: 1.5}}
                         >
                             Our team is a diverse and globally distributed group with backgrounds
                             in engineering, research, business and design. We are passionate about
@@ -204,13 +208,13 @@ export class About extends React.Component<AboutProps, AboutState> {
                     <div className="mx-auto py4 sm-px3" style={{maxWidth: 308}}>
                         <div
                             className="pb2"
-                            style={{fontSize: 30, color: DARKEST_GRAY, fontFamily: 'Roboto Mono', letterSpacing: 7.5}}
+                            style={styles.weAreHiring}
                         >
                             WE'RE HIRING
                         </div>
                         <div
                             className="pb4 mb4"
-                            style={{fontSize: 16, color: DARKEST_GRAY, lineHeight: 1.5, letterSpacing: '0.5px'}}
+                            style={{fontSize: 16, color: colors.darkestGrey, lineHeight: 1.5, letterSpacing: '0.5px'}}
                         >
                             We are seeking outstanding candidates to{' '}
                             <a

From 3c66f18a46ae297181bdc82023a8e8bd895eebe1 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 18:39:35 +0100
Subject: [PATCH 078/125] Don't throw in transformers

---
 packages/0x.js/src/utils/decorators.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/0x.js/src/utils/decorators.ts b/packages/0x.js/src/utils/decorators.ts
index 060a26df91..2a823b9ac8 100644
--- a/packages/0x.js/src/utils/decorators.ts
+++ b/packages/0x.js/src/utils/decorators.ts
@@ -20,7 +20,7 @@ const schemaErrorTransformer = (error: Error) => {
     if (_.includes(error.message, constants.INVALID_TAKER_FORMAT)) {
         // tslint:disable-next-line:max-line-length
         const errMsg = 'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS';
-        throw new Error(errMsg);
+        return new Error(errMsg);
     }
     return error;
 };

From ca2bb60877dbefc2e4ed07f2a437cfc89538e133 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 19 Dec 2017 12:55:48 -0500
Subject: [PATCH 079/125] Update readmes for connect, kovan-facuets, types, and
 utils packages

---
 packages/connect/README.md       | 50 +++++++++++++++++++++++++++++++
 packages/kovan-faucets/README.md | 48 ++++++++++++++++++++++--------
 packages/types/README.md         | 51 ++++++++++++++++++++++++++++++--
 packages/utils/README.md         | 50 +++++++++++++++++++++++++++++--
 4 files changed, 181 insertions(+), 18 deletions(-)

diff --git a/packages/connect/README.md b/packages/connect/README.md
index 9000455267..b6a16a16ca 100644
--- a/packages/connect/README.md
+++ b/packages/connect/README.md
@@ -1 +1,51 @@
+@0xproject/connect
+------
+
 This repository contains a Javascript library that makes it easy to interact with Relayers that conform to the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api)
+
+## Installation
+
+```bash
+yarn add @0xproject/connect
+```
+
+## Usage
+
+* [Docs](https://0xproject.com/docs/connect)
+* [Tutorials](https://0xproject.com/wiki#connect)
+
+## Contributing
+
+We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. 
+
+[CONTRIBUTING.md](../../CONTRIBUTING.md)
+
+### Install Dependencies
+
+If you don't have yarn workspaces enabled - enable them:
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+```bash
+yarn install
+```
+
+### Build
+
+```bash
+yarn build
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run Tests
+
+```bash
+yarn test
+```
diff --git a/packages/kovan-faucets/README.md b/packages/kovan-faucets/README.md
index 8903440e3d..70600fc9c3 100644
--- a/packages/kovan-faucets/README.md
+++ b/packages/kovan-faucets/README.md
@@ -1,22 +1,35 @@
-Test Ether Faucet
-----------------------
+@0xproject/kovan_faucets
+------
 
 This faucet dispenses 0.1 test ether to one recipient per second. It has a max queue size of 1000.
 
+## Installation
 
-## Install
+This is a private package and therefore is not published to npm. In order to build and run this package locally, see the [Install Dependencies](#Install-Dependencies) section and onwards below.
 
-Install project dependencies:
+## Contributing
 
-```
-npm install
+We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. 
+
+[CONTRIBUTING.md](../../CONTRIBUTING.md)
+
+### Install Dependencies
+
+If you don't have yarn workspaces enabled - enable them:
+```bash
+yarn config set workspaces-experimental true
 ```
 
-## Start
+Then install dependencies
+```bash
+yarn install
+```
+
+### Start
 
 Set the following environment variables:
 
-```
+```bash
 export FAUCET_ENVIRONMENT=development
 export DISPENSER_ADDRESS=0x5409ed021d9299bf6814279a6a1411a7e866a631
 export DISPENSER_PRIVATE_KEY=f2f48ee19680706196e2e339e5da3491186e0c4c5030670656b0e0164837257d
@@ -28,11 +41,11 @@ Infura API Key can be requested here: https://infura.io/register.html
 
 Note: The above public/private keys exist when running `testrpc` with the following option `--mnemonic concert load couple harbor equip island argue ramp clarify fence smart topic`.
 
-```
-npm run dev
+```bash
+yarn dev
 ```
 
-## Endpoints
+### Endpoints
 
 ```GET /ether/:recipient```
 
@@ -42,7 +55,6 @@ Where recipient_address is a hex encoded Ethereum address prefixed with `0x`.
 
 Where recipient_address is a hex encoded Ethereum address prefixed with `0x`.
 
-
 ```javascript
 {
     "full": false,
@@ -50,7 +62,7 @@ Where recipient_address is a hex encoded Ethereum address prefixed with `0x`.
 }
 ```
 
-## Docker configs
+### Docker configs
 
 ```
 docker run -d \
@@ -64,3 +76,13 @@ docker run -d \
 -e FAUCET_ENVIRONMENT=production \
 kovan-faucets
 ```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run Tests
+
+N/A
diff --git a/packages/types/README.md b/packages/types/README.md
index d4d48b1fe5..3352128a3d 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -1,10 +1,55 @@
-0x types
+@0xproject/types
 ------
 
-TS types shared across 0x projects and packages
+Typescript types shared across 0x projects and packages
 
-## Install
+## Installation
 
 ```bash
 yarn add -D @0xproject/types
 ```
+
+## Usage
+
+```javascript
+import {
+    TransactionReceipt, 
+    TxData,
+    TxDataPayable,
+} from '@0xproject/types';
+```
+
+
+## Contributing
+
+We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. 
+
+[CONTRIBUTING.md](../../CONTRIBUTING.md)
+
+### Install Dependencies
+
+If you don't have yarn workspaces enabled - enable them:
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+```bash
+yarn install
+```
+
+### Build
+
+```bash
+yarn build
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run Tests
+
+N/A
diff --git a/packages/utils/README.md b/packages/utils/README.md
index 5191e03500..c80c6baf5c 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -1,10 +1,56 @@
-utils
+@0xproject/utils
 ------
 
 Utils to be shared across 0x projects and packages
 
-## Install
+## Installation
 
 ```bash
 yarn add @0xproject/utils
 ```
+
+## Usage
+
+```javascript
+import {
+    addressUtils, 
+    bigNumberConfigs,
+    classUtils,
+    intervalUtils,
+    promisify,
+} from '@0xproject/utils';
+```
+
+## Contributing
+
+We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. 
+
+[CONTRIBUTING.md](../../CONTRIBUTING.md)
+
+### Install Dependencies
+
+If you don't have yarn workspaces enabled - enable them:
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+```bash
+yarn install
+```
+
+### Build
+
+```bash
+yarn build
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run Tests
+
+N/A

From 766824120ab9e36e5c396725fa6bc5b666c43fbc Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Tue, 19 Dec 2017 15:03:42 -0600
Subject: [PATCH 080/125] Remove reliance on testrpc snapshot in ZRX tests

---
 packages/contracts/test/ts/zrx_token.ts | 38 ++++++++++++-------------
 yarn.lock                               |  4 ---
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/packages/contracts/test/ts/zrx_token.ts b/packages/contracts/test/ts/zrx_token.ts
index 6312056b2e..89e3c3ae27 100644
--- a/packages/contracts/test/ts/zrx_token.ts
+++ b/packages/contracts/test/ts/zrx_token.ts
@@ -29,8 +29,8 @@ contract('ZRXToken', (accounts: string[]) => {
             exchangeContractAddress: Exchange.address,
             networkId: constants.TESTRPC_NETWORK_ID,
         });
-        zrxAddress = zeroEx.exchange.getZRXTokenAddress();
-        zrx = await ZRXToken.at(zrxAddress);
+        zrx = await ZRXToken.new();
+        zrxAddress = zrx.address;
         MAX_UINT = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
     });
 
@@ -94,15 +94,12 @@ contract('ZRXToken', (accounts: string[]) => {
         it('should return false if owner has insufficient balance', async () => {
             const ownerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
             const amountToTransfer = ownerBalance.plus(1);
-            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer,
-                                                              {gasLimit: constants.MAX_TOKEN_APPROVE_GAS});
+            const txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_APPROVE_GAS,
+            });
             await zeroEx.awaitTransactionMinedAsync(txHash);
             const didReturnTrue = await zrx.transferFrom.call(owner, spender, amountToTransfer, {from: spender});
             expect(didReturnTrue).to.be.false();
-            // Reset allowance
-            txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, new BigNumber(0),
-                                                          {gasLimit: constants.MAX_TOKEN_APPROVE_GAS});
-            await zeroEx.awaitTransactionMinedAsync(txHash);
         });
 
         it('should return false if spender has insufficient allowance', async () => {
@@ -127,17 +124,17 @@ contract('ZRXToken', (accounts: string[]) => {
             const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
             const amountToTransfer = initOwnerBalance;
             const initSpenderAllowance = MAX_UINT;
-            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, initSpenderAllowance);
+            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, initSpenderAllowance, {
+                gasLimit: constants.MAX_TOKEN_APPROVE_GAS,
+            });
             await zeroEx.awaitTransactionMinedAsync(txHash);
-            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer,
-                                                          {gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS});
+            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
             await zeroEx.awaitTransactionMinedAsync(txHash);
 
             const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
             expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
-            // Restore balance
-            txHash = await zeroEx.token.transferAsync(zrxAddress, spender, owner, amountToTransfer);
-            await zeroEx.awaitTransactionMinedAsync(txHash);
         });
 
         it('should transfer the correct balances if spender has sufficient allowance', async () => {
@@ -147,8 +144,9 @@ contract('ZRXToken', (accounts: string[]) => {
             const initSpenderAllowance = initOwnerBalance;
             let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, initSpenderAllowance);
             await zeroEx.awaitTransactionMinedAsync(txHash);
-            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer,
-                                                          {gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS});
+            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
             await zeroEx.awaitTransactionMinedAsync(txHash);
 
             const newOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
@@ -161,11 +159,11 @@ contract('ZRXToken', (accounts: string[]) => {
         it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
             const initOwnerBalance = await zeroEx.token.getBalanceAsync(zrxAddress, owner);
             const amountToTransfer = initOwnerBalance;
-            const initSpenderAllowance = initOwnerBalance;
-            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, initSpenderAllowance);
+            let txHash = await zeroEx.token.setAllowanceAsync(zrxAddress, owner, spender, amountToTransfer);
             await zeroEx.awaitTransactionMinedAsync(txHash);
-            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer,
-                                                          {gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS});
+            txHash = await zeroEx.token.transferFromAsync(zrxAddress, owner, spender, spender, amountToTransfer, {
+                gasLimit: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+            });
             await zeroEx.awaitTransactionMinedAsync(txHash);
 
             const newSpenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender);
diff --git a/yarn.lock b/yarn.lock
index b61c2f6070..8b87e1fa44 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -270,10 +270,6 @@
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-10.0.0.tgz#b93aa88155fe5106cddf3f934517411ca2a45939"
 
-"@types/yargs@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-8.0.2.tgz#0f9c7b236e2d78cd8f4b6502de15d0728aa29385"
-
 JSONStream@^1.0.4:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"

From 08f2406ca2f41655ab147d91fd9f75f3643ebc27 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 23:04:08 +0100
Subject: [PATCH 081/125] Fix merge

---
 .../ts/components/dialogs/eth_weth_conversion_dialog.tsx  | 4 ++--
 packages/website/ts/components/eth_wrappers.tsx           | 8 ++++----
 packages/website/ts/components/portal.tsx                 | 2 +-
 packages/website/ts/utils/constants.ts                    | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index 25ded40e94..700255163c 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -109,11 +109,11 @@ export class EthWethConversionDialog extends
                             style={{fontSize: 12}}
                         >
                             <div className="left">1 ETH = 1 WETH</div>
-                            {this.props.direction === Side.receive &&
+                            {this.props.direction === Side.Receive &&
                                 <div
                                     className="right"
                                     onClick={this.onMaxClick.bind(this)}
-                                    style={{color: DARK_BLUE, textDecoration: 'underline', cursor: 'pointer'}}
+                                    style={{color: colors.darkBlue, textDecoration: 'underline', cursor: 'pointer'}}
                                 >
                                     Max
                                 </div>
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index da95aa6fd6..bdd4664e8d 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -88,9 +88,9 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
         const wethBalance = ZeroEx.toUnitAmount(etherTokenState.balance, constants.DECIMAL_PLACES_ETH);
         const isBidirectional = true;
         const etherscanUrl = utils.getEtherScanLinkIfExists(
-            etherToken.address, this.props.networkId, EtherscanLinkSuffixes.address,
+            etherToken.address, this.props.networkId, EtherscanLinkSuffixes.Address,
         );
-        const tokenLabel = this.renderToken('Wrapped Ether', etherToken.address, constants.iconUrlBySymbol.WETH);
+        const tokenLabel = this.renderToken('Wrapped Ether', etherToken.address, configs.ICON_URL_BY_SYMBOL.WETH);
         return (
             <div className="clearfix lg-px4 md-px4 sm-px2" style={{minHeight: 600}}>
                 <div className="relative">
@@ -98,7 +98,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                     <div className="absolute" style={{top: 0, right: 0}}>
                         <a
                             target="_blank"
-                            href={constants.WETH_IO_URL}
+                            href={constants.URL_WETH_IO}
                             style={{color: colors.grey}}
                         >
                             <div className="flex">
@@ -273,7 +273,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
                 this, outdatedWETHIfExists.address,
             );
             const etherscanUrl = utils.getEtherScanLinkIfExists(
-                outdatedWETHIfExists.address, this.props.networkId, EtherscanLinkSuffixes.address,
+                outdatedWETHIfExists.address, this.props.networkId, EtherscanLinkSuffixes.Address,
             );
             const tokenLabel = this.renderToken(dateRange, outdatedEtherToken.address, OUTDATED_WETH_ICON_PATH);
             return (
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index 08028d15e8..939dae6f70 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -330,7 +330,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
         });
     }
     private onWethNoticeAccepted() {
-        localStorage.setItem(constants.DISMISS_WETH_NOTICE_LOCAL_STORAGE_KEY, 'set');
+        localStorage.setItem(constants.LOCAL_STORAGE_KEY_DISMISS_WETH_NOTICE, 'set');
         this.setState({
             isWethNoticeDialogOpen: false,
         });
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index e6b51c4521..761d00ef7e 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -82,5 +82,6 @@ export const constants = {
         'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L123',
     URL_WEB3_LOG_ENTRY_EVENT: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L127',
     URL_WEB3_PROVIDER_DOCS: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L150',
+    URL_WETH_IO: 'https://weth.io/',
     URL_ZEROEX_CHAT: 'https://chat.0xproject.com',
 };

From 0dc517808334e83fa07ed08aef859d598ad4c91e Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 23:24:04 +0100
Subject: [PATCH 082/125] Update new WETH addresses and localStorage clearance
 key

---
 packages/website/ts/utils/configs.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index b66348416e..69be5d0821 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -95,12 +95,12 @@ export const configs = {
     } as {[symbol: string]: string},
     IS_MAINNET_ENABLED: true,
     LAST_LOCAL_STORAGE_FILL_CLEARANCE_DATE: '2017-11-22',
-    LAST_LOCAL_STORAGE_TRACKED_TOKEN_CLEARANCE_DATE: '2017-12-13',
+    LAST_LOCAL_STORAGE_TRACKED_TOKEN_CLEARANCE_DATE: '2017-12-19',
     // NEW_WRAPPED_ETHERS is temporary until we remove the SHOULD_DEPRECATE_OLD_WETH_TOKEN flag
     // and add the new WETHs to the tokenRegistry
     NEW_WRAPPED_ETHERS: {
-        1: '0xe495bcacaf29a0eb00fb67b86e9cd2a994dd55d8',
-        42: '0x739e78d6bebbdf24105a5145fa04436589d1cbd9',
+        1: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+        42: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
     } as {[networkId: string]: string},
     OUTDATED_WRAPPED_ETHERS: [
         {

From 484312e677d1f1f1b280cdada92acddf5effd525 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 19 Dec 2017 23:28:18 +0100
Subject: [PATCH 083/125] Remove etherToken from smart contract docs

---
 .../website/ts/containers/smart_contracts_documentation.tsx    | 3 ---
 packages/website/ts/types.ts                                   | 1 -
 packages/website/ts/utils/configs.ts                           | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/packages/website/ts/containers/smart_contracts_documentation.tsx b/packages/website/ts/containers/smart_contracts_documentation.tsx
index e32abaea90..34092748b1 100644
--- a/packages/website/ts/containers/smart_contracts_documentation.tsx
+++ b/packages/website/ts/containers/smart_contracts_documentation.tsx
@@ -29,7 +29,6 @@ const docsInfoConfig: DocsInfoConfig = {
             Sections.Exchange,
             Sections.TokenRegistry,
             Sections.ZRXToken,
-            Sections.EtherToken,
             Sections.TokenTransferProxy,
         ],
     },
@@ -42,13 +41,11 @@ const docsInfoConfig: DocsInfoConfig = {
         TokenTransferProxy: Sections.TokenTransferProxy,
         TokenRegistry: Sections.TokenRegistry,
         ZRXToken: Sections.ZRXToken,
-        EtherToken: Sections.EtherToken,
     },
     visibleConstructors: [
         Sections.Exchange,
         Sections.TokenRegistry,
         Sections.ZRXToken,
-        Sections.EtherToken,
         Sections.TokenTransferProxy,
     ],
     convertToDocAgnosticFormatFn: doxityUtils.convertToDocAgnosticFormat.bind(doxityUtils),
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index be8aea8325..e4b05367fb 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -669,7 +669,6 @@ export enum SmartContractDocSections {
     TokenTransferProxy = 'TokenTransferProxy',
     TokenRegistry = 'TokenRegistry',
     ZRXToken = 'ZRXToken',
-    EtherToken = 'EtherToken',
 }
 
 // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index 69be5d0821..4ae40d7154 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -26,21 +26,18 @@ export const configs = {
                 [SmartContractDocSections.Exchange]: '0x12459c951127e0c374ff9105dda097662a027093',
                 [SmartContractDocSections.TokenTransferProxy]: '0x8da0d80f5007ef1e431dd2127178d224e32c2ef4',
                 [SmartContractDocSections.ZRXToken]: '0xe41d2489571d322189246dafa5ebde1f4699f498',
-                [SmartContractDocSections.EtherToken]: '0x2956356cd2a2bf3202f771f50d3d14a367b48070',
                 [SmartContractDocSections.TokenRegistry]: '0x926a74c5c36adf004c87399e65f75628b0f98d2c',
             },
             [Networks.ropsten]: {
                 [SmartContractDocSections.Exchange]: '0x479cc461fecd078f766ecc58533d6f69580cf3ac',
                 [SmartContractDocSections.TokenTransferProxy]: '0x4e9aad8184de8833365fea970cd9149372fdf1e6',
                 [SmartContractDocSections.ZRXToken]: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
-                [SmartContractDocSections.EtherToken]: '0xc00fd9820cd2898cc4c054b7bf142de637ad129a',
                 [SmartContractDocSections.TokenRegistry]: '0x6b1a50f0bb5a7995444bd3877b22dc89c62843ed',
             },
             [Networks.kovan]: {
                 [SmartContractDocSections.Exchange]: '0x90fe2af704b34e0224bf2299c838e04d4dcf1364',
                 [SmartContractDocSections.TokenTransferProxy]: '0x087Eed4Bc1ee3DE49BeFbd66C662B434B15d49d4',
                 [SmartContractDocSections.ZRXToken]: '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570',
-                [SmartContractDocSections.EtherToken]: '0x05d090b51c40b020eab3bfcb6a2dff130df22e9c',
                 [SmartContractDocSections.TokenRegistry]: '0xf18e504561f4347bea557f3d4558f559dddbae7f',
             },
         },

From f239522a19b046b2eb3e6961ac2829dfa5d611e8 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Tue, 19 Dec 2017 17:50:54 -0500
Subject: [PATCH 084/125] Update some wording and remove N/A test sections

---
 packages/connect/README.md       |  4 ++--
 packages/kovan-faucets/README.md | 17 +++--------------
 packages/types/README.md         |  8 ++------
 packages/utils/README.md         |  8 ++------
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/packages/connect/README.md b/packages/connect/README.md
index b6a16a16ca..4326ba158b 100644
--- a/packages/connect/README.md
+++ b/packages/connect/README.md
@@ -16,9 +16,9 @@ yarn add @0xproject/connect
 
 ## Contributing
 
-We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. 
+We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[CONTRIBUTING.md](../../CONTRIBUTING.md)
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
diff --git a/packages/kovan-faucets/README.md b/packages/kovan-faucets/README.md
index 70600fc9c3..7c4177b9f0 100644
--- a/packages/kovan-faucets/README.md
+++ b/packages/kovan-faucets/README.md
@@ -1,7 +1,7 @@
 @0xproject/kovan_faucets
 ------
 
-This faucet dispenses 0.1 test ether to one recipient per second. It has a max queue size of 1000.
+This faucet dispenses 0.1 test ether to one recipient per second and 0.1 test ZRX every 5 seconds. It has a max queue size of 1000.
 
 ## Installation
 
@@ -9,9 +9,9 @@ This is a private package and therefore is not published to npm. In order to bui
 
 ## Contributing
 
-We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. 
+We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[CONTRIBUTING.md](../../CONTRIBUTING.md)
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
@@ -55,13 +55,6 @@ Where recipient_address is a hex encoded Ethereum address prefixed with `0x`.
 
 Where recipient_address is a hex encoded Ethereum address prefixed with `0x`.
 
-```javascript
-{
-    "full": false,
-    "size": 0
-}
-```
-
 ### Docker configs
 
 ```
@@ -82,7 +75,3 @@ kovan-faucets
 ```bash
 yarn lint
 ```
-
-### Run Tests
-
-N/A
diff --git a/packages/types/README.md b/packages/types/README.md
index 3352128a3d..eb27ce9679 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -22,9 +22,9 @@ import {
 
 ## Contributing
 
-We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. 
+We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[CONTRIBUTING.md](../../CONTRIBUTING.md)
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
@@ -49,7 +49,3 @@ yarn build
 ```bash
 yarn lint
 ```
-
-### Run Tests
-
-N/A
diff --git a/packages/utils/README.md b/packages/utils/README.md
index c80c6baf5c..39b6eab46b 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -23,9 +23,9 @@ import {
 
 ## Contributing
 
-We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. 
+We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[CONTRIBUTING.md](../../CONTRIBUTING.md)
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
@@ -50,7 +50,3 @@ yarn build
 ```bash
 yarn lint
 ```
-
-### Run Tests
-
-N/A

From 3d6c0b75a1583838873c04b03a5f410804960220 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 01:47:03 +0100
Subject: [PATCH 085/125] Improve package descriptions

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 904dcb604b..cf12280b87 100644
--- a/README.md
+++ b/README.md
@@ -22,21 +22,21 @@ This repository contains all the 0x developer tools written in TypeScript. Our h
 | Package | Version | Description |
 |---------|---------|-------------|
 | [`0x.js`](/packages/0x.js) | [![npm](https://img.shields.io/npm/v/0x.js.svg)](https://www.npmjs.com/package/0x.js) | A Javascript library for interacting with the 0x protocol |
-| [`@0xproject/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg)](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS code from ABI |
-| [`@0xproject/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg)](https://www.npmjs.com/package/@0xproject/assert) | Standard type and schema assertions |
+| [`@0xproject/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg)](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS wrappers from smart contract ABIs |
+| [`@0xproject/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg)](https://www.npmjs.com/package/@0xproject/assert) | Type and schema assertions used by our packages |
 | [`@0xproject/connect`](/packages/connect) | [![npm](https://img.shields.io/npm/v/@0xproject/connect.svg)](https://www.npmjs.com/package/@0xproject/connect) | A Javascript library for interacting with the standard relayer api |
 | [`@0xproject/json-schemas`](/packages/json-schemas) | [![npm](https://img.shields.io/npm/v/@0xproject/json-schemas.svg)](https://www.npmjs.com/package/@0xproject/json-schemas) | 0x-related json schemas |
-| [`@0xproject/subproviders`](/packages/subproviders) | [![npm](https://img.shields.io/npm/v/@0xproject/subproviders.svg)](https://www.npmjs.com/package/@0xproject/subproviders) | Web3 subproviders |
-| [`@0xproject/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0xproject/tslint-config.svg)](https://www.npmjs.com/package/@0xproject/tslint-config) | Custom 0x project TSLint rules |
-| [`@0xproject/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0xproject/types.svg)](https://www.npmjs.com/package/@0xproject/types) | Shared types |
-| [`@0xproject/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0xproject/utils.svg)](https://www.npmjs.com/package/@0xproject/utils) | Shared utils |
+| [`@0xproject/subproviders`](/packages/subproviders) | [![npm](https://img.shields.io/npm/v/@0xproject/subproviders.svg)](https://www.npmjs.com/package/@0xproject/subproviders) | Useful web3 subproviders (e.g LedgerSubprovider) |
+| [`@0xproject/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0xproject/tslint-config.svg)](https://www.npmjs.com/package/@0xproject/tslint-config) | Custom 0x development TSLint rules |
+| [`@0xproject/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0xproject/types.svg)](https://www.npmjs.com/package/@0xproject/types) | Shared type declarations |
+| [`@0xproject/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0xproject/utils.svg)](https://www.npmjs.com/package/@0xproject/utils) | Shared utilities |
 | [`@0xproject/web3-wrapper`](/packages/web3-wrapper) | [![npm](https://img.shields.io/npm/v/@0xproject/web3-wrapper.svg)](https://www.npmjs.com/package/@0xproject/web3-wrapper) | Web3 wrapper |
 
 ### Private Packages
 
 | Package | Description |
 |---------|-------------|
-| [`@0xproject/contracts`](/packages/contracts) | Smart contracts |
+| [`@0xproject/contracts`](/packages/contracts) | 0x solidity smart contracts & tests |
 | [`@0xproject/kovan_faucets`](/packages/kovan-faucets) | A faucet micro-service that dispenses test ERC20 tokens or Ether |
 | [`@0xproject/monorepo-scripts`](/packages/monorepo-scripts) | Shared monorepo scripts |
-| [`@0xproject/website`](/packages/website) | 0x website |
+| [`@0xproject/website`](/packages/website) | 0x website & Portal DApp |

From b799a8a108646fc097595291b4697976f6a0d25c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 02:14:44 +0100
Subject: [PATCH 086/125] Flesh out main repo README

---
 README.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/README.md b/README.md
index cf12280b87..bd24d3c3fe 100644
--- a/README.md
+++ b/README.md
@@ -40,3 +40,65 @@ This repository contains all the 0x developer tools written in TypeScript. Our h
 | [`@0xproject/kovan_faucets`](/packages/kovan-faucets) | A faucet micro-service that dispenses test ERC20 tokens or Ether |
 | [`@0xproject/monorepo-scripts`](/packages/monorepo-scripts) | Shared monorepo scripts |
 | [`@0xproject/website`](/packages/website) | 0x website & Portal DApp |
+
+## Usage
+
+Dedicated documentation pages:
+- [0x.js Library](https://0xproject.com/docs/0xjs)
+- [0x Connect](https://0xproject.com/docs/connect)
+- [Smart contracts](https://0xproject.com/docs/contracts)
+- [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md)
+
+## Contributing
+
+We strongly encourage the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install dependencies
+
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+```bash
+yarn install
+```
+
+### Build
+
+Build all packages
+
+```bash
+yarn lerna:run build
+```
+
+### Lint
+
+Lint all packages
+```bash
+yarn lerna:run lint
+```
+
+### Run Tests
+
+Before running the tests, you will need to spin up a [TestRPC](https://www.npmjs.com/package/ethereumjs-testrpc) instance and deploy all the 0x smart contracts.
+
+In a separate terminal, start TestRPC (a convenience command is provided as part of this repo)
+```bash
+yarn testrpc
+```
+
+Then in your main terminal run
+```
+cd packages/contracts
+yarn run migrate
+cd ..
+```
+
+And finally from the root project directory run
+```bash
+yarn lerna:run test
+```

From 53798302da8dd42bd28817bc159d235a291497a5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 02:24:17 +0100
Subject: [PATCH 087/125] Improve subproviders readme

---
 packages/subproviders/README.md | 58 +++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 6 deletions(-)

diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 5fa31611a0..73d61df42e 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -1,15 +1,23 @@
-Subproviders
------------
+@0xproject/subproviders
+--------
 
-A few useful subproviders.
+A few useful web3 subproviders including a LedgerSubprovider useful for adding Ledger Nano S support.
 
 ## Installation
 
 ```
-npm install @0xproject/subproviders --save
+yarn add @0xproject/subproviders
 ```
 
-## Subproviders
+## Usage
+
+Simply import the subprovider you are interested in using:
+
+```javascript
+import {LedgerSubprovider} from '@0xproject/subproviders';
+```
+
+### Subproviders
 
 #### Ledger Nano S subprovider
 
@@ -23,7 +31,39 @@ A subprovider which attempts to send an RPC call to a list of RPC endpoints sequ
 
 A subprovider that relays all signing related requests to a particular provider (in our case the provider injected onto the web page), while sending all other requests to a different provider (perhaps your own backing Ethereum node or Infura).
 
-### Integration tests
+## Contributing
+
+We strongly encourage the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install Dependencies
+
+```bash
+yarn install
+```
+
+### Build
+
+```bash
+yarn build
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run tests
+
+#### Unit tests
+
+```bash
+yarn run test:unit
+```
+
+#### Integration tests
 
 In order to run the integration tests, make sure you have a Ledger Nano S available.
 
@@ -37,3 +77,9 @@ Then run:
 ```
 yarn test:integration
 ```
+
+#### All tests
+
+```bash
+yarn run test:all
+```

From c75eaca5b676d42e1c0ada765a7ff8369c728ff9 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 02:37:02 +0100
Subject: [PATCH 088/125] Add clean instructions

---
 packages/subproviders/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 73d61df42e..2d7483b165 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -49,6 +49,12 @@ yarn install
 yarn build
 ```
 
+### Clean
+
+```bash
+yarn clean
+```
+
 ### Lint
 
 ```bash

From 5d240222093dafd9c9d2db24e66668b4214c1b8e Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 02:37:14 +0100
Subject: [PATCH 089/125] Add mono repo scripts README

---
 packages/monorepo-scripts/README.md | 51 +++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 packages/monorepo-scripts/README.md

diff --git a/packages/monorepo-scripts/README.md b/packages/monorepo-scripts/README.md
new file mode 100644
index 0000000000..d2299b70db
--- /dev/null
+++ b/packages/monorepo-scripts/README.md
@@ -0,0 +1,51 @@
+Mono repo scripts
+------
+
+This repository contains a few helpful scripts for working with this mono repo.
+
+## Usage
+
+#### Dependency versions
+In order to reduce the size of this repo, we try and use the same versions of dependencies between packages. To make it easier to discover version discrepancies between packages, you can run:
+
+```bash
+yarn deps_versions
+```
+
+This will list out any dependencies that differ in versions between packages.
+
+## Contributing
+
+We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install Dependencies
+
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+```bash
+yarn install
+```
+
+### Build
+
+```bash
+yarn build
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
+### Lint
+
+```bash
+yarn lint
+```

From dd39fadce7917d946f1d56ed19defaa2d68e26a5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 02:49:36 +0100
Subject: [PATCH 090/125] Update and improve website README

---
 packages/website/README.md | 66 ++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/packages/website/README.md b/packages/website/README.md
index 40df07cb71..53cdbd8d35 100644
--- a/packages/website/README.md
+++ b/packages/website/README.md
@@ -1,8 +1,5 @@
-<img src="https://github.com/0xProject/branding/blob/master/0x_Black_CMYK.png" width="200px" >
-
----
-
-[0x][website-url] is an open protocol that facilitates trustless, low friction exchange of Ethereum-based assets. A full description of the protocol may be found in our [whitepaper][whitepaper-url].
+Website & 0x Portal DApp
+-----
 
 This repository contains our website and [0x Portal DApp][portal-url] (over-the-counter exchange), facilitating trustless over-the-counter trading of Ethereum-based tokens using 0x protocol.
 
@@ -10,51 +7,58 @@ This repository contains our website and [0x Portal DApp][portal-url] (over-the-
 [whitepaper-url]: https://0xproject.com/pdfs/0x_white_paper.pdf
 [portal-url]: https://0xproject.com/portal
 
-[![Join the chat at https://gitter.im/0xProject/contracts](https://badges.gitter.im/0xProject/contracts.svg)](https://gitter.im/0xProject/contracts?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-### Local Dev Setup
+## Local Dev Setup
 
 Requires Node version 6.9.5 or higher.
 
 Add the following to your `/etc/hosts` file:
 
 ```
-127.0.0.1 0xproject.dev
+127.0.0.1 0xproject.localhost
 ```
 
-Clone the [0x contracts repo](https://github.com/0xProject/contracts) into the same parent directory as this project.
+### Install dependencies:
 
-Install [yarn](https://yarnpkg.com/lang/en/docs/install/) in order to install the project dependencies more deterministically.
-
-Install dependencies:
-
-```
-yarn
+```bash
+yarn install
 ```
 
-Import smart contract artifacts from `contracts` repo:
+### Run dev server
 
-```
-yarn run update_contracts
-```
-
-Start dev server:
-
-```
+```bash
 yarn run dev
 ```
 
-Visit [0xproject.dev:3572](http://0xproject.dev:3572) in your browser.
+Visit [0xproject.localhost:3572](http://0xproject.localhost:3572) in your browser.
 
+### Build
+
+```bash
+yarn build
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Resources
+
+##### Toolkit
+
+- [Material Design Icon Font](http://zavoloklom.github.io/material-design-iconic-font/icons.html#directional)
+- [BassCSS toolkit](http://basscss.com/)
+- [Material-UI component library](http://www.material-ui.com/#/)
 
 ##### Recommended Atom packages:
 
 - [atom-typescript](https://atom.io/packages/atom-typescript)
 - [linter-tslint](https://atom.io/packages/linter-tslint)
-
-##### Resources
-
-- [Material Design Icon Font](http://zavoloklom.github.io/material-design-iconic-font/icons.html#directional)
-- [BassCSS toolkit](http://basscss.com/)
-- [Material-UI](http://www.material-ui.com/#/)

From 0be4e1e1b3a545b56aedc5c1052b260fb4035981 Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Wed, 20 Dec 2017 01:11:58 -0500
Subject: [PATCH 091/125] Fix wording

---
 packages/connect/README.md       | 4 ++--
 packages/kovan-faucets/README.md | 4 ++--
 packages/types/README.md         | 4 ++--
 packages/utils/README.md         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/connect/README.md b/packages/connect/README.md
index 4326ba158b..dd2002af46 100644
--- a/packages/connect/README.md
+++ b/packages/connect/README.md
@@ -16,13 +16,13 @@ yarn add @0xproject/connect
 
 ## Contributing
 
-We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
-If you don't have yarn workspaces enabled - enable them:
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 ```bash
 yarn config set workspaces-experimental true
 ```
diff --git a/packages/kovan-faucets/README.md b/packages/kovan-faucets/README.md
index 7c4177b9f0..111e883024 100644
--- a/packages/kovan-faucets/README.md
+++ b/packages/kovan-faucets/README.md
@@ -9,13 +9,13 @@ This is a private package and therefore is not published to npm. In order to bui
 
 ## Contributing
 
-We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
-If you don't have yarn workspaces enabled - enable them:
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 ```bash
 yarn config set workspaces-experimental true
 ```
diff --git a/packages/types/README.md b/packages/types/README.md
index eb27ce9679..c549a736f4 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -22,13 +22,13 @@ import {
 
 ## Contributing
 
-We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
-If you don't have yarn workspaces enabled - enable them:
+If you don't have yarn workspaces e`nabled (Yarn < v1.0) - enable them:
 ```bash
 yarn config set workspaces-experimental true
 ```
diff --git a/packages/utils/README.md b/packages/utils/README.md
index 39b6eab46b..f56c6c4e7e 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -23,13 +23,13 @@ import {
 
 ## Contributing
 
-We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
-If you don't have yarn workspaces enabled - enable them:
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 ```bash
 yarn config set workspaces-experimental true
 ```

From 613fada49f9d168fb949a370b884367f99deb401 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 14:15:14 +0100
Subject: [PATCH 092/125] Add etherToken.getLogsAsync and etherToken.subscribe
 with tests

---
 packages/0x.js/src/0x.ts                      |   2 +-
 .../contract_wrappers/ether_token_wrapper.ts  |  74 +++++++-
 packages/0x.js/src/index.ts                   |   2 +
 packages/0x.js/src/types.ts                   |  21 ++-
 .../0x.js/test/ether_token_wrapper_test.ts    | 171 +++++++++++++++++-
 packages/0x.js/test/token_wrapper_test.ts     |   3 +-
 packages/0x.js/test/utils/token_utils.ts      |   7 +
 .../containers/zero_ex_js_documentation.tsx   |   2 +
 8 files changed, 274 insertions(+), 8 deletions(-)

diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index e4965f9a2a..7393cc8141 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -201,7 +201,7 @@ export class ZeroEx {
             this._web3Wrapper, config.networkId, config.tokenRegistryContractAddress,
         );
         this.etherToken = new EtherTokenWrapper(
-            this._web3Wrapper, config.networkId, this.token,
+            this._web3Wrapper, config.networkId, this._abiDecoder, this.token,
         );
         this.orderStateWatcher = new OrderStateWatcher(
             this._web3Wrapper, this._abiDecoder, this.token, this.exchange, config.orderWatcherConfig,
diff --git a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
index a6acbe45d8..7b5b4d02a6 100644
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -1,9 +1,21 @@
+import {schemas} from '@0xproject/json-schemas';
 import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 
 import {artifacts} from '../artifacts';
-import {TransactionOpts, ZeroExError} from '../types';
+import {
+    BlockRange,
+    EtherTokenContractEventArgs,
+    EtherTokenEvents,
+    EventCallback,
+    IndexedFilterValues,
+    LogWithDecodedArgs,
+    TokenEvents,
+    TransactionOpts,
+    ZeroExError,
+} from '../types';
+import {AbiDecoder} from '../utils/abi_decoder';
 import {assert} from '../utils/assert';
 
 import {ContractWrapper} from './contract_wrapper';
@@ -17,8 +29,8 @@ import {TokenWrapper} from './token_wrapper';
 export class EtherTokenWrapper extends ContractWrapper {
     private _etherTokenContractIfExists?: EtherTokenContract;
     private _tokenWrapper: TokenWrapper;
-    constructor(web3Wrapper: Web3Wrapper, networkId: number, tokenWrapper: TokenWrapper) {
-        super(web3Wrapper, networkId);
+    constructor(web3Wrapper: Web3Wrapper, networkId: number, abiDecoder: AbiDecoder, tokenWrapper: TokenWrapper) {
+        super(web3Wrapper, networkId, abiDecoder);
         this._tokenWrapper = tokenWrapper;
     }
     /**
@@ -75,7 +87,63 @@ export class EtherTokenWrapper extends ContractWrapper {
         });
         return txHash;
     }
+    /**
+     * Gets historical logs without creating a subscription
+     * @param   etherTokenAddress   An address of the ether token that emmited the logs.
+     * @param   eventName           The ether token contract event you would like to subscribe to.
+     * @param   blockRange          Block range to get logs from.
+     * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
+     *                              the value is the value you are interested in. E.g `{_owner: aUserAddressHex}`
+     * @return  Array of logs that match the parameters
+     */
+    public async getLogsAsync<ArgsType extends EtherTokenContractEventArgs>(
+        etherTokenAddress: string, eventName: EtherTokenEvents, blockRange: BlockRange,
+        indexFilterValues: IndexedFilterValues): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
+        assert.isETHAddressHex('etherTokenAddress', etherTokenAddress);
+        assert.doesBelongToStringEnum('eventName', eventName, TokenEvents);
+        assert.doesConformToSchema('blockRange', blockRange, schemas.blockRangeSchema);
+        assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
+        const logs = await this._getLogsAsync<ArgsType>(
+            etherTokenAddress, eventName, blockRange, indexFilterValues, artifacts.TokenArtifact.abi,
+        );
+        return logs;
+    }
+    /**
+     * Subscribe to an event type emitted by the Token contract.
+     * @param   etherTokenAddress   The hex encoded address where the ether token is deployed.
+     * @param   eventName           The ether token contract event you would like to subscribe to.
+     * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
+     *                              the value is the value you are interested in. E.g `{_owner: aUserAddressHex}`
+     * @param   callback            Callback that gets called when a log is added/removed
+     * @return Subscription token used later to unsubscribe
+     */
+    public subscribe<ArgsType extends EtherTokenContractEventArgs>(
+        etherTokenAddress: string, eventName: EtherTokenEvents, indexFilterValues: IndexedFilterValues,
+        callback: EventCallback<ArgsType>): string {
+        assert.isETHAddressHex('etherTokenAddress', etherTokenAddress);
+        assert.doesBelongToStringEnum('eventName', eventName, TokenEvents);
+        assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
+        assert.isFunction('callback', callback);
+        const subscriptionToken = this._subscribe<ArgsType>(
+            etherTokenAddress, eventName, indexFilterValues, artifacts.TokenArtifact.abi, callback,
+        );
+        return subscriptionToken;
+    }
+    /**
+     * Cancel a subscription
+     * @param   subscriptionToken Subscription token returned by `subscribe()`
+     */
+    public unsubscribe(subscriptionToken: string): void {
+        this._unsubscribe(subscriptionToken);
+    }
+    /**
+     * Cancels all existing subscriptions
+     */
+    public unsubscribeAll(): void {
+        super.unsubscribeAll();
+    }
     private _invalidateContractInstance(): void {
+        this.unsubscribeAll();
         delete this._etherTokenContractIfExists;
     }
     private async _getEtherTokenContractAsync(etherTokenAddress: string): Promise<EtherTokenContract> {
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index b75ca4fa35..b43e7f33f7 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -2,6 +2,7 @@ export {ZeroEx} from './0x';
 
 export {
     Order,
+    BlockParamLiteral,
     SignedOrder,
     ECSignature,
     ZeroExError,
@@ -27,6 +28,7 @@ export {
     ContractEventArg,
     Web3Provider,
     ZeroExConfig,
+    EtherTokenEvents,
     TransactionReceiptWithDecodedLogs,
     LogWithDecodedArgs,
     MethodOpts,
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index 704e59ce53..e6a2c05d03 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -28,6 +28,7 @@ export enum ZeroExError {
 export enum InternalZeroExError {
     NoAbiDecoder = 'NO_ABI_DECODER',
     ZrxNotInTokenRegistry = 'ZRX_NOT_IN_TOKEN_REGISTRY',
+    WethNotInTokenRegistry = 'WETH_NOT_IN_TOKEN_REGISTRY',
 }
 
 /**
@@ -146,8 +147,17 @@ export interface ApprovalContractEventArgs {
     _spender: string;
     _value: BigNumber;
 }
+export interface DepositContractEventArgs {
+    _owner: string;
+    _value: BigNumber;
+}
+export interface WithdrawalContractEventArgs {
+    _owner: string;
+    _value: BigNumber;
+}
 export type TokenContractEventArgs = TransferContractEventArgs|ApprovalContractEventArgs;
-export type ContractEventArgs = ExchangeContractEventArgs|TokenContractEventArgs;
+export type EtherTokenContractEventArgs = TokenContractEventArgs|DepositContractEventArgs|WithdrawalContractEventArgs;
+export type ContractEventArgs = ExchangeContractEventArgs|TokenContractEventArgs|EtherTokenContractEventArgs;
 export type ContractEventArg = string|BigNumber;
 
 export interface Order {
@@ -201,7 +211,14 @@ export enum TokenEvents {
     Approval = 'Approval',
 }
 
-export type ContractEvents = TokenEvents|ExchangeEvents;
+export enum EtherTokenEvents  {
+    Transfer = 'Transfer',
+    Approval = 'Approval',
+    Deposit = 'Deposit',
+    Withdrawal = 'Withdrawal',
+}
+
+export type ContractEvents = TokenEvents|ExchangeEvents|EtherTokenEvents;
 
 export interface IndexedFilterValues {
     [index: string]: ContractEventArg;
diff --git a/packages/0x.js/test/ether_token_wrapper_test.ts b/packages/0x.js/test/ether_token_wrapper_test.ts
index b5ed193082..cdb6ef3b6e 100644
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -4,11 +4,23 @@ import * as chai from 'chai';
 import 'mocha';
 import * as Web3 from 'web3';
 
-import {ZeroEx, ZeroExError} from '../src';
+import {
+    ApprovalContractEventArgs,
+    BlockParamLiteral,
+    BlockRange,
+    DecodedLogEvent,
+    EtherTokenEvents,
+    Token,
+    TransferContractEventArgs,
+    ZeroEx,
+    ZeroExError,
+} from '../src';
 import {artifacts} from '../src/artifacts';
+import {DoneCallback} from '../src/types';
 
 import {chaiSetup} from './utils/chai_setup';
 import {constants} from './utils/constants';
+import {TokenUtils} from './utils/token_utils';
 import {web3Factory} from './utils/web3_factory';
 
 chaiSetup.configure();
@@ -24,11 +36,13 @@ const MAX_REASONABLE_GAS_COST_IN_WEI = 62517;
 describe('EtherTokenWrapper', () => {
     let web3: Web3;
     let zeroEx: ZeroEx;
+    let tokens: Token[];
     let userAddresses: string[];
     let addressWithETH: string;
     let wethContractAddress: string;
     let depositWeiAmount: BigNumber;
     let decimalPlaces: number;
+    let addressWithoutFunds: string;
     const gasPrice = new BigNumber(1);
     const zeroExConfig = {
         gasPrice,
@@ -37,11 +51,13 @@ describe('EtherTokenWrapper', () => {
     before(async () => {
         web3 = web3Factory.create();
         zeroEx = new ZeroEx(web3.currentProvider, zeroExConfig);
+        tokens = await zeroEx.tokenRegistry.getTokensAsync();
         userAddresses = await zeroEx.getAvailableAddressesAsync();
         addressWithETH = userAddresses[0];
         wethContractAddress = (zeroEx.etherToken as any)._getContractAddress(artifacts.EtherTokenArtifact);
         depositWeiAmount = (zeroEx as any)._web3Wrapper.toWei(new BigNumber(5));
         decimalPlaces = 7;
+        addressWithoutFunds = userAddresses[1];
     });
     beforeEach(async () => {
         await blockchainLifecycle.startAsync();
@@ -113,4 +129,157 @@ describe('EtherTokenWrapper', () => {
             ).to.be.rejectedWith(ZeroExError.InsufficientWEthBalanceForWithdrawal);
         });
     });
+    describe('#subscribe', () => {
+        const indexFilterValues = {};
+        let etherTokenAddress: string;
+        const transferAmount = new BigNumber(42);
+        const allowanceAmount = new BigNumber(42);
+        before(() => {
+            const tokenUtils = new TokenUtils(tokens);
+            const etherToken = tokenUtils.getWethTokenOrThrow();
+            etherTokenAddress = etherToken.address;
+        });
+        afterEach(() => {
+            zeroEx.etherToken.unsubscribeAll();
+        });
+        // Hack: Mocha does not allow a test to be both async and have a `done` callback
+        // Since we need to await the receipt of the event in the `subscribe` callback,
+        // we do need both. A hack is to make the top-level a sync fn w/ a done callback and then
+        // wrap the rest of the test in an async block
+        // Source: https://github.com/mochajs/mocha/issues/2407
+        it('Should receive the Transfer event when tokens are transfered', (done: DoneCallback) => {
+            (async () => {
+                const callback = (err: Error, logEvent: DecodedLogEvent<TransferContractEventArgs>) => {
+                    expect(logEvent).to.not.be.undefined();
+                    expect(logEvent.isRemoved).to.be.false();
+                    expect(logEvent.log.logIndex).to.be.equal(0);
+                    expect(logEvent.log.transactionIndex).to.be.equal(0);
+                    expect(logEvent.log.blockNumber).to.be.a('number');
+                    const args = logEvent.log.args;
+                    expect(args._from).to.be.equal(addressWithETH);
+                    expect(args._to).to.be.equal(addressWithoutFunds);
+                    expect(args._value).to.be.bignumber.equal(transferAmount);
+                    done();
+                };
+                await zeroEx.etherToken.depositAsync(etherTokenAddress, transferAmount, addressWithETH);
+                zeroEx.etherToken.subscribe(
+                    etherTokenAddress, EtherTokenEvents.Transfer, indexFilterValues, callback);
+                await zeroEx.token.transferAsync(
+                    etherTokenAddress, addressWithETH, addressWithoutFunds, transferAmount,
+                );
+            })().catch(done);
+        });
+        it('Should receive the Approval event when allowance is being set', (done: DoneCallback) => {
+            (async () => {
+                const callback = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
+                    expect(logEvent).to.not.be.undefined();
+                    expect(logEvent.isRemoved).to.be.false();
+                    const args = logEvent.log.args;
+                    expect(args._owner).to.be.equal(addressWithETH);
+                    expect(args._spender).to.be.equal(addressWithoutFunds);
+                    expect(args._value).to.be.bignumber.equal(allowanceAmount);
+                    done();
+                };
+                zeroEx.etherToken.subscribe(
+                    etherTokenAddress, EtherTokenEvents.Approval, indexFilterValues, callback);
+                await zeroEx.token.setAllowanceAsync(
+                    etherTokenAddress, addressWithETH, addressWithoutFunds, allowanceAmount,
+                );
+            })().catch(done);
+        });
+        it('Outstanding subscriptions are cancelled when zeroEx.setProvider called', (done: DoneCallback) => {
+            (async () => {
+                const callbackNeverToBeCalled = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
+                    done(new Error('Expected this subscription to have been cancelled'));
+                };
+                zeroEx.etherToken.subscribe(
+                    etherTokenAddress, EtherTokenEvents.Transfer, indexFilterValues, callbackNeverToBeCalled,
+                );
+                const callbackToBeCalled = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
+                    done();
+                };
+                const newProvider = web3Factory.getRpcProvider();
+                zeroEx.setProvider(newProvider, constants.TESTRPC_NETWORK_ID);
+                await zeroEx.etherToken.depositAsync(etherTokenAddress, transferAmount, addressWithETH);
+                zeroEx.etherToken.subscribe(
+                    etherTokenAddress, EtherTokenEvents.Transfer, indexFilterValues, callbackToBeCalled,
+                );
+                await zeroEx.token.transferAsync(
+                    etherTokenAddress, addressWithETH, addressWithoutFunds, transferAmount,
+                );
+            })().catch(done);
+        });
+        it('Should cancel subscription when unsubscribe called', (done: DoneCallback) => {
+            (async () => {
+                const callbackNeverToBeCalled = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
+                    done(new Error('Expected this subscription to have been cancelled'));
+                };
+                await zeroEx.etherToken.depositAsync(etherTokenAddress, transferAmount, addressWithETH);
+                const subscriptionToken = zeroEx.etherToken.subscribe(
+                    etherTokenAddress, EtherTokenEvents.Transfer, indexFilterValues, callbackNeverToBeCalled);
+                zeroEx.etherToken.unsubscribe(subscriptionToken);
+                await zeroEx.token.transferAsync(
+                    etherTokenAddress, addressWithETH, addressWithoutFunds, transferAmount,
+                );
+                done();
+            })().catch(done);
+        });
+    });
+    describe('#getLogsAsync', () => {
+        let etherTokenAddress: string;
+        let tokenTransferProxyAddress: string;
+        const blockRange: BlockRange = {
+            fromBlock: 0,
+            toBlock: BlockParamLiteral.Latest,
+        };
+        let txHash: string;
+        before(() => {
+            addressWithETH = userAddresses[0];
+            const tokenUtils = new TokenUtils(tokens);
+            const etherToken = tokenUtils.getWethTokenOrThrow();
+            etherTokenAddress = etherToken.address;
+            tokenTransferProxyAddress = zeroEx.proxy.getContractAddress();
+        });
+        it('should get logs with decoded args emitted by Approval', async () => {
+            txHash = await zeroEx.token.setUnlimitedProxyAllowanceAsync(etherTokenAddress, addressWithETH);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            const eventName = EtherTokenEvents.Approval;
+            const indexFilterValues = {};
+            const logs = await zeroEx.etherToken.getLogsAsync<ApprovalContractEventArgs>(
+                etherTokenAddress, eventName, blockRange, indexFilterValues,
+            );
+            expect(logs).to.have.length(1);
+            const args = logs[0].args;
+            expect(logs[0].event).to.be.equal(eventName);
+            expect(args._owner).to.be.equal(addressWithETH);
+            expect(args._spender).to.be.equal(tokenTransferProxyAddress);
+            expect(args._value).to.be.bignumber.equal(zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS);
+        });
+        it('should only get the logs with the correct event name', async () => {
+            txHash = await zeroEx.token.setUnlimitedProxyAllowanceAsync(etherTokenAddress, addressWithETH);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            const differentEventName = EtherTokenEvents.Transfer;
+            const indexFilterValues = {};
+            const logs = await zeroEx.etherToken.getLogsAsync(
+                etherTokenAddress, differentEventName, blockRange, indexFilterValues,
+            );
+            expect(logs).to.have.length(0);
+        });
+        it('should only get the logs with the correct indexed fields', async () => {
+            txHash = await zeroEx.token.setUnlimitedProxyAllowanceAsync(etherTokenAddress, addressWithETH);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            txHash = await zeroEx.token.setUnlimitedProxyAllowanceAsync(etherTokenAddress, addressWithoutFunds);
+            await zeroEx.awaitTransactionMinedAsync(txHash);
+            const eventName = EtherTokenEvents.Approval;
+            const indexFilterValues = {
+                _owner: addressWithETH,
+            };
+            const logs = await zeroEx.etherToken.getLogsAsync<ApprovalContractEventArgs>(
+                etherTokenAddress, eventName, blockRange, indexFilterValues,
+            );
+            expect(logs).to.have.length(1);
+            const args = logs[0].args;
+            expect(args._owner).to.be.equal(addressWithETH);
+        });
+    });
 });
diff --git a/packages/0x.js/test/token_wrapper_test.ts b/packages/0x.js/test/token_wrapper_test.ts
index 48742b6634..a43cef6759 100644
--- a/packages/0x.js/test/token_wrapper_test.ts
+++ b/packages/0x.js/test/token_wrapper_test.ts
@@ -7,6 +7,7 @@ import * as Web3 from 'web3';
 
 import {
     ApprovalContractEventArgs,
+    BlockParamLiteral,
     BlockRange,
     DecodedLogEvent,
     Token,
@@ -15,7 +16,7 @@ import {
     ZeroEx,
     ZeroExError,
 } from '../src';
-import {BlockParamLiteral, DoneCallback} from '../src/types';
+import {DoneCallback} from '../src/types';
 
 import {chaiSetup} from './utils/chai_setup';
 import {constants} from './utils/constants';
diff --git a/packages/0x.js/test/utils/token_utils.ts b/packages/0x.js/test/utils/token_utils.ts
index 4634899a7c..7da7f466cd 100644
--- a/packages/0x.js/test/utils/token_utils.ts
+++ b/packages/0x.js/test/utils/token_utils.ts
@@ -17,6 +17,13 @@ export class TokenUtils {
         }
         return zrxToken;
     }
+    public getWethTokenOrThrow(): Token {
+        const wethToken = _.find(this.tokens, {symbol: WETH_TOKEN_SYMBOL});
+        if (_.isUndefined(wethToken)) {
+            throw new Error(InternalZeroExError.WethNotInTokenRegistry);
+        }
+        return wethToken;
+    }
     public getDummyTokens(): Token[] {
         const dummyTokens = _.filter(this.tokens, token => {
             return !_.includes([PROTOCOL_TOKEN_SYMBOL, WETH_TOKEN_SYMBOL], token.symbol);
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.tsx b/packages/website/ts/containers/zero_ex_js_documentation.tsx
index ded62d2bcb..84752beeb7 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.tsx
+++ b/packages/website/ts/containers/zero_ex_js_documentation.tsx
@@ -116,6 +116,8 @@ const docsInfoConfig: DocsInfoConfig = {
         'ZeroExConfig',
         'TransactionReceiptWithDecodedLogs',
         'LogWithDecodedArgs',
+        'EtherTokenEvents',
+        'BlockParamLiteral',
         'DecodedLogArgs',
         'MethodOpts',
         'ValidateOrderFillableOpts',

From 0056c66d324ca4d8cee82a84ff64b4832ea360f9 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 14:22:40 +0100
Subject: [PATCH 093/125] Enable multiple EtherTokenContract instances

---
 .../src/contract_wrappers/ether_token_wrapper.ts    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
index 7b5b4d02a6..1edc50cb00 100644
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -27,7 +27,7 @@ import {TokenWrapper} from './token_wrapper';
  * The caller can convert ETH into the equivalent number of wrapped ETH ERC20 tokens and back.
  */
 export class EtherTokenWrapper extends ContractWrapper {
-    private _etherTokenContractIfExists?: EtherTokenContract;
+    private _etherTokenContractsByAddress: {[address: string]: EtherTokenContract};
     private _tokenWrapper: TokenWrapper;
     constructor(web3Wrapper: Web3Wrapper, networkId: number, abiDecoder: AbiDecoder, tokenWrapper: TokenWrapper) {
         super(web3Wrapper, networkId, abiDecoder);
@@ -144,14 +144,19 @@ export class EtherTokenWrapper extends ContractWrapper {
     }
     private _invalidateContractInstance(): void {
         this.unsubscribeAll();
-        delete this._etherTokenContractIfExists;
+        this._etherTokenContractsByAddress = {};
     }
     private async _getEtherTokenContractAsync(etherTokenAddress: string): Promise<EtherTokenContract> {
+        let etherTokenContract = this._etherTokenContractsByAddress[etherTokenAddress];
+        if (!_.isUndefined(etherTokenContract)) {
+            return etherTokenContract;
+        }
         const web3ContractInstance = await this._instantiateContractIfExistsAsync(
             artifacts.EtherTokenArtifact, etherTokenAddress,
         );
         const contractInstance = new EtherTokenContract(web3ContractInstance, this._web3Wrapper.getContractDefaults());
-        this._etherTokenContractIfExists = contractInstance;
-        return this._etherTokenContractIfExists;
+        etherTokenContract = contractInstance;
+        this._etherTokenContractsByAddress[etherTokenAddress] = etherTokenContract;
+        return etherTokenContract;
     }
 }

From e92d6ff84f781005eb01cc5e82eed29a244c9ee8 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 14:27:48 +0100
Subject: [PATCH 094/125] Add EtherToken events to the ABI

---
 packages/0x.js/src/artifacts/EtherToken.json  | 34 +++++++++++++++++++
 .../contract_wrappers/ether_token_wrapper.ts  |  4 +--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/packages/0x.js/src/artifacts/EtherToken.json b/packages/0x.js/src/artifacts/EtherToken.json
index de6946cf2d..0a6c5644c5 100644
--- a/packages/0x.js/src/artifacts/EtherToken.json
+++ b/packages/0x.js/src/artifacts/EtherToken.json
@@ -231,6 +231,40 @@
       ],
       "name": "Approval",
       "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "_owner",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "_value",
+          "type": "uint"
+        }
+      ],
+      "name": "Deposit",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "name": "_owner",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "name": "_value",
+          "type": "uint"
+        }
+      ],
+      "name": "Withdrawal",
+      "type": "event"
     }
   ],
   "networks": {
diff --git a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
index 1edc50cb00..b1d5a0ccca 100644
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -104,7 +104,7 @@ export class EtherTokenWrapper extends ContractWrapper {
         assert.doesConformToSchema('blockRange', blockRange, schemas.blockRangeSchema);
         assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
         const logs = await this._getLogsAsync<ArgsType>(
-            etherTokenAddress, eventName, blockRange, indexFilterValues, artifacts.TokenArtifact.abi,
+            etherTokenAddress, eventName, blockRange, indexFilterValues, artifacts.EtherTokenArtifact.abi,
         );
         return logs;
     }
@@ -125,7 +125,7 @@ export class EtherTokenWrapper extends ContractWrapper {
         assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
         assert.isFunction('callback', callback);
         const subscriptionToken = this._subscribe<ArgsType>(
-            etherTokenAddress, eventName, indexFilterValues, artifacts.TokenArtifact.abi, callback,
+            etherTokenAddress, eventName, indexFilterValues, artifacts.EtherTokenArtifact.abi, callback,
         );
         return subscriptionToken;
     }

From b829d55752416c60440c6ed91b1f59b753416634 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 14:30:37 +0100
Subject: [PATCH 095/125] Make order watcher react to new etherToken events

---
 .../src/order_watcher/order_state_watcher.ts  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/0x.js/src/order_watcher/order_state_watcher.ts b/packages/0x.js/src/order_watcher/order_state_watcher.ts
index c4a9eb1ad0..af9814dc8d 100644
--- a/packages/0x.js/src/order_watcher/order_state_watcher.ts
+++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts
@@ -12,6 +12,8 @@ import {
     ApprovalContractEventArgs,
     BlockParamLiteral,
     ContractEventArgs,
+    DepositContractEventArgs,
+    EtherTokenEvents,
     ExchangeContractErrs,
     ExchangeEvents,
     LogCancelContractEventArgs,
@@ -24,6 +26,7 @@ import {
     SignedOrder,
     TokenEvents,
     TransferContractEventArgs,
+    WithdrawalContractEventArgs,
     ZeroExError,
 } from '../types';
 import {AbiDecoder} from '../utils/abi_decoder';
@@ -243,6 +246,36 @@ export class OrderStateWatcher {
                 }
                 break;
             }
+            case EtherTokenEvents.Deposit:
+            {
+                // Invalidate cache
+                const args = decodedLog.args as DepositContractEventArgs;
+                this._balanceAndProxyAllowanceLazyStore.deleteBalance(decodedLog.address, args._owner);
+                // Revalidate orders
+                makerToken = decodedLog.address;
+                makerAddress = args._owner;
+                if (!_.isUndefined(this._dependentOrderHashes[makerAddress]) &&
+                    !_.isUndefined(this._dependentOrderHashes[makerAddress][makerToken])) {
+                    const orderHashes = Array.from(this._dependentOrderHashes[makerAddress][makerToken]);
+                    await this._emitRevalidateOrdersAsync(orderHashes);
+                }
+                break;
+            }
+            case EtherTokenEvents.Withdrawal:
+            {
+                // Invalidate cache
+                const args = decodedLog.args as WithdrawalContractEventArgs;
+                this._balanceAndProxyAllowanceLazyStore.deleteBalance(decodedLog.address, args._owner);
+                // Revalidate orders
+                makerToken = decodedLog.address;
+                makerAddress = args._owner;
+                if (!_.isUndefined(this._dependentOrderHashes[makerAddress]) &&
+                    !_.isUndefined(this._dependentOrderHashes[makerAddress][makerToken])) {
+                    const orderHashes = Array.from(this._dependentOrderHashes[makerAddress][makerToken]);
+                    await this._emitRevalidateOrdersAsync(orderHashes);
+                }
+                break;
+            }
             case ExchangeEvents.LogFill:
             {
                 // Invalidate cache

From 35c20d505e4ea2309fe6cdc3674ecd2f03f8e337 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 14:37:30 +0100
Subject: [PATCH 096/125] Update CHANGELOG

---
 packages/0x.js/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index c69edd88c8..f2905ad7e4 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -6,6 +6,10 @@ v0.x.x - _TBD, 2017_
     * Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry` (#267)
     * Removed `etherTokenContractAddress` from `ZeroEx` constructor arg `ZeroExConfig` (#267)
     * Rename `SubscriptionOpts` to `BlockRange` (#272)
+    * Add `zeroEx.etherToken.subscribe`, `zeroEx.etherToken.unsubscribe`, `zeroEx.etherToken.unsubscribeAll` (#277)
+    * Add `zeroEx.etherToken.getLogsAsync` (#277)
+    * Add new public types `BlockParamLiteral`, `EtherTokenEvents`, `EtherTokenContractEventArgs`, `DepositContractEventArgs`, `WithdrawalContractEventArgs` (#277)
+    * Support `Deposit` and `Withdraw` events on etherToken (#277)
     * Improve the error message when taker is not a string (#278)
 
 v0.27.1 - _November 28, 2017_

From 9594185f113c09736528dd8b8064c3f45a982cc3 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 14:37:42 +0100
Subject: [PATCH 097/125] Export new public types

---
 packages/0x.js/src/index.ts                                 | 3 +++
 packages/website/ts/containers/zero_ex_js_documentation.tsx | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index b43e7f33f7..da06aad340 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -24,6 +24,9 @@ export {
     TransferContractEventArgs,
     ApprovalContractEventArgs,
     TokenContractEventArgs,
+    EtherTokenContractEventArgs,
+    WithdrawalContractEventArgs,
+    DepositContractEventArgs,
     ContractEventArgs,
     ContractEventArg,
     Web3Provider,
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.tsx b/packages/website/ts/containers/zero_ex_js_documentation.tsx
index 84752beeb7..2f2c49167b 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.tsx
+++ b/packages/website/ts/containers/zero_ex_js_documentation.tsx
@@ -108,6 +108,9 @@ const docsInfoConfig: DocsInfoConfig = {
         'LogErrorContractEventArgs',
         'LogFillContractEventArgs',
         'LogCancelContractEventArgs',
+        'EtherTokenContractEventArgs',
+        'WithdrawalContractEventArgs',
+        'DepositContractEventArgs',
         'TokenEvents',
         'ExchangeContractEventArgs',
         'TransferContractEventArgs',

From abce410897c5b90cd70b258a5231c99817bec9c1 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 14:44:56 +0100
Subject: [PATCH 098/125] Init the _etherTokenContractsByAddress

---
 packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
index b1d5a0ccca..238009759a 100644
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -27,7 +27,7 @@ import {TokenWrapper} from './token_wrapper';
  * The caller can convert ETH into the equivalent number of wrapped ETH ERC20 tokens and back.
  */
 export class EtherTokenWrapper extends ContractWrapper {
-    private _etherTokenContractsByAddress: {[address: string]: EtherTokenContract};
+    private _etherTokenContractsByAddress: {[address: string]: EtherTokenContract} = {};
     private _tokenWrapper: TokenWrapper;
     constructor(web3Wrapper: Web3Wrapper, networkId: number, abiDecoder: AbiDecoder, tokenWrapper: TokenWrapper) {
         super(web3Wrapper, networkId, abiDecoder);

From 78eb79396efcdf803d5be054b28816967fd340e0 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 20:12:46 +0100
Subject: [PATCH 099/125] Fix a typo

---
 packages/0x.js/test/ether_token_wrapper_test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/0x.js/test/ether_token_wrapper_test.ts b/packages/0x.js/test/ether_token_wrapper_test.ts
index cdb6ef3b6e..f3feb39c63 100644
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -144,7 +144,7 @@ describe('EtherTokenWrapper', () => {
         });
         // Hack: Mocha does not allow a test to be both async and have a `done` callback
         // Since we need to await the receipt of the event in the `subscribe` callback,
-        // we do need both. A hack is to make the top-level a sync fn w/ a done callback and then
+        // we do need both. A hack is to make the top-level async fn w/ a done callback and then
         // wrap the rest of the test in an async block
         // Source: https://github.com/mochajs/mocha/issues/2407
         it('Should receive the Transfer event when tokens are transfered', (done: DoneCallback) => {

From c07de97fd8a0fe3cf3ea15b2b6a02b326875e6de Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 13:20:24 +0100
Subject: [PATCH 100/125] Fix WETH events watching

---
 packages/0x.js/src/artifacts/EtherToken.json                | 4 ++--
 packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/0x.js/src/artifacts/EtherToken.json b/packages/0x.js/src/artifacts/EtherToken.json
index 0a6c5644c5..b28a463c0f 100644
--- a/packages/0x.js/src/artifacts/EtherToken.json
+++ b/packages/0x.js/src/artifacts/EtherToken.json
@@ -243,7 +243,7 @@
         {
           "indexed": false,
           "name": "_value",
-          "type": "uint"
+          "type": "uint256"
         }
       ],
       "name": "Deposit",
@@ -260,7 +260,7 @@
         {
           "indexed": false,
           "name": "_value",
-          "type": "uint"
+          "type": "uint256"
         }
       ],
       "name": "Withdrawal",
diff --git a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
index 238009759a..7b27438117 100644
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -100,7 +100,7 @@ export class EtherTokenWrapper extends ContractWrapper {
         etherTokenAddress: string, eventName: EtherTokenEvents, blockRange: BlockRange,
         indexFilterValues: IndexedFilterValues): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
         assert.isETHAddressHex('etherTokenAddress', etherTokenAddress);
-        assert.doesBelongToStringEnum('eventName', eventName, TokenEvents);
+        assert.doesBelongToStringEnum('eventName', eventName, EtherTokenEvents);
         assert.doesConformToSchema('blockRange', blockRange, schemas.blockRangeSchema);
         assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
         const logs = await this._getLogsAsync<ArgsType>(

From d8d15149fcfde98eb0e52e76e8232db90a3b58d6 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 13:36:55 +0100
Subject: [PATCH 101/125] Add WETH9 and mirations

---
 packages/contracts/contracts/tokens/WETH9.sol | 756 ++++++++++++++++++
 .../contracts/deploy/migrations/migrate.ts    |  13 +
 2 files changed, 769 insertions(+)
 create mode 100644 packages/contracts/contracts/tokens/WETH9.sol

diff --git a/packages/contracts/contracts/tokens/WETH9.sol b/packages/contracts/contracts/tokens/WETH9.sol
new file mode 100644
index 0000000000..733ca414bf
--- /dev/null
+++ b/packages/contracts/contracts/tokens/WETH9.sol
@@ -0,0 +1,756 @@
+// Copyright (C) 2015, 2016, 2017 Dapphub
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+pragma solidity ^0.4.18;
+
+contract WETH9 {
+    string public name     = "Wrapped Ether";
+    string public symbol   = "WETH";
+    uint8  public decimals = 18;
+
+    event  Approval(address indexed src, address indexed guy, uint wad);
+    event  Transfer(address indexed src, address indexed dst, uint wad);
+    event  Deposit(address indexed dst, uint wad);
+    event  Withdrawal(address indexed src, uint wad);
+
+    mapping (address => uint)                       public  balanceOf;
+    mapping (address => mapping (address => uint))  public  allowance;
+
+    function() public payable {
+        deposit();
+    }
+    function deposit() public payable {
+        balanceOf[msg.sender] += msg.value;
+        Deposit(msg.sender, msg.value);
+    }
+    function withdraw(uint wad) public {
+        require(balanceOf[msg.sender] >= wad);
+        balanceOf[msg.sender] -= wad;
+        msg.sender.transfer(wad);
+        Withdrawal(msg.sender, wad);
+    }
+
+    function totalSupply() public view returns (uint) {
+        return this.balance;
+    }
+
+    function approve(address guy, uint wad) public returns (bool) {
+        allowance[msg.sender][guy] = wad;
+        Approval(msg.sender, guy, wad);
+        return true;
+    }
+
+    function transfer(address dst, uint wad) public returns (bool) {
+        return transferFrom(msg.sender, dst, wad);
+    }
+
+    function transferFrom(address src, address dst, uint wad)
+        public
+        returns (bool)
+    {
+        require(balanceOf[src] >= wad);
+
+        if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {
+            require(allowance[src][msg.sender] >= wad);
+            allowance[src][msg.sender] -= wad;
+        }
+
+        balanceOf[src] -= wad;
+        balanceOf[dst] += wad;
+
+        Transfer(src, dst, wad);
+
+        return true;
+    }
+}
+
+
+/*
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+*/
diff --git a/packages/contracts/deploy/migrations/migrate.ts b/packages/contracts/deploy/migrations/migrate.ts
index e893e6a6f7..e2c220f68c 100644
--- a/packages/contracts/deploy/migrations/migrate.ts
+++ b/packages/contracts/deploy/migrations/migrate.ts
@@ -20,6 +20,7 @@ export const migrator = {
         const tokenTransferProxy = await deployer.deployAndSaveAsync('TokenTransferProxy');
         const zrxToken = await deployer.deployAndSaveAsync('ZRXToken');
         const etherToken = await deployer.deployAndSaveAsync('EtherToken');
+        const makerEtherToken = await deployer.deployAndSaveAsync('WETH9');
         const tokenReg = await deployer.deployAndSaveAsync('TokenRegistry');
 
         const exchangeArgs = [zrxToken.address, tokenTransferProxy.address];
@@ -68,6 +69,18 @@ export const migrator = {
                 gas: addTokenGasEstimate,
             },
         );
+        await tokenReg.addToken.sendTransactionAsync(
+            makerEtherToken.address,
+            'Maker Ether Token',
+            'WETH9',
+            18,
+            constants.NULL_BYTES,
+            constants.NULL_BYTES,
+            {
+                from: owner,
+                gas: addTokenGasEstimate,
+            },
+        );
         for (const token of tokenInfo) {
             const totalSupply = new BigNumber(0);
             const args = [

From b1f36a9024700ab948f7bd75eff24b29032e5907 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:01:14 +0100
Subject: [PATCH 102/125] Use the new snapshot including WETH9 and it's
 artifacts

---
 .circleci/config.yml                            | 2 +-
 packages/0x.js/src/artifacts/EtherToken.json    | 6 +++---
 packages/0x.js/src/artifacts/Exchange.json      | 2 +-
 packages/0x.js/src/artifacts/TokenRegistry.json | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 86a3e2968e..4d88fd8c4b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
     docker:
       - image: circleci/node:6.12
     environment:
-      CONTRACTS_COMMIT_HASH: '6bda6a2'
+      CONTRACTS_COMMIT_HASH: 'e0f509f'
     steps:
       - checkout
       - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
diff --git a/packages/0x.js/src/artifacts/EtherToken.json b/packages/0x.js/src/artifacts/EtherToken.json
index b28a463c0f..8eb4d250fa 100644
--- a/packages/0x.js/src/artifacts/EtherToken.json
+++ b/packages/0x.js/src/artifacts/EtherToken.json
@@ -269,16 +269,16 @@
   ],
   "networks": {
     "1": {
-      "address": "0x2956356cd2a2bf3202f771f50d3d14a367b48070"
+      "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
     },
     "3": {
       "address": "0xc00fd9820cd2898cc4c054b7bf142de637ad129a"
     },
     "42": {
-      "address": "0x05d090b51c40b020eab3bfcb6a2dff130df22e9c"
+      "address": "0x653e49e301e508a13237c0ddc98ae7d4cd2667a1"
     },
     "50": {
-      "address": "0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c"
+      "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082"
     }
   }
 }
diff --git a/packages/0x.js/src/artifacts/Exchange.json b/packages/0x.js/src/artifacts/Exchange.json
index cf9124ca7a..fa16637afd 100644
--- a/packages/0x.js/src/artifacts/Exchange.json
+++ b/packages/0x.js/src/artifacts/Exchange.json
@@ -601,7 +601,7 @@
       "address": "0x90fe2af704b34e0224bf2299c838e04d4dcf1364"
     },
     "50": {
-      "address": "0x48bacb9266a570d521063ef5dd96e61686dbe788"
+      "address": "0x34d402f14d58e001d8efbe6585051bf9706aa064"
     }
   }
 }
diff --git a/packages/0x.js/src/artifacts/TokenRegistry.json b/packages/0x.js/src/artifacts/TokenRegistry.json
index 973a101e83..c15729dbcf 100644
--- a/packages/0x.js/src/artifacts/TokenRegistry.json
+++ b/packages/0x.js/src/artifacts/TokenRegistry.json
@@ -538,7 +538,7 @@
       "address": "0xf18e504561f4347bea557f3d4558f559dddbae7f"
     },
     "50": {
-      "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082"
+      "address": "0x48bacb9266a570d521063ef5dd96e61686dbe788"
     }
   }
 }

From d639a22cffebed137d703ad76b30f5bcb42de9a4 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:01:35 +0100
Subject: [PATCH 103/125] Add WETH9 tests

---
 .../contract_wrappers/ether_token_wrapper.ts  |  2 +-
 .../0x.js/test/ether_token_wrapper_test.ts    | 58 ++++++++++++++++++-
 packages/0x.js/test/utils/token_utils.ts      |  2 +-
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
index 7b27438117..3e5be3ae4f 100644
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -121,7 +121,7 @@ export class EtherTokenWrapper extends ContractWrapper {
         etherTokenAddress: string, eventName: EtherTokenEvents, indexFilterValues: IndexedFilterValues,
         callback: EventCallback<ArgsType>): string {
         assert.isETHAddressHex('etherTokenAddress', etherTokenAddress);
-        assert.doesBelongToStringEnum('eventName', eventName, TokenEvents);
+        assert.doesBelongToStringEnum('eventName', eventName, EtherTokenEvents);
         assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
         assert.isFunction('callback', callback);
         const subscriptionToken = this._subscribe<ArgsType>(
diff --git a/packages/0x.js/test/ether_token_wrapper_test.ts b/packages/0x.js/test/ether_token_wrapper_test.ts
index f3feb39c63..03f5216eef 100644
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -9,9 +9,11 @@ import {
     BlockParamLiteral,
     BlockRange,
     DecodedLogEvent,
+    DepositContractEventArgs,
     EtherTokenEvents,
     Token,
     TransferContractEventArgs,
+    WithdrawalContractEventArgs,
     ZeroEx,
     ZeroExError,
 } from '../src';
@@ -48,6 +50,10 @@ describe('EtherTokenWrapper', () => {
         gasPrice,
         networkId: constants.TESTRPC_NETWORK_ID,
     };
+    const transferAmount = new BigNumber(42);
+    const allowanceAmount = new BigNumber(42);
+    const depositAmount = new BigNumber(42);
+    const withdrawalAmount = new BigNumber(42);
     before(async () => {
         web3 = web3Factory.create();
         zeroEx = new ZeroEx(web3.currentProvider, zeroExConfig);
@@ -132,8 +138,6 @@ describe('EtherTokenWrapper', () => {
     describe('#subscribe', () => {
         const indexFilterValues = {};
         let etherTokenAddress: string;
-        const transferAmount = new BigNumber(42);
-        const allowanceAmount = new BigNumber(42);
         before(() => {
             const tokenUtils = new TokenUtils(tokens);
             const etherToken = tokenUtils.getWethTokenOrThrow();
@@ -187,6 +191,43 @@ describe('EtherTokenWrapper', () => {
                 );
             })().catch(done);
         });
+        it('Should receive the Deposit event when ether is being deposited', (done: DoneCallback) => {
+            (async () => {
+                const callback = (err: Error, logEvent: DecodedLogEvent<DepositContractEventArgs>) => {
+                    expect(logEvent).to.not.be.undefined();
+                    expect(logEvent.isRemoved).to.be.false();
+                    const args = logEvent.log.args;
+                    expect(args._owner).to.be.equal(addressWithETH);
+                    expect(args._value).to.be.bignumber.equal(depositAmount);
+                    done();
+                };
+                zeroEx.etherToken.subscribe(
+                    etherTokenAddress, EtherTokenEvents.Deposit, indexFilterValues, callback);
+                await zeroEx.etherToken.depositAsync(
+                    etherTokenAddress, depositAmount, addressWithETH,
+                );
+            })().catch(done);
+        });
+        it('Should receive the Withdrawal event when ether is being withdrewn', (done: DoneCallback) => {
+            (async () => {
+                const callback = (err: Error, logEvent: DecodedLogEvent<WithdrawalContractEventArgs>) => {
+                    expect(logEvent).to.not.be.undefined();
+                    expect(logEvent.isRemoved).to.be.false();
+                    const args = logEvent.log.args;
+                    expect(args._owner).to.be.equal(addressWithETH);
+                    expect(args._value).to.be.bignumber.equal(depositAmount);
+                    done();
+                };
+                await zeroEx.etherToken.depositAsync(
+                    etherTokenAddress, depositAmount, addressWithETH,
+                );
+                zeroEx.etherToken.subscribe(
+                    etherTokenAddress, EtherTokenEvents.Withdrawal, indexFilterValues, callback);
+                await zeroEx.etherToken.withdrawAsync(
+                    etherTokenAddress, withdrawalAmount, addressWithETH,
+                );
+            })().catch(done);
+        });
         it('Outstanding subscriptions are cancelled when zeroEx.setProvider called', (done: DoneCallback) => {
             (async () => {
                 const callbackNeverToBeCalled = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
@@ -255,6 +296,19 @@ describe('EtherTokenWrapper', () => {
             expect(args._spender).to.be.equal(tokenTransferProxyAddress);
             expect(args._value).to.be.bignumber.equal(zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS);
         });
+        it('should get logs with decoded args emitted by Deposit', async () => {
+            await zeroEx.etherToken.depositAsync(etherTokenAddress, depositAmount, addressWithETH);
+            const eventName = EtherTokenEvents.Deposit;
+            const indexFilterValues = {};
+            const logs = await zeroEx.etherToken.getLogsAsync<DepositContractEventArgs>(
+                etherTokenAddress, eventName, blockRange, indexFilterValues,
+            );
+            expect(logs).to.have.length(1);
+            const args = logs[0].args;
+            expect(logs[0].event).to.be.equal(eventName);
+            expect(args._owner).to.be.equal(addressWithETH);
+            expect(args._value).to.be.bignumber.equal(depositAmount);
+        });
         it('should only get the logs with the correct event name', async () => {
             txHash = await zeroEx.token.setUnlimitedProxyAllowanceAsync(etherTokenAddress, addressWithETH);
             await zeroEx.awaitTransactionMinedAsync(txHash);
diff --git a/packages/0x.js/test/utils/token_utils.ts b/packages/0x.js/test/utils/token_utils.ts
index 7da7f466cd..8774925bce 100644
--- a/packages/0x.js/test/utils/token_utils.ts
+++ b/packages/0x.js/test/utils/token_utils.ts
@@ -3,7 +3,7 @@ import * as _ from 'lodash';
 import {InternalZeroExError, Token} from '../../src/types';
 
 const PROTOCOL_TOKEN_SYMBOL = 'ZRX';
-const WETH_TOKEN_SYMBOL = 'WETH';
+const WETH_TOKEN_SYMBOL = 'WETH9';
 
 export class TokenUtils {
     private tokens: Token[];

From de6fe257518e661b35df080ab54b1adc6819af5b Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 16:53:41 +0100
Subject: [PATCH 104/125] Write 4 README's

---
 packages/assert/README.md        | 34 ++++++++++++++++++++++--
 packages/json-schemas/README.md  | 37 +++++++++++++++++++++++----
 packages/tslint-config/README.md | 44 +++++++++++++++++++++++++++++---
 packages/web3-wrapper/README.md  | 32 ++++++++++++++++++++++-
 4 files changed, 135 insertions(+), 12 deletions(-)

diff --git a/packages/assert/README.md b/packages/assert/README.md
index b0dc9a4511..2bcb76f50a 100644
--- a/packages/assert/README.md
+++ b/packages/assert/README.md
@@ -3,8 +3,38 @@ assert
 
 Standard type and schema assertions to be used across all 0x projects and packages
 
-## Install
+## Installation
 
 ```bash
-npm install @0xproject/assert --save
+yarn add @0xproject/assert
 ```
+
+## Usage
+
+TODO - Custom documentation page is in progress.
+
+## Contributing
+
+We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+[CONTRIBUTING.md](../../CONTRIBUTING.md)
+
+## Install Dependencies
+
+If you don't have yarn workspaces enabled - enable them:
+`yarn config set workspaces-experimental true`
+
+Then install dependencies
+`yarn install`
+
+## Build
+
+`yarn build`
+
+## Lint
+
+`yarn lint`
+
+## Run Tests
+
+`yarn test`
diff --git a/packages/json-schemas/README.md b/packages/json-schemas/README.md
index d89f57a5e0..4b4d148ed3 100644
--- a/packages/json-schemas/README.md
+++ b/packages/json-schemas/README.md
@@ -1,16 +1,17 @@
 json-schemas
-------------
+------
 
 Contains 0x-related json schemas
 
-## Install:
+## Installation
 
 ```bash
-npm install @0xproject/json-schemas --save
+yarn add @0xproject/json-schemas
 ```
 
-## Usage:
-```
+## Usage
+
+```javascript
 import {SchemaValidator, ValidatorResult, schemas} from '@0xproject/json-schemas';
 
 const {orderSchema} = schemas;
@@ -22,3 +23,29 @@ const order = {
 const validatorResult: ValidatorResult = validator.validate(order, orderSchema); // Contains all errors
 const isValid: boolean = validator.isValid(order, orderSchema); // Only returns boolean
 ```
+
+## Contributing
+
+We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+[CONTRIBUTING.md](../../CONTRIBUTING.md)
+
+## Install Dependencies
+
+If you don't have yarn workspaces enabled - enable them:
+`yarn config set workspaces-experimental true`
+
+Then install dependencies
+`yarn install`
+
+## Build
+
+`yarn build`
+
+## Lint
+
+`yarn lint`
+
+## Run Tests
+
+`yarn test`
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index 38a6bce453..b435258275 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -1,10 +1,46 @@
 tslint-config
--------------
+------
 
-Lint rules related to 0xProject for TSLint.
+TSLint configuration and custom linter rules used by 0xProject.
 
-## Install:
+## Installation
 
 ```bash
-npm install @0xproject/tslint-config --save-dev
+yarn add --dev @0xproject/tslint-config
 ```
+
+## Usage
+
+```json
+{
+  "extends": [
+    "@0xproject/tslint-config"
+  ]
+}
+```
+
+## Contributing
+
+We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+[CONTRIBUTING.md](../../CONTRIBUTING.md)
+
+## Install Dependencies
+
+If you don't have yarn workspaces enabled - enable them:
+`yarn config set workspaces-experimental true`
+
+Then install dependencies
+`yarn install`
+
+## Build
+
+`yarn build`
+
+## Lint
+
+`yarn lint`
+
+## Run Tests
+
+`yarn test`
diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md
index 0df8c63338..04f2b8ca09 100644
--- a/packages/web3-wrapper/README.md
+++ b/packages/web3-wrapper/README.md
@@ -3,8 +3,38 @@ Web3 wrapper
 
 Wrapped version of web3 with nicer interface to be used across 0x projects and packages
 
-## Install
+## Installation
 
 ```bash
 yarn add @0xproject/web3-wrapper
 ```
+
+## Usage
+
+TODO - Custom documentation page is in progress.
+
+## Contributing
+
+We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+[CONTRIBUTING.md](../../CONTRIBUTING.md)
+
+## Install Dependencies
+
+If you don't have yarn workspaces enabled - enable them:
+`yarn config set workspaces-experimental true`
+
+Then install dependencies
+`yarn install`
+
+## Build
+
+`yarn build`
+
+## Lint
+
+`yarn lint`
+
+## Run Tests
+
+`yarn test`

From ecc6cb2b7c8aff181341474830cd482579db7ca1 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 18:03:44 +0100
Subject: [PATCH 105/125] Address feedback

---
 packages/assert/README.md        | 28 +++++++++++++++++++---------
 packages/json-schemas/README.md  | 28 +++++++++++++++++++---------
 packages/tslint-config/README.md | 28 +++++++++++++++++++---------
 packages/web3-wrapper/README.md  | 28 +++++++++++++++++++---------
 4 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/packages/assert/README.md b/packages/assert/README.md
index 2bcb76f50a..7bce1b98f0 100644
--- a/packages/assert/README.md
+++ b/packages/assert/README.md
@@ -19,22 +19,32 @@ We strongly encourage our community members to help us make improvements and to
 
 [CONTRIBUTING.md](../../CONTRIBUTING.md)
 
-## Install Dependencies
+### Install Dependencies
 
 If you don't have yarn workspaces enabled - enable them:
-`yarn config set workspaces-experimental true`
+```bash
+yarn config set workspaces-experimental true
+```
 
 Then install dependencies
-`yarn install`
+```bash
+yarn install
+```
 
-## Build
+### Build
 
-`yarn build`
+```bash
+yarn build
+```
 
-## Lint
+### Lint
 
-`yarn lint`
+```bash
+yarn lint
+```
 
-## Run Tests
+### Run Tests
 
-`yarn test`
+```bash
+yarn test
+```
diff --git a/packages/json-schemas/README.md b/packages/json-schemas/README.md
index 4b4d148ed3..f22e208ea6 100644
--- a/packages/json-schemas/README.md
+++ b/packages/json-schemas/README.md
@@ -30,22 +30,32 @@ We strongly encourage our community members to help us make improvements and to
 
 [CONTRIBUTING.md](../../CONTRIBUTING.md)
 
-## Install Dependencies
+### Install Dependencies
 
 If you don't have yarn workspaces enabled - enable them:
-`yarn config set workspaces-experimental true`
+```bash
+yarn config set workspaces-experimental true
+```
 
 Then install dependencies
-`yarn install`
+```bash
+yarn install
+```
 
-## Build
+### Build
 
-`yarn build`
+```bash
+yarn build
+```
 
-## Lint
+### Lint
 
-`yarn lint`
+```bash
+yarn lint
+```
 
-## Run Tests
+### Run Tests
 
-`yarn test`
+```bash
+yarn test
+```
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index b435258275..ef4fba0229 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -25,22 +25,32 @@ We strongly encourage our community members to help us make improvements and to
 
 [CONTRIBUTING.md](../../CONTRIBUTING.md)
 
-## Install Dependencies
+### Install Dependencies
 
 If you don't have yarn workspaces enabled - enable them:
-`yarn config set workspaces-experimental true`
+```bash
+yarn config set workspaces-experimental true
+```
 
 Then install dependencies
-`yarn install`
+```bash
+yarn install
+```
 
-## Build
+### Build
 
-`yarn build`
+```bash
+yarn build
+```
 
-## Lint
+### Lint
 
-`yarn lint`
+```bash
+yarn lint
+```
 
-## Run Tests
+### Run Tests
 
-`yarn test`
+```bash
+yarn test
+```
diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md
index 04f2b8ca09..db879d3cf4 100644
--- a/packages/web3-wrapper/README.md
+++ b/packages/web3-wrapper/README.md
@@ -19,22 +19,32 @@ We strongly encourage our community members to help us make improvements and to
 
 [CONTRIBUTING.md](../../CONTRIBUTING.md)
 
-## Install Dependencies
+### Install Dependencies
 
 If you don't have yarn workspaces enabled - enable them:
-`yarn config set workspaces-experimental true`
+```bash
+yarn config set workspaces-experimental true
+```
 
 Then install dependencies
-`yarn install`
+```bash
+yarn install
+```
 
-## Build
+### Build
 
-`yarn build`
+```bash
+yarn build
+```
 
-## Lint
+### Lint
 
-`yarn lint`
+```bash
+yarn lint
+```
 
-## Run Tests
+### Run Tests
 
-`yarn test`
+```bash
+yarn test
+```

From 3579f063d6fb09f7a091d3f896bd29edb84b3f55 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 19 Dec 2017 18:04:42 +0100
Subject: [PATCH 106/125] Fix the headers

---
 packages/assert/README.md        | 2 +-
 packages/json-schemas/README.md  | 2 +-
 packages/tslint-config/README.md | 2 +-
 packages/web3-wrapper/README.md  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/assert/README.md b/packages/assert/README.md
index 7bce1b98f0..5b9b6ccab1 100644
--- a/packages/assert/README.md
+++ b/packages/assert/README.md
@@ -1,4 +1,4 @@
-assert
+@0xproject/assert
 ------
 
 Standard type and schema assertions to be used across all 0x projects and packages
diff --git a/packages/json-schemas/README.md b/packages/json-schemas/README.md
index f22e208ea6..1621699e3c 100644
--- a/packages/json-schemas/README.md
+++ b/packages/json-schemas/README.md
@@ -1,4 +1,4 @@
-json-schemas
+@0xproject/json-schemas
 ------
 
 Contains 0x-related json schemas
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index ef4fba0229..f737062b29 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -1,4 +1,4 @@
-tslint-config
+@0xproject/tslint-config
 ------
 
 TSLint configuration and custom linter rules used by 0xProject.
diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md
index db879d3cf4..c8a984435c 100644
--- a/packages/web3-wrapper/README.md
+++ b/packages/web3-wrapper/README.md
@@ -1,4 +1,4 @@
-Web3 wrapper
+@0xproject/web3-wrapper
 ------
 
 Wrapped version of web3 with nicer interface to be used across 0x projects and packages

From c3508dcdc6e2cf459bf076c0bb0087338cf96f7a Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:10:35 +0100
Subject: [PATCH 107/125] Change CONTRIBUTING section

---
 packages/assert/README.md        | 8 ++++++--
 packages/json-schemas/README.md  | 2 +-
 packages/tslint-config/README.md | 2 +-
 packages/web3-wrapper/README.md  | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/assert/README.md b/packages/assert/README.md
index 5b9b6ccab1..585b4f39e2 100644
--- a/packages/assert/README.md
+++ b/packages/assert/README.md
@@ -11,13 +11,17 @@ yarn add @0xproject/assert
 
 ## Usage
 
-TODO - Custom documentation page is in progress.
+```typescript
+import {assert} from '@0xproject/assert';
+
+assert.isValidBaseUnitAmount('baseUnitAmount', baseUnitAmount);
+```
 
 ## Contributing
 
 We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[CONTRIBUTING.md](../../CONTRIBUTING.md)
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
diff --git a/packages/json-schemas/README.md b/packages/json-schemas/README.md
index 1621699e3c..1c0d001b55 100644
--- a/packages/json-schemas/README.md
+++ b/packages/json-schemas/README.md
@@ -28,7 +28,7 @@ const isValid: boolean = validator.isValid(order, orderSchema); // Only returns
 
 We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[CONTRIBUTING.md](../../CONTRIBUTING.md)
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index f737062b29..bbd0fb0f2d 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -23,7 +23,7 @@ yarn add --dev @0xproject/tslint-config
 
 We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[CONTRIBUTING.md](../../CONTRIBUTING.md)
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md
index c8a984435c..3624cea8cd 100644
--- a/packages/web3-wrapper/README.md
+++ b/packages/web3-wrapper/README.md
@@ -17,7 +17,7 @@ TODO - Custom documentation page is in progress.
 
 We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[CONTRIBUTING.md](../../CONTRIBUTING.md)
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

From 8ed776e113f0e249d50aa9e74b459b770ff62cee Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:17:17 +0100
Subject: [PATCH 108/125] Fix yarn workspaces explanation

---
 packages/assert/README.md        |  2 +-
 packages/json-schemas/README.md  |  2 +-
 packages/tslint-config/README.md |  3 ++-
 packages/web3-wrapper/README.md  | 12 +++++++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/assert/README.md b/packages/assert/README.md
index 585b4f39e2..40854cfa22 100644
--- a/packages/assert/README.md
+++ b/packages/assert/README.md
@@ -25,7 +25,7 @@ Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting
 
 ### Install Dependencies
 
-If you don't have yarn workspaces enabled - enable them:
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 ```bash
 yarn config set workspaces-experimental true
 ```
diff --git a/packages/json-schemas/README.md b/packages/json-schemas/README.md
index 1c0d001b55..21ba92a37a 100644
--- a/packages/json-schemas/README.md
+++ b/packages/json-schemas/README.md
@@ -32,7 +32,7 @@ Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting
 
 ### Install Dependencies
 
-If you don't have yarn workspaces enabled - enable them:
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 ```bash
 yarn config set workspaces-experimental true
 ```
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index bbd0fb0f2d..e943bc0db4 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -11,6 +11,7 @@ yarn add --dev @0xproject/tslint-config
 
 ## Usage
 
+Add the following to your `tslint.json` file
 ```json
 {
   "extends": [
@@ -27,7 +28,7 @@ Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting
 
 ### Install Dependencies
 
-If you don't have yarn workspaces enabled - enable them:
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 ```bash
 yarn config set workspaces-experimental true
 ```
diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md
index 3624cea8cd..2aac1124b1 100644
--- a/packages/web3-wrapper/README.md
+++ b/packages/web3-wrapper/README.md
@@ -1,7 +1,7 @@
 @0xproject/web3-wrapper
 ------
 
-Wrapped version of web3 with nicer interface to be used across 0x projects and packages
+Wrapped version of web3 with a nicer interface that is used across 0x projects and packages
 
 ## Installation
 
@@ -11,7 +11,13 @@ yarn add @0xproject/web3-wrapper
 
 ## Usage
 
-TODO - Custom documentation page is in progress.
+```typescript
+import {Web3Wrapper} from '@0xproject/web3-wrapper';
+
+const web3 = ...;
+const web3Wrapper = new Web3Wrapper(web3.currentProvider);
+const availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
+```
 
 ## Contributing
 
@@ -21,7 +27,7 @@ Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting
 
 ### Install Dependencies
 
-If you don't have yarn workspaces enabled - enable them:
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 ```bash
 yarn config set workspaces-experimental true
 ```

From bf1603839ee5b7e8a1b1db32a0d037b3680a38d6 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:21:39 +0100
Subject: [PATCH 109/125] Change contributing test

---
 packages/assert/README.md        | 2 +-
 packages/json-schemas/README.md  | 2 +-
 packages/tslint-config/README.md | 2 +-
 packages/web3-wrapper/README.md  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/assert/README.md b/packages/assert/README.md
index 40854cfa22..052d56582f 100644
--- a/packages/assert/README.md
+++ b/packages/assert/README.md
@@ -19,7 +19,7 @@ assert.isValidBaseUnitAmount('baseUnitAmount', baseUnitAmount);
 
 ## Contributing
 
-We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
diff --git a/packages/json-schemas/README.md b/packages/json-schemas/README.md
index 21ba92a37a..94dfd86400 100644
--- a/packages/json-schemas/README.md
+++ b/packages/json-schemas/README.md
@@ -26,7 +26,7 @@ const isValid: boolean = validator.isValid(order, orderSchema); // Only returns
 
 ## Contributing
 
-We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index e943bc0db4..b27d05df0c 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -22,7 +22,7 @@ Add the following to your `tslint.json` file
 
 ## Contributing
 
-We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md
index 2aac1124b1..c6e2163a33 100644
--- a/packages/web3-wrapper/README.md
+++ b/packages/web3-wrapper/README.md
@@ -21,7 +21,7 @@ const availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
 
 ## Contributing
 
-We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 

From 2a7cafbf20e4ceb42ab79303213a324261dadc0c Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:44:54 +0100
Subject: [PATCH 110/125] Add err==null assertions

---
 packages/0x.js/test/ether_token_wrapper_test.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/0x.js/test/ether_token_wrapper_test.ts b/packages/0x.js/test/ether_token_wrapper_test.ts
index 03f5216eef..b64c532839 100644
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -154,6 +154,7 @@ describe('EtherTokenWrapper', () => {
         it('Should receive the Transfer event when tokens are transfered', (done: DoneCallback) => {
             (async () => {
                 const callback = (err: Error, logEvent: DecodedLogEvent<TransferContractEventArgs>) => {
+                    expect(err).to.be.null();
                     expect(logEvent).to.not.be.undefined();
                     expect(logEvent.isRemoved).to.be.false();
                     expect(logEvent.log.logIndex).to.be.equal(0);
@@ -176,6 +177,7 @@ describe('EtherTokenWrapper', () => {
         it('Should receive the Approval event when allowance is being set', (done: DoneCallback) => {
             (async () => {
                 const callback = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
+                    expect(err).to.be.null();
                     expect(logEvent).to.not.be.undefined();
                     expect(logEvent.isRemoved).to.be.false();
                     const args = logEvent.log.args;
@@ -194,6 +196,7 @@ describe('EtherTokenWrapper', () => {
         it('Should receive the Deposit event when ether is being deposited', (done: DoneCallback) => {
             (async () => {
                 const callback = (err: Error, logEvent: DecodedLogEvent<DepositContractEventArgs>) => {
+                    expect(err).to.be.null();
                     expect(logEvent).to.not.be.undefined();
                     expect(logEvent.isRemoved).to.be.false();
                     const args = logEvent.log.args;
@@ -211,6 +214,7 @@ describe('EtherTokenWrapper', () => {
         it('Should receive the Withdrawal event when ether is being withdrewn', (done: DoneCallback) => {
             (async () => {
                 const callback = (err: Error, logEvent: DecodedLogEvent<WithdrawalContractEventArgs>) => {
+                    expect(err).to.be.null();
                     expect(logEvent).to.not.be.undefined();
                     expect(logEvent.isRemoved).to.be.false();
                     const args = logEvent.log.args;

From 01bc254cd0cc96d2657aec61a21bddae44bb5d0e Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:45:13 +0100
Subject: [PATCH 111/125] Fix a typo

---
 packages/0x.js/test/ether_token_wrapper_test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/0x.js/test/ether_token_wrapper_test.ts b/packages/0x.js/test/ether_token_wrapper_test.ts
index b64c532839..4d12f9f88f 100644
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -211,7 +211,7 @@ describe('EtherTokenWrapper', () => {
                 );
             })().catch(done);
         });
-        it('Should receive the Withdrawal event when ether is being withdrewn', (done: DoneCallback) => {
+        it('Should receive the Withdrawal event when ether is being withdrawn', (done: DoneCallback) => {
             (async () => {
                 const callback = (err: Error, logEvent: DecodedLogEvent<WithdrawalContractEventArgs>) => {
                     expect(err).to.be.null();

From 455f74d449738d43abb5caee3aa02ea86286866c Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:45:35 +0100
Subject: [PATCH 112/125] Fix test description

---
 packages/0x.js/test/ether_token_wrapper_test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/0x.js/test/ether_token_wrapper_test.ts b/packages/0x.js/test/ether_token_wrapper_test.ts
index 4d12f9f88f..4fcb374092 100644
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -232,7 +232,7 @@ describe('EtherTokenWrapper', () => {
                 );
             })().catch(done);
         });
-        it('Outstanding subscriptions are cancelled when zeroEx.setProvider called', (done: DoneCallback) => {
+        it('should cancel outstanding subscriptions when ZeroEx.setProvider is called', (done: DoneCallback) => {
             (async () => {
                 const callbackNeverToBeCalled = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
                     done(new Error('Expected this subscription to have been cancelled'));

From 317194322897b0fc3b7cacaa1a825209a7d74d41 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 14:50:08 +0100
Subject: [PATCH 113/125] Fix command

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd24d3c3fe..3b9b0c690e 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ yarn testrpc
 Then in your main terminal run
 ```
 cd packages/contracts
-yarn run migrate
+yarn migrate
 cd ..
 ```
 

From a0f5ceddce1ae33f388891b1ceff1d88e0217f1c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 14:50:20 +0100
Subject: [PATCH 114/125] Flesh out LedgerSubprovider usage example

---
 packages/subproviders/README.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 2d7483b165..2baa739908 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -14,7 +14,17 @@ yarn add @0xproject/subproviders
 Simply import the subprovider you are interested in using:
 
 ```javascript
-import {LedgerSubprovider} from '@0xproject/subproviders';
+import {
+    ledgerEthereumBrowserClientFactoryAsync as ledgerEthereumClientFactoryAsync,
+    LedgerSubprovider,
+} from '@0xproject/subproviders';
+
+const ledgerSubprovider = new LedgerSubprovider(
+    networkId,
+    ledgerEthereumClientFactoryAsync,
+);
+
+const accounts = await ledgerSubprovider.getAccountsAsync();
 ```
 
 ### Subproviders

From 23aa3ec5eaa25e8afd24ddf048889d1c44940a70 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 14:51:04 +0100
Subject: [PATCH 115/125] Add Yarn < v1.0 disclaimer

---
 packages/subproviders/README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 2baa739908..5d74de9d17 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -49,6 +49,11 @@ Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting
 
 ### Install Dependencies
 
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+```bash
+yarn config set workspaces-experimental true
+```
+
 ```bash
 yarn install
 ```

From 9ed05f56d360d9566d3f749fc5335768e67a87c1 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 14:53:38 +0100
Subject: [PATCH 116/125] Replace our EtherTokens with WETH9 from maker

---
 .../contracts/contracts/tokens/EtherToken.sol |  57 ------
 .../contracts/tokens/EtherToken_v2.sol        |  60 -------
 .../contracts/deploy/migrations/migrate.ts    |  15 +-
 .../2_deploy_independent_contracts.ts         |   3 -
 packages/contracts/test/ts/ether_token_v2.ts  | 166 ------------------
 packages/contracts/util/artifacts.ts          |   4 +-
 6 files changed, 2 insertions(+), 303 deletions(-)
 delete mode 100644 packages/contracts/contracts/tokens/EtherToken.sol
 delete mode 100644 packages/contracts/contracts/tokens/EtherToken_v2.sol
 delete mode 100644 packages/contracts/test/ts/ether_token_v2.ts

diff --git a/packages/contracts/contracts/tokens/EtherToken.sol b/packages/contracts/contracts/tokens/EtherToken.sol
deleted file mode 100644
index 2eae012fc9..0000000000
--- a/packages/contracts/contracts/tokens/EtherToken.sol
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-
-  Copyright 2017 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.4.11;
-
-import "./UnlimitedAllowanceToken.sol";
-import "./../utils/SafeMath.sol";
-
-contract EtherToken is UnlimitedAllowanceToken, SafeMath {
-
-    string constant public name = "Ether Token";
-    string constant public symbol = "WETH";
-    uint8 constant public decimals = 18;
-
-    /// @dev Fallback to calling deposit when ether is sent directly to contract.
-    function()
-        public
-        payable
-    {
-        deposit();
-    }
-
-    /// @dev Buys tokens with Ether, exchanging them 1:1.
-    function deposit()
-        public
-        payable
-    {
-        balances[msg.sender] = safeAdd(balances[msg.sender], msg.value);
-        totalSupply = safeAdd(totalSupply, msg.value);
-    }
-
-    /// @dev Sells tokens in exchange for Ether, exchanging them 1:1.
-    /// @param amount Number of tokens to sell.
-    function withdraw(uint amount)
-        public
-    {
-        balances[msg.sender] = safeSub(balances[msg.sender], amount);
-        totalSupply = safeSub(totalSupply, amount);
-        require(msg.sender.send(amount));
-    }
-}
-
diff --git a/packages/contracts/contracts/tokens/EtherToken_v2.sol b/packages/contracts/contracts/tokens/EtherToken_v2.sol
deleted file mode 100644
index f172c8e350..0000000000
--- a/packages/contracts/contracts/tokens/EtherToken_v2.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-
-  Copyright 2017 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.18;
-
-import "./UnlimitedAllowanceToken_v2.sol";
-import "./../utils/SafeMath_v2.sol";
-
-contract EtherToken_v2 is UnlimitedAllowanceToken_v2, SafeMath_v2 {
-
-    string constant public name = "Ether Token";
-    string constant public symbol = "WETH";
-    string constant public version = "2.0.0"; // version 1.0.0 deployed on mainnet at 0x2956356cd2a2bf3202f771f50d3d14a367b48070
-    uint8 constant public decimals = 18;
-
-    /// @dev Fallback to calling deposit when ether is sent directly to contract.
-    function()
-        public
-        payable
-    {
-        deposit();
-    }
-
-    /// @dev Buys tokens with Ether, exchanging them 1:1.
-    function deposit()
-        public
-        payable
-    {
-        balances[msg.sender] = safeAdd(balances[msg.sender], msg.value);
-        totalSupply = safeAdd(totalSupply, msg.value);
-        Transfer(address(0), msg.sender, msg.value);
-    }
-
-    /// @dev Sells tokens in exchange for Ether, exchanging them 1:1.
-    /// @param _value Number of tokens to sell.
-    function withdraw(uint _value)
-        public
-    {
-        balances[msg.sender] = safeSub(balances[msg.sender], _value);
-        totalSupply = safeSub(totalSupply, _value);
-        require(msg.sender.send(_value));
-        Transfer(msg.sender, address(0), _value);
-    }
-}
-
diff --git a/packages/contracts/deploy/migrations/migrate.ts b/packages/contracts/deploy/migrations/migrate.ts
index e2c220f68c..d21d48a82e 100644
--- a/packages/contracts/deploy/migrations/migrate.ts
+++ b/packages/contracts/deploy/migrations/migrate.ts
@@ -19,8 +19,7 @@ export const migrator = {
 
         const tokenTransferProxy = await deployer.deployAndSaveAsync('TokenTransferProxy');
         const zrxToken = await deployer.deployAndSaveAsync('ZRXToken');
-        const etherToken = await deployer.deployAndSaveAsync('EtherToken');
-        const makerEtherToken = await deployer.deployAndSaveAsync('WETH9');
+        const etherToken = await deployer.deployAndSaveAsync('WETH9');
         const tokenReg = await deployer.deployAndSaveAsync('TokenRegistry');
 
         const exchangeArgs = [zrxToken.address, tokenTransferProxy.address];
@@ -69,18 +68,6 @@ export const migrator = {
                 gas: addTokenGasEstimate,
             },
         );
-        await tokenReg.addToken.sendTransactionAsync(
-            makerEtherToken.address,
-            'Maker Ether Token',
-            'WETH9',
-            18,
-            constants.NULL_BYTES,
-            constants.NULL_BYTES,
-            {
-                from: owner,
-                gas: addTokenGasEstimate,
-            },
-        );
         for (const token of tokenInfo) {
             const totalSupply = new BigNumber(0);
             const args = [
diff --git a/packages/contracts/migrations/2_deploy_independent_contracts.ts b/packages/contracts/migrations/2_deploy_independent_contracts.ts
index 4bf316be6e..b465db7dba 100644
--- a/packages/contracts/migrations/2_deploy_independent_contracts.ts
+++ b/packages/contracts/migrations/2_deploy_independent_contracts.ts
@@ -4,7 +4,6 @@ const {
     MultiSigWalletWithTimeLock,
     TokenTransferProxy,
     EtherToken,
-    EtherTokenV2,
     TokenRegistry,
 } = new Artifacts(artifacts);
 
@@ -34,8 +33,6 @@ module.exports = (deployer: any, network: string, accounts: string[]) => {
                 return deployer.deploy(TokenRegistry);
             }).then(() => {
                 return deployer.deploy(EtherToken);
-            }).then(() => {
-                return deployer.deploy(EtherTokenV2);
             });
     } else {
         deployer.deploy([
diff --git a/packages/contracts/test/ts/ether_token_v2.ts b/packages/contracts/test/ts/ether_token_v2.ts
deleted file mode 100644
index 480c4035bc..0000000000
--- a/packages/contracts/test/ts/ether_token_v2.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import {ZeroEx, ZeroExError} from '0x.js';
-import {promisify} from '@0xproject/utils';
-import {BigNumber} from 'bignumber.js';
-import * as chai from 'chai';
-import Web3 = require('web3');
-
-import {Artifacts} from '../../util/artifacts';
-import {constants} from '../../util/constants';
-
-import {chaiSetup} from './utils/chai_setup';
-
-const {EtherTokenV2} = new Artifacts(artifacts);
-
-chaiSetup.configure();
-const expect = chai.expect;
-
-// In order to benefit from type-safety, we re-assign the global web3 instance injected by Truffle
-// with type `any` to a variable of type `Web3`.
-const web3: Web3 = (global as any).web3;
-
-contract('EtherTokenV2', (accounts: string[]) => {
-    const account = accounts[0];
-    const gasPrice = ZeroEx.toBaseUnitAmount(new BigNumber(20), 9);
-    let zeroEx: ZeroEx;
-    let etherTokenAddress: string;
-    beforeEach(async () => {
-        const etherToken = await EtherTokenV2.new();
-        etherTokenAddress = etherToken.address;
-        zeroEx = new ZeroEx(web3.currentProvider, {
-            gasPrice,
-            networkId: constants.TESTRPC_NETWORK_ID,
-        });
-    });
-
-    const sendTransactionAsync = promisify<string>(web3.eth.sendTransaction);
-    const getEthBalanceAsync = async (owner: string) => {
-        const balanceStr = await promisify<string>(web3.eth.getBalance)(owner);
-        const balance = new BigNumber(balanceStr);
-        return balance;
-    };
-
-    describe('deposit', () => {
-        it('should throw if caller attempts to deposit more Ether than caller balance', async () => {
-            const initEthBalance = await getEthBalanceAsync(account);
-            const ethToDeposit = initEthBalance.plus(1);
-
-            return expect(zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account))
-                .to.be.rejectedWith(ZeroExError.InsufficientEthBalanceForDeposit);
-        });
-
-        it('should convert deposited Ether to wrapped Ether tokens', async () => {
-            const initEthBalance = await getEthBalanceAsync(account);
-            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-            const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
-
-            const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
-            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
-
-            const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
-            const finalEthBalance = await getEthBalanceAsync(account);
-            const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-            expect(finalEthBalance).to.be.bignumber.equal(initEthBalance.minus(ethToDeposit.plus(ethSpentOnGas)));
-            expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.plus(ethToDeposit));
-        });
-
-        it('should log 1 event with correct arguments', async () => {
-            const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
-
-            const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
-            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
-
-            const logs = receipt.logs;
-            expect(logs.length).to.equal(1);
-
-            const expectedFrom = ZeroEx.NULL_ADDRESS;
-            const expectedTo = account;
-            const expectedValue = ethToDeposit;
-            const logArgs = (logs[0] as any).args;
-            expect(logArgs._from).to.equal(expectedFrom);
-            expect(logArgs._to).to.equal(expectedTo);
-            expect(logArgs._value).to.be.bignumber.equal(expectedValue);
-        });
-    });
-
-    describe('withdraw', () => {
-        beforeEach(async () => {
-            const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
-            await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
-        });
-
-        it('should throw if caller attempts to withdraw greater than caller balance', async () => {
-            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-            const ethTokensToWithdraw = initEthTokenBalance.plus(1);
-
-            return expect(zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account))
-                .to.be.rejectedWith(ZeroExError.InsufficientWEthBalanceForWithdrawal);
-        });
-
-        it('should convert ether tokens to ether with sufficient balance', async () => {
-            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-            const initEthBalance = await getEthBalanceAsync(account);
-            const ethTokensToWithdraw = initEthTokenBalance;
-            expect(ethTokensToWithdraw).to.not.be.bignumber.equal(0);
-            const txHash = await zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account, {
-                gasLimit: constants.MAX_ETHERTOKEN_WITHDRAW_GAS,
-            });
-            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
-
-            const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
-            const finalEthBalance = await getEthBalanceAsync(account);
-            const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-            expect(finalEthBalance).to.be.bignumber
-                .equal(initEthBalance.plus(ethTokensToWithdraw.minus(ethSpentOnGas)));
-            expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.minus(ethTokensToWithdraw));
-        });
-
-        it('should log 1 event with correct arguments', async () => {
-            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-            const ethTokensToWithdraw = initEthTokenBalance;
-            expect(ethTokensToWithdraw).to.not.be.bignumber.equal(0);
-            const txHash = await zeroEx.etherToken.withdrawAsync(etherTokenAddress, ethTokensToWithdraw, account, {
-                gasLimit: constants.MAX_ETHERTOKEN_WITHDRAW_GAS,
-            });
-            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
-
-            const logs = receipt.logs;
-            expect(logs.length).to.equal(1);
-
-            const expectedFrom = account;
-            const expectedTo = ZeroEx.NULL_ADDRESS;
-            const expectedValue = ethTokensToWithdraw;
-            const logArgs = (logs[0] as any).args;
-            expect(logArgs._from).to.equal(expectedFrom);
-            expect(logArgs._to).to.equal(expectedTo);
-            expect(logArgs._value).to.be.bignumber.equal(expectedValue);
-        });
-    });
-
-    describe('fallback', () => {
-        it('should convert sent ether to ether tokens', async () => {
-            const initEthBalance = await getEthBalanceAsync(account);
-            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-            const ethToDeposit = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
-
-            const txHash = await sendTransactionAsync({
-                from: account,
-                to: etherTokenAddress,
-                value: ethToDeposit,
-                gasPrice,
-            });
-
-            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
-
-            const ethSpentOnGas = gasPrice.times(receipt.gasUsed);
-            const finalEthBalance = await getEthBalanceAsync(account);
-            const finalEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
-
-            expect(finalEthBalance).to.be.bignumber.equal(initEthBalance.minus(ethToDeposit.plus(ethSpentOnGas)));
-            expect(finalEthTokenBalance).to.be.bignumber.equal(initEthTokenBalance.plus(ethToDeposit));
-        });
-    });
-});
diff --git a/packages/contracts/util/artifacts.ts b/packages/contracts/util/artifacts.ts
index 6b05df78cf..14acd32a12 100644
--- a/packages/contracts/util/artifacts.ts
+++ b/packages/contracts/util/artifacts.ts
@@ -8,7 +8,6 @@ export class Artifacts {
     public DummyToken: any;
     public DummyTokenV2: any;
     public EtherToken: any;
-    public EtherTokenV2: any;
     public MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress: any;
     public MaliciousToken: any;
     constructor(artifacts: any) {
@@ -20,8 +19,7 @@ export class Artifacts {
         this.ZRXToken = artifacts.require('ZRXToken');
         this.DummyToken = artifacts.require('DummyToken');
         this.DummyTokenV2 = artifacts.require('DummyToken_v2');
-        this.EtherToken = artifacts.require('EtherToken');
-        this.EtherTokenV2 = artifacts.require('EtherToken_v2');
+        this.EtherToken = artifacts.require('WETH9');
         this.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress = artifacts.require(
                 'MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress');
         this.MaliciousToken = artifacts.require('MaliciousToken');

From 1d430cf62fa6e957c15fbdf77524c6527d8df319 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 14:53:50 +0100
Subject: [PATCH 117/125] Standardize on improved contributing section

---
 README.md                           | 2 +-
 packages/monorepo-scripts/README.md | 2 +-
 packages/subproviders/README.md     | 2 +-
 packages/website/README.md          | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3b9b0c690e..2715a9e308 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Dedicated documentation pages:
 
 ## Contributing
 
-We strongly encourage the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
diff --git a/packages/monorepo-scripts/README.md b/packages/monorepo-scripts/README.md
index d2299b70db..452e0f94cc 100644
--- a/packages/monorepo-scripts/README.md
+++ b/packages/monorepo-scripts/README.md
@@ -16,7 +16,7 @@ This will list out any dependencies that differ in versions between packages.
 
 ## Contributing
 
-We strongly recommend the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 5d74de9d17..9f01b44538 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -43,7 +43,7 @@ A subprovider that relays all signing related requests to a particular provider
 
 ## Contributing
 
-We strongly encourage the community to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
diff --git a/packages/website/README.md b/packages/website/README.md
index 53cdbd8d35..c050c6387e 100644
--- a/packages/website/README.md
+++ b/packages/website/README.md
@@ -7,6 +7,11 @@ This repository contains our website and [0x Portal DApp][portal-url] (over-the-
 [whitepaper-url]: https://0xproject.com/pdfs/0x_white_paper.pdf
 [portal-url]: https://0xproject.com/portal
 
+## Contributing
+
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ## Local Dev Setup
 

From 03fd73fab8b26fd3551b610f8bbc63bbcf81a230 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 15:00:25 +0100
Subject: [PATCH 118/125] Update snapshot and artifacts

---
 .circleci/config.yml                            | 2 +-
 packages/0x.js/src/artifacts/EtherToken.json    | 2 +-
 packages/0x.js/src/artifacts/Exchange.json      | 2 +-
 packages/0x.js/src/artifacts/TokenRegistry.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4d88fd8c4b..6165603ced 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
     docker:
       - image: circleci/node:6.12
     environment:
-      CONTRACTS_COMMIT_HASH: 'e0f509f'
+      CONTRACTS_COMMIT_HASH: '9ed05f5'
     steps:
       - checkout
       - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
diff --git a/packages/0x.js/src/artifacts/EtherToken.json b/packages/0x.js/src/artifacts/EtherToken.json
index 8eb4d250fa..1105af3b0e 100644
--- a/packages/0x.js/src/artifacts/EtherToken.json
+++ b/packages/0x.js/src/artifacts/EtherToken.json
@@ -278,7 +278,7 @@
       "address": "0x653e49e301e508a13237c0ddc98ae7d4cd2667a1"
     },
     "50": {
-      "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082"
+      "address": "0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c"
     }
   }
 }
diff --git a/packages/0x.js/src/artifacts/Exchange.json b/packages/0x.js/src/artifacts/Exchange.json
index fa16637afd..cf9124ca7a 100644
--- a/packages/0x.js/src/artifacts/Exchange.json
+++ b/packages/0x.js/src/artifacts/Exchange.json
@@ -601,7 +601,7 @@
       "address": "0x90fe2af704b34e0224bf2299c838e04d4dcf1364"
     },
     "50": {
-      "address": "0x34d402f14d58e001d8efbe6585051bf9706aa064"
+      "address": "0x48bacb9266a570d521063ef5dd96e61686dbe788"
     }
   }
 }
diff --git a/packages/0x.js/src/artifacts/TokenRegistry.json b/packages/0x.js/src/artifacts/TokenRegistry.json
index c15729dbcf..973a101e83 100644
--- a/packages/0x.js/src/artifacts/TokenRegistry.json
+++ b/packages/0x.js/src/artifacts/TokenRegistry.json
@@ -538,7 +538,7 @@
       "address": "0xf18e504561f4347bea557f3d4558f559dddbae7f"
     },
     "50": {
-      "address": "0x48bacb9266a570d521063ef5dd96e61686dbe788"
+      "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082"
     }
   }
 }

From d05a36deed7c79cd31656d0d7977ba7be7784243 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 15:02:22 +0100
Subject: [PATCH 119/125] Fix WETH symbol

---
 packages/0x.js/test/utils/token_utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/0x.js/test/utils/token_utils.ts b/packages/0x.js/test/utils/token_utils.ts
index 8774925bce..7da7f466cd 100644
--- a/packages/0x.js/test/utils/token_utils.ts
+++ b/packages/0x.js/test/utils/token_utils.ts
@@ -3,7 +3,7 @@ import * as _ from 'lodash';
 import {InternalZeroExError, Token} from '../../src/types';
 
 const PROTOCOL_TOKEN_SYMBOL = 'ZRX';
-const WETH_TOKEN_SYMBOL = 'WETH9';
+const WETH_TOKEN_SYMBOL = 'WETH';
 
 export class TokenUtils {
     private tokens: Token[];

From ad61fe4b5455b2fe700f8777c0133e3f45ea4ebd Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 15:16:18 +0100
Subject: [PATCH 120/125] Fix link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2715a9e308..1ac7f1e29a 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Dedicated documentation pages:
 
 We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](./CONTRIBUTING.md) before getting started.
 
 ### Install dependencies
 

From 05ee36876386764c76aa0d2359ba17258152097d Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 20 Dec 2017 15:17:36 +0100
Subject: [PATCH 121/125] Fix md link

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b4602b01be..31243fd727 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,7 +42,7 @@ We also recommend you read through the tests.
 
 ## Styleguide
 
-We use `[tslint](https://palantir.github.io/tslint/)` with [custom configs](https://github.com/0xProject/tslint-config-0xproject) to keep our code style consistent.
+We use [TSLint](https://palantir.github.io/tslint/) with [custom configs](https://github.com/0xProject/tslint-config-0xproject) to keep our code style consistent.
 
 To lint your code just run: `yarn lint`
 

From 3e3587c2811ed2078aa821490f446c24c9ab5eec Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 15:21:36 +0100
Subject: [PATCH 122/125] Fix linter issue

---
 packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
index 3e5be3ae4f..969f30463a 100644
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -11,7 +11,6 @@ import {
     EventCallback,
     IndexedFilterValues,
     LogWithDecodedArgs,
-    TokenEvents,
     TransactionOpts,
     ZeroExError,
 } from '../types';

From 5d4078bcf41738d2fa1b72d7abacec297ed6bcfe Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 16:24:56 +0100
Subject: [PATCH 123/125] Add slashes to base URLs

---
 packages/0x.js/test/utils/constants.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/0x.js/test/utils/constants.ts b/packages/0x.js/test/utils/constants.ts
index d486da5813..7b6b2ee7b2 100644
--- a/packages/0x.js/test/utils/constants.ts
+++ b/packages/0x.js/test/utils/constants.ts
@@ -1,11 +1,11 @@
 export const constants = {
     NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
-    RPC_URL: 'http://localhost:8545',
+    RPC_URL: 'http://localhost:8545/',
     ROPSTEN_NETWORK_ID: 3,
     KOVAN_NETWORK_ID: 42,
     TESTRPC_NETWORK_ID: 50,
-    KOVAN_RPC_URL: 'https://kovan.infura.io',
-    ROPSTEN_RPC_URL: 'https://ropsten.infura.io',
+    KOVAN_RPC_URL: 'https://kovan.infura.io/',
+    ROPSTEN_RPC_URL: 'https://ropsten.infura.io/',
     ZRX_DECIMALS: 18,
     GAS_ESTIMATE: 500000,
 };

From 6636a0861d6229efc7d888c48b9c6ee5ab5d1352 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 16:40:19 +0100
Subject: [PATCH 124/125] Update CHANGELOGs

---
 packages/0x.js/CHANGELOG.md         | 2 +-
 packages/json-schemas/CHANGELOG.md  | 4 ++--
 packages/subproviders/CHANGELOG.md  | 2 +-
 packages/tslint-config/CHANGELOG.md | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index f2905ad7e4..d85ace89fa 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CHANGELOG
 
-v0.x.x - _TBD, 2017_
+v0.28.0 - _December 20, 2017_
 ------------------------
     * Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `zeroEx.etherToken` (#267)
     * Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry` (#267)
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md
index 81225e5deb..12a3ab0009 100644
--- a/packages/json-schemas/CHANGELOG.md
+++ b/packages/json-schemas/CHANGELOG.md
@@ -1,9 +1,9 @@
 # CHANGELOG
 
-v0.x.x - _TBD, 2017_
+v0.7.0 - _December 20, 2017_
 ------------------------
     * Rename `subscriptionOptsSchema` to `blockRangeSchema` (#272)
 
-v0.6.7 - _Nov. 14, 2017_
+v0.6.7 - _November 14, 2017_
 ------------------------
     * Re-publish JSON-schema previously published under NPM package 0x-json-schemas
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index 358fcfa15c..51362d805c 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -1,5 +1,5 @@
 # CHANGELOG
 
-v0.x.x - _TBD, 2017_
+v0.2.0 - _December 20, 2017_
 ------------------------
     * Improve the performance of address fetching (#271)
diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md
index 7a6ba41c0e..45c9eaad81 100644
--- a/packages/tslint-config/CHANGELOG.md
+++ b/packages/tslint-config/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+v0.3.0 - _December 20, 2017_
+------------------------
+    * Added rules for unused imports, variables and Async suffixes (#265)
+
 v0.1.0 - _Nov. 14, 2017_
 ------------------------
     * Re-published TsLintConfig previously published under NPM package `tslint-config-0xproject`

From a2bf19efc1d1aef67ac6da321fe36c53135c6555 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 20 Dec 2017 17:10:12 +0100
Subject: [PATCH 125/125] Publish

 - 0x.js@0.28.0
 - @0xproject/abi-gen@0.0.3
 - @0xproject/assert@0.0.8
 - @0xproject/connect@0.3.1
 - contracts@2.1.0
 - @0xproject/dev-utils@0.0.2
 - @0xproject/json-schemas@0.7.0
 - @0xproject/kovan_faucets@1.0.1
 - @0xproject/monorepo-scripts@0.1.1
 - @0xproject/subproviders@0.1.1
 - @0xproject/tslint-config@0.3.0
 - @0xproject/types@0.1.1
 - @0xproject/utils@0.1.1
 - @0xproject/web3-wrapper@0.1.1
 - @0xproject/website@0.0.3
---
 packages/0x.js/package.json            | 18 +++++++++---------
 packages/abi-gen/package.json          |  4 ++--
 packages/assert/package.json           |  8 ++++----
 packages/connect/package.json          |  8 ++++----
 packages/contracts/package.json        | 16 ++++++++--------
 packages/dev-utils/package.json        |  8 ++++----
 packages/json-schemas/package.json     |  6 +++---
 packages/kovan-faucets/package.json    |  8 ++++----
 packages/monorepo-scripts/package.json |  4 ++--
 packages/subproviders/package.json     | 10 +++++-----
 packages/tslint-config/package.json    |  2 +-
 packages/types/package.json            |  4 ++--
 packages/utils/package.json            |  4 ++--
 packages/web3-wrapper/package.json     |  8 ++++----
 packages/website/package.json          |  8 ++++----
 15 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index fcb08646af..145bbff167 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "0x.js",
-  "version": "0.27.2",
+  "version": "0.28.0",
   "description": "A javascript library for interacting with the 0x protocol",
   "keywords": [
     "0x.js",
@@ -45,10 +45,10 @@
     "node": ">=6.0.0"
   },
   "devDependencies": {
-    "@0xproject/abi-gen": "^0.0.2",
-    "@0xproject/tslint-config": "^0.2.1",
-    "@0xproject/types": "^0.1.0",
-    "@0xproject/dev-utils": "^0.0.1",
+    "@0xproject/abi-gen": "^0.0.3",
+    "@0xproject/dev-utils": "^0.0.2",
+    "@0xproject/tslint-config": "^0.3.0",
+    "@0xproject/types": "^0.1.1",
     "@types/bintrees": "^1.0.2",
     "@types/jsonschema": "^1.1.1",
     "@types/lodash": "^4.14.86",
@@ -84,10 +84,10 @@
     "webpack": "^3.1.0"
   },
   "dependencies": {
-    "@0xproject/assert": "^0.0.7",
-    "@0xproject/json-schemas": "^0.6.10",
-    "@0xproject/utils": "^0.1.0",
-    "@0xproject/web3-wrapper": "^0.1.0",
+    "@0xproject/assert": "^0.0.8",
+    "@0xproject/json-schemas": "^0.7.0",
+    "@0xproject/utils": "^0.1.1",
+    "@0xproject/web3-wrapper": "^0.1.1",
     "bignumber.js": "~4.1.0",
     "bintrees": "^1.0.2",
     "bn.js": "^4.11.8",
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index 00943f0633..ee88595b90 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/abi-gen",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Generate contract wrappers from ABI and handlebars templates",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -33,7 +33,7 @@
     "yargs": "^10.0.3"
   },
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
+    "@0xproject/tslint-config": "^0.3.0",
     "@types/glob": "^5.0.33",
     "@types/handlebars": "^4.0.36",
     "@types/mkdirp": "^0.5.1",
diff --git a/packages/assert/package.json b/packages/assert/package.json
index 2fb7746a8a..ff1c45f57f 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/assert",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Provides a standard way of performing type and schema validation across 0x projects",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md",
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
+    "@0xproject/tslint-config": "^0.3.0",
     "@types/lodash": "^4.14.86",
     "@types/mocha": "^2.2.42",
     "@types/valid-url": "^1.0.2",
@@ -37,8 +37,8 @@
     "typescript": "~2.6.1"
   },
   "dependencies": {
-    "@0xproject/json-schemas": "^0.6.10",
-    "@0xproject/utils": "^0.1.0",
+    "@0xproject/json-schemas": "^0.7.0",
+    "@0xproject/utils": "^0.1.1",
     "bignumber.js": "~4.1.0",
     "lodash": "^4.17.4",
     "valid-url": "^1.0.9"
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 39c94779ee..bf92f07d2d 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/connect",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A javascript library for interacting with the standard relayer api",
   "keywords": [
     "connect",
@@ -36,8 +36,8 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md",
   "dependencies": {
-    "@0xproject/assert": "^0.0.7",
-    "@0xproject/json-schemas": "^0.6.10",
+    "@0xproject/assert": "^0.0.8",
+    "@0xproject/json-schemas": "^0.7.0",
     "bignumber.js": "~4.1.0",
     "isomorphic-fetch": "^2.2.1",
     "lodash": "^4.17.4",
@@ -45,7 +45,7 @@
     "websocket": "^1.0.25"
   },
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
+    "@0xproject/tslint-config": "^0.3.0",
     "@types/fetch-mock": "^5.12.1",
     "@types/lodash": "^4.14.86",
     "@types/mocha": "^2.2.42",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 0a7b8f5efc..bb05441b0a 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "contracts",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Smart contract components of 0x protocol",
   "main": "index.js",
   "directories": {
@@ -29,9 +29,9 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md",
   "devDependencies": {
-    "@0xproject/dev-utils": "^0.0.1",
-    "@0xproject/tslint-config": "^0.2.1",
-    "@0xproject/types": "^0.1.0",
+    "@0xproject/dev-utils": "^0.0.2",
+    "@0xproject/tslint-config": "^0.3.0",
+    "@0xproject/types": "^0.1.1",
     "@types/bluebird": "^3.5.3",
     "@types/lodash": "^4.14.86",
     "@types/node": "^8.0.53",
@@ -55,10 +55,10 @@
     "yargs": "^10.0.3"
   },
   "dependencies": {
-    "0x.js": "~0.27.2",
-    "@0xproject/json-schemas": "^0.6.10",
-    "@0xproject/utils": "^0.1.0",
-    "@0xproject/web3-wrapper": "^0.1.0",
+    "0x.js": "^0.28.0",
+    "@0xproject/json-schemas": "^0.7.0",
+    "@0xproject/utils": "^0.1.1",
+    "@0xproject/web3-wrapper": "^0.1.1",
     "bignumber.js": "~4.1.0",
     "bluebird": "^3.5.0",
     "bn.js": "^4.11.8",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index d9a0fa1936..70a598c711 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/dev-utils",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "0x dev TS utils",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,14 +19,14 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/dev-utils/README.md",
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.0",
+    "@0xproject/tslint-config": "^0.3.0",
     "@types/lodash": "^4.14.86",
     "npm-run-all": "^4.1.2",
     "shx": "^0.2.2",
     "tslint": "5.8.0",
-    "typescript": "~2.6.1",
     "types-bn": "^0.0.1",
-    "types-ethereumjs-util": "0xProject/types-ethereumjs-util"
+    "types-ethereumjs-util": "0xProject/types-ethereumjs-util",
+    "typescript": "~2.6.1"
   },
   "dependencies": {
     "bignumber.js": "~4.1.0",
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index 0b3481d1fc..1a13fd2f8c 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/json-schemas",
-  "version": "0.6.10",
+  "version": "0.7.0",
   "description": "0x-related json schemas",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
@@ -27,8 +27,8 @@
     "lodash.values": "^4.3.0"
   },
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
-    "@0xproject/utils": "^0.1.0",
+    "@0xproject/tslint-config": "^0.3.0",
+    "@0xproject/utils": "^0.1.1",
     "@types/lodash.foreach": "^4.5.3",
     "@types/lodash.values": "^4.3.3",
     "@types/mocha": "^2.2.42",
diff --git a/packages/kovan-faucets/package.json b/packages/kovan-faucets/package.json
index 378cd26139..8644907117 100644
--- a/packages/kovan-faucets/package.json
+++ b/packages/kovan-faucets/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@0xproject/kovan_faucets",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether",
   "main": "server.js",
   "scripts": {
@@ -14,8 +14,8 @@
   "author": "Fabio Berger",
   "license": "Apache-2.0",
   "dependencies": {
-    "@0xproject/utils": "^0.1.0",    
-    "0x.js": "~0.27.2",
+    "0x.js": "^0.28.0",
+    "@0xproject/utils": "^0.1.1",
     "bignumber.js": "~4.1.0",
     "body-parser": "^1.17.1",
     "ethereumjs-tx": "^1.3.3",
@@ -26,7 +26,7 @@
     "web3-provider-engine": "^13.0.1"
   },
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
+    "@0xproject/tslint-config": "^0.3.0",
     "@types/body-parser": "^1.16.1",
     "@types/express": "^4.0.35",
     "@types/lodash": "^4.14.86",
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index d696071098..d461b82466 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/monorepo-scripts",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "description": "Helper scripts for the monorepo",
   "scripts": {
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/monorepo-scripts/README.md",
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
+    "@0xproject/tslint-config": "^0.3.0",
     "@types/glob": "^5.0.33",
     "@types/node": "^8.0.53",
     "shx": "^0.2.2",
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 56fc9bf8b4..2311ef61d3 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/subproviders",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
   "license": "Apache-2.0",
@@ -17,8 +17,8 @@
     "test:integration": "run-s clean build run_mocha_integration"
   },
   "dependencies": {
-    "@0xproject/assert": "^0.0.7",
-    "@0xproject/utils": "^0.1.0",
+    "@0xproject/assert": "^0.0.8",
+    "@0xproject/utils": "^0.1.1",
     "bn.js": "^4.11.8",
     "es6-promisify": "^5.0.0",
     "ethereumjs-tx": "^1.3.3",
@@ -31,8 +31,8 @@
     "web3-provider-engine": "^13.0.1"
   },
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
-    "@0xproject/utils": "^0.1.0",
+    "@0xproject/tslint-config": "^0.3.0",
+    "@0xproject/utils": "^0.1.1",
     "@types/lodash": "^4.14.86",
     "@types/mocha": "^2.2.42",
     "@types/node": "^8.0.53",
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 888ff675a8..2f2aa8fa97 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/tslint-config",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Lint rules related to 0xProject for TSLint",
   "main": "tslint.json",
   "scripts": {
diff --git a/packages/types/package.json b/packages/types/package.json
index 1c8818f81f..39ba5dc964 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/types",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "0x types",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/types/README.md",
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
+    "@0xproject/tslint-config": "^0.3.0",
     "bignumber.js": "^5.0.0",
     "shx": "^0.2.2",
     "tslint": "5.8.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 8f856d0a08..729cd5f9f6 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/utils",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "0x TS utils",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/utils/README.md",
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
+    "@0xproject/tslint-config": "^0.3.0",
     "@types/lodash": "^4.14.86",
     "npm-run-all": "^4.1.2",
     "shx": "^0.2.2",
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 3ac532f553..2df0c08f4e 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/web3-wrapper",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Wraps around web3 and gives a nicer interface",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,8 +19,8 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md",
   "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.1",
-    "@0xproject/types": "^0.1.0",
+    "@0xproject/tslint-config": "^0.3.0",
+    "@0xproject/types": "^0.1.1",
     "@types/lodash": "^4.14.86",
     "npm-run-all": "^4.1.2",
     "shx": "^0.2.2",
@@ -29,7 +29,7 @@
     "web3-typescript-typings": "^0.7.2"
   },
   "dependencies": {
-    "@0xproject/utils": "^0.1.0",
+    "@0xproject/utils": "^0.1.1",
     "bignumber.js": "~4.1.0",
     "lodash": "^4.17.4",
     "web3": "^0.20.0"
diff --git a/packages/website/package.json b/packages/website/package.json
index 235ff236e9..ad7f361e59 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xproject/website",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "private": true,
   "description": "Website and 0x portal dapp",
   "scripts": {
@@ -18,9 +18,9 @@
   "author": "Fabio Berger",
   "license": "Apache-2.0",
   "dependencies": {
-    "0x.js": "~0.27.2",
-    "@0xproject/subproviders": "^0.1.0",
-    "@0xproject/utils": "^0.1.0",
+    "0x.js": "^0.28.0",
+    "@0xproject/subproviders": "^0.1.1",
+    "@0xproject/utils": "^0.1.1",
     "accounting": "^0.4.1",
     "basscss": "^8.0.3",
     "bignumber.js": "~4.1.0",