Merge pull request #326 from ElrondNetwork/merge-dev-master-sep22

Merge dev master sep22

cmd/proxy/config/config.toml

@@ -64,6 +64,7 @@
 
 # List of Observers. If you want to define a metachain observer (needed for validator statistics route) use
 # shard id 4294967295
+# Fallback observers which are only used when regular ones are offline should have IsFallback = true
 [[Observers]]
    ShardId = 0
    Address = "http://127.0.0.1:8081"
@@ -72,6 +73,11 @@
    ShardId = 1
    Address = "http://127.0.0.1:8082"
 
+[[Observers]]
+   ShardId = 1
+   Address = "http://127.0.0.1:8083"
+   IsFallback = true
+
 [[FullHistoryNodes]]
    ShardId = 0
    Address = "http://127.0.0.1:8081"

data/observer.go

@@ -2,9 +2,10 @@ package data
 
 // NodeData holds an observer data
 type NodeData struct {
-	ShardId  uint32
-	Address  string
-	IsSynced bool
+	ShardId    uint32
+	Address    string
+	IsSynced   bool
+	IsFallback bool
 }
 
 // NodesReloadResponse is a DTO that holds details about nodes reloading