Skip to content

Commit

Permalink
simapp fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@tac0turtle
tac0turtle committed Sep 23, 2024
1 parent 8c99de3 commit c01a5ed
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 61 deletions.
2 changes: 2 additions & 0 deletions modules/apps/callbacks/testing/simapp/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,8 @@ func (app *SimApp) setAnteHandler(txConfig client.TxConfig) {
ante.HandlerOptions{
AccountKeeper: app.AuthKeeper,
BankKeeper: app.BankKeeper,
ConsensusKeeper: app.ConsensusParamsKeeper,
Environment: runtime.NewEnvironment(nil, app.Logger(), runtime.EnvWithMsgRouterService(app.MsgServiceRouter()), runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())), // nil is set as the kvstoreservice to avoid module access,
SignModeHandler: txConfig.SignModeHandler(),
FeegrantKeeper: app.FeeGrantKeeper,
SigGasConsumer: ante.DefaultSigVerificationGasConsumer,
Expand Down
36 changes: 18 additions & 18 deletions modules/light-clients/08-wasm/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,26 +241,26 @@ replace (
cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240906083041-6033330182c7 // main
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240906090851-36d9b25e8981 // main
cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20240909082436-01c0e9ba3581
cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20240911130545-9e7848985491
cosmossdk.io/x/tx => cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20240905174638-8ce77cbb2450
cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20240911130545-9e7848985491
github.com/cometbft/cometbft => github.com/cometbft/cometbft v1.0.0-rc1.0.20240908111210-ab0be101882f
// pseudo version lower than the latest tag
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-alpha.1.0.20240909082436-01c0e9ba3581
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-beta.1
)
72 changes: 36 additions & 36 deletions modules/light-clients/08-wasm/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,46 +216,46 @@ cosmossdk.io/store v1.0.0-rc.0.0.20240906090851-36d9b25e8981 h1:O510vQpVdyZgSlLm
cosmossdk.io/store v1.0.0-rc.0.0.20240906090851-36d9b25e8981/go.mod h1:5lnCUSlWPWQYrUcNjpqBLTnlykyz1NeGQpMmZq1DCOg=
cosmossdk.io/tools/confix v0.1.2 h1:2hoM1oFCNisd0ltSAAZw2i4ponARPmlhuNu3yy0VwI4=
cosmossdk.io/tools/confix v0.1.2/go.mod h1:7XfcbK9sC/KNgVGxgLM0BrFbVcR/+6Dg7MFfpx7duYo=
cosmossdk.io/x/accounts v0.0.0-20240905174638-8ce77cbb2450 h1:o3Bxw575J9xxPO9K0Dwu2YD7pyNmiRl3Bo8GB/GOsds=
cosmossdk.io/x/accounts v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:b6Hy5/JhCrfLeG07s9pOYkAxfq77E+MtACF86cgbcOQ=
cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240905174638-8ce77cbb2450 h1:sCmeisq+2MOXVX3ui4Xsau8fqq5WLrbPF+mas3+J5D4=
cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:+JMkw+jQZwgBxoP0jABxXAwFF27ghmmJBdPoFSj+0tk=
cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20240905174638-8ce77cbb2450 h1:ViFFe92d4+XgTdSGqfSJAs21bG8YmlxBrXuvwaLgHro=
cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:btniDT7XoWHk/yzsQ09XNk9CZvIQsvMqLiT2UAgAP0U=
cosmossdk.io/x/authz v0.0.0-20240905174638-8ce77cbb2450 h1:dIvjFGZiu+yOAdY0ru9BWuh3S9DTBXuTqdthjoZQJQ0=
cosmossdk.io/x/authz v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:BL2cp28qWDibgmHgjClot6q8kSZEClSS4IOQtt9Tn9E=
cosmossdk.io/x/bank v0.0.0-20240905174638-8ce77cbb2450 h1:7L3wLk36pJc9fEXzSj7MDoayUqTJyyEAqj5W3Ua4TAI=
cosmossdk.io/x/bank v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:9kSCRv7B/mYQmni3T880QT6yEtW9CjyRjDS4P8MCYgA=
cosmossdk.io/x/circuit v0.0.0-20240905174638-8ce77cbb2450 h1:wKlgbrGTCOn7jmx4SLIVa8HYzrYRY1WMLjmBsxiCjmg=
cosmossdk.io/x/circuit v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:B7DRk4UhRcxR24vq6NEMO/BhVI4inblzbpO0KLvG18g=
cosmossdk.io/x/consensus v0.0.0-20240905174638-8ce77cbb2450 h1:J//VFkxEHUAcUi+gX5uYa7ICU7mEJZDWQ+5dAsSgPp4=
cosmossdk.io/x/consensus v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:l6pOuqO+/JfstuPFgRV+srKRtC0xxz65FrRGdzoQMt4=
cosmossdk.io/x/accounts v0.0.0-20240911130545-9e7848985491 h1:uwyARyXPGNfrhm7hosXdD7R61JfUVxRe2tr+wA93TQE=
cosmossdk.io/x/accounts v0.0.0-20240911130545-9e7848985491/go.mod h1:ouuRmydAWNwJb0II+9at7bK7tDLy1mYcu7PsyGi6sl8=
cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240911130545-9e7848985491 h1:wrulAXBqFSB+74kYN98FCIkYQ8WXvKs6wyYMyhvQPE0=
cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240911130545-9e7848985491/go.mod h1:U8UqeNDrmZVhGAvY27L0o8d8hWNm5coYXyO4nF9G9r0=
cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20240911130545-9e7848985491 h1:LxFTHEl+TmGTsKda099x6SrxzTEaqEqF7cSzTNQvewY=
cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20240911130545-9e7848985491/go.mod h1:kr8B7Jccyhul6l3BCHuFwkc3aZSMvl4wC+aWW/nqGUg=
cosmossdk.io/x/authz v0.0.0-20240911130545-9e7848985491 h1:5/KQbfoBWPRVarXrzw7Z4vG48zLi67oRjJ3MMScCoRs=
cosmossdk.io/x/authz v0.0.0-20240911130545-9e7848985491/go.mod h1:hiXfnbaKlBQe7V94/zBaL86EXhMmV347AmjNLSV3rV4=
cosmossdk.io/x/bank v0.0.0-20240911130545-9e7848985491 h1:CjGdghzTZgybcSa6J9S6H9YEQvcOWm3H3tQQ4LVLxeg=
cosmossdk.io/x/bank v0.0.0-20240911130545-9e7848985491/go.mod h1:oo1rdse7UcGHCW6BNZJMj4LhkkLS3yXTJ7l7avs86Hw=
cosmossdk.io/x/circuit v0.0.0-20240911130545-9e7848985491 h1:M7Q6FmTBuAP6sy5V9v2EB4vuFaf1qZG6Nwt7veC8tZI=
cosmossdk.io/x/circuit v0.0.0-20240911130545-9e7848985491/go.mod h1:VLfoQ0nQDH1IBp6BsX5xjGZTLfSEstyGyk5m9vPy6VE=
cosmossdk.io/x/consensus v0.0.0-20240911130545-9e7848985491 h1:SycpGxoSOdVmTD2BeUhdS5EvivWFE1MpFk0jQifFFS4=
cosmossdk.io/x/consensus v0.0.0-20240911130545-9e7848985491/go.mod h1:GgN8T3hAiRn5U6XpXCDoXQp1wOuCUpCGUxfTLu+61SI=
cosmossdk.io/x/distribution v0.0.0-20240906090851-36d9b25e8981 h1:7nEV9siFRy8pcTo+8i3GQku27buS+yOSxTvMeL/uPK4=
cosmossdk.io/x/distribution v0.0.0-20240906090851-36d9b25e8981/go.mod h1:gyG0xDJw0O8Kmyy/n91248GaIpcC4OWhobjFw8MxRuI=
cosmossdk.io/x/epochs v0.0.0-20240905174638-8ce77cbb2450 h1:RVcQ2XCuh39Qg0BYTuzasorzMhtwlua8mBpA3SCPRtY=
cosmossdk.io/x/epochs v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:ab0WK4m5EEvS060gKE8wINBD8bLxFk+OaSalVqwFpoM=
cosmossdk.io/x/evidence v0.0.0-20240905174638-8ce77cbb2450 h1:qGDGb5WLDIy1SuiKb/JM8XcujQoXp0eILU0fxPY0wDU=
cosmossdk.io/x/evidence v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:4zv2pGr0zHXd87GbD5crx+jPKnbh1XftcfJa9Hlvcd0=
cosmossdk.io/x/feegrant v0.0.0-20240905174638-8ce77cbb2450 h1:OcWM7iK+3zxgYWpM2WkbGBFVF1yjQne7z+i9uWO0GqY=
cosmossdk.io/x/feegrant v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:oQRFecRovqcK4O+3gMeR97vceAtA1NchqefZT2EYiIE=
cosmossdk.io/x/gov v0.0.0-20240905174638-8ce77cbb2450 h1:4qpruZEf5JgMPmdQr2neXsc8at1TWnH59ZcEz9SR1uw=
cosmossdk.io/x/gov v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:vxdu3r1+keQ0zugjZYwoaa0IcRscfqM/XQ8mw/MwFGc=
cosmossdk.io/x/group v0.0.0-20240905174638-8ce77cbb2450 h1:6UP+BMaQIf12+Zdm50nHJzBd47Ue9pq+CvTRIhOM4q0=
cosmossdk.io/x/group v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:SPQg4DfFURVX3xOLzOWzv30vxUj8mf5Ehm0OagfdMN8=
cosmossdk.io/x/epochs v0.0.0-20240911130545-9e7848985491 h1:6yGKDvI3syYZ9ni+LlJclFZ0CwG4CUD88PYENxHv2NQ=
cosmossdk.io/x/epochs v0.0.0-20240911130545-9e7848985491/go.mod h1:qDWIsoLncf0khngzyqbDQh/KKe89rvdU7nyVQouNJPw=
cosmossdk.io/x/evidence v0.0.0-20240911130545-9e7848985491 h1:7MDTsV2srY5iUKYy40xbJqse5fWq25RYAbWZjSUfpKI=
cosmossdk.io/x/evidence v0.0.0-20240911130545-9e7848985491/go.mod h1:f1OavXCs2DbxVUIj9A5FzlxvhSwzFte5vnl4rA2CAO4=
cosmossdk.io/x/feegrant v0.0.0-20240911130545-9e7848985491 h1:jJApIXGsbyB/yAdsdXCOovE9yD/2CQd8E8fx1GWfT70=
cosmossdk.io/x/feegrant v0.0.0-20240911130545-9e7848985491/go.mod h1:B1v8em9ELqLWEDx98YJQ7B+GOPeOwdIRp+waTHKKJKs=
cosmossdk.io/x/gov v0.0.0-20240911130545-9e7848985491 h1:OY2uDAb7VjEloqiEDujJn9gCb3/Yt2mKJ+8GQtrfJsM=
cosmossdk.io/x/gov v0.0.0-20240911130545-9e7848985491/go.mod h1:K+t59/43yOKwuire7wxjKujOyIA2B/oE7TiSOf70V+8=
cosmossdk.io/x/group v0.0.0-20240911130545-9e7848985491 h1:1bc2bBhiPevYTuDtVFSeenYgyUFzlPlYPMo/N5Bwre4=
cosmossdk.io/x/group v0.0.0-20240911130545-9e7848985491/go.mod h1:ILneF8TME/tyPCQZbrRqxu9drZ2Ny1OikeRnwOG9LQM=
cosmossdk.io/x/mint v0.0.0-20240909082436-01c0e9ba3581 h1:jlSNLMYdF/zBgKfZynqtUurMTjvVs3v9IfDK+xEf/Eo=
cosmossdk.io/x/mint v0.0.0-20240909082436-01c0e9ba3581/go.mod h1:yHf7jYxy5P9flApH6NsNaZTIrIEqy88xe0bPumNy/IQ=
cosmossdk.io/x/params v0.0.0-20240905174638-8ce77cbb2450 h1:8LThIewMzM3xM7/iQv/LOO4hrC6Hg7yohFeCaLALeg4=
cosmossdk.io/x/params v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:Zj4HqEipshPgZxUlCnUtQHJN/vIpzkqjmvi6V6iO13Y=
cosmossdk.io/x/protocolpool v0.0.0-20240905174638-8ce77cbb2450 h1:gxoZy8PwJQOy7PZ8pKOh9si3oWd36YRIM9oOy94vxvE=
cosmossdk.io/x/protocolpool v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:tNWmnHYYkHWJzZLlqq+mVbhThohAqEuF97GaL9xusIg=
cosmossdk.io/x/slashing v0.0.0-20240905174638-8ce77cbb2450 h1:padUT7OMCH3gekVGhdAwisgDjF3aXM2W3aLWmTjSFn8=
cosmossdk.io/x/slashing v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:R51bRE6znRn4FQKf6Fwx1Ceddt7SZ3ERQ0P3T+3LqOY=
cosmossdk.io/x/staking v0.0.0-20240905174638-8ce77cbb2450 h1:F0ivlDxBL/6dpBp7I/c9VeN9EN+OgGF2352KIQXZi48=
cosmossdk.io/x/staking v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:zfnbjV4Be1fp5kbtmoWKpc+9/t/4x6lNHMXm/C6N+yU=
cosmossdk.io/x/params v0.0.0-20240911130545-9e7848985491 h1:BQ8pYpm2PYDc0eVvAqfBh8L4zzvpV+zwIixxwjwViDs=
cosmossdk.io/x/params v0.0.0-20240911130545-9e7848985491/go.mod h1:9c+kPk1j6b/i5MxALE5ZEyD5aLG22L/FMjI3TRy1DRE=
cosmossdk.io/x/protocolpool v0.0.0-20240911130545-9e7848985491 h1:aXoQxtdH+LPbtv6Ke4n1DVCLqHJw5VKD78mM7u0W//A=
cosmossdk.io/x/protocolpool v0.0.0-20240911130545-9e7848985491/go.mod h1:Ui2l6GBqZIZfPrsm9+OUtrDOEta8f6Ld5RDI9qcWoMM=
cosmossdk.io/x/slashing v0.0.0-20240911130545-9e7848985491 h1:1Wqgrq2+3RM/ZautJOkVTipie4Y4WRA49bHut7EgFFE=
cosmossdk.io/x/slashing v0.0.0-20240911130545-9e7848985491/go.mod h1:X6YTD2Ksqsc3QMQeupqFHXjtega4oOQY3ln9382CAuU=
cosmossdk.io/x/staking v0.0.0-20240911130545-9e7848985491 h1:ZKrVePSYlS8qYXcz8L5x1PYuOOKkgIkM8UfFjMzkpAI=
cosmossdk.io/x/staking v0.0.0-20240911130545-9e7848985491/go.mod h1:AMBXP+pz9KsBueAP6Ks63DHHbo/XCuxt/JFBoleUBM8=
cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897 h1:J3vS3G41JtTWkUX3wVKcXdy1yPUca0d3QnexCR52PeY=
cosmossdk.io/x/tx v0.13.4-0.20240815194237-858ec2fcb897/go.mod h1:5+Hpds6bhT6CdR7DqPh0dVOqyqL7NJkq+x+yjLdYSQU=
cosmossdk.io/x/upgrade v0.0.0-20240905174638-8ce77cbb2450 h1:/l5yuPc0EFHm6X+eWIHFzYn544GQThEj07xFj24itc4=
cosmossdk.io/x/upgrade v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:lRbl8ZW3Xe48JWG3K2fw2TiL4sI8qPvMRY6Fe6ikm9U=
cosmossdk.io/x/upgrade v0.0.0-20240911130545-9e7848985491 h1:dvmopa0GxlEkrnS0ZKzm/bP0ZglYCUuGcW/q6Lqb6Rg=
cosmossdk.io/x/upgrade v0.0.0-20240911130545-9e7848985491/go.mod h1:u5XG/D7wbjinuU7PRc/S2XdJbxT26BepEMby73eGrj8=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
Expand Down Expand Up @@ -372,8 +372,8 @@ github.com/cosmos/cosmos-db v1.0.3-0.20240911104526-ddc3f09bfc22 h1:V3WlarcZwlYY
github.com/cosmos/cosmos-db v1.0.3-0.20240911104526-ddc3f09bfc22/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA=
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
github.com/cosmos/cosmos-sdk v0.52.0-alpha.1.0.20240909082436-01c0e9ba3581 h1:7h+3iVLB+dXxhZ056XPRJC3ZMq2+0W0QJJLSS26BkAY=
github.com/cosmos/cosmos-sdk v0.52.0-alpha.1.0.20240909082436-01c0e9ba3581/go.mod h1:CsAnpiarY7rN6OJcZgKnGU4swIy6pQNKqu2Ck5bONE8=
github.com/cosmos/cosmos-sdk v0.52.0-beta.1 h1:1D6EI2jB+Kqt6rX5YKL/B2EGJ7rifd9qy5x4MtM6PC4=
github.com/cosmos/cosmos-sdk v0.52.0-beta.1/go.mod h1:N0SzGvdpqAhhg9lXCMbrxAwfCSyg3LJM312xj5l00j0=
github.com/cosmos/crypto v0.1.2 h1:Yn500sPY+9sKVdhiPUSDtt8JOpBGMB515dOmla4zfls=
github.com/cosmos/crypto v0.1.2/go.mod h1:b6VWz3HczIpBaQPvI7KrbQeF3pXHh0al3T5e0uwMBQw=
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
Expand Down
2 changes: 1 addition & 1 deletion modules/light-clients/08-wasm/testing/simapp/ante_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
}

