Allow for multiple Geth nodes (#128)

db/migrations/1515613181_add_fields_to_node.down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE nodes
+  DROP COLUMN node_id,
+  DROP COLUMN client_name;

db/migrations/1515613181_add_fields_to_node.up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE nodes
+  ADD COLUMN node_id VARCHAR(128),
+  ADD COLUMN client_name VARCHAR;

db/migrations/1515613715_update_node_index.down.sql

@@ -0,0 +1,9 @@
+BEGIN;
+
+ALTER TABLE nodes
+  DROP CONSTRAINT node_uc;
+
+ALTER TABLE nodes
+  ADD CONSTRAINT node_uc UNIQUE (genesis_block, network_id);
+
+COMMIT;

db/migrations/1515613715_update_node_index.up.sql

@@ -0,0 +1,9 @@
+BEGIN;
+
+ALTER TABLE nodes
+  DROP CONSTRAINT node_uc;
+
+ALTER TABLE nodes
+  ADD CONSTRAINT node_uc UNIQUE (genesis_block, network_id, node_id);
+
+COMMIT;

integration_test/geth_blockchain_test.go

@@ -52,6 +52,8 @@ var _ = Describe("Reading from the Geth blockchain", func() {
 
 		Expect(node.GenesisBlock).To(Equal(devNetworkGenesisBlock))
 		Expect(node.NetworkId).To(Equal(devNetworkNodeId))
+		Expect(len(node.Id)).To(Equal(128))
+		Expect(node.ClientName).To(ContainSubstring("Geth"))
 
 		close(done)
 	}, 15)

pkg/core/node_info.go

@@ -3,4 +3,6 @@ package core
 type Node struct {
 	GenesisBlock string
 	NetworkId    float64
+	Id           string
+	ClientName   string
 }

pkg/fakes/blockchain.go

@@ -50,7 +50,7 @@ func NewBlockchain() *Blockchain {
 		blocks:             make(map[int64]core.Block),
 		logs:               make(map[string][]core.Log),
 		contractAttributes: make(map[string]map[string]string),
-		node:               core.Node{GenesisBlock: "GENESIS"},
+		node:               core.Node{GenesisBlock: "GENESIS", NetworkId: 1, Id: "x123", ClientName: "Geth"},
 	}
 }
 

pkg/geth/blockchain.go

