Merge branch 'main' into fix/service-logs-lines

akash-network · May 5, 2024 · 3f037d3 · 3f037d3
2 parents e08d917 + e82f3d1
commit 3f037d3
Show file tree

Hide file tree

Showing 27 changed files with 4,723 additions and 96 deletions.
diff --git a/.env b/.env
@@ -11,4 +11,7 @@ AKASH_DEVCACHE_NODE_BIN=${AKASH_DEVCACHE_NODE_MODULES}/node_modules/.bin
 AKASH_TS_ROOT=${AKASH_ROOT}/ts
 AKASH_TS_PACKAGE_FILE=${AKASH_TS_ROOT}/package.json
 AKASH_TS_NODE_MODULES=${AKASH_TS_ROOT}/node_modules
-AKASH_TS_NODE_BIN=${AKASH_TS_NODE_MODULES}/.bin
+AKASH_TS_NODE_BIN=${AKASH_TS_NODE_MODULES}/.bin
+AKASH_DEVCACHE_TS_TMP=${AKASH_DEVCACHE_BASE}/tmp/ts
+AKASH_DEVCACHE_TS_TMP_GRPC_JS=${AKASH_DEVCACHE_TS_TMP}/generated-grpc-js
+AKASH_DEVCACHE_TS_TMP_PATCHES=${AKASH_DEVCACHE_TS_TMP}/patches
diff --git a/Makefile b/Makefile
@@ -90,4 +90,3 @@ clean:
 	rm -rf $(AKASH_DEVCACHE)
 	rm -rf $(AKASH_TS_ROOT)/node_modules
 	rm -rf $(AKASH_TS_ROOT)/dist
-	rm -rf $(AKASH_TS_ROOT)/src/generated
diff --git a/make/setup-cache.mk b/make/setup-cache.mk
@@ -21,6 +21,7 @@ $(AKASH_DEVCACHE):
 	mkdir -p $(AKASH_DEVCACHE_VERSIONS)
 	mkdir -p $(AKASH_DEVCACHE_NODE_MODULES)
 	mkdir -p $(AKASH_DEVCACHE)/run
+
 cache: $(AKASH_DEVCACHE)
 
 $(BUF_VERSION_FILE): $(AKASH_DEVCACHE)
@@ -169,4 +170,4 @@ endif
 $(AKASH_TS_NODE_MODULES): $(AKASH_TS_PACKAGE_FILE)
 	@echo "installing node modules..."
 	cd $(AKASH_TS_ROOT) && npm install
-	@echo "node modules installed."
+	@echo "node modules installed."
diff --git a/script/protocgen-legacy.sh b/script/protocgen-legacy.sh
@@ -8,10 +8,15 @@ export PATH=$PATH
 function cleanup {
     # put absolute path
     rm -rf "${AKASH_ROOT}/github.com"
+    rm -rf "$AKASH_DEVCACHE_TS_TMP_GRPC_JS"
+    rm -rf "${AKASH_DEVCACHE_TS_TMP_PATCHES}"
 }
 
 trap cleanup EXIT ERR
 
+mkdir -p "${AKASH_DEVCACHE_TS_TMP_GRPC_JS}"
+mkdir -p "${AKASH_DEVCACHE_TS_TMP_PATCHES}"
+
 script/ts-patches.sh preserve
 
 ts_generated="${AKASH_TS_ROOT}/src/generated"
@@ -39,13 +44,23 @@ for dir in $proto_dirs; do
         $(find "${dir}" -maxdepth 1 -name '*.proto')
 
     .cache/bin/protoc \
-        -I "proto/node" \
         -I ".cache/include/google/protobuf" \
+        -I "proto/node" \
         -I "vendor/github.com/cosmos/cosmos-sdk/proto" \
         -I "vendor/github.com/cosmos/cosmos-sdk/third_party/proto" \
         --plugin="${AKASH_TS_NODE_BIN}/protoc-gen-ts_proto" \
         --ts_proto_out="${AKASH_TS_ROOT}/src/generated" \
