diff --git a/packages/cosmwasm-stargate/scripts/predefine-proto.sh b/packages/cosmwasm-stargate/scripts/predefine-proto.sh index 35547ca0..2b1ddb9e 100755 --- a/packages/cosmwasm-stargate/scripts/predefine-proto.sh +++ b/packages/cosmwasm-stargate/scripts/predefine-proto.sh @@ -3,8 +3,9 @@ set -o errexit -o nounset -o pipefail command -v shellcheck >/dev/null && shellcheck "$0" GENERATED_DIR="./tmp" -ROOT_PROTO_DIR="./proto/cosmwasm/wasmd" -WASM_PROTO_DIR="$ROOT_PROTO_DIR/x/wasm" +ROOT_PROTO_DIR="./proto" +WASM_PROTO_DIR="$ROOT_PROTO_DIR/cosmwasm/wasmd/x/wasm" +COSMOS_PROTO_DIR="$ROOT_PROTO_DIR/cosmos/cosmos-sdk/proto/cosmos" mkdir -p "$GENERATED_DIR" # Can't use --sparse for some reason. Seems related to https://github.com/protobufjs/protobuf.js/issues/1165 @@ -21,8 +22,8 @@ yarn pbjs \ "$WASM_PROTO_DIR/internal/types/msg.proto" \ "$WASM_PROTO_DIR/internal/types/query.proto" \ "$WASM_PROTO_DIR/internal/types/types.proto" \ - "./proto/cosmos/cosmos-sdk/proto/cosmos/base/v1beta1/coin.proto" \ - "./proto/cosmos/cosmos-sdk/proto/cosmos/base/query/v1beta1/pagination.proto" + "$COSMOS_PROTO_DIR/base/v1beta1/coin.proto" \ + "$COSMOS_PROTO_DIR/base/query/v1beta1/pagination.proto" # Work around https://github.com/protobufjs/protobuf.js/issues/1477 # shellcheck disable=SC2016