Merge 08a877c into 4580ae4

Author: bogdan-rosianu

.github/workflows/build_and_test.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     name: Build
     steps:
-      - name: Set up Go 1.17.6
+      - name: Set up Go 1.20.5
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.5
         id: go
 
       - name: Check out code into the Go module directory

.github/workflows/check-cli-md.yml

@@ -0,0 +1,36 @@
+name: Check CLI.md files
+
+on:
+  pull_request:
+    branches: [ master, rc/*, feat/* ]
+    types: [opened, ready_for_review]
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        runs-on: [ubuntu-latest]
+    runs-on: ${{ matrix.runs-on }}
+    name: Check CLI.md
+    steps:
+      - name: Set up Go 1.20.5
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.5
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Get dependencies
+        run: |
+          go get -v -t -d ./...
+          if [ -f Gopkg.toml ]; then
+              curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+              dep ensure
+          fi
+      - name: Check
+        run: |
+          make check-cli-md

.github/workflows/code-coverage.yml

@@ -17,10 +17,10 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     name: Build
     steps:
-      - name: Set up Go 1.17.6
+      - name: Set up Go 1.20.5
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.5
         id: go
 
       - name: Check out code into the Go module directory

.github/workflows/create_release.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     name: Build
     steps:
-      - name: Set up Go 1.17.6
+      - name: Set up Go 1.20.5
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.5
         id: go
 
       - name: Check out code into the Go module directory

.github/workflows/deploy-docker.yml

@@ -16,13 +16,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.5
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.45.2
+          version: v1.53.2
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.github/workflows/golangci-lint.yml

@@ -32,3 +32,6 @@ cmd/node/stats/**
 
 # Local overrides for testnet scripts
 scripts/testnet/local.sh
+
+# Autogenerated test files
+integrationTests/multiShard/endOfEpoch/startInEpoch/Static

.gitignore

@@ -91,3 +91,18 @@ lint: lint-install run-lint
 
 install-proto:
 	bash ./install-proto.sh
+
+check-cli-md:
+	cd ./cmd/assessment && go build
+	cd ./cmd/keygenerator && go build
+	cd ./cmd/logviewer && go build
+	cd ./cmd/node && go build
+	cd ./cmd/seednode && go build
+	cd ./cmd/termui && go build
+	cd ./cmd && bash ./CLI.md.sh
+	@status=$$(git status --porcelain | grep CLI); \
+    	if [ ! -z "$${status}" ]; \
+    	then \
+    		echo "Error - please update all CLI.md files by running the 'cli-docs' or 'check-cli-md' from Makefile!"; \
+    		exit 1; \
+    	fi

Makefile

@@ -165,3 +165,9 @@ var ErrInvalidRole = errors.New("invalid role")
 
 // ErrIsDataTrieMigrated signals that an error occurred while trying to verify the migration status of the data trie
 var ErrIsDataTrieMigrated = errors.New("could not verify the migration status of the data trie")
+
+// ErrGetEligibleManagedKeys signals that an error occurred while getting the eligible managed keys
+var ErrGetEligibleManagedKeys = errors.New("error getting the eligible managed keys")
+
+// ErrGetWaitingManagedKeys signals that an error occurred while getting the waiting managed keys
+var ErrGetWaitingManagedKeys = errors.New("error getting the waiting managed keys")

api/errors/errors.go

@@ -27,6 +27,10 @@ const (
 	epochStartDataForEpoch    = "/epoch-start/:epoch"
 	bootstrapStatusPath       = "/bootstrapstatus"
 	connectedPeersRatingsPath = "/connected-peers-ratings"
+	managedKeys               = "/managed-keys"
+	managedKeysCount          = "/managed-keys/count"
+	eligibleManagedKeys       = "/managed-keys/eligible"
+	waitingManagedKeys        = "/managed-keys/waiting"
 )
 
 // nodeFacadeHandler defines the methods to be implemented by a facade for node requests
@@ -36,7 +40,11 @@ type nodeFacadeHandler interface {
 	GetQueryHandler(name string) (debug.QueryHandler, error)
 	GetEpochStartDataAPI(epoch uint32) (*common.EpochStartDataAPI, error)
 	GetPeerInfo(pid string) ([]core.QueryP2PPeerInfo, error)
-	GetConnectedPeersRatings() string
+	GetConnectedPeersRatingsOnMainNetwork() (string, error)
+	GetManagedKeysCount() int
+	GetManagedKeys() []string
+	GetEligibleManagedKeys() ([]string, error)
+	GetWaitingManagedKeys() ([]string, error)
 	IsInterfaceNil() bool
 }
 
@@ -109,6 +117,26 @@ func NewNodeGroup(facade nodeFacadeHandler) (*nodeGroup, error) {
 			Method:  http.MethodGet,
 			Handler: ng.connectedPeersRatings,
 		},
+		{
+			Path:    managedKeysCount,
+			Method:  http.MethodGet,
+			Handler: ng.managedKeysCount,
+		},
+		{
+			Path:    managedKeys,
+			Method:  http.MethodGet,
+			Handler: ng.managedKeys,
+		},
+		{
+			Path:    eligibleManagedKeys,
+			Method:  http.MethodGet,
+			Handler: ng.managedKeysEligible,
+		},
+		{
+			Path:    waitingManagedKeys,
+			Method:  http.MethodGet,
+			Handler: ng.managedKeysWaiting,
+		},
 	}
 	ng.endpoints = endpoints
 
@@ -327,7 +355,19 @@ func (ng *nodeGroup) bootstrapMetrics(c *gin.Context) {
 
 // connectedPeersRatings returns the node's connected peers ratings
 func (ng *nodeGroup) connectedPeersRatings(c *gin.Context) {
-	ratings := ng.getFacade().GetConnectedPeersRatings()
+	ratings, err := ng.getFacade().GetConnectedPeersRatingsOnMainNetwork()
+	if err != nil {
+		c.JSON(
+			http.StatusInternalServerError,
+			shared.GenericAPIResponse{
+				Data:  nil,
+				Error: err.Error(),
+				Code:  shared.ReturnCodeInternalError,
+			},
+		)
+		return
+	}
+
 	c.JSON(
 		http.StatusOK,
 		shared.GenericAPIResponse{
@@ -338,6 +378,68 @@ func (ng *nodeGroup) connectedPeersRatings(c *gin.Context) {
 	)
 }
 
+// managedKeysCount returns the node's number of managed keys
+func (ng *nodeGroup) managedKeysCount(c *gin.Context) {
+	count := ng.getFacade().GetManagedKeysCount()
+	c.JSON(
+		http.StatusOK,
+		shared.GenericAPIResponse{
+			Data:  gin.H{"count": count},
+			Error: "",
+			Code:  shared.ReturnCodeSuccess,
+		},
+	)
+}
+
+// managedKeys returns all keys managed by the current node
+func (ng *nodeGroup) managedKeys(c *gin.Context) {
+	keys := ng.getFacade().GetManagedKeys()
+	c.JSON(
+		http.StatusOK,
+		shared.GenericAPIResponse{
+			Data:  gin.H{"managedKeys": keys},
+			Error: "",
+			Code:  shared.ReturnCodeSuccess,
+		},
+	)
+}
+
+// managedKeysEligible returns the node's eligible managed keys
+func (ng *nodeGroup) managedKeysEligible(c *gin.Context) {
+	keys, err := ng.getFacade().GetEligibleManagedKeys()
+	if err != nil {
+		shared.RespondWithInternalError(c, errors.ErrGetEligibleManagedKeys, err)
+		return
+	}
+
+	c.JSON(
+		http.StatusOK,
+		shared.GenericAPIResponse{
+			Data:  gin.H{"eligibleKeys": keys},
+			Error: "",
+			Code:  shared.ReturnCodeSuccess,
+		},
+	)
+}
+
+// managedKeysWaiting returns the node's waiting managed keys
+func (ng *nodeGroup) managedKeysWaiting(c *gin.Context) {
+	keys, err := ng.getFacade().GetWaitingManagedKeys()
+	if err != nil {
+		shared.RespondWithInternalError(c, errors.ErrGetWaitingManagedKeys, err)
+		return
+	}
+
+	c.JSON(
+		http.StatusOK,
+		shared.GenericAPIResponse{
+			Data:  gin.H{"waitingKeys": keys},
+			Error: "",
+			Code:  shared.ReturnCodeSuccess,
+		},
+	)
+}
+
 func (ng *nodeGroup) getFacade() nodeFacadeHandler {
 	ng.mutFacade.RLock()
 	defer ng.mutFacade.RUnlock()