Upgrade chaincode (#401)

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
Co-authored-by: Angelo De Caro <adc@zurich.ibm.com>

Author: sapthasurendran

Makefile

@@ -31,7 +31,7 @@ include $(TOP)/checks.mk
 
 .PHONY: unit-tests
 unit-tests:
-    
+
 	@export FAB_BINS=$(FAB_BINS); go test -cover $(shell go list ./... | grep -v '/integration/')
 	cd integration/nwo/; go test -cover ./...
 
@@ -81,15 +81,15 @@ orion-server-images:
 	docker image tag orionbcdb/orion-server:$(ORION_VERSION) orionbcdb/orion-server:latest
 
 INTEGRATION_TARGETS = integration-tests-iou
-INTEGRATION_TARGETS += integration-tests-atsacc 
+INTEGRATION_TARGETS += integration-tests-atsacc
 INTEGRATION_TARGETS += integration-tests-chaincode-events
 INTEGRATION_TARGETS += integration-tests-atsafsc
 INTEGRATION_TARGETS += integration-tests-twonets
 INTEGRATION_TARGETS += integration-tests-pingpong
 INTEGRATION_TARGETS += integration-tests-stoprestart
 
 .PHONY: integration-tests
-integration-tests: $(INTEGRATION_TARGETS)  
+integration-tests: $(INTEGRATION_TARGETS)
 
 .PHONY: integration-tests-iou
 integration-tests-iou:

integration/fabric/events/chaincode/chaincode/main.go

@@ -14,10 +14,10 @@ import (
 func main() {
 	eventsChaincode, err := contractapi.NewChaincode(&chaincode.SmartContract{})
 	if err != nil {
-		log.Panicf("Error creating asset-transfer-events chaincode: %v", err)
+		log.Panicf("Error creating events chaincode: %v", err)
 	}
 
 	if err := eventsChaincode.Start(); err != nil {
-		log.Panicf("Error starting asset-transfer-events chaincode: %v", err)
+		log.Panicf("Error starting events chaincode: %v", err)
 	}
 }

integration/fabric/events/chaincode/events_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/events/chaincode"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/fabric/events/chaincode/views"
+	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fabric"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -26,7 +27,7 @@ var _ = Describe("EndToEnd", func() {
 		ii.Stop()
 	})
 
