multiversx · iulianpascalau · May 10, 2024 · Feb 17, 2023 · Feb 17, 2023 · Feb 20, 2023
diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ For more details, go [here](https://docs.multiversx.com/sdk-and-tools/proxy/).
 ### validator
 
 - `/v1.0/validator/statistics`     (GET) --> returns the validator statistics data from an observer from any shard. Has a cache to avoid many requests
+- `/v1.0/validator/auction`        (GET) --> returns the validator auction list data from an observer from metachain. It doesn't have a cache mechanism, since there is already one in place at the node level
 
 ### block
 

diff --git a/api/groups/baseAccountsGroup.go b/api/groups/baseAccountsGroup.go
@@ -55,7 +55,7 @@ func NewAccountsGroup(facadeHandler data.FacadeHandler) (*accountsGroup, error)
 func (group *accountsGroup) respondWithAccount(c *gin.Context, transform func(*data.AccountModel) gin.H) {
 	address := c.Param("address")
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, address)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrBadUrlParams, err)
 		return
@@ -113,7 +113,7 @@ func (group *accountsGroup) getNonce(c *gin.Context) {
 // getCodeHash returns the code hash for the address parameter
 func (group *accountsGroup) getCodeHash(c *gin.Context) {
 	address := c.Param("address")
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, address)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrBadUrlParams, err)
 		return
@@ -137,7 +137,12 @@ func (group *accountsGroup) getAccounts(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	addr := ""
+	if len(addresses) > 0 {
+		addr = addresses[0]
+	}
+
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrInvalidFields, err)
 		return
@@ -171,7 +176,7 @@ func (group *accountsGroup) getKeyValuePairs(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetKeyValuePairs, err)
 		return
@@ -194,7 +199,7 @@ func (group *accountsGroup) getValueForKey(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetValueForKey, err)
 		return
@@ -246,7 +251,7 @@ func (group *accountsGroup) getESDTTokenData(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetESDTTokenData, err)
 		return
@@ -274,7 +279,7 @@ func (group *accountsGroup) getESDTsRoles(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetRolesForAccount, err)
 		return
@@ -297,7 +302,7 @@ func (group *accountsGroup) getESDTsWithRole(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetESDTsWithRole, err)
 		return
@@ -326,7 +331,7 @@ func (group *accountsGroup) getRegisteredNFTs(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetNFTTokenIDsRegisteredByAddress, err)
 		return
@@ -349,7 +354,7 @@ func (group *accountsGroup) getESDTNftTokenData(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetESDTTokenData, err)
 		return
@@ -383,7 +388,7 @@ func (group *accountsGroup) getGuardianData(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetGuardianData, err)
 		return
@@ -406,7 +411,7 @@ func (group *accountsGroup) getESDTTokens(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrGetESDTTokenData, err)
 		return
@@ -427,7 +432,7 @@ func (group *accountsGroup) isDataTrieMigrated(c *gin.Context) {
 		return
 	}
 
