Skip to content

Commit 922c433

Browse files
authored
fsc v0.8.0 (#1292)
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent 1434a80 commit 922c433

File tree

12 files changed

+425
-538
lines changed

12 files changed

+425
-538
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
FABRIC_VERSION ?= 3.1.1
33
FABRIC_CA_VERSION ?= 1.5.7
44
FABRIC_TWO_DIGIT_VERSION = $(shell echo $(FABRIC_VERSION) | cut -d '.' -f 1,2)
5-
FABRIC_X_TOOLS_VERSION ?= v0.0.5
5+
FABRIC_X_TOOLS_VERSION ?= v0.0.6
6+
FABRIC_X_COMMITTER_VERSION ?= 0.1.7
67

78
# need to install fabric binaries outside of fts tree for now (due to chaincode packaging issues)
89
FABRIC_BINARY_BASE=$(PWD)/../fabric

fabricx.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: fabricx-docker-images
2-
fabricx-docker-images:
3-
docker pull hyperledger/fabric-x-committer-test-node:0.1.5
2+
fabricx-docker-images: ## Pull fabric-x images
3+
docker pull hyperledger/fabric-x-committer-test-node:$(FABRIC_X_COMMITTER_VERSION)
44

55
.PHONY: fxconfig
66
fxconfig: ## Install fxconfig

go.mod

Lines changed: 82 additions & 91 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 190 additions & 321 deletions
Large diffs are not rendered by default.

integration/token/fungible/topology/topology.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc"
1515
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
1616
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/monitoring"
17+
viewsdk "github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/dig"
1718
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/tracing"
1819
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token"
1920
fabric2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/fabric"
@@ -207,7 +208,7 @@ func Topology(opts common.Opts) []api.Topology {
207208
}
208209
}
209210

210-
fscTopology.ListNodes("lib-p2p-bootstrap-node")[0].AddSDK(opts.SDKs[0])
211+
fscTopology.ListNodes("lib-p2p-bootstrap-node")[0].AddSDK(&viewsdk.SDK{})
211212

212213
// add the rest of the SDKs
213214
for i := 1; i < len(opts.SDKs); i++ {

token/services/identity/storage/kvs/hashicorp/go.mod

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/storage/kvs/hashicorp
22

3-
go 1.24.3
3+
go 1.24.6
44

5-
toolchain go1.24.4
5+
toolchain go1.24.11
66

77
require (
88
github.com/docker/docker v28.3.3+incompatible
99
github.com/docker/go-connections v0.6.0
1010
github.com/hashicorp/vault/api v1.16.0
11-
github.com/hyperledger-labs/fabric-smart-client v0.7.0
11+
github.com/hyperledger-labs/fabric-smart-client v0.8.0
1212
github.com/hyperledger-labs/fabric-token-sdk v0.4.1-0.20250528165839-032fb9265504
13-
github.com/stretchr/testify v1.10.0
13+
github.com/stretchr/testify v1.11.1
1414
)
1515

1616
replace github.com/hyperledger-labs/fabric-token-sdk => ./../../../../../../
@@ -26,6 +26,7 @@ require (
2626
github.com/beorn7/perks v1.0.1 // indirect
2727
github.com/bits-and-blooms/bitset v1.20.0 // indirect
2828
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
29+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
2930
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3031
github.com/cockroachdb/errors v1.12.0 // indirect
3132
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
@@ -50,7 +51,7 @@ require (
5051
github.com/golang/protobuf v1.5.4 // indirect
5152
github.com/google/go-cmp v0.7.0 // indirect
5253
github.com/google/uuid v1.6.0 // indirect
53-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
54+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
5455
github.com/hashicorp/errwrap v1.1.0 // indirect
5556
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5657
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -85,43 +86,44 @@ require (
8586
github.com/opencontainers/image-spec v1.1.1 // indirect
8687
github.com/pkg/errors v0.9.1 // indirect
8788
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
88-
github.com/prometheus/client_golang v1.20.5 // indirect
89-
github.com/prometheus/client_model v0.6.1 // indirect
90-
github.com/prometheus/common v0.60.0 // indirect
91-
github.com/prometheus/procfs v0.15.1 // indirect
89+
github.com/prometheus/client_golang v1.23.2 // indirect
90+
github.com/prometheus/client_model v0.6.2 // indirect
91+
github.com/prometheus/common v0.66.1 // indirect
92+
github.com/prometheus/procfs v0.17.0 // indirect
9293
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
93-
github.com/rogpeppe/go-internal v1.13.1 // indirect
94+
github.com/rogpeppe/go-internal v1.14.1 // indirect
9495
github.com/ryanuber/go-glob v1.0.0 // indirect
9596
github.com/sirupsen/logrus v1.9.3 // indirect
9697
github.com/sykesm/zap-logfmt v0.0.4 // indirect
9798
github.com/test-go/testify v1.1.4 // indirect
9899
github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.2 // indirect
99100
github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.2 // indirect
100101
github.com/uptrace/opentelemetry-go-extra/otelzap v0.3.2 // indirect
101-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
102-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
103-
go.opentelemetry.io/otel v1.37.0 // indirect
104-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
105-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
102+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
103+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
104+
go.opentelemetry.io/otel v1.38.0 // indirect
105+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
106+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
106107
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
107-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
108+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
108109
go.opentelemetry.io/otel/log v0.6.0 // indirect
109-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
110-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
111-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
112-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
110+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
111+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
112+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
113+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
113114
go.uber.org/multierr v1.11.0 // indirect
114115
go.uber.org/zap v1.27.0 // indirect
116+
go.yaml.in/yaml/v2 v2.4.3 // indirect
115117
go.yaml.in/yaml/v3 v3.0.4 // indirect
116118
golang.org/x/crypto v0.45.0 // indirect
117-
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 // indirect
119+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
118120
golang.org/x/net v0.47.0 // indirect
119121
golang.org/x/sync v0.18.0 // indirect
120122
golang.org/x/sys v0.38.0 // indirect
121123
golang.org/x/text v0.31.0 // indirect
122-
golang.org/x/time v0.8.0 // indirect
123-
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
124-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
124+
golang.org/x/time v0.12.0 // indirect
125+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
126+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
125127
google.golang.org/grpc v1.76.0 // indirect
126128
google.golang.org/protobuf v1.36.10 // indirect
127129
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)