Updates to scripts and reverted protos

Author: Naq302

packages/xchain-mayachain/genMsgs.sh

@@ -1,55 +1,94 @@
 #!/bin/bash
 
 # This script updates MAYAChain Protobuf bindings for MsgDeposit and MsgSend
+set -e # Exit on any error
 
 MSG_COMPILED_OUTPUTFILE=src/types/proto/MsgCompiled.js
 MSG_COMPILED_TYPES_OUTPUTFILE=src/types/proto/MsgCompiled.d.ts
 
-TMP_DIR=$(mktemp -d)
+# Using local minimal proto files - no need to clone mayanode repository
 
-tput setaf 2
-echo "Checking out https://gitlab.com/mayachain/mayanode to $TMP_DIR"
-tput sgr0
-(cd "$TMP_DIR" && git clone https://gitlab.com/mayachain/mayanode)
+# Download cosmos/base/v1beta1/coin.proto from cosmossdk
+COSMOS_COIN_PROTO="proto/cosmos/base/v1beta1/coin.proto"
+if [ ! -f "$COSMOS_COIN_PROTO" ]; then
+  tput setaf 2
+  echo "Downloading cosmos/base/v1beta1/coin.proto from cosmossdk"
+  tput sgr0
+  mkdir -p "proto/cosmos/base/v1beta1"
+  if ! curl -f -o "$COSMOS_COIN_PROTO" \
+    "https://raw.githubusercontent.com/cosmos/cosmos-sdk/main/proto/cosmos/base/v1beta1/coin.proto"; then
+    echo "Error: Failed to download cosmos coin.proto"
+    exit 1
+  fi
+  echo "✓ Downloaded cosmos coin.proto"
+else
+  echo "✓ cosmos coin.proto already exists"
+fi
 
-# Verify proto files exist
+# Verify our minimal proto files exist
 tput setaf 2
-echo "Checking proto files"
+echo "Checking minimal proto files"
 tput sgr0
-ls "$TMP_DIR/mayanode/proto/mayachain/v1/common/common.proto" || echo "common.proto missing"
-ls "$TMP_DIR/mayanode/proto/mayachain/v1/x/mayachain/types/msg_deposit.proto" || echo "msg_deposit.proto missing"
-ls "$TMP_DIR/mayanode/proto/mayachain/v1/x/mayachain/types/msg_send.proto" || echo "msg_send.proto missing"
+MISSING_FILES=0
+for proto_file in \
+  "proto/common/minimal_common.proto" \
+  "proto/types/minimal_msg_deposit.proto" \
+  "proto/types/minimal_msg_send.proto" \
+  "$COSMOS_COIN_PROTO"; do
+  if [ ! -f "$proto_file" ]; then
+    echo "Error: $(basename "$proto_file") missing"
+    MISSING_FILES=1
+  else
+    echo "✓ $(basename "$proto_file") found"
+  fi
+done
 
-# Download cosmos/base/v1beta1/coin.proto from cosmossdk if needed
-if [ ! -f "$TMP_DIR/mayanode/third_party/proto/cosmos/base/v1beta1/coin.proto" ]; then
-  tput setaf 2
-  echo "Downloading cosmos/base/v1beta1/coin.proto from cosmossdk"
-  tput sgr0
-  mkdir -p "$TMP_DIR/mayanode/third_party/proto/cosmos/base/v1beta1"
-  curl -o "$TMP_DIR/mayanode/third_party/proto/cosmos/base/v1beta1/coin.proto" \
-    "https://raw.githubusercontent.com/cosmos/cosmos-sdk/main/proto/cosmos/base/v1beta1/coin.proto"
+if [ $MISSING_FILES -eq 1 ]; then
+  echo "Error: Required proto files are missing"
+  exit 1
 fi
 
-# Generate Protobuf JS bindings with include path
+# Generate Protobuf JS bindings using minimal proto files to prevent over-inclusion
 tput setaf 2
 echo "Generating $MSG_COMPILED_OUTPUTFILE"
 tput sgr0
-yarn pbjs -w commonjs -t static-module \
-  -p "$TMP_DIR/mayanode/proto" \
-  -p "$TMP_DIR/mayanode/third_party/proto" \
-  "$TMP_DIR/mayanode/proto/mayachain/v1/common/common.proto" \
-  "$TMP_DIR/mayanode/proto/mayachain/v1/x/mayachain/types/msg_deposit.proto" \
-  "$TMP_DIR/mayanode/proto/mayachain/v1/x/mayachain/types/msg_send.proto" \
-  "$TMP_DIR/mayanode/third_party/proto/cosmos/base/v1beta1/coin.proto" \
-  -o "$MSG_COMPILED_OUTPUTFILE" 2>pbjs_errors.txt
+if ! yarn pbjs -w commonjs -t static-module \
+  -p proto \
+  "proto/common/minimal_common.proto" \
+  "proto/types/minimal_msg_deposit.proto" \
+  "proto/types/minimal_msg_send.proto" \
+  "$COSMOS_COIN_PROTO" \
+  -o "$MSG_COMPILED_OUTPUTFILE" 2>pbjs_errors.txt; then
+  echo "Error: Failed to generate JavaScript bindings"
+  cat pbjs_errors.txt
+  exit 1
+fi
 
 # Generate TypeScript definitions
 tput setaf 2
 echo "Generating $MSG_COMPILED_TYPES_OUTPUTFILE"
 tput sgr0
-yarn pbts "$MSG_COMPILED_OUTPUTFILE" -o "$MSG_COMPILED_TYPES_OUTPUTFILE" 2>pbts_errors.txt
+if ! yarn pbts "$MSG_COMPILED_OUTPUTFILE" -o "$MSG_COMPILED_TYPES_OUTPUTFILE" 2>pbts_errors.txt; then
+  echo "Error: Failed to generate TypeScript definitions"
+  cat pbts_errors.txt
+  exit 1
+fi
+
+# Verify generated files
+if [ ! -f "$MSG_COMPILED_OUTPUTFILE" ] || [ ! -s "$MSG_COMPILED_OUTPUTFILE" ]; then
+  echo "Error: Generated JavaScript file is missing or empty"
+  exit 1
+fi
+
+if [ ! -f "$MSG_COMPILED_TYPES_OUTPUTFILE" ] || [ ! -s "$MSG_COMPILED_TYPES_OUTPUTFILE" ]; then
+  echo "Error: Generated TypeScript definitions file is missing or empty"
+  exit 1
+fi
+
+# Clean up error files if they're empty
+[ ! -s pbjs_errors.txt ] && rm -f pbjs_errors.txt
+[ ! -s pbts_errors.txt ] && rm -f pbts_errors.txt
 
 tput setaf 2
-echo "Removing $TMP_DIR/mayanode"
+echo "✓ Successfully generated protobuf bindings"
 tput sgr0
-rm -rf "$TMP_DIR"