anteDecorators := []sdk.AnteDecorator{
ante.NewSetUpContextDecorator(options.Environment), // outermost AnteDecorator. SetUpContext must be called first
ante.NewSetUpContextDecorator(options.Environment, options.ConsensusKeeper), // outermost AnteDecorator. SetUpContext must be called first
ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
ante.NewValidateBasicDecorator(options.Environment),
ante.NewTxTimeoutHeightDecorator(options.Environment),
Expand Down
7 changes: 5 additions & 2 deletions modules/light-clients/08-wasm/testing/simapp/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ func NewSimApp(
runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())),
app.AuthKeeper,
app.BankKeeper,
app.ConsensusParamsKeeper,
govModuleAddr,
signingCtx.ValidatorAddressCodec(),
authcodec.NewBech32Codec(sdk.Bech32PrefixConsAddr),
Expand Down Expand Up @@ -407,7 +408,7 @@ func NewSimApp(
}
homePath := cast.ToString(appOpts.Get(flags.FlagHome))
// set the governance module account as the authority for conducting upgrades
app.UpgradeKeeper = upgradekeeper.NewKeeper(runtime.NewEnvironment(runtime.NewKVStoreService(keys[upgradetypes.StoreKey]), logger.With(log.ModuleKey, "x/upgrade"), runtime.EnvWithMsgRouterService(app.MsgServiceRouter()), runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())), skipUpgradeHeights, appCodec, homePath, app.BaseApp, govModuleAddr)
app.UpgradeKeeper = upgradekeeper.NewKeeper(runtime.NewEnvironment(runtime.NewKVStoreService(keys[upgradetypes.StoreKey]), logger.With(log.ModuleKey, "x/upgrade"), runtime.EnvWithMsgRouterService(app.MsgServiceRouter()), runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())), skipUpgradeHeights, appCodec, homePath, app.BaseApp, govModuleAddr, app.ConsensusParamsKeeper)

