Skip to content

feat: Using buf format instead of clang-format #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbukva merged 1 commit into from
Apr 27, 2026
Merged

feat: Using buf format instead of clang-format #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ coverage: ## Run coverage report
protoVer=0.14.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)

DOCKER_UID ?= $(shell echo $${SUDO_UID:-$$(id -u)})
DOCKER_GID ?= $(shell echo $${SUDO_GID:-$$(id -g)})
DOCKER_UID := $(shell id -u)
DOCKER_GID := $(shell id -g)

protoImage=$(DOCKER) run --rm \
-u $(DOCKER_UID):$(DOCKER_GID) \
Expand Down Expand Up @@ -205,7 +205,8 @@ proto-gen:
go mod tidy

proto-format:
@$(protoImage) find ./ -name "*.proto" -exec clang-format -i -style=file {} \;
@$(protoImage) buf format -w;
#@$(protoImage) find ./ -name "*.proto" -exec clang-format -i -style=file {} \;

proto-lint:
@$(protoImage) buf lint proto/ --error-format=json
Expand Down
4 changes: 2 additions & 2 deletions proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ message DenomAuthorityMetadata {
option (gogoproto.equal) = true;

// Can be empty for no admin, or a valid osmosis address
string admin = 1 [ (gogoproto.moretags) = "yaml:\"admin\"" ];
}
string admin = 1 [(gogoproto.moretags) = "yaml:\"admin\""];
}
10 changes: 5 additions & 5 deletions proto/osmosis/tokenfactory/v1beta1/genesis.proto
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
syntax = "proto3";
package osmosis.tokenfactory.v1beta1;

import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";
import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto";
import "osmosis/tokenfactory/v1beta1/params.proto";
import "cosmos_proto/cosmos.proto";

option go_package = "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types";

