major refactor part 2: remove cold import, full sync, generalize node table

pkg/super_node/btc/indexer.go

@@ -24,7 +24,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/lib/pq"
 
-	"github.com/vulcanize/vulcanizedb/pkg/eth/datastore/postgres"
+	"github.com/vulcanize/vulcanizedb/pkg/postgres"
 	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"
 )
 
@@ -47,7 +47,7 @@ func (in *CIDIndexer) Index(cids shared.CIDsForIndexing) error {
 	if err != nil {
 		return err
 	}
-	headerID, err := in.indexHeaderCID(tx, cidWrapper.HeaderCID)
+	headerID, err := in.indexHeaderCID(tx, cidWrapper.HeaderCID, in.db.NodeID)
 	if err != nil {
 		logrus.Error("btc indexer error when indexing header")
 		return err
@@ -59,13 +59,13 @@ func (in *CIDIndexer) Index(cids shared.CIDsForIndexing) error {
 	return tx.Commit()
 }
 
-func (in *CIDIndexer) indexHeaderCID(tx *sqlx.Tx, header HeaderModel) (int64, error) {
+func (in *CIDIndexer) indexHeaderCID(tx *sqlx.Tx, header HeaderModel, nodeID int64) (int64, error) {
 	var headerID int64
-	err := tx.QueryRowx(`INSERT INTO btc.header_cids (block_number, block_hash, parent_hash, cid, timestamp, bits)
-							VALUES ($1, $2, $3, $4, $5, $6) 
-							ON CONFLICT (block_number, block_hash) DO UPDATE SET (parent_hash, cid, timestamp, bits) = ($3, $4, $5, $6)
+	err := tx.QueryRowx(`INSERT INTO btc.header_cids (block_number, block_hash, parent_hash, cid, timestamp, bits, node_id)
+							VALUES ($1, $2, $3, $4, $5, $6, $7) 
+							ON CONFLICT (block_number, block_hash) DO UPDATE SET (parent_hash, cid, timestamp, bits, node_id) = ($3, $4, $5, $6, $7)
 							RETURNING id`,
-		header.BlockNumber, header.BlockHash, header.ParentHash, header.CID, header.Timestamp, header.Bits).Scan(&headerID)
+		header.BlockNumber, header.BlockHash, header.ParentHash, header.CID, header.Timestamp, header.Bits, nodeID).Scan(&headerID)
 	return headerID, err
 }
 

pkg/super_node/btc/indexer_test.go

@@ -20,7 +20,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/vulcanizedb/pkg/eth/datastore/postgres"
+	"github.com/vulcanize/vulcanizedb/pkg/postgres"
 	"github.com/vulcanize/vulcanizedb/pkg/super_node/btc"
 	"github.com/vulcanize/vulcanizedb/pkg/super_node/btc/mocks"
 	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"

pkg/super_node/btc/models.go

@@ -27,6 +27,7 @@ type HeaderModel struct {
 	CID         string `db:"cid"`
 	Timestamp   int64  `db:"timestamp"`
 	Bits        uint32 `db:"bits"`
+	NodeID      int64  `db:"node_id"`
 }
 
 // TxModel is the db model for btc.transaction_cids table

pkg/super_node/btc/payload_fetcher.go

@@ -32,10 +32,14 @@ type PayloadFetcher struct {
 }
 
 // NewStateDiffFetcher returns a PayloadFetcher
-func NewPayloadFetcher(c *rpcclient.Client) *PayloadFetcher {
-	return &PayloadFetcher{
-		client: c,
+func NewPayloadFetcher(c *rpcclient.ConnConfig) (*PayloadFetcher, error) {
+	client, err := rpcclient.New(c, nil)
+	if err != nil {
+		return nil, err
 	}
+	return &PayloadFetcher{
+		client: client,
+	}, nil
 }
 
 // FetchAt fetches the block payloads at the given block heights

pkg/super_node/btc/retriever.go

@@ -26,7 +26,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/vulcanizedb/pkg/eth/datastore/postgres"
+	"github.com/vulcanize/vulcanizedb/pkg/postgres"
 	"github.com/vulcanize/vulcanizedb/pkg/super_node/shared"
 )
 

pkg/super_node/btc/test_helpers.go

@@ -19,7 +19,7 @@ package btc
 import (
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/vulcanizedb/pkg/eth/datastore/postgres"
+	"github.com/vulcanize/vulcanizedb/pkg/postgres"
 )
 
 // TearDownDB is used to tear down the super node dbs after tests