Add Support for Deferring Mints/Burns from the Module Accounts

proto/cosmos/accesscontrol/constants.proto

@@ -21,5 +21,6 @@ enum ResourceType {
     KV_ORACLE = 7; // child of KV
     KV_DEX = 8; // child of KV
     KV_EPOCH = 9; // child of KV
+    KV_TOKENFACTORY = 11; // child of KV
 }
 

types/accesscontrol/resource.go

@@ -15,14 +15,15 @@ var ResourceTree = map[ResourceType]TreeNode{
 		ResourceType_KV_STAKING,
 		ResourceType_KV_WASM,
 	}},
-	ResourceType_Mem:        {ResourceType_ANY, []ResourceType{ResourceType_DexMem}},
-	ResourceType_DexMem:     {ResourceType_Mem, []ResourceType{}},
-	ResourceType_KV_BANK:    {ResourceType_KV, []ResourceType{}},
-	ResourceType_KV_STAKING: {ResourceType_KV, []ResourceType{}},
-	ResourceType_KV_WASM:    {ResourceType_KV, []ResourceType{}},
-	ResourceType_KV_EPOCH:   {ResourceType_KV, []ResourceType{}},
-	ResourceType_KV_ORACLE:  {ResourceType_KV, []ResourceType{}},
-	ResourceType_KV_DEX:     {ResourceType_KV, []ResourceType{}},
+	ResourceType_Mem:        		{ResourceType_ANY, []ResourceType{ResourceType_DexMem}},
+	ResourceType_DexMem:     		{ResourceType_Mem, []ResourceType{}},
+	ResourceType_KV_BANK:    		{ResourceType_KV, []ResourceType{}},
+	ResourceType_KV_STAKING: 		{ResourceType_KV, []ResourceType{}},
+	ResourceType_KV_WASM:    		{ResourceType_KV, []ResourceType{}},
+	ResourceType_KV_EPOCH:   		{ResourceType_KV, []ResourceType{}},
+	ResourceType_KV_ORACLE:  		{ResourceType_KV, []ResourceType{}},
+	ResourceType_KV_DEX:     		{ResourceType_KV, []ResourceType{}},
+	ResourceType_KV_TOKENFACTORY:	{ResourceType_KV, []ResourceType{}},
 }
 
 // This returns a slice of all resource types that are dependent to a specific resource type

types/context_cache.go

@@ -2,6 +2,8 @@ package types
 
 import (
 	"sync"
+
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 
@@ -20,34 +22,52 @@ func NewContextMemCache() *ContextMemCache {
 	}
 }
 
-func (c *ContextMemCache) UpsertDeferredSends(moduleAccount string, amount Coins) {
-	// Separate locks needed for all mappings - atomic transaction needed
+func (c *ContextMemCache) UpsertDeferredSends(moduleAccount string, amount Coins) error {
+	// Separate locks needed for all mappings - atmoic transaction needed
 	c.deferredBankOpsLock.Lock()
 	defer c.deferredBankOpsLock.Unlock()
 
+	if !amount.IsValid() {
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, amount.String())
+	}
+
 	// If there's already a pending withdrawal then subtract it from that amount first
 	// or else add it to the deferredSends mapping
 	ok := c.deferredWithdrawals.SafeSub(moduleAccount, amount)
 	if !ok {
 		c.deferredSends.UpsertMapping(moduleAccount, amount)
 	}
+	return nil
+}
+
+func (c *ContextMemCache) SafeSubDeferredSends(moduleAccount string, amount Coins) bool {
+	if !amount.IsValid() {
+		panic(sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, amount.String()))
+	}
+
+	return c.deferredSends.SafeSub(moduleAccount, amount)
 }
 
 func (c *ContextMemCache) RangeOnDeferredSendsAndDelete(apply func (recipient string, amount Coins)) {
 	c.deferredSends.RangeOnMapping(apply)
 }
 
-func (c *ContextMemCache) UpsertDeferredWithdrawals(moduleAccount string, amount Coins) {
-	// Separate locks needed for all mappings - atomic transaction needed
+func (c *ContextMemCache) UpsertDeferredWithdrawals(moduleAccount string, amount Coins) error {
+	// Separate locks needed for all mappings - atmoic transaction needed
 	c.deferredBankOpsLock.Lock()
 	defer c.deferredBankOpsLock.Unlock()
 
+	if !amount.IsValid() {
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, amount.String())
+	}
+
 	// If there's already a pending deposit then subtract it from that amount first
 	// or else add it to the deferredWithdrawals mapping
 	ok := c.deferredSends.SafeSub(moduleAccount, amount)
 	if !ok {
 		c.deferredWithdrawals.UpsertMapping(moduleAccount, amount)
 	}
+	return nil
 }
 
 func (c *ContextMemCache) RangeOnDeferredWithdrawalsAndDelete(apply func (recipient string, amount Coins)) {

types/deferred_bank_operations.go

@@ -17,27 +17,16 @@ func NewDeferredBankOperationMap() *DeferredBankOperationMapping {
 	}
 }
 
-func (m *DeferredBankOperationMapping) get(moduleAccount string) (Coins, bool) {
-	if v, ok := m.deferredOperations[moduleAccount]; ok {
-		return v, true
-	}
-	return nil, false
-}
-
-func (m *DeferredBankOperationMapping) set(moduleAccount string, amount Coins) {
-	m.deferredOperations[moduleAccount] = amount
-}
-
 // If there's already a pending opposite operation then subtract it from that amount first
 // returns true if amount was subtracted
 func (m *DeferredBankOperationMapping) SafeSub(moduleAccount string, amount Coins) bool {
 	m.mappingLock.Lock()
 	defer m.mappingLock.Unlock()
 
-	if deferredAmount, ok  := m.get(moduleAccount); ok {
+	if deferredAmount, ok  := m.deferredOperations[moduleAccount]; ok {
 		newAmount, isNegative := deferredAmount.SafeSub(amount)
 		if !isNegative {
-			m.set(moduleAccount, newAmount)
+			m.deferredOperations[moduleAccount] = newAmount
 			return true
 		}
 	}

x/auth/types/expected_keepers.go

@@ -8,4 +8,7 @@ import (
 type BankKeeper interface {
 	SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
 	DeferredSendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
+	DeferredSendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amount sdk.Coins) error
+	DeferredMintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
+	DeferredBurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
 }