Merge branch 'main' into reece/hooks-module

CosmosContracts · Oct 3, 2023 · 43065b4 · 43065b4
2 parents 4adcd7f + de2d7cd
commit 43065b4
Show file tree

Hide file tree

Showing 173 changed files with 1,411 additions and 646 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,14 +12,14 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.20.7
+  GO_VERSION: 1.21.0
 
 jobs:
   build:
     runs-on: ubuntu-latest
     name: build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup go
         uses: actions/setup-go@v4
         with:
@@ -35,15 +35,15 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Test
         run: go test ./...
 
   tidy:
     runs-on: ubuntu-latest
     name: tidy
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup go
         uses: actions/setup-go@v4
         with:

diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
@@ -16,13 +16,13 @@ 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
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Build without push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -18,7 +18,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.20.7
+  GO_VERSION: 1.21.0
 
 jobs:
   analyze:
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v2
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -17,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.20.7
+  GO_VERSION: 1.21.0
 
 jobs:
   golangci:
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: golangci-lint-junod
         uses: golangci/golangci-lint-action@v3

diff --git a/.github/workflows/interchaintest-E2E.yml b/.github/workflows/interchaintest-E2E.yml
@@ -14,7 +14,7 @@ permissions:
   packages: write
 
 env:
-  GO_VERSION: 1.20.7
+  GO_VERSION: 1.21.0
   TAR_PATH: /tmp/juno-docker-image.tar
   IMAGE_NAME: juno-docker-image
 
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Go ${{ env.GO_VERSION }}
         uses: actions/setup-go@v4
@@ -36,10 +36,10 @@ jobs:
           cache-dependency-path: interchaintest/go.sum
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and export
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           tags: juno:local
@@ -69,6 +69,7 @@ jobs:
           - "ictest-unity-gov"
           - "ictest-pob"
           - "ictest-drip"
+          - "ictest-burn"
           - "ictest-clock"
       fail-fast: false
 
@@ -80,7 +81,7 @@ jobs:
           cache-dependency-path: interchaintest/go.sum
 
       - name: checkout chain
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Tarball Artifact
         uses: actions/download-artifact@v3

diff --git a/.github/workflows/push-docker-images.yml b/.github/workflows/push-docker-images.yml
@@ -34,15 +34,15 @@ jobs:
     steps:
       - 
         name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - 
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - 
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
+        uses: docker/login-action@v3 
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -62,7 +62,7 @@ jobs:
       - 
         name: Build and push 
         id: build_push_image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           file: Dockerfile
           context: .

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker compose
         run: STAKE_TOKEN="ujunox" TIMEOUT_COMMIT=500ms docker-compose up -d

diff --git a/.github/workflows/test-simulation.yml.archive b/.github/workflows/test-simulation.yml.archive
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.20-alpine AS go-builder
+FROM golang:1.21-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
@@ -160,6 +160,9 @@ ictest-pob: rm-testcache
 ictest-drip: rm-testcache
 	cd interchaintest &&  go test -race -v -run TestJunoDrip .
 
+ictest-burn: rm-testcache
+	cd interchaintest &&  go test -race -v -run TestJunoBurnModule .
+
 ictest-clock: rm-testcache
 	cd interchaintest &&  go test -race -v -run TestJunoClock .
 

diff --git a/app/ante.go b/app/ante.go
@@ -19,11 +19,11 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
-	decorators "github.com/CosmosContracts/juno/v17/app/decorators"
-	feeshareante "github.com/CosmosContracts/juno/v17/x/feeshare/ante"
-	feesharekeeper "github.com/CosmosContracts/juno/v17/x/feeshare/keeper"
-	globalfeeante "github.com/CosmosContracts/juno/v17/x/globalfee/ante"
-	globalfeekeeper "github.com/CosmosContracts/juno/v17/x/globalfee/keeper"
+	decorators "github.com/CosmosContracts/juno/v18/app/decorators"
+	feeshareante "github.com/CosmosContracts/juno/v18/x/feeshare/ante"
+	feesharekeeper "github.com/CosmosContracts/juno/v18/x/feeshare/keeper"
+	globalfeeante "github.com/CosmosContracts/juno/v18/x/globalfee/ante"
+	globalfeekeeper "github.com/CosmosContracts/juno/v18/x/globalfee/keeper"
 )
 
 // Lower back to 1 mil after https://github.com/cosmos/relayer/issues/1255

