Skip to content

Go 1.23 #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbrandenburger merged 2 commits into from
Apr 4, 2025
Merged

Go 1.23 #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20511d2
Bump go version
mbrandenburger Apr 1, 2025
05dc464
Bump ego version
mbrandenburger Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/setup-option2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.21.x or higher
* [Go](https://golang.org/) 1.23.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
Expand Down
4 changes: 2 additions & 2 deletions ecc_go/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.3/ego_1.5.3_amd64_ubuntu-22.04.deb
apt install ./ego_1.5.3_amd64_ubuntu-22.04.deb build-essential libssl-dev
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
```

You can find more information about ego installation on the official [documentation](https://docs.edgeless.systems/ego/#/getting-started/install).
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-private-chaincode

go 1.21
go 1.23.5

// Note:
// - fabric has a go.mod but the normal tagging, e.g., v2.2.0 does NOT
Expand Down
2 changes: 1 addition & 1 deletion integration/go_chaincode/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-private-chaincode/integration/go_chaincode

go 1.21
go 1.23.5

replace (
github.com/btcsuite/btcd v0.23.4 => github.com/btcsuite/btcd v0.22.1
Expand Down
2 changes: 1 addition & 1 deletion samples/application/ccapi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use an official Golang runtime as a parent image
FROM golang:1.21-alpine AS build
FROM golang:1.23-alpine AS build

ENV PATH="${PATH}:/usr/bin/"

Expand Down
2 changes: 1 addition & 1 deletion samples/application/ccapi/go.mod
View file
Open in desktop
Copy link
Contributor

@chenchanglew chenchanglew Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we miss to update samples/application/ccapi/Dockerfile

Copy link
Contributor

@munapower munapower Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also missing samples/chaincode/cc-tools-demo/Dockerfile 5,5: ARG GO_VER=1.21

Copy link
Contributor Author

@mbrandenburger mbrandenburger Apr 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also missing samples/chaincode/cc-tools-demo/Dockerfile 5,5: ARG GO_VER=1.21

Maria, that Dockerfile is pulled via the setup.sh script and is not part of the FPC repo. So we can ignore it here.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-private-chaincode/samples/application/ccapi

go 1.21
go 1.23.5

require (
github.com/gin-contrib/cors v1.4.0
Expand Down
2 changes: 1 addition & 1 deletion samples/demos/irb/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-private-chaincode/samples/demos/irb

go 1.21
go 1.23.5

replace (
github.com/hyperledger-labs/orion-sdk-go => github.com/hyperledger-labs/orion-sdk-go v0.2.5
Expand Down
2 changes: 1 addition & 1 deletion samples/deployment/fabric-smart-client/the-simple-testing-network/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module the-simple-testing-network

go 1.21
go 1.23.5

replace (
github.com/hyperledger-labs/orion-sdk-go => github.com/hyperledger-labs/orion-sdk-go v0.2.5
Expand Down
44 changes: 22 additions & 22 deletions utils/docker/base-dev/Dockerfile
View file
Open in desktop
Copy link
Contributor

@chenchanglew chenchanglew Apr 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think for ego version update we miss to update the Ego version in readme ecc_go/README.md

Copy link
Contributor

@munapower munapower Apr 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, there you can find wget https://github.com/edgelesssys/ego/releases/download/v1.5.3/ego_1.5.3_amd64_ubuntu-22.04.deb apt install ./ego_1.5.3_amd64_ubuntu-22.04.deb build-essential libssl-dev

Copy link
Contributor Author

@mbrandenburger mbrandenburger Apr 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Fixed

Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ FROM hyperledger/fabric-private-chaincode-base-rt:${FPC_VERSION} as common
LABEL org.opencontainers.image.source https://github.com/hyperledger/fabric-private-chaincode

# config/build params
ARG GO_VERSION=1.21.9
ARG GO_VERSION=1.23.5
ARG NANOPB_VERSION=0.4.7
ARG OPENSSL_VERSION=3.0.12
ARG SGXSSL_VERSION=3.0_Rev1
ARG APT_ADD_PKGS=
ARG EGO_VERSION=1.5.3
ARG EGO_VERSION=1.7.0

# for convenience remember all versions as env variables ..
ENV GO_VERSION=${GO_VERSION}
Expand All @@ -39,32 +39,32 @@ ENV DEBIAN_FRONTEND "noninteractive"
WORKDIR /tmp

RUN apt-get update -q \
&& apt-get install -y -q \
build-essential \
clang-format \
cmake \
git \
libcurl4-openssl-dev \
libprotobuf-dev \
libssl-dev \
libtool \
pkg-config \
python-is-python3 \
protobuf-compiler \
python3-protobuf \
psmisc \
bc \
software-properties-common \
${APT_ADD_PKGS}
&& apt-get install -y -q \
build-essential \
clang-format \
cmake \
git \
libcurl4-openssl-dev \
libprotobuf-dev \
libssl-dev \
libtool \
pkg-config \
python-is-python3 \
protobuf-compiler \
python3-protobuf \
psmisc \
bc \
software-properties-common \
${APT_ADD_PKGS}

# docker commands (need as we use docker daemon from "outside")
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
&& add-apt-repository "deb [arch="$(dpkg --print-architecture)"] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" \
&& apt-get update -q \
&& apt-get install -y -q \
docker-ce-cli \
docker-buildx-plugin \
docker-compose-plugin
docker-ce-cli \
docker-buildx-plugin \
docker-compose-plugin

# Install go
ENV GOROOT=/usr/local/go
Expand Down