Merge branch 'main' into insumity/add-v21-upgrade

cosmos · Oct 2, 2024 · 1626e11 · 1626e11
2 parents 19aa123 + 7f16da6
commit 1626e11
Show file tree

Hide file tree

Showing 59 changed files with 389 additions and 137 deletions.
diff --git a/.changelog/unreleased/dependencies/3366-bump-wasmvm-version.md b/.changelog/unreleased/dependencies/3366-bump-wasmvm-version.md
@@ -0,0 +1,2 @@
+- Update wasmvm to v2.1.3 - security patch
+  ([\#3366](https://github.com/cosmos/gaia/pull/3366))
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,6 @@
 node_modules
 build
 .github
-.vscode
+.vscode
+docs
+.changelog
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -21,7 +21,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v19.2.x"
+    target-branch: "release/v21.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -40,7 +40,7 @@ jobs:
           make build-docs
 
       - name: Deploy 🚀
-        uses: JamesIves/[email protected].4
+        uses: JamesIves/[email protected].8
         with:
           branch: gh-pages
           folder: ~/output

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -46,7 +46,7 @@ jobs:
           flavor: "latest=false"
 
       - name: Build and push docker image
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.9.0
         with:
           context: .
           file: Dockerfile

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -163,15 +163,15 @@ jobs:
       # the old gaiad binary version is hardcoded, need to be updated each major release.
       - name: Install Old Gaiad
         run: |
-          curl -LO https://github.com/cosmos/gaia/releases/download/v19.1.0/gaiad-v19.1.0-linux-amd64
-          chmod a+x gaiad-v19.1.0-linux-amd64
+          curl -LO https://github.com/cosmos/gaia/releases/download/v20.0.0/gaiad-v20.0.0-linux-amd64
+          chmod a+x gaiad-v20.0.0-linux-amd64
           mkdir build
-          mv ./gaiad-v19.1.0-linux-amd64 ./build/gaiadold
+          mv ./gaiad-v20.0.0-linux-amd64 ./build/gaiadold
         if: env.GIT_DIFF
       - name: Install New Gaiad
         run: |
-          curl -LO https://github.com/CosmWasm/wasmvm/releases/download/v2.1.2/libwasmvm.x86_64.so
-          curl -LO https://github.com/CosmWasm/wasmvm/releases/download/v2.1.2/libwasmvm.aarch64.so
+          curl -LO https://github.com/CosmWasm/wasmvm/releases/download/v2.1.3/libwasmvm.x86_64.so
+          curl -LO https://github.com/CosmWasm/wasmvm/releases/download/v2.1.3/libwasmvm.aarch64.so
           uname -m
           sudo cp "./libwasmvm.$(uname -m).so" /usr/lib/
           make build

diff --git a/.mergify.yml b/.mergify.yml
@@ -24,14 +24,14 @@ pull_request_rules:
           {{ title }} (#{{ number }})
           {{ body }}
 
-  - name: Backport patches to the release/v19.2.x branch
+  - name: Backport patches to the release/v21.x branch
     conditions:
       - base=main
-      - label=A:backport/v19.2.x
+      - label=A:backport/v21.x
     actions:
       backport:
         branches:
-          - release/v19.2.x
+          - release/v21.x
 
   - name: Backport patches to the release/v20.x branch
     conditions:

diff --git a/Dockerfile b/Dockerfile
@@ -8,11 +8,11 @@ ENV PACKAGES="curl make git libc-dev bash file gcc linux-headers eudev-dev"
 RUN apk add --no-cache $PACKAGES
 
 # See https://github.com/CosmWasm/wasmvm/releases
-ARG WASMVM_VERSION=v2.1.2
+ARG WASMVM_VERSION=v2.1.3
 ADD https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
 ADD https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
-RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 0881c5b463e89e229b06370e9e2961aec0a5c636772d5142c68d351564464a66
-RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 58e1f6bfa89ee390cb9abc69a5bc126029a497fe09dd399f38a82d0d86fe95ef
+RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep faea4e15390e046d2ca8441c21a88dba56f9a0363f92c5d94015df0ac6da1f2d
+RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 8dab08434a5fe57a6fbbcb8041794bc3c31846d31f8ff5fb353ee74e0fcd3093
 RUN cp "/lib/libwasmvm_muslc.$(uname -m).a" /lib/libwasmvm_muslc.a
 
 COPY go.mod go.sum* ./

diff --git a/ante/ante.go b/ante/ante.go
@@ -22,7 +22,7 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	gaiaerrors "github.com/cosmos/gaia/v20/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
 )
 
 // UseFeeMarketDecorator to make the integration testing easier: we can switch off its ante and post decorators with this flag

diff --git a/ante/gov_expedited_ante.go b/ante/gov_expedited_ante.go
@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 
-	gaiaerrors "github.com/cosmos/gaia/v20/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
 )
 
 var expeditedPropDecoratorEnabled = true

diff --git a/ante/gov_expedited_ante_test.go b/ante/gov_expedited_ante_test.go
@@ -14,8 +14,8 @@ import (
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
-	"github.com/cosmos/gaia/v20/ante"
-	"github.com/cosmos/gaia/v20/app/helpers"
+	"github.com/cosmos/gaia/v21/ante"
+	"github.com/cosmos/gaia/v21/app/helpers"
 )
 
 func TestGovExpeditedProposalsDecorator(t *testing.T) {

diff --git a/ante/gov_vote_ante.go b/ante/gov_vote_ante.go
@@ -12,7 +12,7 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	gaiaerrors "github.com/cosmos/gaia/v20/types/errors"
+	gaiaerrors "github.com/cosmos/gaia/v21/types/errors"
 )
 
 var (

diff --git a/ante/gov_vote_ante_test.go b/ante/gov_vote_ante_test.go
@@ -15,8 +15,8 @@ import (
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/cosmos/gaia/v20/ante"
-	"github.com/cosmos/gaia/v20/app/helpers"
+	"github.com/cosmos/gaia/v21/ante"
+	"github.com/cosmos/gaia/v21/app/helpers"
 )
 
 // Test that the GovVoteDecorator rejects v1beta1 vote messages from accounts with less than 1 atom staked

diff --git a/app/app.go b/app/app.go
@@ -66,17 +66,17 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	gaiaante "github.com/cosmos/gaia/v20/ante"
-	"github.com/cosmos/gaia/v20/app/keepers"
-	"github.com/cosmos/gaia/v20/app/upgrades"
-	v20 "github.com/cosmos/gaia/v20/app/upgrades/v20"
+	gaiaante "github.com/cosmos/gaia/v21/ante"
+	"github.com/cosmos/gaia/v21/app/keepers"
+	"github.com/cosmos/gaia/v21/app/upgrades"
+	v21 "github.com/cosmos/gaia/v21/app/upgrades/v21"
 )
 
 var (
 	// DefaultNodeHome default home directories for the application daemon
 	DefaultNodeHome string
 
-	Upgrades = []upgrades.Upgrade{v20.Upgrade}
+	Upgrades = []upgrades.Upgrade{v21.Upgrade}
 )
 
 var (

diff --git a/app/app_test.go b/app/app_test.go
@@ -14,8 +14,8 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
-	gaia "github.com/cosmos/gaia/v20/app"
-	gaiahelpers "github.com/cosmos/gaia/v20/app/helpers"
+	gaia "github.com/cosmos/gaia/v21/app"
+	gaiahelpers "github.com/cosmos/gaia/v21/app/helpers"
 )
 
 type EmptyAppOptions struct{}

diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go
@@ -30,7 +30,7 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
-	gaiaapp "github.com/cosmos/gaia/v20/app"
+	gaiaapp "github.com/cosmos/gaia/v21/app"
 )
 
 // SimAppChainID hardcoded chainID for simulation

