Merge branch 'main' into improve-error-handling

Author: bonedaddy

config/config.go

@@ -13,7 +13,6 @@ import (
 	"github.com/bonedaddy/go-defi/utils"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
-	config "github.com/ipfs/go-ipfs-config"
 	"github.com/pkg/errors"
 	"github.com/vrischmann/envconfig"
 	"go.bobheadxi.dev/zapx/zapx"
@@ -233,7 +232,7 @@ func (c *Config) EthClient(ctx context.Context) (utils.Blockchain, error) {
 // Authorizer parses the Account configuration struct to return a transaction signer
 // from https://github.com/indexed-finance/circuit-breaker/blob/master/cmd/services_run.go
 // copyright for this code can be found in the LICENSE file of indexed-finance/circuit-breaker
-func (c *Config) Authorizer(cfg *config.Config) (*utils.Authorizer, error) {
+func (c *Config) Authorizer() (*utils.Authorizer, error) {
 	switch c.Blockchain.Account.Mode {
 	case "keyfile":
 		return utils.NewAuthorizer(c.Blockchain.Account.KeyFilePath, c.Blockchain.Account.KeyFilePassword)

go.mod

@@ -3,29 +3,18 @@ module github.com/bonedaddy/go-defi
 go 1.15
 
 require (
-	github.com/consensys/gurvy v0.3.8 // indirect
-	github.com/edsrzf/mmap-go v1.0.0 // indirect
-	github.com/ethereum/go-ethereum v1.10.0
-	github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
-	github.com/google/uuid v1.1.5 // indirect
-	github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29 // indirect
-	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
-	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
-	github.com/huin/goupnp v1.0.1-0.20200620063722-49508fba0031 // indirect
-	github.com/influxdata/influxdb v1.8.3 // indirect
-	github.com/ipfs/go-ipfs-config v0.12.0
 	github.com/pkg/errors v0.8.1 // indirect
 	github.com/rs/cors v1.7.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/ethereum/go-ethereum v1.10.16
 	github.com/shopspring/decimal v1.2.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli/v2 v2.3.0
 	github.com/vrischmann/envconfig v1.3.1-0.20201228145200-1b7b4cd0c1d5
 	go.bobheadxi.dev/zapx/zapx v0.6.8
 	go.uber.org/zap v1.16.0
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
-	gopkg.in/yaml.v2 v2.3.0
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
+	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/postgres v1.0.8
 	gorm.io/driver/sqlite v1.1.4
 	gorm.io/gorm v1.21.4