FAB-14628 _lifecycle give containerinfo for SCC

Presently, there is special case logic for system chaincodes around
gathering container info.  This is extra silly since system chaincodes
never need to be launched.  Still, the lifecycle can provide this info
so as to avoid the special casing.

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

Author: Jason Yellick

core/chaincode/chaincode_support.go

@@ -211,10 +211,6 @@ func processChaincodeExecutionResult(txid, ccName string, resp *pb.ChaincodeMess
 // Invoke will invoke chaincode and return the message containing the response.
 // The chaincode will be launched if it is not already running.
 func (cs *ChaincodeSupport) Invoke(txParams *ccprovider.TransactionParams, cccid *ccprovider.CCContext, input *pb.ChaincodeInput) (*pb.ChaincodeMessage, error) {
-	if cs.BuiltinSCCs.IsSysCC(cccid.Name) {
-		return cs.invokeSystem(txParams, cccid, input)
-	}
-
 	// go to _lifecycle to retrieve information about the chaincode
 	ccci, err := cs.Lifecycle.ChaincodeContainerInfo(txParams.ChannelID, cccid.Name, txParams.TXSimulator)
 	if err != nil {
@@ -244,22 +240,6 @@ func (cs *ChaincodeSupport) Invoke(txParams *ccprovider.TransactionParams, cccid
 	return cs.execute(cctype, txParams, cccid, input, h)
 }
 
-func (cs *ChaincodeSupport) invokeSystem(txParams *ccprovider.TransactionParams, cccid *ccprovider.CCContext, input *pb.ChaincodeInput) (*pb.ChaincodeMessage, error) {
-	// FIXME: remove this once _lifecycle has definitions for all system chaincodes (FAB-14628)
-	ccci := &ccprovider.ChaincodeContainerInfo{
-		Version:   cs.SystemCCVersion,
-		Name:      cccid.Name,
-		PackageID: persistence.PackageID(cccid.Name + ":" + cs.SystemCCVersion),
-	}
-
-	h, err := cs.Launch(txParams.ChannelID, ccci)
-	if err != nil {
-		return nil, err
-	}
-
-	return cs.execute(pb.ChaincodeMessage_TRANSACTION, txParams, cccid, input, h)
-}
-
 func (cs *ChaincodeSupport) CheckInit(txParams *ccprovider.TransactionParams, cccid *ccprovider.CCContext, input *pb.ChaincodeInput) (bool, error) {
 	if txParams.ChannelID == "" {
 		// Channel-less invocations must be for SCCs, so, we ignore them for now

core/chaincode/lifecycle/legacy_lifecycle.go

@@ -11,8 +11,10 @@ import (
 
 	"github.com/hyperledger/fabric/common/util"
 	corechaincode "github.com/hyperledger/fabric/core/chaincode"
+	persistence "github.com/hyperledger/fabric/core/chaincode/persistence/intf"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/ledger"
+	"github.com/hyperledger/fabric/core/scc"
 
 	"github.com/pkg/errors"
 )
@@ -68,9 +70,11 @@ func (ld *LegacyDefinition) RequiresInit() bool {
 }
 
 type ChaincodeEndorsementInfo struct {
-	Resources  *Resources
-	Cache      ChaincodeInfoCache
-	LegacyImpl LegacyLifecycle
+	Resources    *Resources
+	Cache        ChaincodeInfoCache
+	LegacyImpl   LegacyLifecycle
+	BuiltinSCCs  scc.BuiltinSCCs
+	SysCCVersion string
 }
 
 func (cei *ChaincodeEndorsementInfo) CachedChaincodeInfo(channelID, chaincodeName string, qe ledger.SimpleQueryExecutor) (*LocalChaincodeInfo, bool, error) {
@@ -142,8 +146,17 @@ func (cei *ChaincodeEndorsementInfo) ChaincodeDefinition(channelID, chaincodeNam
 	}, nil
 }
 
-// ChaincodeContainerInfo returns the information necessary to launch a chaincode
+// ChaincodeContainerInfo returns the information necessary to launch a chaincode, it also returns
+// static definitions for the fabric defined system chaincodes
 func (cei *ChaincodeEndorsementInfo) ChaincodeContainerInfo(channelID, chaincodeName string, qe ledger.SimpleQueryExecutor) (*ccprovider.ChaincodeContainerInfo, error) {
+	if cei.BuiltinSCCs.IsSysCC(chaincodeName) {
+		return &ccprovider.ChaincodeContainerInfo{
+			PackageID: persistence.PackageID(chaincodeName + ":" + cei.SysCCVersion),
+			Name:      chaincodeName,
+			Version:   cei.SysCCVersion,
+		}, nil
+	}
+
 	chaincodeInfo, ok, err := cei.CachedChaincodeInfo(channelID, chaincodeName, qe)
 	if err != nil {
 		return nil, err

core/chaincode/lifecycle/legacy_lifecycle_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle/mock"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
+	"github.com/hyperledger/fabric/core/scc"
 	lb "github.com/hyperledger/fabric/protos/peer/lifecycle"
 
 	persistence "github.com/hyperledger/fabric/core/chaincode/persistence/intf"
@@ -29,6 +30,7 @@ var _ = Describe("ChaincodeEndorsementInfo", func() {
 		fakeQueryExecutor *mock.SimpleQueryExecutor
 		fakeCache         *mock.ChaincodeInfoCache
 		testInfo          *lifecycle.LocalChaincodeInfo
+		builtinSCCs       scc.BuiltinSCCs
 	)
 
 	BeforeEach(func() {
@@ -44,6 +46,8 @@ var _ = Describe("ChaincodeEndorsementInfo", func() {
 			return fakePublicState.GetState(key)
 		}
 
+		builtinSCCs = map[string]struct{}{}
+
 		err := resources.Serializer.Serialize(lifecycle.NamespacesName,
 			"name",
 			&lifecycle.ChaincodeDefinition{
@@ -77,9 +81,11 @@ var _ = Describe("ChaincodeEndorsementInfo", func() {
 		fakeCache.ChaincodeInfoReturns(testInfo, nil)
 
 		cei = &lifecycle.ChaincodeEndorsementInfo{
-			LegacyImpl: fakeLegacyImpl,
-			Resources:  resources,
-			Cache:      fakeCache,
+			LegacyImpl:   fakeLegacyImpl,
+			Resources:    resources,
+			Cache:        fakeCache,
+			BuiltinSCCs:  builtinSCCs,
+			SysCCVersion: "test-syscc-version",
 		}
 
 	})
@@ -240,6 +246,22 @@ var _ = Describe("ChaincodeEndorsementInfo", func() {
 			}))
 		})
 
+		Context("when the chaincode is a builtin system chaincode", func() {
+			BeforeEach(func() {
+				builtinSCCs["test-syscc-name"] = struct{}{}
+			})
+
+			It("returns a static definition", func() {
+				res, err := cei.ChaincodeContainerInfo("channel-id", "test-syscc-name", fakeQueryExecutor)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(res).To(Equal(&ccprovider.ChaincodeContainerInfo{
+					Name:      "test-syscc-name",
+					Version:   "test-syscc-version",
+					PackageID: "test-syscc-name:test-syscc-version",
+				}))
+			})
+		})
+
 		Context("when the definition does not exist in the new lifecycle", func() {
 			var (
 				legacyContainerInfo *ccprovider.ChaincodeContainerInfo

internal/peer/node/start.go

@@ -435,9 +435,11 @@ func serve(args []string) error {
 		HandlerRegistry: chaincodeHandlerRegistry,
 	}
 	chaincodeEndorsementInfo := &lifecycle.ChaincodeEndorsementInfo{
-		LegacyImpl: lsccInst,
-		Resources:  lifecycleResources,
-		Cache:      lifecycleCache,
+		LegacyImpl:   lsccInst,
+		Resources:    lifecycleResources,
+		Cache:        lifecycleCache,
+		BuiltinSCCs:  builtinSCCs,
+		SysCCVersion: sysCCVersion,
 	}
 
 	lifecycleFunctions := &lifecycle.ExternalFunctions{