Merge branch 'main' into dependabot/go_modules/github.com/cosmos/ibc-…

…go/v7-7.5.0
umee-network · May 16, 2024 · 6ab447c · 6ab447c
2 parents 54ef62f + 695c641
commit 6ab447c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 85 deletions.
diff --git a/proto/umee/auction/v1/events.proto b/proto/umee/auction/v1/events.proto
@@ -13,8 +13,6 @@ option (gogoproto.goproto_getters_all) = false;
 message EventRewardsAuctionResult {
   uint32 id     = 1;
   string bidder = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  // Auctioned tokens.
-  repeated cosmos.base.v1beta1.Coin rewards = 4 [(gogoproto.nullable) = false];
 }
 
 // EventFundRewardsAuction is emitted when sending rewards to auction module

diff --git a/proto/umee/auction/v1/query.proto b/proto/umee/auction/v1/query.proto
@@ -18,7 +18,7 @@ service Query {
     option (google.api.http).get = "/umee/auction/v1/rewards/params";
   }
   // RewardAuction queries the information of the auction by ID. If ID is ommitted, returns
-  // current reward auction params.
+  // current reward auction.
   rpc RewardsAuction(QueryRewardsAuction) returns (QueryRewardsAuctionResponse) {
     option (google.api.http).get = "/umee/auction/v1/rewards";
   }

diff --git a/sdkclient/query/client.go b/sdkclient/query/client.go
@@ -25,7 +25,7 @@ func NewClient(logger *log.Logger, grpcEndpoint string, queryTimeout time.Durati
 }
 
 func (c *Client) dialGrpcConn() (err error) {
-	c.GrpcConn, err = grpc.Dial(
+	c.GrpcConn, err = grpc.NewClient(
 		c.grpcEndpoint,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithContextDialer(dialerFunc),

diff --git a/x/auction/events.pb.go b/x/auction/events.pb.go
diff --git a/x/auction/keeper/rewards.go b/x/auction/keeper/rewards.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/umee-network/umee/v6/util"
 	"github.com/umee-network/umee/v6/util/coin"
+	"github.com/umee-network/umee/v6/util/sdkutil"
 	"github.com/umee-network/umee/v6/util/store"
 	"github.com/umee-network/umee/v6/x/auction"
 )
@@ -33,7 +34,10 @@ func (k Keeper) FinalizeRewardsAuction() error {
 		if err != nil {
 			return fmt.Errorf("can't burn rewards auction bid [%w]", err)
 		}
-
+		sdkutil.Emit(k.ctx, &auction.EventRewardsAuctionResult{
+			Id:     id,
+			Bidder: sdk.AccAddress(bid.Bidder).String(),
+		})
 	} else if len(a.Rewards) != 0 {
 		// rollover the past rewards if there was no bidder
 		newCoins = newCoins.Add(a.Rewards...)

diff --git a/x/auction/query.pb.go b/x/auction/query.pb.go