// GenesisState defines the tokenfactory module's genesis state.
message GenesisState {
// params defines the parameters of the module.
Params params = 1 [ (gogoproto.nullable) = false ];
Params params = 1 [(gogoproto.nullable) = false];

repeated GenesisDenom factory_denoms = 2 [
(gogoproto.moretags) = "yaml:\"factory_denoms\"",
Expand All @@ -21,7 +21,7 @@ message GenesisState {
repeated string sudo_admins = 3 [
(cosmos_proto.scalar) = "cosmos.AddressString",
(gogoproto.moretags) = "yaml:\"sudo_admins\"",
(gogoproto.nullable) = false
(gogoproto.nullable) = false
];
}

Expand All @@ -31,9 +31,9 @@ message GenesisState {
message GenesisDenom {
option (gogoproto.equal) = true;

string denom = 1 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
string denom = 1 [(gogoproto.moretags) = "yaml:\"denom\""];
DenomAuthorityMetadata authority_metadata = 2 [
(gogoproto.moretags) = "yaml:\"authority_metadata\"",
(gogoproto.nullable) = false
];
}
}
4 changes: 2 additions & 2 deletions proto/osmosis/tokenfactory/v1beta1/params.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
syntax = "proto3";
package osmosis.tokenfactory.v1beta1;

import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types";

Expand All @@ -21,4 +21,4 @@ message Params {
(gogoproto.moretags) = "yaml:\"denom_creation_gas_consume\"",
(gogoproto.nullable) = true
];
}
}
36 changes: 14 additions & 22 deletions proto/osmosis/tokenfactory/v1beta1/query.proto
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,26 @@ service Query {

// DenomAuthorityMetadata defines a gRPC query method for fetching
// DenomAuthorityMetadata for a particular denom.
rpc DenomAuthorityMetadata(QueryDenomAuthorityMetadataRequest)
returns (QueryDenomAuthorityMetadataResponse) {
option (google.api.http).get =
"/osmosis/tokenfactory/v1beta1/denoms/{denom}/authority_metadata";
rpc DenomAuthorityMetadata(QueryDenomAuthorityMetadataRequest) returns (QueryDenomAuthorityMetadataResponse) {
option (google.api.http).get = "/osmosis/tokenfactory/v1beta1/denoms/{denom}/authority_metadata";
}

// DenomsFromCreator defines a gRPC query method for fetching all
// denominations created by a specific admin/creator.
rpc DenomsFromCreator(QueryDenomsFromCreatorRequest)
returns (QueryDenomsFromCreatorResponse) {
option (google.api.http).get =
"/osmosis/tokenfactory/v1beta1/denoms_from_creator/{creator}";
rpc DenomsFromCreator(QueryDenomsFromCreatorRequest) returns (QueryDenomsFromCreatorResponse) {
option (google.api.http).get = "/osmosis/tokenfactory/v1beta1/denoms_from_creator/{creator}";
}

// DenomsFromAdmin defines a gRPC query method for fetching all
// denominations owned by a specific admin.
rpc DenomsFromAdmin(QueryDenomsFromAdminRequest)
returns (QueryDenomsFromAdminResponse) {
option (google.api.http).get =
"/osmosis/tokenfactory/v1beta1/denoms_from_admin/{admin}";
rpc DenomsFromAdmin(QueryDenomsFromAdminRequest) returns (QueryDenomsFromAdminResponse) {
option (google.api.http).get = "/osmosis/tokenfactory/v1beta1/denoms_from_admin/{admin}";
}

// IsSudoAdmin defines a gRPC query method for checking whether an address is
// a sudo admin.
rpc IsSudoAdmin(QueryIsSudoAdminRequest) returns (QueryIsSudoAdminResponse) {
option (google.api.http).get =
"/osmosis/tokenfactory/v1beta1/is_sudo_admin/{address}";
option (google.api.http).get = "/osmosis/tokenfactory/v1beta1/is_sudo_admin/{address}";
}

// SudoAdmins defines a gRPC query method for fetching all sudo admin
Expand All @@ -60,13 +53,13 @@ message QueryParamsRequest {}
// QueryParamsResponse is the response type for the Query/Params RPC method.
message QueryParamsResponse {
// params defines the parameters of the module.
Params params = 1 [ (gogoproto.nullable) = false ];
Params params = 1 [(gogoproto.nullable) = false];
}

// QueryDenomAuthorityMetadataRequest defines the request structure for the
// DenomAuthorityMetadata gRPC query.
message QueryDenomAuthorityMetadataRequest {
string denom = 1 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
string denom = 1 [(gogoproto.moretags) = "yaml:\"denom\""];
}

// QueryDenomAuthorityMetadataResponse defines the response structure for the
Expand All @@ -81,25 +74,25 @@ message QueryDenomAuthorityMetadataResponse {
// QueryDenomsFromCreatorRequest defines the request structure for the
// DenomsFromCreator gRPC query.
message QueryDenomsFromCreatorRequest {
string creator = 1 [ (gogoproto.moretags) = "yaml:\"creator\"" ];
string creator = 1 [(gogoproto.moretags) = "yaml:\"creator\""];
}

// QueryDenomsFromCreatorRequest defines the response structure for the
// DenomsFromCreator gRPC query.
message QueryDenomsFromCreatorResponse {
repeated string denoms = 1 [ (gogoproto.moretags) = "yaml:\"denoms\"" ];
repeated string denoms = 1 [(gogoproto.moretags) = "yaml:\"denoms\""];
}

// QueryDenomsFromAdminRequest defines the request structure for the
// DenomsFromAdmin gRPC query.
message QueryDenomsFromAdminRequest {
string admin = 1 [ (gogoproto.moretags) = "yaml:\"admin\"" ];
string admin = 1 [(gogoproto.moretags) = "yaml:\"admin\""];
}

// QueryDenomsFromAdminRequest defines the response structure for the
// DenomsFromAdmin gRPC query.
message QueryDenomsFromAdminResponse {
repeated string denoms = 1 [ (gogoproto.moretags) = "yaml:\"denoms\"" ];
repeated string denoms = 1 [(gogoproto.moretags) = "yaml:\"denoms\""];
}

// QueryIsSudoAdminRequest defines the request structure for the
Expand All @@ -121,6 +114,5 @@ message QuerySudoAdminsRequest {}
// QuerySudoAdminsResponse defines the response structure for the
// SudoAdmins gRPC query.
message QuerySudoAdminsResponse {
repeated string sudo_admins = 1
[(gogoproto.moretags) = "yaml:\"sudo_admins\""];
repeated string sudo_admins = 1 [(gogoproto.moretags) = "yaml:\"sudo_admins\""];
}
44 changes: 20 additions & 24 deletions proto/osmosis/tokenfactory/v1beta1/tx.proto
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
syntax = "proto3";
package osmosis.tokenfactory.v1beta1;

import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "amino/amino.proto";
import "cosmos/bank/v1beta1/bank.proto";
import "osmosis/tokenfactory/v1beta1/params.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos/msg/v1/msg.proto";
import "cosmos_proto/cosmos.proto";
import "amino/amino.proto";
import "gogoproto/gogo.proto";
import "osmosis/tokenfactory/v1beta1/params.proto";

option go_package = "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types";

Expand All @@ -19,8 +19,7 @@ service Msg {
rpc Mint(MsgMint) returns (MsgMintResponse);
rpc Burn(MsgBurn) returns (MsgBurnResponse);
rpc ChangeAdmin(MsgChangeAdmin) returns (MsgChangeAdminResponse);
rpc SetDenomMetadata(MsgSetDenomMetadata)
returns (MsgSetDenomMetadataResponse);
rpc SetDenomMetadata(MsgSetDenomMetadata) returns (MsgSetDenomMetadataResponse);
rpc ForceTransfer(MsgForceTransfer) returns (MsgForceTransferResponse);

// UpdateParams defines a governance operation for updating the x/mint module
Expand All @@ -43,16 +42,15 @@ message MsgCreateDenom {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "osmosis/tokenfactory/create-denom";

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
// subdenom can be up to 44 "alphanumeric" characters long.
string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ];
string subdenom = 2 [(gogoproto.moretags) = "yaml:\"subdenom\""];
}

// MsgCreateDenomResponse is the return value of MsgCreateDenom
// It returns the full string of the newly created denom
message MsgCreateDenomResponse {
string new_token_denom = 1
[ (gogoproto.moretags) = "yaml:\"new_token_denom\"" ];
string new_token_denom = 1 [(gogoproto.moretags) = "yaml:\"new_token_denom\""];
}

// MsgMint is the sdk.Msg type for allowing an admin account to mint
Expand All @@ -61,11 +59,11 @@ message MsgMint {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "osmosis/tokenfactory/mint";

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
(gogoproto.nullable) = false,
(amino.encoding) = "legacy_coin"
(amino.encoding) = "legacy_coin"
];
string mintToAddress = 3 [
(gogoproto.moretags) = "yaml:\"mint_to_address\"",
Expand All @@ -81,11 +79,11 @@ message MsgBurn {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "osmosis/tokenfactory/burn";

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
(gogoproto.nullable) = false,
(amino.encoding) = "legacy_coin"
(amino.encoding) = "legacy_coin"
];
string burnFromAddress = 3 [
(gogoproto.moretags) = "yaml:\"burn_from_address\"",
Expand All @@ -101,9 +99,9 @@ message MsgChangeAdmin {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "osmosis/tokenfactory/change-admin";

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
string new_admin = 3 [ (gogoproto.moretags) = "yaml:\"new_admin\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
string denom = 2 [(gogoproto.moretags) = "yaml:\"denom\""];
string new_admin = 3 [(gogoproto.moretags) = "yaml:\"new_admin\""];
}

// MsgChangeAdminResponse defines the response structure for an executed
Expand All @@ -116,7 +114,7 @@ message MsgSetDenomMetadata {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "osmosis/tokenfactory/set-denom-metadata";

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
cosmos.bank.v1beta1.Metadata metadata = 2 [
(gogoproto.moretags) = "yaml:\"metadata\"",
(gogoproto.nullable) = false
Expand All @@ -131,16 +129,14 @@ message MsgForceTransfer {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "osmosis/tokenfactory/force-transfer";

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
(gogoproto.nullable) = false,
(amino.encoding) = "legacy_coin"
(amino.encoding) = "legacy_coin"
];
string transferFromAddress = 3
[ (gogoproto.moretags) = "yaml:\"transfer_from_address\"" ];
string transferToAddress = 4
[ (gogoproto.moretags) = "yaml:\"transfer_to_address\"" ];
string transferFromAddress = 3 [(gogoproto.moretags) = "yaml:\"transfer_from_address\""];
string transferToAddress = 4 [(gogoproto.moretags) = "yaml:\"transfer_to_address\""];
}

message MsgForceTransferResponse {}
Expand Down
Loading