Bump dependencies, fix code accordingly

Author: Segfaultd

package.json

@@ -40,20 +40,20 @@
         "postdefine-proto": "prettier --write \"src/codec/**/*.ts\""
     },
     "dependencies": {
-        "@cosmjs/amino": "0.30.1",
-        "@cosmjs/crypto": "0.30.1",
-        "@cosmjs/encoding": "0.30.1",
-        "@cosmjs/json-rpc": "^0.30.1",
-        "@cosmjs/math": "0.30.1",
-        "@cosmjs/proto-signing": "0.30.1",
-        "@cosmjs/stargate": "0.30.1",
-        "@cosmjs/tendermint-rpc": "0.30.1",
-        "@cosmjs/utils": "0.30.1",
-        "@ledgerhq/hw-app-cosmos": "^6.28.1",
-        "@ledgerhq/hw-transport": "^6.28.4",
+        "@cosmjs/amino": "0.31.0",
+        "@cosmjs/crypto": "0.31.0",
+        "@cosmjs/encoding": "0.31.0",
+        "@cosmjs/json-rpc": "^0.31.0",
+        "@cosmjs/math": "0.31.0",
+        "@cosmjs/proto-signing": "0.31.0",
+        "@cosmjs/stargate": "0.31.0",
+        "@cosmjs/tendermint-rpc": "0.31.0",
+        "@cosmjs/utils": "0.31.0",
+        "@ledgerhq/hw-app-cosmos": "^6.28.2",
+        "@ledgerhq/hw-transport": "^6.28.5",
         "@types/crypto-js": "^4.1.1",
         "@types/ledgerhq__hw-transport": "^4.21.4",
-        "@types/uuid": "^9.0.0",
+        "@types/uuid": "^9.0.2",
         "crypto-browserify": "^3.12.0",
         "crypto-js": "^4.1.1",
         "long": "^4.0.0",

src/extensions/ibc.ts

@@ -426,36 +426,36 @@ export function setupIbcExtension(base: QueryClient): IbcExtension {
             },
             verified: {
                 channel: {
-                    channel: async (portId: string, channelId: string) => {
-                        // keeper: https://github.com/cosmos/cosmos-sdk/blob/3bafd8255a502e5a9cee07391cf8261538245dfd/x/ibc/04-channel/keeper/keeper.go#L55-L65
-                        // key: https://github.com/cosmos/cosmos-sdk/blob/ef0a7344af345882729598bc2958a21143930a6b/x/ibc/24-host/keys.go#L117-L120
-                        const key = toAscii(`channelEnds/ports/${portId}/channels/${channelId}`);
-                        const responseData = await base.queryVerified('ibc', key);
-                        return responseData.length ? Channel.decode(responseData) : null;
-                    },
-                    packetCommitment: async (portId: string, channelId: string, sequence: number) => {
-                        // keeper: https://github.com/cosmos/cosmos-sdk/blob/3bafd8255a502e5a9cee07391cf8261538245dfd/x/ibc/04-channel/keeper/keeper.go#L128-L133
-                        // key: https://github.com/cosmos/cosmos-sdk/blob/ef0a7344af345882729598bc2958a21143930a6b/x/ibc/24-host/keys.go#L183-L185
-                        const key = toAscii(`commitments/ports/${portId}/channels/${channelId}/packets/${sequence}`);
-                        const responseData = await base.queryVerified('ibc', key);
-                        // keeper code doesn't parse, but returns raw
-                        return responseData;
-                    },
-                    packetAcknowledgement: async (portId: string, channelId: string, sequence: number) => {
-                        // keeper: https://github.com/cosmos/cosmos-sdk/blob/3bafd8255a502e5a9cee07391cf8261538245dfd/x/ibc/04-channel/keeper/keeper.go#L159-L166
-                        // key: https://github.com/cosmos/cosmos-sdk/blob/ef0a7344af345882729598bc2958a21143930a6b/x/ibc/24-host/keys.go#L153-L156
-                        const key = toAscii(`acks/ports/${portId}/channels/${channelId}/acknowledgements/${sequence}`);
-                        const responseData = await base.queryVerified('ibc', key);
-                        // keeper code doesn't parse, but returns raw
-                        return responseData;
-                    },
-                    nextSequenceReceive: async (portId: string, channelId: string) => {
-                        // keeper: https://github.com/cosmos/cosmos-sdk/blob/3bafd8255a502e5a9cee07391cf8261538245dfd/x/ibc/04-channel/keeper/keeper.go#L92-L101
-                        // key: https://github.com/cosmos/cosmos-sdk/blob/ef0a7344af345882729598bc2958a21143930a6b/x/ibc/24-host/keys.go#L133-L136
-                        const key = toAscii(`seqAcks/ports/${portId}/channels/${channelId}/nextSequenceAck`);
-                        const responseData = await base.queryVerified('ibc', key);
-                        return responseData.length ? Uint64.fromBytes(responseData).toNumber() : null;
-                    },
+                  channel: async (portId: string, channelId: string) => {
+                    // keeper: https://github.com/cosmos/cosmos-sdk/blob/3bafd8255a502e5a9cee07391cf8261538245dfd/x/ibc/04-channel/keeper/keeper.go#L55-L65
+                    // key: https://github.com/cosmos/cosmos-sdk/blob/ef0a7344af345882729598bc2958a21143930a6b/x/ibc/24-host/keys.go#L117-L120
+                    const key = toAscii(`channelEnds/ports/${portId}/channels/${channelId}`);
+                    const { value } = await base.queryStoreVerified("ibc", key);
+                    return value.length ? Channel.decode(value) : null;
+                  },
+                  packetCommitment: async (portId: string, channelId: string, sequence: number) => {
+                    // keeper: https://github.com/cosmos/cosmos-sdk/blob/3bafd8255a502e5a9cee07391cf8261538245dfd/x/ibc/04-channel/keeper/keeper.go#L128-L133
+                    // key: https://github.com/cosmos/cosmos-sdk/blob/ef0a7344af345882729598bc2958a21143930a6b/x/ibc/24-host/keys.go#L183-L185
+                    const key = toAscii(`commitments/ports/${portId}/channels/${channelId}/packets/${sequence}`);
+                    const { value } = await base.queryStoreVerified("ibc", key);
+                    // keeper code doesn't parse, but returns raw
+                    return value;
+                  },
+                  packetAcknowledgement: async (portId: string, channelId: string, sequence: number) => {
+                    // keeper: https://github.com/cosmos/cosmos-sdk/blob/3bafd8255a502e5a9cee07391cf8261538245dfd/x/ibc/04-channel/keeper/keeper.go#L159-L166
+                    // key: https://github.com/cosmos/cosmos-sdk/blob/ef0a7344af345882729598bc2958a21143930a6b/x/ibc/24-host/keys.go#L153-L156
+                    const key = toAscii(`acks/ports/${portId}/channels/${channelId}/acknowledgements/${sequence}`);
+                    const { value } = await base.queryStoreVerified("ibc", key);
+                    // keeper code doesn't parse, but returns raw
+                    return value;
+                  },
+                  nextSequenceReceive: async (portId: string, channelId: string) => {
+                    // keeper: https://github.com/cosmos/cosmos-sdk/blob/3bafd8255a502e5a9cee07391cf8261538245dfd/x/ibc/04-channel/keeper/keeper.go#L92-L101
+                    // key: https://github.com/cosmos/cosmos-sdk/blob/ef0a7344af345882729598bc2958a21143930a6b/x/ibc/24-host/keys.go#L133-L136
+                    const key = toAscii(`seqAcks/ports/${portId}/channels/${channelId}/nextSequenceAck`);
+                    const { value } = await base.queryStoreVerified("ibc", key);
+                    return value.length ? Uint64.fromBytes(value).toNumber() : null;
+                  },
                 },
             },
         },

src/extensions/utils.ts

@@ -10,10 +10,11 @@ export interface ProtobufRpcClient {
 
 export function createProtobufRpcClient(base: QueryClient): ProtobufRpcClient {
     return {
-        request: (service: string, method: string, data: Uint8Array): Promise<Uint8Array> => {
+        request: async (service: string, method: string, data: Uint8Array): Promise<Uint8Array> => {
             const path = `/${service}/${method}`;
-            return base.queryUnverified(path, data);
-        },
+            const response = await base.queryAbci(path, data, undefined);
+            return response.value;
+          },
     };
 }