diff --git a/packages/blocks-watcher/.eslintignore b/packages/blocks-watcher/.eslintignore
new file mode 100644
index 0000000..55cb522
--- /dev/null
+++ b/packages/blocks-watcher/.eslintignore
@@ -0,0 +1,2 @@
+# Don't lint build output.
+dist
diff --git a/packages/blocks-watcher/.eslintrc.json b/packages/blocks-watcher/.eslintrc.json
new file mode 100644
index 0000000..a2b842c
--- /dev/null
+++ b/packages/blocks-watcher/.eslintrc.json
@@ -0,0 +1,28 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "semistandard",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 12,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "indent": ["error", 2, { "SwitchCase": 1 }],
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/explicit-module-boundary-types": [
+            "warn",
+            {
+                "allowArgumentsExplicitlyTypedAsAny": true
+            }
+        ]
+    }
+}
diff --git a/packages/blocks-watcher/.gitignore b/packages/blocks-watcher/.gitignore
new file mode 100644
index 0000000..1c88d0a
--- /dev/null
+++ b/packages/blocks-watcher/.gitignore
@@ -0,0 +1,7 @@
+node_modules/
+dist/
+out/
+gql-logs/
+
+.vscode
+.idea
diff --git a/packages/blocks-watcher/.husky/pre-commit b/packages/blocks-watcher/.husky/pre-commit
new file mode 100644
index 0000000..9dcd433
--- /dev/null
+++ b/packages/blocks-watcher/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint
diff --git a/packages/blocks-watcher/.npmrc b/packages/blocks-watcher/.npmrc
new file mode 100644
index 0000000..6b64c5b
--- /dev/null
+++ b/packages/blocks-watcher/.npmrc
@@ -0,0 +1 @@
+@cerc-io:registry=https://git.vdb.to/api/packages/cerc-io/npm/
diff --git a/packages/blocks-watcher/LICENSE b/packages/blocks-watcher/LICENSE
new file mode 100644
index 0000000..331f7cf
--- /dev/null
+++ b/packages/blocks-watcher/LICENSE
@@ -0,0 +1,661 @@
+                                                    GNU AFFERO GENERAL PUBLIC LICENSE
+                                                        Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
+                                 software and other kinds of works, specifically designed to ensure
+                                 cooperation with the community in the case of network server software.
+
+                                   The licenses for most software and other practical works are designed
+                                 to take away your freedom to share and change the works.  By contrast,
+                                 our General Public Licenses are 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.
+
+                                   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.
+
+                                   Developers that use our General Public Licenses protect your rights
+                                 with two steps: (1) assert copyright on the software, and (2) offer
+                                 you this License which gives you legal permission to copy, distribute
+                                 and/or modify the software.
+
+                                   A secondary benefit of defending all users' freedom is that
+                                 improvements made in alternate versions of the program, if they
+                                 receive widespread use, become available for other developers to
+                                 incorporate.  Many developers of free software are heartened and
+                                 encouraged by the resulting cooperation.  However, in the case of
+                                 software used on network servers, this result may fail to come about.
+                                 The GNU General Public License permits making a modified version and
+                                 letting the public access it on a server without ever releasing its
+                                 source code to the public.
+
+                                   The GNU Affero General Public License is designed specifically to
+                                 ensure that, in such cases, the modified source code becomes available
+                                 to the community.  It requires the operator of a network server to
+                                 provide the source code of the modified version running there to the
+                                 users of that server.  Therefore, public use of a modified version, on
+                                 a publicly accessible server, gives the public access to the source
+                                 code of the modified version.
+
+                                   An older license, called the Affero General Public License and
+                                 published by Affero, was designed to accomplish similar goals.  This is
+                                 a different license, not a version of the Affero GPL, but Affero has
+                                 released a new version of the Affero GPL which permits relicensing under
+                                 this license.
+
+                                   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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+                                   Notwithstanding any other provision of this License, if you modify the
+                                 Program, your modified version must prominently offer all users
+                                 interacting with it remotely through a computer network (if your version
+                                 supports such interaction) an opportunity to receive the Corresponding
+                                 Source of your version by providing access to the Corresponding Source
+                                 from a network server at no charge, through some standard or customary
+                                 means of facilitating copying of software.  This Corresponding Source
+                                 shall include the Corresponding Source for any work covered by version 3
+                                 of the GNU General Public License that is incorporated pursuant to the
+                                 following paragraph.
+
+                                   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 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 work with which it is combined will remain governed by version
+                                 3 of the GNU General Public License.
+
+                                   14. Revised Versions of this License.
+
+                                   The Free Software Foundation may publish revised and/or new versions of
+                                 the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+                                     You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
+                                 network, you should also make sure that it provides a way for users to
+                                 get its source.  For example, if your program is a web application, its
+                                 interface could display a "Source" link that leads users to an archive
+                                 of the code.  There are many ways you could offer source, and different
+                                 solutions will be better for different programs; see section 13 for the
+                                 specific requirements.
+
+                                   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 AGPL, see
+                                 <http://www.gnu.org/licenses/>.
diff --git a/packages/blocks-watcher/README.md b/packages/blocks-watcher/README.md
new file mode 100644
index 0000000..97c066f
--- /dev/null
+++ b/packages/blocks-watcher/README.md
@@ -0,0 +1,212 @@
+# blocks-watcher
+
+## Setup
+
+* Run the following command to install required packages:
+
+  ```bash
+  yarn
+  ```
+
+* Create a postgres12 database for the watcher:
+
+  ```bash
+  sudo su - postgres
+  createdb blocks-watcher
+  ```
+
+* If the watcher is an `active` watcher:
+
+  Create database for the job queue and enable the `pgcrypto` extension on them (https://github.com/timgit/pg-boss/blob/master/docs/usage.md#intro):
+
+  ```
+  createdb blocks-watcher-job-queue
+  ```
+
+  ```
+  postgres@tesla:~$ psql -U postgres -h localhost blocks-watcher-job-queue
+  Password for user postgres:
+  psql (12.7 (Ubuntu 12.7-1.pgdg18.04+1))
+  SSL connection (protocol: TLSv1.3, cipher: TLS_AES_256_GCM_SHA384, bits: 256, compression: off)
+  Type "help" for help.
+
+  blocks-watcher-job-queue=# CREATE EXTENSION pgcrypto;
+  CREATE EXTENSION
+  blocks-watcher-job-queue=# exit
+  ```
+
+* In the [config file](./environments/local.toml):
+
+  * Update the database connection settings.
+
+  * Update the `upstream` config and provide the `ipld-eth-server` GQL API endpoint.
+
+  * Update the `server` config with state checkpoint settings.
+
+## Customize
+
+* Indexing on an event:
+
+  * Edit the custom hook function `handleEvent` (triggered on an event) in [hooks.ts](./src/hooks.ts) to perform corresponding indexing using the `Indexer` object.
+
+  * While using the indexer storage methods for indexing, pass `diff` as true if default state is desired to be generated using the state variables being indexed.
+
+* Generating state:
+
+  * Edit the custom hook function `createInitialState` (triggered if the watcher passes the start block, checkpoint: `true`) in [hooks.ts](./src/hooks.ts) to save an initial `State` using the `Indexer` object.
+
+  * Edit the custom hook function `createStateDiff` (triggered on a block) in [hooks.ts](./src/hooks.ts) to save the state in a `diff` `State` using the `Indexer` object. The default state (if exists) is updated.
+
+  * Edit the custom hook function `createStateCheckpoint` (triggered just before default and CLI checkpoint) in [hooks.ts](./src/hooks.ts) to save the state in a `checkpoint` `State` using the `Indexer` object.
+
+### GQL Caching
+
+To enable GQL requests caching:
+
+* Update the `server.gql.cache` config with required settings.
+
+* In the GQL [schema file](./src/schema.gql), use the `cacheControl` directive to apply cache hints at schema level.
+
+  * Eg. Set `inheritMaxAge` to true for non-scalar fields of a type.
+
+* In the GQL [resolvers file](./src/resolvers.ts), uncomment the `setGQLCacheHints()` calls in resolvers for required queries.
+
+## Run
+
+* If the watcher is a `lazy` watcher:
+
+  * Run the server:
+
+    ```bash
+    yarn server
+    ```
+
+    GQL console: http://localhost:3008/graphql
+
+* If the watcher is an `active` watcher:
+
+  * Run the job-runner:
+
+    ```bash
+    yarn job-runner
+    ```
+
+  * Run the server:
+
+    ```bash
+    yarn server
+    ```
+
+    GQL console: http://localhost:3008/graphql
+
+  * To watch a contract:
+
+    ```bash
+    yarn watch:contract --address <contract-address> --kind <contract-kind> --checkpoint <true | false> --starting-block [block-number]
+    ```
+
+    * `address`: Address or identifier of the contract to be watched.
+    * `kind`: Kind of the contract.
+    * `checkpoint`: Turn checkpointing on (`true` | `false`).
+    * `starting-block`: Starting block for the contract (default: `1`).
+
+    Examples:
+
+    Watch a contract with its address and checkpointing on:
+
+    ```bash
+    yarn watch:contract --address 0x1F78641644feB8b64642e833cE4AFE93DD6e7833 --kind ERC20 --checkpoint true
+    ```
+
+    Watch a contract with its identifier and checkpointing on:
+
+    ```bash
+    yarn watch:contract --address MyProtocol --kind protocol --checkpoint true
+    ```
+
+  * To fill a block range:
+
+    ```bash
+    yarn fill --start-block <from-block> --end-block <to-block>
+    ```
+
+    * `start-block`: Block number to start filling from.
+    * `end-block`: Block number till which to fill.
+
+  * To create a checkpoint for a contract:
+
+    ```bash
+    yarn checkpoint create --address <contract-address> --block-hash [block-hash]
+    ```
+
+    * `address`: Address or identifier of the contract for which to create a checkpoint.
+    * `block-hash`: Hash of a block (in the pruned region) at which to create the checkpoint (default: latest canonical block hash).
+
+  * To verify a checkpoint:
+
+    ```bash
+    yarn checkpoint verify --cid <checkpoint-cid>
+    ```
+
+    `cid`: CID of the checkpoint for which to verify.
+
+  * To reset the watcher to a previous block number:
+
+    * Reset watcher:
+
+      ```bash
+      yarn reset watcher --block-number <previous-block-number>
+      ```
+
+    * Reset job-queue:
+
+      ```bash
+      yarn reset job-queue
+      ```
+
+    * Reset state:
+
+      ```bash
+      yarn reset state --block-number <previous-block-number>
+      ```
+
+    * `block-number`: Block number to which to reset the watcher.
+
+  * To export and import the watcher state:
+
+    * In source watcher, export watcher state:
+
+      ```bash
+      yarn export-state --export-file [export-file-path] --block-number [snapshot-block-height]
+      ```
+
+      * `export-file`: Path of file to which to export the watcher data.
+      * `block-number`: Block height at which to take snapshot for export.
+
+    * In target watcher, run job-runner:
+
+      ```bash
+      yarn job-runner
+      ```
+
+    * Import watcher state:
+
+      ```bash
+      yarn import-state --import-file <import-file-path>
+      ```
+
+      * `import-file`: Path of file from which to import the watcher data.
+
+    * Run server:
+
+      ```bash
+      yarn server
+      ```
+
+  * To inspect a CID:
+
+    ```bash
+    yarn inspect-cid --cid <cid>
+    ```
+
+    * `cid`: CID to be inspected.
diff --git a/packages/blocks-watcher/environments/local.toml b/packages/blocks-watcher/environments/local.toml
new file mode 100644
index 0000000..b2d532c
--- /dev/null
+++ b/packages/blocks-watcher/environments/local.toml
@@ -0,0 +1,109 @@
+[server]
+  host = "127.0.0.1"
+  port = 3008
+  kind = "active"
+
+  # Checkpointing state.
+  checkpointing = true
+
+  # Checkpoint interval in number of blocks.
+  checkpointInterval = 2000
+
+  # Enable state creation
+  # CAUTION: Disable only if state creation is not desired or can be filled subsequently
+  enableState = true
+
+  subgraphPath = "./subgraph-build"
+
+  # Interval to restart wasm instance periodically
+  wasmRestartBlocksInterval = 20
+
+  # Interval in number of blocks at which to clear entities cache.
+  clearEntitiesCacheInterval = 1000
+
+  # Flag to specify whether RPC endpoint supports block hash as block tag parameter
+  rpcSupportsBlockHashParam = true
+
+  # Server GQL config
+  [server.gql]
+    path = "/graphql"
+
+    # Max block range for which to return events in eventsInRange GQL query.
+    # Use -1 for skipping check on block range.
+    maxEventsBlockRange = 1000
+
+    # Log directory for GQL requests
+    logDir = "./gql-logs"
+
+    # GQL cache settings
+    [server.gql.cache]
+      enabled = true
+
+      # Max in-memory cache size (in bytes) (default 8 MB)
+      # maxCacheSize
+
+      # GQL cache-control max-age settings (in seconds)
+      maxAge = 15
+      timeTravelMaxAge = 86400 # 1 day
+
+[metrics]
+  host = "127.0.0.1"
+  port = 9000
+  [metrics.gql]
+    port = 9001
+
+[database]
+  type = "postgres"
+  host = "localhost"
+  port = 5432
+  database = "blocks-watcher"
+  username = "postgres"
+  password = "postgres"
+  synchronize = true
+  logging = false
+
+[upstream]
+  [upstream.ethServer]
+    gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
+
+    # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
+    rpcClient = false
+
+    # Boolean flag to specify if rpcProviderEndpoint is an FEVM RPC endpoint
+    isFEVM = false
+
+    # Boolean flag to filter event logs by contracts
+    filterLogsByAddresses = true
+    # Boolean flag to filter event logs by topics
+    filterLogsByTopics = true
+
+  [upstream.cache]
+    name = "requests"
+    enabled = false
+    deleteOnStart = false
+
+[jobQueue]
+  dbConnectionString = "postgres://postgres:postgres@localhost/blocks-watcher-job-queue"
+  maxCompletionLagInSecs = 300
+  jobDelayInMilliSecs = 100
+  eventsInBatch = 50
+  subgraphEventsOrder = true
+  blockDelayInMilliSecs = 2000
+
+  # Boolean to switch between modes of processing events when starting the server.
+  # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them.
+  # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head).
+  useBlockRanges = true
+
+  # Block range in which logs are fetched during historical blocks processing
+  historicalLogsBlockRange = 2000
+
+  # Max block range of historical processing after which it waits for completion of events processing
+  # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
+  historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
diff --git a/packages/blocks-watcher/package.json b/packages/blocks-watcher/package.json
new file mode 100644
index 0000000..5b7008e
--- /dev/null
+++ b/packages/blocks-watcher/package.json
@@ -0,0 +1,76 @@
+{
+  "name": "@cerc-io/blocks-watcher",
+  "version": "0.1.0",
+  "description": "blocks-watcher",
+  "private": true,
+  "main": "dist/index.js",
+  "scripts": {
+    "lint": "eslint --max-warnings=0 .",
+    "build": "yarn clean && tsc && yarn copy-assets",
+    "clean": "rm -rf ./dist",
+    "prepare": "husky install",
+    "copy-assets": "copyfiles -u 1 src/**/*.gql dist/",
+    "server": "DEBUG=vulcanize:* YARN_CHILD_PROCESS=true node --enable-source-maps dist/server.js",
+    "server:dev": "DEBUG=vulcanize:* YARN_CHILD_PROCESS=true ts-node src/server.ts",
+    "job-runner": "DEBUG=vulcanize:* YARN_CHILD_PROCESS=true node --enable-source-maps dist/job-runner.js",
+    "job-runner:dev": "DEBUG=vulcanize:* YARN_CHILD_PROCESS=true ts-node src/job-runner.ts",
+    "watch:contract": "DEBUG=vulcanize:* ts-node src/cli/watch-contract.ts",
+    "fill": "DEBUG=vulcanize:* ts-node src/fill.ts",
+    "fill:state": "DEBUG=vulcanize:* ts-node src/fill.ts --state",
+    "reset": "DEBUG=vulcanize:* ts-node src/cli/reset.ts",
+    "checkpoint": "DEBUG=vulcanize:* node --enable-source-maps dist/cli/checkpoint.js",
+    "checkpoint:dev": "DEBUG=vulcanize:* ts-node src/cli/checkpoint.ts",
+    "export-state": "DEBUG=vulcanize:* node --enable-source-maps dist/cli/export-state.js",
+    "export-state:dev": "DEBUG=vulcanize:* ts-node src/cli/export-state.ts",
+    "import-state": "DEBUG=vulcanize:* node --enable-source-maps dist/cli/import-state.js",
+    "import-state:dev": "DEBUG=vulcanize:* ts-node src/cli/import-state.ts",
+    "inspect-cid": "DEBUG=vulcanize:* ts-node src/cli/inspect-cid.ts",
+    "index-block": "DEBUG=vulcanize:* ts-node src/cli/index-block.ts"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cerc-io/watcher-ts.git"
+  },
+  "author": "",
+  "license": "AGPL-3.0",
+  "bugs": {
+    "url": "https://github.com/cerc-io/watcher-ts/issues"
+  },
+  "homepage": "https://github.com/cerc-io/watcher-ts#readme",
+  "dependencies": {
+    "@apollo/client": "^3.3.19",
+    "@cerc-io/cli": "^0.2.93",
+    "@cerc-io/ipld-eth-client": "^0.2.93",
+    "@cerc-io/solidity-mapper": "^0.2.93",
+    "@cerc-io/util": "^0.2.93",
+    "@cerc-io/graph-node": "^0.2.93",
+    "@ethersproject/providers": "^5.4.4",
+    "debug": "^4.3.1",
+    "decimal.js": "^10.3.1",
+    "ethers": "^5.4.4",
+    "graphql": "^15.5.0",
+    "json-bigint": "^1.0.0",
+    "reflect-metadata": "^0.1.13",
+    "typeorm": "0.2.37",
+    "yargs": "^17.0.1"
+  },
+  "devDependencies": {
+    "@ethersproject/abi": "^5.3.0",
+    "@types/debug": "^4.1.5",
+    "@types/json-bigint": "^1.0.0",
+    "@types/yargs": "^17.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.47.1",
+    "@typescript-eslint/parser": "^5.47.1",
+    "copyfiles": "^2.4.1",
+    "eslint": "^8.35.0",
+    "eslint-config-semistandard": "^15.0.1",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "husky": "^7.0.2",
+    "ts-node": "^10.2.1",
+    "typescript": "^5.0.2"
+  }
+}
diff --git a/packages/blocks-watcher/src/artifacts/UniswapV2Factory.json b/packages/blocks-watcher/src/artifacts/UniswapV2Factory.json
new file mode 100644
index 0000000..244820a
--- /dev/null
+++ b/packages/blocks-watcher/src/artifacts/UniswapV2Factory.json
@@ -0,0 +1,217 @@
+{
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_feeToSetter",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "token0",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "token1",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "pair",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "name": "PairCreated",
+      "type": "event"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "name": "allPairs",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "allPairsLength",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "tokenA",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "tokenB",
+          "type": "address"
+        }
+      ],
+      "name": "createPair",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "pair",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "feeTo",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "feeToSetter",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "getPair",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "migrator",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "pairCodeHash",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_feeTo",
+          "type": "address"
+        }
+      ],
+      "name": "setFeeTo",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_feeToSetter",
+          "type": "address"
+        }
+      ],
+      "name": "setFeeToSetter",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_migrator",
+          "type": "address"
+        }
+      ],
+      "name": "setMigrator",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/cli/checkpoint-cmds/create.ts b/packages/blocks-watcher/src/cli/checkpoint-cmds/create.ts
new file mode 100644
index 0000000..e771c70
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/checkpoint-cmds/create.ts
@@ -0,0 +1,44 @@
+//
+// Copyright 2022 Vulcanize, Inc.
+//
+
+import { CreateCheckpointCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from '../../database';
+import { Indexer } from '../../indexer';
+
+export const command = 'create';
+
+export const desc = 'Create checkpoint';
+
+export const builder = {
+  address: {
+    type: 'string',
+    require: true,
+    demandOption: true,
+    describe: 'Contract address to create the checkpoint for.'
+  },
+  blockHash: {
+    type: 'string',
+    describe: 'Blockhash at which to create the checkpoint.'
+  }
+};
+
+export const handler = async (argv: any): Promise<void> => {
+  const createCheckpointCmd = new CreateCheckpointCmd();
+  await createCheckpointCmd.init(argv, Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    createCheckpointCmd.config.server,
+    createCheckpointCmd.clients.ethClient,
+    createCheckpointCmd.ethProvider,
+    createCheckpointCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await createCheckpointCmd.initIndexer(Indexer, graphWatcher);
+
+  await createCheckpointCmd.exec();
+};
diff --git a/packages/blocks-watcher/src/cli/checkpoint-cmds/verify.ts b/packages/blocks-watcher/src/cli/checkpoint-cmds/verify.ts
new file mode 100644
index 0000000..3709f54
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/checkpoint-cmds/verify.ts
@@ -0,0 +1,40 @@
+//
+// Copyright 2022 Vulcanize, Inc.
+//
+
+import { VerifyCheckpointCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from '../../database';
+import { Indexer } from '../../indexer';
+
+export const command = 'verify';
+
+export const desc = 'Verify checkpoint';
+
+export const builder = {
+  cid: {
+    type: 'string',
+    alias: 'c',
+    demandOption: true,
+    describe: 'Checkpoint CID to be verified'
+  }
+};
+
+export const handler = async (argv: any): Promise<void> => {
+  const verifyCheckpointCmd = new VerifyCheckpointCmd();
+  await verifyCheckpointCmd.init(argv, Database);
+
+  const { graphWatcher, graphDb } = await getGraphDbAndWatcher(
+    verifyCheckpointCmd.config.server,
+    verifyCheckpointCmd.clients.ethClient,
+    verifyCheckpointCmd.ethProvider,
+    verifyCheckpointCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await verifyCheckpointCmd.initIndexer(Indexer, graphWatcher);
+
+  await verifyCheckpointCmd.exec(graphDb);
+};
diff --git a/packages/blocks-watcher/src/cli/checkpoint.ts b/packages/blocks-watcher/src/cli/checkpoint.ts
new file mode 100644
index 0000000..d05ad8a
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/checkpoint.ts
@@ -0,0 +1,39 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import yargs from 'yargs';
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { DEFAULT_CONFIG_PATH } from '@cerc-io/util';
+
+import { hideBin } from 'yargs/helpers';
+
+const log = debug('vulcanize:checkpoint');
+
+const main = async () => {
+  return yargs(hideBin(process.argv))
+    .parserConfiguration({
+      'parse-numbers': false
+    }).options({
+      configFile: {
+        alias: 'f',
+        type: 'string',
+        require: true,
+        demandOption: true,
+        describe: 'configuration file path (toml)',
+        default: DEFAULT_CONFIG_PATH
+      }
+    })
+    .commandDir('checkpoint-cmds', { extensions: ['ts', 'js'], exclude: /([a-zA-Z0-9\s_\\.\-:])+(.d.ts)$/ })
+    .demandCommand(1)
+    .help()
+    .argv;
+};
+
+main().then(() => {
+  process.exit();
+}).catch(err => {
+  log(err);
+});
diff --git a/packages/blocks-watcher/src/cli/export-state.ts b/packages/blocks-watcher/src/cli/export-state.ts
new file mode 100644
index 0000000..bcd1c8a
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/export-state.ts
@@ -0,0 +1,38 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { ExportStateCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from '../database';
+import { Indexer } from '../indexer';
+
+const log = debug('vulcanize:export-state');
+
+const main = async (): Promise<void> => {
+  const exportStateCmd = new ExportStateCmd();
+  await exportStateCmd.init(Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    exportStateCmd.config.server,
+    exportStateCmd.clients.ethClient,
+    exportStateCmd.ethProvider,
+    exportStateCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await exportStateCmd.initIndexer(Indexer, graphWatcher);
+
+  await exportStateCmd.exec();
+};
+
+main().catch(err => {
+  log(err);
+}).finally(() => {
+  process.exit(0);
+});
diff --git a/packages/blocks-watcher/src/cli/import-state.ts b/packages/blocks-watcher/src/cli/import-state.ts
new file mode 100644
index 0000000..04ce0e8
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/import-state.ts
@@ -0,0 +1,39 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { ImportStateCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from '../database';
+import { Indexer } from '../indexer';
+import { State } from '../entity/State';
+
+const log = debug('vulcanize:import-state');
+
+export const main = async (): Promise<any> => {
+  const importStateCmd = new ImportStateCmd();
+  await importStateCmd.init(Database);
+
+  const { graphWatcher, graphDb } = await getGraphDbAndWatcher(
+    importStateCmd.config.server,
+    importStateCmd.clients.ethClient,
+    importStateCmd.ethProvider,
+    importStateCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await importStateCmd.initIndexer(Indexer, graphWatcher);
+
+  await importStateCmd.exec(State, graphDb);
+};
+
+main().catch(err => {
+  log(err);
+}).finally(() => {
+  process.exit(0);
+});
diff --git a/packages/blocks-watcher/src/cli/index-block.ts b/packages/blocks-watcher/src/cli/index-block.ts
new file mode 100644
index 0000000..19a302a
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/index-block.ts
@@ -0,0 +1,38 @@
+//
+// Copyright 2022 Vulcanize, Inc.
+//
+
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { IndexBlockCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from '../database';
+import { Indexer } from '../indexer';
+
+const log = debug('vulcanize:index-block');
+
+const main = async (): Promise<void> => {
+  const indexBlockCmd = new IndexBlockCmd();
+  await indexBlockCmd.init(Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    indexBlockCmd.config.server,
+    indexBlockCmd.clients.ethClient,
+    indexBlockCmd.ethProvider,
+    indexBlockCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await indexBlockCmd.initIndexer(Indexer, graphWatcher);
+
+  await indexBlockCmd.exec();
+};
+
+main().catch(err => {
+  log(err);
+}).finally(() => {
+  process.exit(0);
+});
diff --git a/packages/blocks-watcher/src/cli/inspect-cid.ts b/packages/blocks-watcher/src/cli/inspect-cid.ts
new file mode 100644
index 0000000..4f5955e
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/inspect-cid.ts
@@ -0,0 +1,38 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { InspectCIDCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from '../database';
+import { Indexer } from '../indexer';
+
+const log = debug('vulcanize:inspect-cid');
+
+const main = async (): Promise<void> => {
+  const inspectCIDCmd = new InspectCIDCmd();
+  await inspectCIDCmd.init(Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    inspectCIDCmd.config.server,
+    inspectCIDCmd.clients.ethClient,
+    inspectCIDCmd.ethProvider,
+    inspectCIDCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await inspectCIDCmd.initIndexer(Indexer, graphWatcher);
+
+  await inspectCIDCmd.exec();
+};
+
+main().catch(err => {
+  log(err);
+}).finally(() => {
+  process.exit(0);
+});
diff --git a/packages/blocks-watcher/src/cli/reset-cmds/job-queue.ts b/packages/blocks-watcher/src/cli/reset-cmds/job-queue.ts
new file mode 100644
index 0000000..c33cbfd
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/reset-cmds/job-queue.ts
@@ -0,0 +1,22 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import debug from 'debug';
+
+import { getConfig, resetJobs, Config } from '@cerc-io/util';
+
+const log = debug('vulcanize:reset-job-queue');
+
+export const command = 'job-queue';
+
+export const desc = 'Reset job queue';
+
+export const builder = {};
+
+export const handler = async (argv: any): Promise<void> => {
+  const config: Config = await getConfig(argv.configFile);
+  await resetJobs(config);
+
+  log('Job queue reset successfully');
+};
diff --git a/packages/blocks-watcher/src/cli/reset-cmds/state.ts b/packages/blocks-watcher/src/cli/reset-cmds/state.ts
new file mode 100644
index 0000000..33211d6
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/reset-cmds/state.ts
@@ -0,0 +1,24 @@
+//
+// Copyright 2022 Vulcanize, Inc.
+//
+
+import { ResetStateCmd } from '@cerc-io/cli';
+
+import { Database } from '../../database';
+
+export const command = 'state';
+
+export const desc = 'Reset State to a given block number';
+
+export const builder = {
+  blockNumber: {
+    type: 'number'
+  }
+};
+
+export const handler = async (argv: any): Promise<void> => {
+  const resetStateCmd = new ResetStateCmd();
+  await resetStateCmd.init(argv, Database);
+
+  await resetStateCmd.exec();
+};
diff --git a/packages/blocks-watcher/src/cli/reset-cmds/watcher.ts b/packages/blocks-watcher/src/cli/reset-cmds/watcher.ts
new file mode 100644
index 0000000..827fd28
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/reset-cmds/watcher.ts
@@ -0,0 +1,37 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { ResetWatcherCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from '../../database';
+import { Indexer } from '../../indexer';
+
+export const command = 'watcher';
+
+export const desc = 'Reset watcher to a block number';
+
+export const builder = {
+  blockNumber: {
+    type: 'number'
+  }
+};
+
+export const handler = async (argv: any): Promise<void> => {
+  const resetWatcherCmd = new ResetWatcherCmd();
+  await resetWatcherCmd.init(argv, Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    resetWatcherCmd.config.server,
+    resetWatcherCmd.clients.ethClient,
+    resetWatcherCmd.ethProvider,
+    resetWatcherCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await resetWatcherCmd.initIndexer(Indexer, graphWatcher);
+
+  await resetWatcherCmd.exec();
+};
diff --git a/packages/blocks-watcher/src/cli/reset.ts b/packages/blocks-watcher/src/cli/reset.ts
new file mode 100644
index 0000000..95648c8
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/reset.ts
@@ -0,0 +1,24 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { getResetYargs } from '@cerc-io/util';
+
+const log = debug('vulcanize:reset');
+
+const main = async () => {
+  return getResetYargs()
+    .commandDir('reset-cmds', { extensions: ['ts', 'js'], exclude: /([a-zA-Z0-9\s_\\.\-:])+(.d.ts)$/ })
+    .demandCommand(1)
+    .help()
+    .argv;
+};
+
+main().then(() => {
+  process.exit();
+}).catch(err => {
+  log(err);
+});
diff --git a/packages/blocks-watcher/src/cli/watch-contract.ts b/packages/blocks-watcher/src/cli/watch-contract.ts
new file mode 100644
index 0000000..7d6ce1a
--- /dev/null
+++ b/packages/blocks-watcher/src/cli/watch-contract.ts
@@ -0,0 +1,38 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { WatchContractCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from '../database';
+import { Indexer } from '../indexer';
+
+const log = debug('vulcanize:watch-contract');
+
+const main = async (): Promise<void> => {
+  const watchContractCmd = new WatchContractCmd();
+  await watchContractCmd.init(Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    watchContractCmd.config.server,
+    watchContractCmd.clients.ethClient,
+    watchContractCmd.ethProvider,
+    watchContractCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await watchContractCmd.initIndexer(Indexer, graphWatcher);
+
+  await watchContractCmd.exec();
+};
+
+main().catch(err => {
+  log(err);
+}).finally(() => {
+  process.exit(0);
+});
diff --git a/packages/blocks-watcher/src/client.ts b/packages/blocks-watcher/src/client.ts
new file mode 100644
index 0000000..8bb2bb0
--- /dev/null
+++ b/packages/blocks-watcher/src/client.ts
@@ -0,0 +1,55 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { gql } from '@apollo/client/core';
+import { GraphQLClient, GraphQLConfig } from '@cerc-io/ipld-eth-client';
+
+import { queries, mutations, subscriptions } from './gql';
+
+export class Client {
+  _config: GraphQLConfig;
+  _client: GraphQLClient;
+
+  constructor (config: GraphQLConfig) {
+    this._config = config;
+
+    this._client = new GraphQLClient(config);
+  }
+
+  async getEvents (blockHash: string, contractAddress: string, name: string): Promise<any> {
+    const { events } = await this._client.query(
+      gql(queries.events),
+      { blockHash, contractAddress, name }
+    );
+
+    return events;
+  }
+
+  async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<any> {
+    const { eventsInRange } = await this._client.query(
+      gql(queries.eventsInRange),
+      { fromBlockNumber, toBlockNumber }
+    );
+
+    return eventsInRange;
+  }
+
+  async watchContract (contractAddress: string, startingBlock?: number): Promise<any> {
+    const { watchContract } = await this._client.mutate(
+      gql(mutations.watchContract),
+      { contractAddress, startingBlock }
+    );
+
+    return watchContract;
+  }
+
+  async watchEvents (onNext: (value: any) => void): Promise<ZenObservable.Subscription> {
+    return this._client.subscribe(
+      gql(subscriptions.onEvent),
+      ({ data }) => {
+        onNext(data.onEvent);
+      }
+    );
+  }
+}
diff --git a/packages/blocks-watcher/src/database.ts b/packages/blocks-watcher/src/database.ts
new file mode 100644
index 0000000..e2a46ad
--- /dev/null
+++ b/packages/blocks-watcher/src/database.ts
@@ -0,0 +1,285 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import assert from 'assert';
+import { Connection, ConnectionOptions, DeepPartial, FindConditions, QueryRunner, FindManyOptions, EntityTarget } from 'typeorm';
+import path from 'path';
+
+import {
+  ENTITY_QUERY_TYPE,
+  Database as BaseDatabase,
+  DatabaseInterface,
+  QueryOptions,
+  StateKind,
+  Where
+} from '@cerc-io/util';
+
+import { Contract } from './entity/Contract';
+import { Event } from './entity/Event';
+import { SyncStatus } from './entity/SyncStatus';
+import { StateSyncStatus } from './entity/StateSyncStatus';
+import { BlockProgress } from './entity/BlockProgress';
+import { State } from './entity/State';
+import { Block } from './entity/Block';
+
+export const SUBGRAPH_ENTITIES = new Set([Block]);
+export const ENTITIES = [...SUBGRAPH_ENTITIES];
+// Map: Entity to suitable query type.
+export const ENTITY_QUERY_TYPE_MAP = new Map<new() => any, ENTITY_QUERY_TYPE>([]);
+
+export const ENTITY_TO_LATEST_ENTITY_MAP: Map<any, any> = new Map();
+
+export class Database implements DatabaseInterface {
+  _config: ConnectionOptions;
+  _conn!: Connection;
+  _baseDatabase: BaseDatabase;
+  _propColMaps: { [key: string]: Map<string, string>; };
+
+  constructor (config: ConnectionOptions) {
+    assert(config);
+
+    this._config = {
+      ...config,
+      subscribers: [path.join(__dirname, 'entity/Subscriber.*')],
+      entities: [path.join(__dirname, 'entity/*')]
+    };
+
+    this._baseDatabase = new BaseDatabase(this._config);
+    this._propColMaps = {};
+  }
+
+  get baseDatabase (): BaseDatabase {
+    return this._baseDatabase;
+  }
+
+  async init (): Promise<void> {
+    this._conn = await this._baseDatabase.init();
+  }
+
+  async close (): Promise<void> {
+    return this._baseDatabase.close();
+  }
+
+  getNewState (): State {
+    return new State();
+  }
+
+  async getStates (where: FindConditions<State>): Promise<State[]> {
+    const repo = this._conn.getRepository(State);
+
+    return this._baseDatabase.getStates(repo, where);
+  }
+
+  async getLatestState (contractAddress: string, kind: StateKind | null, blockNumber?: number): Promise<State | undefined> {
+    const repo = this._conn.getRepository(State);
+
+    return this._baseDatabase.getLatestState(repo, contractAddress, kind, blockNumber);
+  }
+
+  async getPrevState (blockHash: string, contractAddress: string, kind?: string): Promise<State | undefined> {
+    const repo = this._conn.getRepository(State);
+
+    return this._baseDatabase.getPrevState(repo, blockHash, contractAddress, kind);
+  }
+
+  // Fetch all diff States after the specified block number.
+  async getDiffStatesInRange (contractAddress: string, startblock: number, endBlock: number): Promise<State[]> {
+    const repo = this._conn.getRepository(State);
+
+    return this._baseDatabase.getDiffStatesInRange(repo, contractAddress, startblock, endBlock);
+  }
+
+  async saveOrUpdateState (dbTx: QueryRunner, state: State): Promise<State> {
+    const repo = dbTx.manager.getRepository(State);
+
+    return this._baseDatabase.saveOrUpdateState(repo, state);
+  }
+
+  async removeStates (dbTx: QueryRunner, blockNumber: number, kind: string): Promise<void> {
+    const repo = dbTx.manager.getRepository(State);
+
+    await this._baseDatabase.removeStates(repo, blockNumber, kind);
+  }
+
+  async removeStatesAfterBlock (dbTx: QueryRunner, blockNumber: number): Promise<void> {
+    const repo = dbTx.manager.getRepository(State);
+
+    await this._baseDatabase.removeStatesAfterBlock(repo, blockNumber);
+  }
+
+  async getStateSyncStatus (): Promise<StateSyncStatus | undefined> {
+    const repo = this._conn.getRepository(StateSyncStatus);
+
+    return this._baseDatabase.getStateSyncStatus(repo);
+  }
+
+  async updateStateSyncStatusIndexedBlock (queryRunner: QueryRunner, blockNumber: number, force?: boolean): Promise<StateSyncStatus> {
+    const repo = queryRunner.manager.getRepository(StateSyncStatus);
+
+    return this._baseDatabase.updateStateSyncStatusIndexedBlock(repo, blockNumber, force);
+  }
+
+  async updateStateSyncStatusCheckpointBlock (queryRunner: QueryRunner, blockNumber: number, force?: boolean): Promise<StateSyncStatus> {
+    const repo = queryRunner.manager.getRepository(StateSyncStatus);
+
+    return this._baseDatabase.updateStateSyncStatusCheckpointBlock(repo, blockNumber, force);
+  }
+
+  async getContracts (): Promise<Contract[]> {
+    const repo = this._conn.getRepository(Contract);
+
+    return this._baseDatabase.getContracts(repo);
+  }
+
+  async createTransactionRunner (): Promise<QueryRunner> {
+    return this._baseDatabase.createTransactionRunner();
+  }
+
+  async getProcessedBlockCountForRange (fromBlockNumber: number, toBlockNumber: number): Promise<{ expected: number, actual: number }> {
+    const repo = this._conn.getRepository(BlockProgress);
+
+    return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
+  }
+
+  async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
+    const repo = this._conn.getRepository(Event);
+
+    return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
+  }
+
+  async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {
+    const repo = queryRunner.manager.getRepository(Event);
+    return this._baseDatabase.saveEventEntity(repo, entity);
+  }
+
+  async getBlockEvents (blockHash: string, where: Where, queryOptions: QueryOptions): Promise<Event[]> {
+    const repo = this._conn.getRepository(Event);
+
+    return this._baseDatabase.getBlockEvents(repo, blockHash, where, queryOptions);
+  }
+
+  async saveBlockWithEvents (queryRunner: QueryRunner, block: DeepPartial<BlockProgress>, events: DeepPartial<Event>[]): Promise<BlockProgress> {
+    const blockRepo = queryRunner.manager.getRepository(BlockProgress);
+    const eventRepo = queryRunner.manager.getRepository(Event);
+
+    return this._baseDatabase.saveBlockWithEvents(blockRepo, eventRepo, block, events);
+  }
+
+  async saveEvents (queryRunner: QueryRunner, events: Event[]): Promise<void> {
+    const eventRepo = queryRunner.manager.getRepository(Event);
+
+    return this._baseDatabase.saveEvents(eventRepo, events);
+  }
+
+  async saveBlockProgress (queryRunner: QueryRunner, block: DeepPartial<BlockProgress>): Promise<BlockProgress> {
+    const repo = queryRunner.manager.getRepository(BlockProgress);
+
+    return this._baseDatabase.saveBlockProgress(repo, block);
+  }
+
+  async saveContract (queryRunner: QueryRunner, address: string, kind: string, checkpoint: boolean, startingBlock: number, context?: any): Promise<Contract> {
+    const repo = queryRunner.manager.getRepository(Contract);
+
+    return this._baseDatabase.saveContract(repo, address, kind, checkpoint, startingBlock, context);
+  }
+
+  async updateSyncStatusIndexedBlock (queryRunner: QueryRunner, blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
+    const repo = queryRunner.manager.getRepository(SyncStatus);
+
+    return this._baseDatabase.updateSyncStatusIndexedBlock(repo, blockHash, blockNumber, force);
+  }
+
+  async updateSyncStatusCanonicalBlock (queryRunner: QueryRunner, blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
+    const repo = queryRunner.manager.getRepository(SyncStatus);
+
+    return this._baseDatabase.updateSyncStatusCanonicalBlock(repo, blockHash, blockNumber, force);
+  }
+
+  async updateSyncStatusChainHead (queryRunner: QueryRunner, blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
+    const repo = queryRunner.manager.getRepository(SyncStatus);
+
+    return this._baseDatabase.updateSyncStatusChainHead(repo, blockHash, blockNumber, force);
+  }
+
+  async updateSyncStatusProcessedBlock (queryRunner: QueryRunner, blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
+    const repo = queryRunner.manager.getRepository(SyncStatus);
+
+    return this._baseDatabase.updateSyncStatusProcessedBlock(repo, blockHash, blockNumber, force);
+  }
+
+  async updateSyncStatusIndexingError (queryRunner: QueryRunner, hasIndexingError: boolean): Promise<SyncStatus | undefined> {
+    const repo = queryRunner.manager.getRepository(SyncStatus);
+
+    return this._baseDatabase.updateSyncStatusIndexingError(repo, hasIndexingError);
+  }
+
+  async updateSyncStatus (queryRunner: QueryRunner, syncStatus: DeepPartial<SyncStatus>): Promise<SyncStatus> {
+    const repo = queryRunner.manager.getRepository(SyncStatus);
+
+    return this._baseDatabase.updateSyncStatus(repo, syncStatus);
+  }
+
+  async getSyncStatus (queryRunner: QueryRunner): Promise<SyncStatus | undefined> {
+    const repo = queryRunner.manager.getRepository(SyncStatus);
+
+    return this._baseDatabase.getSyncStatus(repo);
+  }
+
+  async getEvent (id: string): Promise<Event | undefined> {
+    const repo = this._conn.getRepository(Event);
+
+    return this._baseDatabase.getEvent(repo, id);
+  }
+
+  async getBlocksAtHeight (height: number, isPruned: boolean): Promise<BlockProgress[]> {
+    const repo = this._conn.getRepository(BlockProgress);
+
+    return this._baseDatabase.getBlocksAtHeight(repo, height, isPruned);
+  }
+
+  async markBlocksAsPruned (queryRunner: QueryRunner, blocks: BlockProgress[]): Promise<void> {
+    const repo = queryRunner.manager.getRepository(BlockProgress);
+
+    return this._baseDatabase.markBlocksAsPruned(repo, blocks);
+  }
+
+  async getBlockProgress (blockHash: string): Promise<BlockProgress | undefined> {
+    const repo = this._conn.getRepository(BlockProgress);
+    return this._baseDatabase.getBlockProgress(repo, blockHash);
+  }
+
+  async getBlockProgressEntities (where: FindConditions<BlockProgress>, options: FindManyOptions<BlockProgress>): Promise<BlockProgress[]> {
+    const repo = this._conn.getRepository(BlockProgress);
+
+    return this._baseDatabase.getBlockProgressEntities(repo, where, options);
+  }
+
+  async getEntitiesForBlock (blockHash: string, tableName: string): Promise<any[]> {
+    return this._baseDatabase.getEntitiesForBlock(blockHash, tableName);
+  }
+
+  async updateBlockProgress (queryRunner: QueryRunner, block: BlockProgress, lastProcessedEventIndex: number): Promise<BlockProgress> {
+    const repo = queryRunner.manager.getRepository(BlockProgress);
+
+    return this._baseDatabase.updateBlockProgress(repo, block, lastProcessedEventIndex);
+  }
+
+  async removeEntities<Entity> (queryRunner: QueryRunner, entity: new () => Entity, findConditions?: FindManyOptions<Entity> | FindConditions<Entity>): Promise<void> {
+    return this._baseDatabase.removeEntities(queryRunner, entity, findConditions);
+  }
+
+  async deleteEntitiesByConditions<Entity> (queryRunner: QueryRunner, entity: EntityTarget<Entity>, findConditions: FindConditions<Entity>): Promise<void> {
+    await this._baseDatabase.deleteEntitiesByConditions(queryRunner, entity, findConditions);
+  }
+
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseDatabase.getAncestorAtHeight(blockHash, height);
+  }
+
+  _getPropertyColumnMapForEntity (entityName: string): Map<string, string> {
+    return this._conn.getMetadata(entityName).ownColumns.reduce((acc, curr) => {
+      return acc.set(curr.propertyName, curr.databaseName);
+    }, new Map<string, string>());
+  }
+}
diff --git a/packages/blocks-watcher/src/entity/Block.ts b/packages/blocks-watcher/src/entity/Block.ts
new file mode 100644
index 0000000..84b446e
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/Block.ts
@@ -0,0 +1,64 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryColumn, Column, Index } from 'typeorm';
+import { bigintTransformer } from '@cerc-io/util';
+
+@Entity()
+@Index(['blockNumber'])
+export class Block {
+  @PrimaryColumn('varchar')
+    id!: string;
+
+  @PrimaryColumn('varchar', { length: 66 })
+    blockHash!: string;
+
+  @Column('integer')
+    blockNumber!: number;
+
+  @Column('numeric', { transformer: bigintTransformer })
+    number!: bigint;
+
+  @Column('numeric', { transformer: bigintTransformer })
+    timestamp!: bigint;
+
+  @Column('varchar', { nullable: true })
+    parentHash!: string | null;
+
+  @Column('varchar', { nullable: true })
+    author!: string | null;
+
+  @Column('numeric', { nullable: true, transformer: bigintTransformer })
+    difficulty!: bigint | null;
+
+  @Column('numeric', { nullable: true, transformer: bigintTransformer })
+    totalDifficulty!: bigint | null;
+
+  @Column('numeric', { nullable: true, transformer: bigintTransformer })
+    gasUsed!: bigint | null;
+
+  @Column('numeric', { nullable: true, transformer: bigintTransformer })
+    gasLimit!: bigint | null;
+
+  @Column('varchar', { nullable: true })
+    receiptsRoot!: string | null;
+
+  @Column('varchar', { nullable: true })
+    transactionsRoot!: string | null;
+
+  @Column('varchar', { nullable: true })
+    stateRoot!: string | null;
+
+  @Column('numeric', { nullable: true, transformer: bigintTransformer })
+    size!: bigint | null;
+
+  @Column('varchar', { nullable: true })
+    unclesHash!: string | null;
+
+  @Column('boolean', { default: false })
+    isPruned!: boolean;
+
+  @Column('boolean', { default: false })
+    isRemoved!: boolean;
+}
diff --git a/packages/blocks-watcher/src/entity/BlockProgress.ts b/packages/blocks-watcher/src/entity/BlockProgress.ts
new file mode 100644
index 0000000..ded4a86
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/BlockProgress.ts
@@ -0,0 +1,48 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryGeneratedColumn, Column, Index, CreateDateColumn } from 'typeorm';
+import { BlockProgressInterface } from '@cerc-io/util';
+
+@Entity()
+@Index(['blockHash'], { unique: true })
+@Index(['blockNumber'])
+@Index(['parentHash'])
+export class BlockProgress implements BlockProgressInterface {
+  @PrimaryGeneratedColumn()
+    id!: number;
+
+  @Column('varchar', { nullable: true })
+    cid!: string | null;
+
+  @Column('varchar', { length: 66 })
+    blockHash!: string;
+
+  @Column('varchar', { length: 66 })
+    parentHash!: string;
+
+  @Column('integer')
+    blockNumber!: number;
+
+  @Column('integer')
+    blockTimestamp!: number;
+
+  @Column('integer')
+    numEvents!: number;
+
+  @Column('integer')
+    numProcessedEvents!: number;
+
+  @Column('integer')
+    lastProcessedEventIndex!: number;
+
+  @Column('boolean')
+    isComplete!: boolean;
+
+  @Column('boolean', { default: false })
+    isPruned!: boolean;
+
+  @CreateDateColumn()
+    createdAt!: Date;
+}
diff --git a/packages/blocks-watcher/src/entity/Contract.ts b/packages/blocks-watcher/src/entity/Contract.ts
new file mode 100644
index 0000000..e4defa8
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/Contract.ts
@@ -0,0 +1,27 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryGeneratedColumn, Column, Index } from 'typeorm';
+
+@Entity()
+@Index(['address'], { unique: true })
+export class Contract {
+  @PrimaryGeneratedColumn()
+    id!: number;
+
+  @Column('varchar', { length: 42 })
+    address!: string;
+
+  @Column('varchar')
+    kind!: string;
+
+  @Column('boolean')
+    checkpoint!: boolean;
+
+  @Column('integer')
+    startingBlock!: number;
+
+  @Column('jsonb', { nullable: true })
+    context!: Record<string, { data: any, type: number }>;
+}
diff --git a/packages/blocks-watcher/src/entity/Event.ts b/packages/blocks-watcher/src/entity/Event.ts
new file mode 100644
index 0000000..91f1e6d
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/Event.ts
@@ -0,0 +1,38 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryGeneratedColumn, Column, Index, ManyToOne } from 'typeorm';
+import { BlockProgress } from './BlockProgress';
+
+@Entity()
+@Index(['block', 'contract'])
+@Index(['block', 'contract', 'eventName'])
+export class Event {
+  @PrimaryGeneratedColumn()
+    id!: number;
+
+  @ManyToOne(() => BlockProgress, { onDelete: 'CASCADE' })
+    block!: BlockProgress;
+
+  @Column('varchar', { length: 66 })
+    txHash!: string;
+
+  @Column('integer')
+    index!: number;
+
+  @Column('varchar', { length: 42 })
+    contract!: string;
+
+  @Column('varchar', { length: 256 })
+    eventName!: string;
+
+  @Column('text')
+    eventInfo!: string;
+
+  @Column('text')
+    extraInfo!: string;
+
+  @Column('text')
+    proof!: string;
+}
diff --git a/packages/blocks-watcher/src/entity/FrothyEntity.ts b/packages/blocks-watcher/src/entity/FrothyEntity.ts
new file mode 100644
index 0000000..9898ce8
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/FrothyEntity.ts
@@ -0,0 +1,21 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryColumn, Column, Index } from 'typeorm';
+
+@Entity()
+@Index(['blockNumber'])
+export class FrothyEntity {
+  @PrimaryColumn('varchar')
+    id!: string;
+
+  @PrimaryColumn('varchar')
+    name!: string;
+
+  @PrimaryColumn('varchar', { length: 66 })
+    blockHash!: string;
+
+  @Column('integer')
+    blockNumber!: number;
+}
diff --git a/packages/blocks-watcher/src/entity/State.ts b/packages/blocks-watcher/src/entity/State.ts
new file mode 100644
index 0000000..bc05bca
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/State.ts
@@ -0,0 +1,31 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryGeneratedColumn, Column, Index, ManyToOne } from 'typeorm';
+import { StateKind } from '@cerc-io/util';
+import { BlockProgress } from './BlockProgress';
+
+@Entity()
+@Index(['cid'], { unique: true })
+@Index(['block', 'contractAddress'])
+@Index(['block', 'contractAddress', 'kind'], { unique: true })
+export class State {
+  @PrimaryGeneratedColumn()
+    id!: number;
+
+  @ManyToOne(() => BlockProgress, { onDelete: 'CASCADE' })
+    block!: BlockProgress;
+
+  @Column('varchar', { length: 42 })
+    contractAddress!: string;
+
+  @Column('varchar')
+    cid!: string;
+
+  @Column({ type: 'enum', enum: StateKind })
+    kind!: StateKind;
+
+  @Column('bytea')
+    data!: Buffer;
+}
diff --git a/packages/blocks-watcher/src/entity/StateSyncStatus.ts b/packages/blocks-watcher/src/entity/StateSyncStatus.ts
new file mode 100644
index 0000000..1535eb4
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/StateSyncStatus.ts
@@ -0,0 +1,17 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
+
+@Entity()
+export class StateSyncStatus {
+  @PrimaryGeneratedColumn()
+    id!: number;
+
+  @Column('integer')
+    latestIndexedBlockNumber!: number;
+
+  @Column('integer')
+    latestCheckpointBlockNumber!: number;
+}
diff --git a/packages/blocks-watcher/src/entity/Subscriber.ts b/packages/blocks-watcher/src/entity/Subscriber.ts
new file mode 100644
index 0000000..2cccb84
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/Subscriber.ts
@@ -0,0 +1,21 @@
+//
+// Copyright 2022 Vulcanize, Inc.
+//
+
+import { EventSubscriber, EntitySubscriberInterface, InsertEvent, UpdateEvent } from 'typeorm';
+
+import { afterEntityInsertOrUpdate } from '@cerc-io/util';
+
+import { FrothyEntity } from './FrothyEntity';
+import { ENTITY_TO_LATEST_ENTITY_MAP, SUBGRAPH_ENTITIES } from '../database';
+
+@EventSubscriber()
+export class EntitySubscriber implements EntitySubscriberInterface {
+  async afterInsert (event: InsertEvent<any>): Promise<void> {
+    await afterEntityInsertOrUpdate(FrothyEntity, SUBGRAPH_ENTITIES, event, ENTITY_TO_LATEST_ENTITY_MAP);
+  }
+
+  async afterUpdate (event: UpdateEvent<any>): Promise<void> {
+    await afterEntityInsertOrUpdate(FrothyEntity, SUBGRAPH_ENTITIES, event, ENTITY_TO_LATEST_ENTITY_MAP);
+  }
+}
diff --git a/packages/blocks-watcher/src/entity/SyncStatus.ts b/packages/blocks-watcher/src/entity/SyncStatus.ts
new file mode 100644
index 0000000..cc13c70
--- /dev/null
+++ b/packages/blocks-watcher/src/entity/SyncStatus.ts
@@ -0,0 +1,45 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryGeneratedColumn, Column } from 'typeorm';
+import { SyncStatusInterface } from '@cerc-io/util';
+
+@Entity()
+export class SyncStatus implements SyncStatusInterface {
+  @PrimaryGeneratedColumn()
+    id!: number;
+
+  @Column('varchar', { length: 66 })
+    chainHeadBlockHash!: string;
+
+  @Column('integer')
+    chainHeadBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+    latestIndexedBlockHash!: string;
+
+  @Column('integer')
+    latestIndexedBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+    latestProcessedBlockHash!: string;
+
+  @Column('integer')
+    latestProcessedBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+    latestCanonicalBlockHash!: string;
+
+  @Column('integer')
+    latestCanonicalBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+    initialIndexedBlockHash!: string;
+
+  @Column('integer')
+    initialIndexedBlockNumber!: number;
+
+  @Column('boolean', { default: false })
+    hasIndexingError!: boolean;
+}
diff --git a/packages/blocks-watcher/src/fill.ts b/packages/blocks-watcher/src/fill.ts
new file mode 100644
index 0000000..210341e
--- /dev/null
+++ b/packages/blocks-watcher/src/fill.ts
@@ -0,0 +1,48 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { FillCmd } from '@cerc-io/cli';
+import { getContractEntitiesMap } from '@cerc-io/util';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from './database';
+import { Indexer } from './indexer';
+
+const log = debug('vulcanize:fill');
+
+export const main = async (): Promise<any> => {
+  const fillCmd = new FillCmd();
+  await fillCmd.init(Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    fillCmd.config.server,
+    fillCmd.clients.ethClient,
+    fillCmd.ethProvider,
+    fillCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await fillCmd.initIndexer(Indexer, graphWatcher);
+
+  // Get contractEntitiesMap required for fill-state
+  // NOTE: Assuming each entity type is only mapped to a single contract
+  const contractEntitiesMap = getContractEntitiesMap(graphWatcher.dataSources);
+
+  await fillCmd.exec(contractEntitiesMap);
+};
+
+main().catch(err => {
+  log(err);
+}).finally(() => {
+  process.exit();
+});
+
+process.on('SIGINT', () => {
+  log(`Exiting process ${process.pid} with code 0`);
+  process.exit(0);
+});
diff --git a/packages/blocks-watcher/src/gql/index.ts b/packages/blocks-watcher/src/gql/index.ts
new file mode 100644
index 0000000..4732f68
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/index.ts
@@ -0,0 +1,3 @@
+export * as mutations from './mutations';
+export * as queries from './queries';
+export * as subscriptions from './subscriptions';
diff --git a/packages/blocks-watcher/src/gql/mutations/index.ts b/packages/blocks-watcher/src/gql/mutations/index.ts
new file mode 100644
index 0000000..0c3bd85
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/mutations/index.ts
@@ -0,0 +1,4 @@
+import fs from 'fs';
+import path from 'path';
+
+export const watchContract = fs.readFileSync(path.join(__dirname, 'watchContract.gql'), 'utf8');
diff --git a/packages/blocks-watcher/src/gql/mutations/watchContract.gql b/packages/blocks-watcher/src/gql/mutations/watchContract.gql
new file mode 100644
index 0000000..2ecc74f
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/mutations/watchContract.gql
@@ -0,0 +1,3 @@
+mutation watchContract($address: String!, $kind: String!, $checkpoint: Boolean!, $startingBlock: Int){
+    watchContract(address: $address, kind: $kind, checkpoint: $checkpoint, startingBlock: $startingBlock)
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/_meta.gql b/packages/blocks-watcher/src/gql/queries/_meta.gql
new file mode 100644
index 0000000..d686e04
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/_meta.gql
@@ -0,0 +1,11 @@
+query _meta($block: Block_height){
+    _meta(block: $block){
+        block{
+            hash
+            number
+            timestamp
+        }
+        deployment
+        hasIndexingErrors
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/block.gql b/packages/blocks-watcher/src/gql/queries/block.gql
new file mode 100644
index 0000000..3844476
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/block.gql
@@ -0,0 +1,18 @@
+query block($id: ID!, $block: Block_height){
+    block(id: $id, block: $block){
+        id
+        number
+        timestamp
+        parentHash
+        author
+        difficulty
+        totalDifficulty
+        gasUsed
+        gasLimit
+        receiptsRoot
+        transactionsRoot
+        stateRoot
+        size
+        unclesHash
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/blocks.gql b/packages/blocks-watcher/src/gql/queries/blocks.gql
new file mode 100644
index 0000000..a083ff9
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/blocks.gql
@@ -0,0 +1,18 @@
+query blocks($block: Block_height, $where: Block_filter, $orderBy: Block_orderBy, $orderDirection: OrderDirection, $first: Int, $skip: Int){
+    blocks(block: $block, where: $where, orderBy: $orderBy, orderDirection: $orderDirection, first: $first, skip: $skip){
+        id
+        number
+        timestamp
+        parentHash
+        author
+        difficulty
+        totalDifficulty
+        gasUsed
+        gasLimit
+        receiptsRoot
+        transactionsRoot
+        stateRoot
+        size
+        unclesHash
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/events.gql b/packages/blocks-watcher/src/gql/queries/events.gql
new file mode 100644
index 0000000..130267b
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/events.gql
@@ -0,0 +1,30 @@
+query events($blockHash: String!, $contractAddress: String!, $name: String){
+    events(blockHash: $blockHash, contractAddress: $contractAddress, name: $name){
+        block{
+            cid
+            hash
+            number
+            timestamp
+            parentHash
+        }
+        tx{
+            hash
+            index
+            from
+            to
+        }
+        contract
+        eventIndex
+        event{
+            ... on PairCreatedEvent {
+                token0
+                token1
+                pair
+                null
+            }
+        }
+        proof{
+            data
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/eventsInRange.gql b/packages/blocks-watcher/src/gql/queries/eventsInRange.gql
new file mode 100644
index 0000000..4a1ab93
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/eventsInRange.gql
@@ -0,0 +1,30 @@
+query eventsInRange($fromBlockNumber: Int!, $toBlockNumber: Int!){
+    eventsInRange(fromBlockNumber: $fromBlockNumber, toBlockNumber: $toBlockNumber){
+        block{
+            cid
+            hash
+            number
+            timestamp
+            parentHash
+        }
+        tx{
+            hash
+            index
+            from
+            to
+        }
+        contract
+        eventIndex
+        event{
+            ... on PairCreatedEvent {
+                token0
+                token1
+                pair
+                null
+            }
+        }
+        proof{
+            data
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/getState.gql b/packages/blocks-watcher/src/gql/queries/getState.gql
new file mode 100644
index 0000000..3b8f605
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/getState.gql
@@ -0,0 +1,15 @@
+query getState($blockHash: String!, $contractAddress: String!, $kind: String){
+    getState(blockHash: $blockHash, contractAddress: $contractAddress, kind: $kind){
+        block{
+            cid
+            hash
+            number
+            timestamp
+            parentHash
+        }
+        contractAddress
+        cid
+        kind
+        data
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/getStateByCID.gql b/packages/blocks-watcher/src/gql/queries/getStateByCID.gql
new file mode 100644
index 0000000..6c3c4fd
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/getStateByCID.gql
@@ -0,0 +1,15 @@
+query getStateByCID($cid: String!){
+    getStateByCID(cid: $cid){
+        block{
+            cid
+            hash
+            number
+            timestamp
+            parentHash
+        }
+        contractAddress
+        cid
+        kind
+        data
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/getSyncStatus.gql b/packages/blocks-watcher/src/gql/queries/getSyncStatus.gql
new file mode 100644
index 0000000..48175b4
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/getSyncStatus.gql
@@ -0,0 +1,12 @@
+query getSyncStatus{
+    getSyncStatus{
+        latestIndexedBlockHash
+        latestIndexedBlockNumber
+        latestCanonicalBlockHash
+        latestCanonicalBlockNumber
+        initialIndexedBlockHash
+        initialIndexedBlockNumber
+        latestProcessedBlockHash
+        latestProcessedBlockNumber
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/gql/queries/index.ts b/packages/blocks-watcher/src/gql/queries/index.ts
new file mode 100644
index 0000000..7fca1a5
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/queries/index.ts
@@ -0,0 +1,11 @@
+import fs from 'fs';
+import path from 'path';
+
+export const events = fs.readFileSync(path.join(__dirname, 'events.gql'), 'utf8');
+export const eventsInRange = fs.readFileSync(path.join(__dirname, 'eventsInRange.gql'), 'utf8');
+export const block = fs.readFileSync(path.join(__dirname, 'block.gql'), 'utf8');
+export const blocks = fs.readFileSync(path.join(__dirname, 'blocks.gql'), 'utf8');
+export const _meta = fs.readFileSync(path.join(__dirname, '_meta.gql'), 'utf8');
+export const getStateByCID = fs.readFileSync(path.join(__dirname, 'getStateByCID.gql'), 'utf8');
+export const getState = fs.readFileSync(path.join(__dirname, 'getState.gql'), 'utf8');
+export const getSyncStatus = fs.readFileSync(path.join(__dirname, 'getSyncStatus.gql'), 'utf8');
diff --git a/packages/blocks-watcher/src/gql/subscriptions/index.ts b/packages/blocks-watcher/src/gql/subscriptions/index.ts
new file mode 100644
index 0000000..f12910c
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/subscriptions/index.ts
@@ -0,0 +1,4 @@
+import fs from 'fs';
+import path from 'path';
+
+export const onEvent = fs.readFileSync(path.join(__dirname, 'onEvent.gql'), 'utf8');
diff --git a/packages/blocks-watcher/src/gql/subscriptions/onEvent.gql b/packages/blocks-watcher/src/gql/subscriptions/onEvent.gql
new file mode 100644
index 0000000..ecde54b
--- /dev/null
+++ b/packages/blocks-watcher/src/gql/subscriptions/onEvent.gql
@@ -0,0 +1,30 @@
+subscription onEvent{
+    onEvent{
+        block{
+            cid
+            hash
+            number
+            timestamp
+            parentHash
+        }
+        tx{
+            hash
+            index
+            from
+            to
+        }
+        contract
+        eventIndex
+        event{
+            ... on PairCreatedEvent {
+                token0
+                token1
+                pair
+                null
+            }
+        }
+        proof{
+            data
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/blocks-watcher/src/hooks.ts b/packages/blocks-watcher/src/hooks.ts
new file mode 100644
index 0000000..d45498b
--- /dev/null
+++ b/packages/blocks-watcher/src/hooks.ts
@@ -0,0 +1,86 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import assert from 'assert';
+
+import {
+  ResultEvent,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  updateStateForMappingType,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  updateStateForElementaryType
+} from '@cerc-io/util';
+
+import { Indexer } from './indexer';
+
+/**
+ * Hook function to store an initial state.
+ * @param indexer Indexer instance.
+ * @param blockHash Hash of the concerned block.
+ * @param contractAddress Address of the concerned contract.
+ * @returns Data block to be stored.
+ */
+export async function createInitialState (indexer: Indexer, contractAddress: string, blockHash: string): Promise<any> {
+  assert(indexer);
+  assert(blockHash);
+  assert(contractAddress);
+
+  // Store an empty State.
+  const stateData: any = {
+    state: {}
+  };
+
+  // Use updateStateForElementaryType to update initial state with an elementary property.
+  // Eg. const stateData = updateStateForElementaryType(stateData, '_totalBalance', result.value.toString());
+
+  // Use updateStateForMappingType to update initial state with a nested property.
+  // Eg. const stateData = updateStateForMappingType(stateData, '_allowances', [owner, spender], allowance.value.toString());
+
+  // Return initial state data to be saved.
+  return stateData;
+}
+
+/**
+ * Hook function to create state diff.
+ * @param indexer Indexer instance that contains methods to fetch the contract variable values.
+ * @param blockHash Block hash of the concerned block.
+ */
+export async function createStateDiff (indexer: Indexer, blockHash: string): Promise<void> {
+  assert(indexer);
+  assert(blockHash);
+
+  // Use indexer.createDiff() method to save custom state diff(s).
+}
+
+/**
+ * Hook function to create state checkpoint
+ * @param indexer Indexer instance.
+ * @param contractAddress Address of the concerned contract.
+ * @param blockHash Block hash of the concerned block.
+ * @returns Whether to disable default checkpoint. If false, the state from this hook is updated with that from default checkpoint.
+ */
+export async function createStateCheckpoint (indexer: Indexer, contractAddress: string, blockHash: string): Promise<boolean> {
+  assert(indexer);
+  assert(blockHash);
+  assert(contractAddress);
+
+  // Use indexer.createStateCheckpoint() method to create a custom checkpoint.
+
+  // Return false to update the state created by this hook by auto-generated checkpoint state.
+  // Return true to disable update of the state created by this hook by auto-generated checkpoint state.
+  return false;
+}
+
+/**
+ * Event hook function.
+ * @param indexer Indexer instance that contains methods to fetch and update the contract values in the database.
+ * @param eventData ResultEvent object containing event information.
+ */
+export async function handleEvent (indexer: Indexer, eventData: ResultEvent): Promise<void> {
+  assert(indexer);
+  assert(eventData);
+
+  // Use indexer methods to index data.
+  // Pass `diff` parameter to indexer methods as true to save an auto-generated state from the indexed data.
+}
diff --git a/packages/blocks-watcher/src/indexer.ts b/packages/blocks-watcher/src/indexer.ts
new file mode 100644
index 0000000..bc66bb9
--- /dev/null
+++ b/packages/blocks-watcher/src/indexer.ts
@@ -0,0 +1,683 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import assert from 'assert';
+import { DeepPartial, FindConditions, FindManyOptions, ObjectLiteral } from 'typeorm';
+import debug from 'debug';
+import { ethers, constants } from 'ethers';
+import { GraphQLResolveInfo } from 'graphql';
+
+import { JsonFragment } from '@ethersproject/abi';
+import { BaseProvider } from '@ethersproject/providers';
+import { MappingKey, StorageLayout } from '@cerc-io/solidity-mapper';
+import {
+  Indexer as BaseIndexer,
+  IndexerInterface,
+  ValueResult,
+  ServerConfig,
+  JobQueue,
+  Where,
+  QueryOptions,
+  BlockHeight,
+  ResultMeta,
+  updateSubgraphState,
+  dumpSubgraphState,
+  GraphWatcherInterface,
+  StateKind,
+  StateStatus,
+  ResultEvent,
+  getResultEvent,
+  DatabaseInterface,
+  Clients,
+  EthClient,
+  UpstreamConfig,
+  EthFullBlock,
+  EthFullTransaction,
+  ExtraEventData
+} from '@cerc-io/util';
+import { GraphWatcher } from '@cerc-io/graph-node';
+
+import UniswapV2FactoryArtifacts from './artifacts/UniswapV2Factory.json';
+import { Database, ENTITIES, SUBGRAPH_ENTITIES } from './database';
+import { createInitialState, handleEvent, createStateDiff, createStateCheckpoint } from './hooks';
+import { Contract } from './entity/Contract';
+import { Event } from './entity/Event';
+import { SyncStatus } from './entity/SyncStatus';
+import { StateSyncStatus } from './entity/StateSyncStatus';
+import { BlockProgress } from './entity/BlockProgress';
+import { State } from './entity/State';
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { Block } from './entity/Block';
+/* eslint-enable @typescript-eslint/no-unused-vars */
+
+import { FrothyEntity } from './entity/FrothyEntity';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const log = debug('vulcanize:indexer');
+
+const KIND_UNISWAPV2FACTORY = 'UniswapV2Factory';
+
+export class Indexer implements IndexerInterface {
+  _db: Database;
+  _ethClient: EthClient;
+  _ethProvider: BaseProvider;
+  _baseIndexer: BaseIndexer;
+  _serverConfig: ServerConfig;
+  _upstreamConfig: UpstreamConfig;
+  _graphWatcher: GraphWatcher;
+
+  _abiMap: Map<string, JsonFragment[]>;
+  _storageLayoutMap: Map<string, StorageLayout>;
+  _contractMap: Map<string, ethers.utils.Interface>;
+  eventSignaturesMap: Map<string, string[]>;
+
+  _entityTypesMap: Map<string, { [key: string]: string }>;
+  _relationsMap: Map<any, { [key: string]: any }>;
+
+  _subgraphStateMap: Map<string, any>;
+
+  constructor (
+    config: {
+      server: ServerConfig;
+      upstream: UpstreamConfig;
+    },
+    db: DatabaseInterface,
+    clients: Clients,
+    ethProvider: BaseProvider,
+    jobQueue: JobQueue,
+    graphWatcher?: GraphWatcherInterface
+  ) {
+    assert(db);
+    assert(clients.ethClient);
+
+    this._db = db as Database;
+    this._ethClient = clients.ethClient;
+    this._ethProvider = ethProvider;
+    this._serverConfig = config.server;
+    this._upstreamConfig = config.upstream;
+    this._baseIndexer = new BaseIndexer(config, this._db, this._ethClient, this._ethProvider, jobQueue);
+    assert(graphWatcher);
+    this._graphWatcher = graphWatcher as GraphWatcher;
+
+    this._abiMap = new Map();
+    this._storageLayoutMap = new Map();
+    this._contractMap = new Map();
+    this.eventSignaturesMap = new Map();
+
+    const { abi: UniswapV2FactoryABI } = UniswapV2FactoryArtifacts;
+
+    assert(UniswapV2FactoryABI);
+    this._abiMap.set(KIND_UNISWAPV2FACTORY, UniswapV2FactoryABI);
+
+    const UniswapV2FactoryContractInterface = new ethers.utils.Interface(UniswapV2FactoryABI);
+    this._contractMap.set(KIND_UNISWAPV2FACTORY, UniswapV2FactoryContractInterface);
+
+    const UniswapV2FactoryEventSignatures = Object.values(UniswapV2FactoryContractInterface.events).map(value => {
+      return UniswapV2FactoryContractInterface.getEventTopic(value);
+    });
+    this.eventSignaturesMap.set(KIND_UNISWAPV2FACTORY, UniswapV2FactoryEventSignatures);
+
+    this._entityTypesMap = new Map();
+    this._populateEntityTypesMap();
+
+    this._relationsMap = new Map();
+    this._populateRelationsMap();
+
+    this._subgraphStateMap = new Map();
+  }
+
+  get serverConfig (): ServerConfig {
+    return this._serverConfig;
+  }
+
+  get upstreamConfig (): UpstreamConfig {
+    return this._upstreamConfig;
+  }
+
+  get storageLayoutMap (): Map<string, StorageLayout> {
+    return this._storageLayoutMap;
+  }
+
+  get graphWatcher (): GraphWatcher {
+    return this._graphWatcher;
+  }
+
+  async init (): Promise<void> {
+    await this._baseIndexer.fetchContracts();
+    await this._baseIndexer.fetchStateStatus();
+  }
+
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+    this._graphWatcher.switchClients({ ethClient, ethProvider });
+  }
+
+  async getMetaData (block: BlockHeight): Promise<ResultMeta | null> {
+    return this._baseIndexer.getMetaData(block);
+  }
+
+  getResultEvent (event: Event): ResultEvent {
+    return getResultEvent(event);
+  }
+
+  async getStorageValue (storageLayout: StorageLayout, blockHash: string, contractAddress: string, variable: string, ...mappingKeys: MappingKey[]): Promise<ValueResult> {
+    return this._baseIndexer.getStorageValue(
+      storageLayout,
+      blockHash,
+      contractAddress,
+      variable,
+      ...mappingKeys
+    );
+  }
+
+  async getEntitiesForBlock (blockHash: string, tableName: string): Promise<any[]> {
+    return this._db.getEntitiesForBlock(blockHash, tableName);
+  }
+
+  async processInitialState (contractAddress: string, blockHash: string): Promise<any> {
+    // Call initial state hook.
+    return createInitialState(this, contractAddress, blockHash);
+  }
+
+  async processStateCheckpoint (contractAddress: string, blockHash: string): Promise<boolean> {
+    // Call checkpoint hook.
+    return createStateCheckpoint(this, contractAddress, blockHash);
+  }
+
+  async processCanonicalBlock (blockHash: string, blockNumber: number): Promise<void> {
+    console.time('time:indexer#processCanonicalBlock-finalize_auto_diffs');
+    // Finalize staged diff blocks if any.
+    await this._baseIndexer.finalizeDiffStaged(blockHash);
+    console.timeEnd('time:indexer#processCanonicalBlock-finalize_auto_diffs');
+
+    // Call custom stateDiff hook.
+    await createStateDiff(this, blockHash);
+
+    this._graphWatcher.pruneEntityCacheFrothyBlocks(blockHash, blockNumber);
+  }
+
+  async processCheckpoint (blockHash: string): Promise<void> {
+    // Return if checkpointInterval is <= 0.
+    const checkpointInterval = this._serverConfig.checkpointInterval;
+    if (checkpointInterval <= 0) return;
+
+    console.time('time:indexer#processCheckpoint-checkpoint');
+    await this._baseIndexer.processCheckpoint(this, blockHash, checkpointInterval);
+    console.timeEnd('time:indexer#processCheckpoint-checkpoint');
+  }
+
+  async processCLICheckpoint (contractAddress: string, blockHash?: string): Promise<string | undefined> {
+    return this._baseIndexer.processCLICheckpoint(this, contractAddress, blockHash);
+  }
+
+  async getPrevState (blockHash: string, contractAddress: string, kind?: string): Promise<State | undefined> {
+    return this._db.getPrevState(blockHash, contractAddress, kind);
+  }
+
+  async getLatestState (contractAddress: string, kind: StateKind | null, blockNumber?: number): Promise<State | undefined> {
+    return this._db.getLatestState(contractAddress, kind, blockNumber);
+  }
+
+  async getStatesByHash (blockHash: string): Promise<State[]> {
+    return this._baseIndexer.getStatesByHash(blockHash);
+  }
+
+  async getStateByCID (cid: string): Promise<State | undefined> {
+    return this._baseIndexer.getStateByCID(cid);
+  }
+
+  async getStates (where: FindConditions<State>): Promise<State[]> {
+    return this._db.getStates(where);
+  }
+
+  getStateData (state: State): any {
+    return this._baseIndexer.getStateData(state);
+  }
+
+  // Method used to create auto diffs (diff_staged).
+  async createDiffStaged (contractAddress: string, blockHash: string, data: any): Promise<void> {
+    console.time('time:indexer#createDiffStaged-auto_diff');
+    await this._baseIndexer.createDiffStaged(contractAddress, blockHash, data);
+    console.timeEnd('time:indexer#createDiffStaged-auto_diff');
+  }
+
+  // Method to be used by createStateDiff hook.
+  async createDiff (contractAddress: string, blockHash: string, data: any): Promise<void> {
+    const block = await this.getBlockProgress(blockHash);
+    assert(block);
+
+    await this._baseIndexer.createDiff(contractAddress, block, data);
+  }
+
+  // Method to be used by createStateCheckpoint hook.
+  async createStateCheckpoint (contractAddress: string, blockHash: string, data: any): Promise<void> {
+    const block = await this.getBlockProgress(blockHash);
+    assert(block);
+
+    return this._baseIndexer.createStateCheckpoint(contractAddress, block, data);
+  }
+
+  // Method to be used by export-state CLI.
+  async createCheckpoint (contractAddress: string, blockHash: string): Promise<string | undefined> {
+    const block = await this.getBlockProgress(blockHash);
+    assert(block);
+
+    return this._baseIndexer.createCheckpoint(this, contractAddress, block);
+  }
+
+  // Method to be used by fill-state CLI.
+  async createInit (blockHash: string, blockNumber: number): Promise<void> {
+    // Create initial state for contracts.
+    await this._baseIndexer.createInit(this, blockHash, blockNumber);
+  }
+
+  async saveOrUpdateState (state: State): Promise<State> {
+    return this._baseIndexer.saveOrUpdateState(state);
+  }
+
+  async removeStates (blockNumber: number, kind: StateKind): Promise<void> {
+    await this._baseIndexer.removeStates(blockNumber, kind);
+  }
+
+  async getSubgraphEntity<Entity extends ObjectLiteral> (
+    entity: new () => Entity,
+    id: string,
+    block: BlockHeight,
+    queryInfo: GraphQLResolveInfo
+  ): Promise<any> {
+    const data = await this._graphWatcher.getEntity(entity, id, this._relationsMap, block, queryInfo);
+
+    return data;
+  }
+
+  async getSubgraphEntities<Entity extends ObjectLiteral> (
+    entity: new () => Entity,
+    block: BlockHeight,
+    where: { [key: string]: any } = {},
+    queryOptions: QueryOptions = {},
+    queryInfo: GraphQLResolveInfo
+  ): Promise<any[]> {
+    return this._graphWatcher.getEntities(entity, this._relationsMap, block, where, queryOptions, queryInfo);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async triggerIndexingOnEvent (event: Event, extraData: ExtraEventData): Promise<void> {
+    const resultEvent = this.getResultEvent(event);
+
+    console.time('time:indexer#processEvent-mapping_code');
+    // Call subgraph handler for event.
+    await this._graphWatcher.handleEvent(resultEvent, extraData);
+    console.timeEnd('time:indexer#processEvent-mapping_code');
+
+    // Call custom hook function for indexing on event.
+    await handleEvent(this, resultEvent);
+  }
+
+  async processEvent (event: Event, extraData: ExtraEventData): Promise<void> {
+    // Trigger indexing of data based on the event.
+    await this.triggerIndexingOnEvent(event, extraData);
+  }
+
+  async processBlock (blockProgress: BlockProgress): Promise<void> {
+    console.time('time:indexer#processBlock-init_state');
+    // Call a function to create initial state for contracts.
+    await this._baseIndexer.createInit(this, blockProgress.blockHash, blockProgress.blockNumber);
+    console.timeEnd('time:indexer#processBlock-init_state');
+
+    this._graphWatcher.updateEntityCacheFrothyBlocks(blockProgress);
+  }
+
+  async processBlockAfterEvents (blockHash: string, blockNumber: number, extraData: ExtraEventData): Promise<void> {
+    console.time('time:indexer#processBlockAfterEvents-mapping_code');
+    // Call subgraph handler for block.
+    await this._graphWatcher.handleBlock(blockHash, blockNumber, extraData);
+    console.timeEnd('time:indexer#processBlockAfterEvents-mapping_code');
+
+    console.time('time:indexer#processBlockAfterEvents-dump_subgraph_state');
+    // Persist subgraph state to the DB.
+    await this.dumpSubgraphState(blockHash);
+    console.timeEnd('time:indexer#processBlockAfterEvents-dump_subgraph_state');
+  }
+
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
+    const { topics, data } = logObj;
+
+    const contract = this._contractMap.get(kind);
+    assert(contract);
+
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
+
+    const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
+
+    return {
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
+    };
+  }
+
+  async getStateSyncStatus (): Promise<StateSyncStatus | undefined> {
+    return this._db.getStateSyncStatus();
+  }
+
+  async updateStateSyncStatusIndexedBlock (blockNumber: number, force?: boolean): Promise<StateSyncStatus | undefined> {
+    if (!this._serverConfig.enableState) {
+      return;
+    }
+
+    const dbTx = await this._db.createTransactionRunner();
+    let res;
+
+    try {
+      res = await this._db.updateStateSyncStatusIndexedBlock(dbTx, blockNumber, force);
+      await dbTx.commitTransaction();
+    } catch (error) {
+      await dbTx.rollbackTransaction();
+      throw error;
+    } finally {
+      await dbTx.release();
+    }
+
+    return res;
+  }
+
+  async updateStateSyncStatusCheckpointBlock (blockNumber: number, force?: boolean): Promise<StateSyncStatus> {
+    const dbTx = await this._db.createTransactionRunner();
+    let res;
+
+    try {
+      res = await this._db.updateStateSyncStatusCheckpointBlock(dbTx, blockNumber, force);
+      await dbTx.commitTransaction();
+    } catch (error) {
+      await dbTx.rollbackTransaction();
+      throw error;
+    } finally {
+      await dbTx.release();
+    }
+
+    return res;
+  }
+
+  async getLatestCanonicalBlock (): Promise<BlockProgress | undefined> {
+    const syncStatus = await this.getSyncStatus();
+    assert(syncStatus);
+
+    if (syncStatus.latestCanonicalBlockHash === constants.HashZero) {
+      return;
+    }
+
+    const latestCanonicalBlock = await this.getBlockProgress(syncStatus.latestCanonicalBlockHash);
+    assert(latestCanonicalBlock);
+
+    return latestCanonicalBlock;
+  }
+
+  async getLatestStateIndexedBlock (): Promise<BlockProgress> {
+    return this._baseIndexer.getLatestStateIndexedBlock();
+  }
+
+  async addContracts (): Promise<void> {
+    // Watching all the contracts in the subgraph.
+    await this._graphWatcher.addContracts();
+  }
+
+  async watchContract (address: string, kind: string, checkpoint: boolean, startingBlock: number, context?: any): Promise<void> {
+    return this._baseIndexer.watchContract(address, kind, checkpoint, startingBlock, context);
+  }
+
+  updateStateStatusMap (address: string, stateStatus: StateStatus): void {
+    this._baseIndexer.updateStateStatusMap(address, stateStatus);
+  }
+
+  cacheContract (contract: Contract): void {
+    return this._baseIndexer.cacheContract(contract);
+  }
+
+  async saveEventEntity (dbEvent: Event): Promise<Event> {
+    return this._baseIndexer.saveEventEntity(dbEvent);
+  }
+
+  async saveEvents (dbEvents: Event[]): Promise<void> {
+    return this._baseIndexer.saveEvents(dbEvents);
+  }
+
+  async getEventsByFilter (blockHash: string, contract?: string, name?: string): Promise<Array<Event>> {
+    return this._baseIndexer.getEventsByFilter(blockHash, contract, name);
+  }
+
+  isWatchedContract (address : string): Contract | undefined {
+    return this._baseIndexer.isWatchedContract(address);
+  }
+
+  getWatchedContracts (): Contract[] {
+    return this._baseIndexer.getWatchedContracts();
+  }
+
+  getContractsByKind (kind: string): Contract[] {
+    return this._baseIndexer.getContractsByKind(kind);
+  }
+
+  async getProcessedBlockCountForRange (fromBlockNumber: number, toBlockNumber: number): Promise<{ expected: number, actual: number }> {
+    return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
+  }
+
+  async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
+    return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
+  }
+
+  async getSyncStatus (): Promise<SyncStatus | undefined> {
+    return this._baseIndexer.getSyncStatus();
+  }
+
+  async getBlocks (blockFilter: { blockHash?: string, blockNumber?: number }): Promise<any> {
+    return this._baseIndexer.getBlocks(blockFilter);
+  }
+
+  async updateSyncStatusIndexedBlock (blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
+    return this._baseIndexer.updateSyncStatusIndexedBlock(blockHash, blockNumber, force);
+  }
+
+  async updateSyncStatusChainHead (blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
+    return this._baseIndexer.updateSyncStatusChainHead(blockHash, blockNumber, force);
+  }
+
+  async updateSyncStatusCanonicalBlock (blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
+    const syncStatus = this._baseIndexer.updateSyncStatusCanonicalBlock(blockHash, blockNumber, force);
+    await this.pruneFrothyEntities(blockNumber);
+
+    return syncStatus;
+  }
+
+  async updateSyncStatusProcessedBlock (blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
+    return this._baseIndexer.updateSyncStatusProcessedBlock(blockHash, blockNumber, force);
+  }
+
+  async updateSyncStatusIndexingError (hasIndexingError: boolean): Promise<SyncStatus | undefined> {
+    return this._baseIndexer.updateSyncStatusIndexingError(hasIndexingError);
+  }
+
+  async updateSyncStatus (syncStatus: DeepPartial<SyncStatus>): Promise<SyncStatus> {
+    return this._baseIndexer.updateSyncStatus(syncStatus);
+  }
+
+  async getEvent (id: string): Promise<Event | undefined> {
+    return this._baseIndexer.getEvent(id);
+  }
+
+  async getBlockProgress (blockHash: string): Promise<BlockProgress | undefined> {
+    return this._baseIndexer.getBlockProgress(blockHash);
+  }
+
+  async getBlockProgressEntities (where: FindConditions<BlockProgress>, options: FindManyOptions<BlockProgress>): Promise<BlockProgress[]> {
+    return this._baseIndexer.getBlockProgressEntities(where, options);
+  }
+
+  async getBlocksAtHeight (height: number, isPruned: boolean): Promise<BlockProgress[]> {
+    return this._baseIndexer.getBlocksAtHeight(height, isPruned);
+  }
+
+  async fetchAndSaveFilteredEventsAndBlocks (startBlock: number, endBlock: number): Promise<{
+    blockProgress: BlockProgress,
+    events: DeepPartial<Event>[],
+    ethFullBlock: EthFullBlock;
+    ethFullTransactions: EthFullTransaction[];
+  }[]> {
+    return this._baseIndexer.fetchAndSaveFilteredEventsAndBlocks(startBlock, endBlock, this.eventSignaturesMap, this.parseEventNameAndArgs.bind(this));
+  }
+
+  async fetchEventsForContracts (blockHash: string, blockNumber: number, addresses: string[]): Promise<DeepPartial<Event>[]> {
+    return this._baseIndexer.fetchEventsForContracts(blockHash, blockNumber, addresses, this.eventSignaturesMap, this.parseEventNameAndArgs.bind(this));
+  }
+
+  async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[
+    BlockProgress,
+    DeepPartial<Event>[],
+    EthFullTransaction[]
+  ]> {
+    return this._saveBlockAndFetchEvents(block);
+  }
+
+  async getBlockEvents (blockHash: string, where: Where, queryOptions: QueryOptions): Promise<Array<Event>> {
+    return this._baseIndexer.getBlockEvents(blockHash, where, queryOptions);
+  }
+
+  async removeUnknownEvents (block: BlockProgress): Promise<void> {
+    return this._baseIndexer.removeUnknownEvents(Event, block);
+  }
+
+  async markBlocksAsPruned (blocks: BlockProgress[]): Promise<void> {
+    await this._baseIndexer.markBlocksAsPruned(blocks);
+
+    await this._graphWatcher.pruneEntities(FrothyEntity, blocks, SUBGRAPH_ENTITIES);
+  }
+
+  async pruneFrothyEntities (blockNumber: number): Promise<void> {
+    await this._graphWatcher.pruneFrothyEntities(FrothyEntity, blockNumber);
+  }
+
+  async resetLatestEntities (blockNumber: number): Promise<void> {
+    await this._graphWatcher.resetLatestEntities(blockNumber);
+  }
+
+  async updateBlockProgress (block: BlockProgress, lastProcessedEventIndex: number): Promise<BlockProgress> {
+    return this._baseIndexer.updateBlockProgress(block, lastProcessedEventIndex);
+  }
+
+  async getAncestorAtHeight (blockHash: string, height: number): Promise<string> {
+    return this._baseIndexer.getAncestorAtHeight(blockHash, height);
+  }
+
+  async resetWatcherToBlock (blockNumber: number): Promise<void> {
+    const entities = [...ENTITIES, FrothyEntity];
+    await this._baseIndexer.resetWatcherToBlock(blockNumber, entities);
+
+    await this.resetLatestEntities(blockNumber);
+  }
+
+  async clearProcessedBlockData (block: BlockProgress): Promise<void> {
+    const entities = [...ENTITIES, FrothyEntity];
+    await this._baseIndexer.clearProcessedBlockData(block, entities);
+
+    await this.resetLatestEntities(block.blockNumber);
+  }
+
+  getEntityTypesMap (): Map<string, { [key: string]: string }> {
+    return this._entityTypesMap;
+  }
+
+  getRelationsMap (): Map<any, { [key: string]: any }> {
+    return this._relationsMap;
+  }
+
+  updateSubgraphState (contractAddress: string, data: any): void {
+    return updateSubgraphState(this._subgraphStateMap, contractAddress, data);
+  }
+
+  async dumpSubgraphState (blockHash: string, isStateFinalized = false): Promise<void> {
+    return dumpSubgraphState(this, this._subgraphStateMap, blockHash, isStateFinalized);
+  }
+
+  _populateEntityTypesMap (): void {
+    this._entityTypesMap.set('Block', {
+      id: 'ID',
+      number: 'BigInt',
+      timestamp: 'BigInt',
+      parentHash: 'String',
+      author: 'String',
+      difficulty: 'BigInt',
+      totalDifficulty: 'BigInt',
+      gasUsed: 'BigInt',
+      gasLimit: 'BigInt',
+      receiptsRoot: 'String',
+      transactionsRoot: 'String',
+      stateRoot: 'String',
+      size: 'BigInt',
+      unclesHash: 'String'
+    });
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  _populateRelationsMap (): void {
+  }
+
+  async _saveBlockAndFetchEvents ({
+    cid: blockCid,
+    blockHash,
+    blockNumber,
+    blockTimestamp,
+    parentHash
+  }: DeepPartial<BlockProgress>): Promise<[
+    BlockProgress,
+    DeepPartial<Event>[],
+    EthFullTransaction[]
+  ]> {
+    assert(blockHash);
+    assert(blockNumber);
+
+    const { events: dbEvents, transactions } = await this._baseIndexer.fetchEvents(blockHash, blockNumber, this.eventSignaturesMap, this.parseEventNameAndArgs.bind(this));
+
+    const dbTx = await this._db.createTransactionRunner();
+    try {
+      const block = {
+        cid: blockCid,
+        blockHash,
+        blockNumber,
+        blockTimestamp,
+        parentHash
+      };
+
+      console.time(`time:indexer#_saveBlockAndFetchEvents-db-save-${blockNumber}`);
+      const blockProgress = await this._db.saveBlockWithEvents(dbTx, block, dbEvents);
+      await dbTx.commitTransaction();
+      console.timeEnd(`time:indexer#_saveBlockAndFetchEvents-db-save-${blockNumber}`);
+
+      return [blockProgress, [], transactions];
+    } catch (error) {
+      await dbTx.rollbackTransaction();
+      throw error;
+    } finally {
+      await dbTx.release();
+    }
+  }
+
+  async getFullTransactions (txHashList: string[]): Promise<EthFullTransaction[]> {
+    return this._baseIndexer.getFullTransactions(txHashList);
+  }
+}
diff --git a/packages/blocks-watcher/src/job-runner.ts b/packages/blocks-watcher/src/job-runner.ts
new file mode 100644
index 0000000..93d6820
--- /dev/null
+++ b/packages/blocks-watcher/src/job-runner.ts
@@ -0,0 +1,48 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import debug from 'debug';
+
+import { JobRunnerCmd } from '@cerc-io/cli';
+import { JobRunner } from '@cerc-io/util';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { Indexer } from './indexer';
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from './database';
+
+const log = debug('vulcanize:job-runner');
+
+export const main = async (): Promise<any> => {
+  const jobRunnerCmd = new JobRunnerCmd();
+  await jobRunnerCmd.init(Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    jobRunnerCmd.config.server,
+    jobRunnerCmd.clients.ethClient,
+    jobRunnerCmd.ethProvider,
+    jobRunnerCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await jobRunnerCmd.initIndexer(Indexer, graphWatcher);
+
+  await jobRunnerCmd.exec(async (jobRunner: JobRunner): Promise<void> => {
+    await jobRunner.subscribeBlockProcessingQueue();
+    await jobRunner.subscribeHistoricalProcessingQueue();
+    await jobRunner.subscribeEventProcessingQueue();
+    await jobRunner.subscribeBlockCheckpointQueue();
+    await jobRunner.subscribeHooksQueue();
+  });
+};
+
+main().then(() => {
+  log('Starting job runner...');
+}).catch(err => {
+  log(err);
+});
+
+process.on('uncaughtException', err => {
+  log('uncaughtException', err);
+});
diff --git a/packages/blocks-watcher/src/resolvers.ts b/packages/blocks-watcher/src/resolvers.ts
new file mode 100644
index 0000000..e209f6f
--- /dev/null
+++ b/packages/blocks-watcher/src/resolvers.ts
@@ -0,0 +1,286 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import assert from 'assert';
+import debug from 'debug';
+import { GraphQLResolveInfo } from 'graphql';
+import { ExpressContext } from 'apollo-server-express';
+import winston from 'winston';
+
+import {
+  gqlTotalQueryCount,
+  gqlQueryCount,
+  gqlQueryDuration,
+  getResultState,
+  IndexerInterface,
+  GraphQLBigInt,
+  GraphQLBigDecimal,
+  BlockHeight,
+  OrderDirection,
+  jsonBigIntStringReplacer,
+  EventWatcher,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  setGQLCacheHints
+} from '@cerc-io/util';
+
+import { Indexer } from './indexer';
+
+import { Block } from './entity/Block';
+
+const log = debug('vulcanize:resolver');
+
+const executeAndRecordMetrics = async (
+  indexer: Indexer,
+  gqlLogger: winston.Logger,
+  opName: string,
+  expressContext: ExpressContext,
+  operation: () => Promise<any>
+) => {
+  gqlTotalQueryCount.inc(1);
+  gqlQueryCount.labels(opName).inc(1);
+  const endTimer = gqlQueryDuration.labels(opName).startTimer();
+
+  try {
+    const [result, syncStatus] = await Promise.all([
+      operation(),
+      indexer.getSyncStatus()
+    ]);
+
+    gqlLogger.info({
+      opName,
+      query: expressContext.req.body.query,
+      variables: expressContext.req.body.variables,
+      latestIndexedBlockNumber: syncStatus?.latestIndexedBlockNumber,
+      urlPath: expressContext.req.path,
+      apiKey: expressContext.req.header('x-api-key'),
+      origin: expressContext.req.headers.origin
+    });
+    return result;
+  } catch (error) {
+    gqlLogger.error({
+      opName,
+      error,
+      query: expressContext.req.body.query,
+      variables: expressContext.req.body.variables,
+      urlPath: expressContext.req.path,
+      apiKey: expressContext.req.header('x-api-key'),
+      origin: expressContext.req.headers.origin
+    });
+  } finally {
+    endTimer();
+  }
+};
+
+export const createResolvers = async (
+  indexerArg: IndexerInterface,
+  eventWatcher: EventWatcher,
+  gqlLogger: winston.Logger
+): Promise<any> => {
+  const indexer = indexerArg as Indexer;
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const gqlCacheConfig = indexer.serverConfig.gql.cache;
+
+  return {
+    BigInt: GraphQLBigInt,
+
+    BigDecimal: GraphQLBigDecimal,
+
+    Event: {
+      __resolveType: (obj: any) => {
+        assert(obj.__typename);
+
+        return obj.__typename;
+      }
+    },
+
+    Subscription: {
+      onEvent: {
+        subscribe: () => eventWatcher.getEventIterator()
+      }
+    },
+
+    Mutation: {
+      watchContract: async (_: any, { address, kind, checkpoint, startingBlock = 1 }: { address: string, kind: string, checkpoint: boolean, startingBlock: number }): Promise<boolean> => {
+        log('watchContract', address, kind, checkpoint, startingBlock);
+        await indexer.watchContract(address, kind, checkpoint, startingBlock);
+
+        return true;
+      }
+    },
+
+    Query: {
+      block: async (
+        _: any,
+        { id, block = {} }: { id: string, block: BlockHeight },
+        expressContext: ExpressContext,
+        info: GraphQLResolveInfo
+      ) => {
+        log('block', id, JSON.stringify(block, jsonBigIntStringReplacer));
+
+        // Set cache-control hints
+        // setGQLCacheHints(info, block, gqlCacheConfig);
+
+        return executeAndRecordMetrics(
+          indexer,
+          gqlLogger,
+          'block',
+          expressContext,
+          async () => indexer.getSubgraphEntity(Block, id, block, info)
+        );
+      },
+
+      blocks: async (
+        _: any,
+        { block = {}, where, first, skip, orderBy, orderDirection }: { block: BlockHeight, where: { [key: string]: any }, first: number, skip: number, orderBy: string, orderDirection: OrderDirection },
+        expressContext: ExpressContext,
+        info: GraphQLResolveInfo
+      ) => {
+        log('blocks', JSON.stringify(block, jsonBigIntStringReplacer), JSON.stringify(where, jsonBigIntStringReplacer), first, skip, orderBy, orderDirection);
+
+        // Set cache-control hints
+        // setGQLCacheHints(info, block, gqlCacheConfig);
+
+        return executeAndRecordMetrics(
+          indexer,
+          gqlLogger,
+          'blocks',
+          expressContext,
+          async () => indexer.getSubgraphEntities(
+            Block,
+            block,
+            where,
+            { limit: first, skip, orderBy, orderDirection },
+            info
+          )
+        );
+      },
+
+      events: async (
+        _: any,
+        { blockHash, contractAddress, name }: { blockHash: string, contractAddress: string, name?: string },
+        expressContext: ExpressContext
+      ) => {
+        log('events', blockHash, contractAddress, name);
+
+        return executeAndRecordMetrics(
+          indexer,
+          gqlLogger,
+          'events',
+          expressContext,
+          async () => {
+            const block = await indexer.getBlockProgress(blockHash);
+            if (!block || !block.isComplete) {
+              throw new Error(`Block hash ${blockHash} number ${block?.blockNumber} not processed yet`);
+            }
+
+            const events = await indexer.getEventsByFilter(blockHash, contractAddress, name);
+            return events.map(event => indexer.getResultEvent(event));
+          }
+        );
+      },
+
+      eventsInRange: async (
+        _: any,
+        { fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
+        expressContext: ExpressContext
+      ) => {
+        log('eventsInRange', fromBlockNumber, toBlockNumber);
+
+        return executeAndRecordMetrics(
+          indexer,
+          gqlLogger,
+          'eventsInRange',
+          expressContext,
+          async () => {
+            const syncStatus = await indexer.getSyncStatus();
+
+            if (!syncStatus) {
+              throw new Error('No blocks processed yet');
+            }
+
+            if ((fromBlockNumber < syncStatus.initialIndexedBlockNumber) || (toBlockNumber > syncStatus.latestProcessedBlockNumber)) {
+              throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
+            }
+
+            const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
+            return events.map(event => indexer.getResultEvent(event));
+          }
+        );
+      },
+
+      getStateByCID: async (
+        _: any,
+        { cid }: { cid: string },
+        expressContext: ExpressContext
+      ) => {
+        log('getStateByCID', cid);
+
+        return executeAndRecordMetrics(
+          indexer,
+          gqlLogger,
+          'getStateByCID',
+          expressContext,
+          async () => {
+            const state = await indexer.getStateByCID(cid);
+
+            return state && state.block.isComplete ? getResultState(state) : undefined;
+          }
+        );
+      },
+
+      getState: async (
+        _: any,
+        { blockHash, contractAddress, kind }: { blockHash: string, contractAddress: string, kind: string },
+        expressContext: ExpressContext
+      ) => {
+        log('getState', blockHash, contractAddress, kind);
+
+        return executeAndRecordMetrics(
+          indexer,
+          gqlLogger,
+          'getState',
+          expressContext,
+          async () => {
+            const state = await indexer.getPrevState(blockHash, contractAddress, kind);
+
+            return state && state.block.isComplete ? getResultState(state) : undefined;
+          }
+        );
+      },
+
+      _meta: async (
+        _: any,
+        { block = {} }: { block: BlockHeight },
+        expressContext: ExpressContext
+      ) => {
+        log('_meta');
+
+        return executeAndRecordMetrics(
+          indexer,
+          gqlLogger,
+          '_meta',
+          expressContext,
+          async () => indexer.getMetaData(block)
+        );
+      },
+
+      getSyncStatus: async (
+        _: any,
+        __: Record<string, never>,
+        expressContext: ExpressContext
+      ) => {
+        log('getSyncStatus');
+
+        return executeAndRecordMetrics(
+          indexer,
+          gqlLogger,
+          'getSyncStatus',
+          expressContext,
+          async () => indexer.getSyncStatus()
+        );
+      }
+    }
+  };
+};
diff --git a/packages/blocks-watcher/src/schema.gql b/packages/blocks-watcher/src/schema.gql
new file mode 100644
index 0000000..9f22585
--- /dev/null
+++ b/packages/blocks-watcher/src/schema.gql
@@ -0,0 +1,337 @@
+directive @cacheControl(maxAge: Int, inheritMaxAge: Boolean, scope: CacheControlScope) on FIELD_DEFINITION | OBJECT | INTERFACE | UNION
+
+enum CacheControlScope {
+  PUBLIC
+  PRIVATE
+}
+
+scalar BigInt
+
+scalar BigDecimal
+
+scalar Bytes
+
+type Proof {
+  data: String!
+}
+
+type _Block_ {
+  cid: String
+  hash: String!
+  number: Int!
+  timestamp: Int!
+  parentHash: String!
+}
+
+type _Transaction_ {
+  hash: String!
+  index: Int!
+  from: String!
+  to: String!
+}
+
+type ResultEvent {
+  block: _Block_!
+  tx: _Transaction_!
+  contract: String!
+  eventIndex: Int!
+  event: Event!
+  proof: Proof
+}
+
+union Event = PairCreatedEvent
+
+type PairCreatedEvent {
+  token0: String!
+  token1: String!
+  pair: String!
+  null: BigInt!
+}
+
+input Block_height {
+  hash: Bytes
+  number: Int
+}
+
+input BlockChangedFilter {
+  number_gte: Int!
+}
+
+enum OrderDirection {
+  asc
+  desc
+}
+
+enum Block_orderBy {
+  id
+  number
+  timestamp
+  parentHash
+  author
+  difficulty
+  totalDifficulty
+  gasUsed
+  gasLimit
+  receiptsRoot
+  transactionsRoot
+  stateRoot
+  size
+  unclesHash
+}
+
+input Block_filter {
+  id: ID
+  id_not: ID
+  id_gt: ID
+  id_lt: ID
+  id_gte: ID
+  id_lte: ID
+  id_in: [ID!]
+  id_not_in: [ID!]
+  number: BigInt
+  number_not: BigInt
+  number_gt: BigInt
+  number_lt: BigInt
+  number_gte: BigInt
+  number_lte: BigInt
+  number_in: [BigInt!]
+  number_not_in: [BigInt!]
+  timestamp: BigInt
+  timestamp_not: BigInt
+  timestamp_gt: BigInt
+  timestamp_lt: BigInt
+  timestamp_gte: BigInt
+  timestamp_lte: BigInt
+  timestamp_in: [BigInt!]
+  timestamp_not_in: [BigInt!]
+  parentHash: String
+  parentHash_not: String
+  parentHash_gt: String
+  parentHash_lt: String
+  parentHash_gte: String
+  parentHash_lte: String
+  parentHash_in: [String!]
+  parentHash_not_in: [String!]
+  parentHash_starts_with: String
+  parentHash_starts_with_nocase: String
+  parentHash_not_starts_with: String
+  parentHash_not_starts_with_nocase: String
+  parentHash_ends_with: String
+  parentHash_ends_with_nocase: String
+  parentHash_not_ends_with: String
+  parentHash_not_ends_with_nocase: String
+  parentHash_contains: String
+  parentHash_not_contains: String
+  parentHash_contains_nocase: String
+  parentHash_not_contains_nocase: String
+  author: String
+  author_not: String
+  author_gt: String
+  author_lt: String
+  author_gte: String
+  author_lte: String
+  author_in: [String!]
+  author_not_in: [String!]
+  author_starts_with: String
+  author_starts_with_nocase: String
+  author_not_starts_with: String
+  author_not_starts_with_nocase: String
+  author_ends_with: String
+  author_ends_with_nocase: String
+  author_not_ends_with: String
+  author_not_ends_with_nocase: String
+  author_contains: String
+  author_not_contains: String
+  author_contains_nocase: String
+  author_not_contains_nocase: String
+  difficulty: BigInt
+  difficulty_not: BigInt
+  difficulty_gt: BigInt
+  difficulty_lt: BigInt
+  difficulty_gte: BigInt
+  difficulty_lte: BigInt
+  difficulty_in: [BigInt!]
+  difficulty_not_in: [BigInt!]
+  totalDifficulty: BigInt
+  totalDifficulty_not: BigInt
+  totalDifficulty_gt: BigInt
+  totalDifficulty_lt: BigInt
+  totalDifficulty_gte: BigInt
+  totalDifficulty_lte: BigInt
+  totalDifficulty_in: [BigInt!]
+  totalDifficulty_not_in: [BigInt!]
+  gasUsed: BigInt
+  gasUsed_not: BigInt
+  gasUsed_gt: BigInt
+  gasUsed_lt: BigInt
+  gasUsed_gte: BigInt
+  gasUsed_lte: BigInt
+  gasUsed_in: [BigInt!]
+  gasUsed_not_in: [BigInt!]
+  gasLimit: BigInt
+  gasLimit_not: BigInt
+  gasLimit_gt: BigInt
+  gasLimit_lt: BigInt
+  gasLimit_gte: BigInt
+  gasLimit_lte: BigInt
+  gasLimit_in: [BigInt!]
+  gasLimit_not_in: [BigInt!]
+  receiptsRoot: String
+  receiptsRoot_not: String
+  receiptsRoot_gt: String
+  receiptsRoot_lt: String
+  receiptsRoot_gte: String
+  receiptsRoot_lte: String
+  receiptsRoot_in: [String!]
+  receiptsRoot_not_in: [String!]
+  receiptsRoot_starts_with: String
+  receiptsRoot_starts_with_nocase: String
+  receiptsRoot_not_starts_with: String
+  receiptsRoot_not_starts_with_nocase: String
+  receiptsRoot_ends_with: String
+  receiptsRoot_ends_with_nocase: String
+  receiptsRoot_not_ends_with: String
+  receiptsRoot_not_ends_with_nocase: String
+  receiptsRoot_contains: String
+  receiptsRoot_not_contains: String
+  receiptsRoot_contains_nocase: String
+  receiptsRoot_not_contains_nocase: String
+  transactionsRoot: String
+  transactionsRoot_not: String
+  transactionsRoot_gt: String
+  transactionsRoot_lt: String
+  transactionsRoot_gte: String
+  transactionsRoot_lte: String
+  transactionsRoot_in: [String!]
+  transactionsRoot_not_in: [String!]
+  transactionsRoot_starts_with: String
+  transactionsRoot_starts_with_nocase: String
+  transactionsRoot_not_starts_with: String
+  transactionsRoot_not_starts_with_nocase: String
+  transactionsRoot_ends_with: String
+  transactionsRoot_ends_with_nocase: String
+  transactionsRoot_not_ends_with: String
+  transactionsRoot_not_ends_with_nocase: String
+  transactionsRoot_contains: String
+  transactionsRoot_not_contains: String
+  transactionsRoot_contains_nocase: String
+  transactionsRoot_not_contains_nocase: String
+  stateRoot: String
+  stateRoot_not: String
+  stateRoot_gt: String
+  stateRoot_lt: String
+  stateRoot_gte: String
+  stateRoot_lte: String
+  stateRoot_in: [String!]
+  stateRoot_not_in: [String!]
+  stateRoot_starts_with: String
+  stateRoot_starts_with_nocase: String
+  stateRoot_not_starts_with: String
+  stateRoot_not_starts_with_nocase: String
+  stateRoot_ends_with: String
+  stateRoot_ends_with_nocase: String
+  stateRoot_not_ends_with: String
+  stateRoot_not_ends_with_nocase: String
+  stateRoot_contains: String
+  stateRoot_not_contains: String
+  stateRoot_contains_nocase: String
+  stateRoot_not_contains_nocase: String
+  size: BigInt
+  size_not: BigInt
+  size_gt: BigInt
+  size_lt: BigInt
+  size_gte: BigInt
+  size_lte: BigInt
+  size_in: [BigInt!]
+  size_not_in: [BigInt!]
+  unclesHash: String
+  unclesHash_not: String
+  unclesHash_gt: String
+  unclesHash_lt: String
+  unclesHash_gte: String
+  unclesHash_lte: String
+  unclesHash_in: [String!]
+  unclesHash_not_in: [String!]
+  unclesHash_starts_with: String
+  unclesHash_starts_with_nocase: String
+  unclesHash_not_starts_with: String
+  unclesHash_not_starts_with_nocase: String
+  unclesHash_ends_with: String
+  unclesHash_ends_with_nocase: String
+  unclesHash_not_ends_with: String
+  unclesHash_not_ends_with_nocase: String
+  unclesHash_contains: String
+  unclesHash_not_contains: String
+  unclesHash_contains_nocase: String
+  unclesHash_not_contains_nocase: String
+  _change_block: BlockChangedFilter
+  and: [Block_filter]
+  or: [Block_filter]
+}
+
+type _MetaBlock_ {
+  hash: Bytes
+  number: Int!
+  timestamp: Int
+}
+
+type _Meta_ {
+  block: _MetaBlock_!
+  deployment: String!
+  hasIndexingErrors: Boolean!
+}
+
+type ResultState {
+  block: _Block_!
+  contractAddress: String!
+  cid: String!
+  kind: String!
+  data: String!
+}
+
+type SyncStatus {
+  latestIndexedBlockHash: String!
+  latestIndexedBlockNumber: Int!
+  latestCanonicalBlockHash: String!
+  latestCanonicalBlockNumber: Int!
+  initialIndexedBlockHash: String!
+  initialIndexedBlockNumber: Int!
+  latestProcessedBlockHash: String!
+  latestProcessedBlockNumber: Int!
+}
+
+type Query {
+  events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
+  eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
+  block(id: ID!, block: Block_height): Block
+  blocks(block: Block_height, where: Block_filter, orderBy: Block_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Block!]!
+  _meta(block: Block_height): _Meta_
+  getStateByCID(cid: String!): ResultState
+  getState(blockHash: String!, contractAddress: String!, kind: String): ResultState
+  getSyncStatus: SyncStatus
+}
+
+type Block {
+  id: ID!
+  number: BigInt!
+  timestamp: BigInt!
+  parentHash: String
+  author: String
+  difficulty: BigInt
+  totalDifficulty: BigInt
+  gasUsed: BigInt
+  gasLimit: BigInt
+  receiptsRoot: String
+  transactionsRoot: String
+  stateRoot: String
+  size: BigInt
+  unclesHash: String
+}
+
+type Mutation {
+  watchContract(address: String!, kind: String!, checkpoint: Boolean!, startingBlock: Int): Boolean!
+}
+
+type Subscription {
+  onEvent: ResultEvent!
+}
diff --git a/packages/blocks-watcher/src/server.ts b/packages/blocks-watcher/src/server.ts
new file mode 100644
index 0000000..679134f
--- /dev/null
+++ b/packages/blocks-watcher/src/server.ts
@@ -0,0 +1,43 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import fs from 'fs';
+import path from 'path';
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { ServerCmd } from '@cerc-io/cli';
+import { getGraphDbAndWatcher } from '@cerc-io/graph-node';
+
+import { createResolvers } from './resolvers';
+import { Indexer } from './indexer';
+import { Database, ENTITY_QUERY_TYPE_MAP, ENTITY_TO_LATEST_ENTITY_MAP } from './database';
+
+const log = debug('vulcanize:server');
+
+export const main = async (): Promise<any> => {
+  const serverCmd = new ServerCmd();
+  await serverCmd.init(Database);
+
+  const { graphWatcher } = await getGraphDbAndWatcher(
+    serverCmd.config.server,
+    serverCmd.clients.ethClient,
+    serverCmd.ethProvider,
+    serverCmd.database.baseDatabase,
+    ENTITY_QUERY_TYPE_MAP,
+    ENTITY_TO_LATEST_ENTITY_MAP
+  );
+
+  await serverCmd.initIndexer(Indexer, graphWatcher);
+
+  const typeDefs = fs.readFileSync(path.join(__dirname, 'schema.gql')).toString();
+
+  return serverCmd.exec(createResolvers, typeDefs);
+};
+
+main().then(() => {
+  log('Starting server...');
+}).catch(err => {
+  log(err);
+});
diff --git a/packages/blocks-watcher/src/types.ts b/packages/blocks-watcher/src/types.ts
new file mode 100644
index 0000000..c456217
--- /dev/null
+++ b/packages/blocks-watcher/src/types.ts
@@ -0,0 +1,3 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
diff --git a/packages/blocks-watcher/subgraph-build/UniswapV2Factory/UniswapV2Factory.wasm b/packages/blocks-watcher/subgraph-build/UniswapV2Factory/UniswapV2Factory.wasm
new file mode 100644
index 0000000..02dc46e
Binary files /dev/null and b/packages/blocks-watcher/subgraph-build/UniswapV2Factory/UniswapV2Factory.wasm differ
diff --git a/packages/blocks-watcher/subgraph-build/UniswapV2Factory/abis/UniswapV2Factory.json b/packages/blocks-watcher/subgraph-build/UniswapV2Factory/abis/UniswapV2Factory.json
new file mode 100644
index 0000000..2f6137c
--- /dev/null
+++ b/packages/blocks-watcher/subgraph-build/UniswapV2Factory/abis/UniswapV2Factory.json
@@ -0,0 +1,215 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_feeToSetter",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "token0",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "token1",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "pair",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "PairCreated",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "allPairs",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "allPairsLength",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "tokenA",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "tokenB",
+        "type": "address"
+      }
+    ],
+    "name": "createPair",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "pair",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "feeTo",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "feeToSetter",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "getPair",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "migrator",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "pairCodeHash",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_feeTo",
+        "type": "address"
+      }
+    ],
+    "name": "setFeeTo",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_feeToSetter",
+        "type": "address"
+      }
+    ],
+    "name": "setFeeToSetter",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_migrator",
+        "type": "address"
+      }
+    ],
+    "name": "setMigrator",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
\ No newline at end of file
diff --git a/packages/blocks-watcher/subgraph-build/schema.graphql b/packages/blocks-watcher/subgraph-build/schema.graphql
new file mode 100644
index 0000000..7481971
--- /dev/null
+++ b/packages/blocks-watcher/subgraph-build/schema.graphql
@@ -0,0 +1,16 @@
+type Block @entity {
+  id: ID!
+  number: BigInt!
+  timestamp: BigInt!
+  parentHash: String
+  author: String
+  difficulty: BigInt
+  totalDifficulty: BigInt
+  gasUsed: BigInt
+  gasLimit: BigInt
+  receiptsRoot: String
+  transactionsRoot: String
+  stateRoot: String
+  size: BigInt
+  unclesHash: String
+}
diff --git a/packages/blocks-watcher/subgraph-build/subgraph.yaml b/packages/blocks-watcher/subgraph-build/subgraph.yaml
new file mode 100644
index 0000000..62ad9e9
--- /dev/null
+++ b/packages/blocks-watcher/subgraph-build/subgraph.yaml
@@ -0,0 +1,25 @@
+specVersion: 0.0.4
+description: Blocks
+repository: https://github.com/sushiswap/subgraphs
+schema:
+  file: schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: UniswapV2Factory
+    network: mainnet
+    source:
+      address: "0x719e14fcb364bb05649bd525eb6c4a2d0d4ea2b7"
+      startBlock: 2867000
+      abi: UniswapV2Factory
+    mapping:
+      kind: ethereun/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      file: UniswapV2Factory/UniswapV2Factory.wasm
+      entities:
+        - Blocks
+      abis:
+        - name: UniswapV2Factory
+          file: UniswapV2Factory/abis/UniswapV2Factory.json
+      blockHandlers:
+        - handler: onBlock
diff --git a/packages/blocks-watcher/tsconfig.json b/packages/blocks-watcher/tsconfig.json
new file mode 100644
index 0000000..f4b8852
--- /dev/null
+++ b/packages/blocks-watcher/tsconfig.json
@@ -0,0 +1,74 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Basic Options */
+    // "incremental": true,                         /* Enable incremental compilation */
+    "target": "es5",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
+    "module": "commonjs",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "lib": ["es2019"],                              /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                             /* Allow javascript files to be compiled. */
+    // "checkJs": true,                             /* Report errors in .js files. */
+    // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
+    // "declaration": true,                         /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    "sourceMap": true,                              /* Generates corresponding '.map' file. */
+    // "outFile": "./",                             /* Concatenate and emit output to single file. */
+    "outDir": "dist",                               /* Redirect output structure to the directory. */
+    // "rootDir": "./",                             /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                           /* Enable project compilation */
+    // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
+    // "removeComments": true,                      /* Do not emit comments to output. */
+    // "noEmit": true,                              /* Do not emit outputs. */
+    // "importHelpers": true,                       /* Import emit helpers from 'tslib'. */
+    "downlevelIteration": true,                  /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true,                                 /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,                    /* Enable strict null checks. */
+    // "strictFunctionTypes": true,                 /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,                 /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,        /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                      /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                        /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                      /* Report errors on unused locals. */
+    // "noUnusedParameters": true,                  /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,                   /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
+    // "noUncheckedIndexedAccess": true,            /* Include 'undefined' in index signature results */
+    // "noImplicitOverride": true,                  /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
+    // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                             /* List of folders to include type definitions from. */
+    // "types": [],                                 /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true,                        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                            /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                               /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,                     /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                       /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    "experimentalDecorators": true,                 /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": true,                           /* Skip type checking of declaration files. */
+    "forceConsistentCasingInFileNames": true,       /* Disallow inconsistently-cased references to the same file. */
+    "resolveJsonModule": true                       /* Enabling the option allows importing JSON, and validating the types in that JSON file. */
+  },
+  "include": ["src/**/*"]
+}