FAB-16286 protolator understand ChaincodeHeaderExt

The extension field of the ChannelHeader is treated as opaque, even when
the message type is known.  This properly decodes those bytes as a
chaincode header extension when the type is an endorser tx.

Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Change-Id: I5b93f1146ac5e17692ac31435e5083cec3b2abdf

common/tools/protolator/protoext/commonext/common.go

@@ -42,8 +42,6 @@ func (p *Payload) VariablyOpaqueFields() []string {
 	return []string{"data"}
 }
 
-var PayloadDataMap = map[int32]proto.Message{}
-
 func (p *Payload) VariablyOpaqueFieldProto(name string) (proto.Message, error) {
 	if name != p.VariablyOpaqueFields()[0] {
 		return nil, fmt.Errorf("not a marshaled field: %s", name)
@@ -73,6 +71,29 @@ func (p *Payload) VariablyOpaqueFieldProto(name string) (proto.Message, error) {
 	}
 }
 
+type ChannelHeader struct{ *common.ChannelHeader }
+
+func (ch *ChannelHeader) Underlying() proto.Message {
+	return ch.ChannelHeader
+}
+
+func (ch *ChannelHeader) VariablyOpaqueFields() []string {
+	return []string{"extension"}
+}
+
+func (ch *ChannelHeader) VariablyOpaqueFieldProto(name string) (proto.Message, error) {
+	if name != "extension" {
+		return nil, fmt.Errorf("not an opaque field")
+	}
+
+	switch ch.Type {
+	case int32(common.HeaderType_ENDORSER_TRANSACTION):
+		return &peer.ChaincodeHeaderExtension{}, nil
+	default:
+		return nil, fmt.Errorf("channel header extension only valid for endorser transactions")
+	}
+}
+
 type Header struct{ *common.Header }
 
 func (h *Header) Underlying() proto.Message {

common/tools/protolator/protoext/decorate.go

@@ -38,6 +38,8 @@ func Decorate(msg proto.Message) proto.Message {
 		return &commonext.Envelope{Envelope: m}
 	case *common.Header:
 		return &commonext.Header{Header: m}
+	case *common.ChannelHeader:
+		return &commonext.ChannelHeader{ChannelHeader: m}
 	case *common.SignatureHeader:
 		return &commonext.SignatureHeader{SignatureHeader: m}
 	case *common.Payload: