Add gov msg vote v1

Author: lebascou

jest.config.js

@@ -14,4 +14,7 @@ module.exports = {
         },
     },
     testTimeout: 240000,
+    moduleNameMapper: {
+        '@ledgerhq/devices/hid-framing': '@ledgerhq/devices/lib/hid-framing',
+    },
 };

package.json

@@ -49,14 +49,14 @@
         "@cosmjs/stargate": "0.30.1",
         "@cosmjs/tendermint-rpc": "0.30.1",
         "@cosmjs/utils": "0.30.1",
-        "@ledgerhq/hw-app-cosmos": "^6.27.10",
-        "@ledgerhq/hw-transport": "^6.27.10",
+        "@ledgerhq/hw-app-cosmos": "^6.28.1",
+        "@ledgerhq/hw-transport": "^6.28.4",
         "@types/crypto-js": "^4.1.1",
         "@types/ledgerhq__hw-transport": "^4.21.4",
         "@types/uuid": "^9.0.0",
         "crypto-browserify": "^3.12.0",
         "crypto-js": "^4.1.1",
-        "long": "^5.2.3",
+        "long": "^4.0.0",
         "uuid": "^9.0.0"
     },
     "optionalDependencies": {},

src/registry/aminoTypes.ts

@@ -11,6 +11,7 @@ import { assertDefinedAndNotNull } from '@cosmjs/utils';
 import { AminoMsg, Coin } from '@cosmjs/amino';
 import Long from 'long';
 
+import { MsgVote } from '../codec/cosmos/gov/v1/tx';
 import { MsgDeposit as MsgDepositDfract } from '../codec/lum-network/dfract/tx';
 import {
     MsgDeposit as MsgMillionsDeposit,
@@ -19,6 +20,17 @@ import {
     MsgWithdrawDepositRetry as MsgMillionsWithdrawDepositRetry,
     MsgClaimPrize as MsgMillionsClaimPrize,
 } from '../codec/lum-network/millions/tx';
+
+export interface AminoMsgGovVote extends AminoMsg {
+    readonly type: 'cosmos-sdk/v1/MsgVote';
+    readonly value: {
+        readonly proposal_id: string;
+        readonly voter: string;
+        readonly option: number;
+        readonly metadata?: string;
+    };
+}
+
 export interface AminoMsgDepositDfract extends AminoMsg {
     readonly type: 'lum-network/MsgDeposit';
     readonly value: {
@@ -82,11 +94,30 @@ export const createDefaultAminoTypes = (): AminoConverters => {
         ...createAuthzAminoConverters(),
         ...createDistributionAminoConverters(),
         ...createGovAminoConverters(),
+        ...createGovV1AminoConverters(),
         ...createStakingAminoConverters(),
         ...createIbcAminoConverters(),
     };
 };
 
+const createGovV1AminoConverters = (): AminoConverters => ({
+    '/cosmos.gov.v1.MsgVote': {
+        aminoType: 'cosmos-sdk/v1/MsgVote',
+        toAmino: ({ proposalId, voter, option, metadata }: MsgVote): AminoMsgGovVote['value'] => ({
+            proposal_id: proposalId.toString(),
+            voter,
+            option,
+            metadata: metadata.length > 0 ? metadata : undefined,
+        }),
+        fromAmino: ({ proposal_id, voter, option, metadata }: AminoMsgGovVote['value']): MsgVote => ({
+            proposalId: Long.fromString(proposal_id),
+            voter,
+            option,
+            metadata: metadata || '',
+        }),
+    },
+});
+
 const createDfractAminoConverters = (): AminoConverters => ({
     '/lum.network.dfract.MsgDeposit': {
         aminoType: 'lum-network/MsgDeposit',

src/utils/accounts.ts

@@ -15,7 +15,7 @@ function uint64FromProto(input: Long) {
 
 function accountFromBaseAccount(input: BaseAccount): LumTypes.Account {
     const { address, pubKey, accountNumber, sequence } = input;
-    const pubkey = decodePubkey(pubKey);
+    const pubkey = decodePubkey(pubKey as Any);
     return {
         address: address,
         pubkey: pubkey,

src/utils/commons.ts

@@ -18,11 +18,11 @@ export const sortJSON = <T>(jsonObj: T): T => {
         return jsonObj;
     }
 
-    let keys = Object.keys(jsonObj) as Array<keyof T>;
+    let keys = Object.keys(jsonObj as object) as Array<keyof T>;
     keys = keys.sort();
     const newObject: Partial<T> = {};
     for (let i = 0; i < keys.length; i++) {
-        newObject[keys[i]] = sortJSON(jsonObj[keys[i]]);
+        newObject[keys[i]] = sortJSON((jsonObj as T)[keys[i]]);
     }
     return newObject as T;
 };

tests/wallet.test.ts

@@ -1,7 +1,7 @@
 import { AccountData, DirectSignResponse, OfflineDirectSigner } from '@cosmjs/proto-signing';
 
 import { SignDoc } from '../src/codec/cosmos/tx/v1beta1/tx';
-import { LumWallet, LumWalletFactory, LumUtils, LumConstants, LumMessages, LumRegistry, LumAminoRegistry } from '../src';
+import { LumWallet, LumWalletFactory, LumUtils, LumConstants, LumMessages, LumAminoRegistry } from '../src';
 import { AminoSignResponse, encodeSecp256k1Signature, OfflineAminoSigner, StdSignDoc } from '@cosmjs/amino';
 import { SignMode } from '../src/codec/cosmos/tx/signing/v1beta1/signing';
 

yarn.lock

@@ -1437,7 +1437,7 @@
   resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.6.tgz#f89c82c91c2930f34bc3e0d86a27ec7b6e6e4f5f"
   integrity sha512-D+r2B09vaRO06wfGoss+rNgwqWSoK0bCtsaJWzlD2hv1zxTtucqVtSztbRFypIqxWTCb3ix5Nh2dWHEJVTp2Xw==
 
-"@ledgerhq/hw-app-cosmos@^6.27.10":
+"@ledgerhq/hw-app-cosmos@^6.28.1":
   version "6.28.1"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-cosmos/-/hw-app-cosmos-6.28.1.tgz#7b0c05d40a35cced4e09967eec9a85c530eb0b3e"
   integrity sha512-xlWrkgyuKtmljAtEH9ww7mS8Wv7ek+Ejy8m+XyG7J0Lb88SuXMfwZzj379v5OsSykFqQ4lrWSbA7kG1la5FMBQ==
@@ -1471,7 +1471,7 @@
     node-hid "^2.1.2"
     usb "^1.7.0"
 
-"@ledgerhq/hw-transport@^6.27.10", "@ledgerhq/hw-transport@^6.28.4":
+"@ledgerhq/hw-transport@^6.28.4":
   version "6.28.4"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.4.tgz#c2fc5bff4fca71ac44f069b775d33d0b1b5d9000"
   integrity sha512-fB2H92YQjidmae2GFCmOGPwkZWk0lvTu0tlLlzfiY0wRheAG+DEgjnqhdU8wmydkPLIj0WUjRgldtnJtg/a2iQ==
@@ -4094,11 +4094,6 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-long@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
-  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"