chore: cosmos-sdk v0.42.x, modernized for easier migrations

.github/workflows/lint.yml

@@ -13,17 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 6
     steps:
-      - uses: actions/checkout@v2
-      - uses: technote-space/get-diff-action@v4
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
+      - uses: actions/checkout@v3
       - uses: golangci/golangci-lint-action@master
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.39
+          version: latest
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
-        if: env.GIT_DIFF

.golangci.yml

@@ -1,40 +1,35 @@
 run:
-  tests: false
-#   # timeout for analysis, e.g. 30s, 5m, default is 1m
-#   timeout: 5m
+  tests: true
+  timeout: 5m
+  concurrency: 4
 
 linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
     - depguard
     - dogsled
-    # - errcheck
+    - errcheck
     - goconst
     - gocritic
-    - gofmt
-    - goimports
+    - gofumpt
     - golint
     - gosec
     - gosimple
     - govet
     - ineffassign
     - interfacer
-    - maligned
     - misspell
     - nakedret
     - prealloc
     - scopelint
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unconvert
     - unused
     - unparam
     - misspell
-    # - wsl
     - nolintlint
 
 issues:

Makefile

@@ -402,7 +402,7 @@ proto-check-breaking:
 	@$(DOCKER_BUF) check breaking --against-input $(HTTPS_GIT)#branch=master
 
 
-TM_URL              = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.0-rc6/proto/tendermint
+TM_URL              = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.24/proto/tendermint
 GOGO_PROTO_URL      = https://raw.githubusercontent.com/regen-network/protobuf/cosmos
 COSMOS_PROTO_URL    = https://raw.githubusercontent.com/regen-network/cosmos-proto/master
 CONFIO_URL          = https://raw.githubusercontent.com/confio/ics23/v0.6.3

README.md

@@ -3,53 +3,27 @@ parent:
   order: false
 -->
 
-<div align="center">
-  <h1> Cosmos SDK </h1>
-</div>
-
-![banner](docs/cosmos-sdk-image.jpg)
-
-<div align="center">
-  <a href="https://github.com/cosmos/cosmos-sdk/releases/latest">
-    <img alt="Version" src="https://img.shields.io/github/tag/cosmos/cosmos-sdk.svg" />
-  </a>
-  <a href="https://github.com/cosmos/cosmos-sdk/blob/master/LICENSE">
-    <img alt="License: Apache-2.0" src="https://img.shields.io/github/license/cosmos/cosmos-sdk.svg" />
-  </a>
-  <a href="https://pkg.go.dev/github.com/cosmos/cosmos-sdk?tab=doc">
-    <img alt="GoDoc" src="https://godoc.org/github.com/cosmos/cosmos-sdk?status.svg" />
-  </a>
-  <a href="https://goreportcard.com/report/github.com/cosmos/cosmos-sdk">
-    <img alt="Go report card" src="https://goreportcard.com/badge/github.com/cosmos/cosmos-sdk" />
-  </a>
-  <a href="https://codecov.io/gh/cosmos/cosmos-sdk">
-    <img alt="Code Coverage" src="https://codecov.io/gh/cosmos/cosmos-sdk/branch/master/graph/badge.svg" />
-  </a>
-</div>
-<div align="center">
-  <a href="https://github.com/cosmos/cosmos-sdk">
-    <img alt="Lines Of Code" src="https://tokei.rs/b1/github/cosmos/cosmos-sdk" />
-  </a>
-  <a href="https://discord.gg/AzefAFd">
-    <img alt="Discord" src="https://img.shields.io/discord/669268347736686612.svg" />
-  </a>
-  <a href="https://sourcegraph.com/github.com/cosmos/cosmos-sdk?badge">
-    <img alt="Imported by" src="https://sourcegraph.com/github.com/cosmos/cosmos-sdk/-/badge.svg" />
-  </a>
-    <img alt="Sims" src="https://github.com/cosmos/cosmos-sdk/workflows/Sims/badge.svg" />
-    <img alt="Lint Satus" src="https://github.com/cosmos/cosmos-sdk/workflows/Lint/badge.svg" />
-</div>
+# This version of the SDK is deprecated
 
+## Cosmos-SDK v0.42.x
 