-        --ts_proto_opt=esModuleInterop=true,forceLong=long,outputTypeRegistry=true,useExactTypes=false,outputIndex=true \
+        --ts_proto_opt="esModuleInterop=true,forceLong=long,outputTypeRegistry=true,useExactTypes=false,outputIndex=true" \
+        $(find "${dir}" -maxdepth 1 -name '*.proto')
+
+    .cache/bin/protoc \
+        -I ".cache/include/google/protobuf" \
+        -I "proto/node" \
+        -I "vendor/github.com/cosmos/cosmos-sdk/proto" \
+        -I "vendor/github.com/cosmos/cosmos-sdk/third_party/proto" \
+        --plugin="${AKASH_TS_NODE_BIN}/protoc-gen-ts_proto" \
+        --ts_proto_out="$AKASH_DEVCACHE_TS_TMP_GRPC_JS" \
+        --ts_proto_opt="esModuleInterop=true,forceLong=long,outputTypeRegistry=true,useExactTypes=false,outputServices=grpc-js" \
         $(find "${dir}" -maxdepth 1 -name '*.proto')
 done
 
@@ -73,16 +88,45 @@ for dir in $proto_dirs; do
 
     .cache/bin/protoc \
         -I "proto/provider" \
-        -I "proto/node" \
         -I ".cache/include" \
+        -I "proto/node" \
         -I "vendor/github.com/cosmos/cosmos-sdk/proto" \
         -I "vendor/github.com/cosmos/cosmos-sdk/third_party/proto" \
         --plugin="${AKASH_TS_NODE_BIN}/protoc-gen-ts_proto" \
         --ts_proto_out="${AKASH_TS_ROOT}/src/generated" \
-        --ts_proto_opt=esModuleInterop=true,forceLong=long,outputTypeRegistry=true,useExactTypes=false,outputIndex=true \
+        --ts_proto_opt="esModuleInterop=true,forceLong=long,outputTypeRegistry=true,useExactTypes=false,outputIndex=true" \
+        $(find "${dir}" -maxdepth 1 -name '*.proto')
+
+    .cache/bin/protoc \
+        -I "proto/provider" \
+        -I ".cache/include" \
+        -I "proto/node" \
+        -I "vendor/github.com/cosmos/cosmos-sdk/proto" \
+        -I "vendor/github.com/cosmos/cosmos-sdk/third_party/proto" \
+        --plugin="${AKASH_TS_NODE_BIN}/protoc-gen-ts_proto" \
+        --ts_proto_out="$AKASH_DEVCACHE_TS_TMP_GRPC_JS" \
+        --ts_proto_opt="esModuleInterop=true,forceLong=long,outputTypeRegistry=true,useExactTypes=false,outputServices=grpc-js" \
         $(find "${dir}" -maxdepth 1 -name '*.proto')
 done
 
+# merge generated grpc-js services to the main generated directory
+ts_grpc_js_services=$(find "$AKASH_DEVCACHE_TS_TMP_GRPC_JS" -name 'service.ts')
+
+for file in $ts_grpc_js_services; do
+    dest_path=$(dirname "${file/$AKASH_DEVCACHE_TS_TMP_GRPC_JS/$AKASH_TS_ROOT\/src\/generated}")
+    dest_file="${dest_path}/service.grpc-js.ts"
+
+    mv "$file" "$dest_file"
+
+    path_from_gen_dir=${dest_file#"${AKASH_TS_ROOT}/src/generated/"}
+    index_file_name_base=${path_from_gen_dir%/service.grpc-js.ts}
+    index_file_name="index.${index_file_name_base//\//.}.grpc-js.ts"
+    index_file_path="${AKASH_TS_ROOT}/src/generated/$index_file_name"
+    export_statement="export * from \"./${path_from_gen_dir%.ts}\";"
+
+    echo "$export_statement" > "$index_file_path"
+done
+
 # move proto files to the right places
 cp -rv github.com/akash-network/akash-api/* ./
 
@@ -108,4 +152,4 @@ cp -rv github.com/akash-network/akash-api/* ./
 
 script/ts-patches.sh restore
 
-(cd "$AKASH_TS_ROOT" && npm run format)
+npm run format --prefix "$AKASH_TS_ROOT"
diff --git a/script/ts-patches.sh b/script/ts-patches.sh
@@ -3,7 +3,7 @@
 set -eo pipefail
 
 generated_dir="$AKASH_TS_ROOT/src/generated"
-tmp_dir="$AKASH_DEVCACHE_BASE/tmp/ts"
+tmp_dir="$AKASH_DEVCACHE_TS_TMP_PATCHES"
 
 if [ ! -d "$generated_dir" ]; then
     echo "Directory $generated_dir does not exist. Skipping..."
@@ -12,6 +12,7 @@ fi
 
 preserve_patches() {
     echo "Preserving TypeScript patches..."
+
     find "$generated_dir" -type f -name "*.original.ts" | while read -r src_file; do
         src_file=${src_file//.original/}
         gen_dir=$(dirname "$src_file")