fixes after dirty rebase; canonical hash/header finder function is in this commit now

pkg/eth/types.go

@@ -1,26 +1,30 @@
+// VulcanizeDB
+// Copyright © 2019 Vulcanize
+
+// 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/>.
+
 package eth
 
 import (
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/statediff"
-	eth2 "github.com/vulcanize/ipld-eth-indexer/pkg/eth"
+	"github.com/vulcanize/ipld-eth-indexer/pkg/eth"
 	"github.com/vulcanize/ipld-eth-indexer/pkg/ipfs"
-	"math/big"
 )
 
-// CIDWrapper is used to direct fetching of IPLDs from IPFS
-// Returned by CIDRetriever
-// Passed to IPLDFetcher
-type CIDWrapper struct {
-	BlockNumber  *big.Int
-	Header       eth2.HeaderModel
-	Uncles       []eth2.UncleModel
-	Transactions []eth2.TxModel
-	Receipts     []eth2.ReceiptModel
-	StateNodes   []eth2.StateNodeModel
-	StorageNodes []eth2.StorageNodeWithStateKeyModel
-}
-
 // IPLDs is used to package raw IPLD block data fetched from IPFS and returned by the server
 // Returned by IPLDFetcher and ResponseFilterer
 type IPLDs struct {
@@ -48,3 +52,16 @@ type StorageNode struct {
 	Path           []byte
 	IPLD           ipfs.BlockModel
 }
+
+// CIDWrapper is used to direct fetching of IPLDs from IPFS
+// Returned by CIDRetriever
+// Passed to IPLDFetcher
+type CIDWrapper struct {
+	BlockNumber  *big.Int
+	Header       eth.HeaderModel
+	Uncles       []eth.UncleModel
+	Transactions []eth.TxModel
+	Receipts     []eth.ReceiptModel
+	StateNodes   []eth.StateNodeModel
+	StorageNodes []eth.StorageNodeWithStateKeyModel
+}