Merge branch 'main' into main

Author: mbrandenburger

.github/workflows/documentation.yml

@@ -22,7 +22,7 @@ jobs:
         contents: read
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 2 # required to compare HEAD^
     - run: git diff --name-only HEAD^..HEAD

.github/workflows/git.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Block Fixup Commit Merge
         uses: 13rac1/block-fixup-merge-action@v2.0.0

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
             os-name: jammy
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           submodules: 'recursive'
       - uses: actions/setup-go@v6

docs/setup-option2.md

@@ -10,7 +10,7 @@ Make sure that you have the following required dependencies installed:
 
 * CMake v3.5.1 or higher
 
-* [Go](https://golang.org/) 1.23.x or higher
+* [Go](https://golang.org/) 1.25.x or higher
 
 * Docker 18.09 (or higher) and docker-compose 1.25.x (or higher)
   Note that version from Ubuntu 18.04 is not recent enough!  To upgrade, install a recent version following the instructions from [docker.com](https://docs.docker.com/compose/install/), e.g., for version 1.25.4 execute	

ecc/chaincode/ecc.go

@@ -57,14 +57,14 @@ func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) pb.Resp
 	initMsg, err := t.Extractor.GetInitEnclaveMessage(stub)
 	if err != nil {
 		errMsg := fmt.Sprintf("getting initEnclave msg failed: %s", err.Error())
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return shim.Error(errMsg)
 	}
 
 	chaincodeParams, err := t.Extractor.GetChaincodeParams(stub)
 	if err != nil {
 		errMsg := fmt.Sprintf("getting chaincode params failed: %s", err.Error())
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return shim.Error(errMsg)
 	}
 	serializedChaincodeParams, err := protoutil.Marshal(chaincodeParams)
@@ -75,7 +75,7 @@ func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) pb.Resp
 	hostParams, err := t.Extractor.GetHostParams(stub)
 	if err != nil {
 		errMsg := fmt.Sprintf("getting host params failed: %s", err.Error())
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return shim.Error(errMsg)
 	}
 
@@ -88,7 +88,7 @@ func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) pb.Resp
 	credentialsBytes, err := t.Enclave.Init(serializedChaincodeParams, serializedHostParams, initMsg.AttestationParams)
 	if err != nil {
 		errMsg := fmt.Sprintf("Enclave Init function failed: %s", err.Error())
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return shim.Error(errMsg)
 	}
 
@@ -102,14 +102,14 @@ func (t *EnclaveChaincode) invoke(stub shim.ChaincodeStubInterface) pb.Response
 	serializedChaincodeRequest, err := t.Extractor.GetSerializedChaincodeRequest(stub)
 	if err != nil {
 		errMsg = fmt.Sprintf("cannot get chaincode request message from input: %s", err.Error())
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return shim.Error(errMsg)
 	}
 
 	signedChaincodeResponseMessage, errInvoke := t.Enclave.ChaincodeInvoke(stub, serializedChaincodeRequest)
 	if errInvoke != nil {
 		errMsg = fmt.Sprintf("t.Enclave.Invoke failed: %s", errInvoke)
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		// likely a chaincode error, so we still want response go back ...
 	}
 
@@ -139,14 +139,14 @@ func (t *EnclaveChaincode) endorse(stub shim.ChaincodeStubInterface) pb.Response
 	chaincodeParams, err := t.Extractor.GetChaincodeParams(stub)
 	if err != nil {
 		errMsg := fmt.Sprintf("cannot extract chaincode params: %s", err.Error())
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return shim.Error(errMsg)
 	}
 
 	signedResponseMsg, responseMsg, err := t.Extractor.GetChaincodeResponseMessages(stub)
 	if err != nil {
 		errMsg := fmt.Sprintf("cannot extract chaincode response message: %s", err.Error())
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return shim.Error(errMsg)
 	}
 
@@ -175,20 +175,20 @@ func (t *EnclaveChaincode) endorse(stub shim.ChaincodeStubInterface) pb.Response
 	// check cc param.MSPID matches MSPID of endorser (Post-MVP)
 
 	// validate enclave endorsement signature
-	logger.Debugf("Validating endorsement")
+	logger.Debug("Validating endorsement")
 	err = t.Validator.Validate(signedResponseMsg, attestedData)
 	if err != nil {
 		return shim.Error(err.Error())
 	}
 
 	// replay read/writes from kvrwset from Enclave (to prepare commitment to ledger) and extract kvrwset for subsequent validation
-	logger.Debugf("Replaying rwset")
+	logger.Debug("Replaying rwset")
 	err = t.Validator.ReplayReadWrites(stub, responseMsg.FpcRwSet)
 	if err != nil {
 		return shim.Error(err.Error())
 	}
 
