[FAB-6229] validator support for cfg tree cc lifecycle

This change set introduces support at the committer side
for the config-tree-based chaincode lifecycle management.

Change-Id: Id75460a58347f29dd407361e8a77947993c6237d
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>

Author: ale-linux

core/chaincode/ccproviderimpl.go

@@ -22,7 +22,6 @@ import (
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/ledger"
 	pb "github.com/hyperledger/fabric/protos/peer"
-	"github.com/pkg/errors"
 )
 
 // ccProviderFactory implements the ccprovider.ChaincodeProviderFactory
@@ -70,29 +69,6 @@ func (c *ccProviderImpl) GetCCContext(cid, name, version, txid string, syscc boo
 	return &ccProviderContextImpl{ctx: ctx}
 }
 
-// GetCCValidationInfoFromLSCC returns the VSCC and the policy listed in LSCC for the supplied chaincode
-func (c *ccProviderImpl) GetCCValidationInfoFromLSCC(ctxt context.Context, txid string, signedProp *pb.SignedProposal, prop *pb.Proposal, chainID string, chaincodeID string) (string, []byte, error) {
-	// LSCC does not have any notion about its own
-	// endorsing policy - we should never call this
-	// function with lscc as the chaincodeID
-	if chaincodeID == "lscc" {
-		panic("GetCCValidationInfoFromLSCC invoke for LSCC")
-	}
-
-	data, err := GetChaincodeDefinition(ctxt, txid, signedProp, prop, chainID, chaincodeID)
-	if err != nil {
-		return "", nil, err
-	}
-
-	valcc, valarg := data.Validation()
-
-	if data == nil || valcc == "" || valarg == nil {
-		return "", nil, errors.New("incorrect validation info in LSCC")
-	}
-
-	return valcc, valarg, nil
-}
-
 // ExecuteChaincode executes the chaincode specified in the context with the specified arguments
 func (c *ccProviderImpl) ExecuteChaincode(ctxt context.Context, cccid interface{}, args [][]byte) (*pb.Response, *pb.ChaincodeEvent, error) {
 	return ExecuteChaincode(ctxt, cccid.(*ccProviderContextImpl).ctx, args)

core/chaincode/chaincode_support.go

@@ -680,13 +680,13 @@ func (chaincodeSupport *ChaincodeSupport) Launch(context context.Context, cccid
 		var depPayload []byte
 
 		//hopefully we are restarting from existing image and the deployed transaction exists
-		//this will also validate the ID from the LSCC
+		//(this will also validate the ID from the LSCC if we're not using the config-tree approach)
 		depPayload, err = GetCDS(context, cccid.TxID, cccid.SignedProposal, cccid.Proposal, cccid.ChainID, cID.Name)
 		if err != nil {
-			return cID, cMsg, errors.WithMessage(err, fmt.Sprintf("could not get deployment transaction from LSCC for %s", canName))
+			return cID, cMsg, errors.WithMessage(err, fmt.Sprintf("could not get ChaincodeDeploymentSpec for %s", canName))
 		}
 		if depPayload == nil {
-			return cID, cMsg, errors.WithMessage(err, fmt.Sprintf("failed to get deployment payload %s", canName))
+			return cID, cMsg, errors.WithMessage(err, fmt.Sprintf("nil ChaincodeDeploymentSpec for %s", canName))
 		}
 
 		cds = &pb.ChaincodeDeploymentSpec{}

core/chaincode/chaincode_support_test.go

@@ -636,10 +636,6 @@ func cc2cc(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.Mock
 	mockAclProvider.On("CheckACL", aclmgmt.LSCC_GETCCDATA, chainID, sprop).Return(nil)
 	mockAclProvider.On("CheckACL", aclmgmt.PROPOSE, chainID, sprop).Return(nil)
 
-	if _, _, err := ccprovider.GetChaincodeProvider().GetCCValidationInfoFromLSCC(ctxt, "getccdata", sprop, prop, chainID, calledCC); err != nil {
-		t.Fatalf("Could not get chaincode data from lscc for %s: %s", calledCC, err)
-	}
-
 	sysCCVers := util.GetSysCCVersion()
 	//call a callable system CC, a regular cc, a regular but different cc on a different chain, a regular but same cc on a different chain,  and an uncallable system cc and expect an error inthe last one
 	respSet := &mockpeer.MockResponseSet{errorFunc, nil, []*mockpeer.MockResponse{

core/chaincode/handler.go

@@ -1309,18 +1309,15 @@ func (handler *Handler) enterBusyState(e *fsm.Event, state string) {
 			ctxt = context.WithValue(ctxt, TXSimulatorKey, txsim)
 			ctxt = context.WithValue(ctxt, HistoryQueryExecutorKey, historyQueryExecutor)
 
-			chaincodeLogger.Debugf("[%s] calling lscc to get chaincode data for %s on channel %s",
+			chaincodeLogger.Debugf("[%s] getting chaincode data for %s on channel %s",
 				shorttxid(msg.Txid), calledCcIns.ChaincodeName, calledCcIns.ChainID)
 
-			//Call LSCC to get the called chaincode artifacts
-
 			//is the chaincode a system chaincode ?
 			isscc := sysccprovider.GetSystemChaincodeProvider().IsSysCC(calledCcIns.ChaincodeName)
 
 			var version string
 			if !isscc {
-				//if its a user chaincode, get the details from LSCC
-				//Call LSCC to get the called chaincode artifacts
+				//if its a user chaincode, get the details
 				cd, err := GetChaincodeDefinition(ctxt, msg.Txid, txContext.signedProp, txContext.proposal, calledCcIns.ChainID, calledCcIns.ChaincodeName)
 				if err != nil {
 					errHandler([]byte(err.Error()), "[%s]Failed to get chaincode data (%s) for invoked chaincode. Sending %s", shorttxid(msg.Txid), err, pb.ChaincodeMessage_ERROR)

core/committer/txvalidator/validator.go

@@ -30,6 +30,7 @@ import (
 
 	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/common/channelconfig"
+	"github.com/hyperledger/fabric/common/resourcesconfig"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
 )
 
@@ -56,6 +57,10 @@ type Support interface {
 
 	// Capabilities defines the capabilities for the application portion of this channel
 	Capabilities() channelconfig.ApplicationCapabilities
+
+	// ChaincodeByName returns the definition (and whether they exist)
+	// for a chaincode in a specific channel
+	ChaincodeByName(chainname, ccname string) (resourcesconfig.ChaincodeDefinition, bool)
 }
 
 //Validator interface which defines API to validate block transactions
@@ -612,17 +617,16 @@ func (v *vsccValidatorImpl) GetInfoForValidate(txid, chID, ccID string) (*sysccp
 		// system CC, we need to ask the CC to give us the name
 		// of VSCC and of the policy that should be used
 
-		// obtain name of the VSCC and the policy from LSCC
-		cd, err := v.getCDataForCC(ccID)
+		// obtain name of the VSCC and the policy
+		cd, err := v.getCDataForCC(chID, ccID)
 		if err != nil {
 			msg := fmt.Sprintf("Unable to get chaincode data from ledger for txid %s, due to %s", txid, err)
 			logger.Errorf(msg)
 			return nil, nil, nil, err
 		}
-		cc.ChaincodeName = cd.Name
-		cc.ChaincodeVersion = cd.Version
-		vscc.ChaincodeName = cd.Vscc
-		policy = cd.Policy
+		cc.ChaincodeName = cd.CCName()
+		cc.ChaincodeVersion = cd.CCVersion()
+		vscc.ChaincodeName, policy = cd.Validation()
 	} else {
 		// when we are validating a system CC, we use the default
 		// VSCC and a default policy that requires one signature
@@ -715,6 +719,15 @@ func (v *vsccValidatorImpl) VSCCValidateTx(payload *common.Payload, envBytes []b
 		return err, peer.TxValidationCode_INVALID_OTHER_REASON
 	}
 
+	// if we are using the config-tree-based cc lifecycle approach
+	// there's no legitimate reason why a transaction would write to
+	// lscc so we're going to block it
+	if v.support.Capabilities().LifecycleViaConfig() && writesToLSCC {
+		err := fmt.Errorf("lifecycle via config forbids writes to the lscc namespace")
+		logger.Errorf("%s", err)
+		return err, peer.TxValidationCode_ILLEGAL_WRITESET
+	}
+
 	// we've gathered all the info required to proceed to validation;
 	// validation will behave differently depending on the type of
 	// chaincode (system vs. application)
@@ -843,7 +856,16 @@ func (v *vsccValidatorImpl) VSCCValidateTxForCC(envBytes []byte, txid, chid, vsc
 	return nil
 }
 
-func (v *vsccValidatorImpl) getCDataForCC(ccid string) (*ccprovider.ChaincodeData, error) {
+func (v *vsccValidatorImpl) getCDataForCC(chid, ccid string) (resourcesconfig.ChaincodeDefinition, error) {
+	if v.support.Capabilities().LifecycleViaConfig() {
+		cd, exists := v.support.ChaincodeByName(chid, ccid)
+		if !exists {
+			return nil, &VSCCInfoLookupFailureError{fmt.Sprintf("Could not retrieve state for chaincode %s on channel %s", ccid, chid)}
+		}
+
+		return cd, nil
+	}
+
 	l := v.support.Ledger()
 	if l == nil {
 		return nil, fmt.Errorf("nil ledger instance")

core/common/ccprovider/ccprovider.go

@@ -461,8 +461,6 @@ type ChaincodeProvider interface {
 	GetContext(ledger ledger.PeerLedger, txid string) (context.Context, ledger.TxSimulator, error)
 	// GetCCContext returns an opaque chaincode context
 	GetCCContext(cid, name, version, txid string, syscc bool, signedProp *pb.SignedProposal, prop *pb.Proposal) interface{}
-	// GetCCValidationInfoFromLSCC returns the VSCC and the policy listed by LSCC for the supplied chaincode
-	GetCCValidationInfoFromLSCC(ctxt context.Context, txid string, signedProp *pb.SignedProposal, prop *pb.Proposal, chainID string, chaincodeID string) (string, []byte, error)
 	// ExecuteChaincode executes the chaincode given context and args
 	ExecuteChaincode(ctxt context.Context, cccid interface{}, args [][]byte) (*pb.Response, *pb.ChaincodeEvent, error)
 	// Execute executes the chaincode given context and spec (invocation or deploy)

core/endorser/endorser.go

@@ -296,8 +296,6 @@ func (e *Endorser) endorseProposal(ctx context.Context, chainID string, txid str
 	var escc string
 	//ie, not "lscc" or system chaincodes
 	if isSysCC {
-		// FIXME: getCDSFromLSCC seems to fail for lscc - not sure this is expected?
-		// TODO: who should endorse a call to LSCC?
 		escc = "escc"
 	} else {
 		escc = cd.Endorsement()

core/mocks/ccprovider/ccprovider.go

@@ -130,11 +130,6 @@ func (c *mockCcProviderImpl) GetCCContext(cid, name, version, txid string, syscc
 	return &mockCcProviderContextImpl{}
 }
 
-// GetCCValidationInfoFromLSCC does nothing
-func (c *mockCcProviderImpl) GetCCValidationInfoFromLSCC(ctxt context.Context, txid string, signedProp *peer.SignedProposal, prop *peer.Proposal, chainID string, chaincodeID string) (string, []byte, error) {
-	return "vscc", nil, nil
-}
-
 // ExecuteChaincode does nothing
 func (c *mockCcProviderImpl) ExecuteChaincode(ctxt context.Context, cccid interface{}, args [][]byte) (*peer.Response, *peer.ChaincodeEvent, error) {
 	if c.executeResultProvider != nil {

core/mocks/txvalidator/support.go

@@ -20,6 +20,7 @@ import (
 	"github.com/hyperledger/fabric/common/channelconfig"
 	mockpolicies "github.com/hyperledger/fabric/common/mocks/policies"
 	"github.com/hyperledger/fabric/common/policies"
+	"github.com/hyperledger/fabric/common/resourcesconfig"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/common"
@@ -32,6 +33,10 @@ type Support struct {
 	ACVal         channelconfig.ApplicationCapabilities
 }
 
+func (ms *Support) ChaincodeByName(chainname, ccname string) (resourcesconfig.ChaincodeDefinition, bool) {
+	return nil, false
+}
+
 func (ms *Support) Capabilities() channelconfig.ApplicationCapabilities {
 	return ms.ACVal
 }

core/peer/peer.go

@@ -328,7 +328,8 @@ func createChain(cid string, ledger ledger.PeerLedger, cb *common.Block) error {
 	vcs := struct {
 		*chainSupport
 		*semaphore.Weighted
-	}{cs, validationWorkersSemaphore}
+		Support
+	}{cs, validationWorkersSemaphore, GetSupport()}
 	validator := txvalidator.NewTxValidator(vcs)
 	c := committer.NewLedgerCommitterReactive(ledger, func(block *common.Block) error {
 		chainID, err := utils.GetChainIDFromBlock(block)