Skip to content

Commit

Permalink
chore: merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
johnletey committed Sep 19, 2024
2 parents 8da80c2 + d184ac4 commit 363df53
Show file tree
Hide file tree
Showing 7 changed files with 127 additions and 113 deletions.
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
gofumpt_cmd=mvdan.cc/gofumpt
golangci_lint_cmd=github.com/golangci/golangci-lint/cmd/golangci-lint

FILES := $(shell find $(shell go list -f '{{.Dir}}' ./...) -name "*.go" -a -not -name "*.pb.go" -a -not -name "*.pb.gw.go" -a -not -name "*.pulsar.go" | sed "s|$(shell pwd)/||g")
FILES := $(shell find $(shell go list -f '{{.Dir}}' ./...) -name "*.go" -a -not -name "*.pb.go" -a -not -name "*.pb.gw.go" | sed "s|$(shell pwd)/||g")
license:
@go-license --config .github/license.yml $(FILES)

Expand All @@ -35,10 +35,10 @@ lint:
### Protobuf ###
###############################################################################

BUF_VERSION=1.41
BUF_VERSION=1.42
BUILDER_VERSION=0.15.1

proto-all: proto-format proto-lint proto-gen
proto-all: proto-format proto-lint proto-breaking proto-gen

proto-format:
@echo "🤖 Running protobuf formatter..."
Expand All @@ -58,6 +58,12 @@ proto-lint:
bufbuild/buf:$(BUF_VERSION) lint
@echo "✅ Completed protobuf linting!"

proto-breaking:
@echo "🤖 Running protobuf breaking checks..."
@docker run --rm --volume "$(PWD)":/workspace --workdir /workspace \
bufbuild/buf:$(BUF_VERSION) breaking --against "https://github.com/monerium/module-noble.git#branch=v1.0.0"
@echo "✅ Completed protobuf breaking checks!"

###############################################################################
### Testing ###
###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion api/module/v1/module.pulsar.go

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

138 changes: 71 additions & 67 deletions api/v1/genesis.pulsar.go

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

5 changes: 3 additions & 2 deletions buf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ deps:
- buf.build/cosmos/gogo-proto:5e5b9fdd01804356895f8f79a6f1ddc1
- buf.build/googleapis/googleapis:cc916c31859748a68fd229a3c8d7a2e8
lint:
use:
- STANDARD
except:
- SERVICE_SUFFIX
- RPC_REQUEST_STANDARD_NAME
- RPC_RESPONSE_STANDARD_NAME
breaking:
except:
- FILE_SAME_GO_PACKAGE
2 changes: 1 addition & 1 deletion proto/florin/module/v1/module.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ import "cosmos/app/v1alpha1/module.proto";
message Module {
option (cosmos.app.v1alpha1.module) = {go_import: "github.com/monerium/module-noble/v2/x/florin"};

// authority is the account with permissions to allow new denoms.
// authority is the address that controls allowed denoms of this module.
string authority = 1;
}
3 changes: 2 additions & 1 deletion proto/florin/v1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ message GenesisState {
florin.blacklist.v1.GenesisState blacklist_state = 1 [(gogoproto.nullable) = false];

// authority is the address that controls allowed denoms of this module.
string authority = 2;
// Deprecated and moved to a variable set upon Keeper initialization.
string authority = 2 [deprecated = true];
// allowed_denoms is a unique list of denoms that this module is allowed to burn / mint / etc.
repeated string allowed_denoms = 3;

Expand Down
Loading

0 comments on commit 363df53

Please sign in to comment.