app.IBCKeeper = ibckeeper.NewKeeper(
appCodec, runtime.NewKVStoreService(keys[ibcexported.StoreKey]), app.GetSubspace(ibcexported.ModuleName), app.UpgradeKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
Expand Down Expand Up @@ -611,7 +612,7 @@ func NewSimApp(

// create evidence keeper with router
evidenceKeeper := evidencekeeper.NewKeeper(
appCodec, runtime.NewEnvironment(runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), logger.With(log.ModuleKey, "x/evidence"), runtime.EnvWithMsgRouterService(app.MsgServiceRouter()), runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())), app.StakingKeeper, app.SlashingKeeper, app.AuthKeeper.AddressCodec(),
appCodec, runtime.NewEnvironment(runtime.NewKVStoreService(keys[evidencetypes.StoreKey]), logger.With(log.ModuleKey, "x/evidence"), runtime.EnvWithMsgRouterService(app.MsgServiceRouter()), runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())), app.StakingKeeper, app.SlashingKeeper, app.ConsensusParamsKeeper, app.AuthKeeper.AddressCodec(),
)
// If evidence needs to be handled for the app, set routes in router here and seal
app.EvidenceKeeper = *evidenceKeeper
Expand Down Expand Up @@ -820,6 +821,8 @@ func (app *SimApp) setAnteHandler(txConfig client.TxConfig) {
HandlerOptions: ante.HandlerOptions{
AccountKeeper: app.AuthKeeper,
BankKeeper: app.BankKeeper,
ConsensusKeeper: app.ConsensusParamsKeeper,
Environment: runtime.NewEnvironment(nil, app.Logger(), runtime.EnvWithMsgRouterService(app.MsgServiceRouter()), runtime.EnvWithQueryRouterService(app.GRPCQueryRouter())), // nil is set as the kvstoreservice to avoid module access,
FeegrantKeeper: app.FeeGrantKeeper,
SignModeHandler: txConfig.SignModeHandler(),
SigGasConsumer: ante.DefaultSigVerificationGasConsumer,
Expand Down
23 changes: 19 additions & 4 deletions modules/light-clients/08-wasm/testing/simapp/export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
slashingtypes "cosmossdk.io/x/slashing/types"
"cosmossdk.io/x/staking"
stakingtypes "cosmossdk.io/x/staking/types"

cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
cmttypes "github.com/cometbft/cometbft/types"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
sdk "github.com/cosmos/cosmos-sdk/types"

cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
)

// ExportAppStateAndValidators exports the state of the application for a genesis
Expand Down Expand Up @@ -41,9 +41,24 @@ func (app *SimApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAd
}

validators, err := staking.WriteValidators(ctx, app.StakingKeeper)
cmtValidators := []cmttypes.GenesisValidator{}
for _, val := range validators {
cmtPk, err := cryptocodec.ToCmtPubKeyInterface(val.PubKey)
if err != nil {
return servertypes.ExportedApp{}, err
}
cmtVal := cmttypes.GenesisValidator{
Address: val.Address.Bytes(),
PubKey: cmtPk,
Power: val.Power,
Name: val.Name,
}

cmtValidators = append(cmtValidators, cmtVal)
}
return servertypes.ExportedApp{
AppState: appState,
Validators: validators,
Validators: cmtValidators,
Height: height,
ConsensusParams: app.BaseApp.GetConsensusParams(ctx),
}, err
Expand Down

0 comments on commit c01a5ed

Please sign in to comment.