-	options, err := parseAccountQueryOptions(c)
+	options, err := parseAccountQueryOptions(c, addr)
 	if err != nil {
 		shared.RespondWithValidationError(c, errors.ErrIsDataTrieMigrated, err)
 		return

diff --git a/api/groups/baseGroup_test.go b/api/groups/baseGroup_test.go
@@ -57,6 +57,7 @@ func TestCrudOperationsBaseGroup(t *testing.T) {
 	assert.Equal(t, hd2.Path, bg.endpoints[2].Path)
 
 	err = bg.AddEndpoint(hd4.Path, *hd4)
+	assert.NoError(t, err)
 	assert.Equal(t, 4, len(bg.endpoints))
 
 	// ensure the order

diff --git a/api/groups/baseNodeGroup.go b/api/groups/baseNodeGroup.go
@@ -29,6 +29,7 @@ func NewNodeGroup(facadeHandler data.FacadeHandler) (*nodeGroup, error) {
 	baseRoutesHandlers := []*data.EndpointHandlerData{
 		{Path: "/heartbeatstatus", Handler: ng.getHeartbeatData, Method: http.MethodGet},
 		{Path: "/old-storage-token/:token/nonce/:nonce", Handler: ng.isOldStorageForToken, Method: http.MethodGet},
+		{Path: "/waiting-epochs-left/:key", Handler: ng.waitingEpochsLeft, Method: http.MethodGet},
 	}
 	ng.baseGroup.endpoints = baseRoutesHandlers
 
@@ -69,3 +70,14 @@ func (group *nodeGroup) isOldStorageForToken(c *gin.Context) {
 
 	shared.RespondWith(c, http.StatusOK, gin.H{"isOldStorage": isOldStorage}, "", data.ReturnCodeSuccess)
 }
+
+func (group *nodeGroup) waitingEpochsLeft(c *gin.Context) {
+	publicKey := c.Param("key")
+	response, err := group.facade.GetWaitingEpochsLeftForPublicKey(publicKey)
+	if err != nil {
+		shared.RespondWith(c, http.StatusInternalServerError, nil, err.Error(), data.ReturnCodeInternalError)
+		return
+	}
+
+	shared.RespondWith(c, http.StatusOK, response.Data, "", data.ReturnCodeSuccess)
+}
diff --git a/api/groups/baseNodeGroup_test.go b/api/groups/baseNodeGroup_test.go
@@ -152,3 +152,53 @@ func TestNodeGroup_IsOldStorageToken(t *testing.T) {
 		assert.Equal(t, "map[isOldStorage:true]", fmt.Sprintf("%v", result.Data))
 	})
 }
+
+func TestBaseNodeGroup_GetWaitingEpochsLeftForPublicKey(t *testing.T) {
+	t.Parallel()
+
+	t.Run("facade returns bad request", func(t *testing.T) {
+		t.Parallel()
+
+		facade := &mock.FacadeStub{
+			GetWaitingEpochsLeftForPublicKeyCalled: func(publicKey string) (*data.WaitingEpochsLeftApiResponse, error) {
+				return nil, errors.New("bad request")
+			},
+		}
+		nodeGroup, err := groups.NewNodeGroup(facade)
+		require.NoError(t, err)
+		ws := startProxyServer(nodeGroup, nodePath)
+
+		req, _ := http.NewRequest("GET", "/node/waiting-epochs-left/key", nil)
+		resp := httptest.NewRecorder()
+		ws.ServeHTTP(resp, req)
+
+		assert.Equal(t, http.StatusInternalServerError, resp.Code)
+	})
+	t.Run("facade returns bad request", func(t *testing.T) {
+		t.Parallel()
+
+		providedData := data.WaitingEpochsLeftResponse{
+			EpochsLeft: 10,
+		}
+		facade := &mock.FacadeStub{
+			GetWaitingEpochsLeftForPublicKeyCalled: func(publicKey string) (*data.WaitingEpochsLeftApiResponse, error) {
+				return &data.WaitingEpochsLeftApiResponse{
+					Data: providedData,
+				}, nil
+			},
+		}
+		nodeGroup, err := groups.NewNodeGroup(facade)
+		require.NoError(t, err)
+		ws := startProxyServer(nodeGroup, nodePath)
+
+		req, _ := http.NewRequest("GET", "/node/waiting-epochs-left/key", nil)
+		resp := httptest.NewRecorder()
+		ws.ServeHTTP(resp, req)
+
+		assert.Equal(t, http.StatusOK, resp.Code)
+
+		var result data.WaitingEpochsLeftApiResponse
+		loadResponse(resp.Body, &result)
+		assert.Equal(t, providedData, result.Data)
+	})
+}
diff --git a/api/groups/baseProofGroup_test.go b/api/groups/baseProofGroup_test.go
@@ -50,6 +50,7 @@ func TestGetProof_FailWhenFacadeGetProofFails(t *testing.T) {
 	ws := startProxyServer(proofGroup, "/proof")
 
 	req, err := http.NewRequest("GET", "/proof/root-hash/"+rootHash+"/address/"+address, nil)
+	require.NoError(t, err)
 
 	resp := httptest.NewRecorder()
 	ws.ServeHTTP(resp, req)
@@ -82,6 +83,7 @@ func TestGetProof(t *testing.T) {
 	ws := startProxyServer(proofGroup, "/proof")
 
 	req, err := http.NewRequest("GET", "/proof/root-hash/"+rootHash+"/address/"+address, nil)
+	require.NoError(t, err)
 
 	resp := httptest.NewRecorder()
 	ws.ServeHTTP(resp, req)
@@ -128,6 +130,7 @@ func TestVerifyProof_FailWhenFacadeVerifyProofFails(t *testing.T) {
 	}
 	verifyProofBytes, _ := json.Marshal(varifyProofParams)
 	req, err := http.NewRequest("POST", "/proof/verify", bytes.NewBuffer(verifyProofBytes))
+	require.NoError(t, err)
 
 	resp := httptest.NewRecorder()
 	ws.ServeHTTP(resp, req)
@@ -165,6 +168,7 @@ func TestVerifyProof(t *testing.T) {
 	}
 	verifyProofBytes, _ := json.Marshal(varifyProofParams)
 	req, err := http.NewRequest("POST", "/proof/verify", bytes.NewBuffer(verifyProofBytes))
+	require.NoError(t, err)
 
 	resp := httptest.NewRecorder()
 	ws.ServeHTTP(resp, req)
@@ -200,6 +204,7 @@ func TestGetProofDataTrie_FailWhenFacadeGetProofFails(t *testing.T) {
 
 	endpoint := fmt.Sprintf("/proof/root-hash/%s/address/%s/key/%s", rootHash, address, key)
 	req, err := http.NewRequest("GET", endpoint, nil)
+	require.NoError(t, err)
 
 	resp := httptest.NewRecorder()
 	ws.ServeHTTP(resp, req)
@@ -235,6 +240,7 @@ func TestGetProofDataTrie(t *testing.T) {
 
 	endpoint := fmt.Sprintf("/proof/root-hash/%s/address/%s/key/%s", rootHash, address, key)
 	req, err := http.NewRequest("GET", endpoint, nil)
+	require.NoError(t, err)
 
 	resp := httptest.NewRecorder()
 	ws.ServeHTTP(resp, req)

diff --git a/api/groups/baseTransactionGroup.go b/api/groups/baseTransactionGroup.go
@@ -261,7 +261,7 @@ func (group *transactionGroup) getProcessedTransactionStatus(c *gin.Context) {
 		return
 	}
 
-	shared.RespondWith(c, http.StatusOK, gin.H{"status": status}, "", data.ReturnCodeSuccess)
+	shared.RespondWith(c, http.StatusOK, gin.H{"status": status.Status, "reason": status.Reason}, "", data.ReturnCodeSuccess)
 }
 
 func getTransactionByHashAndSenderAddress(c *gin.Context, ef TransactionFacadeHandler, txHash string, sndAddr string, withEvents bool) {

diff --git a/api/groups/baseTransactionGroup_test.go b/api/groups/baseTransactionGroup_test.go
@@ -75,6 +75,7 @@ type txProcessedStatusResp struct {
 	GeneralResponse
 	Data struct {
 		Status string `json:"status"`
+		Reason string `json:"reason"`
 	} `json:"data"`
 }
 
@@ -776,9 +777,9 @@ func TestTransactionGroup_getProcessedTransactionStatus(t *testing.T) {
 		t.Parallel()
 
 		facade := &mock.FacadeStub{
-			GetProcessedTransactionStatusHandler: func(txHash string) (string, error) {
+			GetProcessedTransactionStatusHandler: func(txHash string) (*data.ProcessStatusResponse, error) {
 				assert.Equal(t, hash, txHash)
-				return "", expectedErr
+				return &data.ProcessStatusResponse{}, expectedErr
 			},
 		}
 		transactionsGroup, err := groups.NewTransactionGroup(facade)
@@ -799,9 +800,12 @@ func TestTransactionGroup_getProcessedTransactionStatus(t *testing.T) {
 	t.Run("should work", func(t *testing.T) {
 		t.Parallel()
 
-		status := "status"
+		status := &data.ProcessStatusResponse{
+			Status: "status",
+			Reason: "some error",
+		}
 		facade := &mock.FacadeStub{
-			GetProcessedTransactionStatusHandler: func(txHash string) (string, error) {
+			GetProcessedTransactionStatusHandler: func(txHash string) (*data.ProcessStatusResponse, error) {
 				assert.Equal(t, hash, txHash)
 				return status, nil
 			},
@@ -820,6 +824,7 @@ func TestTransactionGroup_getProcessedTransactionStatus(t *testing.T) {
 
 		assert.Equal(t, http.StatusOK, resp.Code)
 		assert.Empty(t, response.Error)
-		assert.Equal(t, status, response.Data.Status)
+		assert.Equal(t, status.Status, response.Data.Status)
+		assert.Equal(t, status.Reason, response.Data.Reason)
 	})
 }
diff --git a/api/groups/baseValidatorGroup.go b/api/groups/baseValidatorGroup.go
@@ -27,6 +27,7 @@ func NewValidatorGroup(facadeHandler data.FacadeHandler) (*validatorGroup, error
 
 	baseRoutesHandlers := []*data.EndpointHandlerData{
 		{Path: "/statistics", Handler: vg.statistics, Method: http.MethodGet},
+		{Path: "/auction", Handler: vg.auctionList, Method: http.MethodGet},
 	}
 	vg.baseGroup.endpoints = baseRoutesHandlers
 
@@ -43,3 +44,13 @@ func (group *validatorGroup) statistics(c *gin.Context) {
 
 	shared.RespondWith(c, http.StatusOK, gin.H{"statistics": validatorStatistics}, "", data.ReturnCodeSuccess)
 }
+
+func (group *validatorGroup) auctionList(c *gin.Context) {
+	auctionList, err := group.facade.AuctionList()
+	if err != nil {
+		shared.RespondWith(c, http.StatusBadRequest, nil, err.Error(), data.ReturnCodeRequestError)
+		return
+	}
+
+	shared.RespondWith(c, http.StatusOK, gin.H{"auctionList": auctionList}, "", data.ReturnCodeSuccess)
+}