Merge pull request #241 from oasisprotocol/tjanez/oasis-core-21.3-block-hash-changes

Update Oasis Core to 21.3.5

Author: tjanez

.changelog/241.feature.md

@@ -0,0 +1 @@
+Bump Oasis Core to 21.3.5

.changelog/241.internal.md

@@ -0,0 +1,6 @@
+go: bump github.com/ethereum/go-ethereum to 1.10.9
+
+It fixes a DoS issue via a maliciously crafted p2p message.
+For more details, see [GHSA-59hh-656j-3p7v].
+
+[GHSA-59hh-656j-3p7v]: https://github.com/advisories/GHSA-59hh-656j-3p7v

Makefile

@@ -1,6 +1,6 @@
 include common.mk
 
-OASIS_RELEASE := 21.2.8
+OASIS_RELEASE := 21.3.5
 ROSETTA_CLI_RELEASE := 0.4.0
 
 # Check which tool to use for downloading.

docker/Dockerfile

@@ -13,7 +13,7 @@ FROM golang:1.16-alpine3.13 AS build
 # Install prerequisites.
 RUN rm -f /var/cache/apk/*; apk --no-cache add bash git make gcc g++ libressl-dev libseccomp-dev linux-headers
 
-ARG CORE_BRANCH=v21.2.8
+ARG CORE_BRANCH=v21.3.5
 ARG CORE_GITHUB=https://github.com/oasisprotocol/oasis-core
 
 ARG GATEWAY_BRANCH=master

go.mod

@@ -8,8 +8,9 @@ require (
 	github.com/coinbase/rosetta-cli v0.4.0
 	github.com/coinbase/rosetta-sdk-go v0.3.3
 	github.com/dgraph-io/badger v1.6.2
+	github.com/ethereum/go-ethereum v1.10.9 // indirect
 	github.com/oasisprotocol/ed25519 v0.0.0-20210127160119-f7017427c1ea
-	github.com/oasisprotocol/oasis-core/go v0.2102.8
+	github.com/oasisprotocol/oasis-core/go v0.2103.5
 	github.com/vmihailenco/msgpack/v5 v5.3.4
-	google.golang.org/grpc v1.39.1
+	google.golang.org/grpc v1.41.0
 )

go.sum

@@ -2,14 +2,14 @@ package oasis
 
 import (
 	"context"
-	"encoding/hex"
 	"fmt"
 	"os"
 	"sync"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 
+	"github.com/oasisprotocol/oasis-core/go/common/crypto/hash"
 	cmnGrpc "github.com/oasisprotocol/oasis-core/go/common/grpc"
 	"github.com/oasisprotocol/oasis-core/go/common/logging"
 	consensus "github.com/oasisprotocol/oasis-core/go/consensus/api"
@@ -195,7 +195,7 @@ func (c *grpcClient) GetBlock(ctx context.Context, height int64) (*Block, error)
 	}
 
 	parentHeight := blk.Height - 1
-	var parentHash []byte
+	var parentHash hash.Hash
 	if parentHeight <= 0 {
 		parentHeight = 1
 	}
@@ -217,10 +217,10 @@ func (c *grpcClient) GetBlock(ctx context.Context, height int64) (*Block, error)
 
 	return &Block{
 		Height:       blk.Height,
-		Hash:         hex.EncodeToString(blk.Hash),
+		Hash:         blk.Hash.Hex(),
 		Timestamp:    blk.Time.UnixNano() / 1000000, // ms
 		ParentHeight: parentHeight,
-		ParentHash:   hex.EncodeToString(parentHash),
+		ParentHash:   parentHash.Hex(),
 		Epoch:        uint64(epoch),
 	}, nil
 }

oasis/oasis.go

@@ -165,13 +165,13 @@ var (
 // NewDetailedError returns a new Rosetta error Code, Message, and Retriable
 // set from proto and Details[CauseKey] set from cause.
 func NewDetailedError(proto *types.Error, cause error) *types.Error {
-	module, code, msg := errors.Code(cause)
+	module, code := errors.Code(cause)
 	detailedError := *proto
 	detailedError.Details = map[string]interface{}{
 		CauseKey: map[string]interface{}{
 			ModuleKey: module,
 			CodeKey:   code,
-			MsgKey:    msg,
+			MsgKey:    cause.Error(),
 		},
 	}
 	return &detailedError

services/errors.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"context"
-	"encoding/hex"
 	"encoding/json"
 
 	"github.com/coinbase/rosetta-sdk-go/server"
@@ -79,7 +78,7 @@ func (s *networkAPIService) NetworkStatus(
 
 	var genesisBlockIdentifierHash string
 	if len(status.Consensus.GenesisHash) > 0 {
-		genesisBlockIdentifierHash = hex.EncodeToString(status.Consensus.GenesisHash)
+		genesisBlockIdentifierHash = status.Consensus.GenesisHash.Hex()
 	} else {
 		// If the block is pruned, fill in a dummy value so that users can still get
 		// other network status instead of erroring out completely.
@@ -90,14 +89,14 @@ func (s *networkAPIService) NetworkStatus(
 	if len(status.Consensus.LastRetainedHash) > 0 {
 		oldestBlockIdentifier = &types.BlockIdentifier{
 			Index: status.Consensus.LastRetainedHeight,
-			Hash:  hex.EncodeToString(status.Consensus.LastRetainedHash),
+			Hash:  status.Consensus.LastRetainedHash.Hex(),
 		}
 	}
 
 	resp := &types.NetworkStatusResponse{
 		CurrentBlockIdentifier: &types.BlockIdentifier{
 			Index: status.Consensus.LatestHeight,
-			Hash:  hex.EncodeToString(status.Consensus.LatestHash),
+			Hash:  status.Consensus.LatestHash.Hex(),
 		},
 		CurrentBlockTimestamp: status.Consensus.LatestTime.UnixNano() / 1000000, // ms
 		GenesisBlockIdentifier: &types.BlockIdentifier{