diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6f4bac4f..a621353f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,22 +19,22 @@ jobs: runs-on: ubuntu-latest name: build steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: '1.20' - run: go build ./... tidy: runs-on: ubuntu-latest name: tidy steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: '1.20' - run: | go mod tidy CHANGES_IN_REPO=$(git status --porcelain) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 1be551252..96d5a34f5 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1a631167a..04a790f94 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -23,10 +23,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: '1.20' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/interchaintest.yml b/.github/workflows/interchaintest.yml index 4529d0fed..56010c742 100644 --- a/.github/workflows/interchaintest.yml +++ b/.github/workflows/interchaintest.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to GitHub Container Registry @@ -33,18 +33,18 @@ jobs: push: true platforms: linux/amd64 tags: | - ghcr.io/notional-labs/centauri-ictest:latest + ghcr.io/composablefi/centauri-ictest:latest test-start-cosmos-chain: runs-on: ubuntu-latest needs: build-and-push-image steps: - - name: Set up Go 1.19 - uses: actions/setup-go@v3 + - name: Set up Go 1.20 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: '1.20' - name: checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - run: make ictest-start-cosmos env: @@ -54,13 +54,13 @@ jobs: runs-on: ubuntu-latest needs: build-and-push-image steps: - - name: Set up Go 1.19 - uses: actions/setup-go@v3 + - name: Set up Go 1.20 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: '1.20' - name: checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - run: make ictest-upgrade env: @@ -70,13 +70,13 @@ jobs: runs-on: ubuntu-latest needs: build-and-push-image steps: - - name: Set up Go 1.19 - uses: actions/setup-go@v3 + - name: Set up Go 1.20 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: '1.20' - name: checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - run: make ictest-start-polkadot env: @@ -86,13 +86,13 @@ jobs: runs-on: ubuntu-latest needs: build-and-push-image steps: - - name: Set up Go 1.19 - uses: actions/setup-go@v3 + - name: Set up Go 1.20 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: '1.20' - name: checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - run: make ictest-validator env: @@ -102,13 +102,13 @@ jobs: # runs-on: ubuntu-latest # needs: build-and-push-image # steps: - # - name: Set up Go 1.19 - # uses: actions/setup-go@v3 + # - name: Set up Go 1.20 + # uses: actions/setup-go@v4 # with: - # go-version: 1.19 + # go-version: 1.20 # - name: checkout code - # uses: actions/checkout@v3 + # uses: actions/checkout@v4 # - run: make ictest-ibc # env: @@ -118,13 +118,13 @@ jobs: # runs-on: ubuntu-latest # needs: build-and-push-image # steps: - # - name: Set up Go 1.19 - # uses: actions/setup-go@v3 + # - name: Set up Go 1.20 + # uses: actions/setup-go@v4 # with: - # go-version: 1.19 + # go-version: 1.20 # - name: checkout code - # uses: actions/checkout@v3 + # uses: actions/checkout@v4 # - run: make ictest-push-wasm # env: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3188ae602..0c27618f5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,10 +15,10 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 - - uses: actions/checkout@v3 + go-version: '1.20' + - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: diff --git a/.github/workflows/push_docker_images.yml b/.github/workflows/push_docker_images.yml index 74a6f871a..9ee8b8b76 100644 --- a/.github/workflows/push_docker_images.yml +++ b/.github/workflows/push_docker_images.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe3f3c597..756cc1eec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b78394d8b..55a2a0b76 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,10 +12,10 @@ jobs: name: test steps: - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: '1.20' - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test run: go test ./... \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2c129d821..6598b8e1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG RUNNER_IMAGE="gcr.io/distroless/static-debian11" # Builder # -------------------------------------------------------- -FROM golang:${GO_VERSION}-alpine as builder +FROM golang:${GO_VERSION}-alpine3.18 as builder ARG GIT_VERSION ARG GIT_COMMIT diff --git a/README.md b/README.md index d2e721e98..9b8415a16 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Cosmos blockchain with IBC-v7 and wasm client enable. ## Quick start -Requires [Go 1.19](https://go.dev/doc/install) or higher. +Requires [Go 1.20](https://go.dev/doc/install) or higher. ```bash make install diff --git a/go.work.example b/go.work.example index 46219ac3b..9d174bce0 100644 --- a/go.work.example +++ b/go.work.example @@ -1,4 +1,4 @@ -go 1.19 +go 1.20 use ( ./ diff --git a/tests/interchaintest/go.mod b/tests/interchaintest/go.mod index dffbe962d..6d80d135e 100644 --- a/tests/interchaintest/go.mod +++ b/tests/interchaintest/go.mod @@ -1,6 +1,6 @@ module github.com/notional-labs/composable-testnet/tests/interchaintest -go 1.19 +go 1.20 require ( github.com/cosmos/ibc-go/v7 v7.0.0 diff --git a/tests/interchaintest/go.sum b/tests/interchaintest/go.sum index 24b3b43e9..8c60906fb 100644 --- a/tests/interchaintest/go.sum +++ b/tests/interchaintest/go.sum @@ -229,7 +229,7 @@ github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2B github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/sarama v1.20.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StirlingMarketingGroup/go-namecase v1.0.0 h1:2CzaNtCzc4iNHirR+5ru9OzGg8rQp860gqLBFqRI02Y= @@ -839,7 +839,7 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.20.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -1597,7 +1597,7 @@ google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnp google.golang.org/genproto v0.0.0-20230301171018-9ab4bdc49ad5 h1:/cadn7taPtPlCgiWNetEPsle7jgnlad2R7gR5MXB6dM= google.golang.org/genproto v0.0.0-20230301171018-9ab4bdc49ad5/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/tests/interchaintest/setup.go b/tests/interchaintest/setup.go index 74e6b338c..78fe8b92a 100644 --- a/tests/interchaintest/setup.go +++ b/tests/interchaintest/setup.go @@ -8,8 +8,8 @@ import ( ) var ( - CentauriMainRepo = "ghcr.io/notional-labs/centauri" - CentauriICTestRepo = "ghcr.io/notional-labs/centauri-ictest" + CentauriMainRepo = "ghcr.io/composablefi/composable-cosmos" + CentauriICTestRepo = "ghcr.io/composablefi/centauri-ictest" repo, version = GetDockerImageInfo() diff --git a/tests/interchaintest/upgrade_chain_test.go b/tests/interchaintest/upgrade_chain_test.go index acd90d172..ea2973bc7 100644 --- a/tests/interchaintest/upgrade_chain_test.go +++ b/tests/interchaintest/upgrade_chain_test.go @@ -20,7 +20,7 @@ const ( func TestCentauriUpgrade(t *testing.T) { repo, version := GetDockerImageInfo() - CosmosChainUpgradeTest(t, repo, version, "v6") + CosmosChainUpgradeTest(t, repo, version, "v6_4") } func CosmosChainUpgradeTest(t *testing.T, upgradeContainerRepo, upgradeVersion, upgradeName string) { @@ -38,8 +38,8 @@ func CosmosChainUpgradeTest(t *testing.T, upgradeContainerRepo, upgradeVersion, ChainID: "centaurid", Images: []ibc.DockerImage{ { - Repository: "ghcr.io/notional-labs/centauri", - Version: "6.0", + Repository: "ghcr.io/composablefi/composable-cosmos", + Version: "6.3.7", UidGid: "1025:1025", }, },