Merge branch 'main' into son/port_mint_integration_tests

runtime/v2/module.go

@@ -18,6 +18,7 @@ import (
 	"cosmossdk.io/core/branch"
 	"cosmossdk.io/core/comet"
 	"cosmossdk.io/core/event"
+	"cosmossdk.io/core/gas"
 	"cosmossdk.io/core/header"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/core/router"
@@ -214,6 +215,7 @@ func ProvideEnvironment(
 	kvService store.KVStoreService,
 	memKvService store.MemoryStoreService,
 	headerService header.Service,
+	gasService gas.Service,
 	eventService event.Service,
 	branchService branch.Service,
 	routerBuilder RouterServiceBuilder,
@@ -222,7 +224,7 @@ func ProvideEnvironment(
 		Logger:             logger,
 		BranchService:      branchService,
 		EventService:       eventService,
-		GasService:         stf.NewGasMeterService(),
+		GasService:         gasService,
 		HeaderService:      headerService,
 		QueryRouterService: routerBuilder.BuildQueryRouter(),
 		MsgRouterService:   routerBuilder.BuildMsgRouter([]byte(key.Name())),
@@ -296,6 +298,7 @@ func DefaultServiceBindings() depinject.Config {
 		eventService                = services.NewGenesisEventService(stf.NewEventService())
 		storeBuilder                = root.NewBuilder()
 		branchService               = stf.BranchService{}
+		gasService                  = stf.NewGasMeterService()
 	)
 	return depinject.Supply(
 		kvServiceFactory,
@@ -305,5 +308,6 @@ func DefaultServiceBindings() depinject.Config {
 		eventService,
 		storeBuilder,
 		branchService,
+		gasService,
 	)
 }

tests/go.mod

@@ -51,6 +51,7 @@ require (
 	cosmossdk.io/x/staking v0.0.0-20240226161501-23359a0b6d91
 	github.com/cometbft/cometbft/api v1.0.0-rc2
 	github.com/cosmos/cosmos-db v1.1.0
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gofuzz v1.2.0
 	github.com/jhump/protoreflect v1.17.0
@@ -126,7 +127,6 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect