Skip to content

Commit 3348604

Browse files
chore(fabricx)!: Integrate fabric-x committer v0.1.7
Signed-off-by: Marcus Brandenburger <[email protected]>
1 parent 3491a02 commit 3348604

File tree

13 files changed

+320
-191
lines changed

13 files changed

+320
-191
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ TOP = .
88
FABRIC_VERSION ?= 3.1.1
99
FABRIC_TWO_DIGIT_VERSION = $(shell echo $(FABRIC_VERSION) | cut -d '.' -f 1,2)
1010

11-
FABRIC_X_TOOLS_VERSION ?= v0.0.5
12-
FABRIC_X_COMMITTER_VERSION ?= 0.1.5
11+
FABRIC_X_TOOLS_VERSION ?= 2b2ca4d
12+
FABRIC_X_COMMITTER_VERSION ?= 0.1.7
1313

1414
# need to install fabric binaries outside of fsc tree for now (due to chaincode packaging issues)
1515
FABRIC_BINARY_BASE ?= $(PWD)/../fabric

go.mod

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
github.com/hyperledger/fabric-contract-api-go/v2 v2.2.0
2525
github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5
2626
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7
27-
github.com/hyperledger/fabric-x-committer v0.1.5
28-
github.com/hyperledger/fabric-x-common v0.0.0-20250917075146-ac37a580bb6e
27+
github.com/hyperledger/fabric-x-committer v0.1.7
28+
github.com/hyperledger/fabric-x-common v0.0.0-20251023133631-047a3c32c228
2929
github.com/jackc/pgx/v5 v5.7.1
3030
github.com/jackc/pgxlisten v0.0.0-20241106001234-1d6f6656415c
3131
github.com/jaegertracing/jaeger-idl v0.6.0
@@ -38,33 +38,31 @@ require (
3838
github.com/onsi/gomega v1.37.0
3939
github.com/prometheus/client_golang v1.20.5
4040
github.com/spf13/cobra v1.8.1
41-
github.com/spf13/viper v1.20.1
42-
github.com/stretchr/testify v1.10.0
41+
github.com/spf13/viper v1.21.0
42+
github.com/stretchr/testify v1.11.1
4343
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26
4444
github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.2
4545
github.com/uptrace/opentelemetry-go-extra/otelzap v0.3.2
4646
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0
4747
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0
48-
go.opentelemetry.io/otel v1.37.0
48+
go.opentelemetry.io/otel v1.38.0
4949
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
5050
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0
5151
go.opentelemetry.io/otel/log v0.6.0
52-
go.opentelemetry.io/otel/trace v1.37.0
52+
go.opentelemetry.io/otel/trace v1.38.0
5353
go.uber.org/atomic v1.11.0
5454
go.uber.org/dig v1.18.0
5555
go.uber.org/goleak v1.3.0
5656
go.uber.org/zap v1.27.0
5757
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
58-
golang.org/x/sync v0.18.0
59-
golang.org/x/text v0.31.0
58+
golang.org/x/sync v0.16.0
59+
golang.org/x/text v0.28.0
6060
google.golang.org/grpc v1.76.0
6161
google.golang.org/protobuf v1.36.10
6262
gopkg.in/yaml.v2 v2.4.0
6363
modernc.org/sqlite v1.32.0
6464
)
6565

