refactor!(core): add in environment bundler of service

core/appmodule/environment.go

@@ -0,0 +1,19 @@
+package appmodule
+
+import (
+	"cosmossdk.io/core/branch"
+	"cosmossdk.io/core/event"
+	"cosmossdk.io/core/gas"
+	"cosmossdk.io/core/header"
+	"cosmossdk.io/core/store"
+)
+
+// Environment is used to get all services to their respective module
+type Environment struct {
+	BranchService   branch.Service
+	EventService    event.Service
+	GasService      gas.Service
+	HeaderService   header.Service
+	KvStoreService  map[string]store.KVStoreService
+	MemStoreService map[string]store.MemoryStoreService
+}

core/event/service.go

@@ -21,20 +21,20 @@ type Manager interface {
 	// Callers SHOULD assume that these events may be included in consensus. These events
 	// MUST be emitted deterministically and adding, removing or changing these events SHOULD
 	// be considered state-machine breaking.
-	Emit(ctx context.Context, event protoiface.MessageV1) error
+	Emit(event protoiface.MessageV1) error
 
 	// EmitKV emits an event based on an event and kv-pair attributes.
 	//
 	// These events will not be part of consensus and adding, removing or changing these events is
 	// not a state-machine breaking change.
-	EmitKV(ctx context.Context, eventType string, attrs ...Attribute) error
+	EmitKV(eventType string, attrs ...Attribute) error
 
 	// EmitNonConsensus emits events represented as a protobuf message (as described in ADR 032), without
 	// including it in blockchain consensus.
 	//
 	// These events will not be part of consensus and adding, removing or changing events is
 	// not a state-machine breaking change.
-	EmitNonConsensus(ctx context.Context, event protoiface.MessageV1) error
+	EmitNonConsensus(event protoiface.MessageV1) error
 }
 
 // KVEventAttribute is a kv-pair event attribute.

core/gas/meter.go

@@ -26,15 +26,10 @@ type Service interface {
 	WithBlockGasMeter(ctx context.Context, meter Meter) context.Context
 }
 
-// Meter represents a gas meter.
+// Meter represents a gas meter for modules consumption
 type Meter interface {
-	GasConsumed() Gas
-	GasConsumedToLimit() Gas
-	GasRemaining() Gas
-	Limit() Gas
 	ConsumeGas(amount Gas, descriptor string)
 	RefundGas(amount Gas, descriptor string)
-	IsPastLimit() bool
-	IsOutOfGas() bool
-	String() string
+	GasRemaining() Gas
+	Limit() Gas
 }

runtime/environment.go

@@ -0,0 +1,23 @@
+package runtime
+
+import (
+	"cosmossdk.io/core/appmodule"
+	storetypes "cosmossdk.io/store/types"
+)
+
+func NewEnvironment(kvKeys []storetypes.KVStoreKey, memKeys []storetypes.MemoryStoreKey) *appmodule.Environment {
+	env := &appmodule.Environment{}
+	for _, storeKey := range kvKeys {
+		env.KvStoreService[storeKey.Name()] = NewKVStoreService(&storeKey)
+	}
+	for _, memKey := range memKeys {
+		env.MemStoreService[memKey.Name()] = NewMemStoreService(&memKey)
+	}
+	env.EventService = EventService{}
+	env.HeaderService = HeaderService{}
+	env.BranchService = BranchService{}
+
+	//   GasService      gas.Service
+
+	return env
+}

runtime/events.go