-	Describe("Asset Transfer Events (With Chaincode)", func() {
+	Describe("Events (With Chaincode)", func() {
 		var (
 			alice *chaincode.Client
 			bob   *chaincode.Client
@@ -80,5 +81,26 @@ var _ = Describe("EndToEnd", func() {
 			Expect(payloadsReceived).To(Equal(expectedEventPayloads))
 
 		})
+
+		It("Upgrade Chaincode", func() {
+			// Old chaincode
+			event, err := alice.EventsView("CreateAsset", "CreateAsset")
+			Expect(err).ToNot(HaveOccurred())
+			eventReceived := &views.EventReceived{}
+			json.Unmarshal(event.([]byte), eventReceived)
+			Expect(string(eventReceived.Event.Payload)).To(Equal("Invoked Create Asset Successfully"))
+
+			// Update
+			fabricNetwork := fabric.Network(ii.Ctx, "default")
+			Expect(fabricNetwork).ToNot(BeNil(), "failed to find fabric network 'default'")
+			fabricNetwork.UpdateChaincode("events", "Version-1.0", "github.com/hyperledger-labs/fabric-smart-client/integration/fabric/events/chaincode/newChaincode", "")
+
+			// New chaincode
+			event, err = alice.EventsView("CreateAsset", "CreateAsset")
+			Expect(err).ToNot(HaveOccurred())
+			eventReceived = &views.EventReceived{}
+			json.Unmarshal(event.([]byte), eventReceived)
+			Expect(string(eventReceived.Event.Payload)).To(Equal("Invoked Create Asset Successfully From Upgraded Chaincode"))
+		})
 	})
 })

integration/fabric/events/chaincode/newChaincode/events/events.go

@@ -0,0 +1,25 @@
+/*
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package chaincode
+
+import (
+	"fmt"
+
+	"github.com/hyperledger/fabric-contract-api-go/contractapi"
+)
+
+// SmartContract provides functions for Event Listening
+type SmartContract struct {
+	contractapi.Contract
+}
+
+func (s *SmartContract) InitLedger(ctx contractapi.TransactionContextInterface) {
+	fmt.Println("Init Function Invoked")
+}
+
+func (s *SmartContract) CreateAsset(ctx contractapi.TransactionContextInterface) {
+	ctx.GetStub().SetEvent("CreateAsset", []byte("Invoked Create Asset Successfully From Upgraded Chaincode"))
+
+}

integration/fabric/events/chaincode/newChaincode/main.go

@@ -0,0 +1,23 @@
+/*
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package main
+
+import (
+	"log"
+
+	chaincode "github.com/hyperledger-labs/fabric-smart-client/integration/fabric/events/chaincode/newChaincode/events"
+	"github.com/hyperledger/fabric-contract-api-go/contractapi"
+)
+
+func main() {
+	eventsChaincode, err := contractapi.NewChaincode(&chaincode.SmartContract{})
+	if err != nil {
+		log.Panicf("Error creating events chaincode: %v", err)
+	}
+
+	if err := eventsChaincode.Start(); err != nil {
+		log.Panicf("Error starting events chaincode: %v", err)
+	}
+}

integration/fabric/iou/commands.go

@@ -13,13 +13,13 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func CreateIOU(ii *integration.Infrastructure, identityLabel string, amount uint) string {
+func CreateIOU(ii *integration.Infrastructure, identityLabel string, amount uint, approver string) string {
 	res, err := ii.Client("borrower").CallView(
 		"create", common.JSONMarshall(&views.Create{
 			Amount:   amount,
 			Identity: identityLabel,
 			Lender:   ii.Identity("lender"),
-			Approver: ii.Identity("approver"),
+			Approver: ii.Identity(approver),
 		}),
 	)
 	Expect(err).NotTo(HaveOccurred())
@@ -33,15 +33,20 @@ func CheckState(ii *integration.Infrastructure, partyID, iouStateID string, expe
 	Expect(common.JSONUnmarshalInt(res)).To(BeEquivalentTo(expected))
 }
 
-func UpdateIOU(ii *integration.Infrastructure, iouStateID string, amount uint) {
+func UpdateIOU(ii *integration.Infrastructure, iouStateID string, amount uint, approver string) {
 	txIDBoxed, err := ii.Client("borrower").CallView("update",
 		common.JSONMarshall(&views.Update{
 			LinearID: iouStateID,
 			Amount:   amount,
-			Approver: ii.Identity("approver"),
+			Approver: ii.Identity(approver),
 		}),
 	)
 	Expect(err).NotTo(HaveOccurred())
 	txID := common.JSONUnmarshalString(txIDBoxed)
 	Expect(ii.Client("lender").IsTxFinal(txID)).NotTo(HaveOccurred())
 }
+
+func InitApprover(ii *integration.Infrastructure, approver string) {
+	_, err := ii.Client(approver).CallView("init", nil)
+	Expect(err).NotTo(HaveOccurred())
+}

integration/fabric/iou/iou_test.go

@@ -39,10 +39,12 @@ var _ = Describe("EndToEnd", func() {
 		})
 
 		It("succeeded", func() {
-			iouState := iou.CreateIOU(ii, "", 10)
+			iou.InitApprover(ii, "approver1")
+			iou.InitApprover(ii, "approver2")
+			iouState := iou.CreateIOU(ii, "", 10, "approver1")
 			iou.CheckState(ii, "borrower", iouState, 10)
 			iou.CheckState(ii, "lender", iouState, 10)
-			iou.UpdateIOU(ii, iouState, 5)
+			iou.UpdateIOU(ii, iouState, 5, "approver2")
 			iou.CheckState(ii, "borrower", iouState, 5)
 			iou.CheckState(ii, "lender", iouState, 5)
 		})

integration/fabric/iou/topology.go

@@ -27,14 +27,26 @@ func Topology() []api.Topology {
 	fscTopology := fsc.NewTopology()
 
 	// Add the approver FSC node.
-	approver := fscTopology.AddNodeByName("approver")
+	approver1 := fscTopology.AddNodeByName("approver1")
 	// This option equips the approver's FSC node with an identity belonging to Org1.
 	// Therefore, the approver is an endorser of the Fabric namespace we defined above.
-	approver.AddOptions(
+	approver1.AddOptions(
 		fabric.WithOrganization("Org1"),
 	)
-	approver.RegisterResponder(&views.ApproverView{}, &views.CreateIOUView{})
-	approver.RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{})
+	approver1.RegisterResponder(&views.ApproverView{}, &views.CreateIOUView{})
+	approver1.RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{})
+	approver1.RegisterViewFactory("init", &views.ApproverInitViewFactory{})
+
+	// Add another approver as well
+	approver2 := fscTopology.AddNodeByName("approver2")
+	// This option equips the approver's FSC node with an identity belonging to Org1.
+	// Therefore, the approver is an endorser of the Fabric namespace we defined above.
+	approver2.AddOptions(
+		fabric.WithOrganization("Org1"),
+	)
+	approver2.RegisterResponder(&views.ApproverView{}, &views.CreateIOUView{})
+	approver2.RegisterResponder(&views.ApproverView{}, &views.UpdateIOUView{})
+	approver2.RegisterViewFactory("init", &views.ApproverInitViewFactory{})
 
 	// Add the borrower's FSC node
 	borrower := fscTopology.AddNodeByName("borrower")

integration/fabric/iou/views/approver.go

@@ -88,3 +88,17 @@ func (i *ApproverView) Call(context view.Context) (interface{}, error) {
 	wg.Wait()
 	return nil, nil
 }
+
+type ApproverInitView struct{}
+
+func (a *ApproverInitView) Call(context view.Context) (interface{}, error) {
+	assert.NoError(fabric.GetDefaultChannel(context).Committer().ProcessNamespace("iou"), "failed to setup namespace to process")
+	return nil, nil
+}
+
+type ApproverInitViewFactory struct{}
+
+func (c *ApproverInitViewFactory) NewView(in []byte) (view.View, error) {
+	f := &ApproverInitView{}
+	return f, nil
+}

integration/fabric/iouhsm/iou_test.go

@@ -39,17 +39,17 @@ var _ = Describe("EndToEnd", func() {
 		})
 
 		It("succeeded", func() {
-			iouState := iou.CreateIOU(ii, "", 10)
+			iouState := iou.CreateIOU(ii, "", 10, "approver")
 			iou.CheckState(ii, "borrower", iouState, 10)
 			iou.CheckState(ii, "lender", iouState, 10)
-			iou.UpdateIOU(ii, iouState, 5)
+			iou.UpdateIOU(ii, iouState, 5, "approver")
 			iou.CheckState(ii, "borrower", iouState, 5)
 			iou.CheckState(ii, "lender", iouState, 5)
 
-			iouState = iou.CreateIOU(ii, "borrower-hsm-2", 10)
+			iouState = iou.CreateIOU(ii, "borrower-hsm-2", 10, "approver")
 			iou.CheckState(ii, "borrower", iouState, 10)
 			iou.CheckState(ii, "lender", iouState, 10)
-			iou.UpdateIOU(ii, iouState, 5)
+			iou.UpdateIOU(ii, iouState, 5, "approver")
 			iou.CheckState(ii, "borrower", iouState, 5)
 			iou.CheckState(ii, "lender", iouState, 5)
 		})