66-
require golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
67-
6866
require (
6967
cel.dev/expr v0.24.0 // indirect
7068
cloud.google.com/go v0.116.0 // indirect
@@ -92,6 +90,7 @@ require (
9290
github.com/bytedance/sonic v1.12.3 // indirect
9391
github.com/bytedance/sonic/loader v0.2.0 // indirect
9492
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
93+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
9594
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9695
github.com/cloudwego/base64x v0.1.4 // indirect
9796
github.com/cloudwego/iasm v0.2.0 // indirect
@@ -116,7 +115,7 @@ require (
116115
github.com/felixge/httpsnoop v1.0.4 // indirect
117116
github.com/flynn/noise v1.1.0 // indirect
118117
github.com/francoispqt/gojay v1.2.13 // indirect
119-
github.com/fsnotify/fsnotify v1.8.0 // indirect
118+
github.com/fsnotify/fsnotify v1.9.0 // indirect
120119
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
121120
github.com/getsentry/sentry-go v0.27.0 // indirect
122121
github.com/ghodss/yaml v1.0.0 // indirect
@@ -225,7 +224,7 @@ require (
225224
github.com/opencontainers/runtime-spec v1.2.0 // indirect
226225
github.com/opentracing/opentracing-go v1.2.0 // indirect
227226
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
228-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
227+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
229228
github.com/pion/datachannel v1.5.9 // indirect
230229
github.com/pion/dtls/v2 v2.2.12 // indirect
231230
github.com/pion/ice/v2 v2.3.36 // indirect
@@ -255,13 +254,13 @@ require (
255254
github.com/raulk/go-watchdog v1.3.0 // indirect
256255
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
257256
github.com/rogpeppe/go-internal v1.13.1 // indirect
258-
github.com/sagikazarmark/locafero v0.7.0 // indirect
257+
github.com/sagikazarmark/locafero v0.11.0 // indirect
259258
github.com/sirupsen/logrus v1.9.3 // indirect
260-
github.com/sourcegraph/conc v0.3.0 // indirect
259+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
261260
github.com/spaolacci/murmur3 v1.1.0 // indirect
262-
github.com/spf13/afero v1.12.0 // indirect
263-
github.com/spf13/cast v1.7.1 // indirect
264-
github.com/spf13/pflag v1.0.6 // indirect
261+
github.com/spf13/afero v1.15.0 // indirect
262+
github.com/spf13/cast v1.10.0 // indirect
263+
github.com/spf13/pflag v1.0.10 // indirect
265264
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
266265
github.com/stretchr/objx v0.5.2 // indirect
267266
github.com/subosito/gotenv v1.6.0 // indirect
@@ -281,27 +280,28 @@ require (
281280
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
282281
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
283282
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0
284-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
285-
go.opentelemetry.io/otel/sdk v1.37.0
286-
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
283+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
284+
go.opentelemetry.io/otel/sdk v1.38.0
285+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
287286
go.opentelemetry.io/proto/otlp v1.3.1
288287
go.uber.org/automaxprocs v1.6.0 // indirect
289288
go.uber.org/fx v1.23.0 // indirect
290289
go.uber.org/mock v0.5.0 // indirect
291290
go.uber.org/multierr v1.11.0 // indirect
291+
go.yaml.in/yaml/v3 v3.0.4 // indirect
292292
golang.org/x/arch v0.11.0 // indirect
293-
golang.org/x/crypto v0.45.0 // indirect
294-
golang.org/x/mod v0.29.0 // indirect
295-
golang.org/x/net v0.47.0 // indirect
293+
golang.org/x/crypto v0.41.0 // indirect
294+
golang.org/x/mod v0.26.0 // indirect
295+
golang.org/x/net v0.43.0 // indirect
296296
golang.org/x/oauth2 v0.30.0 // indirect
297-
golang.org/x/sys v0.38.0 // indirect
297+
golang.org/x/sys v0.36.0 // indirect
298298
golang.org/x/time v0.8.0 // indirect
299-
golang.org/x/tools v0.38.0 // indirect
299+
golang.org/x/tools v0.35.0 // indirect
300300
gonum.org/v1/gonum v0.16.0 // indirect
301301
google.golang.org/api v0.215.0 // indirect
302302
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
303-
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
304-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
303+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
304+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
305305
gopkg.in/yaml.v3 v3.0.1 // indirect
306306
lukechampine.com/blake3 v1.3.0 // indirect
307307
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect

0 commit comments

Comments
 (0)