From 05053fbd47337cab65988c23e7203e1ca76917df Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 17 Nov 2020 15:15:06 +0100 Subject: [PATCH 1/4] Regenerate codec for v0.40.0-rc3 --- packages/proto-signing/package.json | 2 +- packages/proto-signing/src/codec/generated/codecimpl.d.ts | 8 +++++++- packages/proto-signing/src/codec/generated/codecimpl.js | 8 +++++++- .../proto-signing/types/codec/generated/codecimpl.d.ts | 8 +++++++- packages/stargate/package.json | 2 +- packages/stargate/src/codec/generated/codecimpl.d.ts | 8 +++++++- packages/stargate/src/codec/generated/codecimpl.js | 8 +++++++- packages/stargate/types/codec/generated/codecimpl.d.ts | 8 +++++++- 8 files changed, 44 insertions(+), 8 deletions(-) diff --git a/packages/proto-signing/package.json b/packages/proto-signing/package.json index 64eab717..6cbac220 100644 --- a/packages/proto-signing/package.json +++ b/packages/proto-signing/package.json @@ -42,7 +42,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=v0.40.0-rc2 ./scripts/get-proto.sh", + "get-proto": "REF=v0.40.0-rc3 ./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/src/codec/generated/codecimpl.d.ts b/packages/proto-signing/src/codec/generated/codecimpl.d.ts index 1a47f92a..dd187a06 100644 --- a/packages/proto-signing/src/codec/generated/codecimpl.d.ts +++ b/packages/proto-signing/src/codec/generated/codecimpl.d.ts @@ -1965,6 +1965,9 @@ export namespace tendermint { interface IPublicKey { /** PublicKey ed25519 */ ed25519?: Uint8Array | null; + + /** PublicKey secp256k1 */ + secp256k1?: Uint8Array | null; } /** Represents a PublicKey. */ @@ -1978,8 +1981,11 @@ export namespace tendermint { /** PublicKey ed25519. */ public ed25519: Uint8Array; + /** PublicKey secp256k1. */ + public secp256k1: Uint8Array; + /** PublicKey sum. */ - public sum?: "ed25519"; + public sum?: "ed25519" | "secp256k1"; /** * Creates a new PublicKey instance using the specified properties. diff --git a/packages/proto-signing/src/codec/generated/codecimpl.js b/packages/proto-signing/src/codec/generated/codecimpl.js index c0d76af9..751b07fe 100644 --- a/packages/proto-signing/src/codec/generated/codecimpl.js +++ b/packages/proto-signing/src/codec/generated/codecimpl.js @@ -1672,9 +1672,10 @@ exports.tendermint = $root.tendermint = (() => { if (p[ks[i]] != null) this[ks[i]] = p[ks[i]]; } PublicKey.prototype.ed25519 = $util.newBuffer([]); + PublicKey.prototype.secp256k1 = $util.newBuffer([]); let $oneOfFields; Object.defineProperty(PublicKey.prototype, "sum", { - get: $util.oneOfGetter(($oneOfFields = ["ed25519"])), + get: $util.oneOfGetter(($oneOfFields = ["ed25519", "secp256k1"])), set: $util.oneOfSetter($oneOfFields), }); PublicKey.create = function create(properties) { @@ -1683,6 +1684,8 @@ exports.tendermint = $root.tendermint = (() => { PublicKey.encode = function encode(m, w) { if (!w) w = $Writer.create(); if (m.ed25519 != null && Object.hasOwnProperty.call(m, "ed25519")) w.uint32(10).bytes(m.ed25519); + if (m.secp256k1 != null && Object.hasOwnProperty.call(m, "secp256k1")) + w.uint32(18).bytes(m.secp256k1); return w; }; PublicKey.decode = function decode(r, l) { @@ -1695,6 +1698,9 @@ exports.tendermint = $root.tendermint = (() => { case 1: m.ed25519 = r.bytes(); break; + case 2: + m.secp256k1 = r.bytes(); + break; default: r.skipType(t & 7); break; diff --git a/packages/proto-signing/types/codec/generated/codecimpl.d.ts b/packages/proto-signing/types/codec/generated/codecimpl.d.ts index 1a47f92a..dd187a06 100644 --- a/packages/proto-signing/types/codec/generated/codecimpl.d.ts +++ b/packages/proto-signing/types/codec/generated/codecimpl.d.ts @@ -1965,6 +1965,9 @@ export namespace tendermint { interface IPublicKey { /** PublicKey ed25519 */ ed25519?: Uint8Array | null; + + /** PublicKey secp256k1 */ + secp256k1?: Uint8Array | null; } /** Represents a PublicKey. */ @@ -1978,8 +1981,11 @@ export namespace tendermint { /** PublicKey ed25519. */ public ed25519: Uint8Array; + /** PublicKey secp256k1. */ + public secp256k1: Uint8Array; + /** PublicKey sum. */ - public sum?: "ed25519"; + public sum?: "ed25519" | "secp256k1"; /** * Creates a new PublicKey instance using the specified properties. diff --git a/packages/stargate/package.json b/packages/stargate/package.json index 8590cff6..ff4ba532 100644 --- a/packages/stargate/package.json +++ b/packages/stargate/package.json @@ -41,7 +41,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=v0.40.0-rc2 ./scripts/get-proto.sh", + "get-proto": "REF=v0.40.0-rc3 ./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/stargate/src/codec/generated/codecimpl.d.ts b/packages/stargate/src/codec/generated/codecimpl.d.ts index b4c9723d..7bc4c814 100644 --- a/packages/stargate/src/codec/generated/codecimpl.d.ts +++ b/packages/stargate/src/codec/generated/codecimpl.d.ts @@ -12032,6 +12032,9 @@ export namespace tendermint { interface IPublicKey { /** PublicKey ed25519 */ ed25519?: Uint8Array | null; + + /** PublicKey secp256k1 */ + secp256k1?: Uint8Array | null; } /** Represents a PublicKey. */ @@ -12045,8 +12048,11 @@ export namespace tendermint { /** PublicKey ed25519. */ public ed25519: Uint8Array; + /** PublicKey secp256k1. */ + public secp256k1: Uint8Array; + /** PublicKey sum. */ - public sum?: "ed25519"; + public sum?: "ed25519" | "secp256k1"; /** * Creates a new PublicKey instance using the specified properties. diff --git a/packages/stargate/src/codec/generated/codecimpl.js b/packages/stargate/src/codec/generated/codecimpl.js index 51ce7a74..4f945ddd 100644 --- a/packages/stargate/src/codec/generated/codecimpl.js +++ b/packages/stargate/src/codec/generated/codecimpl.js @@ -9370,9 +9370,10 @@ exports.tendermint = $root.tendermint = (() => { if (p[ks[i]] != null) this[ks[i]] = p[ks[i]]; } PublicKey.prototype.ed25519 = $util.newBuffer([]); + PublicKey.prototype.secp256k1 = $util.newBuffer([]); let $oneOfFields; Object.defineProperty(PublicKey.prototype, "sum", { - get: $util.oneOfGetter(($oneOfFields = ["ed25519"])), + get: $util.oneOfGetter(($oneOfFields = ["ed25519", "secp256k1"])), set: $util.oneOfSetter($oneOfFields), }); PublicKey.create = function create(properties) { @@ -9381,6 +9382,8 @@ exports.tendermint = $root.tendermint = (() => { PublicKey.encode = function encode(m, w) { if (!w) w = $Writer.create(); if (m.ed25519 != null && Object.hasOwnProperty.call(m, "ed25519")) w.uint32(10).bytes(m.ed25519); + if (m.secp256k1 != null && Object.hasOwnProperty.call(m, "secp256k1")) + w.uint32(18).bytes(m.secp256k1); return w; }; PublicKey.decode = function decode(r, l) { @@ -9393,6 +9396,9 @@ exports.tendermint = $root.tendermint = (() => { case 1: m.ed25519 = r.bytes(); break; + case 2: + m.secp256k1 = r.bytes(); + break; default: r.skipType(t & 7); break; diff --git a/packages/stargate/types/codec/generated/codecimpl.d.ts b/packages/stargate/types/codec/generated/codecimpl.d.ts index b4c9723d..7bc4c814 100644 --- a/packages/stargate/types/codec/generated/codecimpl.d.ts +++ b/packages/stargate/types/codec/generated/codecimpl.d.ts @@ -12032,6 +12032,9 @@ export namespace tendermint { interface IPublicKey { /** PublicKey ed25519 */ ed25519?: Uint8Array | null; + + /** PublicKey secp256k1 */ + secp256k1?: Uint8Array | null; } /** Represents a PublicKey. */ @@ -12045,8 +12048,11 @@ export namespace tendermint { /** PublicKey ed25519. */ public ed25519: Uint8Array; + /** PublicKey secp256k1. */ + public secp256k1: Uint8Array; + /** PublicKey sum. */ - public sum?: "ed25519"; + public sum?: "ed25519" | "secp256k1"; /** * Creates a new PublicKey instance using the specified properties. From d7fdf05aac59ffd0e33f1d394e1a8bfe9cf67041 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 17 Nov 2020 15:15:57 +0100 Subject: [PATCH 2/4] Upgrade simapp to v0.40.0-rc3 --- scripts/simapp/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simapp/env b/scripts/simapp/env index 4cef3fd3..c2f8a43d 100644 --- a/scripts/simapp/env +++ b/scripts/simapp/env @@ -1,4 +1,4 @@ # Choose from https://hub.docker.com/r/interchainio/simapp/tags REPOSITORY="interchainio/simapp" -VERSION="v0.40.0-rc2" +VERSION="v0.40.0-rc3" CONTAINER_NAME="simapp" From ae1f2e28a0da44e6a9f8c448465e26997c69d107 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 17 Nov 2020 16:27:27 +0100 Subject: [PATCH 3/4] Add workaround for missing Tendermint version --- packages/tendermint-rpc/src/adaptorforversion.ts | 5 ++++- packages/tendermint-rpc/src/v0-33/responses.ts | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/tendermint-rpc/src/adaptorforversion.ts b/packages/tendermint-rpc/src/adaptorforversion.ts index dc69d77d..d991c3cd 100644 --- a/packages/tendermint-rpc/src/adaptorforversion.ts +++ b/packages/tendermint-rpc/src/adaptorforversion.ts @@ -5,7 +5,10 @@ import { Adaptor } from "./adaptor"; import { v0_33 } from "./v0-33"; const hashes = { - v0_34: ["ca2c9df"], + v0_34: [ + "ca2c9df", // v0.34.0-rc6 + "", // See https://github.com/cosmos/cosmos-sdk/issues/7963 + ], }; /** diff --git a/packages/tendermint-rpc/src/v0-33/responses.ts b/packages/tendermint-rpc/src/v0-33/responses.ts index 4594d127..d3dd6814 100644 --- a/packages/tendermint-rpc/src/v0-33/responses.ts +++ b/packages/tendermint-rpc/src/v0-33/responses.ts @@ -502,7 +502,9 @@ function decodeNodeInfo(data: RpcNodeInfo): responses.NodeInfo { id: fromHex(assertNotEmpty(data.id)), listenAddr: assertNotEmpty(data.listen_addr), network: assertNotEmpty(data.network), - version: assertNotEmpty(data.version), + // TODO: Reactivate check when https://github.com/cosmos/cosmos-sdk/issues/7963 is resolved + // version: assertNotEmpty(data.version), + version: data.version, channels: assertNotEmpty(data.channels), moniker: assertNotEmpty(data.moniker), other: dictionaryToStringMap(data.other), From d5ff6e3062402f3bb29ed8418d54ddaddee385bb Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 17 Nov 2020 16:38:36 +0100 Subject: [PATCH 4/4] Document 0.40.0-rc3 compatibility --- packages/stargate/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/stargate/README.md b/packages/stargate/README.md index f743dd06..24f24ce0 100644 --- a/packages/stargate/README.md +++ b/packages/stargate/README.md @@ -8,6 +8,7 @@ A client library for the Cosmos SDK 0.40. | CosmJS version | Supported Cosmos SDK version(s) | | ------------------------------- | ------------------------------- | +| ^0.24.0-alpha.8 | 0.40.0-rc3 | | 0.24.0-alpha.2 – 0.24.0-alpha.7 | 0.40.0-rc2 | | 0.24.0-alpha.1 | 0.40.0-rc1 |