Remove setEth function and initialize eth client in connector.Open

connector/connector.go

@@ -3,7 +3,6 @@ package connector
 
 import (
 	"context"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"net/http"
 )
 
@@ -132,6 +131,4 @@ type Web3Connector interface {
 	// Verify checks that the given message was signed by the private key of the given
 	// account.
 	Verify(address, msg, signedMsg string) (identity Identity, err error)
-
-	SetEthClient(ethClient bind.ContractBackend)
 }

connector/web3/web3.go

@@ -3,6 +3,7 @@ package web3
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"github.com/dexidp/dex/connector"
 	"github.com/dexidp/dex/pkg/log"
@@ -11,6 +12,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"os"
 )
 
 type Config struct {
@@ -19,6 +22,12 @@ type Config struct {
 
 func (c *Config) Open(id string, logger log.Logger) (connector.Connector, error) {
 	w := &web3Connector{infuraID: c.InfuraID, logger: logger}
+
+	ethClient, err := createEthClient()
+	if err != nil {
+		return nil, err
+	}
+	w.ethClient = ethClient
 	return w, nil
 }
 
@@ -32,10 +41,6 @@ func (c *web3Connector) InfuraID() string {
 	return c.infuraID
 }
 
-func (c *web3Connector) SetEthClient(ethClient bind.ContractBackend) {
-	c.ethClient = ethClient
-}
-
 // https://gist.github.com/dcb9/385631846097e1f59e3cba3b1d42f3ed#file-eth_sign_verify-go
 func (c *web3Connector) Verify(address, msg, signedMsg string) (identity connector.Identity, err error) {
 	addrb := common.HexToAddress(address)
@@ -114,3 +119,16 @@ func (c *web3Connector) VerifyERC1271Signature(contractAddress common.Address, h
 func signHash(data []byte) []byte {
 	return accounts.TextHash(data)
 }
+
+func createEthClient() (bind.ContractBackend, error) {
+	rpcUrl := os.Getenv("ETH_RPC_CLIENT")
+	if rpcUrl != "" {
+		client, err := ethclient.Dial(rpcUrl)
+		if err != nil {
+			return nil, err
+		}
+		return client, nil
+	}
+
+	return nil, errors.New("could not initialize eth client with url")
+}

connector/web3/web3_test.go

@@ -22,22 +22,11 @@ type BkTest struct {
 	t *testing.T
 }
 
-func newConnector(t *testing.T) *web3Connector {
+func newConnector() *web3Connector {
 	log := logrus.New()
 
-	testConfig := Config{
-		InfuraID: "mockInfuraID",
-	}
-
-	conn, err := testConfig.Open("id", log)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	web3Conn, ok := conn.(*web3Connector)
-	if !ok {
-		t.Fatal(err)
-	}
+	web3Conn := &web3Connector{}
+	web3Conn.logger = log
 
 	return web3Conn
 }
@@ -66,7 +55,7 @@ func signMessage(msg string, pk *ecdsa.PrivateKey) ([]byte, []byte, error) {
 }
 
 func TestEOALogin(t *testing.T) {
-	conn := newConnector(t)
+	conn := newConnector()
 	// Create and deploy eth client
 	bk := BkTest{
 		t: t,
@@ -75,7 +64,7 @@ func TestEOALogin(t *testing.T) {
 	sim, auth, ctrPk, err := bk.createMockBlockchain()
 	assert.NoError(t, err)
 
-	conn.SetEthClient(sim)
+	conn.ethClient = sim
 
 	defer func(sim *backends.SimulatedBackend) {
 		err := sim.Close()
@@ -200,12 +189,12 @@ func TestBlockchainBackend(t *testing.T) {
 	bk := BkTest{
 		t: t,
 	}
-	conn := newConnector(t)
+	conn := newConnector()
 
 	sim, auth, pk, err := bk.createMockBlockchain()
 	assert.NoError(t, err)
 
-	conn.SetEthClient(sim)
+	conn.ethClient = sim
 
 	defer func(sim *backends.SimulatedBackend) {
 		err := sim.Close()

server/handlers.go

@@ -409,13 +409,6 @@ func (s *Server) handleVerify(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ethClient, err := createEthClient()
-	if err != nil {
-		s.renderErrorJSON(w, http.StatusBadRequest, "Could not verify signature.")
-		return
-	}
-	w3Conn.SetEthClient(ethClient)
-
 	identity, err := w3Conn.Verify(data.Address, data.Nonce, verifyReq.Signed)
 	if err != nil {
 		s.renderErrorJSON(w, http.StatusBadRequest, "Could not verify signature.")
@@ -472,13 +465,6 @@ func (s *Server) handleVerifyDirect(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ethClient, err := createEthClient()
-	if err != nil {
-		s.renderErrorJSON(w, http.StatusBadRequest, "Could not verify signature.")
-		return
-	}
-	w3Conn.SetEthClient(ethClient)
-
 	identity, err := w3Conn.Verify(data.Address, data.Nonce, verifyReq.Signed)
 	if err != nil {
 		s.renderErrorJSON(w, http.StatusBadRequest, "Could not verify signature.")