proto-signing: Update proto scripts

packages/proto-signing/package.json

@@ -29,10 +29,10 @@
     "format-text": "prettier --write --prose-wrap always --print-width 80 \"./*.md\"",
     "lint": "eslint --max-warnings 0 \"**/*.{js,ts}\"",
     "lint-fix": "eslint --max-warnings 0 \"**/*.{js,ts}\" --fix",
-    "move-types": "shx rm -rf ./types/* && shx mv build/types/* ./types && shx rm -rf ./types/testdata ./types/*.spec.d.ts",
+    "move-types": "shx rm -rf ./types/* && shx mv build/types/* ./types && shx rm -rf ./types/testdata ./types/*.spec.d.ts \"./types/codec/**/*[!.d].ts\"",
     "format-types": "prettier --write --loglevel warn \"./types/**/*.d.ts\"",
     "prebuild": "shx rm -rf ./build",
-    "build": "tsc && shx mkdir -p build/codec/generated && shx cp ./src/codec/generated/*.js ./build/codec/generated/ && shx mkdir -p ./build/types/codec/generated && shx cp ./src/codec/generated/*.d.ts ./build/types/codec/generated",
+    "build": "tsc && shx cp -R ./src/codec ./build/ && shx mkdir -p ./build/types/codec && shx cp -R ./src/codec ./build/types/",
     "postbuild": "yarn move-types && yarn format-types",
     "build-or-skip": "[ -n \"$SKIP_BUILD\" ] || yarn build",
     "test-node": "node jasmine-testrunner.js",
@@ -43,9 +43,8 @@
     "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js",
     "preget-proto": "shx rm -rf proto",
     "get-proto": "REF=v0.40.0 ./scripts/get-proto.sh",
-    "predefine-proto": "./scripts/predefine-proto.sh",
     "define-proto": "./scripts/define-proto.sh",
-    "postdefine-proto": "prettier --write \"src/codec/generated/codecimpl.*\""
+    "postdefine-proto": "prettier --write \"src/codec/**/*.ts\""
   },
   "dependencies": {
     "@cosmjs/launchpad": "^0.24.0-alpha.22",

packages/proto-signing/scripts/define-proto.sh

@@ -2,15 +2,25 @@
 set -o errexit -o nounset -o pipefail
 command -v shellcheck >/dev/null && shellcheck "$0"
 
-TMP_DIR="./tmp"
-JS_SOURCE_FILE="$TMP_DIR/codecimpl.js"
-DEFINITIONS_FILE="$TMP_DIR/codecimpl.d.ts"
-OUTPUT_DIR="./src/codec/generated/"
+ROOT_PROTO_DIR="./proto/cosmos/cosmos-sdk"
+THIRD_PARTY_PROTO_DIR="$ROOT_PROTO_DIR/third_party/proto"
+COSMOS_PROTO_DIR="$ROOT_PROTO_DIR/proto"
+OUT_DIR="./src/codec/"
 
-yarn pbts "$JS_SOURCE_FILE" -o "$DEFINITIONS_FILE"
-# Remove comments after using them for the .d.ts
-# Note "When input files are specified on the command line, tsconfig.json files are ignored." (https://www.typescriptlang.org/docs/handbook/tsconfig-json.html)
-yarn tsc --removeComments --target es2017 --module commonjs --outDir "$OUTPUT_DIR" --allowJs "$JS_SOURCE_FILE"
+mkdir -p "$OUT_DIR"
 
-cp "$DEFINITIONS_FILE" "$OUTPUT_DIR"
-rm "$DEFINITIONS_FILE" "$JS_SOURCE_FILE"
+protoc \
+  --plugin="$(yarn bin protoc-gen-ts_proto)" \
+  --ts_proto_out="$OUT_DIR" \
+  --proto_path="$COSMOS_PROTO_DIR" \
+  --proto_path="$THIRD_PARTY_PROTO_DIR" \
+  --ts_proto_opt="forceLong=long,useOptionals=true" \
+  "$THIRD_PARTY_PROTO_DIR/gogoproto/gogo.proto" \
+  "$COSMOS_PROTO_DIR/cosmos/base/v1beta1/coin.proto" \
+  "$COSMOS_PROTO_DIR/cosmos/bank/v1beta1/bank.proto" \
+  "$COSMOS_PROTO_DIR/cosmos/bank/v1beta1/tx.proto" \
+  "$COSMOS_PROTO_DIR/cosmos/crypto/multisig/v1beta1/multisig.proto" \
+  "$COSMOS_PROTO_DIR/cosmos/crypto/secp256k1/keys.proto" \
+  "$COSMOS_PROTO_DIR/cosmos/tx/v1beta1/tx.proto" \
+  "$COSMOS_PROTO_DIR/cosmos/tx/signing/v1beta1/signing.proto" \
+  "$THIRD_PARTY_PROTO_DIR/tendermint/crypto/keys.proto"

packages/proto-signing/scripts/predefine-proto.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-set -o errexit -o nounset -o pipefail
-command -v shellcheck >/dev/null && shellcheck "$0"
-
-GENERATED_DIR="./tmp"
-ROOT_PROTO_DIR="./proto/cosmos/cosmos-sdk"
-COSMOS_PROTO_DIR="$ROOT_PROTO_DIR/proto/cosmos"
-TENDERMINT_PROTO_DIR="$ROOT_PROTO_DIR/third_party/proto/tendermint"
-
-mkdir -p "$GENERATED_DIR"
-yarn pbjs \
-  -t static-module \
-  --es6 \
-  -w commonjs \
-  -o "$GENERATED_DIR/codecimpl.js" \
-  --sparse \
-  --no-beautify \
-  --no-delimited \
-  --no-verify \
-  --no-convert \
-  --force-long \
-  "$COSMOS_PROTO_DIR/bank/v1beta1/bank.proto" \
-  "$COSMOS_PROTO_DIR/bank/v1beta1/tx.proto" \
-  "$COSMOS_PROTO_DIR/base/v1beta1/coin.proto" \
-  "$COSMOS_PROTO_DIR/crypto/multisig/v1beta1/multisig.proto" \
-  "$COSMOS_PROTO_DIR/crypto/secp256k1/keys.proto" \
-  "$COSMOS_PROTO_DIR/tx/v1beta1/tx.proto" \
-  "$COSMOS_PROTO_DIR/tx/signing/v1beta1/signing.proto" \
-  "$TENDERMINT_PROTO_DIR/crypto/keys.proto"
-
-# Work around https://github.com/protobufjs/protobuf.js/issues/1477
-# shellcheck disable=SC2016
-sed -i "" -e 's/^const \$root =.*$/const \$root = {};/' "$GENERATED_DIR/codecimpl.js"