+This build of the cosmos-sdk has been updated for easier migrations:
 
+* it uses iavl v0.19.4 with fast node on by default
+* it's been linted so that if you encounter issues in your migration, those issues stand out when using a linter.
+* it uses tendermint v0.34.24
+
+**Please kindly note that this is unsupported software.**
+
+## Cosmos-SDK Propaganda
 
 The Cosmos-SDK is a framework for building blockchain applications in Golang.
 It is being used to build [`Gaia`](https://github.com/cosmos/gaia), the first implementation of the Cosmos Hub.
 
 **WARNING**: The SDK has mostly stabilized, but we are still making some
 breaking changes.
 
-**Note**: Requires [Go 1.15+](https://golang.org/dl/)
+**Note**: Requires [Go 1.18+](https://golang.org/dl/)
 
 ## Quick Start
 

baseapp/baseapp.go

@@ -28,9 +28,7 @@ const (
 	runTxModeDeliver                   // Deliver a transaction
 )
 
-var (
-	_ abci.Application = (*BaseApp)(nil)
-)
+var _ abci.Application = (*BaseApp)(nil)
 
 type (
 	// Enum mode for app.runTx
@@ -44,7 +42,7 @@ type (
 )
 
 // BaseApp reflects the ABCI application implementation.
-type BaseApp struct { // nolint: maligned
+type BaseApp struct { //nolint: maligned
 	// initialized on creation
 	logger            log.Logger
 	name              string               // application name from abci.Info

baseapp/baseapp_test.go

@@ -5,7 +5,6 @@ import (
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"strings"
@@ -134,7 +133,7 @@ func setupBaseAppWithSnapshots(t *testing.T, blocks uint, blockTxs int, options
 
 	snapshotInterval := uint64(2)
 	snapshotTimeout := 1 * time.Minute
-	snapshotDir, err := ioutil.TempDir("", "baseapp")
+	snapshotDir, err := os.MkdirTemp("", "baseapp")
 	require.NoError(t, err)
 	snapshotStore, err := snapshots.NewStore(dbm.NewMemDB(), snapshotDir)
 	require.NoError(t, err)
@@ -1292,7 +1291,6 @@ func TestTxGasLimits(t *testing.T) {
 
 			return newCtx, nil
 		})
-
 	}
 
 	routerOpt := func(bapp *BaseApp) {

baseapp/msg_service_router.go

@@ -41,9 +41,9 @@ func (msr *MsgServiceRouter) Handler(methodName string) MsgServiceHandler {
 // service description, handler is an object which implements that gRPC service.
 //
 // This function PANICs:
-// - if it is called before the service `Msg`s have been registered using
-//   RegisterInterfaces,
-// - or if a service is being registered twice.
+//   - if it is called before the service `Msg`s have been registered using
+//     RegisterInterfaces,
+//   - or if a service is being registered twice.
 func (msr *MsgServiceRouter) RegisterService(sd *grpc.ServiceDesc, handler interface{}) {
 	// Adds a top-level query handler based on the gRPC service name.
 	for _, method := range sd.Methods {

client/broadcast_test.go

@@ -67,5 +67,4 @@ func TestBroadcastError(t *testing.T) {
 			require.Equal(t, txHash, resp.TxHash)
 		}
 	}
-
 }

client/config/config_test.go

@@ -3,7 +3,7 @@ package config_test
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 
@@ -53,12 +53,12 @@ func TestConfigCmd(t *testing.T) {
 	_, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 	require.NoError(t, err)
 
-	//./build/simd config node //http://localhost:1
+	// ./build/simd config node //http://localhost:1
 	b := bytes.NewBufferString("")
 	cmd.SetOut(b)
 	cmd.SetArgs([]string{"node"})
 	cmd.Execute()
-	out, err := ioutil.ReadAll(b)
+	out, err := io.ReadAll(b)
 	require.NoError(t, err)
 	require.Equal(t, string(out), testNode1+"\n")
 }

client/config/toml.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"text/template"
 
@@ -43,7 +42,7 @@ func writeConfigToFile(configFilePath string, config *ClientConfig) error {
 		return err
 	}
 
-	return ioutil.WriteFile(configFilePath, buffer.Bytes(), 0600)
+	return os.WriteFile(configFilePath, buffer.Bytes(), 0o600)
 }
 
 // ensureConfigPath creates a directory configPath if it does not exist

client/context_test.go

@@ -51,7 +51,7 @@ func TestContext_PrintObject(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t,
 		`{"animal":{"@type":"/testdata.Dog","size":"big","name":"Spot"},"x":"10"}
-`, string(buf.Bytes()))
+`, buf.String())
 
 	// yaml
 	buf = &bytes.Buffer{}
@@ -65,7 +65,7 @@ func TestContext_PrintObject(t *testing.T) {
   name: Spot
   size: big
 x: "10"
-`, string(buf.Bytes()))
+`, buf.String())
 
 	//
 	// amino
@@ -81,7 +81,7 @@ x: "10"
 	require.NoError(t, err)
 	require.Equal(t,
 		`{"type":"testdata/HasAnimal","value":{"animal":{"type":"testdata/Dog","value":{"size":"big","name":"Spot"}},"x":"10"}}
-`, string(buf.Bytes()))
+`, buf.String())
 
 	// yaml
 	buf = &bytes.Buffer{}
@@ -98,7 +98,7 @@ value:
       name: Spot
       size: big
   x: "10"
-`, string(buf.Bytes()))
+`, buf.String())
 }
 
 func TestCLIQueryConn(t *testing.T) {

client/debug/main.go

@@ -131,7 +131,6 @@ $ %s debug addr cosmos1e0jnq2sun3dzjh8p2xq95kk0expwmd7shwjpfg
 			`, version.AppName),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			addrString := args[0]
 			var addr []byte
 
@@ -147,7 +146,6 @@ $ %s debug addr cosmos1e0jnq2sun3dzjh8p2xq95kk0expwmd7shwjpfg
 
 					if err3 != nil {
 						return fmt.Errorf("expected hex or bech32. Got errors: hex: %v, bech32 acc: %v, bech32 val: %v", err, err2, err3)
-
 					}
 				}
 			}

client/flags/flags.go

@@ -86,7 +86,7 @@ func AddQueryFlagsToCmd(cmd *cobra.Command) {
 	cmd.Flags().Int64(FlagHeight, 0, "Use a specific height to query state at (this can error if the node is pruning state)")
 	cmd.Flags().StringP(tmcli.OutputFlag, "o", "text", "Output format (text|json)")
 
-	cmd.MarkFlagRequired(FlagChainID)
+	cmd.MarkFlagRequired(FlagChainID) // nolint: errcheck
 
 	cmd.SetErr(cmd.ErrOrStderr())
 	cmd.SetOut(cmd.OutOrStdout())

client/grpc/reflection/reflection_test.go

@@ -27,9 +27,9 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	s.queryClient = queryClient
 }
 
-func (s IntegrationTestSuite) TestSimulateService() {
+func (s IntegrationTestSuite) TestSimulateService() { //nolint:govet // this is a test and we're ok with copying locks.
 	// We will test the following interface for testing.
-	var iface = "cosmos.evidence.v1beta1.Evidence"
+	iface := "cosmos.evidence.v1beta1.Evidence"
 
 	// Test that "cosmos.evidence.v1beta1.Evidence" is included in the
 	// interfaces.

client/grpc/tmservice/service.go

@@ -22,8 +22,10 @@ type queryServer struct {
 	interfaceRegistry codectypes.InterfaceRegistry
 }
 
-var _ ServiceServer = queryServer{}
-var _ codectypes.UnpackInterfacesMessage = &GetLatestValidatorSetResponse{}
+var (
+	_ ServiceServer                      = queryServer{}
+	_ codectypes.UnpackInterfacesMessage = &GetLatestValidatorSetResponse{}
+)
 
 // NewQueryServer creates a new tendermint query server.
 func NewQueryServer(clientCtx client.Context, interfaceRegistry codectypes.InterfaceRegistry) ServiceServer {
@@ -148,7 +150,6 @@ func (s queryServer) GetValidatorSetByHeight(ctx context.Context, req *GetValida
 	}
 
 	validatorsRes, err := rpc.GetValidators(s.clientCtx, &req.Height, &page, &limit)
-
 	if err != nil {
 		return nil, err
 	}