refactor(slashing): spinout to new go module

.github/workflows/test.yml

@@ -1036,3 +1036,34 @@ jobs:
  SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
  with:
  projectBaseDir: x/gov/
+
+ test-x-slashing:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-go@v4
+ with:
+ go-version: "1.21"
+ check-latest: true
+ cache: true
+ cache-dependency-path: x/slashing/go.sum
+ - uses: technote-space/get-diff-action@v6.1.2
+ id: git_diff
+ with:
+ PATTERNS: |
+ x/slashing/**/*.go
+ x/slashing/go.mod
+ x/slashing/go.sum
+ - name: tests
+ if: env.GIT_DIFF
+ run: |
+ cd x/slashing
+ go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./...
+ - name: sonarcloud
+ if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
+ uses: SonarSource/sonarcloud-github-action@master
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+ with:
+ projectBaseDir: x/slashing/

CHANGELOG.md

@@ -175,7 +175,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
  * Remove depreacted `MakeTestingEncodingParams` from `simapp/params`
 * (x/group) [#17937](https://github.com/cosmos/cosmos-sdk/pull/17937) Groups module was moved to its own go.mod `cosmossdk.io/x/group`
 * (x/gov) [#18197](https://github.com/cosmos/cosmos-sdk/pull/18197) Gov module was moved to its own go.mod `cosmossdk.io/x/gov`
-* (x/gov) [#18199](https://github.com/cosmos/cosmos-sdk/pull/18199) Distribution module was moved to its own go.mod `cosmossdk.io/x/distribution`
+* (x/distribution) [#18199](https://github.com/cosmos/cosmos-sdk/pull/18199) Distribution module was moved to its own go.mod `cosmossdk.io/x/distribution`
+* (x/slashing) [#18201](https://github.com/cosmos/cosmos-sdk/pull/18201) Slashing module was moved to its own go.mod `cosmossdk.io/x/slashing`
 * (x/consensus) [#18041](https://github.com/cosmos/cosmos-sdk/pull/18041) `ToProtoConsensusParams()` returns an error 
 * (x/slashing) [#18115](https://github.com/cosmos/cosmos-sdk/pull/18115) `NewValidatorSigningInfo` takes strings instead of `sdk.AccAddress`
 

UPGRADING.md

@@ -34,6 +34,26 @@ Refer to SimApp `root_v2.go` and `root.go` for an example with an app v2 and a l
 
 ### Modules
 
+#### `x/group`
+
+Group was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/group`
+
+#### `x/gov`
+
+Gov was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/gov`
+
+#### `x/distribution`
+
+Distribution was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/distribution`
+
+#### `x/slashing`
+
+Slashing was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/slashing`
+
+#### Params
+
+A standalone Go module was created and it is accessible at "cosmossdk.io/x/params".
+
 #### `**all**`
 
 ##### Genesis Interface

client/v2/go.mod

@@ -160,3 +160,5 @@ replace github.com/cosmos/cosmos-sdk => ./../../
 replace cosmossdk.io/x/gov => ./../../x/gov
 
 replace cosmossdk.io/x/distribution => ./../../x/distribution
+
+replace cosmossdk.io/x/slashing => ./../../x/slashing

contrib/images/simd-env/Dockerfile

@@ -16,6 +16,7 @@ COPY x/tx/go.mod x/tx/go.sum /work/x/tx/
 COPY x/protocolpool/go.mod x/protocolpool/go.sum /work/x/protocolpool/
 COPY x/gov/go.mod x/gov/go.sum /work/x/gov/
 COPY x/distribution/go.mod x/distribution/go.sum /work/x/distribution/
+COPY x/slashing/go.mod x/slashing/go.sum /work/x/slashing/
 RUN go mod download
 
 COPY ./ /work

go.mod

@@ -14,10 +14,10 @@ require (
  cosmossdk.io/x/distribution v0.0.0-20230925135524-a1bc045b3190
  cosmossdk.io/x/gov v0.0.0-20230925135524-a1bc045b3190
  cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190
+ cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000
  cosmossdk.io/x/tx v0.11.0
  github.com/99designs/keyring v1.2.1
  github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816
- github.com/bits-and-blooms/bitset v1.10.0
  github.com/cockroachdb/errors v1.11.1
  github.com/cometbft/cometbft v0.38.0
  github.com/cosmos/btcutil v1.0.5
@@ -69,6 +69,7 @@ require (
  github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
  github.com/DataDog/zstd v1.5.5 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
+ github.com/bits-and-blooms/bitset v1.10.0 // indirect
  github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
  github.com/bufbuild/protocompile v0.6.0 // indirect
  github.com/cenkalti/backoff/v4 v4.1.3 // indirect
@@ -169,7 +170,11 @@ require (
 // replace (
 // <temporary replace>
 // )
-replace cosmossdk.io/x/protocolpool => ./x/protocolpool
+// TODO remove after all modules have their own go.mods
+replace (
+ cosmossdk.io/x/protocolpool => ./x/protocolpool
+ cosmossdk.io/x/slashing => ./x/slashing
+)
 
 replace cosmossdk.io/x/gov => ./x/gov
 

proto/cosmos/slashing/module/v1/module.proto

@@ -7,7 +7,7 @@ import "cosmos/app/v1alpha1/module.proto";
 // Module is the config object of the slashing module.
 message Module {
  option (cosmos.app.v1alpha1.module) = {
- go_import: "github.com/cosmos/cosmos-sdk/x/slashing"
+ go_import: "cosmossdk.io/x/slashing"
  };
 
  // authority defines the custom module authority. If not set, defaults to the governance module.

proto/cosmos/slashing/v1beta1/genesis.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package cosmos.slashing.v1beta1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types";
+option go_package = "cosmossdk.io/x/slashing/types";
 
 import "gogoproto/gogo.proto";
 import "cosmos/slashing/v1beta1/slashing.proto";

proto/cosmos/slashing/v1beta1/query.proto

@@ -8,7 +8,7 @@
 import "cosmos_proto/cosmos.proto";
 import "amino/amino.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types";
+option go_package = "cosmossdk.io/x/slashing/types";
 
 // Query provides defines the gRPC querier service
 service Query {

proto/cosmos/slashing/v1beta1/slashing.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package cosmos.slashing.v1beta1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types";
+option go_package = "cosmossdk.io/x/slashing/types";
 option (gogoproto.equal_all) = true;
 
 import "gogoproto/gogo.proto";

proto/cosmos/slashing/v1beta1/tx.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package cosmos.slashing.v1beta1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types";
+option go_package = "cosmossdk.io/x/slashing/types";
 option (gogoproto.equal_all) = true;
 
 import "gogoproto/gogo.proto";

simapp/app.go

@@ -46,6 +46,9 @@ import (
  "cosmossdk.io/x/protocolpool"
  poolkeeper "cosmossdk.io/x/protocolpool/keeper"
  pooltypes "cosmossdk.io/x/protocolpool/types"
+ "cosmossdk.io/x/slashing"
+ slashingkeeper "cosmossdk.io/x/slashing/keeper"
+ slashingtypes "cosmossdk.io/x/slashing/types"
  "cosmossdk.io/x/tx/signing"
  "cosmossdk.io/x/upgrade"
  upgradekeeper "cosmossdk.io/x/upgrade/keeper"
@@ -100,9 +103,6 @@ import (
  "github.com/cosmos/cosmos-sdk/x/mint"
  mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
  minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
- "github.com/cosmos/cosmos-sdk/x/slashing"
- slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
- slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  "github.com/cosmos/cosmos-sdk/x/staking"
  stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

simapp/app_config.go

@@ -46,6 +46,8 @@ import (
  _ "cosmossdk.io/x/nft/module" // import for side-effects
  _ "cosmossdk.io/x/protocolpool" // import for side-effects
  pooltypes "cosmossdk.io/x/protocolpool/types"
+ _ "cosmossdk.io/x/slashing" // import for side-effects
+ slashingtypes "cosmossdk.io/x/slashing/types"
  _ "cosmossdk.io/x/upgrade" // import for side-effects
  upgradetypes "cosmossdk.io/x/upgrade/types"
 
@@ -67,8 +69,6 @@ import (
  genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
  _ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects
  minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
- _ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects
- slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  _ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )

simapp/app_test.go

@@ -21,6 +21,7 @@ import (
  feegrantmodule "cosmossdk.io/x/feegrant/module"
  "cosmossdk.io/x/gov"
  group "cosmossdk.io/x/group/module"
+ "cosmossdk.io/x/slashing"
  "cosmossdk.io/x/upgrade"
 
  "github.com/cosmos/cosmos-sdk/baseapp"
@@ -39,7 +40,6 @@ import (
  "github.com/cosmos/cosmos-sdk/x/crisis"
  "github.com/cosmos/cosmos-sdk/x/genutil"
  "github.com/cosmos/cosmos-sdk/x/mint"
- "github.com/cosmos/cosmos-sdk/x/slashing"
  "github.com/cosmos/cosmos-sdk/x/staking"
 )
 

simapp/app_v2.go

@@ -21,6 +21,7 @@ import (
  nftkeeper "cosmossdk.io/x/nft/keeper"
  _ "cosmossdk.io/x/protocolpool"
  poolkeeper "cosmossdk.io/x/protocolpool/keeper"
+ slashingkeeper "cosmossdk.io/x/slashing/keeper"
  upgradekeeper "cosmossdk.io/x/upgrade/keeper"
 
  "github.com/cosmos/cosmos-sdk/baseapp"
@@ -43,7 +44,6 @@ import (
  consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
  crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
  mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
- slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
  stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 )
 

simapp/export.go

@@ -9,10 +9,10 @@ import (
 
  "cosmossdk.io/collections"
  storetypes "cosmossdk.io/store/types"
+ slashingtypes "cosmossdk.io/x/slashing/types"
 
  servertypes "github.com/cosmos/cosmos-sdk/server/types"
  sdk "github.com/cosmos/cosmos-sdk/types"
- slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  "github.com/cosmos/cosmos-sdk/x/staking"
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )

simapp/go.mod

@@ -37,6 +37,7 @@ require (
  cosmossdk.io/x/distribution v0.0.0-20230925135524-a1bc045b3190
  cosmossdk.io/x/gov v0.0.0-20230925135524-a1bc045b3190
  cosmossdk.io/x/group v0.0.0-00010101000000-000000000000
+ cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000
 )
 
 require (
@@ -218,6 +219,7 @@ replace (
  cosmossdk.io/x/group => ../x/group
  cosmossdk.io/x/nft => ../x/nft
  cosmossdk.io/x/protocolpool => ../x/protocolpool
+ cosmossdk.io/x/slashing => ../x/slashing
  cosmossdk.io/x/upgrade => ../x/upgrade
 )
 

simapp/sim_test.go

@@ -20,6 +20,7 @@ import (
  "cosmossdk.io/store"
  storetypes "cosmossdk.io/store/types"
  "cosmossdk.io/x/feegrant"
+ slashingtypes "cosmossdk.io/x/slashing/types"
 
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/client/flags"
@@ -29,7 +30,6 @@ import (
  authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
  "github.com/cosmos/cosmos-sdk/x/simulation"
  simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
- slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 

tests/go.mod

@@ -37,6 +37,7 @@ require (
  cosmossdk.io/x/distribution v0.0.0-20230925135524-a1bc045b3190
  cosmossdk.io/x/gov v0.0.0-20230925135524-a1bc045b3190
  cosmossdk.io/x/group v0.0.0-00010101000000-000000000000
+ cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000
 )
 
 require (
@@ -216,6 +217,7 @@ replace (
  cosmossdk.io/x/nft => ../x/nft
  cosmossdk.io/x/params => ../x/params
  cosmossdk.io/x/protocolpool => ../x/protocolpool
+ cosmossdk.io/x/slashing => ../x/slashing
  cosmossdk.io/x/upgrade => ../x/upgrade
 )
 

tests/integration/evidence/keeper/infraction_test.go

@@ -20,6 +20,10 @@ import (
  "cosmossdk.io/x/evidence/exported"
  "cosmossdk.io/x/evidence/keeper"
  evidencetypes "cosmossdk.io/x/evidence/types"
+ "cosmossdk.io/x/slashing"
+ slashingkeeper "cosmossdk.io/x/slashing/keeper"
+ "cosmossdk.io/x/slashing/testutil"
+ slashingtypes "cosmossdk.io/x/slashing/types"
 
  "github.com/cosmos/cosmos-sdk/codec"
  addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
@@ -39,10 +43,6 @@ import (
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
  minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
- "github.com/cosmos/cosmos-sdk/x/slashing"
- slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
- "github.com/cosmos/cosmos-sdk/x/slashing/testutil"
- slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  "github.com/cosmos/cosmos-sdk/x/staking"
  stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
  stakingtestutil "github.com/cosmos/cosmos-sdk/x/staking/testutil"

tests/integration/rapidgen/rapidgen.go

@@ -35,6 +35,7 @@ import (
  gov_v1_types "cosmossdk.io/x/gov/types/v1"
  gov_v1beta1_types "cosmossdk.io/x/gov/types/v1beta1"
  grouptypes "cosmossdk.io/x/group"
+ slashingtypes "cosmossdk.io/x/slashing/types"
  upgradetypes "cosmossdk.io/x/upgrade/types"
 
  "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
@@ -44,7 +45,6 @@ import (
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
  minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
- slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 

tests/integration/slashing/keeper/keeper_test.go

@@ -11,6 +11,10 @@ import (
  "cosmossdk.io/core/comet"
  "cosmossdk.io/log"
  storetypes "cosmossdk.io/store/types"
+ "cosmossdk.io/x/slashing"
+ slashingkeeper "cosmossdk.io/x/slashing/keeper"
+ "cosmossdk.io/x/slashing/testutil"
+ slashingtypes "cosmossdk.io/x/slashing/types"
 
  "github.com/cosmos/cosmos-sdk/codec"
  addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
@@ -26,10 +30,6 @@ import (
  bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
- "github.com/cosmos/cosmos-sdk/x/slashing"
- slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
- "github.com/cosmos/cosmos-sdk/x/slashing/testutil"
- slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  "github.com/cosmos/cosmos-sdk/x/staking"
  stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
  stakingtestutil "github.com/cosmos/cosmos-sdk/x/staking/testutil"

tests/integration/tx/aminojson/aminojson_test.go

@@ -40,6 +40,8 @@ import (
  gov_v1_types "cosmossdk.io/x/gov/types/v1"
  gov_v1beta1_types "cosmossdk.io/x/gov/types/v1beta1"
  groupmodule "cosmossdk.io/x/group/module"
+ "cosmossdk.io/x/slashing"
+ slashingtypes "cosmossdk.io/x/slashing/types"
  "cosmossdk.io/x/tx/signing/aminojson"
  signing_testutil "cosmossdk.io/x/tx/signing/testutil"
  "cosmossdk.io/x/upgrade"
@@ -69,8 +71,6 @@ import (
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  "github.com/cosmos/cosmos-sdk/x/consensus"
  "github.com/cosmos/cosmos-sdk/x/mint"
- "github.com/cosmos/cosmos-sdk/x/slashing"
- slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  "github.com/cosmos/cosmos-sdk/x/staking"
  stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )

tests/integration/tx/decode_test.go

@@ -16,6 +16,7 @@ import (
  feegrantmodule "cosmossdk.io/x/feegrant/module"
  "cosmossdk.io/x/gov"
  groupmodule "cosmossdk.io/x/group/module"
+ "cosmossdk.io/x/slashing"
  "cosmossdk.io/x/tx/decode"
  txsigning "cosmossdk.io/x/tx/signing"
  "cosmossdk.io/x/upgrade"
@@ -35,7 +36,6 @@ import (
  "github.com/cosmos/cosmos-sdk/x/bank"
  "github.com/cosmos/cosmos-sdk/x/consensus"
  "github.com/cosmos/cosmos-sdk/x/mint"
- "github.com/cosmos/cosmos-sdk/x/slashing"
  "github.com/cosmos/cosmos-sdk/x/staking"
 )