Skip to content

Commit 49ad87c

Browse files
committed
bump sei-cosmos
1 parent 0b726db commit 49ad87c

File tree

7 files changed

+11
-22
lines changed

7 files changed

+11
-22
lines changed

app/app.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
servertypes "github.com/cosmos/cosmos-sdk/server/types"
2222
"github.com/cosmos/cosmos-sdk/simapp"
2323
sdk "github.com/cosmos/cosmos-sdk/types"
24+
"github.com/cosmos/cosmos-sdk/types/genesis"
2425
"github.com/cosmos/cosmos-sdk/types/module"
2526
"github.com/cosmos/cosmos-sdk/utils"
2627
"github.com/cosmos/cosmos-sdk/x/auth"
@@ -77,7 +78,6 @@ import (
7778
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
7879
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
7980
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
80-
ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts"
8181
icacontroller "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller"
8282
icacontrollerkeeper "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/keeper"
8383
icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types"
@@ -203,14 +203,10 @@ var (
203203
slashing.AppModuleBasic{},
204204
feegrantmodule.AppModuleBasic{},
205205
authzmodule.AppModuleBasic{},
206-
ibc.AppModuleBasic{},
207206
upgrade.AppModuleBasic{},
208207
evidence.AppModuleBasic{},
209-
transfer.AppModuleBasic{},
210208
vesting.AppModuleBasic{},
211209
wasm.AppModuleBasic{},
212-
ica.AppModuleBasic{},
213-
intertx.AppModuleBasic{},
214210
)
215211

216212
// module account permissions
@@ -488,14 +484,12 @@ func NewWasmApp(
488484
scopedICAControllerKeeper,
489485
app.MsgServiceRouter(),
490486
)
491-
icaModule := ica.NewAppModule(&app.icaControllerKeeper, &app.icaHostKeeper)
492487
icaHostIBCModule := icahost.NewIBCModule(app.icaHostKeeper)
493488

494489
// For wasmd we use the demo controller from https://github.com/cosmos/interchain-accounts but see notes below
495490
app.interTxKeeper = intertxkeeper.NewKeeper(appCodec, keys[intertxtypes.StoreKey], app.icaControllerKeeper, scopedInterTxKeeper)
496491
// Note: please do your research before using this in production app, this is a demo and not an officially
497492
// supported IBC team implementation. Do your own research before using it.
498-
interTxModule := intertx.NewAppModule(appCodec, app.interTxKeeper)
499493
interTxIBCModule := intertx.NewIBCModule(app.interTxKeeper)
500494
// You will likely want to swap out the second argument with your own reviewed and maintained ica auth module
501495
icaControllerIBCModule := icacontroller.NewIBCModule(app.icaControllerKeeper, interTxIBCModule)
@@ -561,6 +555,7 @@ func NewWasmApp(
561555
app.accountKeeper,
562556
app.bankKeeper,
563557
&stakingKeeper,
558+
app.paramsKeeper,
564559
govRouter,
565560
)
566561
/**** Module Options ****/
@@ -592,11 +587,7 @@ func NewWasmApp(
592587
evidence.NewAppModule(app.evidenceKeeper),
593588
feegrantmodule.NewAppModule(appCodec, app.accountKeeper, app.bankKeeper, app.feeGrantKeeper, app.interfaceRegistry),
594589
authzmodule.NewAppModule(appCodec, app.authzKeeper, app.accountKeeper, app.bankKeeper, app.interfaceRegistry),
595-
ibc.NewAppModule(app.ibcKeeper),
596590
params.NewAppModule(app.paramsKeeper),
597-
transferModule,
598-
icaModule,
599-
interTxModule,
600591
crisis.NewAppModule(&app.crisisKeeper, skipGenesisInvariants), // always be last to make sure that it checks for all invariants and not only part of them
601592
)
602593

@@ -918,7 +909,7 @@ func (app *WasmApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci
918909

919910
app.upgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
920911

921-
return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
912+
return app.mm.InitGenesis(ctx, app.appCodec, genesisState, genesis.GenesisImportConfig{})
922913
}
923914

924915
// LoadHeight loads a particular height

app/sim_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/cosmos/cosmos-sdk/baseapp"
1111
"github.com/cosmos/cosmos-sdk/simapp"
1212
sdk "github.com/cosmos/cosmos-sdk/types"
13+
"github.com/cosmos/cosmos-sdk/types/genesis"
1314
"github.com/cosmos/cosmos-sdk/types/kv"
1415
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
1516
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -158,7 +159,7 @@ func TestAppImportExport(t *testing.T) {
158159

159160
ctxA := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()})
160161
ctxB := newApp.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()})
161-
newApp.mm.InitGenesis(ctxB, app.AppCodec(), genesisState)
162+
newApp.mm.InitGenesis(ctxB, app.AppCodec(), genesisState, genesis.GenesisImportConfig{})
162163
newApp.StoreConsensusParams(ctxB, exported.ConsensusParams)
163164