@@ -18,10 +18,10 @@
 
 func (es EventService) EventManager(ctx context.Context) event.Manager {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	return &Events{sdkCtx.EventManager()}
 }
 
 var _ event.Manager = (*Events)(nil)
 
 type Events struct {
 	sdk.EventManagerI
@@ -29,17 +29,17 @@
 
 func NewEventManager(ctx context.Context) event.Manager {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	return &Events{sdkCtx.EventManager()}
 }
 
 // Emit emits an typed event that is defined in the protobuf file.
 // In the future these events will be added to consensus.
-func (e Events) Emit(ctx context.Context, event protoiface.MessageV1) error {
+func (e Events) Emit(event protoiface.MessageV1) error {
 	return e.EventManagerI.EmitTypedEvent(event)
 }
 
 // EmitKV emits a key value pair event.
-func (e Events) EmitKV(ctx context.Context, eventType string, attrs ...event.Attribute) error {
+func (e Events) EmitKV(eventType string, attrs ...event.Attribute) error {
 	attributes := make([]sdk.Attribute, 0, len(attrs))
 
 	for _, attr := range attrs {
@@ -52,6 +52,6 @@
 
 // Emit emits an typed event that is defined in the protobuf file.
 // In the future these events will be added to consensus.
-func (e Events) EmitNonConsensus(ctx context.Context, event protoiface.MessageV1) error {
+func (e Events) EmitNonConsensus(event protoiface.MessageV1) error {
 	return e.EventManagerI.EmitTypedEvent(event)
 }

runtime/gas.go

@@ -0,0 +1,44 @@
+package runtime
+
+import (
+	"context"
+
+	"cosmossdk.io/core/gas"
+	storetypes "cosmossdk.io/store/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+var _ gas.Service = GasService{}
+
+type GasService struct {
+	storetypes.GasMeter
+}
+
+func (g GasService) GetGasMeter(ctx context.Context) gas.Meter {
+	return sdk.UnwrapSDKContext(ctx).GasMeter()
+}
+
+func (g GasService) GetBlockGasMeter(ctx context.Context) gas.Meter {
+	return sdk.UnwrapSDKContext(ctx).BlockGasMeter()
+}
+
+func (g GasService) WithGasMeter(ctx context.Context, meter gas.Meter) context.Context {
+	return sdk.UnwrapSDKContext(ctx).WithGasMeter(meter)
+}
+
+func (g GasService) WithBlockGasMeter(ctx context.Context, meter gas.Meter) context.Context {
+	return sdk.UnwrapSDKContext(ctx).WithGasMeter()
+}
+
+// ______________________________________________________________________________________________
+// Gas Meter Wrappers
+// ______________________________________________________________________________________________
+
+type SDKGasMeter struct {
+	gas.Meter
+}
+
+type CoreGasmeter struct {
+	storetypes.GasMeter
+}

runtime/store.go

@@ -28,6 +28,10 @@ type memStoreService struct {
 	key *storetypes.MemoryStoreKey
 }
 
+func NewMemStoreService(storeKey *storetypes.MemoryStoreKey) store.MemoryStoreService {
+	return &memStoreService{key: storeKey}
+}
+
 func (m memStoreService) OpenMemoryStore(ctx context.Context) store.KVStore {
 	return newKVStore(sdk.UnwrapSDKContext(ctx).KVStore(m.key))
 }

simapp/app.go

@@ -282,7 +282,6 @@ func NewSimApp(
 	bApp.SetParamStore(app.ConsensusParamsKeeper.ParamsStore)
 
 	// add keepers
-
 	app.AuthKeeper = authkeeper.NewAccountKeeper(appCodec, runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, maccPerms, authcodec.NewBech32Codec(sdk.Bech32MainPrefix), sdk.Bech32MainPrefix, authtypes.NewModuleAddress(govtypes.ModuleName).String())
 
 	accountsKeeper, err := accounts.NewKeeper(

x/accounts/msg_server.go

@@ -44,7 +44,6 @@ func (m msgServer) Init(ctx context.Context, request *v1.MsgInit) (*v1.MsgInitRe
 
 	eventManager := m.k.eventService.EventManager(ctx)
 	err = eventManager.EmitKV(
-		ctx,
 		"account_creation",
 		event.Attribute{
 			Key:   "address",

x/accounts/utils_test.go

@@ -24,13 +24,13 @@ func (a addressCodec) BytesToString(bz []byte) (string, error)   { return string
 
 type eventService struct{}
 
-func (e eventService) Emit(ctx context.Context, event protoiface.MessageV1) error { return nil }
+func (e eventService) Emit(event protoiface.MessageV1) error { return nil }
 
-func (e eventService) EmitKV(ctx context.Context, eventType string, attrs ...event.Attribute) error {
+func (e eventService) EmitKV(eventType string, attrs ...event.Attribute) error {
 	return nil
 }
 
-func (e eventService) EmitNonConsensus(ctx context.Context, event protoiface.MessageV1) error {
+func (e eventService) EmitNonConsensus(event protoiface.MessageV1) error {
 	return nil
 }
 

x/consensus/keeper/keeper.go

@@ -80,9 +80,8 @@
 	}
 
 	if err := k.event.EventManager(ctx).EmitKV(
-		ctx,
 		"update_consensus_params",
 		event.Attribute{Key: "authority", Value: msg.Authority},
 		event.Attribute{Key: "parameters", Value: consensusParams.String()}); err != nil {
 		return nil, err
 	}

x/counter/keeper/keeper.go

@@ -68,9 +68,8 @@
 	}
 
 	if err := k.event.EventManager(ctx).EmitKV(
-		ctx,
 		"increase_counter",
 		event.Attribute{Key: "signer", Value: msg.Signer},
 		event.Attribute{Key: "new count", Value: fmt.Sprint(num + msg.Count)}); err != nil {
 		return nil, err
 	}