From 587387ff2790d2c3f3d2e5986788a8476fda28c6 Mon Sep 17 00:00:00 2001 From: Kostas Christidis Date: Mon, 8 May 2017 18:14:29 -0400 Subject: [PATCH] Revert [FAB-3493] Fix LAST_CONFIG on new channels This reverts commit 150d17e8fd9fb67f26fd99c95edf8ad4c3615324. A simpler fix is introduced in a follow-up changeset. Change-Id: I5c63edbf3064b4f637f71becf6ac57a6f5d8d1d3 Signed-off-by: Kostas Christidis --- common/configtx/manager.go | 21 ++---- common/configtx/util.go | 15 ---- common/configtx/util_test.go | 18 ----- common/mocks/configtx/configtx.go | 2 +- orderer/common/broadcast/broadcast.go | 2 +- orderer/configupdate/configupdate.go | 3 +- orderer/configupdate/configupdate_test.go | 3 - orderer/multichain/chainsupport.go | 3 - orderer/multichain/manager.go | 2 +- orderer/multichain/manager_test.go | 13 +--- orderer/multichain/systemchain.go | 2 +- orderer/multichain/systemchain_test.go | 80 ++++++++++----------- orderer/multichain/util_test.go | 22 ++---- protos/common/configtx.pb.go | 88 +++++++++++------------ protos/common/configtx.proto | 1 - 15 files changed, 100 insertions(+), 175 deletions(-) diff --git a/common/configtx/manager.go b/common/configtx/manager.go index 429a0e8ee41..a982f4305fd 100644 --- a/common/configtx/manager.go +++ b/common/configtx/manager.go @@ -175,24 +175,15 @@ func (cm *configManager) proposeConfigUpdate(configtx *cb.Envelope) (*cb.ConfigE func (cm *configManager) prepareApply(configEnv *cb.ConfigEnvelope) (map[string]comparable, *configResult, error) { if configEnv == nil { - return nil, nil, fmt.Errorf("attempted to apply config with nil envelope") + return nil, nil, fmt.Errorf("Attempted to apply config with nil envelope") } if configEnv.Config == nil { - return nil, nil, fmt.Errorf("config cannot be nil") + return nil, nil, fmt.Errorf("Config cannot be nil") } - var expectedSequence uint64 - if configEnv.Config.NewChannel { - expectedSequence = FixNewChannelConfig(configEnv).Config.Sequence - if configEnv.Config.Sequence != expectedSequence { - return nil, nil, fmt.Errorf("should prepare to update to %d (new channel) got %d instead", expectedSequence, configEnv.Config.Sequence) - } - } else { - expectedSequence = cm.current.sequence + 1 - if configEnv.Config.Sequence != expectedSequence { - return nil, nil, fmt.Errorf("expected sequence %d (config at: %d), cannot prepare to update to %d", expectedSequence, cm.current.sequence, configEnv.Config.Sequence) - } + if configEnv.Config.Sequence != cm.current.sequence+1 { + return nil, nil, fmt.Errorf("Config at sequence %d, cannot prepare to update to %d", cm.current.sequence, configEnv.Config.Sequence) } configUpdateEnv, err := envelopeToConfigUpdate(configEnv.LastUpdate) @@ -207,11 +198,11 @@ func (cm *configManager) prepareApply(configEnv *cb.ConfigEnvelope) (map[string] channelGroup, err := configMapToConfig(configMap) if err != nil { - return nil, nil, fmt.Errorf("could not turn configMap back to channelGroup: %s", err) + return nil, nil, fmt.Errorf("Could not turn configMap back to channelGroup: %s", err) } if !reflect.DeepEqual(channelGroup, configEnv.Config.ChannelGroup) { - return nil, nil, fmt.Errorf("configEnvelope LastUpdate did not produce the supplied config result") + return nil, nil, fmt.Errorf("ConfigEnvelope LastUpdate did not produce the supplied config result") } result, err := cm.processConfig(channelGroup) diff --git a/common/configtx/util.go b/common/configtx/util.go index 8208092b409..eca9f4266b9 100644 --- a/common/configtx/util.go +++ b/common/configtx/util.go @@ -97,18 +97,3 @@ func UnmarshalConfigEnvelopeOrPanic(data []byte) *cb.ConfigEnvelope { } return result } - -// FixNewChannelConfig is to be applied on messages of type ConfigEnvelope that -// are used to create a new channel. It returns a ConfigEnvelope whose -// Config.Sequence and Config.NewChannel fields are set so that the config -// manager of the new channel starts at the right sequence number. -func FixNewChannelConfig(configEnv *cb.ConfigEnvelope) *cb.ConfigEnvelope { - properSequence := uint64(0) - if configEnv.Config.Sequence != properSequence { - logger.Debugf("Received a new channel config env whose sequence is incorrectly set to %d, setting to %d instead", - configEnv.Config.Sequence, properSequence) - } - configEnv.Config.Sequence = properSequence - configEnv.Config.NewChannel = true - return configEnv -} diff --git a/common/configtx/util_test.go b/common/configtx/util_test.go index a148b71e0e8..a8a86b5d7a3 100644 --- a/common/configtx/util_test.go +++ b/common/configtx/util_test.go @@ -19,10 +19,6 @@ package configtx import ( "math/rand" "testing" - - cb "github.com/hyperledger/fabric/protos/common" - - "github.com/stretchr/testify/assert" ) // TestValidchainID checks that the constraints on chain IDs are enforced properly @@ -63,20 +59,6 @@ func TestValidChainID(t *testing.T) { }) } -// TestFixNewChannelConfig checks that returned config envelope has its Sequence -// and NewChannel fields set appropriately. -func TestFixNewChannelConfig(t *testing.T) { - expectedSequenceValue := uint64(0) - expectedNewChannelValue := true - - sampleConfigEnvelope := &cb.ConfigEnvelope{Config: &cb.Config{Sequence: uint64(rand.Uint32())}} - returnedConfigEnvelope := FixNewChannelConfig(sampleConfigEnvelope) - - assert.Equal(t, expectedSequenceValue, returnedConfigEnvelope.Config.Sequence, "Sequence should be zero %d", expectedSequenceValue) - assert.NotNil(t, returnedConfigEnvelope.Config.NewChannel, "NewChannel field should be set") - assert.Equal(t, expectedNewChannelValue, returnedConfigEnvelope.Config.NewChannel, "NewChannel field should be set to %t", expectedNewChannelValue) -} - // Helper functions func randomAlphaString(size int) string { diff --git a/common/mocks/configtx/configtx.go b/common/mocks/configtx/configtx.go index 3dbfaaa655b..aa3296142b9 100644 --- a/common/mocks/configtx/configtx.go +++ b/common/mocks/configtx/configtx.go @@ -177,7 +177,7 @@ type Manager struct { // ProposeConfigUpdateError is returned as the error value for ProposeConfigUpdate ProposeConfigUpdateError error - // ProposeConfigUpdateVal returns as the value for ProposeConfigUpdate + // ProposeConfigUpdateVal is returns as the value for ProposeConfigUpdate ProposeConfigUpdateVal *cb.ConfigEnvelope // ConfigEnvelopeVal is returned as the value for ConfigEnvelope() diff --git a/orderer/common/broadcast/broadcast.go b/orderer/common/broadcast/broadcast.go index 004b6613f07..a3b26bade99 100644 --- a/orderer/common/broadcast/broadcast.go +++ b/orderer/common/broadcast/broadcast.go @@ -162,7 +162,7 @@ func (bh *handlerImpl) Handle(srv ab.AtomicBroadcast_BroadcastServer) error { } if logger.IsEnabledFor(logging.DEBUG) { - logger.Debugf("Broadcast has successfully enqueued message of type %s for chain %s", cb.HeaderType_name[chdr.Type], chdr.ChannelId) + logger.Debugf("Broadcast has successfully enqueued message of type %d for chain %s", chdr.Type, chdr.ChannelId) } err = srv.Send(&ab.BroadcastResponse{Status: cb.Status_SUCCESS}) diff --git a/orderer/configupdate/configupdate.go b/orderer/configupdate/configupdate.go index ef76aeae2d6..f3a4e5b8bbc 100644 --- a/orderer/configupdate/configupdate.go +++ b/orderer/configupdate/configupdate.go @@ -23,7 +23,6 @@ package configupdate import ( "fmt" - "github.com/hyperledger/fabric/common/configtx" configtxapi "github.com/hyperledger/fabric/common/configtx/api" "github.com/hyperledger/fabric/common/crypto" cb "github.com/hyperledger/fabric/protos/common" @@ -142,7 +141,7 @@ func (p *Processor) newChannelConfig(channelID string, envConfigUpdate *cb.Envel return nil, err } - newChannelEnvConfig, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, channelID, p.signer, configtx.FixNewChannelConfig(newChannelConfigEnv), msgVersion, epoch) + newChannelEnvConfig, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, channelID, p.signer, newChannelConfigEnv, msgVersion, epoch) if err != nil { return nil, err } diff --git a/orderer/configupdate/configupdate_test.go b/orderer/configupdate/configupdate_test.go index 14d0b4b285d..7f49f307a75 100644 --- a/orderer/configupdate/configupdate_test.go +++ b/orderer/configupdate/configupdate_test.go @@ -58,9 +58,6 @@ func (msm *mockSupportManager) GetChain(chainID string) (Support, bool) { func (msm *mockSupportManager) NewChannelConfig(env *cb.Envelope) (configtxapi.Manager, error) { return &mockconfigtx.Manager{ ProposeConfigUpdateVal: &cb.ConfigEnvelope{ - Config: &cb.Config{ - Sequence: 0, - }, LastUpdate: env, }, }, nil diff --git a/orderer/multichain/chainsupport.go b/orderer/multichain/chainsupport.go index d8e0e93f7d7..51fc3f80fcd 100644 --- a/orderer/multichain/chainsupport.go +++ b/orderer/multichain/chainsupport.go @@ -231,7 +231,6 @@ func (cs *chainSupport) addLastConfigSignature(block *cb.Block) { } lastConfigValue := utils.MarshalOrPanic(&cb.LastConfig{Index: cs.lastConfig}) - logger.Debugf("[channel: %s] About to write block, setting its LAST_CONFIG to %d", cs.ChainID(), cs.lastConfig) lastConfigSignature.Signature = utils.SignOrPanic(cs.signer, util.ConcatenateBytes(lastConfigValue, lastConfigSignature.SignatureHeader, block.Header.Bytes())) @@ -258,8 +257,6 @@ func (cs *chainSupport) WriteBlock(block *cb.Block, committers []filter.Committe if err != nil { logger.Panicf("[channel: %s] Could not append block: %s", cs.ChainID(), err) } - - logger.Debugf("[channel: %s] Wrote block %d", cs.ChainID(), block.GetHeader().Number) return block } diff --git a/orderer/multichain/manager.go b/orderer/multichain/manager.go index c1db0bec7f4..4a8dae15194 100644 --- a/orderer/multichain/manager.go +++ b/orderer/multichain/manager.go @@ -290,7 +290,7 @@ func (ml *multiLedger) NewChannelConfig(envConfigUpdate *cb.Envelope) (configtxa channelGroup.Groups[config.ApplicationGroupKey] = applicationGroup channelGroup.Values[config.ConsortiumKey] = config.TemplateConsortium(consortium.Name).Values[config.ConsortiumKey] - templateConfig, _ := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, configUpdate.ChannelId, ml.signer, &cb.ConfigEnvelope{ + templateConfig, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, configUpdate.ChannelId, ml.signer, &cb.ConfigEnvelope{ Config: &cb.Config{ ChannelGroup: channelGroup, }, diff --git a/orderer/multichain/manager_test.go b/orderer/multichain/manager_test.go index 34a5f473c1e..e7c91273e23 100644 --- a/orderer/multichain/manager_test.go +++ b/orderer/multichain/manager_test.go @@ -21,7 +21,6 @@ import ( "testing" "time" - "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric/common/configtx" genesisconfig "github.com/hyperledger/fabric/common/configtx/tool/localconfig" "github.com/hyperledger/fabric/common/configtx/tool/provisional" @@ -254,7 +253,7 @@ func TestNewChain(t *testing.T) { configEnv, err := cm.ProposeConfigUpdate(envConfigUpdate) assert.NoError(t, err, "Proposing initial update") - ingressTx, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, newChainID, mockCrypto(), configtx.FixNewChannelConfig(configEnv), msgVersion, epoch) + ingressTx, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, newChainID, mockCrypto(), configEnv, msgVersion, epoch) assert.NoError(t, err, "Creating ingresstx") wrapped := wrapConfigTx(ingressTx) @@ -316,16 +315,6 @@ func TestNewChain(t *testing.T) { if status != cb.Status_SUCCESS { t.Fatalf("Could not retrieve block on new chain") } - - // Inspect LAST_CONFIG value - metadataItem := &cb.Metadata{} - err := proto.Unmarshal(block.Metadata.Metadata[cb.BlockMetadataIndex_LAST_CONFIG], metadataItem) - assert.NoError(t, err, "Block should carry LAST_CONFIG metadata item") - lastConfig := &cb.LastConfig{} - err = proto.Unmarshal(metadataItem.Value, lastConfig) - assert.NoError(t, err, "LAST_CONFIG metadata item should carry last config value") - assert.Equal(t, uint64(0), lastConfig.Index, "LAST_CONFIG value should point to genesis block") - for i := 0; i < int(conf.Orderer.BatchSize.MaxMessageCount); i++ { if !reflect.DeepEqual(utils.ExtractEnvelopeOrPanic(block, i), messages[i]) { t.Errorf("Block contents wrong at index %d in new chain", i) diff --git a/orderer/multichain/systemchain.go b/orderer/multichain/systemchain.go index 1e54b1dd2b6..7c7f05fe710 100644 --- a/orderer/multichain/systemchain.go +++ b/orderer/multichain/systemchain.go @@ -129,7 +129,7 @@ func (scf *systemChainFilter) authorize(configEnvelope *cb.ConfigEnvelope) (conf return nil, err } - err = configManager.Apply(configtx.FixNewChannelConfig(newChannelConfigEnv)) + err = configManager.Apply(newChannelConfigEnv) if err != nil { return nil, err } diff --git a/orderer/multichain/systemchain_test.go b/orderer/multichain/systemchain_test.go index df7d082c00b..0c45f2f3422 100644 --- a/orderer/multichain/systemchain_test.go +++ b/orderer/multichain/systemchain_test.go @@ -32,8 +32,6 @@ import ( "github.com/stretchr/testify/assert" ) -var newChannelID = "newChannel" - type mockSupport struct { msc *mockconfig.Orderer } @@ -73,94 +71,96 @@ func (mcc *mockChainCreator) NewChannelConfig(envConfigUpdate *cb.Envelope) (con if mcc.NewChannelConfigErr != nil { return nil, mcc.NewChannelConfigErr } - - pldConfigUpdate := utils.UnmarshalPayloadOrPanic(envConfigUpdate.Payload) - configUpdateEnv := configtx.UnmarshalConfigUpdateEnvelopeOrPanic(pldConfigUpdate.Data) - configUpdate := configtx.UnmarshalConfigUpdateOrPanic(configUpdateEnv.ConfigUpdate) - - configEnvelopeVal := &cb.ConfigEnvelope{ - Config: &cb.Config{ChannelGroup: configUpdate.WriteSet}, - } - - proposeConfigUpdateVal := configEnvelopeVal - proposeConfigUpdateVal.Config.Sequence = 1 - proposeConfigUpdateVal.LastUpdate = envConfigUpdate - - ctxm := &mockconfigtx.Manager{ - ConfigEnvelopeVal: configEnvelopeVal, - ProposeConfigUpdateVal: proposeConfigUpdateVal, - } - - return ctxm, nil + confUpdate := configtx.UnmarshalConfigUpdateOrPanic(configtx.UnmarshalConfigUpdateEnvelopeOrPanic(utils.UnmarshalPayloadOrPanic(envConfigUpdate.Payload).Data).ConfigUpdate) + return &mockconfigtx.Manager{ + ConfigEnvelopeVal: &cb.ConfigEnvelope{ + Config: &cb.Config{Sequence: 1, ChannelGroup: confUpdate.WriteSet}, + LastUpdate: envConfigUpdate, + }, + }, nil } func TestGoodProposal(t *testing.T) { + newChainID := "NewChainID" + mcc := newMockChainCreator() - configUpdateEnv, _ := configtx.NewCompositeTemplate( + configEnv, err := configtx.NewCompositeTemplate( configtx.NewSimpleTemplate( config.DefaultHashingAlgorithm(), config.DefaultBlockDataHashingStructure(), config.TemplateOrdererAddresses([]string{"foo"}), ), configtx.NewChainCreationTemplate("SampleConsortium", []string{}), - ).Envelope(newChannelID) - - ingressTx := makeConfigTxFromConfigUpdateEnvelope(newChannelID, configUpdateEnv, true) - ordererTx := wrapConfigTx(ingressTx) + ).Envelope(newChainID) + if err != nil { + t.Fatalf("Error constructing configtx") + } + ingressTx := makeConfigTxFromConfigUpdateEnvelope(newChainID, configEnv) + wrapped := wrapConfigTx(ingressTx) sysFilter := newSystemChainFilter(mcc.ms, mcc) - action, committer := sysFilter.Apply(ordererTx) + action, committer := sysFilter.Apply(wrapped) + assert.EqualValues(t, action, filter.Accept, "Did not accept valid transaction") assert.True(t, committer.Isolated(), "Channel creation belong in its own block") committer.Commit() assert.Len(t, mcc.newChains, 1, "Proposal should only have created 1 new chain") + assert.Equal(t, ingressTx, mcc.newChains[0], "New chain should have been created with ingressTx") } func TestProposalRejectedByConfig(t *testing.T) { + newChainID := "NewChainID" + mcc := newMockChainCreator() mcc.NewChannelConfigErr = fmt.Errorf("Error creating channel") - configUpdateEnv, _ := configtx.NewCompositeTemplate( + configEnv, err := configtx.NewCompositeTemplate( configtx.NewSimpleTemplate( config.DefaultHashingAlgorithm(), config.DefaultBlockDataHashingStructure(), config.TemplateOrdererAddresses([]string{"foo"}), ), configtx.NewChainCreationTemplate("SampleConsortium", []string{}), - ).Envelope(newChannelID) - - ingressTx := makeConfigTxFromConfigUpdateEnvelope(newChannelID, configUpdateEnv, true) - ordererTx := wrapConfigTx(ingressTx) + ).Envelope(newChainID) + if err != nil { + t.Fatalf("Error constructing configtx") + } + ingressTx := makeConfigTxFromConfigUpdateEnvelope(newChainID, configEnv) + wrapped := wrapConfigTx(ingressTx) sysFilter := newSystemChainFilter(mcc.ms, mcc) - action, _ := sysFilter.Apply(ordererTx) + action, _ := sysFilter.Apply(wrapped) - assert.EqualValues(t, action, filter.Reject, "Did not reject invalid transaction") + assert.EqualValues(t, action, filter.Reject, "Did not accept valid transaction") assert.Len(t, mcc.newChains, 0, "Proposal should not have created a new chain") } func TestNumChainsExceeded(t *testing.T) { + newChainID := "NewChainID" + mcc := newMockChainCreator() mcc.ms.msc.MaxChannelsCountVal = 1 mcc.newChains = make([]*cb.Envelope, 2) - configUpdateEnv, _ := configtx.NewCompositeTemplate( + configEnv, err := configtx.NewCompositeTemplate( configtx.NewSimpleTemplate( config.DefaultHashingAlgorithm(), config.DefaultBlockDataHashingStructure(), config.TemplateOrdererAddresses([]string{"foo"}), ), configtx.NewChainCreationTemplate("SampleConsortium", []string{}), - ).Envelope(newChannelID) - - ingressTx := makeConfigTxFromConfigUpdateEnvelope(newChannelID, configUpdateEnv, true) - ordererTx := wrapConfigTx(ingressTx) + ).Envelope(newChainID) + if err != nil { + t.Fatalf("Error constructing configtx") + } + ingressTx := makeConfigTxFromConfigUpdateEnvelope(newChainID, configEnv) + wrapped := wrapConfigTx(ingressTx) sysFilter := newSystemChainFilter(mcc.ms, mcc) - action, _ := sysFilter.Apply(ordererTx) + action, _ := sysFilter.Apply(wrapped) assert.EqualValues(t, filter.Reject, action, "Transaction had created too many channels") } diff --git a/orderer/multichain/util_test.go b/orderer/multichain/util_test.go index 54ad5e4b42b..981bf336243 100644 --- a/orderer/multichain/util_test.go +++ b/orderer/multichain/util_test.go @@ -93,7 +93,7 @@ func makeConfigTx(chainID string, i int) *cb.Envelope { if err != nil { panic(err) } - return makeConfigTxFromConfigUpdateEnvelope(chainID, configEnv, false) + return makeConfigTxFromConfigUpdateEnvelope(chainID, configEnv) } func wrapConfigTx(env *cb.Envelope) *cb.Envelope { @@ -104,30 +104,18 @@ func wrapConfigTx(env *cb.Envelope) *cb.Envelope { return result } -func makeConfigTxFromConfigUpdateEnvelope(chainID string, configUpdateEnv *cb.ConfigUpdateEnvelope, newChannel bool) *cb.Envelope { +func makeConfigTxFromConfigUpdateEnvelope(chainID string, configUpdateEnv *cb.ConfigUpdateEnvelope) *cb.Envelope { configUpdateTx, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG_UPDATE, chainID, mockCrypto(), configUpdateEnv, msgVersion, epoch) if err != nil { panic(err) } - - configEnv := &cb.ConfigEnvelope{ - Config: &cb.Config{ - Sequence: 1, - ChannelGroup: configtx.UnmarshalConfigUpdateOrPanic(configUpdateEnv.ConfigUpdate).WriteSet, - }, - LastUpdate: configUpdateTx, - } - - if newChannel { - configEnv = configtx.FixNewChannelConfig(configEnv) - } - - configTx, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, chainID, mockCrypto(), configEnv, + configTx, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, chainID, mockCrypto(), &cb.ConfigEnvelope{ + Config: &cb.Config{Sequence: 1, ChannelGroup: configtx.UnmarshalConfigUpdateOrPanic(configUpdateEnv.ConfigUpdate).WriteSet}, + LastUpdate: configUpdateTx}, msgVersion, epoch) if err != nil { panic(err) } - return configTx } diff --git a/protos/common/configtx.pb.go b/protos/common/configtx.pb.go index 24d77e3cc88..4aa9b6d425e 100644 --- a/protos/common/configtx.pb.go +++ b/protos/common/configtx.pb.go @@ -110,7 +110,6 @@ func (*ConfigPolicySchema) Descriptor() ([]byte, []int) { return fileDescriptor1 type Config struct { Sequence uint64 `protobuf:"varint,1,opt,name=sequence" json:"sequence,omitempty"` ChannelGroup *ConfigGroup `protobuf:"bytes,2,opt,name=channel_group,json=channelGroup" json:"channel_group,omitempty"` - NewChannel bool `protobuf:"varint,3,opt,name=new_channel,json=newChannel" json:"new_channel,omitempty"` } func (m *Config) Reset() { *m = Config{} } @@ -268,49 +267,48 @@ func init() { func init() { proto.RegisterFile("common/configtx.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 696 bytes of a gzipped FileDescriptorProto + // 674 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x55, 0xdb, 0x6e, 0xd3, 0x40, - 0x10, 0x55, 0xe2, 0x36, 0x4d, 0x26, 0xe9, 0x85, 0x6d, 0x10, 0x26, 0x02, 0xb5, 0x18, 0x28, 0x2d, - 0x48, 0x49, 0x29, 0x0f, 0xad, 0x90, 0xfa, 0x42, 0x55, 0x01, 0x2f, 0x15, 0x38, 0x5c, 0xa4, 0x0a, - 0x29, 0x72, 0xed, 0x69, 0x62, 0xd5, 0xf1, 0x9a, 0xf5, 0xba, 0x25, 0x4f, 0x7c, 0x02, 0x1f, 0xc8, - 0x1f, 0xf0, 0x15, 0xc8, 0xbb, 0x6b, 0xb3, 0x6e, 0x9c, 0x44, 0x3c, 0x25, 0x33, 0x7b, 0xce, 0x99, - 0xd9, 0xd9, 0x39, 0x32, 0xdc, 0x75, 0xe9, 0x78, 0x4c, 0xc3, 0x9e, 0x4b, 0xc3, 0x4b, 0x7f, 0xc8, - 0x7f, 0x74, 0x23, 0x46, 0x39, 0x25, 0x35, 0x99, 0xee, 0x6c, 0xe6, 0xc7, 0xe9, 0x8f, 0x3c, 0xec, - 0x64, 0x9c, 0x88, 0x06, 0xbe, 0xeb, 0x63, 0x2c, 0xd3, 0xd6, 0x15, 0xac, 0x9d, 0x08, 0x95, 0xd3, - 0xf0, 0x1a, 0x03, 0x1a, 0x21, 0xd9, 0x81, 0x9a, 0xd4, 0x35, 0x2b, 0xdb, 0x95, 0xdd, 0xe6, 0xc1, - 0x5a, 0x57, 0xe9, 0x48, 0x9c, 0xad, 0x4e, 0xc9, 0x4b, 0x68, 0x06, 0x4e, 0xcc, 0x07, 0x49, 0xe4, - 0x39, 0x1c, 0xcd, 0xaa, 0x00, 0x6f, 0x64, 0xe0, 0x4c, 0xce, 0x86, 0x14, 0xf4, 0x59, 0x60, 0xac, - 0xdf, 0x06, 0xdc, 0x91, 0x2a, 0x6f, 0x19, 0x4d, 0xa2, 0xbe, 0x3b, 0xc2, 0xb1, 0x43, 0x8e, 0xa1, - 0x36, 0x4c, 0xc3, 0xd8, 0xac, 0x6c, 0x1b, 0xbb, 0xcd, 0x83, 0xa7, 0xc5, 0x82, 0x1a, 0xb4, 0x2b, - 0xfe, 0xc7, 0xa7, 0x21, 0x67, 0x13, 0x5b, 0x91, 0x52, 0xfa, 0xb5, 0x13, 0x24, 0x18, 0x9b, 0xd5, - 0x45, 0xf4, 0x2f, 0x02, 0xa7, 0xe8, 0x92, 0x44, 0x4e, 0xa0, 0x9e, 0x8d, 0xc4, 0x34, 0x84, 0xc0, - 0xb3, 0xd9, 0x02, 0x1f, 0x14, 0x52, 0x4a, 0xe4, 0xc4, 0xce, 0x27, 0x68, 0x6a, 0xad, 0x91, 0x0d, - 0x30, 0xae, 0x70, 0x22, 0xe6, 0xd7, 0xb0, 0xd3, 0xbf, 0xa4, 0x07, 0xcb, 0xa2, 0x9e, 0x1a, 0xd3, - 0xfd, 0x99, 0x25, 0x6c, 0x89, 0x7b, 0x5d, 0x3d, 0xaa, 0xa4, 0xaa, 0x5a, 0xc7, 0xff, 0xad, 0x2a, - 0xb8, 0xd3, 0xaa, 0x5f, 0x61, 0xb5, 0x70, 0x8d, 0x12, 0xdd, 0xfd, 0xa2, 0x6e, 0xa7, 0xa8, 0x2b, - 0xd8, 0x93, 0x29, 0x61, 0x6b, 0x33, 0x7b, 0x5c, 0xad, 0xb0, 0xd5, 0x06, 0x32, 0xcd, 0xb2, 0x7e, - 0x42, 0x4d, 0x66, 0x49, 0x07, 0xea, 0x31, 0x7e, 0x4f, 0x30, 0x74, 0x51, 0x74, 0xb0, 0x64, 0xe7, - 0x31, 0x39, 0x82, 0x55, 0x77, 0xe4, 0x84, 0x21, 0x06, 0x03, 0xf1, 0xd6, 0xaa, 0x9d, 0xcd, 0x92, - 0xe1, 0xd9, 0x2d, 0x85, 0x14, 0x11, 0xd9, 0x82, 0x66, 0x88, 0x37, 0x03, 0x95, 0x33, 0x8d, 0xed, - 0xca, 0x6e, 0xdd, 0x86, 0x10, 0x6f, 0x4e, 0x64, 0xc6, 0xe2, 0xd0, 0x96, 0x6c, 0xb9, 0x99, 0xf9, - 0xf2, 0x3f, 0x86, 0x55, 0xb9, 0xde, 0xd9, 0x5a, 0xa7, 0x3d, 0xb5, 0xec, 0x96, 0xab, 0x81, 0xc9, - 0x21, 0x40, 0xec, 0x0f, 0x43, 0x87, 0x27, 0x2c, 0xdf, 0xba, 0x7b, 0xc5, 0xa6, 0xfa, 0xd9, 0xb9, - 0xad, 0x41, 0xad, 0x5f, 0x15, 0x68, 0xe9, 0x65, 0xc9, 0x43, 0x80, 0xec, 0x86, 0xbe, 0xa7, 0x5e, - 0xa0, 0xa1, 0x32, 0xef, 0x3d, 0xd2, 0x85, 0x3a, 0x43, 0xc7, 0x1b, 0xc4, 0xc8, 0xe7, 0xdd, 0x7d, - 0x25, 0x05, 0xf5, 0x91, 0x93, 0x7d, 0x68, 0xdc, 0x30, 0x9f, 0xa3, 0x20, 0x18, 0xb3, 0x09, 0x75, - 0x81, 0xea, 0x23, 0xb7, 0xfe, 0x18, 0xd0, 0xd4, 0x4e, 0x88, 0x09, 0x2b, 0xd7, 0xc8, 0x62, 0x9f, - 0x86, 0xea, 0x35, 0xb2, 0x90, 0x1c, 0xe6, 0x2e, 0x95, 0x17, 0xde, 0x2a, 0x11, 0x2e, 0xf5, 0xe7, - 0x61, 0xee, 0x4f, 0x63, 0x36, 0xb1, 0xcc, 0x99, 0xc7, 0x9a, 0x33, 0x97, 0x04, 0xf5, 0x51, 0x19, - 0x75, 0x86, 0x27, 0xd3, 0xd9, 0x8e, 0xa9, 0x37, 0x10, 0xf1, 0xc4, 0x5c, 0x96, 0xb3, 0x1d, 0x53, - 0x4f, 0x2e, 0x62, 0xe7, 0x6c, 0x91, 0x65, 0xf7, 0x8a, 0x26, 0x28, 0x1d, 0xa4, 0x66, 0xab, 0xb3, - 0x45, 0x66, 0x9d, 0xaf, 0x27, 0xb8, 0xba, 0xde, 0xc7, 0xc5, 0x36, 0x7d, 0x5e, 0x54, 0x6c, 0x97, - 0xd9, 0x54, 0x37, 0xe8, 0xb7, 0xec, 0xad, 0x45, 0xb1, 0x39, 0x6f, 0xdd, 0xd6, 0x85, 0x5b, 0x4a, - 0xe2, 0xd6, 0x40, 0x8d, 0x5b, 0x03, 0xb5, 0x68, 0xb6, 0xdb, 0x32, 0x9e, 0x23, 0xbf, 0x03, 0x35, - 0x25, 0x52, 0x2d, 0x7e, 0x61, 0x54, 0xcb, 0xea, 0x74, 0x51, 0xc1, 0x73, 0x58, 0xbf, 0x65, 0x36, - 0xb2, 0x07, 0x1b, 0xb9, 0xdd, 0x06, 0x23, 0x74, 0x3c, 0x64, 0xca, 0xc1, 0xeb, 0x79, 0xfe, 0x9d, - 0x48, 0x93, 0x07, 0xd0, 0xc8, 0x53, 0xea, 0x9e, 0xff, 0x12, 0x6f, 0xfa, 0xf0, 0x84, 0xb2, 0x61, - 0x77, 0x34, 0x89, 0x90, 0x05, 0xe8, 0x0d, 0x91, 0x75, 0x2f, 0x9d, 0x0b, 0xe6, 0xbb, 0xf2, 0xb3, - 0x19, 0xab, 0x8e, 0xcf, 0x5f, 0x0c, 0x7d, 0x3e, 0x4a, 0x2e, 0xd2, 0xb0, 0xa7, 0x81, 0x7b, 0x12, - 0xdc, 0x93, 0x60, 0xf5, 0x21, 0xbe, 0xa8, 0x89, 0xf0, 0xd5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xe9, 0xd8, 0x73, 0x80, 0xbf, 0x07, 0x00, 0x00, + 0x10, 0x55, 0xe2, 0xd6, 0x4d, 0x26, 0xe9, 0x85, 0x6d, 0x10, 0xc6, 0x02, 0x51, 0x0c, 0x94, 0x16, + 0x24, 0xa7, 0x94, 0x87, 0x56, 0x48, 0x7d, 0xa1, 0xaa, 0x80, 0x97, 0x0a, 0x1c, 0x2e, 0x52, 0x85, + 0x88, 0x5c, 0x7b, 0xeb, 0x58, 0x75, 0xbc, 0x66, 0xbd, 0x2e, 0xe4, 0x2b, 0xf8, 0x40, 0xfe, 0x80, + 0xaf, 0x40, 0xde, 0x5d, 0x9b, 0x75, 0xe2, 0x24, 0xe2, 0x29, 0x99, 0x99, 0x73, 0xce, 0xec, 0xce, + 0xce, 0x91, 0xe1, 0xb6, 0x47, 0xc6, 0x63, 0x12, 0xf7, 0x3d, 0x12, 0x5f, 0x85, 0x01, 0xfb, 0x69, + 0x27, 0x94, 0x30, 0x82, 0x74, 0x91, 0x36, 0xb7, 0xcb, 0x72, 0xfe, 0x23, 0x8a, 0x66, 0xc1, 0x49, + 0x48, 0x14, 0x7a, 0x21, 0x4e, 0x45, 0xda, 0xba, 0x86, 0x8d, 0x53, 0xae, 0x72, 0x16, 0xdf, 0xe0, + 0x88, 0x24, 0x18, 0xed, 0x82, 0x2e, 0x74, 0x8d, 0xc6, 0x4e, 0x63, 0xaf, 0x73, 0xb8, 0x61, 0x4b, + 0x1d, 0x81, 0x73, 0x64, 0x15, 0xbd, 0x80, 0x4e, 0xe4, 0xa6, 0x6c, 0x98, 0x25, 0xbe, 0xcb, 0xb0, + 0xd1, 0xe4, 0xe0, 0xad, 0x02, 0x5c, 0xc8, 0x39, 0x90, 0x83, 0x3e, 0x71, 0x8c, 0xf5, 0x5b, 0x83, + 0x5b, 0x42, 0xe5, 0x0d, 0x25, 0x59, 0x32, 0xf0, 0x46, 0x78, 0xec, 0xa2, 0x13, 0xd0, 0x83, 0x3c, + 0x4c, 0x8d, 0xc6, 0x8e, 0xb6, 0xd7, 0x39, 0x7c, 0x52, 0x6d, 0xa8, 0x40, 0x6d, 0xfe, 0x3f, 0x3d, + 0x8b, 0x19, 0x9d, 0x38, 0x92, 0x94, 0xd3, 0x6f, 0xdc, 0x28, 0xc3, 0xa9, 0xd1, 0x5c, 0x46, 0xff, + 0xcc, 0x71, 0x92, 0x2e, 0x48, 0xe8, 0x14, 0x5a, 0xc5, 0x48, 0x0c, 0x8d, 0x0b, 0x3c, 0x9d, 0x2f, + 0xf0, 0x5e, 0x22, 0x85, 0x44, 0x49, 0x34, 0x3f, 0x42, 0x47, 0x39, 0x1a, 0xda, 0x02, 0xed, 0x1a, + 0x4f, 0xf8, 0xfc, 0xda, 0x4e, 0xfe, 0x17, 0xf5, 0x61, 0x95, 0xf7, 0x93, 0x63, 0xba, 0x3b, 0xb7, + 0x85, 0x23, 0x70, 0xaf, 0x9a, 0xc7, 0x8d, 0x5c, 0x55, 0x39, 0xf1, 0x7f, 0xab, 0x72, 0xee, 0xac, + 0xea, 0x17, 0x58, 0xaf, 0x5c, 0xa3, 0x46, 0xf7, 0xa0, 0xaa, 0x6b, 0x56, 0x75, 0x39, 0x7b, 0x32, + 0x23, 0x6c, 0x6d, 0x17, 0x8f, 0xab, 0x34, 0xb6, 0x7a, 0x80, 0x66, 0x59, 0xd6, 0x37, 0xd0, 0x45, + 0x16, 0x99, 0xd0, 0x4a, 0xf1, 0xf7, 0x0c, 0xc7, 0x1e, 0xe6, 0x27, 0x58, 0x71, 0xca, 0x18, 0x1d, + 0xc3, 0xba, 0x37, 0x72, 0xe3, 0x18, 0x47, 0x43, 0xfe, 0xd6, 0xf2, 0x38, 0xdb, 0x35, 0xc3, 0x73, + 0xba, 0x12, 0xc9, 0x23, 0x8b, 0x41, 0x4f, 0x14, 0xc5, 0xe2, 0x95, 0xbb, 0xfd, 0x08, 0xd6, 0xc5, + 0xf6, 0x16, 0x5b, 0x9b, 0xb7, 0xec, 0x3a, 0x5d, 0x4f, 0x01, 0xa3, 0x23, 0x80, 0x34, 0x0c, 0x62, + 0x97, 0x65, 0xb4, 0x5c, 0xaa, 0x3b, 0xd5, 0x9e, 0x83, 0xa2, 0xee, 0x28, 0x50, 0xeb, 0x57, 0x03, + 0xba, 0x6a, 0x5b, 0x74, 0x1f, 0xa0, 0xb8, 0x40, 0xe8, 0xcb, 0x01, 0xb7, 0x65, 0xe6, 0x9d, 0x8f, + 0x6c, 0x68, 0x51, 0xec, 0xfa, 0xc3, 0x14, 0xb3, 0x45, 0x57, 0x5b, 0xcb, 0x41, 0x03, 0xcc, 0xd0, + 0x01, 0xb4, 0x7f, 0xd0, 0x90, 0x61, 0x4e, 0xd0, 0xe6, 0x13, 0x5a, 0x1c, 0x35, 0xc0, 0xcc, 0xfa, + 0xa3, 0x41, 0x47, 0xa9, 0x20, 0x03, 0xd6, 0x6e, 0x30, 0x4d, 0x43, 0x12, 0xcb, 0x61, 0x17, 0x21, + 0x3a, 0x2a, 0x4d, 0x28, 0x2e, 0xfc, 0xa0, 0x46, 0xb8, 0xd6, 0x7e, 0x47, 0xa5, 0xfd, 0xb4, 0xf9, + 0xc4, 0x3a, 0xe3, 0x9d, 0x28, 0xc6, 0x5b, 0xe1, 0xd4, 0x87, 0x75, 0xd4, 0x39, 0x96, 0xcb, 0x67, + 0x3b, 0x26, 0xfe, 0x90, 0xc7, 0x13, 0x63, 0x55, 0xcc, 0x76, 0x4c, 0x7c, 0xb1, 0x67, 0xe6, 0xf9, + 0x32, 0x47, 0xee, 0x57, 0x77, 0xbc, 0x76, 0x90, 0x8a, 0x6b, 0xce, 0x97, 0x79, 0x71, 0xb1, 0x1e, + 0xe7, 0xaa, 0x7a, 0x1f, 0x96, 0xbb, 0xf0, 0x59, 0x55, 0xb1, 0x57, 0xe7, 0x42, 0xd5, 0x7f, 0x5f, + 0x8b, 0xb7, 0xe6, 0xcd, 0x16, 0xbc, 0x75, 0x4f, 0x15, 0xee, 0x4a, 0x89, 0xa9, 0x81, 0x6a, 0x53, + 0x03, 0xb5, 0x48, 0xb1, 0xdb, 0x22, 0x5e, 0x20, 0xbf, 0x0b, 0xba, 0x14, 0x69, 0x56, 0x3f, 0x20, + 0xf2, 0xc8, 0xb2, 0xba, 0xac, 0xe1, 0x05, 0x6c, 0x4e, 0x99, 0x0d, 0xed, 0xc3, 0x56, 0x69, 0xb7, + 0xe1, 0x08, 0xbb, 0x3e, 0xa6, 0xd2, 0xc1, 0x9b, 0x65, 0xfe, 0x2d, 0x4f, 0xa3, 0x7b, 0xd0, 0x2e, + 0x53, 0xf2, 0x9e, 0xff, 0x12, 0xaf, 0x07, 0xf0, 0x98, 0xd0, 0xc0, 0x1e, 0x4d, 0x12, 0x4c, 0x23, + 0xec, 0x07, 0x98, 0xda, 0x57, 0xee, 0x25, 0x0d, 0x3d, 0xf1, 0x55, 0x4c, 0xe5, 0x89, 0x2f, 0x9e, + 0x07, 0x21, 0x1b, 0x65, 0x97, 0x79, 0xd8, 0x57, 0xc0, 0x7d, 0x01, 0xee, 0x0b, 0xb0, 0xfc, 0xce, + 0x5e, 0xea, 0x3c, 0x7c, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0x25, 0x75, 0xfb, 0xf8, 0x9e, 0x07, + 0x00, 0x00, } diff --git a/protos/common/configtx.proto b/protos/common/configtx.proto index 8b8dc585fd8..c810b82fe70 100644 --- a/protos/common/configtx.proto +++ b/protos/common/configtx.proto @@ -65,7 +65,6 @@ message ConfigPolicySchema {} message Config { uint64 sequence = 1; ConfigGroup channel_group = 2; - bool new_channel = 3; } message ConfigUpdateEnvelope {