164165
t.Log("comparing stores...")

benchmarks/app_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func SetupWithGenesisAccounts(b testing.TB, db dbm.DB, genAccs []authtypes.Genes
5050
totalSupply = totalSupply.Add(b.Coins...)
5151
}
5252

53-
bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{})
53+
bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{}, banktypes.DefaultGenesisState().WeiBalances)
5454
genesisState[banktypes.ModuleName] = appCodec.MustMarshalJSON(bankGenesis)
5555

5656
stateBytes, err := json.MarshalIndent(genesisState, "", " ")

cmd/wasmd/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
111111
ac := appCreator{
112112
encCfg: encodingConfig,
113113
}
114-
server.AddCommands(rootCmd, app.DefaultNodeHome, ac.newApp, ac.appExport, addModuleInitFlags, []trace.TracerProviderOption{})
114+
server.AddCommands(rootCmd, app.DefaultNodeHome, ac.newApp, nil, addModuleInitFlags, []trace.TracerProviderOption{})
115115

116116
// add keybase, auxiliary RPC, query, and tx child commands
117117
rootCmd.AddCommand(

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ replace (
155155
// Use the cosmos-flavored keyring library
156156
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
157157
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
158-
github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.3.26
158+
github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.3.45
159159
github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.1.9
160160
github.com/cosmos/ibc-go/v3 => github.com/sei-protocol/sei-ibc-go/v3 v3.1.0
161161
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,8 @@ github.com/savaki/jq v0.0.0-20161209013833-0e6baecebbf8 h1:ajJQhvqPSQFJJ4aV5mDAM
772772
github.com/savaki/jq v0.0.0-20161209013833-0e6baecebbf8/go.mod h1:Nw/CCOXNyF5JDd6UpYxBwG5WWZ2FOJ/d5QnXL4KQ6vY=
773773
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
774774
github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
775-
github.com/sei-protocol/sei-cosmos v0.3.26 h1:brYESCnbYI7gr/O8QEHxIyntZrIZp4ONA7m0xfDn6eI=
776-
github.com/sei-protocol/sei-cosmos v0.3.26/go.mod h1:og/KbejR/zSQ8otapODEDU9zYNhFSUDbq9+tgeYePyU=
775+
github.com/sei-protocol/sei-cosmos v0.3.45 h1:l6ss5Y4OC+vvu+74lWz8EUBJN68x0CRuaEYtqA+TvOs=
776+
github.com/sei-protocol/sei-cosmos v0.3.45/go.mod h1:ZwWxF/69WlcLEn4BzVjPPToTFkE2sjPanU8PNNyKoOk=
777777
github.com/sei-protocol/sei-db v0.0.27-0.20240123064153-d6dfa112e760 h1:MiHIPwPH2Yo6LQQfINgFTofm+K1EqpQYmg8h5m/cFrs=
778778
github.com/sei-protocol/sei-db v0.0.27-0.20240123064153-d6dfa112e760/go.mod h1:F/ZKZA8HJPcUzSZPA8yt6pfwlGriJ4RDR4eHKSGLStI=
779779
github.com/sei-protocol/sei-iavl v0.1.9 h1:y4mVYftxLNRs6533zl7N0/Ch+CzRQc04JDfHolIxgBE=

x/wasm/keeper/test_common.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ import (
5353
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
5454
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
5555
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
56-
"github.com/cosmos/ibc-go/v3/modules/apps/transfer"
5756
ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
58-
ibc "github.com/cosmos/ibc-go/v3/modules/core"
5957
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
6058
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
6159
"github.com/stretchr/testify/require"
@@ -85,10 +83,8 @@ var ModuleBasics = module.NewBasicManager(
8583
params.AppModuleBasic{},
8684
crisis.AppModuleBasic{},
8785
slashing.AppModuleBasic{},
88-
ibc.AppModuleBasic{},
8986
upgrade.AppModuleBasic{},
9087
evidence.AppModuleBasic{},
91-
transfer.AppModuleBasic{},
9288
)
9389

9490
func MakeTestCodec(t testing.TB) codec.Codec {
@@ -418,6 +414,7 @@ func createTestInput(
418414
accountKeeper,
419415
bankKeeper,
420416
stakingKeeper,
417+
paramsKeeper,
421418
govRouter,
422419
)
423420

0 commit comments

Comments
 (0)