Feat: fpc-fsc extension submodule

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
 
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@v4
         id: filter
         with:
           filters: |
@@ -78,7 +78,7 @@ jobs:
       #
       - name: Login to the ${{ env.DOCKER_REGISTRY }} Container Registry
         if: env.PUSH_TO_MAIN == 'true' && steps.filter.outputs.docker == 'true'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ github.actor }}

client_sdk/go/pkg/core/contract/contract.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/hyperledger/fabric-private-chaincode/internal/crypto"
 	"github.com/hyperledger/fabric-private-chaincode/internal/utils"
-	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric-lib-go/common/flogging"
 )
 
 var logger = flogging.MustGetLogger("fpc-client-contract")

client_sdk/go/pkg/core/contract/contract_test.go

@@ -13,8 +13,8 @@ import (
 	fpccontract "github.com/hyperledger/fabric-private-chaincode/client_sdk/go/pkg/core/contract"
 	"github.com/hyperledger/fabric-private-chaincode/client_sdk/go/pkg/core/contract/fakes"
 	"github.com/hyperledger/fabric-private-chaincode/internal/crypto"
-	"github.com/hyperledger/fabric-protos-go/peer"
-	"github.com/hyperledger/fabric/protoutil"
+	"github.com/hyperledger/fabric-protos-go-apiv2/peer"
+	"github.com/hyperledger/fabric-x-common/protoutil"
 	"github.com/stretchr/testify/assert"
 )
 

client_sdk/go/pkg/core/lifecycle/client.go

