Merge branch 'master' of github.com:lum-network/chain into feature/lu…

…m-514
lum-network · Jan 3, 2023 · 1329aa4 · 1329aa4
2 parents 1ace106 + 709fe40
commit 1329aa4
Show file tree

Hide file tree

Showing 8 changed files with 473 additions and 395 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright [2022] [Lum Foundation]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/proto/lum-network/dfract/params.proto b/proto/lum-network/dfract/params.proto
@@ -4,6 +4,6 @@ package lum.network.dfract;
 option go_package = "github.com/lum-network/chain/x/dfract/types";
 
 message Params {
-  string deposit_denom = 1;
+  repeated string deposit_denoms = 1;
   uint32 min_deposit_amount = 2;
 }
diff --git a/x/dfract/genesis_test.go b/x/dfract/genesis_test.go
@@ -24,7 +24,7 @@ var testGenesis = types.GenesisState{
 		sdk.NewInt64Coin(sdk.DefaultBondDenom, 15_000),
 	},
 	Params: types.Params{
-		DepositDenom:     sdk.DefaultBondDenom,
+		DepositDenoms:    []string{sdk.DefaultBondDenom},
 		MinDepositAmount: 1_000,
 	},
 	DepositsMinted: []*types.Deposit{

diff --git a/x/dfract/keeper/keeper.go b/x/dfract/keeper/keeper.go
@@ -2,9 +2,10 @@ package keeper
 
 import (
 	"fmt"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	"strconv"
 
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -101,12 +102,6 @@ func (k Keeper) GetModuleAccountBalance(ctx sdk.Context) sdk.Coins {
 // GetModuleAccountBalanceForDenom Return the module account's balance
 func (k Keeper) GetModuleAccountBalanceForDenom(ctx sdk.Context, denom string) sdk.Coin {
 	moduleAcc := k.GetModuleAccount(ctx)
-	params := k.GetParams(ctx)
-
-	if denom != params.DepositDenom && denom != types.MintDenom {
-		return sdk.Coin{}
-	}
-
 	return k.BankKeeper.GetBalance(ctx, moduleAcc, denom)
 }
 
@@ -116,8 +111,10 @@ func (k Keeper) CreateDeposit(ctx sdk.Context, msg types.MsgDeposit) error {
 	params := k.GetParams(ctx)
 
 	// Make sure the deposit is made of allowed denom
-	if params.DepositDenom != msg.GetAmount().Denom {
-		return types.ErrUnauthorizedDepositDenom
+	for _, denom := range params.DepositDenoms {
+		if denom != msg.GetAmount().Denom {
+			return types.ErrUnauthorizedDepositDenom
+		}
 	}
 
 	// Make sure we have an actual deposit to do
@@ -171,74 +168,77 @@ func (k Keeper) ProcessWithdrawAndMintProposal(ctx sdk.Context, proposal *types.
 	// Acquire the parameters to get the denoms
 	params := k.GetParams(ctx)
 
-	// Acquire the module account balance
-	balance := k.GetModuleAccountBalanceForDenom(ctx, params.GetDepositDenom())
-
-	// Acquire the list of deposits pending withdrawal and mint
-	depositsPendingWithdrawal := k.ListDepositsPendingWithdrawal(ctx)
-	depositsPendingMint := k.ListDepositsPendingMint(ctx)
-
-	// Withdrawal the coins from the pending withdrawal deposits using the module account
-	if balance.Amount.IsPositive() {
-		destinationAddress, err := sdk.AccAddressFromBech32(proposal.GetWithdrawalAddress())
-		if err != nil {
-			return sdkerrors.ErrInvalidAddress
-		}
-		if err := k.BankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, destinationAddress, sdk.NewCoins(balance)); err != nil {
-			return err
+	// Iterate over the array of deposit denoms to get the module account balance for a particular denom
+	for _, denom := range params.DepositDenoms {
+		// Acquire the module account balance
+		balance := k.GetModuleAccountBalanceForDenom(ctx, denom)
+
+		// Acquire the list of deposits pending withdrawal and mint
+		depositsPendingWithdrawal := k.ListDepositsPendingWithdrawal(ctx)
+		depositsPendingMint := k.ListDepositsPendingMint(ctx)
+
+		// Withdrawal the coins from the pending withdrawal deposits using the module account
+		if balance.Amount.IsPositive() {
+			destinationAddress, err := sdk.AccAddressFromBech32(proposal.GetWithdrawalAddress())
+			if err != nil {
+				return sdkerrors.ErrInvalidAddress
+			}
+			if err := k.BankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, destinationAddress, sdk.NewCoins(balance)); err != nil {
+				return err
+			}
 		}
-	}
 
-	// Mint the coins for all the pending mint deposits and add them to the the minted deposits
-	for _, deposit := range depositsPendingMint {
-		depositorAddress, err := sdk.AccAddressFromBech32(deposit.GetDepositorAddress())
-		if err != nil {
-			return sdkerrors.ErrInvalidAddress
+		// Mint the coins for all the pending mint deposits and add them to the the minted deposits
+		for _, deposit := range depositsPendingMint {
+			depositorAddress, err := sdk.AccAddressFromBech32(deposit.GetDepositorAddress())
+			if err != nil {
+				return sdkerrors.ErrInvalidAddress
+			}
+
+			toMint := sdk.NewCoin(types.MintDenom, deposit.GetAmount().Amount.MulRaw(proposal.GetMicroMintRate()).QuoRaw(MicroPrecision))
+			if err := k.BankKeeper.MintCoins(ctx, types.ModuleName, sdk.NewCoins(toMint)); err != nil {
+				return err
+			}
+
+			if err := k.BankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(toMint)); err != nil {
+				return err
+			}
+
+			k.RemoveDepositPendingMint(ctx, depositorAddress)
+			k.AddDepositMinted(ctx, depositorAddress, *deposit)
+			ctx.EventManager().Events().AppendEvents(sdk.Events{
+				sdk.NewEvent(
+					types.EventTypeMint,
+					sdk.NewAttribute(types.AttributeKeyDepositor, depositorAddress.String()),
+					sdk.NewAttribute(types.AttributeKeyAmount, deposit.GetAmount().String()),
+					sdk.NewAttribute(types.AttributeKeyMinted, toMint.String()),
+					sdk.NewAttribute(types.AttributeKeyMicroMintRate, fmt.Sprintf("%d", proposal.GetMicroMintRate())),
+				),
+			})
 		}
 
-		toMint := sdk.NewCoin(types.MintDenom, deposit.GetAmount().Amount.MulRaw(proposal.GetMicroMintRate()).QuoRaw(MicroPrecision))
-		if err := k.BankKeeper.MintCoins(ctx, types.ModuleName, sdk.NewCoins(toMint)); err != nil {
-			return err
+		// Process the pending withdrawal deposits
+		for _, deposit := range depositsPendingWithdrawal {
+			depositorAddress, err := sdk.AccAddressFromBech32(deposit.GetDepositorAddress())
+			if err != nil {
+				return sdkerrors.ErrInvalidAddress
+			}
+			k.RemoveDepositPendingWithdrawal(ctx, depositorAddress)
+			k.SetDepositPendingMint(ctx, depositorAddress, *deposit)
+			ctx.EventManager().Events().AppendEvents(sdk.Events{
+				sdk.NewEvent(
+					types.EventTypeWithdraw,
+					sdk.NewAttribute(types.AttributeKeyDepositor, depositorAddress.String()),
+					sdk.NewAttribute(types.AttributeKeyAmount, deposit.GetAmount().String()),
+				),
+			})
 		}
 
-		if err := k.BankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, depositorAddress, sdk.NewCoins(toMint)); err != nil {
-			return err
-		}
-
-		k.RemoveDepositPendingMint(ctx, depositorAddress)
-		k.AddDepositMinted(ctx, depositorAddress, *deposit)
+		// Trigger the events
 		ctx.EventManager().Events().AppendEvents(sdk.Events{
-			sdk.NewEvent(
-				types.EventTypeMint,
-				sdk.NewAttribute(types.AttributeKeyDepositor, depositorAddress.String()),
-				sdk.NewAttribute(types.AttributeKeyAmount, deposit.GetAmount().String()),
-				sdk.NewAttribute(types.AttributeKeyMinted, toMint.String()),
-				sdk.NewAttribute(types.AttributeKeyMicroMintRate, fmt.Sprintf("%d", proposal.GetMicroMintRate())),
-			),
+			sdk.NewEvent(types.EventTypeMint, sdk.NewAttribute(types.AttributeKeyMintBlock, strconv.FormatInt(ctx.BlockHeight(), 10))),
 		})
 	}
 
-	// Process the pending withdrawal deposits
-	for _, deposit := range depositsPendingWithdrawal {
-		depositorAddress, err := sdk.AccAddressFromBech32(deposit.GetDepositorAddress())
-		if err != nil {
-			return sdkerrors.ErrInvalidAddress
-		}
-		k.RemoveDepositPendingWithdrawal(ctx, depositorAddress)
-		k.SetDepositPendingMint(ctx, depositorAddress, *deposit)
-		ctx.EventManager().Events().AppendEvents(sdk.Events{
-			sdk.NewEvent(
-				types.EventTypeWithdraw,
-				sdk.NewAttribute(types.AttributeKeyDepositor, depositorAddress.String()),
-				sdk.NewAttribute(types.AttributeKeyAmount, deposit.GetAmount().String()),
-			),
-		})
-	}
-
-	// Trigger the events
-	ctx.EventManager().Events().AppendEvents(sdk.Events{
-		sdk.NewEvent(types.EventTypeMint, sdk.NewAttribute(types.AttributeKeyMintBlock, strconv.FormatInt(ctx.BlockHeight(), 10))),
-	})
-
 	return nil
 }