-	logger.Debugf("Endorsement successful")
+	logger.Debug("Endorsement successful")
 	return shim.Success([]byte("OK")) // make sure we have a non-empty return on success so we can distinguish success from failure in cli ...
 }
 

ecc/chaincode/enclave/enclave.go

@@ -12,6 +12,7 @@ package enclave
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"unsafe"
 
@@ -80,7 +81,7 @@ func (e *EnclaveStub) Init(chaincodeParams, hostParams, attestationParams []byte
 	if ret != 0 {
 		msg := fmt.Sprintf("can not create enclave (%s): Reason: %v", enclaveLibFile, ret)
 		logger.Error(msg)
-		return nil, fmt.Errorf(msg)
+		return nil, errors.New(msg)
 	}
 	e.eid = eid
 	e.sem.Release(1)
@@ -114,7 +115,7 @@ func (e *EnclaveStub) ChaincodeInvoke(stub shim.ChaincodeStubInterface, crmProto
 	const scresmProtoBytesMaxLen = 1024 * 100 // Let's be really conservative ...
 
 	if !e.isInitialized {
-		return nil, fmt.Errorf("enclave not yet initialized")
+		return nil, errors.New("enclave not yet initialized")
 	}
 
 	// register our stub for callbacks

ecc_go/README.md

@@ -80,8 +80,8 @@ Install ego by running the following:
 ```bash
 wget -qO- https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add
 add-apt-repository "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu `lsb_release -cs` main"
-wget https://github.com/edgelesssys/ego/releases/download/v1.7.0/ego_1.7.0_amd64_ubuntu-22.04.deb
-apt install ./ego_1.7.0_amd64_ubuntu-22.04.deb build-essential libssl-dev
+wget https://github.com/edgelesssys/ego/releases/download/v1.8.1/ego_1.8.1_amd64_ubuntu-22.04.deb
+apt install ./ego_1.8.1_amd64_ubuntu-22.04.deb build-essential libssl-dev
 ```
 
 You can find more information about ego installation on the official [documentation](https://docs.edgeless.systems/ego/#/getting-started/install).

go.mod

@@ -1,6 +1,6 @@
 module github.com/hyperledger/fabric-private-chaincode
 
-go 1.23.5
+go 1.25.6
 
 // Note:
 // - fabric has a go.mod but the normal tagging, e.g., v2.2.0 does NOT
@@ -35,10 +35,10 @@ require (
 	github.com/onsi/gomega v1.27.8
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.7.0
-	github.com/stretchr/testify v1.8.4
-	golang.org/x/sync v0.5.0
-	golang.org/x/tools v0.14.0
-	google.golang.org/protobuf v1.33.0
+	github.com/stretchr/testify v1.11.0
+	golang.org/x/sync v0.19.0
+	golang.org/x/tools v0.41.0
+	google.golang.org/protobuf v1.36.6
 	gopkg.in/yaml.v2 v2.4.0
 	honnef.co/go/tools v0.4.3
 )
@@ -52,7 +52,7 @@ require (
 	github.com/IBM/idemix/bccsp/types v0.0.0-20231107110234-4cf31dd43660 // indirect
 	github.com/IBM/mathlib v0.0.3-0.20231011094432-44ee0eb539da // indirect
 	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ale-linux/aries-framework-go/component/kmscrypto v0.0.0-20231023164747-f3f972769504 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -61,17 +61,16 @@ require (
 	github.com/cloudflare/cfssl v1.4.1 // indirect
 	github.com/consensys/bavard v0.1.13 // indirect
 	github.com/consensys/gnark-crypto v0.12.1 // indirect
-	github.com/containerd/containerd v1.7.13 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/docker v26.1.0+incompatible // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/docker v28.5.2+incompatible // indirect
+	github.com/docker/go-connections v0.6.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fsouza/go-dockerclient v1.10.0 // indirect
 	github.com/go-kit/kit v0.10.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
 	github.com/go-openapi/spec v0.20.8 // indirect
@@ -80,10 +79,9 @@ require (
 	github.com/gobuffalo/envy v1.10.1 // indirect
 	github.com/gobuffalo/packd v1.0.1 // indirect
 	github.com/gobuffalo/packr v1.30.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/certificate-transparency-go v1.0.21 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -94,29 +92,31 @@ require (
 	github.com/joho/godotenv v1.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kilic/bls12-381 v0.1.0 // indirect
-	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/mmcloughlin/addchain v0.4.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/go-archive v0.1.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/sys/user v0.1.0 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
+	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.17.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
@@ -133,17 +133,18 @@ require (
 	github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.25.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
-	google.golang.org/grpc v1.59.0 // indirect
+	golang.org/x/mod v0.32.0 // indirect
+	golang.org/x/net v0.50.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
+	golang.org/x/text v0.34.0 // indirect
+	golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/grpc v1.78.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gotest.tools/v3 v3.5.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )