change to rpchub

Author: blockpinetwork

README.md

@@ -23,20 +23,20 @@ To start the aggregator, the following command can be run:
     build/aggregator
 ```
 ## Configuration
-Default password is `blockpi`.
+Default password is `123456`.
 
-Visit https://ag-cfg.rpchub.io/ to configure the aggregator.
+Visit https://ag-cfg.rpchub.io/ to configure the aggregator. See the [documents](https://docs.rpchub.io/) for more details.
 
-Or get current configuration by using command, replace `<password>` to what you set or using the default password:
+Get current configuration by using command, replace `<password>` to what you set or using the default password:
 ```shell
-curl -u blockpi:<password> 'http://localhost:8012/config'
+curl -u rpchub:<password> 'http://localhost:8012/config'
 ```
 To update the configuration, the following command can be run:
 ```shell
-curl -u blockpi:<password> -X POST 'http://localhost:8012/config' --header 'Content-Type: application/json' --data-raw '{"password":"blockpi","request_timeout":30,"max_retries":3,"nodes":{"bsc":[{"name":"blockpi-public-bsc","endpoint":"https://bsc.blockpi.network/v1/rpc/public","weight":100,"read_only":false,"disabled":false}],"ethereum":[{"name":"blockpi-public-ethereum","endpoint":"https://ethereum.blockpi.network/v1/rpc/public","weight":90,"read_only":false,"disabled":false},{"name":"ethereum-ankr","endpoint":"https://rpc.ankr.com/eth","weight":10,"read_only":false,"disabled":false}]},"phishing_db":["https://cfg.rpchub.io/agg/scam-addresses.json"],"phishing_db_update_interval":60}'
+curl -u rpchub:<password> -X POST 'http://localhost:8012/config' --header 'Content-Type: application/json' --data-raw '{"password":"123456","request_timeout":30,"max_retries":3,"nodes":{"bsc":[{"name":"bsc-official","endpoint":"https://bsc-dataseed.binance.org","weight":100,"read_only":false,"disabled":false}],"ethereum":[{"name":"blockpi-public-ethereum","endpoint":"https://ethereum.blockpi.network/v1/rpc/public","weight":90,"read_only":false,"disabled":false},{"name":"ethereum-ankr","endpoint":"https://rpc.ankr.com/eth","weight":10,"read_only":false,"disabled":false}]},"phishing_db":["https://cfg.rpchub.io/agg/scam-addresses.json"],"phishing_db_update_interval":3600}'
 ```
 
 ## Reset configuration
 1. Stop the aggregator. 
-2. Delete the configuration directory `rm -rf $HOME/.blockpi/aggregator/`.
+2. Delete the configuration directory `rm -rf $HOME/.rpchub/aggregator/`.
 3. Restart the aggregator

cmd/aggregator/commands/root.go

@@ -10,7 +10,7 @@ func RootApp() *cli.App {
 	runCmd := RunCommand()
 	cmd := &cli.App{
 		Name:                 "aggregator",
-		Usage:                "blockpi aggregator",
+		Usage:                "RPCHub aggregator",
 		Flags:                runCmd.Flags,
 		EnableBashCompletion: true,
 		BashComplete:         cli.DefaultAppComplete,

cmd/aggregator/main.go

@@ -26,7 +26,7 @@ func main() {
 }
 
 func initPath() {
-	dir, err := gfile.Home(".blockpi/aggregator")
+	dir, err := gfile.Home(".rpchub/aggregator")
 	if err != nil {
 		panic(err)
 	}

config/config.go

@@ -10,6 +10,7 @@ import (
 	"github.com/syndtr/goleveldb/leveldb"
 	leveldbErrors "github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/valyala/fasthttp"
+	"sort"
 	"sync"
 	"time"
 )
@@ -21,7 +22,7 @@ var (
 	defaultPhishingDb = "https://cfg.rpchub.io/agg/scam-addresses.json"
 
 	_Config = &Config{
-		Password:                 "blockpi",
+		Password:                 "123456",
 		RequestTimeout:           30,
 		MaxRetries:               3,
 		PhishingDb:               []string{defaultPhishingDb},
@@ -102,7 +103,7 @@ func LoadDefault() {
 
 			if retries >= 5 {
 				notify.SendError("Load default Config failed", fmt.Sprintf("Status Code: %d\nError: %s", statusCode, errStr))
-				logger.Warn("Load default config failed, you may manually update the config by postman or via blockpi aggregator manager [https://aggregator.blockpi.io]")
+				logger.Warn("Load default config failed, See the documents for more details [https://docs.rpchub.io/]")
 				return
 			} else {
 				time.Sleep(time.Second * 3)
@@ -172,5 +173,6 @@ func Chains() []string {
 	for key, _ := range Default().Nodes {
 		chains = append(chains, key)
 	}
+	sort.Strings(chains)
 	return chains
 }

middleware/plugins/http_proxy.go

@@ -59,8 +59,20 @@ func (m *HttpProxyMiddleware) OnProcess(session *rpc.Session) error {
 		//	ctx.Response.Header.Set("X-Do-Node", session.NodeName)
 		//}
 
+		shouldDisableEndpoint := false
 		if err != nil {
 			log.Error(err.Error(), "node", session.NodeName)
+			shouldDisableEndpoint = true
+		}
+
+		statusCode := ctx.Response.StatusCode()
+		if statusCode/100 != 2 {
+			log.Error("error status code", "code", statusCode, "node", session.NodeName)
+			shouldDisableEndpoint = true
+		}
+
+		if shouldDisableEndpoint {
+			//todo disable endpoint
 		}
 
 		return err

middleware/plugins/safety.go

@@ -115,6 +115,8 @@ func (m *SafetyMiddleware) updatePhishingDb() {
 
 	var phishingAddresses []*phishingAddress
 
+	hasError := false
+
 	for _, dbUrl := range cfg.PhishingDb {
 		logger.Info("Updating phishing db", "url", dbUrl)
 
@@ -131,6 +133,7 @@ func (m *SafetyMiddleware) updatePhishingDb() {
 			err := cli.Do(req, resp)
 			if err != nil {
 				log.Error("Phishing db update failed", "url", dbUrl, "err", err)
+				hasError = true
 				return
 			}
 			result := map[string]string{}
@@ -174,7 +177,9 @@ func (m *SafetyMiddleware) updatePhishingDb() {
 	count := len(phishingAddressMap)
 	logger.Info("Updated phishing db", "addresses", count)
 
-	lastUpdateAt = time.Now()
+	if !hasError {
+		lastUpdateAt = time.Now()
+	}
 }
 
 func (m *SafetyMiddleware) isPhishingAddress(address string) (exist bool, pha *phishingAddress) {

server/manage_server.go

@@ -95,7 +95,7 @@ func NewManageServer() error {
 				payload, err := base64.StdEncoding.DecodeString(string(auth[len(basicAuthPrefix):]))
 				if err == nil {
 					pair := bytes.SplitN(payload, []byte(":"), 2)
-					if len(pair) == 2 && bytes.Equal(pair[0], []byte("blockpi")) && bytes.Equal(pair[1], []byte(config.Default().Password)) {
+					if len(pair) == 2 && bytes.Equal(pair[0], []byte("rpchub")) && bytes.Equal(pair[1], []byte(config.Default().Password)) {
 						config.Default().Mrt += 1
 						config.Save()
 						r.Handler(ctx)