Change block response parsing approach

rpc/client.go

@@ -97,9 +97,9 @@ type ClientInformational interface {
 
 	// GetLatestEntity returns latest AddressableEntity from the network.
 	GetLatestEntity(ctx context.Context, entityIdentifier EntityIdentifier) (StateGetEntity, error)
-	// GetEntityByHash returns an AddressableEntity by block hash from the network.
+	// GetEntityByBlockHash returns an AddressableEntity by block hash from the network.
 	GetEntityByBlockHash(ctx context.Context, entityIdentifier EntityIdentifier, hash string) (StateGetEntity, error)
-	// GetEntityByHeight returns an AddressableEntity by block height from the network.
+	// GetEntityByBlockHeight returns an AddressableEntity by block height from the network.
 	GetEntityByBlockHeight(ctx context.Context, entityIdentifier EntityIdentifier, height uint64) (StateGetEntity, error)
 
 	// GetLatestBlock returns the latest types.Block from the network.

rpc/response.go

@@ -89,6 +89,21 @@ func (b ChainGetBlockResult) GetRawJSON() json.RawMessage {
 	return b.rawJSON
 }
 
+func (v *ChainGetBlockResult) UnmarshalJSON(data []byte) error {
+	var res chainGetBlockResultV1Compatible
+	if err := json.Unmarshal(data, &res); err != nil {
+		return err
+	}
+
+	blockResult, err := newChainGetBlockResultFromV1Compatible(res, data)
+	if err != nil {
+		return err
+	}
+
+	*v = blockResult
+	return nil
+}
+
 type chainGetBlockResultV1Compatible struct {
 	APIVersion          string                     `json:"api_version"`
 	BlockWithSignatures *types.BlockWithSignatures `json:"block_with_signatures"`

rpc/rpc_client.go

@@ -400,54 +400,36 @@ func (c *client) GetEraInfoByBlockHash(ctx context.Context, hash string) (ChainG
 }
 
 func (c *client) GetLatestBlock(ctx context.Context) (ChainGetBlockResult, error) {
-	var result chainGetBlockResultV1Compatible
+	var result ChainGetBlockResult
 
-	resp, err := c.processRequest(ctx, MethodGetBlock, nil, &result)
+	_, err := c.processRequest(ctx, MethodGetBlock, nil, &result)
 	if err != nil {
 		return ChainGetBlockResult{}, err
 	}
 
-	blockResult, err := newChainGetBlockResultFromV1Compatible(result, resp.Result)
-	if err != nil {
-		return ChainGetBlockResult{}, err
-	}
-
-	blockResult.rawJSON = resp.Result
-	return blockResult, nil
+	return result, nil
 }
 
 func (c *client) GetBlockByHash(ctx context.Context, hash string) (ChainGetBlockResult, error) {
-	var result chainGetBlockResultV1Compatible
+	var result ChainGetBlockResult
 
-	resp, err := c.processRequest(ctx, MethodGetBlock, NewParamBlockByHash(hash), &result)
+	_, err := c.processRequest(ctx, MethodGetBlock, NewParamBlockByHash(hash), &result)
 	if err != nil {
 		return ChainGetBlockResult{}, err
 	}
 
-	blockResult, err := newChainGetBlockResultFromV1Compatible(result, resp.Result)
-	if err != nil {
-		return ChainGetBlockResult{}, err
-	}
-
-	blockResult.rawJSON = resp.Result
-	return blockResult, nil
+	return result, nil
 }
 
 func (c *client) GetBlockByHeight(ctx context.Context, height uint64) (ChainGetBlockResult, error) {
-	var result chainGetBlockResultV1Compatible
+	var result ChainGetBlockResult
 
-	resp, err := c.processRequest(ctx, MethodGetBlock, NewParamBlockByHeight(height), &result)
+	_, err := c.processRequest(ctx, MethodGetBlock, NewParamBlockByHeight(height), &result)
 	if err != nil {
 		return ChainGetBlockResult{}, err
 	}
 
-	blockResult, err := newChainGetBlockResultFromV1Compatible(result, resp.Result)
-	if err != nil {
-		return ChainGetBlockResult{}, err
-	}
-
-	blockResult.rawJSON = resp.Result
-	return blockResult, nil
+	return result, nil
 }
 
 func (c *client) GetLatestBlockTransfers(ctx context.Context) (ChainGetBlockTransfersResult, error) {

types/unbonding_purse.go

@@ -13,7 +13,7 @@ type UnbondingPurse struct {
 	// Bonding purse
 	BondingPurse key.URef `json:"bonding_purse"`
 	// Era ID in which this unbonding request was created.
-	EraOfCreation uint32 `json:"era_of_creation"`
+	EraOfCreation uint64 `json:"era_of_creation"`
 	// Unbonder public key.
 	UnbonderPublicKey keypair.PublicKey `json:"unbonder_public_key"`
 	// The original validator's public key.