diff --git a/app/modules.go b/app/modules.go
@@ -62,8 +62,8 @@ import (
 	wasm "github.com/CosmWasm/wasmd/x/wasm"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	"github.com/cosmos/gaia/v20/x/metaprotocols"
-	metaprotocolstypes "github.com/cosmos/gaia/v20/x/metaprotocols/types"
+	"github.com/cosmos/gaia/v21/x/metaprotocols"
+	metaprotocolstypes "github.com/cosmos/gaia/v21/x/metaprotocols/types"
 )
 
 var maccPerms = map[string][]string{

diff --git a/app/post.go b/app/post.go
@@ -8,7 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/cosmos/gaia/v20/ante"
+	"github.com/cosmos/gaia/v21/ante"
 )
 
 // PostHandlerOptions are the options required for constructing a FeeMarket PostHandler.

diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go
@@ -22,7 +22,7 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	gaia "github.com/cosmos/gaia/v20/app"
+	gaia "github.com/cosmos/gaia/v21/app"
 )
 
 // Simulation parameter constants

diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 
-	gaia "github.com/cosmos/gaia/v20/app"
+	gaia "github.com/cosmos/gaia/v21/app"
 )
 
 // SimulationOperations retrieves the simulation params from the provided file path

diff --git a/app/sim_bench_test.go b/app/sim_bench_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
 
-	gaia "github.com/cosmos/gaia/v20/app"
-	"github.com/cosmos/gaia/v20/app/sim"
+	gaia "github.com/cosmos/gaia/v21/app"
+	"github.com/cosmos/gaia/v21/app/sim"
 )
 
 // Profile with:

diff --git a/app/sim_test.go b/app/sim_test.go
@@ -23,11 +23,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
 
