Merge branch 'master' into ryan/604-update-spec

regen-network · Jan 28, 2022 · 0a308e0 · 0a308e0
2 parents 97f6853 + fc7e17e
commit 0a308e0
Show file tree

Hide file tree

Showing 26 changed files with 19,092 additions and 1,075 deletions.
diff --git a/Makefile b/Makefile
@@ -347,7 +347,7 @@ proto-all: proto-gen proto-lint proto-check-breaking proto-format
 
 proto-gen:
 	@echo "Generating Protobuf files"
-	@echo "If you're having trouble with this command, you need to install the latest buf, protoc-gen-gocosmos, protoc-gen-grpc-gateway, protoc-gen-go-pulsar, and protoc-gen-go-grpc locally"
+	@echo "If you're having trouble with this command, you need to install the latest buf, protoc-gen-gocosmos, protoc-gen-grpc-gateway, protoc-gen-go-pulsar, protoc-gen-go-grpc and protoc-gen-go-cosmos-orm locally"
 #	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then docker start -a $(containerProtoGen); else docker run --name $(containerProtoGen) -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \
 #		sh ./scripts/protocgen.sh; fi
 	./scripts/protocgen.sh

diff --git a/api/regen/ecocredit/basket/v1beta1/state.cosmos_orm.go b/api/regen/ecocredit/basket/v1beta1/state.cosmos_orm.go