From 465785802851e8849801c7b8acd50d011b1b021d Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 7 Mar 2023 14:04:24 +0100 Subject: [PATCH] Upgrade cosmjs-types to 0.7 --- .pnp.cjs | 16 +++++----- ...-types-npm-0.6.0-4ad2730ce2-06000f10d9.zip | 3 -- ...-types-npm-0.7.1-d44ec482fd-533d56d076.zip | 3 ++ CHANGELOG.md | 1 + packages/cli/package.json | 2 +- packages/cosmwasm-stargate/package.json | 2 +- packages/proto-signing/package.json | 2 +- packages/stargate/package.json | 2 +- .../src/modules/ibc/aminomessages.spec.ts | 5 ++++ .../stargate/src/modules/ibc/aminomessages.ts | 29 ++++++++++--------- yarn.lock | 16 +++++----- 11 files changed, 44 insertions(+), 37 deletions(-) delete mode 100644 .yarn/cache/cosmjs-types-npm-0.6.0-4ad2730ce2-06000f10d9.zip create mode 100644 .yarn/cache/cosmjs-types-npm-0.7.1-d44ec482fd-533d56d076.zip diff --git a/.pnp.cjs b/.pnp.cjs index 519ad968..7a38a6c3 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -1036,7 +1036,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ [\ "cosmjs-types",\ - "npm:0.6.0"\ + "npm:0.7.1"\ ],\ [\ "cross-spawn",\ @@ -3240,7 +3240,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["axios", "npm:0.21.4"],\ ["babylon", "npm:6.18.0"],\ ["chalk", "npm:4.1.2"],\ - ["cosmjs-types", "npm:0.6.0"],\ + ["cosmjs-types", "npm:0.7.1"],\ ["diff", "npm:4.0.2"],\ ["eslint", "npm:7.26.0"],\ ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"],\ @@ -3286,7 +3286,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/pako", "npm:1.0.1"],\ ["@typescript-eslint/eslint-plugin", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:5.54.0"],\ ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:5.54.0"],\ - ["cosmjs-types", "npm:0.6.0"],\ + ["cosmjs-types", "npm:0.7.1"],\ ["eslint", "npm:7.26.0"],\ ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"],\ ["eslint-import-resolver-node", "npm:0.3.4"],\ @@ -3659,7 +3659,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/node", "npm:15.9.0"],\ ["@typescript-eslint/eslint-plugin", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:5.54.0"],\ ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:5.54.0"],\ - ["cosmjs-types", "npm:0.6.0"],\ + ["cosmjs-types", "npm:0.7.1"],\ ["eslint", "npm:7.26.0"],\ ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"],\ ["eslint-import-resolver-node", "npm:0.3.4"],\ @@ -3760,7 +3760,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/node", "npm:15.9.0"],\ ["@typescript-eslint/eslint-plugin", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:5.54.0"],\ ["@typescript-eslint/parser", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:5.54.0"],\ - ["cosmjs-types", "npm:0.6.0"],\ + ["cosmjs-types", "npm:0.7.1"],\ ["eslint", "npm:7.26.0"],\ ["eslint-config-prettier", "virtual:4f1584ad4aba8733a24be7c8aebbffafef25607f2d00f4b314cf96717145c692763628a31c2b85d4686fbb091ff21ebffa3cc337399c042c19a32b9bdb786464#npm:8.3.0"],\ ["eslint-import-resolver-node", "npm:0.3.4"],\ @@ -6931,10 +6931,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["cosmjs-types", [\ - ["npm:0.6.0", {\ - "packageLocation": "./.yarn/cache/cosmjs-types-npm-0.6.0-4ad2730ce2-06000f10d9.zip/node_modules/cosmjs-types/",\ + ["npm:0.7.1", {\ + "packageLocation": "./.yarn/cache/cosmjs-types-npm-0.7.1-d44ec482fd-533d56d076.zip/node_modules/cosmjs-types/",\ "packageDependencies": [\ - ["cosmjs-types", "npm:0.6.0"],\ + ["cosmjs-types", "npm:0.7.1"],\ ["long", "npm:4.0.0"],\ ["protobufjs", "npm:6.11.3"]\ ],\ diff --git a/.yarn/cache/cosmjs-types-npm-0.6.0-4ad2730ce2-06000f10d9.zip b/.yarn/cache/cosmjs-types-npm-0.6.0-4ad2730ce2-06000f10d9.zip deleted file mode 100644 index b6ae462e..00000000 --- a/.yarn/cache/cosmjs-types-npm-0.6.0-4ad2730ce2-06000f10d9.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:481f034b96a9167980596c7db0958e8058782276b6ef965462ecdc127ab24a4f -size 939388 diff --git a/.yarn/cache/cosmjs-types-npm-0.7.1-d44ec482fd-533d56d076.zip b/.yarn/cache/cosmjs-types-npm-0.7.1-d44ec482fd-533d56d076.zip new file mode 100644 index 00000000..a22269ea --- /dev/null +++ b/.yarn/cache/cosmjs-types-npm-0.7.1-d44ec482fd-533d56d076.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef0496eb6031656f6d91ce0fd5faaf8d08241595f5dc52c9946d690f510f6cd0 +size 1141497 diff --git a/CHANGELOG.md b/CHANGELOG.md index c4589c99..522ed143 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to - all: The TypeScript compilation target is now ES2020 ([#1002]). - all: Add full support for Node.js 18 and run all CI tests with it ([#1240]). +- all: Upgrade cosmjs-types to 0.7. - @cosmjs/tendermint-rpc: Remove unused `index` field from `RpcTxEvent` and `TxEvent`. This is unset starting with Tendermint 0.34. - @cosmjs/proto-signing: Make input and output of `decodePubkey` non-optional diff --git a/packages/cli/package.json b/packages/cli/package.json index 599fa6bc..1e4616b6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -53,7 +53,7 @@ "axios": "^0.21.2", "babylon": "^6.18.0", "chalk": "^4", - "cosmjs-types": "^0.6.0", + "cosmjs-types": "^0.7.1", "diff": "^4", "recast": "^0.20", "ts-node": "^8", diff --git a/packages/cosmwasm-stargate/package.json b/packages/cosmwasm-stargate/package.json index b6785b82..994a2366 100644 --- a/packages/cosmwasm-stargate/package.json +++ b/packages/cosmwasm-stargate/package.json @@ -46,7 +46,7 @@ "@cosmjs/stargate": "workspace:^", "@cosmjs/tendermint-rpc": "workspace:^", "@cosmjs/utils": "workspace:^", - "cosmjs-types": "^0.6.0", + "cosmjs-types": "^0.7.1", "long": "^4.0.0", "pako": "^2.0.2" }, diff --git a/packages/proto-signing/package.json b/packages/proto-signing/package.json index 24f706cd..8fd1271a 100644 --- a/packages/proto-signing/package.json +++ b/packages/proto-signing/package.json @@ -44,7 +44,7 @@ "@cosmjs/encoding": "workspace:^", "@cosmjs/math": "workspace:^", "@cosmjs/utils": "workspace:^", - "cosmjs-types": "^0.6.0", + "cosmjs-types": "^0.7.1", "long": "^4.0.0" }, "devDependencies": { diff --git a/packages/stargate/package.json b/packages/stargate/package.json index 5c56b338..33023397 100644 --- a/packages/stargate/package.json +++ b/packages/stargate/package.json @@ -46,7 +46,7 @@ "@cosmjs/stream": "workspace:^", "@cosmjs/tendermint-rpc": "workspace:^", "@cosmjs/utils": "workspace:^", - "cosmjs-types": "^0.6.0", + "cosmjs-types": "^0.7.1", "long": "^4.0.0", "protobufjs": "~6.11.3", "xstream": "^11.14.0" diff --git a/packages/stargate/src/modules/ibc/aminomessages.spec.ts b/packages/stargate/src/modules/ibc/aminomessages.spec.ts index f4d7a636..3eda0649 100644 --- a/packages/stargate/src/modules/ibc/aminomessages.spec.ts +++ b/packages/stargate/src/modules/ibc/aminomessages.spec.ts @@ -20,6 +20,7 @@ describe("AminoTypes", () => { revisionNumber: Long.fromString("456", true), }, timeoutTimestamp: Long.fromString("789", true), + memo: "", }; const aminoTypes = new AminoTypes(createIbcAminoConverters()); const aminoMsg = aminoTypes.toAmino({ @@ -56,6 +57,7 @@ describe("AminoTypes", () => { revisionNumber: Long.UZERO, }, timeoutTimestamp: Long.UZERO, + memo: "", }; const aminoTypes = new AminoTypes(createIbcAminoConverters()); const aminoMsg = aminoTypes.toAmino({ @@ -89,6 +91,7 @@ describe("AminoTypes", () => { receiver: "cosmos10dyr9899g6t0pelew4nvf4j5c3jcgv0r73qga5", timeoutHeight: undefined, timeoutTimestamp: Long.UZERO, + memo: "", }; const aminoMsg = new AminoTypes(createIbcAminoConverters()).toAmino({ typeUrl: "/ibc.applications.transfer.v1.MsgTransfer", @@ -139,6 +142,7 @@ describe("AminoTypes", () => { revisionNumber: Long.fromString("456", true), }, timeoutTimestamp: Long.fromString("789", true), + memo: "", }; expect(msg).toEqual({ typeUrl: "/ibc.applications.transfer.v1.MsgTransfer", @@ -174,6 +178,7 @@ describe("AminoTypes", () => { revisionNumber: Long.UZERO, }, timeoutTimestamp: Long.UZERO, + memo: "", }; expect(msg).toEqual({ typeUrl: "/ibc.applications.transfer.v1.MsgTransfer", diff --git a/packages/stargate/src/modules/ibc/aminomessages.ts b/packages/stargate/src/modules/ibc/aminomessages.ts index 18f8d6b7..951e2f9e 100644 --- a/packages/stargate/src/modules/ibc/aminomessages.ts +++ b/packages/stargate/src/modules/ibc/aminomessages.ts @@ -95,20 +95,21 @@ export function createIbcAminoConverters(): AminoConverters { receiver, timeout_height, timeout_timestamp, - }: AminoMsgTransfer["value"]): MsgTransfer => ({ - sourcePort: source_port, - sourceChannel: source_channel, - token: token, - sender: sender, - receiver: receiver, - timeoutHeight: timeout_height - ? { - revisionHeight: Long.fromString(timeout_height.revision_height || "0", true), - revisionNumber: Long.fromString(timeout_height.revision_number || "0", true), - } - : undefined, - timeoutTimestamp: Long.fromString(timeout_timestamp || "0", true), - }), + }: AminoMsgTransfer["value"]): MsgTransfer => + MsgTransfer.fromPartial({ + sourcePort: source_port, + sourceChannel: source_channel, + token: token, + sender: sender, + receiver: receiver, + timeoutHeight: timeout_height + ? { + revisionHeight: Long.fromString(timeout_height.revision_height || "0", true), + revisionNumber: Long.fromString(timeout_height.revision_number || "0", true), + } + : undefined, + timeoutTimestamp: Long.fromString(timeout_timestamp || "0", true), + }), }, }; } diff --git a/yarn.lock b/yarn.lock index e48c786e..4b7dbc0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -362,7 +362,7 @@ __metadata: axios: ^0.21.2 babylon: ^6.18.0 chalk: ^4 - cosmjs-types: ^0.6.0 + cosmjs-types: ^0.7.1 diff: ^4 eslint: ^7.5 eslint-config-prettier: ^8.3.0 @@ -408,7 +408,7 @@ __metadata: "@types/pako": ^1.0.1 "@typescript-eslint/eslint-plugin": ^5.54.0 "@typescript-eslint/parser": ^5.54.0 - cosmjs-types: ^0.6.0 + cosmjs-types: ^0.7.1 eslint: ^7.5 eslint-config-prettier: ^8.3.0 eslint-import-resolver-node: ^0.3.4 @@ -767,7 +767,7 @@ __metadata: "@types/node": ^15.0.1 "@typescript-eslint/eslint-plugin": ^5.54.0 "@typescript-eslint/parser": ^5.54.0 - cosmjs-types: ^0.6.0 + cosmjs-types: ^0.7.1 eslint: ^7.5 eslint-config-prettier: ^8.3.0 eslint-import-resolver-node: ^0.3.4 @@ -864,7 +864,7 @@ __metadata: "@types/node": ^15.0.1 "@typescript-eslint/eslint-plugin": ^5.54.0 "@typescript-eslint/parser": ^5.54.0 - cosmjs-types: ^0.6.0 + cosmjs-types: ^0.7.1 eslint: ^7.5 eslint-config-prettier: ^8.3.0 eslint-import-resolver-node: ^0.3.4 @@ -2933,13 +2933,13 @@ __metadata: languageName: unknown linkType: soft -"cosmjs-types@npm:^0.6.0": - version: 0.6.0 - resolution: "cosmjs-types@npm:0.6.0" +"cosmjs-types@npm:^0.7.1": + version: 0.7.1 + resolution: "cosmjs-types@npm:0.7.1" dependencies: long: ^4.0.0 protobufjs: ~6.11.2 - checksum: 06000f10d931bbd23381a2303337f6c203add988d2e4e63307a0b920b2c317197d3e17d4fc535e55e7fdc211e472ee3dff18847bb7f42704d194370a1c6ed581 + checksum: 533d56d076a39fea98cac766ef965e92cc21e8de27cbebdd7396526c67167cef3aff683675337e95a21de212beedac8338a9e5405367115f68eb97cce2320aa8 languageName: node linkType: hard