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 Sep 21, 2024
1 parent 0b2b3dd commit 8856053
Show file tree
Hide file tree
Showing 22 changed files with 372 additions and 328 deletions.
2 changes: 1 addition & 1 deletion app/next-v2/COMMIT
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d6364b8956eb0aab11a764f75a4dcc1e9ee550d4
763e4d68e435fb35029bf80c88b4450a5bb4debf
24 changes: 18 additions & 6 deletions app/next-v2/app_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
stakingmodulev1 "cosmossdk.io/api/cosmos/staking/module/v1"
txconfigv1 "cosmossdk.io/api/cosmos/tx/config/v1"
upgrademodulev1 "cosmossdk.io/api/cosmos/upgrade/module/v1"
validatemodulev1 "cosmossdk.io/api/cosmos/validate/module/v1"
vestingmodulev1 "cosmossdk.io/api/cosmos/vesting/module/v1"
"cosmossdk.io/depinject/appconfig"
"cosmossdk.io/x/accounts"
Expand Down Expand Up @@ -68,12 +69,13 @@ import (
upgradetypes "cosmossdk.io/x/upgrade/types"

"github.com/cosmos/cosmos-sdk/runtime"
_ "github.com/cosmos/cosmos-sdk/x/auth" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/auth/tx/config" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/auth" // import for side-effects
authtxconfig "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
_ "github.com/cosmos/cosmos-sdk/x/auth/vesting" // import for side-effects
vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
"github.com/cosmos/cosmos-sdk/x/validate"
)

var (
Expand Down Expand Up @@ -183,8 +185,22 @@ var (
QueryGasLimit: 100_000,
SimulationGasLimit: 100_000,
},
// SkipStoreKeys is an optional list of store keys to skip when constructing the
// module's keeper. This is useful when a module does not have a store key.
SkipStoreKeys: []string{
authtxconfig.DepinjectModuleName,
validate.ModuleName,
},
}),
},
{
Name: authtxconfig.DepinjectModuleName, // x/auth/tx/config depinject module (not app module), use to provide tx configuration
Config: appconfig.WrapAny(&txconfigv1.Config{}),
},
{
Name: validate.ModuleName,
Config: appconfig.WrapAny(&validatemodulev1.Module{}),
},
{
Name: authtypes.ModuleName,
Config: appconfig.WrapAny(&authmodulev1.Module{
Expand Down Expand Up @@ -218,10 +234,6 @@ var (
Name: slashingtypes.ModuleName,
Config: appconfig.WrapAny(&slashingmodulev1.Module{}),
},
{
Name: "tx",
Config: appconfig.WrapAny(&txconfigv1.Config{}),
},
{
Name: genutiltypes.ModuleName,
Config: appconfig.WrapAny(&genutilmodulev1.Module{}),
Expand Down
72 changes: 36 additions & 36 deletions app/next-v2/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,39 +245,39 @@ require (

// SimApp on main always tests the latest extracted SDK modules importing the sdk
replace (
cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.0.0-20240919213947-d6364b8956eb
cosmossdk.io/collections => cosmossdk.io/collections v0.4.1-0.20240919213947-d6364b8956eb
cosmossdk.io/tools/confix => cosmossdk.io/tools/confix v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/accounts/defaults/base => cosmossdk.io/x/accounts/defaults/base v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/x/tx => cosmossdk.io/x/tx v0.13.4-0.20240919213947-d6364b8956eb
cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.0.0-20240920150546-763e4d68e435
cosmossdk.io/collections => cosmossdk.io/collections v0.4.1-0.20240920150546-763e4d68e435
cosmossdk.io/tools/confix => cosmossdk.io/tools/confix v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/accounts/defaults/base => cosmossdk.io/x/accounts/defaults/base v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/x/tx => cosmossdk.io/x/tx v0.13.4-0.20240920150546-763e4d68e435
cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20240920150546-763e4d68e435
)

// 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.20240919213947-d6364b8956eb
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20240920150546-763e4d68e435
// 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 All @@ -287,14 +287,14 @@ replace (

// server v2 integration
replace (
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240919213947-d6364b8956eb
cosmossdk.io/core => cosmossdk.io/core v1.0.0-alpha.3.0.20240919213947-d6364b8956eb
cosmossdk.io/core/testing => cosmossdk.io/core/testing v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/runtime/v2 => cosmossdk.io/runtime/v2 v2.0.0-20240919213947-d6364b8956eb
cosmossdk.io/server/v2 => cosmossdk.io/server/v2 v2.0.0-20240919213947-d6364b8956eb
cosmossdk.io/server/v2/appmanager => cosmossdk.io/server/v2/appmanager v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/server/v2/cometbft => cosmossdk.io/server/v2/cometbft v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/server/v2/stf => cosmossdk.io/server/v2/stf v0.0.0-20240919213947-d6364b8956eb
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240919213947-d6364b8956eb
cosmossdk.io/store/v2 => cosmossdk.io/store/v2 v2.0.0-20240919213947-d6364b8956eb
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240920150546-763e4d68e435
cosmossdk.io/core => cosmossdk.io/core v1.0.0-alpha.3.0.20240920150546-763e4d68e435
cosmossdk.io/core/testing => cosmossdk.io/core/testing v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/runtime/v2 => cosmossdk.io/runtime/v2 v2.0.0-20240920150546-763e4d68e435
cosmossdk.io/server/v2 => cosmossdk.io/server/v2 v2.0.0-20240920150546-763e4d68e435
cosmossdk.io/server/v2/appmanager => cosmossdk.io/server/v2/appmanager v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/server/v2/cometbft => cosmossdk.io/server/v2/cometbft v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/server/v2/stf => cosmossdk.io/server/v2/stf v0.0.0-20240920150546-763e4d68e435
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240920150546-763e4d68e435
cosmossdk.io/store/v2 => cosmossdk.io/store/v2 v2.0.0-20240920150546-763e4d68e435
)
Loading

0 comments on commit 8856053

Please sign in to comment.