Upgrade dependencies and add types in Amino types

ThibaultJRD · ThibaultJRD · commit 080ef93f2754 · 2023-02-07T20:04:39.000+01:00
diff --git a/docs/lib/classes/lumledgerwallet.md b/docs/lib/classes/lumledgerwallet.md
@@ -193,7 +193,7 @@ ___
 
 ### signTransaction
 
-▸ **signTransaction**(`doc`): `Promise`<[[`SignDoc`](../interfaces/LumTypes.SignDoc.md), `Uint8Array`]\>
+▸ **signTransaction**(`doc`): `Promise`<[`SignDoc`, `Uint8Array`]\>
 
 Sign a transaction document using a LumWallet
 
@@ -205,7 +205,7 @@ Sign a transaction document using a LumWallet
 
 #### Returns
 
-`Promise`<[[`SignDoc`](../interfaces/LumTypes.SignDoc.md), `Uint8Array`]\>
+`Promise`<[`SignDoc`, `Uint8Array`]\>
 
 #### Overrides
 
diff --git a/docs/lib/classes/lumpaperwallet.md b/docs/lib/classes/lumpaperwallet.md
@@ -189,7 +189,7 @@ ___
 
 ### signTransaction
 
-▸ **signTransaction**(`doc`): `Promise`<[[`SignDoc`](../interfaces/LumTypes.SignDoc.md), `Uint8Array`]\>
+▸ **signTransaction**(`doc`): `Promise`<[`SignDoc`, `Uint8Array`]\>
 
 Sign a transaction document using a LumWallet
 
@@ -201,7 +201,7 @@ Sign a transaction document using a LumWallet
 
 #### Returns
 
-`Promise`<[[`SignDoc`](../interfaces/LumTypes.SignDoc.md), `Uint8Array`]\>
+`Promise`<[`SignDoc`, `Uint8Array`]\>
 
 #### Overrides
 
diff --git a/docs/lib/classes/lumwallet.md b/docs/lib/classes/lumwallet.md
@@ -137,7 +137,7 @@ ___
 
 ### signTransaction
 
-▸ `Abstract` **signTransaction**(`doc`): `Promise`<[[`SignDoc`](../interfaces/LumTypes.SignDoc.md), `Uint8Array`]\>
+▸ `Abstract` **signTransaction**(`doc`): `Promise`<[`SignDoc`, `Uint8Array`]\>
 
 Sign a transaction document using a LumWallet
 
@@ -149,7 +149,7 @@ Sign a transaction document using a LumWallet
 
 #### Returns
 
-`Promise`<[[`SignDoc`](../interfaces/LumTypes.SignDoc.md), `Uint8Array`]\>
+`Promise`<[`SignDoc`, `Uint8Array`]\>
 
 ___
 
diff --git a/docs/lib/interfaces/lumtypes.signdoc.md b/docs/lib/interfaces/lumtypes.signdoc.md
diff --git a/docs/lib/modules/lumtypes.md b/docs/lib/modules/lumtypes.md
@@ -16,15 +16,24 @@
 - [LogAttribute](../interfaces/LumTypes.LogAttribute.md)
 - [LogEvent](../interfaces/LumTypes.LogEvent.md)
 - [PubKey](../interfaces/LumTypes.PubKey.md)
-- [SignDoc](../interfaces/LumTypes.SignDoc.md)
 - [SignMsg](../interfaces/LumTypes.SignMsg.md)
 - [Tx](../interfaces/LumTypes.Tx.md)
 
