From fa58c73988c9181d0d9572a0ef3c11cd67059f91 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Mon, 6 Dec 2021 09:50:52 +0100 Subject: [PATCH 1/2] Upgrade cosmjs-types to ^0.4.0 --- .pnp.cjs | 16 ++++++++-------- ...mjs-types-npm-0.3.0-7e874d3092-b123bc1a55.zip | 3 --- ...mjs-types-npm-0.4.0-accb450c96-ffc3e6451e.zip | 3 +++ CHANGELOG.md | 2 +- packages/cli/package.json | 2 +- packages/cosmwasm-stargate/package.json | 2 +- packages/proto-signing/package.json | 2 +- packages/proto-signing/src/registry.ts | 4 ++-- packages/stargate/package.json | 2 +- yarn.lock | 16 ++++++++-------- 10 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 .yarn/cache/cosmjs-types-npm-0.3.0-7e874d3092-b123bc1a55.zip create mode 100644 .yarn/cache/cosmjs-types-npm-0.4.0-accb450c96-ffc3e6451e.zip diff --git a/.pnp.cjs b/.pnp.cjs index 510fa80b..bd26b62d 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -1048,7 +1048,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], [ "cosmjs-types", - "npm:0.3.0" + "npm:0.4.0" ], [ "create-hash", @@ -3282,7 +3282,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["axios", "npm:0.21.4"], ["babylon", "npm:6.18.0"], ["colors", "npm:1.4.0"], - ["cosmjs-types", "npm:0.3.0"], + ["cosmjs-types", "npm:0.4.0"], ["diff", "npm:4.0.2"], ["eslint", "npm:7.26.0"], ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"], @@ -3328,7 +3328,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/pako", "npm:1.0.1"], ["@typescript-eslint/eslint-plugin", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.28.4"], ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.28.4"], - ["cosmjs-types", "npm:0.3.0"], + ["cosmjs-types", "npm:0.4.0"], ["eslint", "npm:7.26.0"], ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"], ["eslint-import-resolver-node", "npm:0.3.4"], @@ -3766,7 +3766,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/node", "npm:15.3.1"], ["@typescript-eslint/eslint-plugin", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.28.4"], ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.28.4"], - ["cosmjs-types", "npm:0.3.0"], + ["cosmjs-types", "npm:0.4.0"], ["eslint", "npm:7.26.0"], ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"], ["eslint-import-resolver-node", "npm:0.3.4"], @@ -3870,7 +3870,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/node", "npm:15.3.1"], ["@typescript-eslint/eslint-plugin", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.28.4"], ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:4.28.4"], - ["cosmjs-types", "npm:0.3.0"], + ["cosmjs-types", "npm:0.4.0"], ["eslint", "npm:7.26.0"], ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"], ["eslint-import-resolver-node", "npm:0.3.4"], @@ -7033,10 +7033,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["cosmjs-types", [ - ["npm:0.3.0", { - "packageLocation": "./.yarn/cache/cosmjs-types-npm-0.3.0-7e874d3092-b123bc1a55.zip/node_modules/cosmjs-types/", + ["npm:0.4.0", { + "packageLocation": "./.yarn/cache/cosmjs-types-npm-0.4.0-accb450c96-ffc3e6451e.zip/node_modules/cosmjs-types/", "packageDependencies": [ - ["cosmjs-types", "npm:0.3.0"], + ["cosmjs-types", "npm:0.4.0"], ["long", "npm:4.0.0"], ["protobufjs", "npm:6.11.2"] ], diff --git a/.yarn/cache/cosmjs-types-npm-0.3.0-7e874d3092-b123bc1a55.zip b/.yarn/cache/cosmjs-types-npm-0.3.0-7e874d3092-b123bc1a55.zip deleted file mode 100644 index a2a61b30..00000000 --- a/.yarn/cache/cosmjs-types-npm-0.3.0-7e874d3092-b123bc1a55.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f4821fd9738da4e77798569dd776023c5052ea4d3552c8a15af6c919dde062f -size 741561 diff --git a/.yarn/cache/cosmjs-types-npm-0.4.0-accb450c96-ffc3e6451e.zip b/.yarn/cache/cosmjs-types-npm-0.4.0-accb450c96-ffc3e6451e.zip new file mode 100644 index 00000000..c07169a6 --- /dev/null +++ b/.yarn/cache/cosmjs-types-npm-0.4.0-accb450c96-ffc3e6451e.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e730c8bd09822b2153803a941023040367fd9d08bb1a74cb1466189e4649427 +size 1074040 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7665af03..3eaac579 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ and this project adheres to code that only needs to support one backend. ([#865]) - @cosmjs/tendermint-rpc: Remove default URL from `HttpClient` and `WebsocketClient` constructors ([#897]). -- all: Upgrade cosmjs-types to 0.3. This includes the types of the Cosmos SDK +- all: Upgrade cosmjs-types to 0.4. This includes the types of the Cosmos SDK 0.44 modules x/authz and x/feegrant. It causes a few breaking changes by adding fields to interfaces. ([#928]) - @cosmjs/stargate and @cosmjs/cosmwasm-stargate: Add simulation support diff --git a/packages/cli/package.json b/packages/cli/package.json index cbd94384..70167a73 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -54,7 +54,7 @@ "axios": "^0.21.2", "babylon": "^6.18.0", "colors": "^1.3.3", - "cosmjs-types": "^0.3.0", + "cosmjs-types": "^0.4.0", "diff": "^4", "recast": "^0.20", "ts-node": "^8", diff --git a/packages/cosmwasm-stargate/package.json b/packages/cosmwasm-stargate/package.json index ca4e9691..43e47401 100644 --- a/packages/cosmwasm-stargate/package.json +++ b/packages/cosmwasm-stargate/package.json @@ -46,7 +46,7 @@ "@cosmjs/stargate": "workspace:packages/stargate", "@cosmjs/tendermint-rpc": "workspace:packages/tendermint-rpc", "@cosmjs/utils": "workspace:packages/utils", - "cosmjs-types": "^0.3.0", + "cosmjs-types": "^0.4.0", "long": "^4.0.0", "pako": "^2.0.2", "protobufjs": "~6.10.2" diff --git a/packages/proto-signing/package.json b/packages/proto-signing/package.json index 12f8a45a..fe850555 100644 --- a/packages/proto-signing/package.json +++ b/packages/proto-signing/package.json @@ -42,7 +42,7 @@ "@cosmjs/amino": "workspace:packages/amino", "@cosmjs/crypto": "workspace:packages/crypto", "@cosmjs/math": "workspace:packages/math", - "cosmjs-types": "^0.3.0", + "cosmjs-types": "^0.4.0", "long": "^4.0.0", "protobufjs": "~6.10.2" }, diff --git a/packages/proto-signing/src/registry.ts b/packages/proto-signing/src/registry.ts index b40df4b2..b3ea7d75 100644 --- a/packages/proto-signing/src/registry.ts +++ b/packages/proto-signing/src/registry.ts @@ -12,8 +12,8 @@ import protobuf from "protobufjs"; export interface TsProtoGeneratedType { readonly encode: (message: any | { [k: string]: any }, writer?: protobuf.Writer) => protobuf.Writer; readonly decode: (input: Uint8Array | protobuf.Reader, length?: number) => any; - readonly fromJSON: (object: { [k: string]: any }) => any; - readonly fromPartial: (object: { [k: string]: any }) => any; + readonly fromJSON: (object: any) => any; + readonly fromPartial: (object: any) => any; readonly toJSON: (message: any | { [k: string]: any }) => unknown; } diff --git a/packages/stargate/package.json b/packages/stargate/package.json index eff4ac7d..b4ee5fa8 100644 --- a/packages/stargate/package.json +++ b/packages/stargate/package.json @@ -46,7 +46,7 @@ "@cosmjs/stream": "workspace:packages/stream", "@cosmjs/tendermint-rpc": "workspace:packages/tendermint-rpc", "@cosmjs/utils": "workspace:packages/utils", - "cosmjs-types": "^0.3.0", + "cosmjs-types": "^0.4.0", "long": "^4.0.0", "protobufjs": "~6.10.2", "xstream": "^11.14.0" diff --git a/yarn.lock b/yarn.lock index 974881f2..58463474 100644 --- a/yarn.lock +++ b/yarn.lock @@ -367,7 +367,7 @@ __metadata: axios: ^0.21.2 babylon: ^6.18.0 colors: ^1.3.3 - cosmjs-types: ^0.3.0 + cosmjs-types: ^0.4.0 diff: ^4 eslint: ^7.5 eslint-config-prettier: ^8.3.0 @@ -413,7 +413,7 @@ __metadata: "@types/pako": ^1.0.1 "@typescript-eslint/eslint-plugin": ^4.28 "@typescript-eslint/parser": ^4.28 - cosmjs-types: ^0.3.0 + cosmjs-types: ^0.4.0 eslint: ^7.5 eslint-config-prettier: ^8.3.0 eslint-import-resolver-node: ^0.3.4 @@ -835,7 +835,7 @@ __metadata: "@types/node": ^15.0.1 "@typescript-eslint/eslint-plugin": ^4.28 "@typescript-eslint/parser": ^4.28 - cosmjs-types: ^0.3.0 + cosmjs-types: ^0.4.0 eslint: ^7.5 eslint-config-prettier: ^8.3.0 eslint-import-resolver-node: ^0.3.4 @@ -935,7 +935,7 @@ __metadata: "@types/node": ^15.0.1 "@typescript-eslint/eslint-plugin": ^4.28 "@typescript-eslint/parser": ^4.28 - cosmjs-types: ^0.3.0 + cosmjs-types: ^0.4.0 eslint: ^7.5 eslint-config-prettier: ^8.3.0 eslint-import-resolver-node: ^0.3.4 @@ -3009,13 +3009,13 @@ __metadata: languageName: unknown linkType: soft -"cosmjs-types@npm:^0.3.0": - version: 0.3.0 - resolution: "cosmjs-types@npm:0.3.0" +"cosmjs-types@npm:^0.4.0": + version: 0.4.0 + resolution: "cosmjs-types@npm:0.4.0" dependencies: long: ^4.0.0 protobufjs: ~6.11.2 - checksum: b123bc1a55b6a8d4bd8963a75fa5d4a63109359c980810c31bcf3426e8a0d3384f570d6a3e11bab4337ff9611075fa8e24c3cd4ab6a77f86e8d35f2abd4cdcc6 + checksum: ffc3e6451e85023f81e17ae55cc221d2be77fa01ac65cbd51ec69b695c49a7fba5ddd50a913e519db8aae821f02f0c1a231a2d20337d4646ca520bb3584631a1 languageName: node linkType: hard From 61fb5872df2a9ff8741396015a397ae104fe46c5 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Mon, 6 Dec 2021 11:03:28 +0100 Subject: [PATCH 2/2] Adaot tests to Date -> Timestamp change --- CHANGELOG.md | 3 ++- packages/stargate/src/queries/gov.spec.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3eaac579..7b39c428 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,8 @@ and this project adheres to `WebsocketClient` constructors ([#897]). - all: Upgrade cosmjs-types to 0.4. This includes the types of the Cosmos SDK 0.44 modules x/authz and x/feegrant. It causes a few breaking changes by - adding fields to interfaces. ([#928]) + adding fields to interfaces as well as changing `Date` to a `Timestamp` + object. ([#928]) - @cosmjs/stargate and @cosmjs/cosmwasm-stargate: Add simulation support ([#931]). - @cosmjs/tendermint-rpc: Remove `Tendermint33Client` and related symbols. diff --git a/packages/stargate/src/queries/gov.spec.ts b/packages/stargate/src/queries/gov.spec.ts index fc917a7d..cae143ff 100644 --- a/packages/stargate/src/queries/gov.spec.ts +++ b/packages/stargate/src/queries/gov.spec.ts @@ -235,11 +235,11 @@ describe("GovExtension", () => { proposalId: longify(proposalId), status: ProposalStatus.PROPOSAL_STATUS_VOTING_PERIOD, finalTallyResult: { yes: "0", abstain: "0", no: "0", noWithVeto: "0" }, - submitTime: jasmine.any(Date), - depositEndTime: jasmine.any(Date), + submitTime: { seconds: jasmine.any(Long), nanos: jasmine.any(Number) }, + depositEndTime: { seconds: jasmine.any(Long), nanos: jasmine.any(Number) }, totalDeposit: initialDeposit, - votingStartTime: jasmine.any(Date), - votingEndTime: jasmine.any(Date), + votingStartTime: { seconds: jasmine.any(Long), nanos: jasmine.any(Number) }, + votingEndTime: { seconds: jasmine.any(Long), nanos: jasmine.any(Number) }, }); tmClient.disconnect(); @@ -261,11 +261,11 @@ describe("GovExtension", () => { proposalId: longify(proposalId), status: ProposalStatus.PROPOSAL_STATUS_VOTING_PERIOD, finalTallyResult: { yes: "0", abstain: "0", no: "0", noWithVeto: "0" }, - submitTime: jasmine.any(Date), - depositEndTime: jasmine.any(Date), + submitTime: { seconds: jasmine.any(Long), nanos: jasmine.any(Number) }, + depositEndTime: { seconds: jasmine.any(Long), nanos: jasmine.any(Number) }, totalDeposit: initialDeposit, - votingStartTime: jasmine.any(Date), - votingEndTime: jasmine.any(Date), + votingStartTime: { seconds: jasmine.any(Long), nanos: jasmine.any(Number) }, + votingEndTime: { seconds: jasmine.any(Long), nanos: jasmine.any(Number) }, }); tmClient.disconnect();