Merge branch 'main' into sai/remove_wasm_custom_msgs

umee-network · Apr 17, 2024 · 261a24f · 261a24f
2 parents eb22160 + e642166
commit 261a24f
Show file tree

Hide file tree

Showing 22 changed files with 1,169 additions and 229 deletions.
diff --git a/app/app.go b/app/app.go
@@ -510,6 +510,7 @@ func New(
 	app.AuctionKeeperB = auctionkeeper.NewBuilder(
 		appCodec,
 		keys[auction.StoreKey],
+		auctionmodule.SubAccounts(),
 		app.BankKeeper,
 		app.UGovKeeperB.EmergencyGroup,
 	)

diff --git a/proto/umee/auction/v1/auction.proto b/proto/umee/auction/v1/auction.proto
@@ -1,7 +1,10 @@
 syntax = "proto3";
 package umee.auction.v1;
 
+import "google/protobuf/timestamp.proto";
 import "gogoproto/gogo.proto";
+import "cosmos_proto/cosmos.proto";
+import "cosmos/base/v1beta1/coin.proto";
 
 option go_package                      = "github.com/umee-network/umee/v6/x/auction";
 option (gogoproto.goproto_getters_all) = false;
@@ -11,3 +14,15 @@ message RewardsParams {
   // bid_duration is duration of the bid phase in seconds.
   int64 bid_duration = 1;
 }
+
+// Bid records a user bid
+message Bid {
+  string bidder = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  string amount = 2 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false];
+}
+
+// Auction Rewards
+message Rewards {
+  repeated cosmos.base.v1beta1.Coin rewards = 1 [(gogoproto.nullable) = false];
+  google.protobuf.Timestamp         ends_at = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+}
diff --git a/proto/umee/auction/v1/genesis.proto b/proto/umee/auction/v1/genesis.proto
@@ -2,7 +2,6 @@ syntax = "proto3";
 package umee.auction.v1;
 
 import "google/protobuf/timestamp.proto";
-import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 import "umee/auction/v1/auction.proto";
@@ -17,14 +16,13 @@ message GenesisState {
   RewardsParams rewards_params = 1 [(gogoproto.nullable) = false];
   // Latest active (in bid phase) reward auction.
   uint32 reward_auction_id = 2;
-  // Latest highest bid.
-  string                   highest_bidder = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  cosmos.base.v1beta1.Coin highest_bid    = 4 [(gogoproto.nullable) = false];
+  // Latest highest rewards bid.
+  Bid highest_rewards_bid = 3 [(gogoproto.nullable) = false];
 
+  google.protobuf.Timestamp current_rewards_auction_end = 4 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   // Tokens collected for the current auction.
   repeated cosmos.base.v1beta1.Coin current_rewards = 5 [(gogoproto.nullable) = false];
   // Tokens collected for the next auction, while the current reward auction is still in the
   // bid phase.
-  repeated cosmos.base.v1beta1.Coin next_rewards                = 6 [(gogoproto.nullable) = false];
-  google.protobuf.Timestamp         current_rewards_auction_end = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+  repeated cosmos.base.v1beta1.Coin next_rewards = 6 [(gogoproto.nullable) = false];
 }
diff --git a/proto/umee/auction/v1/query.proto b/proto/umee/auction/v1/query.proto
@@ -42,8 +42,8 @@ message QueryRewardsAuction {
 message QueryRewardsAuctionResponse {
   uint32 id = 1;
   // highest bidder
-  string   bidder                               = 2;
-  repeated cosmos.base.v1beta1.Coin rewards     = 3 [(gogoproto.nullable) = false];
-  cosmos.base.v1beta1.Coin          usd_rewards = 4 [(gogoproto.nullable) = false];
-  google.protobuf.Timestamp         ends_at     = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+  string                   bidder           = 2;
+  cosmos.base.v1beta1.Coin bid              = 3 [(gogoproto.nullable) = false];
+  repeated cosmos.base.v1beta1.Coin rewards = 4 [(gogoproto.nullable) = false];
+  google.protobuf.Timestamp         ends_at = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
 }
diff --git a/proto/umee/util/v1/proto.proto b/proto/umee/util/v1/proto.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+package umee.util.v1;
+
+import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
+
+option go_package = "github.com/umee-network/umee/v6/util/store";
+
+option (gogoproto.goproto_getters_all) = false;
+
+// Slice of sdk.Coin
+message Coins {
+  repeated cosmos.base.v1beta1.Coin coins = 1 [(gogoproto.nullable) = false];
+}
diff --git a/util/coin/fixtures.go b/util/coin/fixtures.go
@@ -1,6 +1,7 @@
 package coin
 
 import (
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	appparams "github.com/umee-network/umee/v6/app/params"
@@ -46,6 +47,11 @@ func Umee(amount int64) sdk.Coin {
 	return sdk.NewInt64Coin(umee, amount)
 }
 
+// UmeeInt creates a BondDenom sdk.Coin with the given amount
+func UmeeInt(amount sdkmath.Int) sdk.Coin {
+	return sdk.NewCoin(umee, amount)
+}
+
 // UmeeCoins creates an Umee (uumee) sdk.Coins with the given amount
 func UmeeCoins(amount int64) sdk.Coins {
 	return sdk.NewCoins(sdk.NewInt64Coin(umee, amount))