-	"github.com/cosmos/gaia/v20/ante"
-	gaia "github.com/cosmos/gaia/v20/app"
+	"github.com/cosmos/gaia/v21/ante"
+	gaia "github.com/cosmos/gaia/v21/app"
 	// "github.com/cosmos/gaia/v11/app/helpers"
 	// "github.com/cosmos/gaia/v11/app/params"
-	"github.com/cosmos/gaia/v20/app/sim"
+	"github.com/cosmos/gaia/v21/app/sim"
 )
 
 // AppChainID hardcoded chainID for simulation

diff --git a/app/upgrades/types.go b/app/upgrades/types.go
@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/cosmos/gaia/v20/app/keepers"
+	"github.com/cosmos/gaia/v21/app/keepers"
 )
 
 // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal

diff --git a/app/upgrades/v19/constants.go b/app/upgrades/v19/constants.go
@@ -1,7 +1,7 @@
 package v19
 
 import (
-	"github.com/cosmos/gaia/v20/app/upgrades"
+	"github.com/cosmos/gaia/v21/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v19/upgrades.go b/app/upgrades/v19/upgrades.go
@@ -8,7 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/cosmos/gaia/v20/app/keepers"
+	"github.com/cosmos/gaia/v21/app/keepers"
 )
 
 func CreateUpgradeHandler(

diff --git a/app/upgrades/v20/constants.go b/app/upgrades/v20/constants.go
@@ -1,7 +1,7 @@
 package v20
 
 import (
-	"github.com/cosmos/gaia/v20/app/upgrades"
+	"github.com/cosmos/gaia/v21/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v20/upgrades.go b/app/upgrades/v20/upgrades.go
@@ -23,7 +23,7 @@ import (
 	govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
-	"github.com/cosmos/gaia/v20/app/keepers"
+	"github.com/cosmos/gaia/v21/app/keepers"
 )
 
 // Constants for the new parameters in the v20 upgrade.

diff --git a/app/upgrades/v20/upgrades_test.go b/app/upgrades/v20/upgrades_test.go
@@ -21,8 +21,8 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 
-	"github.com/cosmos/gaia/v20/app/helpers"
-	v20 "github.com/cosmos/gaia/v20/app/upgrades/v20"
+	"github.com/cosmos/gaia/v21/app/helpers"
+	v20 "github.com/cosmos/gaia/v21/app/upgrades/v20"
 )
 
 func GetTestMsgConsumerAddition() providertypes.MsgConsumerAddition { //nolint:staticcheck

diff --git a/app/upgrades/v21/constants.go b/app/upgrades/v21/constants.go
@@ -1,7 +1,7 @@
 package v21
 
 import (
-	"github.com/cosmos/gaia/v20/app/upgrades"
+	"github.com/cosmos/gaia/v21/app/upgrades"
 )
 
 const (

diff --git a/app/upgrades/v21/upgrades.go b/app/upgrades/v21/upgrades.go
@@ -2,15 +2,16 @@ package v21
 
 import (
 	"context"
+	"fmt"
+
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
-	"fmt"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	"github.com/cosmos/gaia/v20/app/keepers"
+	"github.com/cosmos/gaia/v21/app/keepers"
 	providerkeeper "github.com/cosmos/interchain-security/v6/x/ccv/provider/keeper"
 	types2 "github.com/cosmos/interchain-security/v6/x/ccv/provider/types"
 )

diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	addressutil "github.com/cosmos/gaia/v20/pkg/address"
+	addressutil "github.com/cosmos/gaia/v21/pkg/address"
 )
 
 var flagBech32Prefix = "prefix"

diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go
@@ -57,7 +57,7 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
-	gaia "github.com/cosmos/gaia/v20/app"
+	gaia "github.com/cosmos/gaia/v21/app"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

diff --git a/cmd/gaiad/cmd/root_test.go b/cmd/gaiad/cmd/root_test.go
@@ -7,8 +7,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	app "github.com/cosmos/gaia/v20/app"
-	"github.com/cosmos/gaia/v20/cmd/gaiad/cmd"
+	app "github.com/cosmos/gaia/v21/app"
+	"github.com/cosmos/gaia/v21/cmd/gaiad/cmd"
 )
 
 func TestRootCmdConfig(t *testing.T) {

diff --git a/cmd/gaiad/cmd/testnet_set_local_validator.go b/cmd/gaiad/cmd/testnet_set_local_validator.go
@@ -19,7 +19,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	gaia "github.com/cosmos/gaia/v20/app"
+	gaia "github.com/cosmos/gaia/v21/app"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 

diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go
@@ -5,8 +5,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	app "github.com/cosmos/gaia/v20/app"
-	"github.com/cosmos/gaia/v20/cmd/gaiad/cmd"
+	app "github.com/cosmos/gaia/v21/app"
+	"github.com/cosmos/gaia/v21/cmd/gaiad/cmd"
 )
 
 func main() {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Update wasmvm to v2.1.3 - security patch
		([\#3366](https://github.com/cosmos/gaia/pull/3366))