Fix: Resolve protobuf generation bloat with sparse mode filtering

packages/xchain-mayachain/genMsgs.sh

@@ -1,31 +1,97 @@
 #!/bin/bash
 
-# this script checks out mayanode master and generates the proto3 typescript buindings for MsgDeposit and MsgSend
+# 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
 
+# 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 our minimal proto files exist
 tput setaf 2
-echo "Checking out https://gitlab.com/mayachain/mayanode  to $TMP_DIR"
+echo "Checking minimal proto files"
 tput sgr0
-(cd $TMP_DIR && git clone https://gitlab.com/mayachain/mayanode)
+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
+
+if [ $MISSING_FILES -eq 1 ]; then
+  echo "Error: Required proto files are missing"
+  exit 1
+fi
 
-# Generate msgs
+# Generate Protobuf JS bindings using minimal proto files to prevent over-inclusion
 tput setaf 2
 echo "Generating $MSG_COMPILED_OUTPUTFILE"
 tput sgr0
-yarn run pbjs -w commonjs -t static-module $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
+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
+
 # Fix import to be ESM-compatible (no omitted file extension)
 sed -i -E 's|"(protobufjs/minimal)"|"\1.js"|' "$MSG_COMPILED_OUTPUTFILE"
 
+# Generate TypeScript definitions
 tput setaf 2
 echo "Generating $MSG_COMPILED_TYPES_OUTPUTFILE"
 tput sgr0
-yarn run pbts $MSG_COMPILED_OUTPUTFILE -o $MSG_COMPILED_TYPES_OUTPUTFILE
+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

packages/xchain-mayachain/src/types/proto/MsgCompiled.d.ts

@@ -19,6 +19,9 @@ export namespace common {
 
         /** Asset trade */
         trade?: (boolean|null);
+
+        /** Asset secured */
+        secured?: (boolean|null);
     }
 
     /** Represents an Asset. */
@@ -45,6 +48,9 @@ export namespace common {
         /** Asset trade. */
         public trade: boolean;
 
+        /** Asset secured. */
+        public secured: boolean;
+
         /**
          * Creates a new Asset instance using the specified properties.
          * @param [properties] Properties to set

packages/xchain-mayachain/src/types/proto/MsgCompiled.js

@@ -29,6 +29,7 @@ $root.common = (function() {
          * @property {string|null} [ticker] Asset ticker
          * @property {boolean|null} [synth] Asset synth
          * @property {boolean|null} [trade] Asset trade
+         * @property {boolean|null} [secured] Asset secured
          */
 
         /**
@@ -86,6 +87,14 @@ $root.common = (function() {
          */
         Asset.prototype.trade = false;
 
+        /**
+         * Asset secured.
+         * @member {boolean} secured
+         * @memberof common.Asset
+         * @instance
+         */
+        Asset.prototype.secured = false;
+
         /**
          * Creates a new Asset instance using the specified properties.
          * @function create
@@ -120,6 +129,8 @@ $root.common = (function() {
                 writer.uint32(/* id 4, wireType 0 =*/32).bool(message.synth);
             if (message.trade != null && Object.hasOwnProperty.call(message, "trade"))
                 writer.uint32(/* id 5, wireType 0 =*/40).bool(message.trade);
+            if (message.secured != null && Object.hasOwnProperty.call(message, "secured"))
+                writer.uint32(/* id 6, wireType 0 =*/48).bool(message.secured);
             return writer;
         };
 
@@ -169,6 +180,9 @@ $root.common = (function() {
                 case 5:
                     message.trade = reader.bool();
                     break;
+                case 6:
+                    message.secured = reader.bool();
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -219,6 +233,9 @@ $root.common = (function() {
             if (message.trade != null && message.hasOwnProperty("trade"))
                 if (typeof message.trade !== "boolean")
                     return "trade: boolean expected";
+            if (message.secured != null && message.hasOwnProperty("secured"))
+                if (typeof message.secured !== "boolean")
+                    return "secured: boolean expected";
             return null;
         };
 
@@ -244,6 +261,8 @@ $root.common = (function() {
                 message.synth = Boolean(object.synth);
             if (object.trade != null)
                 message.trade = Boolean(object.trade);
+            if (object.secured != null)
+                message.secured = Boolean(object.secured);
             return message;
         };
 
@@ -266,6 +285,7 @@ $root.common = (function() {
                 object.ticker = "";
                 object.synth = false;
                 object.trade = false;
+                object.secured = false;
             }
             if (message.chain != null && message.hasOwnProperty("chain"))
                 object.chain = message.chain;
@@ -277,6 +297,8 @@ $root.common = (function() {
                 object.synth = message.synth;
             if (message.trade != null && message.hasOwnProperty("trade"))
                 object.trade = message.trade;
+            if (message.secured != null && message.hasOwnProperty("secured"))
+                object.secured = message.secured;
             return object;
         };
 

packages/xchain-thorchain/genMsgs.sh

@@ -1,45 +1,68 @@
 #!/bin/bash
 
 # This script updates THORChain 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 thornode repository
 
-tput setaf 2
-echo "Checking out https://gitlab.com/thorchain/thornode to $TMP_DIR"
-tput sgr0
-(cd "$TMP_DIR" && git clone --branch develop https://gitlab.com/thorchain/thornode)
+# 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/thornode/proto/thorchain/v1/common/common.proto" || echo "common.proto missing"
-ls "$TMP_DIR/thornode/proto/thorchain/v1/types/msg_deposit.proto" || echo "msg_deposit.proto missing"
-ls "$TMP_DIR/thornode/proto/thorchain/v1/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
-tput setaf 2
-echo "Downloading cosmos/base/v1beta1/coin.proto from cosmossdk"
-tput sgr0
-mkdir -p "$TMP_DIR/thornode/third_party/proto/cosmos/base/v1beta1"
-curl -o "$TMP_DIR/thornode/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/thornode/proto" \
-  -p "$TMP_DIR/thornode/third_party/proto" \
-  "$TMP_DIR/thornode/proto/thorchain/v1/common/common.proto" \
-  "$TMP_DIR/thornode/proto/thorchain/v1/types/msg_deposit.proto" \
-  "$TMP_DIR/thornode/proto/thorchain/v1/types/msg_send.proto" \
-  "$TMP_DIR/thornode/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
 
 # Fix import to be ESM-compatible (no omitted file extension)
 sed -i -E 's|"(protobufjs/minimal)"|"\1.js"|' "$MSG_COMPILED_OUTPUTFILE"
@@ -48,9 +71,27 @@ sed -i -E 's|"(protobufjs/minimal)"|"\1.js"|' "$MSG_COMPILED_OUTPUTFILE"
 tput setaf 2
 echo "Generating $MSG_COMPILED_TYPES_OUTPUTFILE"
 tput sgr0
-yarn pbts --name types "$MSG_COMPILED_OUTPUTFILE" -o "$MSG_COMPILED_TYPES_OUTPUTFILE" 2>pbts_errors.txt
+if ! yarn pbts --name types "$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/thornode"
+echo "✓ Successfully generated protobuf bindings"
 tput sgr0
-rm -rf "$TMP_DIR"