@@ -7,20 +7,21 @@ SPDX-License-Identifier: Apache-2.0
77package msgprocessor
88
99import (
10- "fmt"
11-
1210 "github.com/hyperledger/fabric/common/channelconfig"
13- configtxapi "github.com/hyperledger/fabric/common/configtx/api"
1411 cb "github.com/hyperledger/fabric/protos/common"
1512 "github.com/hyperledger/fabric/protos/utils"
1613
1714 "github.com/golang/protobuf/proto"
15+ "github.com/pkg/errors"
1816)
1917
2018// ChainCreator defines the methods necessary to simulate channel creation.
2119type ChainCreator interface {
2220 // NewChannelConfig returns a template config for a new channel.
23- NewChannelConfig (envConfigUpdate * cb.Envelope ) (configtxapi.Manager , error )
21+ NewChannelConfig (envConfigUpdate * cb.Envelope ) (channelconfig.Resources , error )
22+
23+ // CreateBundle parses the config into resources
24+ CreateBundle (channelID string , config * cb.Config ) (channelconfig.Resources , error )
2425
2526 // ChannelsCount returns the count of channels which currently exist.
2627 ChannelsCount () int
@@ -51,16 +52,16 @@ func (scf *SystemChainFilter) Apply(env *cb.Envelope) error {
5152
5253 err := proto .Unmarshal (env .Payload , msgData )
5354 if err != nil {
54- return fmt .Errorf ("bad payload: %s" , err )
55+ return errors .Errorf ("bad payload: %s" , err )
5556 }
5657
5758 if msgData .Header == nil {
58- return fmt .Errorf ("missing payload header" )
59+ return errors .Errorf ("missing payload header" )
5960 }
6061
6162 chdr , err := utils .UnmarshalChannelHeader (msgData .Header .ChannelHeader )
6263 if err != nil {
63- return fmt .Errorf ("bad channel header: %s" , err )
64+ return errors .Errorf ("bad channel header: %s" , err )
6465 }
6566
6667 if chdr .Type != int32 (cb .HeaderType_ORDERER_TRANSACTION ) {
@@ -76,83 +77,85 @@ func (scf *SystemChainFilter) Apply(env *cb.Envelope) error {
7677 if maxChannels > 0 {
7778 // We check for strictly greater than to accommodate the system channel
7879 if uint64 (scf .cc .ChannelsCount ()) > maxChannels {
79- return fmt .Errorf ("channel creation would exceed maximimum number of channels: %d" , maxChannels )
80+ return errors .Errorf ("channel creation would exceed maximimum number of channels: %d" , maxChannels )
8081 }
8182 }
8283
8384 configTx := & cb.Envelope {}
8485 err = proto .Unmarshal (msgData .Data , configTx )
8586 if err != nil {
86- return fmt .Errorf ("payload data error unmarshaling to envelope: %s" , err )
87+ return errors .Errorf ("payload data error unmarshaling to envelope: %s" , err )
8788 }
8889
8990 return scf .authorizeAndInspect (configTx )
9091}
9192
92- func (scf * SystemChainFilter ) authorize (configEnvelope * cb.ConfigEnvelope ) (* cb.ConfigEnvelope , error ) {
93- if configEnvelope .LastUpdate == nil {
94- return nil , fmt .Errorf ("updated config does not include a config update" )
95- }
96-
97- configManager , err := scf .cc .NewChannelConfig (configEnvelope .LastUpdate )
98- if err != nil {
99- return nil , fmt .Errorf ("error constructing new channel config from update: %s" , err )
100- }
101-
102- newChannelConfigEnv , err := configManager .ProposeConfigUpdate (configEnvelope .LastUpdate )
103- if err != nil {
104- return nil , fmt .Errorf ("error proposing channel update to new channel config: %s" , err )
105- }
106-
107- err = configManager .Validate (newChannelConfigEnv )
108- if err != nil {
109- return nil , fmt .Errorf ("error applying channel update to new channel config: %s" , err )
110- }
111-
112- return newChannelConfigEnv , nil
113- }
114-
11593func (scf * SystemChainFilter ) authorizeAndInspect (configTx * cb.Envelope ) error {
11694 payload := & cb.Payload {}
11795 err := proto .Unmarshal (configTx .Payload , payload )
11896 if err != nil {
119- return fmt .Errorf ("error unmarshaling wrapped configtx envelope payload: %s" , err )
97+ return errors .Errorf ("error unmarshaling wrapped configtx envelope payload: %s" , err )
12098 }
12199
122100 if payload .Header == nil {
123- return fmt .Errorf ("wrapped configtx envelope missing header" )
101+ return errors .Errorf ("wrapped configtx envelope missing header" )
124102 }
125103
126104 chdr , err := utils .UnmarshalChannelHeader (payload .Header .ChannelHeader )
127105 if err != nil {
128- return fmt .Errorf ("error unmarshaling wrapped configtx envelope channel header: %s" , err )
106+ return errors .Errorf ("error unmarshaling wrapped configtx envelope channel header: %s" , err )
129107 }
130108
131109 if chdr .Type != int32 (cb .HeaderType_CONFIG ) {
132- return fmt .Errorf ("wrapped configtx envelope not a config transaction" )
110+ return errors .Errorf ("wrapped configtx envelope not a config transaction" )
133111 }
134112
135113 configEnvelope := & cb.ConfigEnvelope {}
136114 err = proto .Unmarshal (payload .Data , configEnvelope )
137115 if err != nil {
138- return fmt .Errorf ("error unmarshalling wrapped configtx config envelope from payload: %s" , err )
116+ return errors .Errorf ("error unmarshalling wrapped configtx config envelope from payload: %s" , err )
117+ }
118+
119+ if configEnvelope .LastUpdate == nil {
120+ return errors .Errorf ("updated config does not include a config update" )
121+ }
122+
123+ res , err := scf .cc .NewChannelConfig (configEnvelope .LastUpdate )
124+ if err != nil {
125+ return errors .Errorf ("error constructing new channel config from update: %s" , err )
139126 }
140127
141128 // Make sure that the config was signed by the appropriate authorized entities
142- proposedEnv , err := scf . authorize ( configEnvelope )
129+ newChannelConfigEnv , err := res . ConfigtxManager (). ProposeConfigUpdate ( configEnvelope . LastUpdate )
143130 if err != nil {
144- return err
131+ return errors . Errorf ( "error proposing channel update to new channel config: %s" , err )
145132 }
146133
147134 // reflect.DeepEqual will not work here, because it considers nil and empty maps as unequal
148- if ! proto .Equal (proposedEnv . Config , configEnvelope . Config ) {
149- return fmt .Errorf ("config proposed by the channel creation request did not match the config received with the channel creation request" )
135+ if ! proto .Equal (newChannelConfigEnv , configEnvelope ) {
136+ return errors .Errorf ("config proposed by the channel creation request did not match the config received with the channel creation request" )
150137 }
151138
152- // Make sure the config can be parsed into a bundle
153- _ , err = channelconfig .NewBundle (chdr .ChannelId , configEnvelope .Config )
139+ bundle , err := scf .cc .CreateBundle (res .ConfigtxManager ().ChainID (), newChannelConfigEnv .Config )
154140 if err != nil {
155- return fmt .Errorf ("failed to create config bundle: %s" , err )
141+ return errors .Wrap (err , "config does not validly parse" )
142+ }
143+
144+ if err = res .ValidateNew (bundle ); err != nil {
145+ return errors .Wrap (err , "new bundle invalid" )
146+ }
147+
148+ oc , ok := bundle .OrdererConfig ()
149+ if ! ok {
150+ return errors .New ("config is missing orderer group" )
151+ }
152+
153+ if err = oc .Capabilities ().Supported (); err != nil {
154+ return errors .Wrap (err , "config update is not compatible" )
155+ }
156+
157+ if err = bundle .ChannelConfig ().Capabilities ().Supported (); err != nil {
158+ return errors .Wrap (err , "config update is not compatible" )
156159 }
157160
158161 return nil
0 commit comments