fix: re-enable make proto-check and update proto options (backport #1060

) (#1067)

* fix: re-enable make proto-check and update proto options (#1060)

* fix: update proto build tooling

* fix: re-enable make proto-check in CI

* chore: proto check that works (#1063)

* wip

* works

* comments

---------

Co-authored-by: Shawn <[email protected]>
(cherry picked from commit acc494f)

# Conflicts:
#	.github/workflows/automated-tests.yml

* chore: resolve conflicts

---------

Co-authored-by: MSalopek <[email protected]>

.github/workflows/automated-tests.yml

@@ -23,9 +23,9 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.19" # The Go version to download (if necessary) and use.
-      # - name: Proto Check
-      #   run: make proto-check
+          go-version: "1.20" # The Go version to download (if necessary) and use.
+      - name: Proto Check
+        run: make proto-check
       - name: Unit, integration and difference tests
         run: go test ./...
       - name: E2E tests

Makefile

@@ -122,19 +122,27 @@ proto-gen:
 	@$(protoImage) sh ./scripts/protocgen.sh;
 
 proto-check:
-	@if git diff --quiet; then \
-		echo "No files were modified before running 'make proto-gen'."; \
+	@if git diff --quiet --exit-code main...HEAD -- proto; then \
+		echo "Pass! No committed changes found in /proto directory between the currently checked out branch and main."; \
 	else \
-		echo "Error: Uncommitted changes exist before running 'make proto-gen'. Please commit or stash your changes."; \
-		exit 1; \
-	fi
-	@$(MAKE) proto-gen
-	@if git diff --quiet; then \
-		echo "No files were modified after running 'make proto-gen'. Pass!"; \
-	else \
-		echo "Error: Files were modified after running 'make proto-gen'. Please commit changes to .pb files"; \
-		exit 1; \
-	fi
+		echo "Committed changes found in /proto directory between the currently checked out branch and main."; \
+		modified_protos=$$(git diff --name-only main...HEAD proto); \
+		modified_pb_files= ; \
+        for proto_file in $${modified_protos}; do \
+            proto_name=$$(basename "$${proto_file}" .proto); \
+            pb_files=$$(find x/ccv -name "$${proto_name}.pb.go"); \
+            for pb_file in $${pb_files}; do \
+                if git diff --quiet --exit-code main...HEAD -- "$${pb_file}"; then \
+                    echo "Missing committed changes in $${pb_file}"; \
+					exit 1; \
+                else \
+                    modified_pb_files+="$${pb_file} "; \
+                fi \
+            done \
+        done; \
+		echo "Pass! Correctly modified pb files: "; \
+		echo $${modified_pb_files}; \
+    fi
 
 proto-format:
 	@echo "Formatting Protobuf files"

proto/interchain_security/ccv/consumer/v1/consumer.proto

@@ -3,7 +3,7 @@ package interchain_security.ccv.consumer.v1;
 
 import "interchain_security/ccv/v1/ccv.proto";
 
-option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types";
 
 import "google/protobuf/any.proto";
 import "gogoproto/gogo.proto";

proto/interchain_security/ccv/consumer/v1/genesis.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package interchain_security.ccv.consumer.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types";
 
 import "interchain_security/ccv/v1/ccv.proto";
 import "interchain_security/ccv/consumer/v1/consumer.proto";

proto/interchain_security/ccv/consumer/v1/query.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package interchain_security.ccv.consumer.v1;
-option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types";
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";

proto/interchain_security/ccv/provider/v1/genesis.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types";
 
 import "gogoproto/gogo.proto";
 import "interchain_security/ccv/v1/ccv.proto";

proto/interchain_security/ccv/provider/v1/provider.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";

proto/interchain_security/ccv/provider/v1/query.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types";
 
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";

proto/interchain_security/ccv/provider/v1/tx.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/provider/types";
 
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";

proto/interchain_security/ccv/v1/ccv.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package interchain_security.ccv.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v2/x/ccv/types";
+option go_package = "github.com/cosmos/interchain-security/v3/x/ccv/types";
 
 import "cosmos/staking/v1beta1/staking.proto";
 

scripts/protocgen.sh

@@ -16,6 +16,6 @@ done
 cd ..
 
 # move proto files to the right places
-cp -r github.com/cosmos/interchain-security/v2/* ./
+cp -r github.com/cosmos/interchain-security/v3/* ./
 rm -rf github.com