remove depedency

README.md

@@ -1,10 +1,11 @@
 # eth-ipfs-state-validator
 
-Uses [pg-ipfs-ethdb](https://github.com/vulcanize/pg-ipfs-ethdb) to validate completeness of Ethereum state data on PG-IPFS
+Uses [pg-ipfs-ethdb](https://github.com/vulcanize/pg-ipfs-ethdb) to validate completeness of Ethereum state data on IPFS
 
 ## Background
 
-State data on Ethereum is stored in the form of [Modified Merkle Patricia Tries](https://eth.wiki/en/fundamentals/patricia-tree).
+State data on Ethereum takes the form of [Modified Merkle Patricia Tries](https://eth.wiki/en/fundamentals/patricia-tree).
+On disk each unique node of a trie is stored as a key-value pair between the Keccak256 hash of the RLP-encoded node and the RLP-encoded node.
 To prove the existence of a specific node in an MMPT with a known root hash, one provides a list of all of the nodes along the path descending
 from the root node to the node in question. To validate the completeness of a state database- to confirm every node for a state and/or storage trie(s) is present
 in a database- requires traversing the entire trie (or linked set of tries) and confirming the presence of every node in the database.

go.mod

@@ -11,6 +11,5 @@ require (
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/viper v1.7.0
-	github.com/vulcanize/ipfs-blockchain-watcher v0.0.11-alpha
 	github.com/vulcanize/pg-ipfs-ethdb v0.0.2-alpha
 )

pkg/database.go

@@ -0,0 +1,74 @@
+// 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 validator
+
+import (
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/spf13/viper"
+)
+
+// Env variables
+const (
+	DATABASE_NAME     = "DATABASE_NAME"
+	DATABASE_HOSTNAME = "DATABASE_HOSTNAME"
+	DATABASE_PORT     = "DATABASE_PORT"
+	DATABASE_USER     = "DATABASE_USER"
+	DATABASE_PASSWORD = "DATABASE_PASSWORD"
+)
+
+// NewDB returns a new sqlx.DB from config/cli/env variables
+func NewDB() (*sqlx.DB, error) {
+	c := Config{}
+	c.Init()
+	return sqlx.Connect("postgres", c.ConnString())
+}
+
+type Config struct {
+	Hostname string
+	Name     string
+	User     string
+	Password string
+	Port     int
+}
+
+func (c *Config) ConnString() string {
+	if len(c.User) > 0 && len(c.Password) > 0 {
+		return fmt.Sprintf("postgresql://%s:%s@%s:%d/%s?sslmode=disable",
+			c.User, c.Password, c.Hostname, c.Port, c.Name)
+	}
+	if len(c.User) > 0 && len(c.Password) == 0 {
+		return fmt.Sprintf("postgresql://%s@%s:%d/%s?sslmode=disable",
+			c.User, c.Hostname, c.Port, c.Name)
+	}
+	return fmt.Sprintf("postgresql://%s:%d/%s?sslmode=disable", c.Hostname, c.Port, c.Name)
+}
+
+func (c *Config) Init() {
+	viper.BindEnv("database.name", DATABASE_NAME)
+	viper.BindEnv("database.hostname", DATABASE_HOSTNAME)
+	viper.BindEnv("database.port", DATABASE_PORT)
+	viper.BindEnv("database.user", DATABASE_USER)
+	viper.BindEnv("database.password", DATABASE_PASSWORD)
+
+	c.Name = viper.GetString("database.name")
+	c.Hostname = viper.GetString("database.hostname")
+	c.Port = viper.GetInt("database.port")
+	c.User = viper.GetString("database.user")
+	c.Password = viper.GetString("database.password")
+}

pkg/postgres.go

@@ -1,32 +0,0 @@
-// VulcanizeDB
-// Copyright © 2020 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 validator
-
-import (
-	"github.com/jmoiron/sqlx"
-	_ "github.com/lib/pq" //postgres driver
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/config"
-)
-
-// NewDB returns a new sqlx.DB from env variables
-func NewDB() (*sqlx.DB, error) {
-	c := config.Database{}
-	c.Init()
-	connectStr := config.DbConnectionString(c)
-	return sqlx.Connect("postgres", connectStr)
-}