Added protocol_version to InfoGetStatusResult (#108)

* Added protocol_version to InfoGetStatusResult response
make-software · Aug 6, 2024 · 356fe5c · 356fe5c
1 parent 963249d
commit 356fe5c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/rpc/response.go b/rpc/response.go
@@ -398,6 +398,8 @@ func (b InfoGetValidatorChangesResult) GetRawJSON() json.RawMessage {
 type InfoGetStatusResult struct {
 	// The RPC API version.
 	APIVersion string `json:"api_version"`
+	// The protocol version running in the node
+	ProtocolVersion string `json:"protocol_version"`
 	// The compiled node version.
 	BuildVersion string `json:"build_version"`
 	// The chainspec name, used to identify the currently connected network.
@@ -509,7 +511,7 @@ func (b QueryBalanceDetailsResult) GetRawJSON() json.RawMessage {
 type InfoGetRewardResult struct {
 	APIVersion     string          `json:"api_version"`
 	DelegationRate float32         `json:"delegation_rate"`
-	EraID          uint32          `json:"era_id"`
+	EraID          uint64          `json:"era_id"`
 	RewardAmount   clvalue.UInt512 `json:"reward_amount"`
 
 	rawJSON json.RawMessage

diff --git a/tests/data/rpc_response/get_status.json b/tests/data/rpc_response/get_status.json
@@ -3,6 +3,7 @@
   "id": "1",
   "result": {
     "api_version": "2.0.0",
+    "protocol_version": "5.4.3",
     "peers": [
       {
         "node_id": "tls:4cca..587b",

diff --git a/tests/rpc/client_example_test.go b/tests/rpc/client_example_test.go
@@ -88,5 +88,6 @@ func Test_Client_RPCGetStatus_WithAuthorizationHeader(t *testing.T) {
 	status, err := client.GetStatus(context.Background())
 	require.NoError(t, err)
 	assert.Equal(t, "2.0.0", status.APIVersion)
+	assert.Equal(t, "5.4.3", status.ProtocolVersion)
 	assert.NotEmpty(t, status.LatestSwitchBlockHash)
 }
diff --git a/types/block.go b/types/block.go
@@ -15,7 +15,7 @@ type Block struct {
 	StateRootHash       key.Hash                        `json:"state_root_hash"`
 	LastSwitchBlockHash key.Hash                        `json:"last_switch_block_hash"`
 	ParentHash          key.Hash                        `json:"parent_hash"`
-	EraID               uint32                          `json:"era_id"`
+	EraID               uint64                          `json:"era_id"`
 	Timestamp           Timestamp                       `json:"timestamp"`
 	AccumulatedSeed     *key.Hash                       `json:"accumulated_seed,omitempty"`
 	RandomBit           bool                            `json:"random_bit"`
@@ -143,7 +143,7 @@ type BlockHeaderWrapper struct {
 type BlockHeader struct {
 	AccumulatedSeed *key.Hash `json:"accumulated_seed,omitempty"`
 	BodyHash        key.Hash  `json:"body_hash"`
-	EraID           uint32    `json:"era_id"`
+	EraID           uint64    `json:"era_id"`
 	CurrentGasPrice uint8     `json:"current_gas_price"`
 	Height          uint64    `json:"height"`
 	ParentHash      key.Hash  `json:"parent_hash"`
@@ -206,7 +206,7 @@ func NewBlockHeaderFromV2(header BlockHeaderV2) BlockHeader {
 type BlockHeaderV1 struct {
 	AccumulatedSeed *key.Hash `json:"accumulated_seed,omitempty"`
 	BodyHash        key.Hash  `json:"body_hash"`
-	EraID           uint32    `json:"era_id"`
+	EraID           uint64    `json:"era_id"`
 	Height          uint64    `json:"height"`
 	ParentHash      key.Hash  `json:"parent_hash"`
 	ProtocolVersion string    `json:"protocol_version,omitempty"`
@@ -275,7 +275,7 @@ type BlockBodyV2 struct {
 type BlockHeaderV2 struct {
 	AccumulatedSeed     *key.Hash `json:"accumulated_seed,omitempty"`
 	BodyHash            key.Hash  `json:"body_hash"`
-	EraID               uint32    `json:"era_id"`
+	EraID               uint64    `json:"era_id"`
 	CurrentGasPrice     uint8     `json:"current_gas_price"`
 	Height              uint64    `json:"height"`
 	ParentHash          key.Hash  `json:"parent_hash"`

diff --git a/types/minimal_block_info.go b/types/minimal_block_info.go
@@ -9,7 +9,7 @@ import (
 
 type MinimalBlockInfo struct {
 	Creator       keypair.PublicKey `json:"creator"`
-	EraID         uint32            `json:"era_id"`
+	EraID         uint64            `json:"era_id"`
 	Hash          key.Hash          `json:"hash"`
 	Height        uint32            `json:"height"`
 	StateRootHash key.Hash          `json:"state_root_hash"`