diff --git a/packages/proto-signing/scripts/define-proto.sh b/packages/proto-signing/scripts/define-proto.sh
index 7053d578..e098edd8 100755
--- a/packages/proto-signing/scripts/define-proto.sh
+++ b/packages/proto-signing/scripts/define-proto.sh
@@ -9,6 +9,9 @@ OUTPUT_DIR="./src/generated/"
 
 
 yarn pbts "$JS_SOURCE_FILE" -o "$DEFINITIONS_FILE"
-yarn tsc --removeComments --outDir "$OUTPUT_DIR" --allowJs "$JS_SOURCE_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"
+
 cp "$DEFINITIONS_FILE" "$OUTPUT_DIR"
 rm "$DEFINITIONS_FILE" "$JS_SOURCE_FILE"
diff --git a/packages/proto-signing/src/generated/codecimpl.js b/packages/proto-signing/src/generated/codecimpl.js
index 8ac57050..9f6268c8 100644
--- a/packages/proto-signing/src/generated/codecimpl.js
+++ b/packages/proto-signing/src/generated/codecimpl.js
@@ -1,13 +1,13 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.google = exports.tendermint = exports.cosmos = void 0;
 var $protobuf = require("protobufjs/minimal");
-var $Reader = $protobuf.Reader,
+const $Reader = $protobuf.Reader,
   $Writer = $protobuf.Writer,
   $util = $protobuf.util;
