Add Tx channels to context

baseapp/baseapp.go

@@ -803,6 +803,7 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode runTxMode) (*s
 		)
 
 		if handler := app.msgServiceRouter.Handler(msg); handler != nil {
+			ctx = ctx.WithMessageIndex(i)
 			// ADR 031 request type routing
 			msgResult, err = handler(ctx, msg)
 			eventMsgName = sdk.MsgTypeURL(msg)

proto/cosmos/accesscontrol/accesscontrol.proto

@@ -4,8 +4,7 @@ package cosmos.accesscontrol.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/accesscontrol/constants.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/accesscontrol/types";
-
+option go_package = "github.com/cosmos/cosmos-sdk/types/accesscontrol";
 
 message AccessOperation {
     AccessType access_type  = 1;

proto/cosmos/accesscontrol/constants.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package cosmos.accesscontrol.v1beta1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/accesscontrol/types";
+option go_package = "github.com/cosmos/cosmos-sdk/types/accesscontrol";
 
 enum AccessType {
     UNKNOWN = 0;

proto/cosmos/accesscontrol/genesis.proto → proto/cosmos/accesscontrol_genesis/genesis.proto

@@ -1,8 +1,7 @@
 syntax = "proto3";
-package cosmos.accesscontrol.v1beta1;
+package cosmos.accesscontrol_genesis.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "cosmos/accesscontrol/constants.proto";
 import "cosmos/accesscontrol/accesscontrol.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/accesscontrol/types";
@@ -11,7 +10,7 @@ message GenesisState {
     Params params = 1 [(gogoproto.nullable) = false];
 
     // mapping between every message type and its predetermined resource read/write sequence
-    repeated MessageDependencyMapping message_dependency_mapping = 2 [
+    repeated cosmos.accesscontrol.v1beta1.MessageDependencyMapping message_dependency_mapping = 2 [
         (gogoproto.nullable) = false,
         (gogoproto.moretags) = "yaml:\"message_dependency_mapping\""
     ];

x/accesscontrol/types/access_operation.go → types/accesscontrol/access_operation.go

@@ -1,4 +1,4 @@
-package types
+package accesscontrol
 
 import (
 	fmt "fmt"

types/context.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/store/gaskv"
 	stypes "github.com/cosmos/cosmos-sdk/store/types"
+	acltypes "github.com/cosmos/cosmos-sdk/types/accesscontrol"
 )
 
 /*
@@ -39,8 +40,18 @@ type Context struct {
 	consParams    *tmproto.ConsensusParams
 	eventManager  *EventManager
 	priority      int64 // The tx priority, only relevant in CheckTx
+
+	txBlockingChannels		MessageAccessOpsChannelMapping
+	txCompletionChannels	MessageAccessOpsChannelMapping
+	messageIndex int	// Used to track current message being processed
 }
 
+// Alias for Map of MessageIndex -> AccessOperation -> Channel
+type MessageAccessOpsChannelMapping = map[int]AccessOpsChannelMapping
+
+// Alias for Map of AccessOperation -> Channel
+type AccessOpsChannelMapping = map[*acltypes.AccessOperation][]chan interface{}
+
 // Proposed rename, not done to avoid API breakage
 type Request = Context
 
@@ -60,6 +71,9 @@ func (c Context) IsReCheckTx() bool           { return c.recheckTx }
 func (c Context) MinGasPrices() DecCoins      { return c.minGasPrice }
 func (c Context) EventManager() *EventManager { return c.eventManager }
 func (c Context) Priority() int64             { return c.priority }
+func (c Context) TxCompletionChannels() MessageAccessOpsChannelMapping { return c.txCompletionChannels }
+func (c Context) TxBlockingChannels() 	MessageAccessOpsChannelMapping { return c.txBlockingChannels }
+func (c Context) MessageIndex() int		  { return c.messageIndex }
 
 // clone the header before returning
 func (c Context) BlockHeader() tmproto.Header {
@@ -222,6 +236,24 @@ func (c Context) WithEventManager(em *EventManager) Context {
 	return c
 }
 
+// WithTxCompletionChannels returns a Context with an updated list of completion channel
+func (c Context) WithTxCompletionChannels(completionChannels MessageAccessOpsChannelMapping) Context {
+	c.txCompletionChannels = completionChannels
+	return c
+}
+
+// WithTxBlockingChannels returns a Context with an updated list of blocking channels for completion signals
+func (c Context) WithTxBlockingChannels(blockingChannels MessageAccessOpsChannelMapping) Context {
+	c.txBlockingChannels = blockingChannels
+	return c
+}
+
+// WithMessageIndex returns a Context with the current message index that's being processed
+func (c Context) WithMessageIndex(messageIndex int) Context {
+	c.messageIndex = messageIndex
+	return c
+}
+
 // TODO: remove???
 func (c Context) IsZero() bool {
 	return c.ms == nil

types/tx_msg.go

@@ -78,4 +78,4 @@ type TxEncoder func(tx Tx) ([]byte, error)
 // MsgTypeURL returns the TypeURL of a `sdk.Msg`.
 func MsgTypeURL(msg Msg) string {
 	return "/" + proto.MessageName(msg)
-}
+}

x/accesscontrol/keeper/genesis.go

@@ -2,7 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
+	acltypes "github.com/cosmos/cosmos-sdk/types/accesscontrol"
 	"github.com/cosmos/cosmos-sdk/x/accesscontrol/types"
 )
 
@@ -14,8 +14,8 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) {
 }
 
 func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
-	resourceDepedencyMappings := []types.MessageDependencyMapping{}
-	k.IterateResourceKeys(ctx, func(dependencyMapping types.MessageDependencyMapping) (stop bool) {
+	resourceDepedencyMappings := []acltypes.MessageDependencyMapping{}
+	k.IterateResourceKeys(ctx, func(dependencyMapping acltypes.MessageDependencyMapping) (stop bool) {
 		resourceDepedencyMappings = append(resourceDepedencyMappings, dependencyMapping)
 		return false
 	})

x/accesscontrol/keeper/keeper.go

@@ -8,8 +8,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	acltypes "github.com/cosmos/cosmos-sdk/types/accesscontrol"
 	"github.com/cosmos/cosmos-sdk/x/accesscontrol/types"
-
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )
 
@@ -41,17 +41,17 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger {
 	return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName))
 }
 
-func (k Keeper) GetResourceDependencyMapping(ctx sdk.Context, messageKey string) types.MessageDependencyMapping {
+func (k Keeper) GetResourceDependencyMapping(ctx sdk.Context, messageKey string) acltypes.MessageDependencyMapping {
 	store := ctx.KVStore(k.storeKey)
 	b := store.Get(types.GetResourceDependencyKey(messageKey))
-	dependencyMapping := types.MessageDependencyMapping{}
+	dependencyMapping := acltypes.MessageDependencyMapping{}
 	k.cdc.MustUnmarshal(b, &dependencyMapping)
 	return dependencyMapping
 }
 
 func (k Keeper) SetResourceDependencyMapping(
 	ctx sdk.Context,
-	dependencyMapping types.MessageDependencyMapping,
+	dependencyMapping acltypes.MessageDependencyMapping,
 ) error {
 	err := types.ValidateMessageDependencyMapping(dependencyMapping)
 	if err != nil {
@@ -64,12 +64,12 @@ func (k Keeper) SetResourceDependencyMapping(
 	return nil
 }
 
-func (k Keeper) IterateResourceKeys(ctx sdk.Context, handler func(dependencyMapping types.MessageDependencyMapping) (stop bool)) {
+func (k Keeper) IterateResourceKeys(ctx sdk.Context, handler func(dependencyMapping acltypes.MessageDependencyMapping) (stop bool)) {
 	store := ctx.KVStore(k.storeKey)
 	iter := sdk.KVStorePrefixIterator(store, types.GetResourceDependencyMappingKey())
 	defer iter.Close()
 	for ; iter.Valid(); iter.Next() {
-		dependencyMapping := types.MessageDependencyMapping{}
+		dependencyMapping := acltypes.MessageDependencyMapping{}
 		k.cdc.MustUnmarshal(iter.Value(), &dependencyMapping)
 		if handler(dependencyMapping) {
 			break

x/accesscontrol/types/genesis.go

@@ -4,22 +4,23 @@ import (
 	"encoding/json"
 
 	"github.com/cosmos/cosmos-sdk/codec"
+	acltypes "github.com/cosmos/cosmos-sdk/types/accesscontrol"
 )
 
-func DefaultMessageDependencyMapping() []MessageDependencyMapping {
-	return []MessageDependencyMapping{
+func DefaultMessageDependencyMapping() []acltypes.MessageDependencyMapping {
+	return []acltypes.MessageDependencyMapping{
 		{
 			MessageKey: "",
-			AccessOps: []AccessOperation{
-				{AccessType: AccessType_UNKNOWN, ResourceType: ResourceType_ANY, IdentifierTemplate: "*"},
-				{AccessType: AccessType_COMMIT, ResourceType: ResourceType_ANY, IdentifierTemplate: "*"},
+			AccessOps: []acltypes.AccessOperation{
+				{AccessType: acltypes.AccessType_UNKNOWN, ResourceType: acltypes.ResourceType_ANY, IdentifierTemplate: "*"},
+				{AccessType: acltypes.AccessType_COMMIT, ResourceType: acltypes.ResourceType_ANY, IdentifierTemplate: "*"},
 			},
 		},
 	}
 }
 
 // NewGenesisState creates a new GenesisState object
-func NewGenesisState(params Params, messageDependencyMapping []MessageDependencyMapping) *GenesisState {
+func NewGenesisState(params Params, messageDependencyMapping []acltypes.MessageDependencyMapping) *GenesisState {
 	return &GenesisState{
 		Params:                   params,
 		MessageDependencyMapping: messageDependencyMapping,