go/consensus/tendermint: Bump Tendermint Core to v0.34-rc4-oasis2

.changelog/3229.breaking.md

@@ -0,0 +1,6 @@
+go/consensus: Simplify light client API
+
+Methods `GetSignedHeader` and `GetValidatorSet` have been replaced with
+`GetLightBlock` which provides both the signed header and the validator set.
+This makes sense as the two are commonly used together so this saves a
+round-trip.

go/consensus/api/base.go

@@ -185,12 +185,7 @@ func (b *BaseBackend) GetSignerNonce(ctx context.Context, req *GetSignerNonceReq
 }
 
 // Implements Backend.
-func (b *BaseBackend) GetSignedHeader(ctx context.Context, height int64) (*SignedHeader, error) {
-	panic(ErrUnsupported)
-}
-
-// Implements Backend.
-func (b *BaseBackend) GetValidatorSet(ctx context.Context, height int64) (*ValidatorSet, error) {
+func (b *BaseBackend) GetLightBlock(ctx context.Context, height int64) (*LightBlock, error) {
 	panic(ErrUnsupported)
 }
 

go/consensus/api/grpc.go

@@ -47,10 +47,8 @@ var (
 	// methodWatchBlocks is the WatchBlocks method.
 	methodWatchBlocks = serviceName.NewMethod("WatchBlocks", nil)
 
-	// methodGetSignedHeader is the GetSignedHeader method.
-	methodGetSignedHeader = lightServiceName.NewMethod("GetSignedHeader", int64(0))
-	// methodGetValidatorSet is the GetValidatorSet method.
-	methodGetValidatorSet = lightServiceName.NewMethod("GetValidatorSet", int64(0))
+	// methodGetLightBlock is the GetLightBlock method.
+	methodGetLightBlock = lightServiceName.NewMethod("GetLightBlock", int64(0))
 	// methodGetParameters is the GetParameters method.
 	methodGetParameters = lightServiceName.NewMethod("GetParameters", int64(0))
 	// methodStateSyncGet is the StateSyncGet method.
@@ -133,12 +131,8 @@ var (
 		HandlerType: (*LightClientBackend)(nil),
 		Methods: []grpc.MethodDesc{
 			{
-				MethodName: methodGetSignedHeader.ShortName(),
-				Handler:    handlerGetSignedHeader,
-			},
-			{
-				MethodName: methodGetValidatorSet.ShortName(),
-				Handler:    handlerGetValidatorSet,
+				MethodName: methodGetLightBlock.ShortName(),
+				Handler:    handlerGetLightBlock,
 			},
 			{
 				MethodName: methodGetParameters.ShortName(),
@@ -460,7 +454,7 @@ func handlerWatchBlocks(srv interface{}, stream grpc.ServerStream) error {
 	}
 }
 
-func handlerGetSignedHeader( // nolint: golint
+func handlerGetLightBlock( // nolint: golint
 	srv interface{},
 	ctx context.Context,
 	dec func(interface{}) error,
@@ -471,37 +465,14 @@ func handlerGetSignedHeader( // nolint: golint
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(LightClientBackend).GetSignedHeader(ctx, height)
+		return srv.(LightClientBackend).GetLightBlock(ctx, height)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: methodGetSignedHeader.FullName(),
+		FullMethod: methodGetLightBlock.FullName(),
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(LightClientBackend).GetSignedHeader(ctx, req.(int64))
-	}
-	return interceptor(ctx, height, info, handler)
-}
-
-func handlerGetValidatorSet( // nolint: golint
-	srv interface{},
-	ctx context.Context,
-	dec func(interface{}) error,
-	interceptor grpc.UnaryServerInterceptor,
-) (interface{}, error) {
-	var height int64
-	if err := dec(&height); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(LightClientBackend).GetValidatorSet(ctx, height)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: methodGetValidatorSet.FullName(),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(LightClientBackend).GetValidatorSet(ctx, req.(int64))
+		return srv.(LightClientBackend).GetLightBlock(ctx, req.(int64))
 	}
 	return interceptor(ctx, height, info, handler)
 }
@@ -660,18 +631,9 @@ type consensusLightClient struct {
 }
 
 // Implements LightClientBackend.
-func (c *consensusLightClient) GetSignedHeader(ctx context.Context, height int64) (*SignedHeader, error) {
-	var rsp SignedHeader
-	if err := c.conn.Invoke(ctx, methodGetSignedHeader.FullName(), height, &rsp); err != nil {
-		return nil, err
-	}
-	return &rsp, nil
-}
-
-// Implements LightClientBackend.
-func (c *consensusLightClient) GetValidatorSet(ctx context.Context, height int64) (*ValidatorSet, error) {
-	var rsp ValidatorSet
-	if err := c.conn.Invoke(ctx, methodGetValidatorSet.FullName(), height, &rsp); err != nil {
+func (c *consensusLightClient) GetLightBlock(ctx context.Context, height int64) (*LightBlock, error) {
+	var rsp LightBlock
+	if err := c.conn.Invoke(ctx, methodGetLightBlock.FullName(), height, &rsp); err != nil {
 		return nil, err
 	}
 	return &rsp, nil

go/consensus/api/light.go

@@ -9,11 +9,9 @@ import (
 
 // LightClientBackend is the limited consensus interface used by light clients.
 type LightClientBackend interface {
-	// GetSignedHeader returns the signed header for a specific height.
-	GetSignedHeader(ctx context.Context, height int64) (*SignedHeader, error)
-
-	// GetValidatorSet returns the validator set for a specific height.
-	GetValidatorSet(ctx context.Context, height int64) (*ValidatorSet, error)
+	// GetLightBlock returns a light version of the consensus layer block that can be used for light
+	// client verification.
+	GetLightBlock(ctx context.Context, height int64) (*LightBlock, error)
 
 	// GetParameters returns the consensus parameters for a specific height.
 	GetParameters(ctx context.Context, height int64) (*Parameters, error)
@@ -30,19 +28,11 @@ type LightClientBackend interface {
 	SubmitEvidence(ctx context.Context, evidence *Evidence) error
 }
 
-// SignedHeader is a signed consensus block header.
-type SignedHeader struct {
-	// Height contains the block height this header is for.
-	Height int64 `json:"height"`
-	// Meta contains the consensus backend specific signed header.
-	Meta []byte `json:"meta"`
-}
-
-// ValidatorSet contains the validator set information.
-type ValidatorSet struct {
-	// Height contains the block height this validator set is for.
+// LightBlock is a light consensus block suitable for syncing light clients.
+type LightBlock struct {
+	// Height contains the block height.
 	Height int64 `json:"height"`
-	// Meta contains the consensus backend specific validator set.
+	// Meta contains the consensus backend specific light block.
 	Meta []byte `json:"meta"`
 }
 

go/consensus/tendermint/api/genesis.go

@@ -95,7 +95,6 @@ func genesisToTendermint(d *genesis.Document) (*tmtypes.GenesisDoc, error) {
 	evCfg.MaxNum = d.Consensus.Parameters.MaxEvidenceNum
 	evCfg.MaxAgeNumBlocks = debondingInterval * epochInterval
 	evCfg.MaxAgeDuration = time.Duration(evCfg.MaxAgeNumBlocks) * (d.Consensus.Parameters.TimeoutCommit + 1*time.Second)
-	evCfg.ProofTrialPeriod = evCfg.MaxAgeNumBlocks / 2
 
 	doc := tmtypes.GenesisDoc{
 		ChainID:       d.ChainContext()[:tmtypes.MaxChainIDLen],

go/consensus/tendermint/apps/staking/staking.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/tendermint/tendermint/abci/types"
-	tmtypes "github.com/tendermint/tendermint/types"
 
 	"github.com/oasisprotocol/oasis-core/go/common/cbor"
 	"github.com/oasisprotocol/oasis-core/go/common/quantity"
@@ -85,7 +84,7 @@ func (app *stakingApplication) BeginBlock(ctx *api.Context, request types.Reques
 	// the actual evidence has already been verified by Tendermint to be valid.
 	for _, evidence := range request.ByzantineValidators {
 		switch evidence.Type {
-		case tmtypes.ABCIEvidenceTypeDuplicateVote:
+		case types.EvidenceType_DUPLICATE_VOTE:
 			if err := onEvidenceDoubleSign(ctx, evidence.Validator.Address, evidence.Height, evidence.Time, evidence.Validator.Power); err != nil {
 				return err
 			}

go/consensus/tendermint/full/light.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	tmstate "github.com/tendermint/tendermint/state"
+	tmtypes "github.com/tendermint/tendermint/types"
 
 	"github.com/oasisprotocol/oasis-core/go/common/cbor"
 	consensusAPI "github.com/oasisprotocol/oasis-core/go/consensus/api"
@@ -13,7 +14,7 @@ import (
 )
 
 // Implements LightClientBackend.
-func (t *fullService) GetSignedHeader(ctx context.Context, height int64) (*consensusAPI.SignedHeader, error) {
+func (t *fullService) GetLightBlock(ctx context.Context, height int64) (*consensusAPI.LightBlock, error) {
 	if err := t.ensureStarted(ctx); err != nil {
 		return nil, err
 	}
@@ -27,40 +28,27 @@ func (t *fullService) GetSignedHeader(ctx context.Context, height int64) (*conse
 		return nil, fmt.Errorf("tendermint: header is nil")
 	}
 
-	meta, err := commit.SignedHeader.ToProto().Marshal()
-	if err != nil {
-		return nil, fmt.Errorf("tendermint: failed to marshal signed header: %w", err)
-	}
-
-	return &consensusAPI.SignedHeader{
-		Height: commit.Header.Height,
-		Meta:   meta,
-	}, nil
-}
-
-// Implements LightClientBackend.
-func (t *fullService) GetValidatorSet(ctx context.Context, height int64) (*consensusAPI.ValidatorSet, error) {
-	if err := t.ensureStarted(ctx); err != nil {
-		return nil, err
-	}
-
 	// Don't use the client as that imposes stupid pagination. Access the state database directly.
 	vals, err := tmstate.LoadValidators(t.stateDb, height)
 	if err != nil {
 		return nil, consensusAPI.ErrVersionNotFound
 	}
 
-	protoVals, err := vals.ToProto()
+	lb := tmtypes.LightBlock{
+		SignedHeader: &commit.SignedHeader,
+		ValidatorSet: vals,
+	}
+	protoLb, err := lb.ToProto()
 	if err != nil {
-		return nil, fmt.Errorf("tendermint: failed to convert validators: %w", err)
+		return nil, fmt.Errorf("tendermint: failed to convert light block: %w", err)
 	}
-	meta, err := protoVals.Marshal()
+	meta, err := protoLb.Marshal()
 	if err != nil {
-		return nil, fmt.Errorf("tendermint: failed to marshal validators: %w", err)
+		return nil, fmt.Errorf("tendermint: failed to marshal light block: %w", err)
 	}
 
-	return &consensusAPI.ValidatorSet{
-		Height: height,
+	return &consensusAPI.LightBlock{
+		Height: commit.Header.Height,
 		Meta:   meta,
 	}, nil
 }

go/consensus/tendermint/full/statesync.go

@@ -30,23 +30,23 @@ func (sp *stateProvider) AppHash(height uint64) ([]byte, error) {
 	defer sp.Unlock()
 
 	// We have to fetch the next height, which contains the app hash for the previous height.
-	header, err := sp.lc.GetVerifiedSignedHeader(sp.ctx, int64(height+1))
+	lb, err := sp.lc.GetVerifiedLightBlock(sp.ctx, int64(height+1))
 	if err != nil {
 		return nil, err
 	}
-	return header.AppHash, nil
+	return lb.AppHash, nil
 }
 
 // Implements tmstatesync.StateProvider.
 func (sp *stateProvider) Commit(height uint64) (*tmtypes.Commit, error) {
 	sp.Lock()
 	defer sp.Unlock()
 
-	header, err := sp.lc.GetVerifiedSignedHeader(sp.ctx, int64(height))
+	lb, err := sp.lc.GetVerifiedLightBlock(sp.ctx, int64(height))
 	if err != nil {
 		return nil, err
 	}
-	return header.Commit, nil
+	return lb.Commit, nil
 }
 
 // Implements tmstatesync.StateProvider.
@@ -62,45 +62,41 @@ func (sp *stateProvider) State(height uint64) (tmstate.State, error) {
 	// XXX: This will fail in case an upgrade happened in-between.
 	state.Version.Consensus.App = version.ConsensusProtocol.ToU64()
 
-	// We need to verify up until h+2, to get the validator set. This also prefetches the headers
-	// for h and h+1 in the typical case where the trusted header is after the snapshot height.
-	_, err := sp.lc.GetVerifiedSignedHeader(sp.ctx, int64(height+2))
+	// The snapshot height maps onto the state heights as follows:
+	//
+	// height: last block, i.e. the snapshotted height
+	// height+1: current block, i.e. the first block we'll process after the snapshot
+	// height+2: next block, i.e. the second block after the snapshot
+	//
+	// We need to fetch the NextValidators from height+2 because if the application changed
+	// the validator set at the snapshot height then this only takes effect at height+2.
+	lastLightBlock, err := sp.lc.GetVerifiedLightBlock(sp.ctx, int64(height))
 	if err != nil {
 		return tmstate.State{}, err
 	}
-	header, err := sp.lc.GetVerifiedSignedHeader(sp.ctx, int64(height))
+	curLightBlock, err := sp.lc.GetVerifiedLightBlock(sp.ctx, int64(height)+1)
 	if err != nil {
 		return tmstate.State{}, err
 	}
-	nextHeader, err := sp.lc.GetVerifiedSignedHeader(sp.ctx, int64(height+1))
+	nextLightBlock, err := sp.lc.GetVerifiedLightBlock(sp.ctx, int64(height)+2)
 	if err != nil {
 		return tmstate.State{}, err
 	}
-	state.LastBlockHeight = header.Height
-	state.LastBlockTime = header.Time
-	state.LastBlockID = header.Commit.BlockID
-	state.AppHash = nextHeader.AppHash
-	state.LastResultsHash = nextHeader.LastResultsHash
-
-	state.LastValidators, _, err = sp.lc.GetVerifiedValidatorSet(sp.ctx, int64(height))
-	if err != nil {
-		return tmstate.State{}, err
-	}
-	state.Validators, _, err = sp.lc.GetVerifiedValidatorSet(sp.ctx, int64(height+1))
-	if err != nil {
-		return tmstate.State{}, err
-	}
-	state.NextValidators, _, err = sp.lc.GetVerifiedValidatorSet(sp.ctx, int64(height+2))
-	if err != nil {
-		return tmstate.State{}, err
-	}
-	state.LastHeightValidatorsChanged = int64(height)
+	state.LastBlockHeight = lastLightBlock.Height
+	state.LastBlockTime = lastLightBlock.Time
+	state.LastBlockID = lastLightBlock.Commit.BlockID
+	state.AppHash = curLightBlock.AppHash
+	state.LastResultsHash = curLightBlock.LastResultsHash
+	state.LastValidators = lastLightBlock.ValidatorSet
+	state.Validators = curLightBlock.ValidatorSet
+	state.NextValidators = nextLightBlock.ValidatorSet
+	state.LastHeightValidatorsChanged = nextLightBlock.Height
 
 	// Fetch consensus parameters with light client verification.
-	params, err := sp.lc.GetVerifiedParameters(sp.ctx, nextHeader.Height)
+	params, err := sp.lc.GetVerifiedParameters(sp.ctx, nextLightBlock.Height)
 	if err != nil {
 		return tmstate.State{}, fmt.Errorf("failed to fetch consensus parameters for height %d: %w",
-			nextHeader.Height,
+			nextLightBlock.Height,
 			err,
 		)
 	}