fix: #1221 move block node Protobuf files to fix import mismatch (#1223)

* Moved block node api and internal to block-node folder
* Updated protobuf artifact script to maintain the new folder structure
* Verified all clients still function without change (no package changes in generated files)

Signed-off-by: Joseph S <121976561+jsync-swirlds@users.noreply.github.com>

Author: jsync-swirlds

protobuf/.gitignore

@@ -0,0 +1 @@
+*.tgz

protobuf/build.gradle.kts

@@ -28,7 +28,7 @@ val generateBlockNodeProtoArtifact: TaskProvider<Exec> =
         commandLine(
             "sh",
             "-c",
-            "${layout.projectDirectory}/scripts/build-bn-proto.sh -t $cnTagHash -v ${project.version} -o ${layout.projectDirectory}/block-node-protobuf -i false -b ${layout.projectDirectory}/src/main/proto/org/hiero/block/api",
+            "${layout.projectDirectory}/scripts/build-bn-proto.sh -t $cnTagHash -v ${project.version} -o ${layout.projectDirectory}/block-node-protobuf -i true -b ${layout.projectDirectory}/src/main/proto/",
         )
     }
 
@@ -56,20 +56,16 @@ sourceSets {
         pbj {
             srcDir(
                 generateBlockNodeProtoArtifact.map {
-                    "${layout.projectDirectory}/block-node-protobuf"
+                    "${layout.projectDirectory}/block-node-protobuf/"
                 }
             )
-            // exclude BN files at root level
-            exclude("*.proto")
         }
         proto {
             srcDir(
                 generateBlockNodeProtoArtifact.map {
-                    "${layout.projectDirectory}/block-node-protobuf"
+                    "${layout.projectDirectory}/block-node-protobuf/"
                 }
             )
-            // exclude BN files at root level
-            exclude("*.proto")
         }
     }
 }

protobuf/scripts/build-bn-proto.sh

@@ -23,7 +23,7 @@ function usage {
     echo "  -i bool     Flag if BN API proto should be included, if false no artifact is created"
     echo "              (example: true, default is true)"
     echo "  -b string   BN API path"
-    echo "              (assumes wordkingDir is protobuf module, default is src/main/proto/org/hiero/block/api)"
+    echo "              (assumes wordkingDir is protobuf module, default is src/main/proto/)"
     echo ""
 }
 
@@ -67,7 +67,7 @@ fi
 # handle defaults for optional fields
 cleanup="${cleanup:-false}"
 include_bn_api="${include_bn_api:-true}"
-bn_api_path="${bn_api_path:-src/main/proto/org/hiero/block/api}"
+bn_api_path="${bn_api_path:-src/main/proto/}"
 
 echo "Running $0, working directory: $PWD"
 echo "repository_tag: $repository_tag, release_version: $release_version, output_dir: $output_dir, cleanup: $cleanup, include_bn_api: $include_bn_api, bn_api_path: $bn_api_path ..."
@@ -103,15 +103,9 @@ cp -r ./hiero-consensus-node/hapi/hedera-protobuf-java-api/src/main/proto/servic
 # Copy CN 'streams' protobuf files to the output_dir directory
 cp -r ./hiero-consensus-node/hapi/hedera-protobuf-java-api/src/main/proto/streams "$output_dir"
 
-if $include_bn_api; then
-  # Copy BN repo protobuf files to the new directory
-  echo "Copy BN API proto src:'$bn_api_path' to target:'$output_dir' directory"
-  cp -r $bn_api_path/* "$output_dir/"
-fi
-
 if $include_bn_api; then
   # create artifact file if BN APIs are included
-  tar -czf "block-node-protobuf-$release_version.tgz" -C "./$output_dir" .
+  tar -czf "block-node-protobuf-$release_version.tgz" -C "$output_dir" . -C ${bn_api_path} ./block-node
   echo "CN + BN proto artifact 'block-node-protobuf-$release_version.tgz' successfully created."
 fi
 
@@ -120,10 +114,9 @@ if $cleanup; then
   rm -rf ./hiero-consensus-node
 
   echo "Cleaning up intermediate "$output_dir" directory"
-  rm -rf "./$output_dir"
+  rm -rf "$output_dir"
 fi
 
-
 if [ $? -eq 0 ]; then
   echo "CN proto retrieval and $output_dir contents successfully created."
 else

protobuf/src/main/proto/org/hiero/block/api/block_access_service.proto renamed to protobuf/src/main/proto/block-node/api/block_access_service.proto

@@ -7,7 +7,7 @@ option java_package = "org.hiero.block.api.protoc";
 // <<<pbj.java_package = "org.hiero.block.api">>> This comment is special code for setting PBJ Compiler java package
 option java_multiple_files = true;
 
-import "org/hiero/block/api/shared_message_types.proto";
+import "block-node/api/shared_message_types.proto";
 
 /**
  * Publish a stream of block items.

protobuf/src/main/proto/org/hiero/block/api/block_stream_publish_service.proto renamed to protobuf/src/main/proto/block-node/api/block_stream_publish_service.proto

@@ -7,7 +7,7 @@ option java_package = "org.hiero.block.api.protoc";
 // <<<pbj.java_package = "org.hiero.block.api">>> This comment is special code for setting PBJ Compiler java package
 option java_multiple_files = true;
 
-import "org/hiero/block/api/shared_message_types.proto";
+import "block-node/api/shared_message_types.proto";
 
 /**
  * A request to stream block items from block node to a client.

protobuf/src/main/proto/org/hiero/block/api/block_stream_subscribe_service.proto renamed to protobuf/src/main/proto/block-node/api/block_stream_subscribe_service.proto

@@ -7,8 +7,8 @@ option java_package = "org.hiero.block.internal.protoc";
 // <<<pbj.java_package = "org.hiero.block.internal">>> This comment is special code for setting PBJ Compiler java package
 option java_multiple_files = true;
 
-import "org/hiero/block/api/block_access_service.proto";
-import "org/hiero/block/api/block_stream_subscribe_service.proto";
+import "block-node/api/block_access_service.proto";
+import "block-node/api/block_stream_subscribe_service.proto";
 
 message PublishStreamRequestUnparsed {
     BlockItemSetUnparsed block_items = 1;