Merge pull request #1273 from hyperledger/backport-1175

shorsher · web-flow · commit f3610b632820 · 2023-04-17T10:32:38.000-04:00
Include signing key in batch processor identifier
diff --git a/internal/batch/batch_manager.go b/internal/batch/batch_manager.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2023 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -135,7 +135,7 @@ type dispatcher struct {
 }
 
 func (bm *batchManager) getProcessorKey(identity *core.SignerRef, groupID *fftypes.Bytes32) string {
-	return fmt.Sprintf("%s|%v", identity.Author, groupID)
+	return fmt.Sprintf("%s|%s|%v", identity.Author, identity.Key, groupID)
 }
 
 func (bm *batchManager) getDispatcherKey(txType core.TransactionType, msgType core.MessageType) string {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright © 2022 Kaleido, Inc.`
	`1`	`+// Copyright © 2023 Kaleido, Inc.`
`2`	`2`	`//`
`3`	`3`	`// SPDX-License-Identifier: Apache-2.0`
`4`	`4`	`//`
`@@ -135,7 +135,7 @@ type dispatcher struct {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`func (bm batchManager) getProcessorKey(identity core.SignerRef, groupID *fftypes.Bytes32) string {`
`138`		`- return fmt.Sprintf("%s\|%v", identity.Author, groupID)`
	`138`	`+ return fmt.Sprintf("%s\|%s\|%v", identity.Author, identity.Key, groupID)`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`func (bm *batchManager) getDispatcherKey(txType core.TransactionType, msgType core.MessageType) string {`