diff --git a/packages/proto-signing/package.json b/packages/proto-signing/package.json index ed5a38c1..c7e499cc 100644 --- a/packages/proto-signing/package.json +++ b/packages/proto-signing/package.json @@ -40,7 +40,7 @@ "coverage": "nyc --reporter=text --reporter=lcov yarn test --quiet", "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js", "preget-proto": "rm -rf proto", - "get-proto": "REF=20c80cfd44a068a592148d648c50de3459fd6295 ./scripts/get-proto.sh", + "get-proto": "REF=v0.40.0-rc0 ./scripts/get-proto.sh", "predefine-proto": "./scripts/predefine-proto.sh", "define-proto": "./scripts/define-proto.sh", "postdefine-proto": "prettier --write \"src/codec/generated/codecimpl.*\"" diff --git a/packages/proto-signing/scripts/get-proto.sh b/packages/proto-signing/scripts/get-proto.sh index dc9a4931..b9ff708c 100755 --- a/packages/proto-signing/scripts/get-proto.sh +++ b/packages/proto-signing/scripts/get-proto.sh @@ -9,7 +9,7 @@ ZIP_FILE="$COSMOS_DIR/tmp.zip" REF=${REF:-"master"} SUFFIX=${REF} -[[ $SUFFIX =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && SUFFIX=${SUFFIX#v} +[[ $SUFFIX =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]] && SUFFIX=${SUFFIX#v} mkdir -p "$COSMOS_DIR" diff --git a/packages/proto-signing/scripts/predefine-proto.sh b/packages/proto-signing/scripts/predefine-proto.sh index 2676f4d7..2cc2f5b6 100755 --- a/packages/proto-signing/scripts/predefine-proto.sh +++ b/packages/proto-signing/scripts/predefine-proto.sh @@ -6,7 +6,6 @@ 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" -GOOGLE_PROTO_DIR="$ROOT_PROTO_DIR/third_party/proto/google" mkdir -p "$GENERATED_DIR" yarn pbjs \ @@ -20,15 +19,14 @@ yarn pbjs \ --no-verify \ --no-convert \ --force-long \ - "$COSMOS_PROTO_DIR/cosmos.proto" \ - "$COSMOS_PROTO_DIR/bank/bank.proto" \ - "$COSMOS_PROTO_DIR/crypto/crypto.proto" \ - "$COSMOS_PROTO_DIR/tx/tx.proto" \ - "$COSMOS_PROTO_DIR/tx/signing/signing.proto" \ - "$TENDERMINT_PROTO_DIR/abci/types/types.proto" \ - "$TENDERMINT_PROTO_DIR/crypto/merkle/merkle.proto" \ - "$TENDERMINT_PROTO_DIR/libs/kv/types.proto" \ - "$GOOGLE_PROTO_DIR/protobuf/any.proto" + "$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