@@ -39,7 +39,7 @@ SPDX-License-Identifier: Apache-2.0
 package lifecycle
 
 import (
-	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric-lib-go/common/flogging"
 	"github.com/pkg/errors"
 
 	"github.com/hyperledger/fabric-private-chaincode/client_sdk/go/pkg/sgx"

client_sdk/go/pkg/fab/ccpackager/packager.go

@@ -27,21 +27,67 @@ package ccpackager
 
 import (
 	"archive/tar"
+	"bufio"
 	"bytes"
 	"compress/gzip"
 	"encoding/json"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 
 	"github.com/hyperledger/fabric-private-chaincode/client_sdk/go/pkg/sgx"
 	"github.com/hyperledger/fabric-private-chaincode/internal/utils"
-	"github.com/hyperledger/fabric/core/chaincode/persistence"
-	"github.com/hyperledger/fabric/core/chaincode/platforms/util"
 	"github.com/pkg/errors"
 )
 
+// labelRegexp controls the allowed characters for a chaincode label.
+var labelRegexp = regexp.MustCompile(`^[[:alnum:]][[:alnum:]_.+-]*$`)
+
+func validateLabel(label string) error {
+	if !labelRegexp.MatchString(label) {
+		return errors.Errorf("invalid label '%s'. Label must be non-empty, can only consist of alphanumerics, symbols from '.+-_', and can only begin with alphanumerics", label)
+	}
+	return nil
+}
+
+func writeFileToPackage(localpath string, packagepath string, tw *tar.Writer) error {
+	fd, err := os.Open(localpath)
+	if err != nil {
+		return fmt.Errorf("%s: %s", localpath, err)
+	}
+	defer fd.Close()
+
+	fi, err := fd.Stat()
+	if err != nil {
+		return fmt.Errorf("%s: %s", localpath, err)
+	}
+
+	header, err := tar.FileInfoHeader(fi, localpath)
+	if err != nil {
+		return fmt.Errorf("failed calculating FileInfoHeader: %s", err)
+	}
+
+	header.Name = packagepath
+	header.Mode = 0100644
+	header.Uid = 500
+	header.Gid = 500
+	header.Uname = ""
+	header.Gname = ""
+
+	if err = tw.WriteHeader(header); err != nil {
+		return fmt.Errorf("failed to write header for %s: %s", localpath, err)
+	}
+
+	_, err = io.Copy(tw, bufio.NewReader(fd))
+	if err != nil {
+		return fmt.Errorf("failed to write %s as %s: %s", localpath, packagepath, err)
+	}
+	return nil
+}
+
 const (
 	codePackageName          = "code.tar.gz"
 	metadataPackageName      = "metadata.json"
@@ -132,7 +178,7 @@ func validateRegularPackageInput(p *Descriptor) error {
 		return errors.Errorf("SGXMode must be set either to %s or %s, actual: %s", sgx.SGXModeHwType, sgx.SGXModeSimType, p.SGXMode)
 	}
 
-	if err := persistence.ValidateLabel(p.Label); err != nil {
+	if err := validateLabel(p.Label); err != nil {
 		return err
 	}
 	return nil
@@ -145,7 +191,7 @@ func validateCaaSPackageInput(p *Descriptor) error {
 		return errors.Wrap(err, "CaaSEndpoint is invalid")
 	}
 
-	if err := persistence.ValidateLabel(p.Label); err != nil {
+	if err := validateLabel(p.Label); err != nil {
 		return err
 	}
 	return nil
@@ -284,7 +330,7 @@ func getDeploymentPayload(ccPath string) ([]byte, error) {
 	tw := tar.NewWriter(gw)
 
 	for _, file := range files {
-		err = util.WriteFileToPackage(filepath.Join(file.Path, file.Name), file.Name, tw)
+		err = writeFileToPackage(filepath.Join(file.Path, file.Name), file.Name, tw)
 		if err != nil {
 			return nil, errors.Wrapf(err, "error writing %s to tar", file.Name)
 		}

config.mk

@@ -62,7 +62,7 @@ PLANTUML_IMG_FORMAT ?= png # pdf / png / svg
 #--------------------------------------------------
 PROJECT_NAME=fabric-private-chaincode
 
-export FABRIC_VERSION ?= 2.5.9
+export FABRIC_VERSION ?= 3.1.4
 export FABRIC_CA_VERSION ?= 1.5.12
 
 export FPC_VERSION := main

ecc/chaincode/ecc.go

@@ -10,14 +10,14 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/hyperledger/fabric-chaincode-go/shim"
+	"github.com/hyperledger/fabric-chaincode-go/v2/shim"
 	"github.com/hyperledger/fabric-private-chaincode/ecc/chaincode/ercc"
 	"github.com/hyperledger/fabric-private-chaincode/internal/endorsement"
 	"github.com/hyperledger/fabric-private-chaincode/internal/protos"
 	"github.com/hyperledger/fabric-private-chaincode/internal/utils"
-	pb "github.com/hyperledger/fabric-protos-go/peer"
-	"github.com/hyperledger/fabric/common/flogging"
-	"github.com/hyperledger/fabric/protoutil"
+	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
+	"github.com/hyperledger/fabric-lib-go/common/flogging"
+	"github.com/hyperledger/fabric-x-common/protoutil"
 )
 
 var logger = flogging.MustGetLogger("ecc")
@@ -31,12 +31,12 @@ type EnclaveChaincode struct {
 }
 
 // Init sets the chaincode state to "init"
-func (t *EnclaveChaincode) Init(stub shim.ChaincodeStubInterface) pb.Response {
+func (t *EnclaveChaincode) Init(stub shim.ChaincodeStubInterface) *pb.Response {
 	return shim.Success(nil)
 }
 
 // Invoke receives transactions and forwards to op handlers
-func (t *EnclaveChaincode) Invoke(stub shim.ChaincodeStubInterface) pb.Response {
+func (t *EnclaveChaincode) Invoke(stub shim.ChaincodeStubInterface) *pb.Response {
 	function, _ := stub.GetFunctionAndParameters()
 	logger.Infof("Invoke is running [%s]", function)
 
@@ -52,7 +52,7 @@ func (t *EnclaveChaincode) Invoke(stub shim.ChaincodeStubInterface) pb.Response
 	}
 }
 
-func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) pb.Response {
+func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) *pb.Response {
 	// extract all enclave inputs from invocation params
 	initMsg, err := t.Extractor.GetInitEnclaveMessage(stub)
 	if err != nil {
@@ -96,7 +96,7 @@ func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) pb.Resp
 	return shim.Success([]byte(base64.StdEncoding.EncodeToString(credentialsBytes)))
 }
 
-func (t *EnclaveChaincode) invoke(stub shim.ChaincodeStubInterface) pb.Response {
+func (t *EnclaveChaincode) invoke(stub shim.ChaincodeStubInterface) *pb.Response {
 	var errMsg string
 
 	serializedChaincodeRequest, err := t.Extractor.GetSerializedChaincodeRequest(stub)
@@ -116,15 +116,15 @@ func (t *EnclaveChaincode) invoke(stub shim.ChaincodeStubInterface) pb.Response
 	signedChaincodeResponseMessageB64 := []byte(base64.StdEncoding.EncodeToString(signedChaincodeResponseMessage))
 	logger.Debugf("base64-encoded response message: '%s'", signedChaincodeResponseMessageB64)
 
-	var response pb.Response
+	var response *pb.Response
 	if errInvoke == nil {
-		response = pb.Response{
+		response = &pb.Response{
 			Status:  shim.OK,
 			Payload: signedChaincodeResponseMessageB64,
 			Message: errMsg,
 		}
 	} else {
-		response = pb.Response{
+		response = &pb.Response{
 			Status:  shim.ERROR,
 			Payload: signedChaincodeResponseMessageB64,
 			Message: errMsg,
@@ -134,7 +134,7 @@ func (t *EnclaveChaincode) invoke(stub shim.ChaincodeStubInterface) pb.Response
 	return response
 }
 
-func (t *EnclaveChaincode) endorse(stub shim.ChaincodeStubInterface) pb.Response {
+func (t *EnclaveChaincode) endorse(stub shim.ChaincodeStubInterface) *pb.Response {
 
 	chaincodeParams, err := t.Extractor.GetChaincodeParams(stub)
 	if err != nil {

ecc/chaincode/ecc_test.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/fabric-chaincode-go/shim"
+	"github.com/hyperledger/fabric-chaincode-go/v2/shim"
 	"github.com/hyperledger/fabric-private-chaincode/ecc/chaincode/ercc"
 	"github.com/hyperledger/fabric-private-chaincode/ecc/chaincode/fakes"
 	"github.com/hyperledger/fabric-private-chaincode/internal/endorsement"
 	"github.com/hyperledger/fabric-private-chaincode/internal/protos"
-	"github.com/hyperledger/fabric-protos-go/peer"
+	"github.com/hyperledger/fabric-protos-go-apiv2/peer"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/types/known/anypb"
 )
@@ -262,7 +262,7 @@ func TestEndorse(t *testing.T) {
 	assert.EqualValues(t, []byte("OK"), r.Payload)
 }
 
-func expectError(t *testing.T, errorMsg string, r peer.Response) {
+func expectError(t *testing.T, errorMsg string, r *peer.Response) {
 	assert.EqualValues(t, shim.ERROR, r.Status)
 	assert.EqualValues(t, errorMsg, r.Message)
 }

ecc/chaincode/enclave.go

@@ -8,7 +8,7 @@ SPDX-License-Identifier: Apache-2.0
 package chaincode
 
 import (
-	"github.com/hyperledger/fabric-chaincode-go/shim"
+	"github.com/hyperledger/fabric-chaincode-go/v2/shim"
 )
 
 type Enclave interface {

ecc/chaincode/enclave/enclave.go

@@ -16,9 +16,9 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/hyperledger/fabric-chaincode-go/shim"
-	"github.com/hyperledger/fabric/common/flogging"
-	"github.com/hyperledger/fabric/protoutil"
+	"github.com/hyperledger/fabric-chaincode-go/v2/shim"
+	"github.com/hyperledger/fabric-lib-go/common/flogging"
+	"github.com/hyperledger/fabric-x-common/protoutil"
 	"golang.org/x/sync/semaphore"
 )
 

ecc/chaincode/enclave/logging_go.go

@@ -11,7 +11,7 @@
 package enclave
 
 import (
-	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric-lib-go/common/flogging"
 )
 
 // #cgo CFLAGS: -I${SRCDIR}/../../../common/logging/untrusted

ecc/chaincode/enclave/mock_enclave.go

@@ -17,11 +17,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hyperledger/fabric-chaincode-go/shim"
+	"github.com/hyperledger/fabric-chaincode-go/v2/shim"
 	"github.com/hyperledger/fabric-private-chaincode/internal/crypto"
 	"github.com/hyperledger/fabric-private-chaincode/internal/protos"
-	"github.com/hyperledger/fabric-protos-go/ledger/rwset/kvrwset"
-	"github.com/hyperledger/fabric/common/flogging"
+	"github.com/hyperledger/fabric-protos-go-apiv2/ledger/rwset/kvrwset"
+	"github.com/hyperledger/fabric-lib-go/common/flogging"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/anypb"

ecc/chaincode/enclave/shim.go

@@ -17,7 +17,7 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/hyperledger/fabric-chaincode-go/shim"
+	"github.com/hyperledger/fabric-chaincode-go/v2/shim"
 	"github.com/hyperledger/fabric-private-chaincode/internal/utils"
 )
 

ecc/chaincode/ercc/stub.go

@@ -10,7 +10,7 @@ package ercc
 import (
 	"fmt"
 
-	"github.com/hyperledger/fabric-chaincode-go/shim"
+	"github.com/hyperledger/fabric-chaincode-go/v2/shim"
 	"github.com/hyperledger/fabric-private-chaincode/internal/protos"
 	"github.com/hyperledger/fabric-private-chaincode/internal/utils"
 )