@@ -3,6 +3,8 @@ package geth
 import (
 	"math/big"
 
+	"strings"
+
 	"github.com/8thlight/vulcanizedb/pkg/core"
 	"github.com/8thlight/vulcanizedb/pkg/geth/node"
 	"github.com/ethereum/go-ethereum"
@@ -25,11 +27,22 @@ func NewBlockchain(ipcPath string) *Blockchain {
 	blockchain := Blockchain{}
 	rpcClient, _ := rpc.Dial(ipcPath)
 	client := ethclient.NewClient(rpcClient)
-	blockchain.node = node.Retrieve(rpcClient)
+	blockchain.node = node.Info(rpcClient)
+	if infura := isInfuraNode(ipcPath); infura {
+		blockchain.node.Id = "infura"
+		blockchain.node.ClientName = "infura"
+	}
 	blockchain.client = client
 	return &blockchain
 }
 
+func isInfuraNode(ipcPath string) bool {
+	if strings.Contains(ipcPath, "infura") {
+		return true
+	}
+	return false
+}
+
 func (blockchain *Blockchain) GetLogs(contract core.Contract, startingBlockNumber *big.Int, endingBlockNumber *big.Int) ([]core.Log, error) {
 	if endingBlockNumber == nil {
 		endingBlockNumber = startingBlockNumber

pkg/geth/node/node.go

@@ -7,22 +7,43 @@ import (
 
 	"github.com/8thlight/vulcanizedb/pkg/core"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
-func Retrieve(client *rpc.Client) core.Node {
+func Info(client *rpc.Client) core.Node {
 	node := core.Node{}
-
+	node.NetworkId = NetworkId(client)
-	var version string
+	node.GenesisBlock = GenesisBlock(client)
-	client.CallContext(context.Background(), &version, "net_version")
+	node.Id, node.ClientName = IdClientName(client)
-	node.NetworkId, _ = strconv.ParseFloat(version, 64)
-
-	var protocolVersion string
-	client.CallContext(context.Background(), &protocolVersion, "eth_protocolVersion")
-
-	var header *types.Header
-	client.CallContext(context.Background(), &header, "eth_getBlockByNumber", "0x0", false)
-	node.GenesisBlock = header.Hash().Hex()
-
 	return node
 }
+
+func IdClientName(client *rpc.Client) (string, string) {
+	var info p2p.NodeInfo
+	modules, _ := client.SupportedModules()
+	if _, ok := modules["admin"]; ok {
+		client.CallContext(context.Background(), &info, "admin_nodeInfo")
+		return info.ID, info.Name
+	}
+	return "", ""
+}
+
+func NetworkId(client *rpc.Client) float64 {
+	var version string
+	client.CallContext(context.Background(), &version, "net_version")
+	networkId, _ := strconv.ParseFloat(version, 64)
+	return networkId
+}
+
+func ProtocolVersion(client *rpc.Client) string {
+	var protocolVersion string
+	client.CallContext(context.Background(), &protocolVersion, "eth_protocolVersion")
+	return protocolVersion
+}
+
+func GenesisBlock(client *rpc.Client) string {
+	var header *types.Header
+	client.CallContext(context.Background(), &header, "eth_getBlockByNumber", "0x0", false)
+	return header.Hash().Hex()
+}

pkg/repositories/postgres.go

@@ -111,13 +111,16 @@ func (repository Postgres) FindLogs(address string, blockNumber int64) []core.Lo
 func (repository *Postgres) CreateNode(node *core.Node) error {
 	var nodeId int64
 	err := repository.Db.QueryRow(
-		`INSERT INTO nodes (genesis_block, network_id)
+		`INSERT INTO nodes (genesis_block, network_id, node_id, client_name)
-                VALUES ($1, $2)
+                VALUES ($1, $2, $3, $4)
-                ON CONFLICT (genesis_block, network_id)
+                ON CONFLICT (genesis_block, network_id, node_id)
                   DO UPDATE
-                    SET genesis_block = $1, network_id = $2
+                    SET genesis_block = $1,
+                    	network_id = $2,
+                    	node_id = $3,
+                    	client_name = $4
                 RETURNING id`,
-		node.GenesisBlock, node.NetworkId).Scan(&nodeId)
+		node.GenesisBlock, node.NetworkId, node.Id, node.ClientName).Scan(&nodeId)
 	if err != nil {
 		return ErrUnableToSetNode
 	}

pkg/repositories/postgres_test.go

@@ -47,7 +47,7 @@ var _ = Describe("Postgres repository", func() {
 			Transactions: []core.Transaction{},
 		}
 		cfg, _ := config.NewConfig("private")
-		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1}
+		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1, Id: "x123", ClientName: "geth"}
 		repository, _ := repositories.NewPostgres(cfg.Database, node)
 
 		err1 := repository.CreateOrUpdateBlock(badBlock)
@@ -60,7 +60,7 @@ var _ = Describe("Postgres repository", func() {
 
 	It("throws error when can't connect to the database", func() {
 		invalidDatabase := config.Database{}
-		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1}
+		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1, Id: "x123", ClientName: "geth"}
 		_, err := repositories.NewPostgres(invalidDatabase, node)
 		Expect(err).To(Equal(repositories.ErrDBConnectionFailed))
 	})
@@ -68,7 +68,7 @@ var _ = Describe("Postgres repository", func() {
 	It("throws error when can't create node", func() {
 		cfg, _ := config.NewConfig("private")
 		badHash := fmt.Sprintf("x %s", strings.Repeat("1", 100))
-		node := core.Node{GenesisBlock: badHash, NetworkId: 1}
+		node := core.Node{GenesisBlock: badHash, NetworkId: 1, Id: "x123", ClientName: "geth"}
 		_, err := repositories.NewPostgres(cfg.Database, node)
 		Expect(err).To(Equal(repositories.ErrUnableToSetNode))
 	})
@@ -82,7 +82,7 @@ var _ = Describe("Postgres repository", func() {
 			TxHash:      badTxHash,
 		}
 		cfg, _ := config.NewConfig("private")
-		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1}
+		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1, Id: "x123", ClientName: "geth"}
 		repository, _ := repositories.NewPostgres(cfg.Database, node)
 
 		err := repository.CreateLogs([]core.Log{badLog})
@@ -101,7 +101,7 @@ var _ = Describe("Postgres repository", func() {
 			Transactions: []core.Transaction{badTransaction},
 		}
 		cfg, _ := config.NewConfig("private")
-		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1}
+		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1, Id: "x123", ClientName: "geth"}
 		repository, _ := repositories.NewPostgres(cfg.Database, node)
 
 		err1 := repository.CreateOrUpdateBlock(block)

pkg/repositories/testing/helpers.go

@@ -22,7 +22,12 @@ func AssertRepositoryBehavior(buildRepository func(node core.Node) repositories.
 	var repository repositories.Repository
 
 	BeforeEach(func() {
-		node := core.Node{GenesisBlock: "GENESIS", NetworkId: 1}
+		node := core.Node{
+			GenesisBlock: "GENESIS",
+			NetworkId:    1,
+			Id:           "b6f90c0fdd8ec9607aed8ee45c69322e47b7063f0bfb7a29c8ecafab24d0a22d24dd2329b5ee6ed4125a03cb14e57fd584e67f9e53e6c631055cbbd82f080845",
+			ClientName:   "Geth/v1.7.2-stable-1db4ecdc/darwin-amd64/go1.9",
+		}
 		repository = buildRepository(node)
 	})
 
@@ -48,6 +53,8 @@ func AssertRepositoryBehavior(buildRepository func(node core.Node) repositories.
 			nodeTwo := core.Node{
 				GenesisBlock: "0x456",
 				NetworkId:    1,
+				Id:           "x123456",
+				ClientName:   "Geth",
 			}
 			repositoryTwo := buildRepository(nodeTwo)