Vault/allow multiple currency

proto/reserve/auction/v1/auction.proto

@@ -88,11 +88,11 @@ message BidQueue {
   uint64 auction_id = 1;
 
   // array of bid entries with bidder address
-  repeated Bid bids = 2;
+  repeated Bid bids = 2 [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
 }
 
 // Bids defines a list of bid entries
 message Bids {
   // array of bid entries with bidder address
-  repeated Bid bids = 1;
+  repeated Bid bids = 1 [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
 }

proto/reserve/auction/v1/query.proto

@@ -22,7 +22,11 @@ service Query {
   }
 
   rpc QueryAllBids(QueryAllBidsRequest) returns (QueryAllBidsResponse){
-    option (google.api.http).get = "/reserve/auction/auction";
+    option (google.api.http).get = "/reserve/auction/bids";
+  }
+
+  rpc QueryAllBidderBids(QueryAllBidderBidsRequest) returns (QueryAllBidderBidsResponse){
+    option (google.api.http).get = "/reserve/auction/bids/{bidder}";
   }
 }
 
@@ -52,4 +56,15 @@ message QueryAllBidsResponse {
   // params holds all the parameters of this module.
   repeated Bid Bids = 1
       [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
+}
+
+message QueryAllBidderBidsRequest {
+  string bidder = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  uint64 auction_id = 2;
+}
+
+message QueryAllBidderBidsResponse {
+  // params holds all the parameters of this module.
+  repeated Bid Bids = 1
+      [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
 }

proto/reserve/vaults/params.proto

@@ -22,7 +22,7 @@ message Params {
     (gogoproto.nullable) = false
   ];
 
-  string mint_denom = 2;
+  repeated string allowed_mint_denom = 2;
 
   google.protobuf.Duration charging_period = 3 [
     (gogoproto.stdduration) = true,
@@ -33,42 +33,44 @@ message Params {
 
 // VaultParams defines the parameters for each collateral vault type.
 message VaultMamagerParams {
-  string min_collateral_ratio = 1 [
+  string mint_denom = 1;
+
+  string min_collateral_ratio = 2 [
     (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (amino.dont_omitempty) = true,
     (gogoproto.nullable) = false
   ];
 
-  string liquidation_ratio = 2 [
+  string liquidation_ratio = 3 [
     (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (amino.dont_omitempty) = true,
     (gogoproto.nullable) = false
   ];
 
-  string max_debt = 3 [
+  string max_debt = 4 [
     (cosmos_proto.scalar) = "cosmos.Int",
     (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (amino.dont_omitempty) = true,
     (gogoproto.nullable) = false
   ];
 
-  string stability_fee = 4 [
+  string stability_fee = 5 [
     (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (amino.dont_omitempty) = true,
     (gogoproto.nullable) = false
   ];
 
-  string liquidation_penalty = 5 [
+  string liquidation_penalty = 6 [
     (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (amino.dont_omitempty) = true,
     (gogoproto.nullable) = false
   ];
 
-  string minting_fee = 6 [
+  string minting_fee = 7 [
     (cosmos_proto.scalar) = "cosmos.Dec",
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (amino.dont_omitempty) = true,
@@ -142,7 +144,9 @@ message VaultLiquidationStatus {
 }
 
 message Liquidation {
-  string denom = 1;
+  string debt_denom = 1;
+
+  string mint_denom = 2;
 
   repeated Vault liquidating_vaults = 3;
 

x/auction/keeper/abci.go

@@ -2,162 +2,21 @@ package keeper
 
 import (
 	"context"
-	"time"
 
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/onomyprotocol/reserve/x/auction/types"
-	vaultstypes "github.com/onomyprotocol/reserve/x/vaults/types"
 )
 
 func (k *Keeper) BeginBlocker(ctx context.Context) error {
-	params := k.GetParams(ctx)
+	// get allowed mint denom
+	allowedMintDenoms := k.vaultKeeper.GetAllowedMintDenoms(ctx)
 
-	currentTime := sdk.UnwrapSDKContext(ctx).BlockHeader().Time
-	lastAuctionPeriods := time.Unix(k.LastestAuctionPeriod, 0)
-	// check if has reached the next auction periods
-	if lastAuctionPeriods.Add(params.AuctionPeriods).Before(currentTime) {
-		// update latest auction period
-		k.LastestAuctionPeriod = lastAuctionPeriods.Add(params.AuctionPeriods).Unix()
-
-		liquidations, err := k.vaultKeeper.GetLiquidations(ctx)
+	for _, mintDenom := range allowedMintDenoms {
+		err := k.handleLiquidation(ctx, mintDenom)
 		if err != nil {
 			return err
 		}
-
-		liquidatedVaults := make([]*vaultstypes.Vault, 0)
-		for _, liq := range liquidations {
-			liquidatedVaults = append(liquidatedVaults, liq.LiquidatingVaults...)
-		}
-
-		// create new auction for this vault
-		for _, vault := range liquidatedVaults {
-			//calcualte initial price and target price
-			auction, isCreate, err := k.GetNewAuction(ctx, currentTime, vault.LiquidationPrice, vault.CollateralLocked, vault.Debt, vault.Id)
-			if err != nil {
-				return err
-			}
-
-			if isCreate {
-				err = k.Auctions.Set(ctx, auction.AuctionId, *auction)
-				if err != nil {
-					return err
-				}
-				err = k.Bids.Set(ctx, auction.AuctionId, types.BidQueue{AuctionId: auction.AuctionId, Bids: []*types.Bid{}})
-				if err != nil {
-					return err
-				}
-				err = k.BidIdSeq.Set(ctx, auction.AuctionId, 0)
-				if err != nil {
-					return err
-				}
-			}
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	// loop through all auctions
-	// get liquidations data then distribute debt & collateral remain
-	liquidationMap := make(map[string]*vaultstypes.Liquidation)
-	err := k.Auctions.Walk(ctx, nil, func(auctionId uint64, auction types.Auction) (bool, error) {
-		bidQueue, err := k.Bids.Get(ctx, auction.AuctionId)
-		if err != nil {
-			return true, err
-		}
-		vault, err := k.vaultKeeper.GetVault(ctx, auction.VaultId)
-		if err != nil {
-			return true, err
-		}
-
-		needCleanup := false
-		currentRate := math.LegacyMustNewDecFromStr(auction.CurrentRate)
-		lowestRate := math.LegacyMustNewDecFromStr(params.LowestRate)
-		if auction.Status == types.AuctionStatus_AUCTION_STATUS_FINISHED ||
-			auction.Status == types.AuctionStatus_AUCTION_STATUS_OUT_OF_COLLATHERAL ||
-			currentRate.Equal(lowestRate) {
-			liquidation_tmp, ok := liquidationMap[auction.Item.Denom]
-			if ok && liquidation_tmp != nil {
-				liquidation_tmp.Denom = auction.Item.Denom
-				liquidation_tmp.LiquidatingVaults = append(liquidation_tmp.LiquidatingVaults, &vault)
-				liquidation_tmp.VaultLiquidationStatus[vault.Id] = &vaultstypes.VaultLiquidationStatus{
-					Sold:             auction.TokenRaised,
-					RemainCollateral: auction.Item,
-				}
-			} else {
-				liquidation_tmp = &vaultstypes.Liquidation{
-					Denom:                  auction.Item.Denom,
-					LiquidatingVaults:      []*vaultstypes.Vault{&vault},
-					VaultLiquidationStatus: make(map[uint64]*vaultstypes.VaultLiquidationStatus),
-				}
-
-				liquidation_tmp.VaultLiquidationStatus[vault.Id] = &vaultstypes.VaultLiquidationStatus{
-					Sold:             auction.TokenRaised,
-					RemainCollateral: auction.Item,
-				}
-				liquidationMap[auction.Item.Denom] = liquidation_tmp
-			}
-			err := k.bankKeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, vaultstypes.ModuleName, sdk.NewCoins(liquidationMap[auction.Item.Denom].VaultLiquidationStatus[vault.Id].Sold))
-			if err != nil {
-				return true, err
-			}
-
-			needCleanup = true
-			// skip other logic
-		}
-
-		if needCleanup {
-			err = k.refundBidders(ctx, bidQueue)
-			if err != nil {
-				return true, err
-			}
-
-			// clear the auction afterward
-			err = k.DeleteAuction(ctx, auction.AuctionId)
-			if err != nil {
-				return true, err
-			}
-
-			return false, nil
-		}
-
-		// check if reach next reduce step
-		if auction.LastDiscountTime.Add(params.ReduceStep).Before(currentTime) {
-			// get new discount rate
-			newRate, err := k.discountRate(auction, params)
-			if err != nil {
-				return true, err
-			}
-
-			// apply new changes
-			auction.CurrentRate = newRate
-			auction.LastDiscountTime = auction.LastDiscountTime.Add(params.ReduceStep)
-
-			// update new rate and last discount time
-			err = k.Auctions.Set(ctx, auctionId, auction)
-			if err != nil {
-				return true, err
-			}
-		}
-
-		err = k.fillBids(ctx, auction, bidQueue)
-		if err != nil {
-			return true, err
-		}
-
-		return false, nil
-	})
-
-	// Loop through liquidationMap and liquidate
-	for _, liq := range liquidationMap {
-		err := k.vaultKeeper.Liquidate(ctx, *liq)
-		if err != nil {
-			return err
-		}
-	}
-	if err != nil {
-		return err
 	}
 
 	return nil

x/auction/keeper/auction.go

@@ -7,7 +7,6 @@ import (
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/onomyprotocol/reserve/x/auction/types"
-	vaultstypes "github.com/onomyprotocol/reserve/x/vaults/types"
 )
 
 // return aution, is create, error
@@ -17,8 +16,12 @@ func (k Keeper) GetNewAuction(ctx context.Context,
 	item, targetGoal sdk.Coin,
 	vaultId uint64,
 ) (*types.Auction, bool, error) {
+	vault, err := k.vaultKeeper.GetVault(ctx, vaultId)
+	if err != nil {
+		return nil, true, err
+	}
 	var newAuction *types.Auction
-	err := k.Auctions.Walk(ctx, nil, func(key uint64, value types.Auction) (stop bool, err error) {
+	err = k.Auctions.Walk(ctx, nil, func(key uint64, value types.Auction) (stop bool, err error) {
 		if value.VaultId == vaultId {
 			newAuction = &value
 			return true, nil
@@ -31,7 +34,8 @@ func (k Keeper) GetNewAuction(ctx context.Context,
 	if newAuction != nil {
 		return newAuction, false, nil
 	}
-	newAuction, err = k.NewAuction(ctx, startTime, initialPrice, item, targetGoal, vaultId)
+	newAuction, err = k.NewAuction(ctx, startTime, initialPrice, item, targetGoal, vaultId, vault.Debt.Denom)
+
 	if err != nil {
 		return newAuction, true, err
 	}
@@ -43,6 +47,7 @@ func (k Keeper) NewAuction(ctx context.Context,
 	initialPrice math.LegacyDec,
 	item, targetGoal sdk.Coin,
 	vaultId uint64,
+	mintDenom string,
 ) (*types.Auction, error) {
 	auctionId, err := k.AuctionIdSeq.Next(ctx)
 	if err != nil {
@@ -58,7 +63,7 @@ func (k Keeper) NewAuction(ctx context.Context,
 		LastDiscountTime: startTime,
 		Status:           types.AuctionStatus_AUCTION_STATUS_ACTIVE,
 		TargetGoal:       targetGoal,
-		TokenRaised:      sdk.NewCoin(vaultstypes.DefaultMintDenom, math.ZeroInt()),
+		TokenRaised:      sdk.NewCoin(mintDenom, math.ZeroInt()),
 		VaultId:          vaultId,
 	}, nil
 }

x/auction/keeper/grpc_query.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 
+	"cosmossdk.io/collections"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -54,13 +55,31 @@ func (k Querier) QueryAllBids(ctx context.Context, req *types.QueryAllBidsReques
 	allBids := []types.Bid{}
 
 	err := k.k.Bids.Walk(ctx, nil, func(key uint64, value types.BidQueue) (stop bool, err error) {
-		for _, bid := range value.Bids {
-			allBids = append(allBids, *bid)
-		}
+		allBids = append(allBids, value.Bids...)
 		return false, nil
 	})
 
 	return &types.QueryAllBidsResponse{
 		Bids: allBids,
 	}, err
 }
+
+func (k Querier) QueryAllBidderBids(ctx context.Context, req *types.QueryAllBidderBidsRequest) (*types.QueryAllBidderBidsResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "invalid request")
+	}
+
+	bidderAddr, err := k.k.authKeeper.AddressCodec().StringToBytes(req.Bidder)
+	if err != nil {
+		return nil, err
+	}
+
+	bidsByAddress, err := k.k.BidByAddress.Get(ctx, collections.Join(req.AuctionId, sdk.AccAddress(bidderAddr)))
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.QueryAllBidderBidsResponse{
+		Bids: bidsByAddress.Bids,
+	}, err
+}