Merge branch 'hyperledger:main' into main

Author: iliecirciumaru

.github/workflows/tests.yml

@@ -25,5 +25,8 @@ jobs:
         with:
           go-version-file: go.mod
 
+      - name: Generate test artifacts
+        run: make generate
+
       - name: Run unit tests
         run: make test

.golangci.yml

@@ -1,9 +1,7 @@
-#
 # Copyright IBM Corp. All Rights Reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-
 version: "2"
 linters:
   enable:
@@ -53,6 +51,10 @@ linters:
           deny:
             - pkg: github.com/pkg/errors
               desc: github.com/pkg/errors is no longer maintained
+    staticcheck:
+      checks:
+        - all
+        - "-ST1000" # Disable ST1000: "should have a package comment"
     errcheck:
       # Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
       # Such cases aren't reported by default.
@@ -144,6 +146,9 @@ linters:
           arguments:
             - fmt.Printf
             - fmt.Println
+            - strings.Builder.WriteString
+            - strings.Builder.WriteByte
+            - strings.Builder.Write
         - name: confusing-naming
           disabled: true
         - name: comment-spacings
@@ -176,7 +181,7 @@ linters:
         - .Wrapf(
         - status.Error(
         - .Wait() # The error reported by errorgroup.Wait() (external) actually
-          # originates from the internal code.
+        # originates from the internal code.
       # An array of strings that specify regular expressions of signatures to ignore.
       # Default: []
       ignore-sig-regexps:
@@ -194,6 +199,8 @@ linters:
 
         SPDX-License-Identifier: Apache-2.0
   exclusions:
+    paths:
+      - protolator
     # Mode of the generated files analysis.
     #
     # - `strict`: sources are excluded by strictly following the Go generated file convention.
@@ -204,7 +211,7 @@ linters:
     # - `disable`: disable the generated files exclusion.
     #
     # Default: lax
-    generated: lax
+    generated: strict
     # Log a warning if an exclusion rule is unused.
     # Default: false
     warn-unused: true
@@ -224,6 +231,10 @@ formatters:
       # with the given prefixes are grouped after 3rd-party packages.
       # Default: ""
       local-prefixes:
-        - github.com/hyperledger/fabric-x-common
+        - github.com/hyperledger/fabric-x
   exclusions:
     generated: lax
+sort-order:
+  - file # filepath, line, and column.
+  - severity
+  - linter

Dockerfile

@@ -10,13 +10,13 @@
 ###########################################
 FROM golang:1.25 AS builder
 
-# List of CLI tools to build
-ARG FABRICX_TOOLS="configtxgen cryptogen configtxlator fxconfig"
-
 # Build environment variables
 ENV CGO_ENABLED=1
 ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
 
+# Args
+ARG IDEMIX_VERSION=v0.0.2
+
 WORKDIR /go/src/github.com/hyperledger/fabric-x
 
 # Copy dependency files first (cache optimization)
@@ -27,10 +27,11 @@ RUN go mod download
 COPY . .
 
 # Build the binaries
-RUN mkdir -p /tmp/bin && \
-    for tool in $FABRICX_TOOLS; do \
-    go build -o /tmp/bin/$tool ./tools/$tool; \
-    done
+RUN go build -o /tmp/bin/configtxgen ./tools/configtxgen
+RUN go build -o /tmp/bin/cryptogen ./tools/cryptogen
+RUN go build -o /tmp/bin/configtxlator ./tools/configtxlator
+RUN go build -o /tmp/bin/fxconfig ./tools/fxconfig
+RUN GOBIN=/tmp/bin go install github.com/IBM/idemix/tools/idemixgen@$IDEMIX_VERSION
 
 ###########################################
 # Stage 2: Production runtime image

MAINTAINERS.md

@@ -4,12 +4,20 @@
 
 **Active Maintainers**
 
-| Name                 | GitHub                           | Chat            | email                         |
-| -------------------- | -------------------------------- | --------------- | ----------------------------- |
-| Ilie Circiumaru      | [iliecirciumaru][iliecirciumaru] | Ilie Circiumaru | <ici@zurich.ibm.com>          |
-| Marcus Brandenburger | [mbrandenburger][mbrandenburger] | bur             | <bur@zurich.ibm.com>          |
-| Pasquale Convertini  | [pasquale95][pasquale95]         | paskelo95       | <Pasquale.Convertini@ibm.com> |
+| Name                   | GitHub                           | Chat            | email                         |
+| ---------------------- | -------------------------------- | --------------- | ----------------------------- |
+| Hagar Meir             | [HagarMeir][HagarMeir]           | HagarMeir       | <hagar.meir@ibm.com>          |
+| Ilie Circiumaru        | [iliecirciumaru][iliecirciumaru] | Ilie Circiumaru | <ici@zurich.ibm.com>          |
+| Liran Funaro           | [liran-funaro][liran-funaro]     | liran-funaro    | <liran.funaro@ibm.com>        |
+| Marcus Brandenburger   | [mbrandenburger][mbrandenburger] | bur             | <bur@zurich.ibm.com>          |
+| Pasquale Convertini    | [pasquale95][pasquale95]         | paskelo95       | <Pasquale.Convertini@ibm.com> |
+| Senthilnathan Natarajan | [cendhu][cendhu]                | cendhu          | <cendhu@gmail.com>            |
+| Yoav Tock              | [tock-ibm][tock-ibm]             | tock-ibm        | <tock@il.ibm.com>             |
 
-[mbrandenburger]: https://github.com/mbrandenburger
+[cendhu]: https://github.com/cendhu
+[HagarMeir]: https://github.com/HagarMeir
 [iliecirciumaru]: https://github.com/iliecirciumaru
+[liran-funaro]: https://github.com/liran-funaro
+[mbrandenburger]: https://github.com/mbrandenburger
 [pasquale95]: https://github.com/pasquale95
+[tock-ibm]: https://github.com/tock-ibm

Makefile

@@ -41,6 +41,11 @@ tools: $(TOOLS_EXES) ## Builds all tools
 
 GO_TEST_FMT_FLAGS := -hide empty-packages
 
+## Run generate
+.PHONY: generate
+generate: FORCE
+	go generate ./...
+
 ## Run all tests
 .PHONY: test
 test: FORCE

README.md

@@ -98,10 +98,10 @@ To set up the network yourself, follow the tutorial in the [sample deployment sc
 - [Fabric-X whitepaper](https://eprint.iacr.org/2023/1717.pdf) - detailed description of the Fabric-X. Explains motivation,implementation details and presents performance benchmarks
 - [Fabric-X Committer](https://github.com/hyperledger/fabric-x-committer) Github repository
 - [Fabric-X Orderer](https://github.com/hyperledger/fabric-x-orderer) Github repository
-- [Fabric-X Endorser](https://github.com/hyperledger/fabric-x-endorser)
 - [Fabric-Token-SDK](https://github.com/hyperledger-labs/fabric-token-sdk) and [Fabric-Smart-Client](https://github.com/hyperledger-labs/fabric-smart-client) Github repositories
-- [Fabrix-X Common](https://github.com/hyperledger/fabric-x-common) Github repository - contains new CLIs and protobufs
+- [Fabrix-X Common](https://github.com/hyperledger/fabric-x-common) Github repository - contains new CLIs and protobuf, and code shared between the orderer and committer
 - [Sample deployment scripts](https://github.com/LF-Decentralized-Trust-labs/fabric-x-ansible-collection)
+- [Fabric-X RFCs](https://github.com/hyperledger/fabric-x-rfcs) Github repository - contains request for comments (RFCs) in the Fabric-X project
 
 ## Coming soon...
 

go.mod

@@ -5,28 +5,34 @@
 
 module github.com/hyperledger/fabric-x
 
-go 1.24.3
+go 1.25.5
 
-toolchain go1.24.6
+tool (
+	github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt
+	github.com/hyperledger/fabric-x-common/cmd/configtxgen
+	github.com/hyperledger/fabric-x-common/cmd/cryptogen
+)
 
 require (
+	github.com/alecthomas/kingpin/v2 v2.4.0
+	github.com/cockroachdb/errors v1.12.0
 	github.com/gorilla/handlers v1.5.1
-	github.com/hyperledger/fabric-config v0.3.0
 	github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5
 	github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7
-	github.com/hyperledger/fabric-x-committer v0.1.7
-	github.com/hyperledger/fabric-x-common v0.0.0-20251023133631-047a3c32c228
-	github.com/pkg/errors v0.9.1
-	github.com/spf13/cobra v1.8.1
+	github.com/hyperledger/fabric-x-committer v0.1.9
+	github.com/hyperledger/fabric-x-common v0.1.1-0.20260219094834-26c5a49ed548
+	github.com/spf13/cobra v1.10.2
+	github.com/spf13/viper v1.21.0
 	github.com/stretchr/testify v1.11.1
-	golang.org/x/text v0.28.0
-	google.golang.org/protobuf v1.36.10
-	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/yaml.v2 v2.4.0
+	github.com/testcontainers/testcontainers-go v0.40.0
+	golang.org/x/sync v0.19.0
+	golang.org/x/text v0.33.0
+	google.golang.org/protobuf v1.36.11
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
+	dario.cat/mergo v1.0.2 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/IBM/idemix v0.0.2-0.20240913182345-72941a5f41cd // indirect
 	github.com/IBM/idemix/bccsp/schemes/aries v0.0.0-20240913182345-72941a5f41cd // indirect
@@ -35,90 +41,114 @@ require (
 	github.com/IBM/mathlib v0.0.3-0.20250709075152-a138079496c3 // indirect
 	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
+	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.20.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cockroachdb/errors v1.11.3 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/redact v1.1.5 // indirect
-	github.com/consensys/gnark-crypto v0.18.1 // indirect
+	github.com/consensys/gnark-crypto v0.19.2 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
+	github.com/containerd/platforms v0.2.1 // indirect
+	github.com/cpuguy83/dockercfg v0.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/docker v28.0.0+incompatible // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/distribution/reference v0.6.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/ebitengine/purego v0.8.4 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/fsouza/go-dockerclient v1.12.0 // indirect
+	github.com/fsouza/go-dockerclient v1.12.3 // indirect
 	github.com/getsentry/sentry-go v0.27.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gotesttools/gotestfmt/v2 v2.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // indirect
 	github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866 // indirect
 	github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc // indirect
 	github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.14.3 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgtype v1.14.3 // indirect
-	github.com/jackc/puddle v1.3.0 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/kilic/bls12-381 v0.1.0 // indirect
-	github.com/klauspost/compress v1.17.10 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.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.6.0 // indirect
-	github.com/moby/sys/user v0.3.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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/onsi/gomega v1.34.2 // indirect
+	github.com/nxadm/tail v1.4.11 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/gomega v1.38.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.60.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
+	github.com/shirou/gopsutil/v4 v4.25.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
-	github.com/spf13/viper v1.21.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/sykesm/zap-logfmt v0.0.4 // indirect
-	github.com/yugabyte/pgx/v4 v4.14.8 // indirect
+	github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
+	github.com/yugabyte/pgx/v5 v5.7.6-yb-1 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
+	go.opentelemetry.io/otel v1.40.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
+	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.40.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/trace v1.40.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
-	golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
-	google.golang.org/grpc v1.75.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	golang.org/x/crypto v0.47.0 // indirect
+	golang.org/x/net v0.49.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/time v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260120174246-409b4a993575 // indirect
+	google.golang.org/grpc v1.78.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 )
-
-tool github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt