Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Commit

Permalink
sync simapp changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@julienrbrt @github-actions
julienrbrt authored and github-actions[bot] committed May 4, 2024
1 parent 3fb747b commit 9e70c41
Show file tree
Hide file tree
Showing 10 changed files with 170 additions and 177 deletions.
2 changes: 1 addition & 1 deletion app/next/COMMIT
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a6bc921c9a7f60c3f55fa3e4763e3a7a02595b60
921ab722e4ed6baa8f3000977849a0682e150aaa
6 changes: 3 additions & 3 deletions app/next/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ import (
"cosmossdk.io/x/circuit"
circuitkeeper "cosmossdk.io/x/circuit/keeper"
circuittypes "cosmossdk.io/x/circuit/types"
"cosmossdk.io/x/consensus"
consensusparamkeeper "cosmossdk.io/x/consensus/keeper"
consensusparamtypes "cosmossdk.io/x/consensus/types"
distr "cosmossdk.io/x/distribution"
distrkeeper "cosmossdk.io/x/distribution/keeper"
distrtypes "cosmossdk.io/x/distribution/types"
Expand Down Expand Up @@ -107,9 +110,6 @@ import (
"github.com/cosmos/cosmos-sdk/types/msgservice"
sigtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/version"
"github.com/cosmos/cosmos-sdk/x/consensus"
consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
"github.com/cosmos/cosmos-sdk/x/genutil"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
)
Expand Down
4 changes: 2 additions & 2 deletions app/next/app_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ import (
banktypes "cosmossdk.io/x/bank/types"
_ "cosmossdk.io/x/circuit" // import for side-effects
circuittypes "cosmossdk.io/x/circuit/types"
_ "cosmossdk.io/x/consensus" // import for side-effects
consensustypes "cosmossdk.io/x/consensus/types"
_ "cosmossdk.io/x/distribution" // import for side-effects
distrtypes "cosmossdk.io/x/distribution/types"
_ "cosmossdk.io/x/epochs" // import for side-effects
Expand All @@ -67,8 +69,6 @@ import (
upgradetypes "cosmossdk.io/x/upgrade/types"

"github.com/cosmos/cosmos-sdk/runtime"
_ "github.com/cosmos/cosmos-sdk/x/consensus" // import for side-effects
consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
)

Expand Down
2 changes: 1 addition & 1 deletion app/next/app_di.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
authzkeeper "cosmossdk.io/x/authz/keeper"
bankkeeper "cosmossdk.io/x/bank/keeper"
circuitkeeper "cosmossdk.io/x/circuit/keeper"
consensuskeeper "cosmossdk.io/x/consensus/keeper"
distrkeeper "cosmossdk.io/x/distribution/keeper"
epochskeeper "cosmossdk.io/x/epochs/keeper"
evidencekeeper "cosmossdk.io/x/evidence/keeper"
Expand All @@ -51,7 +52,6 @@ import (
servertypes "github.com/cosmos/cosmos-sdk/server/types"
testdata_pulsar "github.com/cosmos/cosmos-sdk/testutil/testdata/testpb"
"github.com/cosmos/cosmos-sdk/types/module"
consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
)

// DefaultNodeHome default home directories for the application daemon
Expand Down
57 changes: 30 additions & 27 deletions app/next/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
cosmossdk.io/x/staking v0.0.0-20240226161501-23359a0b6d91
cosmossdk.io/x/tx v0.13.3
cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
github.com/cometbft/cometbft v0.38.7-0.20240412124004-1f67e396cf45
github.com/cometbft/cometbft v0.38.7
github.com/cosmos/cosmos-db v1.0.2
// this version is not used as it is always replaced by the latest Cosmos SDK version
github.com/cosmos/cosmos-sdk v0.51.0
Expand All @@ -45,6 +45,8 @@ require (
google.golang.org/protobuf v1.34.0
)

require cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000

require (
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.32.0-20240130113600-88ef6483f90f.1 // indirect
buf.build/gen/go/tendermint/tendermint/protocolbuffers/go v1.32.0-20231117195010-33ed361a9051.1 // indirect
Expand Down Expand Up @@ -230,39 +232,40 @@ require (

// SimApp on main always tests the latest extracted SDK modules importing the sdk
replace (
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240503011422-a6bc921c9a7f
cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/collections => cosmossdk.io/collections v0.4.1-0.20240503011422-a6bc921c9a7f
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240503011422-a6bc921c9a7f
cosmossdk.io/depinject => cosmossdk.io/depinject v1.0.0-alpha.4.0.20240503011422-a6bc921c9a7f
cosmossdk.io/tools/confix => cosmossdk.io/tools/confix v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/auth => cosmossdk.io/x/auth v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20240503011422-a6bc921c9a7f
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240503212206-921ab722e4ed
cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.0.0-20240503212206-921ab722e4ed
cosmossdk.io/collections => cosmossdk.io/collections v0.4.1-0.20240503212206-921ab722e4ed
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240503212206-921ab722e4ed
cosmossdk.io/depinject => cosmossdk.io/depinject v1.0.0-alpha.4.0.20240503212206-921ab722e4ed
cosmossdk.io/tools/confix => cosmossdk.io/tools/confix v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/auth => cosmossdk.io/x/auth v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20240503212206-921ab722e4ed
cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20240503212206-921ab722e4ed
)

// Below are the long-lived replace of the SimApp
replace (
// use cosmos fork of keyring
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
// Simapp always use the latest version of the cosmos-sdk
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20240503011422-a6bc921c9a7f
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20240503212206-921ab722e4ed
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1
Expand Down
Loading

0 comments on commit 9e70c41

Please sign in to comment.