Merge pull request CosmosContracts#543 from CosmosContracts/reece/bum…

…p-to-v13 chore(cleanup): Main to V13 + ICA improvement
graphprotocol · Feb 8, 2023 · 2f69983 · 2f69983
2 parents d3a183a + f77aa31
commit 2f69983
Show file tree

Hide file tree

Showing 137 changed files with 741 additions and 794 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20.0
       - run: go build ./...
 
   test:
@@ -25,7 +25,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20.0
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Test
@@ -37,10 +37,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20.0
       - name: Test price-feeder
-        run: cd price-feeder && make test-unit   
-
+        run: cd price-feeder && make test-unit
 
   tidy:
     runs-on: ubuntu-latest
@@ -50,7 +49,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20.0
       - run: |
           go mod tidy
           CHANGES_IN_REPO=$(git status --porcelain)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20.0
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
@@ -50,7 +50,6 @@ jobs:
       #   with:
       #     debug: true
 
-
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
 

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20.0
       - uses: actions/checkout@v3
 
       - name: golangci-lint-junod
@@ -35,7 +35,7 @@ jobs:
 
       - name: golangci-lint-price_feeder
         uses: golangci/golangci-lint-action@v3
-        with:          
+        with:
           version: latest
           working-directory: price-feeder
           args: --timeout 10m
diff --git a/.github/workflows/lint-price-feeder.yml b/.github/workflows/lint-price-feeder.yml
@@ -0,0 +1,35 @@
+---
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+      - main
+  pull_request:
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  # pull-requests: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.0
+      - uses: actions/checkout@v3
+
+      - name: golangci-lint-price_feeder
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          working-directory: price-feeder
+          args: --timeout 10m
diff --git a/.github/workflows/price-feeder-release.yaml b/.github/workflows/price-feeder-release.yaml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.20.0
           cache: true
           cache-dependency-path: price-feeder/go.sum
       # Parse 'v*.*.*' semantic version from 'price-feeder/v*.*.*' and save to

diff --git a/.github/workflows/test-e2e-oracle.yml b/.github/workflows/test-e2e-oracle.yml
@@ -19,24 +19,20 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
-      -
-        name: Setup Go
+      - name: Setup Go
         uses: actions/[email protected]
         with:
-          go-version: 1.19
-      -
-        name: Check out repository code
+          go-version: 1.20.0
+      - name: Check out repository code
         uses: actions/checkout@v2
-      -
-        name: Get git diff
+      - name: Get git diff
         uses: technote-space/[email protected]
         with:
           PATTERNS: |
             **/**.go
             go.mod
             go.sum
-      -
-        name: Get data from build cache
+      - name: Get data from build cache
         uses: actions/cache@v3
         with:
           # In order:
@@ -52,15 +48,11 @@ jobs:
           key: ${{ runner.os }}-go-docker-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-docker-${{ matrix.go-version }}-
-      -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      -
-        name: Build e2e image
+      - name: Build e2e image
         run: make docker-build-debug
-      -
-        name: Test e2e oracle
-        run: make test-e2e-oracle
+      - name: Test e2e oracle
+        run: make test-e2e-oracle
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -1,4 +1,4 @@
-name: Test-e2e 
+name: Test-e2e
 
 on:
   pull_request:
@@ -19,24 +19,20 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
-      -
-        name: Setup Go
+      - name: Setup Go
         uses: actions/[email protected]
         with:
-          go-version: 1.18
-      -
-        name: Check out repository code
+          go-version: 1.20.0
+      - name: Check out repository code
         uses: actions/checkout@v2
-      -
-        name: Get git diff
+      - name: Get git diff
         uses: technote-space/[email protected]
         with:
           PATTERNS: |
             **/**.go
             go.mod
             go.sum
-      -
-        name: Get data from build cache
+      - name: Get data from build cache
         uses: actions/cache@v3
         with:
           # In order:
@@ -52,15 +48,11 @@ jobs:
           key: ${{ runner.os }}-go-docker-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-docker-${{ matrix.go-version }}-
-      -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      -
-        name: Build e2e image
+      - name: Build e2e image
         run: make docker-build-debug
-      -
-        name: Test e2e and Upgrade
+      - name: Test e2e and Upgrade
         run: make test-e2e-ci
diff --git a/.github/workflows/test-simulation.yml b/.github/workflows/test-simulation.yml
@@ -1,6 +1,6 @@
 ---
-on:  pull_request
-name: Test Simulation 
+on: pull_request
+name: Test Simulation
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     name: test
     steps:
-    - name: Install Go
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.18
-    - name: Checkout code
-      uses: actions/checkout@v3
-    - name: Test
-      run: make test-sim-multi-seed-short
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.0
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Test
+        run: make test-sim-multi-seed-short
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # docker build . -t cosmoscontracts/juno:latest
 # docker run --rm -it cosmoscontracts/juno:latest /bin/sh
-FROM golang:1.19-alpine AS go-builder
+FROM golang:1.20-alpine AS go-builder
 
 # this comes from standard alpine nightly file
 #  https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile

diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ TM_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::
 DOCKER := $(shell which docker)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8
 BUILDDIR ?= $(CURDIR)/build
-E2E_UPGRADE_VERSION := "v12"
+E2E_UPGRADE_VERSION := "v13"
 export GO111MODULE = on
 
 # process build tags
@@ -92,6 +92,14 @@ endif
 include contrib/devtools/Makefile
 
 all: install
