Skip to content

Commit

Permalink
Merge pull request #2009 from iotaledger/chore/go-1.20-upgrade
Browse files Browse the repository at this point in the history
Upgrade to go 1.20 in preparation to hive.go refactor
  • Loading branch information
muXxer authored Feb 23, 2023
2 parents f756aaf + 9f86e64 commit 6388606
Show file tree
Hide file tree
Showing 28 changed files with 217 additions and 251 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v3
with:
go-version: 1.19.5
go-version: 1.20.1
id: go

- name: Check out code into the Go module directory
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
- name: install golang
uses: actions/setup-go@v3
with:
go-version: 1.19.5
go-version: 1.20.1

- name: Install solc
run: |
Expand All @@ -61,8 +61,8 @@ jobs:
- name: install tinygo
# only work on x86_64
run: |
wget https://github.com/tinygo-org/tinygo/releases/download/v0.26.0/tinygo_0.26.0_amd64.deb
sudo dpkg -i tinygo_0.26.0_amd64.deb
wget https://github.com/tinygo-org/tinygo/releases/download/v0.27.0/tinygo_0.27.0_amd64.deb
sudo dpkg -i tinygo_0.27.0_amd64.deb
export PATH=$PATH:/usr/local/bin
- name: install rust-toolchain
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19.5
go-version: 1.20.1
id: go

- name: Check out code into the Go module directory
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/heavy-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v3
with:
go-version: 1.19.5
go-version: 1.20.1
id: go

- name: Check out code into the Go module directory
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- name: install golang
uses: actions/setup-go@v3
with:
go-version: 1.19.5
go-version: 1.20.1

- name: Install solc
run: |
Expand All @@ -83,8 +83,8 @@ jobs:
- name: install tinygo
# only work on x86_64
run: |
wget https://github.com/tinygo-org/tinygo/releases/download/v0.26.0/tinygo_0.26.0_amd64.deb
sudo dpkg -i tinygo_0.26.0_amd64.deb
wget https://github.com/tinygo-org/tinygo/releases/download/v0.27.0/tinygo_0.27.0_amd64.deb
sudo dpkg -i tinygo_0.27.0_amd64.deb
export PATH=$PATH:/usr/local/bin
- name: install rust-toolchain
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19.5
go-version: 1.20.1
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
name: Release wasp-cli Binaries
runs-on: ubuntu-latest
container:
image: iotaledger/goreleaser-cgo-cross-compiler:1.19.5
image: iotaledger/goreleaser-cgo-cross-compiler:1.20.1
steps:
- name: Create dist folder
run: mkdir /dist && cd /dist/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG GOLANG_IMAGE_TAG=1.19-bullseye
ARG GOLANG_IMAGE_TAG=1.20-bullseye

# Build stage
FROM golang:${GOLANG_IMAGE_TAG} AS build
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.noncached
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG GOLANG_IMAGE_TAG=1.19-bullseye
ARG GOLANG_IMAGE_TAG=1.20-bullseye

# Build stage
FROM golang:${GOLANG_IMAGE_TAG} AS build
Expand Down
2 changes: 1 addition & 1 deletion documentation/docs/guide/solo/what-is-solo.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ validate real smart contracts and entire inter-chain protocols before deploying

### Prerequisites

[Go (version 1.19)](https://tip.golang.org/doc/go1.19). As _Solo_ tests are written in Go, you must
[Go (version 1.20)](https://tip.golang.org/doc/go1.20). As _Solo_ tests are written in Go, you must
[install Go](https://go.dev/doc/install).

### Access the Solo Framework
Expand Down
Binary file modified documentation/tutorial-examples/test/solotutorial_bg.wasm
Binary file not shown.
42 changes: 22 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/iotaledger/wasp

go 1.19
go 1.20

replace (
github.com/ethereum/go-ethereum => github.com/iotaledger/go-ethereum v1.10.26-wasp
Expand All @@ -18,9 +18,10 @@ require (
github.com/iotaledger/inx-app v1.0.0-rc.3
github.com/iotaledger/inx/go v1.0.0-rc.1
github.com/iotaledger/iota.go/v3 v3.0.0-rc.1.0.20230223105330-ef33ea7fe34f
github.com/labstack/echo-contrib v0.13.1
github.com/labstack/echo/v4 v4.10.0
github.com/libp2p/go-libp2p v0.25.1
github.com/labstack/echo-contrib v0.14.0
github.com/labstack/echo/v4 v4.10.2
github.com/labstack/gommon v0.4.0
github.com/libp2p/go-libp2p v0.26.0
github.com/multiformats/go-multiaddr v0.8.0
github.com/pangpanglabs/echoswagger/v2 v2.4.1
github.com/pkg/errors v0.9.1
Expand All @@ -36,15 +37,15 @@ require (
go.uber.org/dig v1.16.1
go.uber.org/zap v1.24.0
golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230212135524-a684f29349b6
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
gopkg.in/yaml.v3 v3.0.1
nhooyr.io/websocket v1.8.7
pgregory.net/rapid v0.5.5
)

require (
filippo.io/edwards25519 v1.0.0 // indirect
github.com/VictoriaMetrics/fastcache v1.12.0 // indirect
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand Down Expand Up @@ -84,15 +85,15 @@ require (
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/google/pprof v0.0.0-20230222194610-99052d3372e7 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.1 // indirect
github.com/huin/goupnp v1.0.3 // indirect
github.com/huin/goupnp v1.1.0 // indirect
github.com/iancoleman/orderedmap v0.2.0 // indirect
github.com/iotaledger/grocksdb v1.7.5-0.20221128103803-fcdb79760195 // indirect
github.com/iotaledger/iota.go v1.0.0 // indirect
Expand All @@ -102,13 +103,13 @@ require (
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/jcchavezs/porto v0.4.0 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.15 // indirect
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/koron/go-ssdp v0.0.3 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-cidranger v1.1.0 // indirect
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
Expand All @@ -130,39 +131,40 @@ require (
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
github.com/multiformats/go-multibase v0.1.1 // indirect
github.com/multiformats/go-multicodec v0.8.0 // indirect
github.com/multiformats/go-multicodec v0.8.1 // indirect
github.com/multiformats/go-multihash v0.2.1 // indirect
github.com/multiformats/go-multistream v0.4.1 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/oasisprotocol/ed25519 v0.0.0-20210505154701-76d8c688d86e // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect
github.com/onsi/ginkgo/v2 v2.8.3 // indirect
github.com/opencontainers/runtime-spec v1.0.2 // indirect
github.com/panjf2000/ants/v2 v2.7.1 // indirect
github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/petermattis/goid v0.0.0-20221215004737-a150e88a970d // indirect
github.com/petermattis/goid v0.0.0-20230222173705-8ff7bb262a50 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/common v0.40.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/tsdb v0.10.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
github.com/quic-go/quic-go v0.32.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
github.com/quic-go/quic-go v0.33.0 // indirect
github.com/quic-go/webtransport-go v0.5.1 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
Expand All @@ -182,7 +184,7 @@ require (
go.elastic.co/apm v1.15.0 // indirect
go.elastic.co/apm/module/apmhttp v1.15.0 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
go.uber.org/fx v1.19.1 // indirect
go.uber.org/fx v1.19.2 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.8.0 // indirect
Expand Down
Loading

0 comments on commit 6388606

Please sign in to comment.