Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MUL-2104: network configuration #107

Open
wants to merge 3 commits into
base: release_1.3
Choose a base branch
from
Open

MUL-2104: network configuration #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ecc9dd
configure coin types via config
nickpro Nov 20, 2018
408a1bb
rollback struct
nickpro Nov 20, 2018
c6dd3d2
remove commented line
nickpro Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ func main() {
log.Fatalf("Server initialization: %s\n", err.Error())
}

if err = mu.Run(); err != nil {
log.Fatalf("Server running: %s\n", err.Error())
}

mu.Run()
log.Infof("Server started successfully")
}
13 changes: 13 additions & 0 deletions common/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package common

import (
"github.com/Multy-io/Multy-back/store"
"github.com/graarh/golang-socketio"
)

type NodeServiceConfiguration interface {
InitHandlers(dbConf *store.Conf, coinTypes []store.CoinType, nsqAddr string) (interface{}, error)
SetUserData(userStore store.UserStore, ct []store.CoinType) ([]store.ServiceInfo, error)
RegisterWebSocketEvents(socketServer *gosocketio.Server) error
}

29 changes: 14 additions & 15 deletions eth/eth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var log = slf.WithContext("eth")
//InitHandlers init nsq mongo and ws connection to node
// return main client , test client , err
func InitHandlers(dbConf *store.Conf, coinTypes []store.CoinType, nsqAddr string) (*ETHConn, error) {
//declare pacakge struct
//declare package struct
cli := &ETHConn{
Mempool: sync.Map{},
MempoolTest: sync.Map{},
Expand Down Expand Up @@ -98,29 +98,28 @@ func InitHandlers(dbConf *store.Conf, coinTypes []store.CoinType, nsqAddr string
if err != nil {
return cli, fmt.Errorf("fetchCoinType: %s", err.Error())
}

cliMain, err := initGrpcClient(coinTypeMain.GRPCUrl)
if err != nil {
return cli, fmt.Errorf("initGrpcClient: %s", err.Error())
}

cli.CliMain = cliMain

// setup testnet
coinTypeTest, err := store.FetchCoinType(coinTypes, currencies.Ether, currencies.ETHTest)
if err != nil {
return cli, fmt.Errorf("fetchCoinType: %s", err.Error())
}
cliTest, err := initGrpcClient(coinTypeTest.GRPCUrl)
if err != nil {
return cli, fmt.Errorf("initGrpcClient: %s", err.Error())
}
cli.CliTest = cliTest

cli.setGRPCHandlers(currencies.ETHMain, coinTypeMain.AccuracyRange)
log.Infof("InitHandlers: initGrpcClient: Main: √")

cli.setGRPCHandlers(currencies.ETHTest, coinTypeTest.AccuracyRange)
log.Infof("InitHandlers: initGrpcClient: Test: √")
// setup testnet
//coinTypeTest, err := store.FetchCoinType(coinTypes, currencies.Ether, currencies.ETHTest)
//if err != nil {
// return cli, fmt.Errorf("fetchCoinType: %s", err.Error())
//}
//cliTest, err := initGrpcClient(coinTypeTest.GRPCUrl)
//if err != nil {
// return cli, fmt.Errorf("initGrpcClient: %s", err.Error())
//}
//cli.CliTest = cliTest
//cli.setGRPCHandlers(currencies.ETHTest, coinTypeTest.AccuracyRange)
//log.Infof("InitHandlers: initGrpcClient: Test: √")

return cli, nil
}
Expand Down
141 changes: 83 additions & 58 deletions multy-back.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,40 +71,85 @@ func Init(conf *Configuration) (*Multy, error) {
multy.userStore = userStore
log.Infof("UserStore initialization done on %s √", conf.Database)

//BTC
btcCli, err := btc.InitHandlers(&conf.Database, conf.SupportedNodes, conf.NSQAddress)
if err != nil {
return nil, fmt.Errorf("Init: btc.InitHandlers: %s", err.Error())
}
btcVer, err := btcCli.CliMain.ServiceInfo(context.Background(), &btcpb.Empty{})
multy.BTC = btcCli
log.Infof(" BTC initialization done on %v √", btcVer)

// ETH
ethCli, err := eth.InitHandlers(&conf.Database, conf.SupportedNodes, conf.NSQAddress)
if err != nil {
return nil, fmt.Errorf("Init: btc.InitHandlers: %s", err.Error())
}
ethVer, err := ethCli.CliMain.ServiceInfo(context.Background(), &ethpb.Empty{})
multy.ETH = ethCli
log.Infof(" ETH initialization done on %v √", ethVer)
multy.setupConfiguredNodes()

//users data set
sv, err := multy.SetUserData(multy.userStore, conf.SupportedNodes)
sv, err := multy.SetUserData(multy.userStore, multy.config.SupportedNodes)
if err != nil {
return nil, fmt.Errorf("Init: multy.SetUserData: %s", err.Error())
return nil, fmt.Errorf("Init: multy.SetUserData: %s ", err.Error())
}
log.Infof("Users data initialization done √")
log.Infof("Users data initialization done √")

log.Debugf("Server versions %v", sv)

// REST handlers
if err = multy.initHttpRoutes(conf); err != nil {
return nil, fmt.Errorf("Router initialization: %s", err.Error())
if err = multy.initHttpRoutes(); err != nil {
return nil, fmt.Errorf("Router initialization: %s ", err.Error())
}

if err = multy.registerWebSocketEvents(); err != nil {
return nil, fmt.Errorf("Failed to register websocket events: [%s] ", err.Error())
}

return multy, nil
}


func (m *Multy) registerWebSocketEvents() error {
// socketIO server initialization. server -> mobile client
socketIORoute := m.route.Group("/socketio")
socketIOPool, err := client.SetSocketIOHandlers(m.restClient, m.BTC, m.ETH, socketIORoute, m.config.SocketioAddr,
m.config.NSQAddress, m.userStore)
if err != nil {
return err
}
m.clientPool = socketIOPool

for _, nodeConfig := range m.config.SupportedNodes {
switch nodeConfig.СurrencyID {
case currencies.Bitcoin:
m.BTC.WsServer = m.clientPool.Server
break
case currencies.Ether:
m.ETH.WsServer = m.clientPool.Server
break
}
}

return nil
}


func (m *Multy) setupConfiguredNodes() {
for _, nodeConfig := range m.config.SupportedNodes {
switch nodeConfig.СurrencyID {
case currencies.Bitcoin:
//BTC
btcCli, err := btc.InitHandlers(&m.config.Database, m.config.SupportedNodes, m.config.NSQAddress)
if err != nil {
log.Errorf("Init: btc.InitHandlers: %s", err.Error())
break
}
btcVer, err := btcCli.CliMain.ServiceInfo(context.Background(), &btcpb.Empty{})
m.BTC = btcCli
log.Infof(" BTC initialization done on %v √", btcVer)
break
case currencies.Ether:
// ETH
ethCli, err := eth.InitHandlers(&m.config.Database, m.config.SupportedNodes, m.config.NSQAddress)
if err != nil {
log.Errorf("Init: btc.InitHandlers: [%s] ", err.Error())
break
}
ethVer, err := ethCli.CliMain.ServiceInfo(context.Background(), &ethpb.Empty{})
m.ETH = ethCli
log.Infof(" ETH initialization done on %v √", ethVer)
break
}
}
}


// SetUserData make initial userdata to node service
func (m *Multy) SetUserData(userStore store.UserStore, ct []store.CoinType) ([]store.ServiceInfo, error) {
servicesInfo := []store.ServiceInfo{}
Expand Down Expand Up @@ -227,13 +272,12 @@ func (m *Multy) SetUserData(userStore store.UserStore, ct []store.CoinType) ([]s
// - http
// - socketio
// - firebase
func (multy *Multy) initHttpRoutes(conf *Configuration) error {
func (m *Multy) initHttpRoutes() error {
router := gin.Default()
multy.route = router
m.route = router
gin.SetMode(gin.DebugMode)

f, err := os.OpenFile("../currencies/erc20tokens.json", os.O_RDONLY, os.FileMode(0644))
// f, err := os.OpenFile("/currencies/erc20tokens.json")
if err != nil {
return err
}
Expand All @@ -246,56 +290,37 @@ func (multy *Multy) initHttpRoutes(conf *Configuration) error {
_ = json.Unmarshal(bs, &tokenList)

restClient, err := client.SetRestHandlers(
multy.userStore,
m.userStore,
router,
conf.DonationAddresses,
multy.BTC,
multy.ETH,
conf.MultyVerison,
conf.Secretkey,
conf.MobileVersions,
m.config.DonationAddresses,
m.BTC,
m.ETH,
m.config.MultyVerison,
m.config.Secretkey,
m.config.MobileVersions,
tokenList,
conf.BrowserDefault,
m.config.BrowserDefault,
)
if err != nil {
return err
}
multy.restClient = restClient

// socketIO server initialization. server -> mobile client
socketIORoute := router.Group("/socketio")
socketIOPool, err := client.SetSocketIOHandlers(multy.restClient, multy.BTC, multy.ETH, socketIORoute, conf.SocketioAddr, conf.NSQAddress, multy.userStore)
if err != nil {
return err
}
multy.clientPool = socketIOPool
multy.ETH.WsServer = multy.clientPool.Server
multy.BTC.WsServer = multy.clientPool.Server

firebaseClient, err := client.InitFirebaseConn(&conf.Firebase, multy.route, conf.NSQAddress)
m.restClient = restClient
firebaseClient, err := client.InitFirebaseConn(&m.config.Firebase, m.route, m.config.NSQAddress)
if err != nil {
return err
}
multy.firebaseClient = firebaseClient
m.firebaseClient = firebaseClient

return nil
}


// Run runs service
func (multy *Multy) Run() error {
func (m *Multy) Run() {
log.Info("Running server")
multy.route.Run(multy.config.RestAddress)
return nil
m.route.Run(m.config.RestAddress)
}

func fetchCoinType(coinTypes []store.CoinType, currencyID, networkID int) (*store.CoinType, error) {
for _, ct := range coinTypes {
if ct.СurrencyID == currencyID && ct.NetworkID == networkID {
return &ct, nil
}
}
return nil, fmt.Errorf("fetchCoinType: no such coin in config")
}

func (m *Multy) restoreState(coinType store.CoinType, ncClient interface{}) {
if coinType.AccuracyRange > 0 {
Expand Down