Rc/supernova

README.md

@@ -56,6 +56,7 @@ For more details, go [here](https://docs.multiversx.com/sdk-and-tools/proxy/).
 - `/v1.0/network/direct-staked-info` (GET) --> returns the list of direct staked values
 - `/v1.0/network/delegated-info`     (GET) --> returns the list of delegated values
 - `/v1.0/network/enable-epochs`      (GET) --> returns the activation epochs metric
+- `/v1.0/network/enable-epochs-v2`   (GET) --> returns the newer version of activation epochs
 ### node
 
 - `/v1.0/node/heartbeatstatus`     (GET) --> returns the heartbeat data from an observer from any shard. Has a cache to avoid many requests

api/groups/baseNetworkGroup.go

@@ -37,6 +37,7 @@ func NewNetworkGroup(facadeHandler data.FacadeHandler) (*networkGroup, error) {
 		{Path: "/esdt/non-fungible-tokens", Handler: ng.getEsdtHandlerFunc(data.NonFungibleTokens), Method: http.MethodGet},
 		{Path: "/esdt/supply/:token", Handler: ng.getESDTSupply, Method: http.MethodGet},
 		{Path: "/enable-epochs", Handler: ng.getEnableEpochs, Method: http.MethodGet},
+		{Path: "/enable-epochs-v2", Handler: ng.getEnableEpochsV2, Method: http.MethodGet},
 		{Path: "/direct-staked-info", Handler: ng.getDirectStakedInfo, Method: http.MethodGet},
 		{Path: "/delegated-info", Handler: ng.getDelegatedInfo, Method: http.MethodGet},
 		{Path: "/ratings", Handler: ng.getRatingsConfig, Method: http.MethodGet},
@@ -144,6 +145,16 @@ func (group *networkGroup) getEnableEpochs(c *gin.Context) {
 	c.JSON(http.StatusOK, enableEpochsMetrics)
 }
 
+func (group *networkGroup) getEnableEpochsV2(c *gin.Context) {
+	enableEpochsMetrics, err := group.facade.GetEnableEpochsMetricsV2()
+	if err != nil {
+		shared.RespondWith(c, http.StatusInternalServerError, nil, err.Error(), data.ReturnCodeInternalError)
+		return
+	}
+
+	c.JSON(http.StatusOK, enableEpochsMetrics)
+}
+
 func (group *networkGroup) getESDTSupply(c *gin.Context) {
 	tokenIdentifier := c.Param("token")
 	if tokenIdentifier == "" {

api/groups/baseNetworkGroup_test.go

@@ -216,7 +216,7 @@ func TestGetEconomicsData_ShouldWork(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, resp.Code)
 	assert.Equal(t, expectedResp, ecDataResp)
-	assert.Equal(t, expectedResp.Data, ecDataResp.Data) //extra safe
+	assert.Equal(t, expectedResp.Data, ecDataResp.Data) // extra safe
 }
 
 func TestGetAllIssuedESDTs_ShouldErr(t *testing.T) {
@@ -325,7 +325,7 @@ func TestGetDelegatedInfo_ShouldWork(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, resp.Code)
 	assert.Equal(t, expectedResp, delegatedInfoResp)
-	assert.Equal(t, expectedResp.Data, delegatedInfoResp.Data) //extra safe
+	assert.Equal(t, expectedResp.Data, delegatedInfoResp.Data) // extra safe
 }
 
 func TestGetDirectStaked_ShouldErr(t *testing.T) {
@@ -374,7 +374,7 @@ func TestGetDirectStaked_ShouldWork(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, resp.Code)
 	assert.Equal(t, expectedResp, directStakedResp)
-	assert.Equal(t, expectedResp.Data, directStakedResp.Data) //extra safe
+	assert.Equal(t, expectedResp.Data, directStakedResp.Data) // extra safe
 }
 
 func TestGetEnableEpochsMetrics_FacadeErrShouldErr(t *testing.T) {
@@ -452,6 +452,81 @@ func TestGetEnableEpochsMetrics_OkRequestShouldWork(t *testing.T) {
 	assert.Equal(t, value, res)
 }
 
+func TestGetEnableEpochsMetricsV2_FacadeErrShouldErr(t *testing.T) {
+	t.Parallel()
+
+	expectedErr := errors.New("expected err")
+	facade := &mock.FacadeStub{
+		GetEnableEpochsMetricsV2Handler: func() (*data.GenericAPIResponse, error) {
+			return nil, expectedErr
+		},
+	}
+	networkGroup, err := groups.NewNetworkGroup(facade)
+	require.NoError(t, err)
+	ws := startProxyServer(networkGroup, networkPath)
+
+	req, _ := http.NewRequest("GET", "/network/enable-epochs-v2", nil)
+	resp := httptest.NewRecorder()
+	ws.ServeHTTP(resp, req)
+	assert.Equal(t, http.StatusInternalServerError, resp.Code)
+
+	var result metricsResponse
+	loadResponse(resp.Body, &result)
+
+	assert.Equal(t, expectedErr.Error(), result.Error)
+}
+
+func TestGetEnableEpochsMetricsV2_BadRequestShouldErr(t *testing.T) {
+	t.Parallel()
+
+	facade := &mock.FacadeStub{
+		GetEnableEpochsMetricsV2Handler: func() (*data.GenericAPIResponse, error) {
+			return nil, errors.New("bad request")
+		},
+	}
+	networkGroup, err := groups.NewNetworkGroup(facade)
+	require.NoError(t, err)
+	ws := startProxyServer(networkGroup, networkPath)
+
+	req, _ := http.NewRequest("GET", "/network/enable-epochs-v2", nil)
+	resp := httptest.NewRecorder()
+	ws.ServeHTTP(resp, req)
+
+	assert.Equal(t, http.StatusInternalServerError, resp.Code)
+}
+
+func TestGetEnableEpochsMetricsV2_OkRequestShouldWork(t *testing.T) {
+	t.Parallel()
+
+	key := "SupernovaEnableEpoch"
+	value := float64(4)
+	facade := &mock.FacadeStub{
+		GetEnableEpochsMetricsV2Handler: func() (*data.GenericAPIResponse, error) {
+			return &data.GenericAPIResponse{
+				Data: map[string]interface{}{
+					key: value,
+				},
+				Error: "",
+			}, nil
+		},
+	}
+	networkGroup, err := groups.NewNetworkGroup(facade)
+	require.NoError(t, err)
+	ws := startProxyServer(networkGroup, networkPath)
+
+	req, _ := http.NewRequest("GET", "/network/enable-epochs-v2", nil)
+	resp := httptest.NewRecorder()
+	ws.ServeHTTP(resp, req)
+	assert.Equal(t, http.StatusOK, resp.Code)
+
+	var result metricsResponse
+	loadResponse(resp.Body, &result)
+
+	res, ok := result.Data[key]
+	assert.True(t, ok)
+	assert.Equal(t, value, res)
+}
+
 func TestGetRatingsConfig_ShouldFail(t *testing.T) {
 	t.Parallel()
 

api/groups/interface.go

@@ -65,6 +65,7 @@ type NetworkFacadeHandler interface {
 	GetDirectStakedInfo() (*data.GenericAPIResponse, error)
 	GetDelegatedInfo() (*data.GenericAPIResponse, error)
 	GetEnableEpochsMetrics() (*data.GenericAPIResponse, error)
+	GetEnableEpochsMetricsV2() (*data.GenericAPIResponse, error)
 	GetESDTSupply(token string) (*data.ESDTSupplyResponse, error)
 	GetRatingsConfig() (*data.GenericAPIResponse, error)
 	GetGenesisNodesPubKeys() (*data.GenericAPIResponse, error)

api/mock/facadeStub.go

@@ -45,6 +45,7 @@ type FacadeStub struct {
 	GetNetworkMetricsHandler                     func(shardID uint32) (*data.GenericAPIResponse, error)
 	GetAllIssuedESDTsHandler                     func(tokenType string) (*data.GenericAPIResponse, error)
 	GetEnableEpochsMetricsHandler                func() (*data.GenericAPIResponse, error)
+	GetEnableEpochsMetricsV2Handler              func() (*data.GenericAPIResponse, error)
 	GetEconomicsDataMetricsHandler               func() (*data.GenericAPIResponse, error)
 	GetDirectStakedInfoCalled                    func() (*data.GenericAPIResponse, error)
 	GetDelegatedInfoCalled                       func() (*data.GenericAPIResponse, error)
@@ -235,6 +236,11 @@ func (f *FacadeStub) GetEnableEpochsMetrics() (*data.GenericAPIResponse, error)
 	return f.GetEnableEpochsMetricsHandler()
 }
 
+// GetEnableEpochsMetricsV2 -
+func (f *FacadeStub) GetEnableEpochsMetricsV2() (*data.GenericAPIResponse, error) {
+	return f.GetEnableEpochsMetricsV2Handler()
+}
+
 // GetRatingsConfig -
 func (f *FacadeStub) GetRatingsConfig() (*data.GenericAPIResponse, error) {
 	return f.GetRatingsConfigCalled()

cmd/proxy/config/apiConfig/v1_0.toml

@@ -69,6 +69,7 @@ Routes = [
     { Name = "/direct-staked-info", Open = true, Secured = true, RateLimit = 0 },
     { Name = "/delegated-info", Open = true, Secured = true, RateLimit = 0 },
     { Name = "/enable-epochs", Open = true, Secured = false, RateLimit = 0 },
+    { Name = "/enable-epochs-v2", Open = true, Secured = false, RateLimit = 0 },
     { Name = "/ratings", Open = true, Secured = false, RateLimit = 0 },
     { Name = "/genesis-nodes", Open = true, Secured = false, RateLimit = 0 },
     { Name = "/gas-configs", Open = true, Secured = false, RateLimit = 0 },

cmd/proxy/config/apiConfig/v_next.toml

@@ -69,6 +69,7 @@ Routes = [
     { Name = "/direct-staked-info", Open = true, Secured = true, RateLimit = 0 },
     { Name = "/delegated-info", Open = true, Secured = true, RateLimit = 0 },
     { Name = "/enable-epochs", Open = true, Secured = false, RateLimit = 0 },
+    { Name = "/enable-epochs-v2", Open = true, Secured = false, RateLimit = 0 },
     { Name = "/ratings", Open = true, Secured = false, RateLimit = 0 },
     { Name = "/genesis-nodes", Open = true, Secured = false, RateLimit = 0 },
     { Name = "/gas-configs", Open = true, Secured = false, RateLimit = 0 },

cmd/proxy/config/config.toml

@@ -18,6 +18,9 @@
    # before it should be updated
    EconomicsMetricsCacheValidityDurationSec = 600 # 10 minutes
 
+   # BlockCacheDurationSec defines how long block/hyperblock results (queried by hash or nonce) are kept in cache, in seconds.
+   BlockCacheDurationSec = 30
+
    # BalancedObservers - if this flag is set to true, then the requests will be distributed equally between observers.
    # Otherwise, there are chances that only one observer from a shard will process the requests
    BalancedObservers = true

cmd/proxy/config/swagger/openapi.json

@@ -316,7 +316,7 @@
         "tags": [
           "address"
         ],
-        "summary": "returns all ESDT tokens that the provided address interacted with",
+        "summary": "returns all the ESDT Tokens owned by the specified address.",
         "parameters": [
           {
             "name": "address",
@@ -422,7 +422,7 @@
         "tags": [
           "address"
         ],
-        "summary": "returns all ESDT tokens that the provided address interacted with",
+        "summary": "returns the details of a specific ESDT token for a given address",
         "parameters": [
           {
             "name": "address",
@@ -1071,6 +1071,26 @@
         }
       }
     },
+    "/network/enable-epochs-v2": {
+      "get": {
+        "tags": [
+          "network"
+        ],
+        "summary": "returns the activation epochs metric",
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GenericResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/network/ratings": {
       "get": {
         "tags": [

cmd/proxy/main.go

@@ -30,6 +30,7 @@ import (
 	processFactory "github.com/multiversx/mx-chain-proxy-go/process/factory"
 	"github.com/multiversx/mx-chain-proxy-go/testing"
 	versionsFactory "github.com/multiversx/mx-chain-proxy-go/versions/factory"
+	"github.com/multiversx/mx-chain-storage-go/timecache"
 	"github.com/urfave/cli"
 )
 
@@ -336,6 +337,7 @@ func createVersionsRegistryTestOrProduction(
 				HeartbeatCacheValidityDurationSec:        60,
 				ValStatsCacheValidityDurationSec:         60,
 				EconomicsMetricsCacheValidityDurationSec: 6,
+				BlockCacheDurationSec:                    30,
 				FaucetValue:                              "10000000000",
 			},
 			ApiLogging: config.ApiLoggingConfig{
@@ -512,13 +514,22 @@ func createVersionsRegistry(
 		return nil, err
 	}
 
-	closableComponents.Add(nodeGroupProc, valStatsProc, nodeStatusProc, bp)
+	cacheDuration := time.Duration(cfg.GeneralSettings.BlockCacheDurationSec) * time.Second
+	timedCache, err := timecache.NewTimeCacher(timecache.ArgTimeCacher{
+		DefaultSpan: cacheDuration,
+		CacheExpiry: cacheDuration,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	closableComponents.Add(nodeGroupProc, valStatsProc, nodeStatusProc, bp, timedCache)
 
 	nodeGroupProc.StartCacheUpdate()
 	valStatsProc.StartCacheUpdate()
 	nodeStatusProc.StartCacheUpdate()
 
-	blockProc, err := process.NewBlockProcessor(bp)
+	blockProc, err := process.NewBlockProcessor(bp, timedCache)
 	if err != nil {
 		return nil, err
 	}

config/config.go

@@ -11,6 +11,7 @@ type GeneralSettingsConfig struct {
 	HeartbeatCacheValidityDurationSec        int
 	ValStatsCacheValidityDurationSec         int
 	EconomicsMetricsCacheValidityDurationSec int
+	BlockCacheDurationSec                    int
 	FaucetValue                              string
 	RateLimitWindowDurationSeconds           int
 	BalancedObservers                        bool

data/block.go

@@ -12,6 +12,16 @@ type BlockApiResponse struct {
 	Code  ReturnCode              `json:"code"`
 }
 
+// Hash returns internal hash
+func (h *BlockApiResponse) Hash() string {
+	return h.Data.Block.Hash
+}
+
+// Nonce returns internal nonce
+func (h *BlockApiResponse) Nonce() uint64 {
+	return h.Data.Block.Nonce
+}
+
 // BlockApiResponsePayload wraps a block
 type BlockApiResponsePayload struct {
 	Block api.Block `json:"block"`
@@ -24,6 +34,16 @@ type HyperblockApiResponse struct {
 	Code  ReturnCode                   `json:"code"`
 }
 
+// Hash returns internal hash
+func (h *HyperblockApiResponse) Hash() string {
+	return h.Data.Hyperblock.Hash
+}
+
+// Nonce returns internal nonce
+func (h *HyperblockApiResponse) Nonce() uint64 {
+	return h.Data.Hyperblock.Nonce
+}
+
 // NewHyperblockApiResponse creates a HyperblockApiResponse
 func NewHyperblockApiResponse(hyperblock api.Hyperblock) *HyperblockApiResponse {
 	return &HyperblockApiResponse{

facade/baseFacade.go

@@ -345,6 +345,11 @@ func (pf *ProxyFacade) GetEnableEpochsMetrics() (*data.GenericAPIResponse, error
 	return pf.nodeStatusProc.GetEnableEpochsMetrics()
 }
 
+// GetEnableEpochsMetricsV2 retrieves the activation epochs
+func (pf *ProxyFacade) GetEnableEpochsMetricsV2() (*data.GenericAPIResponse, error) {
+	return pf.nodeStatusProc.GetEnableEpochsMetricsV2()
+}
+
 // GetRatingsConfig retrieves the node's configuration's metrics
 func (pf *ProxyFacade) GetRatingsConfig() (*data.GenericAPIResponse, error) {
 	return pf.nodeStatusProc.GetRatingsConfig()
@@ -406,8 +411,8 @@ func (pf *ProxyFacade) ValidatorStatistics() (map[string]*data.ValidatorApiRespo
 }
 
 // AuctionList will return the auction list
-func (epf *ProxyFacade) AuctionList() ([]*data.AuctionListValidatorAPIResponse, error) {
-	auctionList, err := epf.valStatsProc.GetAuctionList()
+func (pf *ProxyFacade) AuctionList() ([]*data.AuctionListValidatorAPIResponse, error) {
+	auctionList, err := pf.valStatsProc.GetAuctionList()
 	if err != nil {
 		return nil, err
 	}
@@ -536,8 +541,8 @@ func (pf *ProxyFacade) GetInternalStartOfEpochValidatorsInfo(epoch uint32) (*dat
 }
 
 // GetWaitingEpochsLeftForPublicKey returns the number of epochs left for the public key until it becomes eligible
-func (epf *ProxyFacade) GetWaitingEpochsLeftForPublicKey(publicKey string) (*data.WaitingEpochsLeftApiResponse, error) {
-	return epf.nodeGroupProc.GetWaitingEpochsLeftForPublicKey(publicKey)
+func (pf *ProxyFacade) GetWaitingEpochsLeftForPublicKey(publicKey string) (*data.WaitingEpochsLeftApiResponse, error) {
+	return pf.nodeGroupProc.GetWaitingEpochsLeftForPublicKey(publicKey)
 }
 
 // IsDataTrieMigrated returns true if the data trie for the given address is migrated

facade/interface.go

@@ -92,6 +92,7 @@ type NodeStatusProcessor interface {
 	GetLatestFullySynchronizedHyperblockNonce() (uint64, error)
 	GetAllIssuedESDTs(tokenType string) (*data.GenericAPIResponse, error)
 	GetEnableEpochsMetrics() (*data.GenericAPIResponse, error)
+	GetEnableEpochsMetricsV2() (*data.GenericAPIResponse, error)
 	GetDirectStakedInfo() (*data.GenericAPIResponse, error)
 	GetDelegatedInfo() (*data.GenericAPIResponse, error)
 	GetRatingsConfig() (*data.GenericAPIResponse, error)

facade/mock/nodeStatusProcessorStub.go

@@ -12,6 +12,7 @@ type NodeStatusProcessorStub struct {
 	GetDirectStakedInfoCalled                       func() (*data.GenericAPIResponse, error)
 	GetDelegatedInfoCalled                          func() (*data.GenericAPIResponse, error)
 	GetEnableEpochsMetricsCalled                    func() (*data.GenericAPIResponse, error)
+	GetEnableEpochsMetricsV2Called                  func() (*data.GenericAPIResponse, error)
 	GetRatingsConfigCalled                          func() (*data.GenericAPIResponse, error)
 	GetGenesisNodesPubKeysCalled                    func() (*data.GenericAPIResponse, error)
 	GetGasConfigsCalled                             func() (*data.GenericAPIResponse, error)
@@ -91,6 +92,15 @@ func (stub *NodeStatusProcessorStub) GetEnableEpochsMetrics() (*data.GenericAPIR
 	return &data.GenericAPIResponse{}, nil
 }
 
+// GetEnableEpochsMetricsV2 -
+func (stub *NodeStatusProcessorStub) GetEnableEpochsMetricsV2() (*data.GenericAPIResponse, error) {
+	if stub.GetEnableEpochsMetricsV2Called != nil {
+		return stub.GetEnableEpochsMetricsV2Called()
+	}
+
+	return &data.GenericAPIResponse{}, nil
+}
+
 // GetRatingsConfig -
 func (stub *NodeStatusProcessorStub) GetRatingsConfig() (*data.GenericAPIResponse, error) {
 	if stub.GetRatingsConfigCalled != nil {