Skip to content

Commit

Permalink
Merge branch 'main' into robert/auction-module
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-zaremba committed Mar 25, 2024
2 parents 68586f9 + f8e7d34 commit ee5b094
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 92 deletions.
3 changes: 2 additions & 1 deletion proto/umee/auction/v1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ 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";
Expand All @@ -17,7 +18,7 @@ message GenesisState {
// Latest active (in bid phase) reward auction.
uint32 reward_auction_id = 2;
// Latest highest bid.
string highest_bidder = 3;
string highest_bidder = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
// Tokens collected for the current auction.
repeated cosmos.base.v1beta1.Coin current_rewards = 4 [(gogoproto.nullable) = false];
// Tokens collected for the next auction, while the current reward auction is still in the
Expand Down
2 changes: 1 addition & 1 deletion proto/umee/auction/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ service Query {
// RewardAuction queries the information of the auction by ID. If ID is ommitted, returns
// current reward auction params.
rpc RewardAuction(QueryRewardAuction) returns (QueryRewardAuctionResponse) {
option (google.api.http).get = "/umee/auction/v1/rewards/{id}";
option (google.api.http).get = "/umee/auction/v1/rewards";
}
}

Expand Down
57 changes: 30 additions & 27 deletions x/auction/genesis.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 32 additions & 32 deletions x/auction/query.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 13 additions & 31 deletions x/auction/query.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ee5b094

Please sign in to comment.