diff --git a/app/app.go b/app/app.go
@@ -63,18 +63,19 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/CosmosContracts/juno/v17/app/keepers"
-	"github.com/CosmosContracts/juno/v17/app/openapiconsole"
-	upgrades "github.com/CosmosContracts/juno/v17/app/upgrades"
-	v10 "github.com/CosmosContracts/juno/v17/app/upgrades/v10"
-	v11 "github.com/CosmosContracts/juno/v17/app/upgrades/v11"
-	v12 "github.com/CosmosContracts/juno/v17/app/upgrades/v12"
-	v13 "github.com/CosmosContracts/juno/v17/app/upgrades/v13"
-	v14 "github.com/CosmosContracts/juno/v17/app/upgrades/v14"
-	v15 "github.com/CosmosContracts/juno/v17/app/upgrades/v15"
-	v16 "github.com/CosmosContracts/juno/v17/app/upgrades/v16"
-	v17 "github.com/CosmosContracts/juno/v17/app/upgrades/v17"
-	"github.com/CosmosContracts/juno/v17/docs"
+	"github.com/CosmosContracts/juno/v18/app/keepers"
+	"github.com/CosmosContracts/juno/v18/app/openapiconsole"
+	upgrades "github.com/CosmosContracts/juno/v18/app/upgrades"
+	v10 "github.com/CosmosContracts/juno/v18/app/upgrades/v10"
+	v11 "github.com/CosmosContracts/juno/v18/app/upgrades/v11"
+	v12 "github.com/CosmosContracts/juno/v18/app/upgrades/v12"
+	v13 "github.com/CosmosContracts/juno/v18/app/upgrades/v13"
+	v14 "github.com/CosmosContracts/juno/v18/app/upgrades/v14"
+	v15 "github.com/CosmosContracts/juno/v18/app/upgrades/v15"
+	v16 "github.com/CosmosContracts/juno/v18/app/upgrades/v16"
+	v17 "github.com/CosmosContracts/juno/v18/app/upgrades/v17"
+	v18 "github.com/CosmosContracts/juno/v18/app/upgrades/v18"
+	"github.com/CosmosContracts/juno/v18/docs"
 )
 
 const (
@@ -95,7 +96,17 @@ 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, v13.Upgrade, v14.Upgrade, v15.Upgrade, v16.Upgrade, v17.Upgrade}
+	Upgrades = []upgrades.Upgrade{
+		v10.Upgrade,
+		v11.Upgrade,
+		v12.Upgrade,
+		v13.Upgrade,
+		v14.Upgrade,
+		v15.Upgrade,
+		v16.Upgrade,
+		v17.Upgrade,
+		v18.Upgrade,
+	}
 )
 
 // These constants are derived from the above variables.

diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go
@@ -34,8 +34,8 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/CosmosContracts/juno/v17/app"
-	appparams "github.com/CosmosContracts/juno/v17/app/params"
+	"github.com/CosmosContracts/juno/v18/app"
+	appparams "github.com/CosmosContracts/juno/v18/app/params"
 )
 
 type KeeperTestHelper struct {

diff --git a/app/encoding.go b/app/encoding.go
@@ -3,7 +3,7 @@ package app
 import (
 	"github.com/cosmos/cosmos-sdk/std"
 
-	"github.com/CosmosContracts/juno/v17/app/params"
+	"github.com/CosmosContracts/juno/v18/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for testing