-var $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {});
-exports.cosmos = $root.cosmos = (function () {
-  var cosmos = {};
+const $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {});
+exports.cosmos = $root.cosmos = (() => {
+  const cosmos = {};
   cosmos.Coin = (function () {
     function Coin(p) {
       if (p)
@@ -613,7 +613,7 @@ exports.cosmos = $root.cosmos = (function () {
     return Attribute;
   })();
   cosmos.bank = (function () {
-    var bank = {};
+    const bank = {};
     bank.Params = (function () {
       function Params(p) {
         this.sendEnabled = [];
@@ -1031,7 +1031,7 @@ exports.cosmos = $root.cosmos = (function () {
     return bank;
   })();
   cosmos.crypto = (function () {
-    var crypto = {};
+    const crypto = {};
     crypto.PublicKey = (function () {
       function PublicKey(p) {
         if (p)
@@ -1044,7 +1044,7 @@ exports.cosmos = $root.cosmos = (function () {
       PublicKey.prototype.multisig = null;
       PublicKey.prototype.secp256r1 = $util.newBuffer([]);
       PublicKey.prototype.anyPubkey = null;
-      var $oneOfFields;
+      let $oneOfFields;
       Object.defineProperty(PublicKey.prototype, "sum", {
         get: $util.oneOfGetter(
           ($oneOfFields = ["secp256k1", "ed25519", "sr25519", "multisig", "secp256r1", "anyPubkey"]),
@@ -1228,7 +1228,7 @@ exports.cosmos = $root.cosmos = (function () {
     return crypto;
   })();
   cosmos.tx = (function () {
-    var tx = {};
+    const tx = {};
     tx.Tx = (function () {
       function Tx(p) {
         this.signatures = [];
@@ -1555,7 +1555,7 @@ exports.cosmos = $root.cosmos = (function () {
       }
       ModeInfo.prototype.single = null;
       ModeInfo.prototype.multi = null;
-      var $oneOfFields;
+      let $oneOfFields;
       Object.defineProperty(ModeInfo.prototype, "sum", {
         get: $util.oneOfGetter(($oneOfFields = ["single", "multi"])),
         set: $util.oneOfSetter($oneOfFields),
@@ -1717,9 +1717,9 @@ exports.cosmos = $root.cosmos = (function () {
       return Fee;
     })();
     tx.signing = (function () {
-      var signing = {};
+      const signing = {};
       signing.SignMode = (function () {
-        var valuesById = {},
+        const valuesById = {},
           values = Object.create(valuesById);
         values[(valuesById[0] = "SIGN_MODE_UNSPECIFIED")] = 0;
         values[(valuesById[1] = "SIGN_MODE_DIRECT")] = 1;
@@ -1816,7 +1816,7 @@ exports.cosmos = $root.cosmos = (function () {
           }
           Data.prototype.single = null;
           Data.prototype.multi = null;
-          var $oneOfFields;
+          let $oneOfFields;
           Object.defineProperty(Data.prototype, "sum", {
             get: $util.oneOfGetter(($oneOfFields = ["single", "multi"])),
             set: $util.oneOfSetter($oneOfFields),
@@ -1956,12 +1956,12 @@ exports.cosmos = $root.cosmos = (function () {
   })();
   return cosmos;
 })();
-exports.tendermint = $root.tendermint = (function () {
-  var tendermint = {};
+exports.tendermint = $root.tendermint = (() => {
+  const tendermint = {};
   tendermint.abci = (function () {
-    var abci = {};
+    const abci = {};
     abci.types = (function () {
-      var types = {};
+      const types = {};
       types.Request = (function () {
         function Request(p) {
           if (p)
@@ -1979,7 +1979,7 @@ exports.tendermint = $root.tendermint = (function () {
         Request.prototype.deliverTx = null;
         Request.prototype.endBlock = null;
         Request.prototype.commit = null;
-        var $oneOfFields;
+        let $oneOfFields;
         Object.defineProperty(Request.prototype, "value", {
           get: $util.oneOfGetter(
             ($oneOfFields = [
@@ -2401,7 +2401,7 @@ exports.tendermint = $root.tendermint = (function () {
         return RequestBeginBlock;
       })();
       types.CheckTxType = (function () {
-        var valuesById = {},
+        const valuesById = {},
           values = Object.create(valuesById);
         values[(valuesById[0] = "New")] = 0;
         values[(valuesById[1] = "Recheck")] = 1;
@@ -2561,7 +2561,7 @@ exports.tendermint = $root.tendermint = (function () {
         Response.prototype.deliverTx = null;
         Response.prototype.endBlock = null;
         Response.prototype.commit = null;
-        var $oneOfFields;
+        let $oneOfFields;
         Object.defineProperty(Response.prototype, "value", {
           get: $util.oneOfGetter(
             ($oneOfFields = [
@@ -4131,9 +4131,9 @@ exports.tendermint = $root.tendermint = (function () {
     return abci;
   })();
   tendermint.crypto = (function () {
-    var crypto = {};
+    const crypto = {};
     crypto.merkle = (function () {
-      var merkle = {};
+      const merkle = {};
       merkle.ProofOp = (function () {
         function ProofOp(p) {
           if (p)
@@ -4222,9 +4222,9 @@ exports.tendermint = $root.tendermint = (function () {
     return crypto;
   })();
   tendermint.libs = (function () {
-    var libs = {};
+    const libs = {};
     libs.kv = (function () {
-      var kv = {};
+      const kv = {};
       kv.Pair = (function () {
         function Pair(p) {
           if (p)
@@ -4309,10 +4309,10 @@ exports.tendermint = $root.tendermint = (function () {
   })();
   return tendermint;
 })();
-exports.google = $root.google = (function () {
-  var google = {};
+exports.google = $root.google = (() => {
+  const google = {};
   google.protobuf = (function () {
-    var protobuf = {};
+    const protobuf = {};
     protobuf.Any = (function () {
       function Any(p) {
         if (p)
diff --git a/packages/stargate/scripts/define-proto.sh b/packages/stargate/scripts/define-proto.sh
index 7053d578..e098edd8 100755
--- a/packages/stargate/scripts/define-proto.sh
+++ b/packages/stargate/scripts/define-proto.sh
@@ -9,6 +9,9 @@ OUTPUT_DIR="./src/generated/"
 
 
 yarn pbts "$JS_SOURCE_FILE" -o "$DEFINITIONS_FILE"
-yarn tsc --removeComments --outDir "$OUTPUT_DIR" --allowJs "$JS_SOURCE_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"
+
 cp "$DEFINITIONS_FILE" "$OUTPUT_DIR"
 rm "$DEFINITIONS_FILE" "$JS_SOURCE_FILE"
diff --git a/packages/stargate/src/generated/codecimpl.js b/packages/stargate/src/generated/codecimpl.js
index 26ed2c5d..d5275c63 100644
--- a/packages/stargate/src/generated/codecimpl.js
+++ b/packages/stargate/src/generated/codecimpl.js
@@ -1,13 +1,13 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.google = exports.tendermint = exports.cosmos = void 0;
 var $protobuf = require("protobufjs/minimal");
-var $Reader = $protobuf.Reader,
+const $Reader = $protobuf.Reader,
   $Writer = $protobuf.Writer,
   $util = $protobuf.util;
-var $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {});
-exports.cosmos = $root.cosmos = (function () {
-  var cosmos = {};
+const $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {});
+exports.cosmos = $root.cosmos = (() => {
+  const cosmos = {};
   cosmos.Coin = (function () {
     function Coin(p) {
       if (p)
@@ -613,7 +613,7 @@ exports.cosmos = $root.cosmos = (function () {
     return Attribute;
   })();
   cosmos.auth = (function () {
-    var auth = {};
+    const auth = {};
     auth.BaseAccount = (function () {
       function BaseAccount(p) {
         if (p)
@@ -944,7 +944,7 @@ exports.cosmos = $root.cosmos = (function () {
     return auth;
   })();
   cosmos.bank = (function () {
-    var bank = {};
+    const bank = {};
     bank.Params = (function () {
       function Params(p) {
         this.sendEnabled = [];
@@ -1720,7 +1720,7 @@ exports.cosmos = $root.cosmos = (function () {
     return bank;
   })();
   cosmos.crypto = (function () {
-    var crypto = {};
+    const crypto = {};
     crypto.PublicKey = (function () {
       function PublicKey(p) {
         if (p)
@@ -1733,7 +1733,7 @@ exports.cosmos = $root.cosmos = (function () {
       PublicKey.prototype.multisig = null;
       PublicKey.prototype.secp256r1 = $util.newBuffer([]);
       PublicKey.prototype.anyPubkey = null;
-      var $oneOfFields;
+      let $oneOfFields;
       Object.defineProperty(PublicKey.prototype, "sum", {
         get: $util.oneOfGetter(
           ($oneOfFields = ["secp256k1", "ed25519", "sr25519", "multisig", "secp256r1", "anyPubkey"]),
@@ -1917,7 +1917,7 @@ exports.cosmos = $root.cosmos = (function () {
     return crypto;
   })();
   cosmos.query = (function () {
-    var query = {};
+    const query = {};
     query.PageRequest = (function () {
       function PageRequest(p) {
         if (p)
@@ -2010,7 +2010,7 @@ exports.cosmos = $root.cosmos = (function () {
     return query;
   })();
   cosmos.tx = (function () {
-    var tx = {};
+    const tx = {};
     tx.Tx = (function () {
       function Tx(p) {
         this.signatures = [];
@@ -2337,7 +2337,7 @@ exports.cosmos = $root.cosmos = (function () {
       }
       ModeInfo.prototype.single = null;
       ModeInfo.prototype.multi = null;
-      var $oneOfFields;
+      let $oneOfFields;
       Object.defineProperty(ModeInfo.prototype, "sum", {
         get: $util.oneOfGetter(($oneOfFields = ["single", "multi"])),
         set: $util.oneOfSetter($oneOfFields),
@@ -2499,9 +2499,9 @@ exports.cosmos = $root.cosmos = (function () {
       return Fee;
     })();
     tx.signing = (function () {
-      var signing = {};
+      const signing = {};
       signing.SignMode = (function () {
-        var valuesById = {},
+        const valuesById = {},
           values = Object.create(valuesById);
         values[(valuesById[0] = "SIGN_MODE_UNSPECIFIED")] = 0;
         values[(valuesById[1] = "SIGN_MODE_DIRECT")] = 1;
@@ -2598,7 +2598,7 @@ exports.cosmos = $root.cosmos = (function () {
           }
           Data.prototype.single = null;
           Data.prototype.multi = null;
-          var $oneOfFields;
+          let $oneOfFields;
           Object.defineProperty(Data.prototype, "sum", {
             get: $util.oneOfGetter(($oneOfFields = ["single", "multi"])),
             set: $util.oneOfSetter($oneOfFields),
@@ -2738,12 +2738,12 @@ exports.cosmos = $root.cosmos = (function () {
   })();
   return cosmos;
 })();
-exports.tendermint = $root.tendermint = (function () {
-  var tendermint = {};
+exports.tendermint = $root.tendermint = (() => {
+  const tendermint = {};
   tendermint.abci = (function () {
-    var abci = {};
+    const abci = {};
     abci.types = (function () {
-      var types = {};
+      const types = {};
       types.Request = (function () {
         function Request(p) {
           if (p)
@@ -2761,7 +2761,7 @@ exports.tendermint = $root.tendermint = (function () {
         Request.prototype.deliverTx = null;
         Request.prototype.endBlock = null;
         Request.prototype.commit = null;
-        var $oneOfFields;
+        let $oneOfFields;
         Object.defineProperty(Request.prototype, "value", {
           get: $util.oneOfGetter(
             ($oneOfFields = [
@@ -3183,7 +3183,7 @@ exports.tendermint = $root.tendermint = (function () {
         return RequestBeginBlock;
       })();
       types.CheckTxType = (function () {
-        var valuesById = {},
+        const valuesById = {},
           values = Object.create(valuesById);
         values[(valuesById[0] = "New")] = 0;
         values[(valuesById[1] = "Recheck")] = 1;
@@ -3343,7 +3343,7 @@ exports.tendermint = $root.tendermint = (function () {
         Response.prototype.deliverTx = null;
         Response.prototype.endBlock = null;
         Response.prototype.commit = null;
-        var $oneOfFields;
+        let $oneOfFields;
         Object.defineProperty(Response.prototype, "value", {
           get: $util.oneOfGetter(
             ($oneOfFields = [
@@ -4913,9 +4913,9 @@ exports.tendermint = $root.tendermint = (function () {
     return abci;
   })();
   tendermint.crypto = (function () {
-    var crypto = {};
+    const crypto = {};
     crypto.merkle = (function () {
-      var merkle = {};
+      const merkle = {};
       merkle.ProofOp = (function () {
         function ProofOp(p) {
           if (p)
@@ -5004,9 +5004,9 @@ exports.tendermint = $root.tendermint = (function () {
     return crypto;
   })();
   tendermint.libs = (function () {
-    var libs = {};
+    const libs = {};
     libs.kv = (function () {
-      var kv = {};
+      const kv = {};
       kv.Pair = (function () {
         function Pair(p) {
           if (p)
@@ -5091,10 +5091,10 @@ exports.tendermint = $root.tendermint = (function () {
   })();
   return tendermint;
 })();
-exports.google = $root.google = (function () {
-  var google = {};
+exports.google = $root.google = (() => {
+  const google = {};
   google.protobuf = (function () {
-    var protobuf = {};
+    const protobuf = {};
     protobuf.Any = (function () {
       function Any(p) {
         if (p)