Skip to content

Commit 73067b7

Browse files
mbrandenburgermbrandenburger
authored
Upgrade to latest FSC version (hyperledger#756)
- Upgrades to the latest version in order to prepare to update other go deps. - Upgrades go to 1.21.x Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
1 parent d52c6b7 commit 73067b7

File tree

10 files changed

+1263
-1632
lines changed

10 files changed

+1263
-1632
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Make sure that you have the following required dependencies installed:
259259

260260
* CMake v3.5.1 or higher
261261

262-
* [Go](https://golang.org/) 1.20.x or higher
262+
* [Go](https://golang.org/) 1.21.x or higher
263263

264264
* Docker 18.09 (or higher) and docker-compose 1.25.x (or higher)
265265
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

‎go.mod‎

Lines changed: 57 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hyperledger/fabric-private-chaincode
22

3-
go 1.20
3+
go 1.21
44

55
// Note:
66
// - fabric has a go.mod but the normal tagging, e.g., v2.2.0 does NOT
@@ -31,38 +31,47 @@ require (
3131
github.com/hyperledger/fabric-sdk-go v1.0.1-0.20221020141211-7af45cede6af
3232
github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1
3333
github.com/onsi/ginkgo v1.16.5
34-
github.com/onsi/ginkgo/v2 v2.9.2
35-
github.com/onsi/gomega v1.27.6
34+
github.com/onsi/ginkgo/v2 v2.11.0
35+
github.com/onsi/gomega v1.27.8
3636
github.com/pkg/errors v0.9.1
3737
github.com/spf13/cobra v1.7.0
38-
github.com/stretchr/testify v1.8.2
39-
golang.org/x/sync v0.1.0
40-
golang.org/x/tools v0.8.0
41-
google.golang.org/protobuf v1.30.0
38+
github.com/stretchr/testify v1.8.4
39+
golang.org/x/sync v0.5.0
40+
golang.org/x/tools v0.14.0
41+
google.golang.org/protobuf v1.33.0
4242
gopkg.in/yaml.v2 v2.4.0
4343
honnef.co/go/tools v0.4.3
4444
)
4545

4646
require (
4747
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4848
github.com/BurntSushi/toml v1.2.1 // indirect
49-
github.com/IBM/idemix v0.0.0-20220112103229-701e7610d405 // indirect
50-
github.com/IBM/mathlib v0.0.0-20220112091634-0a7378db6912 // indirect
49+
github.com/IBM/idemix v0.0.2-0.20231107110441-534ea4193b8f // indirect
50+
github.com/IBM/idemix/bccsp/schemes/aries v0.0.0-20231107110234-4cf31dd43660 // indirect
51+
github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20231107110234-4cf31dd43660 // indirect
52+
github.com/IBM/idemix/bccsp/types v0.0.0-20231107110234-4cf31dd43660 // indirect
53+
github.com/IBM/mathlib v0.0.3-0.20231011094432-44ee0eb539da // indirect
5154
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
52-
github.com/Microsoft/go-winio v0.6.0 // indirect
55+
github.com/Microsoft/go-winio v0.6.1 // indirect
56+
github.com/ale-linux/aries-framework-go/component/kmscrypto v0.0.0-20231023164747-f3f972769504 // indirect
57+
github.com/benbjohnson/clock v1.3.5 // indirect
5358
github.com/beorn7/perks v1.0.1 // indirect
59+
github.com/bits-and-blooms/bitset v1.7.0 // indirect
5460
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5561
github.com/cloudflare/cfssl v1.4.1 // indirect
56-
github.com/consensys/gnark-crypto v0.6.0 // indirect
57-
github.com/containerd/containerd v1.6.18 // indirect
62+
github.com/consensys/bavard v0.1.13 // indirect
63+
github.com/consensys/gnark-crypto v0.12.1 // indirect
64+
github.com/containerd/containerd v1.7.13 // indirect
65+
github.com/containerd/log v0.1.0 // indirect
5866
github.com/davecgh/go-spew v1.1.1 // indirect
59-
github.com/docker/docker v23.0.2+incompatible // indirect
60-
github.com/docker/go-connections v0.4.0 // indirect
67+
github.com/docker/docker v26.1.0+incompatible // indirect
68+
github.com/docker/go-connections v0.5.0 // indirect
6169
github.com/docker/go-units v0.5.0 // indirect
62-
github.com/fsnotify/fsnotify v1.4.9 // indirect
63-
github.com/fsouza/go-dockerclient v1.9.7 // indirect
70+
github.com/fsnotify/fsnotify v1.6.0 // indirect
71+
github.com/fsouza/go-dockerclient v1.10.0 // indirect
6472
github.com/go-kit/kit v0.10.0 // indirect
6573
github.com/go-logfmt/logfmt v0.5.1 // indirect
74+
github.com/go-logr/logr v1.3.0 // indirect
6675
github.com/go-openapi/jsonpointer v0.19.5 // indirect
6776
github.com/go-openapi/jsonreference v0.20.0 // indirect
6877
github.com/go-openapi/spec v0.20.8 // indirect
@@ -72,46 +81,48 @@ require (
7281
github.com/gobuffalo/packd v1.0.1 // indirect
7382
github.com/gobuffalo/packr v1.30.1 // indirect
7483
github.com/gogo/protobuf v1.3.2 // indirect
75-
github.com/golang/mock v1.4.4 // indirect
84+
github.com/golang/mock v1.6.0 // indirect
7685
github.com/google/certificate-transparency-go v1.0.21 // indirect
77-
github.com/google/go-cmp v0.5.9 // indirect
78-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
86+
github.com/google/go-cmp v0.6.0 // indirect
87+
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
7988
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
8089
github.com/hashicorp/hcl v1.0.0 // indirect
81-
github.com/hyperledger/fabric-amcl v0.0.0-20221107192335-5c75bc7be9c0 // indirect
90+
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
8291
github.com/hyperledger/fabric-config v0.1.0 // indirect
8392
github.com/hyperledger/fabric-lib-go v1.0.0 // indirect
8493
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8594
github.com/joho/godotenv v1.4.0 // indirect
8695
github.com/josharian/intern v1.0.0 // indirect
87-
github.com/klauspost/compress v1.15.14 // indirect
88-
github.com/magiconair/properties v1.8.5 // indirect
96+
github.com/kilic/bls12-381 v0.1.0 // indirect
97+
github.com/klauspost/compress v1.17.4 // indirect
98+
github.com/magiconair/properties v1.8.7 // indirect
8999
github.com/mailru/easyjson v0.7.7 // indirect
90100
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
91101
github.com/miekg/pkcs11 v1.1.1 // indirect
92102
github.com/mitchellh/mapstructure v1.4.3 // indirect
93103
github.com/mmcloughlin/addchain v0.4.0 // indirect
94-
github.com/moby/patternmatcher v0.5.0 // indirect
104+
github.com/moby/docker-image-spec v1.3.1 // indirect
105+
github.com/moby/patternmatcher v0.6.0 // indirect
95106
github.com/moby/sys/sequential v0.5.0 // indirect
96-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
107+
github.com/moby/sys/user v0.1.0 // indirect
108+
github.com/moby/term v0.5.0 // indirect
97109
github.com/morikuni/aec v1.0.0 // indirect
98110
github.com/nxadm/tail v1.4.8 // indirect
99111
github.com/opencontainers/go-digest v1.0.0 // indirect
100-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
101-
github.com/opencontainers/runc v1.1.5 // indirect
112+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
102113
github.com/pelletier/go-toml v1.9.5 // indirect
103114
github.com/pmezard/go-difflib v1.0.0 // indirect
104-
github.com/prometheus/client_golang v1.11.1 // indirect
105-
github.com/prometheus/client_model v0.3.0 // indirect
106-
github.com/prometheus/common v0.32.1 // indirect
107-
github.com/prometheus/procfs v0.8.0 // indirect
108-
github.com/rogpeppe/go-internal v1.9.0 // indirect
109-
github.com/sirupsen/logrus v1.9.0 // indirect
115+
github.com/prometheus/client_golang v1.17.0 // indirect
116+
github.com/prometheus/client_model v0.5.0 // indirect
117+
github.com/prometheus/common v0.44.0 // indirect
118+
github.com/prometheus/procfs v0.12.0 // indirect
119+
github.com/rogpeppe/go-internal v1.11.0 // indirect
120+
github.com/sirupsen/logrus v1.9.3 // indirect
110121
github.com/spf13/afero v1.6.0 // indirect
111-
github.com/spf13/cast v1.3.1 // indirect
122+
github.com/spf13/cast v1.4.1 // indirect
112123
github.com/spf13/jwalterweatherman v1.1.0 // indirect
113124
github.com/spf13/pflag v1.0.5 // indirect
114-
github.com/spf13/viper v1.7.0 // indirect
125+
github.com/spf13/viper v1.10.1 // indirect
115126
github.com/subosito/gotenv v1.2.0 // indirect
116127
github.com/sykesm/zap-logfmt v0.0.4 // indirect
117128
github.com/weppos/publicsuffix-go v0.5.0 // indirect
@@ -120,18 +131,19 @@ require (
120131
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
121132
github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e // indirect
122133
github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
123-
go.uber.org/atomic v1.7.0 // indirect
124-
go.uber.org/multierr v1.6.0 // indirect
125-
go.uber.org/zap v1.24.0 // indirect
126-
golang.org/x/crypto v0.1.0 // indirect
134+
go.uber.org/multierr v1.11.0 // indirect
135+
go.uber.org/zap v1.25.0 // indirect
136+
golang.org/x/crypto v0.22.0 // indirect
127137
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
128-
golang.org/x/mod v0.10.0 // indirect
129-
golang.org/x/net v0.9.0 // indirect
130-
golang.org/x/sys v0.7.0 // indirect
131-
golang.org/x/text v0.9.0 // indirect
132-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
133-
google.golang.org/grpc v1.53.0 // indirect
134-
gopkg.in/ini.v1 v1.51.0 // indirect
138+
golang.org/x/mod v0.13.0 // indirect
139+
golang.org/x/net v0.24.0 // indirect
140+
golang.org/x/sys v0.19.0 // indirect
141+
golang.org/x/text v0.14.0 // indirect
142+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
143+
google.golang.org/grpc v1.59.0 // indirect
144+
gopkg.in/ini.v1 v1.66.2 // indirect
135145
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
136146
gopkg.in/yaml.v3 v3.0.1 // indirect
147+
gotest.tools/v3 v3.5.1 // indirect
148+
rsc.io/tmplfunc v0.0.3 // indirect
137149
)

0 commit comments

Comments
 (0)