parse forHyperblock from block request too

multiversx · Jan 9, 2025 · dd444df · dd444df
1 parent bda1e8e
commit dd444df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/api/groups/urlParams.go b/api/groups/urlParams.go
@@ -23,7 +23,12 @@ func parseBlockQueryOptions(c *gin.Context) (common.BlockQueryOptions, error) {
 		return common.BlockQueryOptions{}, err
 	}
 
-	options := common.BlockQueryOptions{WithTransactions: withTxs, WithLogs: withLogs}
+	forHyperblock, err := parseBoolUrlParam(c, common.UrlParameterForHyperblock)
+	if err != nil {
+		return common.BlockQueryOptions{}, err
+	}
+
+	options := common.BlockQueryOptions{WithTransactions: withTxs, WithLogs: withLogs, ForHyperblock: forHyperblock}
 	return options, nil
 }
 

diff --git a/api/groups/urlParams_test.go b/api/groups/urlParams_test.go
@@ -12,13 +12,13 @@ import (
 )
 
 func TestParseBlockQueryOptions(t *testing.T) {
-	options, err := parseBlockQueryOptions(createDummyGinContextWithQuery("withTxs=true&withLogs=true"))
+	options, err := parseBlockQueryOptions(createDummyGinContextWithQuery("withTxs=true&withLogs=true&forHyperblock=true"))
 	require.Nil(t, err)
-	require.Equal(t, common.BlockQueryOptions{WithTransactions: true, WithLogs: true}, options)
+	require.Equal(t, common.BlockQueryOptions{WithTransactions: true, WithLogs: true, ForHyperblock: true}, options)
 
 	options, err = parseBlockQueryOptions(createDummyGinContextWithQuery("withTxs=true"))
 	require.Nil(t, err)
-	require.Equal(t, common.BlockQueryOptions{WithTransactions: true, WithLogs: false}, options)
+	require.Equal(t, common.BlockQueryOptions{WithTransactions: true, WithLogs: false, ForHyperblock: false}, options)
 
 	options, err = parseBlockQueryOptions(createDummyGinContextWithQuery("withTxs=foobar"))
 	require.NotNil(t, err)

diff --git a/cmd/proxy/config/swagger/openapi.json b/cmd/proxy/config/swagger/openapi.json
@@ -645,7 +645,7 @@
         }
       }
     },
-    "/block/{shard}/by-nonce/{nonce}?withTxs=true": {
+    "/block/{shard}/by-nonce/{nonce}?withTxs=true&withLogs=true&forHyperblock=true": {
       "get": {
         "tags": [
           "block"
@@ -725,7 +725,7 @@
         }
       }
     },
-    "/block/{shard}/by-hash/{hash}?withTxs=true": {
+    "/block/{shard}/by-hash/{hash}?withTxs=true&withLogs=true&forHyperblock=true": {
       "get": {
         "tags": [
           "block"