diff --git a/packages/stargate/.gitignore b/packages/stargate/.gitignore index 5d19789f..d983d1c5 100644 --- a/packages/stargate/.gitignore +++ b/packages/stargate/.gitignore @@ -1,7 +1,4 @@ build/ dist/ docs/ - -# protobuf code generation -proto/ tmp/ diff --git a/packages/stargate/package.json b/packages/stargate/package.json index 224a5276..d4d60454 100644 --- a/packages/stargate/package.json +++ b/packages/stargate/package.json @@ -34,9 +34,7 @@ "test-chrome": "yarn pack-web && karma start --single-run --browsers ChromeHeadless", "test": "yarn build-or-skip && yarn test-node", "coverage": "nyc --reporter=text --reporter=lcov yarn test --quiet", - "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js", - "get-proto": "rm -rf proto && COSMOS_SDK_REF=v0.42.0 ./scripts/get-proto.sh", - "define-proto": "./scripts/define-proto.sh && prettier --write \"src/codec/**/*.ts\"" + "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js" }, "dependencies": { "@confio/ics23": "^0.6.3", diff --git a/packages/stargate/scripts/define-proto.sh b/packages/stargate/scripts/define-proto.sh deleted file mode 100755 index 3f3f978f..00000000 --- a/packages/stargate/scripts/define-proto.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -set -o errexit -o nounset -o pipefail -command -v shellcheck >/dev/null && shellcheck "$0" - -ROOT_PROTO_DIR="./proto/cosmos/cosmos-sdk" -COSMOS_PROTO_DIR="$ROOT_PROTO_DIR/proto" -THIRD_PARTY_PROTO_DIR="$ROOT_PROTO_DIR/third_party/proto" -OUT_DIR="./src/codec/" - -mkdir -p "$OUT_DIR" - -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="esModuleInterop=true,forceLong=long,useOptionals=true" \ - "$COSMOS_PROTO_DIR/cosmos/auth/v1beta1/auth.proto" \ - "$COSMOS_PROTO_DIR/cosmos/auth/v1beta1/query.proto" \ - "$COSMOS_PROTO_DIR/cosmos/bank/v1beta1/bank.proto" \ - "$COSMOS_PROTO_DIR/cosmos/bank/v1beta1/query.proto" \ - "$COSMOS_PROTO_DIR/cosmos/bank/v1beta1/tx.proto" \ - "$COSMOS_PROTO_DIR/cosmos/base/abci/v1beta1/abci.proto" \ - "$COSMOS_PROTO_DIR/cosmos/base/query/v1beta1/pagination.proto" \ - "$COSMOS_PROTO_DIR/cosmos/base/v1beta1/coin.proto" \ - "$COSMOS_PROTO_DIR/cosmos/crypto/multisig/v1beta1/multisig.proto" \ - "$COSMOS_PROTO_DIR/cosmos/crypto/secp256k1/keys.proto" \ - "$COSMOS_PROTO_DIR/cosmos/distribution/v1beta1/distribution.proto" \ - "$COSMOS_PROTO_DIR/cosmos/distribution/v1beta1/query.proto" \ - "$COSMOS_PROTO_DIR/cosmos/distribution/v1beta1/tx.proto" \ - "$COSMOS_PROTO_DIR/cosmos/staking/v1beta1/query.proto" \ - "$COSMOS_PROTO_DIR/cosmos/staking/v1beta1/staking.proto" \ - "$COSMOS_PROTO_DIR/cosmos/staking/v1beta1/tx.proto" \ - "$COSMOS_PROTO_DIR/cosmos/tx/signing/v1beta1/signing.proto" \ - "$COSMOS_PROTO_DIR/cosmos/tx/v1beta1/tx.proto" \ - "$COSMOS_PROTO_DIR/cosmos/vesting/v1beta1/vesting.proto" \ - "$COSMOS_PROTO_DIR/ibc/applications/transfer/v1/query.proto" \ - "$COSMOS_PROTO_DIR/ibc/applications/transfer/v1/tx.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/channel/v1/channel.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/channel/v1/query.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/channel/v1/tx.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/client/v1/client.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/client/v1/query.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/client/v1/tx.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/commitment/v1/commitment.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/connection/v1/connection.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/connection/v1/query.proto" \ - "$COSMOS_PROTO_DIR/ibc/core/connection/v1/tx.proto" \ - "$COSMOS_PROTO_DIR/ibc/lightclients/tendermint/v1/tendermint.proto" \ - "$THIRD_PARTY_PROTO_DIR/confio/proofs.proto" \ - "$THIRD_PARTY_PROTO_DIR/tendermint/abci/types.proto" \ - "$THIRD_PARTY_PROTO_DIR/tendermint/crypto/keys.proto" \ - "$THIRD_PARTY_PROTO_DIR/tendermint/crypto/proof.proto" \ - "$THIRD_PARTY_PROTO_DIR/tendermint/libs/bits/types.proto" \ - "$THIRD_PARTY_PROTO_DIR/tendermint/types/params.proto" \ - "$THIRD_PARTY_PROTO_DIR/tendermint/types/types.proto" \ - "$THIRD_PARTY_PROTO_DIR/tendermint/types/validator.proto" \ - "$THIRD_PARTY_PROTO_DIR/tendermint/version/types.proto" - -# Remove unnecessary codec files -rm -rf \ - src/codec/cosmos_proto/ \ - src/codec/gogoproto/ \ - src/codec/google/api/ \ - src/codec/google/protobuf/descriptor.ts diff --git a/packages/stargate/scripts/get-proto.sh b/packages/stargate/scripts/get-proto.sh deleted file mode 100755 index c938d933..00000000 --- a/packages/stargate/scripts/get-proto.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -o errexit -o nounset -o pipefail -command -v shellcheck >/dev/null && shellcheck "$0" - -PROTO_DIR="./proto" -COSMOS_DIR="$PROTO_DIR/cosmos" -COSMOS_SDK_DIR="$COSMOS_DIR/cosmos-sdk" -ZIP_FILE="$COSMOS_DIR/tmp.zip" -COSMOS_SDK_REF=${COSMOS_SDK_REF:-"master"} -SUFFIX=${COSMOS_SDK_REF} - -[[ $SUFFIX =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]] && SUFFIX=${SUFFIX#v} - -mkdir -p "$COSMOS_DIR" - -wget -qO "$ZIP_FILE" "https://github.com/cosmos/cosmos-sdk/archive/$COSMOS_SDK_REF.zip" -unzip "$ZIP_FILE" "*.proto" -d "$COSMOS_DIR" -mv "$COSMOS_SDK_DIR-$SUFFIX" "$COSMOS_SDK_DIR" -rm "$ZIP_FILE"