hopefully fixed proposals

DecentralCardGame · Sep 26, 2023 · 158c72d · 158c72d
1 parent c4853ce
commit 158c72d
Show file tree

Hide file tree

Showing 5 changed files with 155 additions and 106 deletions.
diff --git a/app/app.go b/app/app.go
@@ -495,6 +495,28 @@ func New(
 	// If evidence needs to be handled for the app, set routes in router here and seal
 	app.EvidenceKeeper = *evidenceKeeper
 
+	app.CardchainKeeper = *cardchainmodulekeeper.NewKeeper(
+		appCodec,
+		keys[cardchainmoduletypes.UsersStoreKey],
+		keys[cardchainmoduletypes.CardsStoreKey],
+		keys[cardchainmoduletypes.MatchesStoreKey],
+		keys[cardchainmoduletypes.CollectionsStoreKey],
+		keys[cardchainmoduletypes.SellOffersStoreKey],
+		keys[cardchainmoduletypes.PoolsStoreKey],
+		keys[cardchainmoduletypes.CouncilsStoreKey],
+		keys[cardchainmoduletypes.RunningAveragesStoreKey],
+		keys[cardchainmoduletypes.ImagesStoreKey],
+		keys[cardchainmoduletypes.ServersStoreKey],
+		keys[cardchainmoduletypes.InternalStoreKey],
+		app.GetSubspace(cardchainmoduletypes.ModuleName),
+
+		app.BankKeeper,
+	)
+
+	cardchainModule := cardchainmodule.NewAppModule(appCodec, app.CardchainKeeper, app.AccountKeeper, app.BankKeeper)
+
+	// this line is used by starport scaffolding # stargate/app/keeperDefinition
+
 	// register the proposal types
 	govRouter := govv1beta1.NewRouter()
 	govRouter.
@@ -518,27 +540,6 @@ func New(
 		govConfig,
 	)
 
-	app.CardchainKeeper = *cardchainmodulekeeper.NewKeeper(
-		appCodec,
-		keys[cardchainmoduletypes.UsersStoreKey],
-		keys[cardchainmoduletypes.CardsStoreKey],
-		keys[cardchainmoduletypes.MatchesStoreKey],
-		keys[cardchainmoduletypes.CollectionsStoreKey],
-		keys[cardchainmoduletypes.SellOffersStoreKey],
-		keys[cardchainmoduletypes.PoolsStoreKey],
-		keys[cardchainmoduletypes.CouncilsStoreKey],
-		keys[cardchainmoduletypes.RunningAveragesStoreKey],
-		keys[cardchainmoduletypes.ImagesStoreKey],
-		keys[cardchainmoduletypes.ServersStoreKey],
-		keys[cardchainmoduletypes.InternalStoreKey],
-		app.GetSubspace(cardchainmoduletypes.ModuleName),
-
-		app.BankKeeper,
-	)
-	cardchainModule := cardchainmodule.NewAppModule(appCodec, app.CardchainKeeper, app.AccountKeeper, app.BankKeeper)
-
-	// this line is used by starport scaffolding # stargate/app/keeperDefinition
-
 	// Sealing prevents other modules from creating scoped sub-keepers
 	app.CapabilityKeeper.Seal()
 

diff --git a/go.mod b/go.mod
@@ -19,16 +19,16 @@ require (
 	github.com/tendermint/tendermint v0.34.29
 	github.com/tendermint/tm-db v0.6.7
 	golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0
-	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
-	google.golang.org/grpc v1.57.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
+	google.golang.org/grpc v1.58.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	cloud.google.com/go v0.110.4 // indirect
-	cloud.google.com/go/compute v1.20.1 // indirect
+	cloud.google.com/go v0.110.6 // indirect
+	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.1.0 // indirect
+	cloud.google.com/go/iam v1.1.1 // indirect
 	cloud.google.com/go/storage v1.30.1 // indirect
 	cosmossdk.io/math v1.0.0-rc.0 // indirect
 	filippo.io/edwards25519 v1.0.0-rc.1 // indirect
@@ -146,18 +146,18 @@ require (
 	github.com/zondax/ledger-go v0.14.1 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
-	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/oauth2 v0.10.0 // indirect
-	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/term v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/oauth2 v0.12.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.126.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect
+	google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect