From db2969d924b7c71666f057980f2d37fdaff4990b Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 13 Aug 2020 10:48:43 +0200 Subject: [PATCH] Avoid manipulating the $protobuf object --- packages/proto-signing/scripts/predefine-proto.sh | 4 ++++ packages/proto-signing/src/generated/codecimpl.js | 2 +- packages/stargate/scripts/predefine-proto.sh | 4 ++++ packages/stargate/src/generated/codecimpl.js | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/proto-signing/scripts/predefine-proto.sh b/packages/proto-signing/scripts/predefine-proto.sh index bf6c8062..5f0a8d63 100755 --- a/packages/proto-signing/scripts/predefine-proto.sh +++ b/packages/proto-signing/scripts/predefine-proto.sh @@ -28,3 +28,7 @@ yarn pbjs \ "$TENDERMINT_PROTO_DIR/crypto/merkle/merkle.proto" \ "$TENDERMINT_PROTO_DIR/libs/kv/types.proto" \ "$GOOGLE_PROTO_DIR/protobuf/any.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" diff --git a/packages/proto-signing/src/generated/codecimpl.js b/packages/proto-signing/src/generated/codecimpl.js index 9f6268c8..f46f7262 100644 --- a/packages/proto-signing/src/generated/codecimpl.js +++ b/packages/proto-signing/src/generated/codecimpl.js @@ -5,7 +5,7 @@ var $protobuf = require("protobufjs/minimal"); const $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; -const $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {}); +const $root = {}; exports.cosmos = $root.cosmos = (() => { const cosmos = {}; cosmos.Coin = (function () { diff --git a/packages/stargate/scripts/predefine-proto.sh b/packages/stargate/scripts/predefine-proto.sh index 32121ee2..86a1a8de 100755 --- a/packages/stargate/scripts/predefine-proto.sh +++ b/packages/stargate/scripts/predefine-proto.sh @@ -30,3 +30,7 @@ yarn pbjs \ "$TENDERMINT_PROTO_DIR/crypto/merkle/merkle.proto" \ "$TENDERMINT_PROTO_DIR/libs/kv/types.proto" \ "$GOOGLE_PROTO_DIR/protobuf/any.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" diff --git a/packages/stargate/src/generated/codecimpl.js b/packages/stargate/src/generated/codecimpl.js index d5275c63..d89f93c5 100644 --- a/packages/stargate/src/generated/codecimpl.js +++ b/packages/stargate/src/generated/codecimpl.js @@ -5,7 +5,7 @@ var $protobuf = require("protobufjs/minimal"); const $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; -const $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {}); +const $root = {}; exports.cosmos = $root.cosmos = (() => { const cosmos = {}; cosmos.Coin = (function () {