+### Type aliases
+
+- [SignDoc](LumTypes.md#signdoc)
+
 ### Variables
 
 - [PubKey](LumTypes.md#pubkey)
 - [Tx](LumTypes.md#tx)
 
+## Type aliases
+
+### SignDoc
+
+Ƭ **SignDoc**: `SignDocCosmos`
+
 ## Variables
 
 ### PubKey
diff --git a/docs/lib/modules/lumutils.md b/docs/lib/modules/lumutils.md
@@ -230,7 +230,7 @@ ___
 
 ### generateSignDoc
 
-▸ `Const` **generateSignDoc**(`doc`, `signerIdx`, `signMode`): [`SignDoc`](../interfaces/LumTypes.SignDoc.md)
+▸ `Const` **generateSignDoc**(`doc`, `signerIdx`, `signMode`): `SignDoc`
 
 Generate transaction doc to be signed
 
@@ -244,7 +244,7 @@ Generate transaction doc to be signed
 
 #### Returns
 
-[`SignDoc`](../interfaces/LumTypes.SignDoc.md)
+`SignDoc`
 
 ___
 
@@ -258,7 +258,7 @@ Generate transaction sign doc bytes used to sign the transaction
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `signDoc` | [`SignDoc`](../interfaces/LumTypes.SignDoc.md) | sign doc (as generated by the generateSignDoc function) |
+| `signDoc` | `SignDoc` | sign doc (as generated by the generateSignDoc function) |
 
 #### Returns
 
@@ -295,7 +295,7 @@ Generate transaction bytes to broadcast
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `signDoc` | [`SignDoc`](../interfaces/LumTypes.SignDoc.md) | sign doc (as generated by the generateSignDoc function) |
+| `signDoc` | `SignDoc` | sign doc (as generated by the generateSignDoc function) |
 | `signatures` | `Uint8Array`[] | transaction signatures (as generated by the generateSignature function) |
 
 #### Returns
diff --git a/package.json b/package.json
@@ -35,28 +35,28 @@
         "format": "prettier --write '**/*.{js,jsx,ts,tsx,css,json,md,html,yml}'",
         "bump": "npm version",
         "preget-proto": "rm -rf proto",
-        "get-proto": "COSMOS_REF=v0.46.7 IBC_REF=v5.0.1 LUM_REF=v1.3.0 sh ./scripts/get-proto.sh",
+        "get-proto": "COSMOS_REF=v0.46.7 IBC_REF=v5.0.1 LUM_REF=v1.3.1 sh ./scripts/get-proto.sh",
         "define-proto": "sh ./scripts/define-proto.sh",
         "postdefine-proto": "prettier --write \"src/codec/**/*.ts\""
     },
     "dependencies": {
-        "@cosmjs/amino": "0.26.5",
-        "@cosmjs/crypto": "0.26.5",
-        "@cosmjs/encoding": "0.26.5",
-        "@cosmjs/math": "0.26.5",
-        "@cosmjs/proto-signing": "0.26.5",
-        "@cosmjs/stargate": "0.26.5",
-        "@cosmjs/tendermint-rpc": "0.26.5",
-        "@cosmjs/utils": "0.26.5",
-        "@ledgerhq/hw-app-cosmos": "^6.11.2",
-        "@ledgerhq/hw-transport": "^6.11.2",
-        "@types/crypto-js": "^4.0.2",
+        "@cosmjs/amino": "0.29.5",
+        "@cosmjs/crypto": "0.29.5",
+        "@cosmjs/encoding": "0.29.5",
+        "@cosmjs/math": "0.29.5",
+        "@cosmjs/proto-signing": "0.29.5",
+        "@cosmjs/stargate": "0.29.5",
+        "@cosmjs/tendermint-rpc": "0.29.5",
+        "@cosmjs/utils": "0.29.5",
+        "@ledgerhq/hw-app-cosmos": "^6.27.10",
+        "@ledgerhq/hw-transport": "^6.27.10",
+        "@types/crypto-js": "^4.1.1",
         "@types/ledgerhq__hw-transport": "^4.21.4",
-        "@types/uuid": "^8.3.1",
+        "@types/uuid": "^9.0.0",
         "crypto-browserify": "^3.12.0",
         "crypto-js": "^4.1.1",
-        "long": "^4.0.0",
-        "uuid": "^8.3.2"
+        "long": "^5.2.1",
+        "uuid": "^9.0.0"
     },
     "optionalDependencies": {},
     "devDependencies": {
diff --git a/src/client/LumClient.ts b/src/client/LumClient.ts
@@ -29,6 +29,7 @@ import {
 import { setupSlashingExtension, SlashingExtension } from '../extensions/slashing';
 import { AuthzExtension, setupAuthzExtension } from '../extensions/authz';
 import { FeegrantExtension, setupFeegrantExtension } from '../extensions/feegrant';
+import { createAminoTypes } from '../registry/aminoTypes';
 
 export class LumClient {
     readonly tmClient: Tendermint34Client;
@@ -98,6 +99,8 @@ export class LumClient {
      */
     static connect = async (endpoint: string): Promise<LumClient> => {
         const tmClient = await Tendermint34Client.connect(endpoint);
+        console.log(createAminoTypes());
+
         return new LumClient(tmClient);
     };
 
@@ -127,8 +130,7 @@ export class LumClient {
      * Get the connected node status information
      */
     status = async (): Promise<StatusResponse> => {
-        const status = await this.tmClient.status();
-        return status;
+        return this.tmClient.status();
     };
 
     /**
@@ -194,8 +196,7 @@ export class LumClient {
      * @param address wallet address
      */
     getAllBalances = async (address: string): Promise<LumTypes.Coin[]> => {
-        const balances = await this.queryClient.bank.allBalances(address);
-        return balances;
+        return this.queryClient.bank.allBalances(address);
     };
 
     /**
@@ -212,8 +213,7 @@ export class LumClient {
      * Get all coins supplies
      */
     getAllSupplies = async (): Promise<LumTypes.Coin[]> => {
-        const supplies = await this.queryClient.bank.totalSupply();
-        return supplies;
+        return this.queryClient.bank.totalSupply();
     };
 
     /**
@@ -223,8 +223,7 @@ export class LumClient {
      * @param includeProof whether or not to include proof of the transaction inclusion in the block
      */
     getTx = async (hash: Uint8Array, includeProof?: boolean): Promise<LumTypes.TxResponse | null> => {
-        const result = await this.tmClient.tx({ hash: hash, prove: includeProof });
-        return result;
+        return this.tmClient.tx({ hash: hash, prove: includeProof });
     };
 
     /**
@@ -274,7 +273,7 @@ export class LumClient {
      * @param doc document to sign
      */
     signTx = async (wallet: LumWallet | LumWallet[], doc: LumTypes.Doc): Promise<Uint8Array> => {
-        let wallets: LumWallet[] = [];
+        let wallets: LumWallet[];
         if (Array.isArray(wallet)) {
             wallets = wallet;
         } else {
@@ -312,8 +311,7 @@ export class LumClient {
      * @param tx signed transaction to broadcast
      */
     broadcastTx = async (tx: Uint8Array): Promise<LumTypes.BroadcastTxCommitResponse> => {
-        const response = await this.tmClient.broadcastTxCommit({ tx });
-        return response;
+        return this.tmClient.broadcastTxCommit({ tx });
     };
 
     /**
diff --git a/src/messages/gov/MsgVote.ts b/src/messages/gov/MsgVote.ts
@@ -13,7 +13,7 @@ export const BuildMsgVote = (proposalId: Long, voter: string, option: VoteOption
             proposalId,
             voter,
             option,
-            metadata
+            metadata,
         } as MsgVote,
     };
 };
diff --git a/src/registry/aminoTypes.ts b/src/registry/aminoTypes.ts
@@ -1,4 +1,14 @@
-import { AminoConverter } from '@cosmjs/stargate';
+import {
+    AminoConverter,
+    createAuthzAminoConverters,
+    createBankAminoConverters,
+    createDistributionAminoConverters,
+    createFeegrantAminoConverters,
+    createGovAminoConverters,
+    createIbcAminoConverters,
+    createStakingAminoConverters,
+    createVestingAminoConverters,
+} from '@cosmjs/stargate';
 import { MsgDeposit as MsgDepositDfract } from '../codec/lum-network/dfract/tx';
 import { AminoMsg, Coin } from '@cosmjs/amino';
 
@@ -14,8 +24,22 @@ export function isAminoMsgDeposit(msg: AminoMsg): msg is AminoMsgDepositDfract {
     return msg.type === 'lum-network/MsgDeposit';
 }
 
-export const createAminoTypes = (): Record<string, AminoConverter> => {
+export const createDefaultAminoTypes = (): { [p: string]: AminoConverter | 'not_supported_by_chain' } => {
     return {
+        ...createBankAminoConverters(),
+        ...createAuthzAminoConverters(),
+        ...createDistributionAminoConverters(),
+        ...createGovAminoConverters(),
+        ...createStakingAminoConverters('lum'),
+        ...createIbcAminoConverters(),
+        ...createFeegrantAminoConverters(),
+        ...createVestingAminoConverters(),
+    };
+};
+
+export const createAminoTypes = (): { [p: string]: AminoConverter | 'not_supported_by_chain' } => {
+    return {
+        ...createDefaultAminoTypes(),
         // DFract
 
         '/lum.network.dfract.MsgDeposit': {
diff --git a/src/types/SignDoc.ts b/src/types/SignDoc.ts
@@ -1,20 +1,3 @@
-export interface SignDoc {
-    /**
-     * body_bytes is protobuf serialization of a TxBody that matches the
-     * representation in TxRaw.
-     */
-    bodyBytes: Uint8Array;
-    /**
-     * auth_info_bytes is a protobuf serialization of an AuthInfo that matches the
-     * representation in TxRaw.
-     */
-    authInfoBytes: Uint8Array;
-    /**
-     * chain_id is the unique identifier of the chain this transaction targets.
-     * It prevents signed transactions from being used on another chain by an
-     * attacker
-     */
-    chainId: string;
-    /** account_number is the account number of the account in state */
-    accountNumber: Long;
-}
+import { SignDoc as SignDocCosmos } from '../codec/cosmos/tx/v1beta1/tx';
+
+export type SignDoc = SignDocCosmos;
diff --git a/src/utils/encoding.ts b/src/utils/encoding.ts
@@ -1,5 +1,5 @@
 import * as hexEncoding from 'crypto-js/enc-hex';
-import { Bech32, toHex, fromHex, toBase64, fromBase64, toAscii, fromAscii, toUtf8, fromUtf8, toRfc3339, fromRfc3339 } from '@cosmjs/encoding';
+import { toHex, fromHex, toBase64, fromBase64, toAscii, fromAscii, toUtf8, fromUtf8, toRfc3339, fromRfc3339, fromBech32, toBech32 } from '@cosmjs/encoding';
 import { sha256 } from '@cosmjs/crypto';
 import SHA3 from 'crypto-js/sha3';
 
@@ -72,4 +72,4 @@ export const toJSON = (data: unknown): unknown => {
     return data;
 };
 
-export { sha256, Bech32, toHex, fromHex, toBase64, fromBase64, toAscii, fromAscii, toUtf8, fromUtf8, toRfc3339, fromRfc3339 };
+export { sha256, toHex, fromHex, toBase64, fromBase64, toAscii, fromAscii, toUtf8, fromUtf8, toRfc3339, fromRfc3339, fromBech32, toBech32 };
diff --git a/src/utils/keys.ts b/src/utils/keys.ts
@@ -2,7 +2,7 @@ import { PubKey } from '../codec/cosmos/crypto/secp256k1/keys';
 import { Any } from '../codec/google/protobuf/any';
 import { Secp256k1, sha256, ripemd160, EnglishMnemonic, Bip39, Slip10, Slip10Curve, stringToPath, Random } from '@cosmjs/crypto';
 
-import { Bech32 } from './encoding';
+import { fromBech32, toBech32 } from './encoding';
 import { LumBech32PrefixAccAddr, getLumHdPath, PrivateKeyLength } from '../constants';
 
 /**
@@ -17,7 +17,7 @@ export const getAddressFromPublicKey = (publicKey: Uint8Array, prefix = LumBech3
     }
     const hash1 = sha256(publicKey);
     const hash2 = ripemd160(hash1);
-    return Bech32.encode(prefix, hash2);
+    return toBech32(prefix, hash2);
 };
 
 /**
@@ -80,7 +80,7 @@ export const generatePrivateKey = (): Uint8Array => {
  */
 export const isAddressValid = (address: string, prefix: string | undefined = LumBech32PrefixAccAddr): boolean => {
     try {
-        const decoded = Bech32.decode(address);
+        const decoded = fromBech32(address);
         return (!prefix || prefix === decoded.prefix) && decoded.data.length === 20;
     } catch (err) {
         return false;
diff --git a/src/utils/transactions.ts b/src/utils/transactions.ts
diff --git a/src/wallet/LumWallet.ts b/src/wallet/LumWallet.ts
diff --git a/tests/client.test.ts b/tests/client.test.ts
diff --git a/yarn.lock b/yarn.lock
