Log checked headers for MCD events (#43)

* Log checked headers for Bite events

* Log checked headers for Drip drip events

* Log checked headers for Drip file events

- mark headers checked for 3 implementations of file on the Drip contract

* Log checked headers for Frob frob events

* Log checked headers for Pit file events

- mark headers checked for 3 implementations of file on the Pit contract

* Log checked headers for Vat init events

pkg/transformers/drip_file/ilk/converter.go

@@ -25,28 +25,36 @@ import (
 )
 
 type Converter interface {
-	ToModel(ethLog types.Log) (DripFileIlkModel, error)
+	ToModels(ethLogs []types.Log) ([]DripFileIlkModel, error)
 }
 
 type DripFileIlkConverter struct{}
 
-func (DripFileIlkConverter) ToModel(ethLog types.Log) (DripFileIlkModel, error) {
-	err := verifyLog(ethLog)
-	if err != nil {
-		return DripFileIlkModel{}, err
+func (DripFileIlkConverter) ToModels(ethLogs []types.Log) ([]DripFileIlkModel, error) {
+	var models []DripFileIlkModel
+	for _, ethLog := range ethLogs {
+		err := verifyLog(ethLog)
+		if err != nil {
+			return nil, err
+		}
+		ilk := string(bytes.Trim(ethLog.Topics[2].Bytes(), "\x00"))
+		vow := string(bytes.Trim(ethLog.Topics[3].Bytes(), "\x00"))
+		taxBytes := ethLog.Data[len(ethLog.Data)-shared.DataItemLength:]
+		tax := big.NewInt(0).SetBytes(taxBytes).String()
+		raw, err := json.Marshal(ethLog)
+		if err != nil {
+			return nil, err
+		}
+		model := DripFileIlkModel{
+			Ilk:              ilk,
+			Vow:              vow,
+			Tax:              tax,
+			TransactionIndex: ethLog.TxIndex,
+			Raw:              raw,
+		}
+		models = append(models, model)
 	}
-	ilk := string(bytes.Trim(ethLog.Topics[2].Bytes(), "\x00"))
-	vow := string(bytes.Trim(ethLog.Topics[3].Bytes(), "\x00"))
-	taxBytes := ethLog.Data[len(ethLog.Data)-shared.DataItemLength:]
-	tax := big.NewInt(0).SetBytes(taxBytes).String()
-	raw, err := json.Marshal(ethLog)
-	return DripFileIlkModel{
-		Ilk:              ilk,
-		Vow:              vow,
-		Tax:              tax,
-		TransactionIndex: ethLog.TxIndex,
-		Raw:              raw,
-	}, err
+	return models, nil
 }
 
 func verifyLog(log types.Log) error {

pkg/transformers/drip_file/ilk/converter_test.go

@@ -32,7 +32,7 @@ var _ = Describe("Drip file ilk converter", func() {
 			Data:   []byte{1, 1, 1, 1, 1},
 		}
 
-		_, err := converter.ToModel(badLog)
+		_, err := converter.ToModels([]types.Log{badLog})
 
 		Expect(err).To(HaveOccurred())
 	})
@@ -43,7 +43,7 @@ var _ = Describe("Drip file ilk converter", func() {
 			Topics: []common.Hash{{}, {}, {}, {}},
 		}
 
-		_, err := converter.ToModel(badLog)
+		_, err := converter.ToModels([]types.Log{badLog})
 
 		Expect(err).To(HaveOccurred())
 
@@ -52,9 +52,10 @@ var _ = Describe("Drip file ilk converter", func() {
 	It("converts a log to a model", func() {
 		converter := ilk.DripFileIlkConverter{}
 
-		model, err := converter.ToModel(test_data.EthDripFileIlkLog)
+		models, err := converter.ToModels([]types.Log{test_data.EthDripFileIlkLog})
 
 		Expect(err).NotTo(HaveOccurred())
-		Expect(model).To(Equal(test_data.DripFileIlkModel))
+		Expect(len(models)).To(Equal(1))
+		Expect(models[0]).To(Equal(test_data.DripFileIlkModel))
 	})
 })

pkg/transformers/drip_file/ilk/repository.go

@@ -20,7 +20,8 @@ import (
 )
 
 type Repository interface {
-	Create(headerID int64, model DripFileIlkModel) error
+	Create(headerID int64, models []DripFileIlkModel) error
+	MarkHeaderChecked(headerID int64) error
 	MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error)
 }
 
@@ -32,12 +33,38 @@ func NewDripFileIlkRepository(db *postgres.DB) DripFileIlkRepository {
 	return DripFileIlkRepository{db: db}
 }
 
-func (repository DripFileIlkRepository) Create(headerID int64, model DripFileIlkModel) error {
-	_, err := repository.db.Exec(
-		`INSERT into maker.drip_file_ilk (header_id, ilk, vow, tax, tx_idx, raw_log)
+func (repository DripFileIlkRepository) Create(headerID int64, models []DripFileIlkModel) error {
+	tx, err := repository.db.Begin()
+	if err != nil {
+		return err
+	}
+	for _, model := range models {
+		_, err = tx.Exec(
+			`INSERT into maker.drip_file_ilk (header_id, ilk, vow, tax, tx_idx, raw_log)
         VALUES($1, $2, $3, $4::NUMERIC, $5, $6)`,
-		headerID, model.Ilk, model.Vow, model.Tax, model.TransactionIndex, model.Raw,
-	)
+			headerID, model.Ilk, model.Vow, model.Tax, model.TransactionIndex, model.Raw,
+		)
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, drip_file_ilk_checked)
+		VALUES ($1, $2) 
+	ON CONFLICT (header_id) DO
+		UPDATE SET drip_file_ilk_checked = $2`, headerID, true)
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return tx.Commit()
+}
+
+func (repository DripFileIlkRepository) MarkHeaderChecked(headerID int64) error {
+	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, drip_file_ilk_checked)
+		VALUES ($1, $2) 
+	ON CONFLICT (header_id) DO
+		UPDATE SET drip_file_ilk_checked = $2`, headerID, true)
 	return err
 }
 
@@ -46,8 +73,8 @@ func (repository DripFileIlkRepository) MissingHeaders(startingBlockNumber, endi
 	err := repository.db.Select(
 		&result,
 		`SELECT headers.id, headers.block_number FROM headers
-               LEFT JOIN maker.drip_file_ilk on headers.id = header_id
-               WHERE header_id ISNULL
+               LEFT JOIN checked_headers on headers.id = header_id
+               WHERE (header_id ISNULL OR drip_file_ilk_checked IS FALSE)
                AND headers.block_number >= $1
                AND headers.block_number <= $2
                AND headers.eth_node_fingerprint = $3`,

pkg/transformers/drip_file/ilk/repository_test.go

@@ -21,6 +21,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/vulcanize/vulcanizedb/pkg/core"
+	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/drip_file/ilk"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
@@ -29,15 +30,24 @@ import (
 
 var _ = Describe("Drip file ilk repository", func() {
 	Describe("Create", func() {
-		It("adds a drip file ilk event", func() {
-			db := test_config.NewTestDB(core.Node{})
+		var (
+			db                    *postgres.DB
+			dripFileIlkRepository ilk.Repository
+			err                   error
+			headerID              int64
+		)
+
+		BeforeEach(func() {
+			db = test_config.NewTestDB(core.Node{})
 			test_config.CleanTestDB(db)
 			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
+			headerID, err = headerRepository.CreateOrUpdateHeader(core.Header{})
 			Expect(err).NotTo(HaveOccurred())
-			dripFileIlkRepository := ilk.NewDripFileIlkRepository(db)
+			dripFileIlkRepository = ilk.NewDripFileIlkRepository(db)
+		})
 
-			err = dripFileIlkRepository.Create(headerID, test_data.DripFileIlkModel)
+		It("adds a drip file ilk event", func() {
+			err = dripFileIlkRepository.Create(headerID, []ilk.DripFileIlkModel{test_data.DripFileIlkModel})
 
 			Expect(err).NotTo(HaveOccurred())
 			var dbDripFileIlk ilk.DripFileIlkModel
@@ -50,30 +60,28 @@ var _ = Describe("Drip file ilk repository", func() {
 			Expect(dbDripFileIlk.Raw).To(MatchJSON(test_data.DripFileIlkModel.Raw))
 		})
 
-		It("does not duplicate drip file events", func() {
-			db := test_config.NewTestDB(core.Node{})
-			test_config.CleanTestDB(db)
-			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
+		It("marks header as checked for logs", func() {
+			err = dripFileIlkRepository.Create(headerID, []ilk.DripFileIlkModel{test_data.DripFileIlkModel})
+
 			Expect(err).NotTo(HaveOccurred())
-			dripFileIlkRepository := ilk.NewDripFileIlkRepository(db)
-			err = dripFileIlkRepository.Create(headerID, test_data.DripFileIlkModel)
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_ilk_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+
+		It("does not duplicate drip file events", func() {
+			err = dripFileIlkRepository.Create(headerID, []ilk.DripFileIlkModel{test_data.DripFileIlkModel})
 			Expect(err).NotTo(HaveOccurred())
 
-			err = dripFileIlkRepository.Create(headerID, test_data.DripFileIlkModel)
+			err = dripFileIlkRepository.Create(headerID, []ilk.DripFileIlkModel{test_data.DripFileIlkModel})
 
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("pq: duplicate key value violates unique constraint"))
 		})
 
 		It("removes drip file if corresponding header is deleted", func() {
-			db := test_config.NewTestDB(core.Node{})
-			test_config.CleanTestDB(db)
-			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
-			Expect(err).NotTo(HaveOccurred())
-			dripFileIlkRepository := ilk.NewDripFileIlkRepository(db)
-			err = dripFileIlkRepository.Create(headerID, test_data.DripFileIlkModel)
+			err = dripFileIlkRepository.Create(headerID, []ilk.DripFileIlkModel{test_data.DripFileIlkModel})
 			Expect(err).NotTo(HaveOccurred())
 
 			_, err = db.Exec(`DELETE FROM headers WHERE id = $1`, headerID)
@@ -86,6 +94,46 @@ var _ = Describe("Drip file ilk repository", func() {
 		})
 	})
 
+	Describe("MarkHeaderChecked", func() {
+		var (
+			db                    *postgres.DB
+			dripFileIlkRepository ilk.Repository
+			err                   error
+			headerID              int64
+		)
+
+		BeforeEach(func() {
+			db = test_config.NewTestDB(core.Node{})
+			test_config.CleanTestDB(db)
+			headerRepository := repositories.NewHeaderRepository(db)
+			headerID, err = headerRepository.CreateOrUpdateHeader(core.Header{})
+			Expect(err).NotTo(HaveOccurred())
+			dripFileIlkRepository = ilk.NewDripFileIlkRepository(db)
+		})
+
+		It("creates a row for a new headerID", func() {
+			err = dripFileIlkRepository.MarkHeaderChecked(headerID)
+
+			Expect(err).NotTo(HaveOccurred())
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_ilk_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+
+		It("updates row when headerID already exists", func() {
+			_, err = db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerID)
+
+			err = dripFileIlkRepository.MarkHeaderChecked(headerID)
+
+			Expect(err).NotTo(HaveOccurred())
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_ilk_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+	})
+
 	Describe("MissingHeaders", func() {
 		It("returns headers with no associated drip file event", func() {
 			db := test_config.NewTestDB(core.Node{})
@@ -102,7 +150,7 @@ var _ = Describe("Drip file ilk repository", func() {
 				Expect(err).NotTo(HaveOccurred())
 			}
 			dripFileIlkRepository := ilk.NewDripFileIlkRepository(db)
-			err := dripFileIlkRepository.Create(headerIDs[1], test_data.DripFileIlkModel)
+			err := dripFileIlkRepository.MarkHeaderChecked(headerIDs[1])
 			Expect(err).NotTo(HaveOccurred())
 
 			headers, err := dripFileIlkRepository.MissingHeaders(startingBlockNumber, endingBlockNumber)
@@ -113,6 +161,33 @@ var _ = Describe("Drip file ilk repository", func() {
 			Expect(headers[1].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber)))
 		})
 
+		It("only treats headers as checked if drip file ilk logs have been checked", func() {
+			db := test_config.NewTestDB(core.Node{})
+			test_config.CleanTestDB(db)
+			headerRepository := repositories.NewHeaderRepository(db)
+			startingBlockNumber := int64(1)
+			dripFileIlkdBlockNumber := int64(2)
+			endingBlockNumber := int64(3)
+			blockNumbers := []int64{startingBlockNumber, dripFileIlkdBlockNumber, endingBlockNumber, endingBlockNumber + 1}
+			var headerIDs []int64
+			for _, n := range blockNumbers {
+				headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{BlockNumber: n})
+				headerIDs = append(headerIDs, headerID)
+				Expect(err).NotTo(HaveOccurred())
+			}
+			dripFileIlkRepository := ilk.NewDripFileIlkRepository(db)
+			_, err := db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerIDs[1])
+			Expect(err).NotTo(HaveOccurred())
+
+			headers, err := dripFileIlkRepository.MissingHeaders(startingBlockNumber, endingBlockNumber)
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(len(headers)).To(Equal(3))
+			Expect(headers[0].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileIlkdBlockNumber)))
+			Expect(headers[1].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileIlkdBlockNumber)))
+			Expect(headers[2].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileIlkdBlockNumber)))
+		})
+
 		It("only returns headers associated with the current node", func() {
 			db := test_config.NewTestDB(core.Node{})
 			test_config.CleanTestDB(db)
@@ -130,7 +205,7 @@ var _ = Describe("Drip file ilk repository", func() {
 			}
 			dripFileIlkRepository := ilk.NewDripFileIlkRepository(db)
 			dripFileIlkRepositoryTwo := ilk.NewDripFileIlkRepository(dbTwo)
-			err := dripFileIlkRepository.Create(headerIDs[0], test_data.DripFileIlkModel)
+			err := dripFileIlkRepository.MarkHeaderChecked(headerIDs[0])
 			Expect(err).NotTo(HaveOccurred())
 
 			nodeOneMissingHeaders, err := dripFileIlkRepository.MissingHeaders(blockNumbers[0], blockNumbers[len(blockNumbers)-1])

pkg/transformers/drip_file/ilk/transformer.go

@@ -60,16 +60,20 @@ func (transformer DripFileIlkTransformer) Execute() error {
 		if err != nil {
 			return err
 		}
-		for _, log := range matchingLogs {
-			model, err := transformer.Converter.ToModel(log)
-			if err != nil {
-				return err
-			}
-			err = transformer.Repository.Create(header.Id, model)
+		if len(matchingLogs) < 1 {
+			err = transformer.Repository.MarkHeaderChecked(header.Id)
 			if err != nil {
 				return err
 			}
 		}
+		model, err := transformer.Converter.ToModels(matchingLogs)
+		if err != nil {
+			return err
+		}
+		err = transformer.Repository.Create(header.Id, model)
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }

pkg/transformers/drip_file/ilk/transformer_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+
 	"github.com/vulcanize/vulcanizedb/pkg/core"
 	"github.com/vulcanize/vulcanizedb/pkg/fakes"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/drip_file"
@@ -96,6 +97,42 @@ var _ = Describe("Drip file ilk transformer", func() {
 		Expect(err).To(MatchError(fakes.FakeError))
 	})
 
+	It("marks header checked if no logs returned", func() {
+		mockConverter := &ilk_mocks.MockDripFileIlkConverter{}
+		mockRepository := &ilk_mocks.MockDripFileIlkRepository{}
+		headerID := int64(123)
+		mockRepository.SetMissingHeaders([]core.Header{{Id: headerID}})
+		mockFetcher := &mocks.MockLogFetcher{}
+		transformer := ilk.DripFileIlkTransformer{
+			Converter:  mockConverter,
+			Fetcher:    mockFetcher,
+			Repository: mockRepository,
+		}
+
+		err := transformer.Execute()
+
+		Expect(err).NotTo(HaveOccurred())
+		mockRepository.AssertMarkHeaderCheckedCalledWith(headerID)
+	})
+
+	It("returns error if marking header checked returns err", func() {
+		mockConverter := &ilk_mocks.MockDripFileIlkConverter{}
+		mockRepository := &ilk_mocks.MockDripFileIlkRepository{}
+		mockRepository.SetMissingHeaders([]core.Header{{Id: int64(123)}})
+		mockRepository.SetMarkHeaderCheckedErr(fakes.FakeError)
+		mockFetcher := &mocks.MockLogFetcher{}
+		transformer := ilk.DripFileIlkTransformer{
+			Converter:  mockConverter,
+			Fetcher:    mockFetcher,
+			Repository: mockRepository,
+		}
+
+		err := transformer.Execute()
+
+		Expect(err).To(HaveOccurred())
+		Expect(err).To(MatchError(fakes.FakeError))
+	})
+
 	It("converts matching logs", func() {
 		converter := &ilk_mocks.MockDripFileIlkConverter{}
 		fetcher := &mocks.MockLogFetcher{}
@@ -111,7 +148,7 @@ var _ = Describe("Drip file ilk transformer", func() {
 		err := transformer.Execute()
 
 		Expect(err).NotTo(HaveOccurred())
-		Expect(converter.PassedLog).To(Equal(test_data.EthDripFileIlkLog))
+		Expect(converter.PassedLogs).To(Equal([]types.Log{test_data.EthDripFileIlkLog}))
 	})
 
 	It("returns error if converter returns error", func() {
@@ -150,7 +187,7 @@ var _ = Describe("Drip file ilk transformer", func() {
 
 		Expect(err).NotTo(HaveOccurred())
 		Expect(repository.PassedHeaderID).To(Equal(fakeHeader.Id))
-		Expect(repository.PassedModel).To(Equal(test_data.DripFileIlkModel))
+		Expect(repository.PassedModels).To(Equal([]ilk.DripFileIlkModel{test_data.DripFileIlkModel}))
 	})
 
 	It("returns error if repository returns error for create", func() {

pkg/transformers/drip_file/repo/converter.go

@@ -23,25 +23,33 @@ import (
 )
 
 type Converter interface {
-	ToModel(ethLog types.Log) (DripFileRepoModel, error)
+	ToModels(ethLogs []types.Log) ([]DripFileRepoModel, error)
 }
 
 type DripFileRepoConverter struct{}
 
-func (DripFileRepoConverter) ToModel(ethLog types.Log) (DripFileRepoModel, error) {
-	err := verifyLog(ethLog)
-	if err != nil {
-		return DripFileRepoModel{}, err
+func (DripFileRepoConverter) ToModels(ethLogs []types.Log) ([]DripFileRepoModel, error) {
+	var models []DripFileRepoModel
+	for _, ethLog := range ethLogs {
+		err := verifyLog(ethLog)
+		if err != nil {
+			return nil, err
+		}
+		what := string(bytes.Trim(ethLog.Topics[2].Bytes(), "\x00"))
+		data := big.NewInt(0).SetBytes(ethLog.Topics[3].Bytes()).String()
+		raw, err := json.Marshal(ethLog)
+		if err != nil {
+			return nil, err
+		}
+		model := DripFileRepoModel{
+			What:             what,
+			Data:             data,
+			TransactionIndex: ethLog.TxIndex,
+			Raw:              raw,
+		}
+		models = append(models, model)
 	}
-	what := string(bytes.Trim(ethLog.Topics[2].Bytes(), "\x00"))
-	data := big.NewInt(0).SetBytes(ethLog.Topics[3].Bytes()).String()
-	raw, err := json.Marshal(ethLog)
-	return DripFileRepoModel{
-		What:             what,
-		Data:             data,
-		TransactionIndex: ethLog.TxIndex,
-		Raw:              raw,
-	}, err
+	return models, nil
 }
 
 func verifyLog(log types.Log) error {

pkg/transformers/drip_file/repo/converter_test.go

@@ -32,7 +32,7 @@ var _ = Describe("Drip file repo converter", func() {
 			Data:   []byte{1, 1, 1, 1, 1},
 		}
 
-		_, err := converter.ToModel(badLog)
+		_, err := converter.ToModels([]types.Log{badLog})
 
 		Expect(err).To(HaveOccurred())
 	})
@@ -40,9 +40,10 @@ var _ = Describe("Drip file repo converter", func() {
 	It("converts a log to a model", func() {
 		converter := repo.DripFileRepoConverter{}
 
-		model, err := converter.ToModel(test_data.EthDripFileRepoLog)
+		models, err := converter.ToModels([]types.Log{test_data.EthDripFileRepoLog})
 
 		Expect(err).NotTo(HaveOccurred())
-		Expect(model).To(Equal(test_data.DripFileRepoModel))
+		Expect(len(models)).To(Equal(1))
+		Expect(models[0]).To(Equal(test_data.DripFileRepoModel))
 	})
 })

pkg/transformers/drip_file/repo/repository.go

@@ -20,7 +20,8 @@ import (
 )
 
 type Repository interface {
-	Create(headerID int64, model DripFileRepoModel) error
+	Create(headerID int64, models []DripFileRepoModel) error
+	MarkHeaderChecked(headerID int64) error
 	MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error)
 }
 
@@ -32,12 +33,38 @@ func NewDripFileRepoRepository(db *postgres.DB) DripFileRepoRepository {
 	return DripFileRepoRepository{db: db}
 }
 
-func (repository DripFileRepoRepository) Create(headerID int64, model DripFileRepoModel) error {
-	_, err := repository.db.Exec(
-		`INSERT into maker.drip_file_repo (header_id, what, data, tx_idx, raw_log)
+func (repository DripFileRepoRepository) Create(headerID int64, models []DripFileRepoModel) error {
+	tx, err := repository.db.Begin()
+	if err != nil {
+		return err
+	}
+	for _, model := range models {
+		_, err = tx.Exec(
+			`INSERT into maker.drip_file_repo (header_id, what, data, tx_idx, raw_log)
         VALUES($1, $2, $3::NUMERIC, $4, $5)`,
-		headerID, model.What, model.Data, model.TransactionIndex, model.Raw,
-	)
+			headerID, model.What, model.Data, model.TransactionIndex, model.Raw,
+		)
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, drip_file_repo_checked)
+		VALUES ($1, $2) 
+	ON CONFLICT (header_id) DO
+		UPDATE SET drip_file_repo_checked = $2`, headerID, true)
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return tx.Commit()
+}
+
+func (repository DripFileRepoRepository) MarkHeaderChecked(headerID int64) error {
+	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, drip_file_repo_checked)
+		VALUES ($1, $2) 
+	ON CONFLICT (header_id) DO
+		UPDATE SET drip_file_repo_checked = $2`, headerID, true)
 	return err
 }
 
@@ -46,8 +73,8 @@ func (repository DripFileRepoRepository) MissingHeaders(startingBlockNumber, end
 	err := repository.db.Select(
 		&result,
 		`SELECT headers.id, headers.block_number FROM headers
-               LEFT JOIN maker.drip_file_repo on headers.id = header_id
-               WHERE header_id ISNULL
+               LEFT JOIN checked_headers on headers.id = header_id
+               WHERE (header_id ISNULL OR drip_file_repo_checked IS FALSE)
                AND headers.block_number >= $1
                AND headers.block_number <= $2
                AND headers.eth_node_fingerprint = $3`,

pkg/transformers/drip_file/repo/repository_test.go

@@ -19,23 +19,33 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/vulcanize/vulcanizedb/pkg/core"
+	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/drip_file/repo"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
 	"github.com/vulcanize/vulcanizedb/test_config"
 )
 
-var _ = Describe("", func() {
+var _ = Describe("Drip file repo repository", func() {
 	Describe("Create", func() {
-		It("adds a drip file repo event", func() {
-			db := test_config.NewTestDB(core.Node{})
+		var (
+			db                     *postgres.DB
+			dripFileRepoRepository repo.Repository
+			err                    error
+			headerID               int64
+		)
+
+		BeforeEach(func() {
+			db = test_config.NewTestDB(core.Node{})
 			test_config.CleanTestDB(db)
 			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
+			headerID, err = headerRepository.CreateOrUpdateHeader(core.Header{})
 			Expect(err).NotTo(HaveOccurred())
-			dripFileRepoRepository := repo.NewDripFileRepoRepository(db)
+			dripFileRepoRepository = repo.NewDripFileRepoRepository(db)
+		})
 
-			err = dripFileRepoRepository.Create(headerID, test_data.DripFileRepoModel)
+		It("adds a drip file repo event", func() {
+			err = dripFileRepoRepository.Create(headerID, []repo.DripFileRepoModel{test_data.DripFileRepoModel})
 
 			Expect(err).NotTo(HaveOccurred())
 			var dbDripFileRepo repo.DripFileRepoModel
@@ -47,30 +57,28 @@ var _ = Describe("", func() {
 			Expect(dbDripFileRepo.Raw).To(MatchJSON(test_data.DripFileRepoModel.Raw))
 		})
 
-		It("does not duplicate drip file events", func() {
-			db := test_config.NewTestDB(core.Node{})
-			test_config.CleanTestDB(db)
-			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
+		It("marks header as checked for logs", func() {
+			err = dripFileRepoRepository.Create(headerID, []repo.DripFileRepoModel{test_data.DripFileRepoModel})
+
 			Expect(err).NotTo(HaveOccurred())
-			dripFileRepoRepository := repo.NewDripFileRepoRepository(db)
-			err = dripFileRepoRepository.Create(headerID, test_data.DripFileRepoModel)
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_repo_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+
+		It("does not duplicate drip file events", func() {
+			err = dripFileRepoRepository.Create(headerID, []repo.DripFileRepoModel{test_data.DripFileRepoModel})
 			Expect(err).NotTo(HaveOccurred())
 
-			err = dripFileRepoRepository.Create(headerID, test_data.DripFileRepoModel)
+			err = dripFileRepoRepository.Create(headerID, []repo.DripFileRepoModel{test_data.DripFileRepoModel})
 
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("pq: duplicate key value violates unique constraint"))
 		})
 
 		It("removes drip file if corresponding header is deleted", func() {
-			db := test_config.NewTestDB(core.Node{})
-			test_config.CleanTestDB(db)
-			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
-			Expect(err).NotTo(HaveOccurred())
-			dripFileRepoRepository := repo.NewDripFileRepoRepository(db)
-			err = dripFileRepoRepository.Create(headerID, test_data.DripFileRepoModel)
+			err = dripFileRepoRepository.Create(headerID, []repo.DripFileRepoModel{test_data.DripFileRepoModel})
 			Expect(err).NotTo(HaveOccurred())
 
 			_, err = db.Exec(`DELETE FROM headers WHERE id = $1`, headerID)
@@ -83,6 +91,46 @@ var _ = Describe("", func() {
 		})
 	})
 
+	Describe("MarkHeaderChecked", func() {
+		var (
+			db                     *postgres.DB
+			dripFileRepoRepository repo.Repository
+			err                    error
+			headerID               int64
+		)
+
+		BeforeEach(func() {
+			db = test_config.NewTestDB(core.Node{})
+			test_config.CleanTestDB(db)
+			headerRepository := repositories.NewHeaderRepository(db)
+			headerID, err = headerRepository.CreateOrUpdateHeader(core.Header{})
+			Expect(err).NotTo(HaveOccurred())
+			dripFileRepoRepository = repo.NewDripFileRepoRepository(db)
+		})
+
+		It("creates a row for a new headerID", func() {
+			err = dripFileRepoRepository.MarkHeaderChecked(headerID)
+
+			Expect(err).NotTo(HaveOccurred())
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_repo_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+
+		It("updates row when headerID already exists", func() {
+			_, err = db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerID)
+
+			err = dripFileRepoRepository.MarkHeaderChecked(headerID)
+
+			Expect(err).NotTo(HaveOccurred())
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_repo_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+	})
+
 	Describe("MissingHeaders", func() {
 		It("returns headers with no associated drip file event", func() {
 			db := test_config.NewTestDB(core.Node{})
@@ -99,7 +147,7 @@ var _ = Describe("", func() {
 				Expect(err).NotTo(HaveOccurred())
 			}
 			dripFileRepoRepository := repo.NewDripFileRepoRepository(db)
-			err := dripFileRepoRepository.Create(headerIDs[1], test_data.DripFileRepoModel)
+			err := dripFileRepoRepository.MarkHeaderChecked(headerIDs[1])
 			Expect(err).NotTo(HaveOccurred())
 
 			headers, err := dripFileRepoRepository.MissingHeaders(startingBlockNumber, endingBlockNumber)
@@ -110,6 +158,33 @@ var _ = Describe("", func() {
 			Expect(headers[1].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber)))
 		})
 
+		It("only treats headers as checked if drip file repo logs have been checked", func() {
+			db := test_config.NewTestDB(core.Node{})
+			test_config.CleanTestDB(db)
+			headerRepository := repositories.NewHeaderRepository(db)
+			startingBlockNumber := int64(1)
+			dripFileRepodBlockNumber := int64(2)
+			endingBlockNumber := int64(3)
+			blockNumbers := []int64{startingBlockNumber, dripFileRepodBlockNumber, endingBlockNumber, endingBlockNumber + 1}
+			var headerIDs []int64
+			for _, n := range blockNumbers {
+				headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{BlockNumber: n})
+				headerIDs = append(headerIDs, headerID)
+				Expect(err).NotTo(HaveOccurred())
+			}
+			dripFileRepoRepository := repo.NewDripFileRepoRepository(db)
+			_, err := db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerIDs[1])
+			Expect(err).NotTo(HaveOccurred())
+
+			headers, err := dripFileRepoRepository.MissingHeaders(startingBlockNumber, endingBlockNumber)
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(len(headers)).To(Equal(3))
+			Expect(headers[0].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileRepodBlockNumber)))
+			Expect(headers[1].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileRepodBlockNumber)))
+			Expect(headers[2].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileRepodBlockNumber)))
+		})
+
 		It("only returns headers associated with the current node", func() {
 			db := test_config.NewTestDB(core.Node{})
 			test_config.CleanTestDB(db)
@@ -127,7 +202,7 @@ var _ = Describe("", func() {
 			}
 			dripFileRepoRepository := repo.NewDripFileRepoRepository(db)
 			dripFileRepoRepositoryTwo := repo.NewDripFileRepoRepository(dbTwo)
-			err := dripFileRepoRepository.Create(headerIDs[0], test_data.DripFileRepoModel)
+			err := dripFileRepoRepository.MarkHeaderChecked(headerIDs[0])
 			Expect(err).NotTo(HaveOccurred())
 
 			nodeOneMissingHeaders, err := dripFileRepoRepository.MissingHeaders(blockNumbers[0], blockNumbers[len(blockNumbers)-1])

pkg/transformers/drip_file/repo/transformer.go

@@ -60,16 +60,20 @@ func (transformer DripFileRepoTransformer) Execute() error {
 		if err != nil {
 			return err
 		}
-		for _, log := range matchingLogs {
-			model, err := transformer.Converter.ToModel(log)
-			if err != nil {
-				return err
-			}
-			err = transformer.Repository.Create(header.Id, model)
+		if len(matchingLogs) < 1 {
+			err = transformer.Repository.MarkHeaderChecked(header.Id)
 			if err != nil {
 				return err
 			}
 		}
+		model, err := transformer.Converter.ToModels(matchingLogs)
+		if err != nil {
+			return err
+		}
+		err = transformer.Repository.Create(header.Id, model)
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }

pkg/transformers/drip_file/repo/transformer_test.go

@@ -97,6 +97,42 @@ var _ = Describe("Drip file repo transformer", func() {
 		Expect(err).To(MatchError(fakes.FakeError))
 	})
 
+	It("marks header checked if no logs returned", func() {
+		mockConverter := &repo_mocks.MockDripFileRepoConverter{}
+		mockRepository := &repo_mocks.MockDripFileRepoRepository{}
+		headerID := int64(123)
+		mockRepository.SetMissingHeaders([]core.Header{{Id: headerID}})
+		mockFetcher := &mocks.MockLogFetcher{}
+		transformer := repo.DripFileRepoTransformer{
+			Converter:  mockConverter,
+			Fetcher:    mockFetcher,
+			Repository: mockRepository,
+		}
+
+		err := transformer.Execute()
+
+		Expect(err).NotTo(HaveOccurred())
+		mockRepository.AssertMarkHeaderCheckedCalledWith(headerID)
+	})
+
+	It("returns error if marking header checked returns err", func() {
+		mockConverter := &repo_mocks.MockDripFileRepoConverter{}
+		mockRepository := &repo_mocks.MockDripFileRepoRepository{}
+		mockRepository.SetMissingHeaders([]core.Header{{Id: int64(123)}})
+		mockRepository.SetMarkHeaderCheckedErr(fakes.FakeError)
+		mockFetcher := &mocks.MockLogFetcher{}
+		transformer := repo.DripFileRepoTransformer{
+			Converter:  mockConverter,
+			Fetcher:    mockFetcher,
+			Repository: mockRepository,
+		}
+
+		err := transformer.Execute()
+
+		Expect(err).To(HaveOccurred())
+		Expect(err).To(MatchError(fakes.FakeError))
+	})
+
 	It("converts matching logs", func() {
 		converter := &repo_mocks.MockDripFileRepoConverter{}
 		fetcher := &mocks.MockLogFetcher{}
@@ -112,7 +148,7 @@ var _ = Describe("Drip file repo transformer", func() {
 		err := transformer.Execute()
 
 		Expect(err).NotTo(HaveOccurred())
-		Expect(converter.PassedLog).To(Equal(test_data.EthDripFileRepoLog))
+		Expect(converter.PassedLogs).To(Equal([]types.Log{test_data.EthDripFileRepoLog}))
 	})
 
 	It("returns error if converter returns error", func() {
@@ -151,7 +187,7 @@ var _ = Describe("Drip file repo transformer", func() {
 
 		Expect(err).NotTo(HaveOccurred())
 		Expect(repository.PassedHeaderID).To(Equal(fakeHeader.Id))
-		Expect(repository.PassedModel).To(Equal(test_data.DripFileRepoModel))
+		Expect(repository.PassedModels).To(Equal([]repo.DripFileRepoModel{test_data.DripFileRepoModel}))
 	})
 
 	It("returns error if repository returns error for create", func() {

pkg/transformers/drip_file/vow/converter.go

@@ -22,25 +22,33 @@ import (
 )
 
 type Converter interface {
-	ToModel(ethLog types.Log) (DripFileVowModel, error)
+	ToModels(ethLogs []types.Log) ([]DripFileVowModel, error)
 }
 
 type DripFileVowConverter struct{}
 
-func (DripFileVowConverter) ToModel(ethLog types.Log) (DripFileVowModel, error) {
-	err := verifyLog(ethLog)
-	if err != nil {
-		return DripFileVowModel{}, err
+func (DripFileVowConverter) ToModels(ethLogs []types.Log) ([]DripFileVowModel, error) {
+	var models []DripFileVowModel
+	for _, ethLog := range ethLogs {
+		err := verifyLog(ethLog)
+		if err != nil {
+			return nil, err
+		}
+		what := string(bytes.Trim(ethLog.Topics[2].Bytes(), "\x00"))
+		data := string(bytes.Trim(ethLog.Topics[3].Bytes(), "\x00"))
+		raw, err := json.Marshal(ethLog)
+		if err != nil {
+			return nil, err
+		}
+		model := DripFileVowModel{
+			What:             what,
+			Data:             data,
+			TransactionIndex: ethLog.TxIndex,
+			Raw:              raw,
+		}
+		models = append(models, model)
 	}
-	what := string(bytes.Trim(ethLog.Topics[2].Bytes(), "\x00"))
-	data := string(bytes.Trim(ethLog.Topics[3].Bytes(), "\x00"))
-	raw, err := json.Marshal(ethLog)
-	return DripFileVowModel{
-		What:             what,
-		Data:             data,
-		TransactionIndex: ethLog.TxIndex,
-		Raw:              raw,
-	}, err
+	return models, nil
 }
 
 func verifyLog(log types.Log) error {

pkg/transformers/drip_file/vow/converter_test.go

@@ -32,7 +32,7 @@ var _ = Describe("Drip file repo converter", func() {
 			Data:   []byte{1, 1, 1, 1, 1},
 		}
 
-		_, err := converter.ToModel(badLog)
+		_, err := converter.ToModels([]types.Log{badLog})
 
 		Expect(err).To(HaveOccurred())
 	})
@@ -40,9 +40,10 @@ var _ = Describe("Drip file repo converter", func() {
 	It("converts a log to a model", func() {
 		converter := vow.DripFileVowConverter{}
 
-		model, err := converter.ToModel(test_data.EthDripFileVowLog)
+		models, err := converter.ToModels([]types.Log{test_data.EthDripFileVowLog})
 
 		Expect(err).NotTo(HaveOccurred())
-		Expect(model).To(Equal(test_data.DripFileVowModel))
+		Expect(len(models)).To(Equal(1))
+		Expect(models[0]).To(Equal(test_data.DripFileVowModel))
 	})
 })

pkg/transformers/drip_file/vow/repository.go

@@ -20,7 +20,8 @@ import (
 )
 
 type Repository interface {
-	Create(headerID int64, model DripFileVowModel) error
+	Create(headerID int64, models []DripFileVowModel) error
+	MarkHeaderChecked(headerID int64) error
 	MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error)
 }
 
@@ -32,12 +33,38 @@ func NewDripFileVowRepository(db *postgres.DB) DripFileVowRepository {
 	return DripFileVowRepository{db: db}
 }
 
-func (repository DripFileVowRepository) Create(headerID int64, model DripFileVowModel) error {
-	_, err := repository.db.Exec(
-		`INSERT into maker.drip_file_vow (header_id, what, data, tx_idx, raw_log)
+func (repository DripFileVowRepository) Create(headerID int64, models []DripFileVowModel) error {
+	tx, err := repository.db.Begin()
+	if err != nil {
+		return err
+	}
+	for _, model := range models {
+		_, err = tx.Exec(
+			`INSERT into maker.drip_file_vow (header_id, what, data, tx_idx, raw_log)
         VALUES($1, $2, $3, $4, $5)`,
-		headerID, model.What, model.Data, model.TransactionIndex, model.Raw,
-	)
+			headerID, model.What, model.Data, model.TransactionIndex, model.Raw,
+		)
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+	_, err = tx.Exec(`INSERT INTO public.checked_headers (header_id, drip_file_vow_checked)
+		VALUES ($1, $2) 
+	ON CONFLICT (header_id) DO
+		UPDATE SET drip_file_vow_checked = $2`, headerID, true)
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return tx.Commit()
+}
+
+func (repository DripFileVowRepository) MarkHeaderChecked(headerID int64) error {
+	_, err := repository.db.Exec(`INSERT INTO public.checked_headers (header_id, drip_file_vow_checked)
+		VALUES ($1, $2) 
+	ON CONFLICT (header_id) DO
+		UPDATE SET drip_file_vow_checked = $2`, headerID, true)
 	return err
 }
 
@@ -46,8 +73,8 @@ func (repository DripFileVowRepository) MissingHeaders(startingBlockNumber, endi
 	err := repository.db.Select(
 		&result,
 		`SELECT headers.id, headers.block_number FROM headers
-               LEFT JOIN maker.drip_file_vow on headers.id = header_id
-               WHERE header_id ISNULL
+               LEFT JOIN checked_headers on headers.id = header_id
+               WHERE (header_id ISNULL OR drip_file_vow_checked IS FALSE)
                AND headers.block_number >= $1
                AND headers.block_number <= $2
                AND headers.eth_node_fingerprint = $3`,

pkg/transformers/drip_file/vow/repository_test.go

@@ -16,26 +16,38 @@ package vow_test
 
 import (
 	"database/sql"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+
 	"github.com/vulcanize/vulcanizedb/pkg/core"
+	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres"
 	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/drip_file/vow"
 	"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
 	"github.com/vulcanize/vulcanizedb/test_config"
 )
 
-var _ = Describe("", func() {
+var _ = Describe("Drip file vow repository", func() {
 	Describe("Create", func() {
-		It("adds a drip file vow event", func() {
-			db := test_config.NewTestDB(core.Node{})
+		var (
+			db                    *postgres.DB
+			dripFileVowRepository vow.Repository
+			err                   error
+			headerID              int64
+		)
+
+		BeforeEach(func() {
+			db = test_config.NewTestDB(core.Node{})
 			test_config.CleanTestDB(db)
 			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
+			headerID, err = headerRepository.CreateOrUpdateHeader(core.Header{})
 			Expect(err).NotTo(HaveOccurred())
-			dripFileVowRepository := vow.NewDripFileVowRepository(db)
+			dripFileVowRepository = vow.NewDripFileVowRepository(db)
+		})
 
-			err = dripFileVowRepository.Create(headerID, test_data.DripFileVowModel)
+		It("adds a drip file vow event", func() {
+			err = dripFileVowRepository.Create(headerID, []vow.DripFileVowModel{test_data.DripFileVowModel})
 
 			Expect(err).NotTo(HaveOccurred())
 			var dbDripFileVow vow.DripFileVowModel
@@ -47,30 +59,28 @@ var _ = Describe("", func() {
 			Expect(dbDripFileVow.Raw).To(MatchJSON(test_data.DripFileVowModel.Raw))
 		})
 
-		It("does not duplicate drip file events", func() {
-			db := test_config.NewTestDB(core.Node{})
-			test_config.CleanTestDB(db)
-			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
+		It("marks header as checked for logs", func() {
+			err = dripFileVowRepository.Create(headerID, []vow.DripFileVowModel{test_data.DripFileVowModel})
+
 			Expect(err).NotTo(HaveOccurred())
-			dripFileVowRepository := vow.NewDripFileVowRepository(db)
-			err = dripFileVowRepository.Create(headerID, test_data.DripFileVowModel)
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_vow_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+
+		It("does not duplicate drip file events", func() {
+			err = dripFileVowRepository.Create(headerID, []vow.DripFileVowModel{test_data.DripFileVowModel})
 			Expect(err).NotTo(HaveOccurred())
 
-			err = dripFileVowRepository.Create(headerID, test_data.DripFileVowModel)
+			err = dripFileVowRepository.Create(headerID, []vow.DripFileVowModel{test_data.DripFileVowModel})
 
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("pq: duplicate key value violates unique constraint"))
 		})
 
 		It("removes drip file if corresponding header is deleted", func() {
-			db := test_config.NewTestDB(core.Node{})
-			test_config.CleanTestDB(db)
-			headerRepository := repositories.NewHeaderRepository(db)
-			headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{})
-			Expect(err).NotTo(HaveOccurred())
-			dripFileVowRepository := vow.NewDripFileVowRepository(db)
-			err = dripFileVowRepository.Create(headerID, test_data.DripFileVowModel)
+			err = dripFileVowRepository.Create(headerID, []vow.DripFileVowModel{test_data.DripFileVowModel})
 			Expect(err).NotTo(HaveOccurred())
 
 			_, err = db.Exec(`DELETE FROM headers WHERE id = $1`, headerID)
@@ -83,8 +93,48 @@ var _ = Describe("", func() {
 		})
 	})
 
+	Describe("MarkHeaderChecked", func() {
+		var (
+			db                    *postgres.DB
+			dripFileVowRepository vow.Repository
+			err                   error
+			headerID              int64
+		)
+
+		BeforeEach(func() {
+			db = test_config.NewTestDB(core.Node{})
+			test_config.CleanTestDB(db)
+			headerRepository := repositories.NewHeaderRepository(db)
+			headerID, err = headerRepository.CreateOrUpdateHeader(core.Header{})
+			Expect(err).NotTo(HaveOccurred())
+			dripFileVowRepository = vow.NewDripFileVowRepository(db)
+		})
+
+		It("creates a row for a new headerID", func() {
+			err = dripFileVowRepository.MarkHeaderChecked(headerID)
+
+			Expect(err).NotTo(HaveOccurred())
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_vow_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+
+		It("updates row when headerID already exists", func() {
+			_, err = db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerID)
+
+			err = dripFileVowRepository.MarkHeaderChecked(headerID)
+
+			Expect(err).NotTo(HaveOccurred())
+			var headerChecked bool
+			err = db.Get(&headerChecked, `SELECT drip_file_vow_checked FROM public.checked_headers WHERE header_id = $1`, headerID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(headerChecked).To(BeTrue())
+		})
+	})
+
 	Describe("MissingHeaders", func() {
-		It("returns headers with no associated drip file event", func() {
+		It("returns headers that haven't been checked", func() {
 			db := test_config.NewTestDB(core.Node{})
 			test_config.CleanTestDB(db)
 			headerRepository := repositories.NewHeaderRepository(db)
@@ -99,7 +149,7 @@ var _ = Describe("", func() {
 				Expect(err).NotTo(HaveOccurred())
 			}
 			dripFileVowRepository := vow.NewDripFileVowRepository(db)
-			err := dripFileVowRepository.Create(headerIDs[1], test_data.DripFileVowModel)
+			err := dripFileVowRepository.MarkHeaderChecked(headerIDs[1])
 			Expect(err).NotTo(HaveOccurred())
 
 			headers, err := dripFileVowRepository.MissingHeaders(startingBlockNumber, endingBlockNumber)
@@ -110,6 +160,33 @@ var _ = Describe("", func() {
 			Expect(headers[1].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber)))
 		})
 
+		It("only treats headers as checked if drip file vow logs have been checked", func() {
+			db := test_config.NewTestDB(core.Node{})
+			test_config.CleanTestDB(db)
+			headerRepository := repositories.NewHeaderRepository(db)
+			startingBlockNumber := int64(1)
+			dripFileVowdBlockNumber := int64(2)
+			endingBlockNumber := int64(3)
+			blockNumbers := []int64{startingBlockNumber, dripFileVowdBlockNumber, endingBlockNumber, endingBlockNumber + 1}
+			var headerIDs []int64
+			for _, n := range blockNumbers {
+				headerID, err := headerRepository.CreateOrUpdateHeader(core.Header{BlockNumber: n})
+				headerIDs = append(headerIDs, headerID)
+				Expect(err).NotTo(HaveOccurred())
+			}
+			dripFileVowRepository := vow.NewDripFileVowRepository(db)
+			_, err := db.Exec(`INSERT INTO public.checked_headers (header_id) VALUES ($1)`, headerIDs[1])
+			Expect(err).NotTo(HaveOccurred())
+
+			headers, err := dripFileVowRepository.MissingHeaders(startingBlockNumber, endingBlockNumber)
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(len(headers)).To(Equal(3))
+			Expect(headers[0].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileVowdBlockNumber)))
+			Expect(headers[1].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileVowdBlockNumber)))
+			Expect(headers[2].BlockNumber).To(Or(Equal(startingBlockNumber), Equal(endingBlockNumber), Equal(dripFileVowdBlockNumber)))
+		})
+
 		It("only returns headers associated with the current node", func() {
 			db := test_config.NewTestDB(core.Node{})
 			test_config.CleanTestDB(db)
@@ -127,7 +204,7 @@ var _ = Describe("", func() {
 			}
 			dripFileVowRepository := vow.NewDripFileVowRepository(db)
 			dripFileVowRepositoryTwo := vow.NewDripFileVowRepository(dbTwo)
-			err := dripFileVowRepository.Create(headerIDs[0], test_data.DripFileVowModel)
+			err := dripFileVowRepository.MarkHeaderChecked(headerIDs[0])
 			Expect(err).NotTo(HaveOccurred())
 
 			nodeOneMissingHeaders, err := dripFileVowRepository.MissingHeaders(blockNumbers[0], blockNumbers[len(blockNumbers)-1])

pkg/transformers/drip_file/vow/transformer.go

@@ -60,16 +60,20 @@ func (transformer DripFileVowTransformer) Execute() error {
 		if err != nil {
 			return err
 		}
-		for _, log := range matchingLogs {
-			model, err := transformer.Converter.ToModel(log)
-			if err != nil {
-				return err
-			}
-			err = transformer.Repository.Create(header.Id, model)
+		if len(matchingLogs) < 1 {
+			err = transformer.Repository.MarkHeaderChecked(header.Id)
 			if err != nil {
 				return err
 			}
 		}
+		model, err := transformer.Converter.ToModels(matchingLogs)
+		if err != nil {
+			return err
+		}
+		err = transformer.Repository.Create(header.Id, model)
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }

pkg/transformers/drip_file/vow/transformer_test.go

@@ -97,6 +97,42 @@ var _ = Describe("Drip file vow transformer", func() {
 		Expect(err).To(MatchError(fakes.FakeError))
 	})
 
+	It("marks header checked if no logs returned", func() {
+		mockConverter := &vow_mocks.MockDripFileVowConverter{}
+		mockRepository := &vow_mocks.MockDripFileVowRepository{}
+		headerID := int64(123)
+		mockRepository.SetMissingHeaders([]core.Header{{Id: headerID}})
+		mockFetcher := &mocks.MockLogFetcher{}
+		transformer := vow.DripFileVowTransformer{
+			Converter:  mockConverter,
+			Fetcher:    mockFetcher,
+			Repository: mockRepository,
+		}
+
+		err := transformer.Execute()
+
+		Expect(err).NotTo(HaveOccurred())
+		mockRepository.AssertMarkHeaderCheckedCalledWith(headerID)
+	})
+
+	It("returns error if marking header checked returns err", func() {
+		mockConverter := &vow_mocks.MockDripFileVowConverter{}
+		mockRepository := &vow_mocks.MockDripFileVowRepository{}
+		mockRepository.SetMissingHeaders([]core.Header{{Id: int64(123)}})
+		mockRepository.SetMarkHeaderCheckedErr(fakes.FakeError)
+		mockFetcher := &mocks.MockLogFetcher{}
+		transformer := vow.DripFileVowTransformer{
+			Converter:  mockConverter,
+			Fetcher:    mockFetcher,
+			Repository: mockRepository,
+		}
+
+		err := transformer.Execute()
+
+		Expect(err).To(HaveOccurred())
+		Expect(err).To(MatchError(fakes.FakeError))
+	})
+
 	It("converts matching logs", func() {
 		converter := &vow_mocks.MockDripFileVowConverter{}
 		fetcher := &mocks.MockLogFetcher{}
@@ -112,7 +148,7 @@ var _ = Describe("Drip file vow transformer", func() {
 		err := transformer.Execute()
 
 		Expect(err).NotTo(HaveOccurred())
-		Expect(converter.PassedLog).To(Equal(test_data.EthDripFileVowLog))
+		Expect(converter.PassedLogs).To(Equal([]types.Log{test_data.EthDripFileVowLog}))
 	})
 
 	It("returns error if converter returns error", func() {
@@ -151,7 +187,7 @@ var _ = Describe("Drip file vow transformer", func() {
 
 		Expect(err).NotTo(HaveOccurred())
 		Expect(repository.PassedHeaderID).To(Equal(fakeHeader.Id))
-		Expect(repository.PassedModel).To(Equal(test_data.DripFileVowModel))
+		Expect(repository.PassedModels).To(Equal([]vow.DripFileVowModel{test_data.DripFileVowModel}))
 	})
 
 	It("returns error if repository returns error for create", func() {