From c055483cf31836f77ba2a1bd1452e8fa01f6fe33 Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Mon, 9 Sep 2024 17:23:36 +0200 Subject: [PATCH] fix other simapps --- modules/apps/callbacks/go.mod | 4 ++-- modules/apps/callbacks/go.sum | 4 ++-- modules/apps/callbacks/testing/simapp/app.go | 4 ++-- modules/apps/callbacks/testing/simapp/simd/cmd/root.go | 5 +++-- modules/light-clients/08-wasm/go.mod | 2 +- modules/light-clients/08-wasm/go.sum | 8 ++++---- modules/light-clients/08-wasm/testing/simapp/app.go | 4 ++-- .../light-clients/08-wasm/testing/simapp/simd/cmd/root.go | 5 +++-- testing/simapp/app.go | 4 ++-- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/modules/apps/callbacks/go.mod b/modules/apps/callbacks/go.mod index e2e1f0a72f7..a60c45d312f 100644 --- a/modules/apps/callbacks/go.mod +++ b/modules/apps/callbacks/go.mod @@ -14,6 +14,7 @@ require ( cosmossdk.io/api v0.8.0 cosmossdk.io/client/v2 v2.0.0-beta.3 cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab + cosmossdk.io/core v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.1 cosmossdk.io/math v1.3.0 @@ -29,7 +30,7 @@ require ( cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a cosmossdk.io/x/group v0.0.0-00010101000000-000000000000 - cosmossdk.io/x/mint v0.0.0-20240906090851-36d9b25e8981 + cosmossdk.io/x/mint v0.0.0-20240909082436-01c0e9ba3581 cosmossdk.io/x/params v0.0.0-00010101000000-000000000000 cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190 cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000 @@ -58,7 +59,6 @@ require ( cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/iam v1.1.9 // indirect cloud.google.com/go/storage v1.42.0 // indirect - cosmossdk.io/core v1.0.0 // indirect cosmossdk.io/core/testing v0.0.0-20240906090851-36d9b25e8981 // indirect cosmossdk.io/depinject v1.0.0 // indirect cosmossdk.io/schema v0.2.0 // indirect diff --git a/modules/apps/callbacks/go.sum b/modules/apps/callbacks/go.sum index ef45cec006e..06b9b2a6a71 100644 --- a/modules/apps/callbacks/go.sum +++ b/modules/apps/callbacks/go.sum @@ -242,8 +242,8 @@ cosmossdk.io/x/gov v0.0.0-20240905174638-8ce77cbb2450 h1:4qpruZEf5JgMPmdQr2neXsc 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/mint v0.0.0-20240905174638-8ce77cbb2450 h1:v3zIaCX8qskFcMPvaAR5LCApI3B6s0cE1yv3SPp8Bx4= -cosmossdk.io/x/mint v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:Wkjv4vrA5xjk8dXEy/L6U4pCd433yVDInYJ7VY3RqKM= +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= diff --git a/modules/apps/callbacks/testing/simapp/app.go b/modules/apps/callbacks/testing/simapp/app.go index 074f36f4465..7098121e359 100644 --- a/modules/apps/callbacks/testing/simapp/app.go +++ b/modules/apps/callbacks/testing/simapp/app.go @@ -7,13 +7,13 @@ import ( "os" "path/filepath" - dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" "github.com/spf13/cast" autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" "cosmossdk.io/client/v2/autocli" + corestore "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/accounts" @@ -236,7 +236,7 @@ func init() { // NewSimApp returns a reference to an initialized SimApp. func NewSimApp( logger log.Logger, - db dbm.DB, + db corestore.KVStoreWithBatch, traceStore io.Writer, loadLatest bool, appOpts servertypes.AppOptions, diff --git a/modules/apps/callbacks/testing/simapp/simd/cmd/root.go b/modules/apps/callbacks/testing/simapp/simd/cmd/root.go index e7383a8c3c1..3049cc92273 100644 --- a/modules/apps/callbacks/testing/simapp/simd/cmd/root.go +++ b/modules/apps/callbacks/testing/simapp/simd/cmd/root.go @@ -10,6 +10,7 @@ import ( "github.com/spf13/viper" "cosmossdk.io/client/v2/offchain" + corestore "cosmossdk.io/core/store" "cosmossdk.io/log" confixcmd "cosmossdk.io/tools/confix/cmd" @@ -277,7 +278,7 @@ func genesisCommand(moduleManager *module.Manager, appExport servertypes.AppExpo // newApp creates the application func newApp( logger log.Logger, - db dbm.DB, + db corestore.KVStoreWithBatch, traceStore io.Writer, appOpts servertypes.AppOptions, ) servertypes.Application { @@ -293,7 +294,7 @@ func newApp( // appExport creates a new simapp (optionally at a given height) and exports state. func appExport( logger log.Logger, - db dbm.DB, + db corestore.KVStoreWithBatch, traceStore io.Writer, height int64, forZeroHeight bool, diff --git a/modules/light-clients/08-wasm/go.mod b/modules/light-clients/08-wasm/go.mod index b9bc819f940..1f2cba895ff 100644 --- a/modules/light-clients/08-wasm/go.mod +++ b/modules/light-clients/08-wasm/go.mod @@ -24,7 +24,7 @@ require ( cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a cosmossdk.io/x/group v0.0.0-00010101000000-000000000000 - cosmossdk.io/x/mint v0.0.0-20240906090851-36d9b25e8981 + cosmossdk.io/x/mint v0.0.0-20240909082436-01c0e9ba3581 cosmossdk.io/x/params v0.0.0-00010101000000-000000000000 cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190 cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000 diff --git a/modules/light-clients/08-wasm/go.sum b/modules/light-clients/08-wasm/go.sum index f2e0bc8ff70..8dcf4d8d9ca 100644 --- a/modules/light-clients/08-wasm/go.sum +++ b/modules/light-clients/08-wasm/go.sum @@ -212,8 +212,8 @@ cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= cosmossdk.io/schema v0.2.0 h1:UH5CR1DqUq8yP+5Np8PbvG4YX0zAUsTN2Qk6yThmfMk= cosmossdk.io/schema v0.2.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 h1:o024zaPHYtmUGL2BCX1ns9rfZmMc19U4hQ2CAPt2Xgg= -cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897/go.mod h1:Ma4uny4RFegWTbU71fBmkSIoHrWHlLC/JwwgWgehZm4= +cosmossdk.io/store v1.0.0-rc.0.0.20240906090851-36d9b25e8981 h1:O510vQpVdyZgSlLm4NG2aQltDkKfoWcKrVCPPWQlNHs= +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= @@ -242,8 +242,8 @@ cosmossdk.io/x/gov v0.0.0-20240905174638-8ce77cbb2450 h1:4qpruZEf5JgMPmdQr2neXsc 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/mint v0.0.0-20240905174638-8ce77cbb2450 h1:v3zIaCX8qskFcMPvaAR5LCApI3B6s0cE1yv3SPp8Bx4= -cosmossdk.io/x/mint v0.0.0-20240905174638-8ce77cbb2450/go.mod h1:Wkjv4vrA5xjk8dXEy/L6U4pCd433yVDInYJ7VY3RqKM= +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= diff --git a/modules/light-clients/08-wasm/testing/simapp/app.go b/modules/light-clients/08-wasm/testing/simapp/app.go index 128a437362c..8839c7e883c 100644 --- a/modules/light-clients/08-wasm/testing/simapp/app.go +++ b/modules/light-clients/08-wasm/testing/simapp/app.go @@ -9,13 +9,13 @@ import ( "path/filepath" "strconv" - dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" "github.com/spf13/cast" autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" "cosmossdk.io/client/v2/autocli" + corestore "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/accounts" @@ -241,7 +241,7 @@ func init() { // NewSimApp returns a reference to an initialized SimApp. func NewSimApp( logger log.Logger, - db dbm.DB, + db corestore.KVStoreWithBatch, traceStore io.Writer, loadLatest bool, appOpts servertypes.AppOptions, diff --git a/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go b/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go index fade9a49e8f..d088d5d4551 100644 --- a/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go +++ b/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go @@ -14,6 +14,7 @@ import ( "github.com/spf13/viper" "cosmossdk.io/client/v2/offchain" + corestore "cosmossdk.io/core/store" "cosmossdk.io/log" confixcmd "cosmossdk.io/tools/confix/cmd" @@ -292,7 +293,7 @@ func genesisCommand(moduleManager *module.Manager, appExport servertypes.AppExpo // newApp creates the application func newApp( logger log.Logger, - db dbm.DB, + db corestore.KVStoreWithBatch, traceStore io.Writer, appOpts servertypes.AppOptions, ) servertypes.Application { @@ -308,7 +309,7 @@ func newApp( // appExport creates a new simapp (optionally at a given height) and exports state. func appExport( logger log.Logger, - db dbm.DB, + db corestore.KVStoreWithBatch, traceStore io.Writer, height int64, forZeroHeight bool, diff --git a/testing/simapp/app.go b/testing/simapp/app.go index 7c795d621da..86b886e0d18 100644 --- a/testing/simapp/app.go +++ b/testing/simapp/app.go @@ -7,13 +7,13 @@ import ( "os" "path/filepath" - dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" "github.com/spf13/cast" autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" "cosmossdk.io/client/v2/autocli" + corestore "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/accounts" @@ -217,7 +217,7 @@ func init() { // NewSimApp returns a reference to an initialized SimApp. func NewSimApp( logger log.Logger, - db dbm.DB, + db corestore.KVStoreWithBatch, traceStore io.Writer, loadLatest bool, appOpts servertypes.AppOptions,