Merge pull request #1130 from scrtlabs/overhaul-protobuf

Overhaul gRPC queries

.github/workflows/ci.yaml

@@ -317,7 +317,7 @@ jobs:
           make kill-localsecret # next step needs the localsecret ports
       - name: Run secret.js tests
         run: |
-          git clone --depth 1 --branch cosmwasm-v1 https://github.com/scrtlabs/secret.js
+          git clone --depth 1 --branch cw1-overhaul-protobuf https://github.com/scrtlabs/secret.js
           cd secret.js
           # Use the docker images that we built just a few steps above
           perl -i -pe 's/localsecret:.+?"/localsecret:v0.0.0"/' ./test/*

Makefile

@@ -435,7 +435,7 @@ aesm-image:
 	docker build -f deployment/dockerfiles/aesm.Dockerfile -t enigmampc/aesm .
 
 ###############################################################################
-###                                Swagger                                  ###
+###                         Swagger & Protobuf                              ###
 ###############################################################################
 
 # Install the runsim binary with a temporary workaround of entering an outside
@@ -456,22 +456,12 @@ update-swagger-openapi-docs: statik proto-swagger-openapi-gen
         echo "\033[92mSwagger docs are in sync\033[0m";\
     fi
 
-.PHONY: update-swagger-openapi-docs statik
-
-###############################################################################
-###                                Protobuf                                 ###
-###############################################################################
-
-## proto-all: proto-gen proto-lint proto-check-breaking
-
-# proto-gen:
-#	@./scripts/protocgen.sh
+# Example `CHAIN_VERSION=v1.4 make proto-swagger-openapi-gen`
+proto-swagger-openapi-gen:
+	@./scripts/protoc-swagger-openapi-gen.sh
 
-# proto-lint:
-#	@buf check lint --error-format=json
+.PHONY: update-swagger-openapi-docs statik proto-swagger-openapi-gen
 
-# proto-check-breaking:
-#	@buf check breaking --against-input '.git#branch=master'
 
 protoVer=v0.2
 
@@ -481,10 +471,7 @@ proto-gen:
 	@echo "Generating Protobuf files"
 	$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace tendermintdev/sdk-proto-gen:$(protoVer) sh ./scripts/protocgen.sh
 
-proto-swagger-openapi-gen:
-	@./scripts/protoc-swagger-openapi-gen.sh
-
 proto-lint:
 	@$(DOCKER_BUF) lint --error-format=json
 
-.PHONY: proto-all proto-gen proto-swagger-openapi-gen proto-format proto-lint proto-check-breaking
+.PHONY: proto-all proto-gen proto-format proto-lint proto-check-breaking

client/docs/config.json

@@ -3,7 +3,7 @@
   "info": {
     "title": "Secret Network",
     "description": "A REST interface for queries and transactions",
-    "version": "v1.4.0"
+    "version": "v1.4"
   },
   "apis": [
     {
@@ -243,4 +243,4 @@
       }
     }
   ]
-}
+}