Updated proto get and define

Author: cyborgshead

define-proto.sh

@@ -2,10 +2,8 @@
 set -o errexit -o nounset -o pipefail
 command -v shellcheck >/dev/null && shellcheck "$0"
 
-CYBER_REF='2.0.0'
-ROOT_PROTO_DIR="./proto/cyber/go-cyber-$CYBER_REF"
-CYBER_PROTO_DIR="$ROOT_PROTO_DIR/proto"
-THIRD_PARTY_PROTO_DIR="$ROOT_PROTO_DIR/third_party/proto"
+CYBER_TS_REF='0.1.0'
+CYBER_PROTO_DIR="./proto/cyber/proto-$CYBER_TS_REF"
 OUT_DIR="./src/codec/"
 
 mkdir -p "$OUT_DIR"
@@ -15,10 +13,9 @@ protoc \
   --plugin="$(yarn bin protoc-gen-ts_proto)" \
   --ts_proto_out="$OUT_DIR" \
   --proto_path="$CYBER_PROTO_DIR" \
-  --proto_path="$THIRD_PARTY_PROTO_DIR" \
   --ts_proto_opt="esModuleInterop=true,forceLong=long,useOptionals=messages" \
-  "$THIRD_PARTY_PROTO_DIR/cosmos/base/query/v1beta1/pagination.proto" \
-  "$CYBER_PROTO_DIR/cyber/base/query/v1beta1/pagination.proto" \
+  "$CYBER_PROTO_DIR/cosmos/base/query/v1beta1/pagination.proto" \
+  "$CYBER_PROTO_DIR/cosmos/base/v1beta1/coin.proto" \
   "$CYBER_PROTO_DIR/cyber/graph/v1beta1/types.proto" \
   "$CYBER_PROTO_DIR/cyber/graph/v1beta1/query.proto" \
   "$CYBER_PROTO_DIR/cyber/graph/v1beta1/tx.proto" \
@@ -31,11 +28,16 @@ protoc \
   "$CYBER_PROTO_DIR/cyber/rank/v1beta1/query.proto" \
   "$CYBER_PROTO_DIR/cyber/grid/v1beta1/types.proto" \
   "$CYBER_PROTO_DIR/cyber/grid/v1beta1/query.proto" \
-  "$CYBER_PROTO_DIR/cyber/grid/v1beta1/tx.proto"
+  "$CYBER_PROTO_DIR/cyber/grid/v1beta1/tx.proto" \
+  "$CYBER_PROTO_DIR/cyber/liquidity/v1beta1/liquidity.proto" \
+  "$CYBER_PROTO_DIR/cyber/liquidity/v1beta1/query.proto" \
+  "$CYBER_PROTO_DIR/cyber/liquidity/v1beta1/tx.proto" \
 
 # Remove unnecessary codec files
 rm -rf \
   src/codec/gogoproto/ \
   src/codec/google/api/ \
   src/codec/google/protobuf/descriptor.ts \
-  src/codec/protoc-gen-openapiv2
+  src/codec/protoc-gen-openapiv2 \
+  src/codec/google \
+  src/codec/cosmos_proto

get-proto.sh

@@ -5,13 +5,13 @@ command -v shellcheck >/dev/null && shellcheck "$0"
 PROTO_DIR="./proto"
 CYBER_DIR="$PROTO_DIR/cyber"
 ZIP_FILE="$CYBER_DIR/tmp.zip"
-CYBER_REF='v2.0.0'
+CYBER_REF='0.1.0'
 mkdir -p "$CYBER_DIR"
 
-wget -qO "$ZIP_FILE" "https://github.com/cybercongress/go-cyber/archive/refs/tags/$CYBER_REF.zip"
+#wget -qO "$ZIP_FILE" "https://github.com/cybercongress/go-cyber/archive/refs/tags/$CYBER_REF.zip"
+wget -qO "$ZIP_FILE" "https://github.com/cyborgshead/cyber-ts/archive/refs/tags/v$CYBER_REF.zip"
 unzip "$ZIP_FILE" "*.proto" -d "$CYBER_DIR"
 rm "$ZIP_FILE"
+mv "$CYBER_DIR/cyber-ts-$CYBER_REF/packages/cyber-ts/proto" "$CYBER_DIR/proto-$CYBER_REF"
+rm -rf "$CYBER_DIR/cyber-ts-$CYBER_REF"
 
-wget -qO "$ZIP_FILE" "https://github.com/tendermint/liquidity/archive/master.zip"
-unzip "$ZIP_FILE" "*.proto" -d "$CYBER_DIR"
-rm "$ZIP_FILE"