post-upstream-merge fixes

node/hello/cbor_gen.go

@@ -105,7 +105,6 @@ func (t *HelloMessage) UnmarshalCBOR(r io.Reader) error {
 	if maj != cbg.MajUnsignedInt {
 		return fmt.Errorf("wrong type for uint64 field")
 	}
-	t.HeaviestTipSetHeight = uint64(extra)
 	// t.HeaviestTipSetWeight (types.BigInt) (struct)
 
 	{

node/hello/hello.go

@@ -2,6 +2,7 @@ package hello
 
 import (
 	"context"
+	"github.com/filecoin-project/specs-actors/actors/abi"
 	"time"
 
 	"github.com/filecoin-project/specs-actors/actors/abi/big"
@@ -25,7 +26,7 @@ var log = logging.Logger("hello")
 
 type HelloMessage struct {
 	HeaviestTipSet       []cid.Cid
-	HeaviestTipSetHeight uint64
+	HeaviestTipSetHeight abi.ChainEpoch
 	HeaviestTipSetWeight big.Int
 	GenesisHash          cid.Cid
 }