refactor deferred balance to use memkv

baseapp/baseapp.go

@@ -970,7 +970,7 @@ func (app *BaseApp) runTx(ctx sdk.Context, mode runTxMode, txBytes []byte) (gInf
 		// Dont need to validate in checkTx mode
 		if ctx.MsgValidator() != nil && mode == runTxModeDeliver {
 			storeAccessOpEvents := msCache.GetEvents()
-			accessOps, _ := app.anteDepGenerator([]acltypes.AccessOperation{}, tx)
+			accessOps := ctx.TxMsgAccessOps()[acltypes.ANTE_MSG_INDEX]
 
 			missingAccessOps := ctx.MsgValidator().ValidateAccessOperations(accessOps, storeAccessOpEvents)
 			if len(missingAccessOps) != 0 {

baseapp/block_gas_test.go

@@ -125,7 +125,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
 			}
 			// check block gas is always consumed - this value may change if we update the logic for
 			// how gas is consumed
-			baseGas := uint64(52585) // baseGas is the gas consumed before tx msg
+			baseGas := uint64(58406) // baseGas is the gas consumed before tx msg
 			expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas)
 			if expGasConsumed > txtypes.MaxGasWanted {
 				// capped by gasLimit

proto/cosmos/accesscontrol/constants.proto

@@ -128,6 +128,9 @@ enum ResourceType {
     KV_DEX_CONTRACT = 90; // child of KV_DEX
     KV_DEX_LONG_ORDER_COUNT = 91; // child of KV_DEX
     KV_DEX_SHORT_ORDER_COUNT = 92; // child of KV_DEX
+
+    KV_BANK_DEFERRED = 93; // child of KV
+    KV_BANK_DEFERRED_MODULE_TX_INDEX = 95; // child of KV_BANK_DEFERRED
 }
 
 enum WasmMessageSubtype {

simapp/app.go

@@ -225,7 +225,7 @@ func NewSimApp(
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
 	// NOTE: The testingkey is just mounted for testing purposes. Actual applications should
 	// not include this key.
-	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, "testingkey")
+	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, "testingkey", banktypes.DeferredCacheStoreKey)
 
 	// configure state listening capabilities using AppOptions
 	// we are doing nothing with the returned streamingServices and waitGroup in this case
@@ -259,8 +259,8 @@ func NewSimApp(
 	app.AccountKeeper = authkeeper.NewAccountKeeper(
 		appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms,
 	)
-	app.BankKeeper = bankkeeper.NewBaseKeeper(
-		appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(),
+	app.BankKeeper = bankkeeper.NewBaseKeeperWithDeferredCache(
+		appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(), memKeys[banktypes.DeferredCacheStoreKey],
 	)
 	stakingKeeper := stakingkeeper.NewKeeper(
 		appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName),

types/accesscontrol/comparator.go

@@ -21,6 +21,9 @@ var (
 	}
 )
 
+// We generate dependencies on a per message basis for a trnasaction, but antehandlers also use resources. As a result we use -1 for the ante handler index (used as map key) to indicate that it is prior to msgs in the tx
+const ANTE_MSG_INDEX = int(-1)
+
 type Comparator struct {
 	AccessType AccessType
 	Identifier string

types/accesscontrol/resource.go

@@ -21,6 +21,7 @@ var ResourceTree = map[ResourceType]TreeNode{
 		ResourceType_KV_AUTHZ,
 		ResourceType_KV_FEEGRANT,
 		ResourceType_KV_SLASHING,
+		ResourceType_KV_BANK_DEFERRED,
 	}},
 	ResourceType_Mem: {ResourceType_ANY, []ResourceType{
 		ResourceType_DexMem,
@@ -31,9 +32,11 @@ var ResourceTree = map[ResourceType]TreeNode{
 		ResourceType_KV_BANK_DENOM,
 		ResourceType_KV_BANK_BALANCES,
 	}},
-	ResourceType_KV_BANK_SUPPLY:   {ResourceType_KV_BANK, []ResourceType{}},
-	ResourceType_KV_BANK_DENOM:    {ResourceType_KV_BANK, []ResourceType{}},
-	ResourceType_KV_BANK_BALANCES: {ResourceType_KV_BANK, []ResourceType{}},
+	ResourceType_KV_BANK_SUPPLY:                   {ResourceType_KV_BANK, []ResourceType{}},
+	ResourceType_KV_BANK_DENOM:                    {ResourceType_KV_BANK, []ResourceType{}},
+	ResourceType_KV_BANK_BALANCES:                 {ResourceType_KV_BANK, []ResourceType{}},
+	ResourceType_KV_BANK_DEFERRED:                 {ResourceType_KV, []ResourceType{ResourceType_KV_BANK_DEFERRED_MODULE_TX_INDEX}},
+	ResourceType_KV_BANK_DEFERRED_MODULE_TX_INDEX: {ResourceType_KV_BANK_DEFERRED, []ResourceType{}},
 	ResourceType_KV_STAKING: {ResourceType_KV, []ResourceType{
 		ResourceType_KV_STAKING_DELEGATION,
 		ResourceType_KV_STAKING_VALIDATOR,

types/context.go

@@ -47,8 +47,7 @@ type Context struct {
 
 	msgValidator *acltypes.MsgValidator
 	messageIndex int // Used to track current message being processed
-
-	contextMemCache *ContextMemCache
+	txIndex      int
 
 	traceSpanContext context.Context
 }
@@ -133,12 +132,12 @@ func (c Context) MessageIndex() int {
 	return c.messageIndex
 }
 
-func (c Context) MsgValidator() *acltypes.MsgValidator {
-	return c.msgValidator
+func (c Context) TxIndex() int {
+	return c.txIndex
 }
 
-func (c Context) ContextMemCache() *ContextMemCache {
-	return c.contextMemCache
+func (c Context) MsgValidator() *acltypes.MsgValidator {
+	return c.msgValidator
 }
 
 // clone the header before returning
@@ -173,16 +172,15 @@ func NewContext(ms MultiStore, header tmproto.Header, isCheckTx bool, logger log
 	// https://github.com/gogo/protobuf/issues/519
 	header.Time = header.Time.UTC()
 	return Context{
-		ctx:             context.Background(),
-		ms:              ms,
-		header:          header,
-		chainID:         header.ChainID,
-		checkTx:         isCheckTx,
-		logger:          logger,
-		gasMeter:        stypes.NewInfiniteGasMeter(),
-		minGasPrice:     DecCoins{},
-		eventManager:    NewEventManager(),
-		contextMemCache: NewContextMemCache(),
+		ctx:          context.Background(),
+		ms:           ms,
+		header:       header,
+		chainID:      header.ChainID,
+		checkTx:      isCheckTx,
+		logger:       logger,
+		gasMeter:     stypes.NewInfiniteGasMeter(),
+		minGasPrice:  DecCoins{},
+		eventManager: NewEventManager(),
 
 		txBlockingChannels:   make(acltypes.MessageAccessOpsChannelMapping),
 		txCompletionChannels: make(acltypes.MessageAccessOpsChannelMapping),
@@ -335,14 +333,14 @@ func (c Context) WithMessageIndex(messageIndex int) Context {
 	return c
 }
 
-func (c Context) WithMsgValidator(msgValidator *acltypes.MsgValidator) Context {
-	c.msgValidator = msgValidator
+// WithTxIndex returns a Context with the current transaction index that's being processed
+func (c Context) WithTxIndex(txIndex int) Context {
+	c.txIndex = txIndex
 	return c
 }
 
-// WithContextMemCache returns a Context with a new context mem cache
-func (c Context) WithContextMemCache(contextMemCache *ContextMemCache) Context {
-	c.contextMemCache = contextMemCache
+func (c Context) WithMsgValidator(msgValidator *acltypes.MsgValidator) Context {
+	c.msgValidator = msgValidator
 	return c
 }