+	@echo "--> project root: go mod tidy"	
+	@go mod tidy
+	@echo "--> price-feeder: go mod tidy "	
+	@make -C price-feeder tidy
+	@echo "--> price-feeder: linting --fix"	
+	@make -C price-feeder lint
+	@echo "--> project root: linting --fix"	
+	@GOGC=1 golangci-lint run --fix --timeout=8m
 
 install: go.sum
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/junod

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -4,7 +4,7 @@ This document contains the roadmap for the Juno project. It is a living document
 
 ---
 
-## V13 - Q3 or Q4 2023 / TBD
+## V14 - Q3 or Q4 2023 / TBD
 <!-- - [Medium Blog](https://medium.com/@reecepbcups/juno-v12-update-4bab64640a62) -->
 
 - [Notion Plan Page](https://fluffy-conifer-309.notion.site/123261ebfe2040d9ac559f7e7d3c5cd2?v=6d59a04765f543738676f8db21ae8525)
@@ -25,19 +25,19 @@ This update will focus more on upgrading the base layer of the Juno stack, bring
 
 ---
 
-## V12 - Q1 2023
+## V13 - Q1 2023
 
 Links:
 
 - [Medium Blog](https://medium.com/@reecepbcups/juno-v12-update-4bab64640a62)
 
 - [Notion Plan Page](https://fluffy-conifer-309.notion.site/123261ebfe2040d9ac559f7e7d3c5cd2?v=6d59a04765f543738676f8db21ae8525)
 
-- [V12 Tracking Issue](https://github.com/CosmosContracts/juno/issues/268)
+- [3 Tracking Issue](https://github.com/CosmosContracts/juno/issues/268)
 
-The V12 update is Juno's largest update, bringing many new features for developers, users, and relayers.
+The V13 update is Juno's largest update, bringing many new features for developers, users, and relayers.
 
-### V12 PRs
+### V13 PRs
 
 - [x/FeeShare (CosmWasm)](https://github.com/CosmosContracts/juno/pull/385)
 - [x/TokenFactory](https://github.com/CosmosContracts/juno/pull/368)
@@ -50,7 +50,7 @@ The V12 update is Juno's largest update, bringing many new features for develope
 - [x/ibc V4](https://github.com/CosmosContracts/juno/pull/387)
 - [x/ibc-fees](https://github.com/CosmosContracts/juno/pull/432)
 
-V12 is targeted at developers with relayer and user experience improvements as well.
+V13 is targeted at developers with relayer and user experience improvements as well.
 
 **FeeShare** will allow contract developers to receive 50% of gas fees executed on their contract. Providing an alternative income source for new business use cases. This also enhances current business models to support developers & grow the ecosystem further.
 

diff --git a/app/ante.go b/app/ante.go
@@ -14,10 +14,10 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 
 	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	decorators "github.com/CosmosContracts/juno/v12/app/decorators"
+	decorators "github.com/CosmosContracts/juno/v13/app/decorators"
 
-	feeshareante "github.com/CosmosContracts/juno/v12/x/feeshare/ante"
-	feesharekeeper "github.com/CosmosContracts/juno/v12/x/feeshare/keeper"
+	feeshareante "github.com/CosmosContracts/juno/v13/x/feeshare/ante"
+	feesharekeeper "github.com/CosmosContracts/juno/v13/x/feeshare/keeper"
 )
 
 func updateAppSimulationFlag(flag bool) {

diff --git a/app/app.go b/app/app.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/CosmosContracts/juno/v12/app/openapiconsole"
-	"github.com/CosmosContracts/juno/v12/docs"
+	"github.com/CosmosContracts/juno/v13/app/openapiconsole"
+	"github.com/CosmosContracts/juno/v13/docs"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
@@ -48,13 +48,14 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/CosmosContracts/juno/v12/app/keepers"
-	encparams "github.com/CosmosContracts/juno/v12/app/params"
-	upgrades "github.com/CosmosContracts/juno/v12/app/upgrades"
-	v10 "github.com/CosmosContracts/juno/v12/app/upgrades/v10"
-	v11 "github.com/CosmosContracts/juno/v12/app/upgrades/v11"
-	v12 "github.com/CosmosContracts/juno/v12/app/upgrades/v12"
-	oracleclient "github.com/CosmosContracts/juno/v12/x/oracle/client"
+	"github.com/CosmosContracts/juno/v13/app/keepers"
+	encparams "github.com/CosmosContracts/juno/v13/app/params"
+	upgrades "github.com/CosmosContracts/juno/v13/app/upgrades"
+	v10 "github.com/CosmosContracts/juno/v13/app/upgrades/v10"
+	v11 "github.com/CosmosContracts/juno/v13/app/upgrades/v11"
+	v12 "github.com/CosmosContracts/juno/v13/app/upgrades/v12"
+	v13 "github.com/CosmosContracts/juno/v13/app/upgrades/v13"
+	oracleclient "github.com/CosmosContracts/juno/v13/x/oracle/client"
 )
 
 const (
@@ -75,7 +76,7 @@ var (
 	// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
 	EnableSpecificProposals = ""
 
-	Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade}
+	Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade}
 )
 
 // These constants are derived from the above variables.

diff --git a/app/encoding.go b/app/encoding.go
@@ -1,7 +1,7 @@
 package app
 
 import (
-	"github.com/CosmosContracts/juno/v12/app/params"
+	"github.com/CosmosContracts/juno/v13/app/params"
 
 	"github.com/cosmos/cosmos-sdk/std"
 )