Stargate v0.25 upgrade

packages/cw20-wallet/package.json

@@ -21,10 +21,9 @@
     "@ant-design/icons": "^4.2.2",
     "@cosmicdapp/design": "^0.4.5",
     "@cosmicdapp/logic": "^0.4.5",
-    "@cosmjs/cosmwasm": "^0.24.0-alpha.22",
-    "@cosmjs/crypto": "^0.24.0-alpha.22",
-    "@cosmjs/launchpad": "^0.24.0-alpha.22",
-    "@cosmjs/math": "^0.24.0-alpha.22",
+    "@cosmjs/cosmwasm-stargate": "^0.25.6",
+    "@cosmjs/crypto": "^0.25.6",
+    "@cosmjs/math": "^0.25.6",
     "antd": "^4.5.4",
     "clipboard-copy": "^3.1.0",
     "formik": "^2.1.5",

packages/cw20-wallet/src/App/routes/Tokens/TokenList/index.tsx

@@ -1,5 +1,5 @@
 import { CW20, CW20Instance, useContracts, useSdk } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Decimal } from "@cosmjs/math";
 import { Typography } from "antd";
 import React, { useCallback, useEffect, useState } from "react";
@@ -49,7 +49,7 @@ function TokenList(): JSX.Element {
 
     client.getContracts(config.codeId).then((contracts) => {
       contracts.forEach((contract) => {
-        const newCw20contract = CW20(client).use(contract.address);
+        const newCw20contract = CW20(client).use(contract);
         addContract(newCw20contract);
       });
     });

packages/cw20-wallet/src/App/routes/TokensAdd/index.tsx

@@ -1,6 +1,6 @@
 import { BackButton, OperationResultState, PageLayout } from "@cosmicdapp/design";
 import { CW20, getErrorFromStackTrace, useContracts, useError, useSdk } from "@cosmicdapp/logic";
-import { Contract } from "@cosmjs/cosmwasm";
+import { Contract } from "@cosmjs/cosmwasm-stargate";
 import { Button, Typography } from "antd";
 import { Formik } from "formik";
 import { Form, FormItem, Input, Transfer } from "formik-antd";
@@ -28,11 +28,19 @@ function TokensAdd(): JSX.Element {
     const codeId = !Number.isNaN(Number(contract)) && Number(contract);
 
     if (codeId) {
-      getClient()
+      const client = getClient();
+      client
         .getContracts(codeId)
         .then((contracts) => {
-          setContracts(contracts);
-          setCodeId(codeId);
+          const contractsPromise = [];
+          contracts.forEach(contract => {
+            contractsPromise.push(client.getContract(contract));
+          });
+          Promise.all(contractsPromise)
+            .then((contracts) => {
+              setContracts(contracts);
+              setCodeId(codeId);
+            });
         })
         .catch(setError);
     } else {

packages/logic/package.json

@@ -29,13 +29,12 @@
     "prepare": "tsdx build"
   },
   "dependencies": {
-    "@cosmjs/cosmwasm-stargate": "^0.24.0-alpha.22",
-    "@cosmjs/crypto": "^0.24.0-alpha.22",
-    "@cosmjs/faucet-client": "^0.24.0-alpha.22",
-    "@cosmjs/launchpad": "^0.24.0-alpha.22",
-    "@cosmjs/ledger-amino": "^0.24.0-alpha.22",
-    "@cosmjs/math": "^0.24.0-alpha.22",
-    "@cosmjs/tendermint-rpc": "^0.24.0-alpha.22",
+    "@cosmjs/cosmwasm-stargate": "^0.25.6",
+    "@cosmjs/crypto": "^0.25.6",
+    "@cosmjs/faucet-client": "^0.25.6",
+    "@cosmjs/ledger-amino": "^0.25.6",
+    "@cosmjs/math": "^0.25.6",
+    "@cosmjs/tendermint-rpc": "^0.25.6",
     "@ledgerhq/hw-transport-webusb": "^5.39.1"
   },
   "peerDependencies": {

packages/logic/src/service/cw20.tsx

@@ -1,5 +1,5 @@
 import { SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 
 export type Expiration =
   | { readonly at_height: number }

packages/logic/src/service/sdk.ts

@@ -1,7 +1,8 @@
-import { CosmWasmFeeTable } from "@cosmjs/cosmwasm-launchpad";
+import { CosmWasmFeeTable } from "@cosmjs/cosmwasm-stargate";
 import { SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
 import { Bip39, Random } from "@cosmjs/crypto";
-import { GasLimits, GasPrice, makeCosmoshubPath, OfflineSigner, Secp256k1HdWallet } from "@cosmjs/launchpad";
+import { defaultGasLimits as defaultStargateGasLimits, GasLimits, GasPrice, makeCosmoshubPath, } from "@cosmjs/stargate";
+import { DirectSecp256k1HdWallet, OfflineSigner } from "@cosmjs/proto-signing";
 import { LedgerSigner } from "@cosmjs/ledger-amino";
 import {
   DistributionExtension,
@@ -10,7 +11,7 @@ import {
   setupStakingExtension,
   StakingExtension,
 } from "@cosmjs/stargate";
-import { adaptor34, Client as TendermintClient } from "@cosmjs/tendermint-rpc";
+import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
 import { AppConfig } from "../config";
 
@@ -37,7 +38,10 @@ export type WalletLoader = (chainId: string, addressPrefix?: string) => Promise<
 export async function loadOrCreateWallet(_chainId: string, addressPrefix?: string): Promise<OfflineSigner> {
   const mnemonic = loadOrCreateMnemonic();
   const hdPath = makeCosmoshubPath(0);
-  const wallet = await Secp256k1HdWallet.fromMnemonic(mnemonic, hdPath, addressPrefix);
+  const wallet = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic, {
+    hdPaths: [hdPath],
+    prefix: addressPrefix
+  });
   return wallet;
 }
 
@@ -64,6 +68,7 @@ export async function loadKeplrWallet(chainId: string): Promise<OfflineSigner> {
 // using a signing keyring generated from the given mnemonic
 export async function createClient(config: AppConfig, signer: OfflineSigner): Promise<SigningCosmWasmClient> {
   const gasLimits: GasLimits<CosmWasmFeeTable> = {
+    ...defaultStargateGasLimits,
     upload: 1500000,
     init: 600000,
     exec: 400000,
@@ -82,6 +87,6 @@ export async function createClient(config: AppConfig, signer: OfflineSigner): Pr
 export async function createStakingClient(
   apiUrl: string,
 ): Promise<QueryClient & StakingExtension & DistributionExtension> {
-  const tmClient = await TendermintClient.connect(apiUrl, adaptor34);
+  const tmClient = await Tendermint34Client.connect(apiUrl);
   return QueryClient.withExtensions(tmClient, setupStakingExtension, setupDistributionExtension);
 }

packages/logic/src/service/wallet.tsx

@@ -1,6 +1,7 @@
 import { SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
 import { FaucetClient } from "@cosmjs/faucet-client";
-import { Coin, OfflineSigner } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
+import { OfflineSigner } from "@cosmjs/proto-signing";
 import { QueryClient, StakingExtension, DistributionExtension } from "@cosmjs/stargate";
 import * as React from "react";
 import { useEffect, useState } from "react";

packages/logic/src/utils/currency.ts

@@ -1,4 +1,4 @@
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Decimal } from "@cosmjs/math";
 
 // NARROW NO-BREAK SPACE (U+202F)

packages/name-service/package.json

@@ -20,8 +20,8 @@
   "dependencies": {
     "@cosmicdapp/design": "^0.4.5",
     "@cosmicdapp/logic": "^0.4.5",
-    "@cosmjs/cosmwasm": "^0.24.0-alpha.22",
-    "@cosmjs/launchpad": "^0.24.0-alpha.22",
+    "@cosmjs/cosmwasm-stargate": "^0.25.6",
+    "@cosmjs/stargate": "^0.25.6",
     "antd": "^4.5.4",
     "clipboard-copy": "^3.1.0",
     "formik": "^2.1.5",

packages/name-service/src/App/routes/Contract/components/SearchResult/index.tsx

@@ -1,6 +1,6 @@
 import { OperationResultState } from "@cosmicdapp/design";
 import { getErrorFromStackTrace, printableCoin, useError, useSdk } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Button, Typography } from "antd";
 import copyToClipboard from "clipboard-copy";
 import React, { useEffect, useState } from "react";

packages/name-service/src/App/routes/Home/index.tsx

@@ -1,6 +1,6 @@
 import { PageLayout, YourAccount } from "@cosmicdapp/design";
 import { useError, useSdk } from "@cosmicdapp/logic";
-import { Contract } from "@cosmjs/cosmwasm";
+import { Contract } from "@cosmjs/cosmwasm-stargate";
 import { Button, Typography } from "antd";
 import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
@@ -17,9 +17,19 @@ export function Home(): JSX.Element {
   const [contracts, setContracts] = useState<readonly Contract[]>([]);
 
   useEffect(() => {
-    getClient()
+    const client = getClient();
+    client
       .getContracts(config.codeId)
-      .then((contracts) => setContracts(contracts))
+      .then((contracts) => {
+        const contractsPromise = [];
+        contracts.forEach(contract => {
+          contractsPromise.push(client.getContract(contract));
+        });
+        Promise.all(contractsPromise)
+          .then((contracts) => {
+            setContracts(contracts);
+          });
+      })
       .catch(setError);
   }, [getClient, setError]);
 

packages/name-service/src/App/routes/Transfer/index.tsx

@@ -1,6 +1,6 @@
 import { BackButton, Loading, OperationResultState, PageLayout, YourAccount } from "@cosmicdapp/design";
 import { getErrorFromStackTrace, printableCoin, useError, useSdk } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Typography } from "antd";
 import React, { useEffect, useState } from "react";
 import { useHistory, useParams } from "react-router-dom";

packages/native-staking/package.json

@@ -20,8 +20,8 @@
   "dependencies": {
     "@cosmicdapp/design": "^0.4.5",
     "@cosmicdapp/logic": "^0.4.5",
-    "@cosmjs/launchpad": "^0.24.0-alpha.22",
-    "@cosmjs/math": "^0.24.0-alpha.22",
+    "@cosmjs/stargate": "^0.25.6",
+    "@cosmjs/math": "^0.25.6",
     "antd": "^4.5.4",
     "clipboard-copy": "^3.1.0",
     "formik": "^2.1.5",

packages/native-staking/src/App/routes/Delegate/FormDelegateBalance/index.tsx

@@ -1,5 +1,5 @@
 import { useSdk } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Decimal } from "@cosmjs/math";
 import { Button, Typography } from "antd";
 import { Formik } from "formik";

packages/native-staking/src/App/routes/Delegate/index.tsx

@@ -1,6 +1,6 @@
 import { Loading, PageLayout } from "@cosmicdapp/design";
 import { displayAmountToNative, getErrorFromStackTrace, useSdk } from "@cosmicdapp/logic";
-import { Coin, coins } from "@cosmjs/launchpad";
+import { Coin, coins } from "@cosmjs/stargate";
 import { isBroadcastTxFailure } from "@cosmjs/stargate";
 import { Typography } from "antd";
 import React, { useState } from "react";

packages/native-staking/src/App/routes/Rewards/index.tsx

@@ -1,6 +1,6 @@
 import { Loading, PageLayout } from "@cosmicdapp/design";
 import { AppConfig, getErrorFromStackTrace, nativeCoinToDisplay, useSdk } from "@cosmicdapp/logic";
-import { Coin, coins } from "@cosmjs/launchpad";
+import { Coin, coins } from "@cosmjs/stargate";
 import { isBroadcastTxFailure } from "@cosmjs/stargate";
 import { Button, Typography } from "antd";
 import React, { useEffect, useState } from "react";
@@ -42,7 +42,7 @@ export function Rewards(): JSX.Element {
   useEffect(() => {
     (async function updateRewards() {
       try {
-        const { rewards } = await getStakingClient().distribution.unverified.delegationRewards(
+        const { rewards } = await getStakingClient().distribution.delegationRewards(
           address,
           validatorAddress,
         );

packages/native-staking/src/App/routes/Undelegate/FormUndelegateBalance/index.tsx

@@ -37,7 +37,7 @@ export function FormUndelegateBalance({
   useEffect(() => {
     (async function updateBalance() {
       try {
-        const { delegationResponse } = await getStakingClient().staking.unverified.delegation(
+        const { delegationResponse } = await getStakingClient().staking.delegation(
           address,
           validatorAddress,
         );

packages/native-staking/src/App/routes/Undelegate/index.tsx

@@ -1,6 +1,6 @@
 import { Loading, PageLayout } from "@cosmicdapp/design";
 import { displayAmountToNative, getErrorFromStackTrace, useSdk } from "@cosmicdapp/logic";
-import { Coin, coins } from "@cosmjs/launchpad";
+import { Coin, coins } from "@cosmjs/stargate";
 import { isBroadcastTxFailure } from "@cosmjs/stargate";
 import { Typography } from "antd";
 import React, { useState } from "react";

packages/native-staking/src/App/routes/Validator/index.tsx

@@ -1,6 +1,6 @@
 import { PageLayout } from "@cosmicdapp/design";
 import { nativeCoinToDisplay, useSdk } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Decimal } from "@cosmjs/math";
 import { Button, Typography } from "antd";
 import React, { useEffect, useState } from "react";
@@ -44,7 +44,7 @@ export function Validator(): JSX.Element {
   useEffect(() => {
     (async function updateBalance() {
       try {
-        const { delegationResponse } = await getStakingClient().staking.unverified.delegation(
+        const { delegationResponse } = await getStakingClient().staking.delegation(
           address,
           validatorAddress,
         );

packages/native-staking/src/App/routes/Validators/index.tsx

@@ -32,7 +32,7 @@ export function Validators(): JSX.Element {
 
   useEffect(() => {
     (async function updateValidatorsData() {
-      const { validators } = await getStakingClient().staking.unverified.validators("BOND_STATUS_BONDED");
+      const { validators } = await getStakingClient().staking.validators("BOND_STATUS_BONDED");
       const validatorsData: readonly ValidatorData[] = validators
         .map((validator) => ({
           name: validator.description.moniker,

packages/native-staking/src/App/utils/staking.ts

@@ -29,7 +29,7 @@ export function useStakingValidator(validatorAddress: string): StakingValidator
   useEffect(() => {
     (async function updateValidator() {
       try {
-        const { validator } = await getStakingClient().staking.unverified.validator(validatorAddress);
+        const { validator } = await getStakingClient().staking.validator(validatorAddress);
         setValidator(validator);
       } catch (error) {
         setError(error.message);

packages/staking-service/package.json

@@ -20,8 +20,8 @@
   "dependencies": {
     "@cosmicdapp/design": "^0.4.5",
     "@cosmicdapp/logic": "^0.4.5",
-    "@cosmjs/launchpad": "^0.24.0-alpha.22",
-    "@cosmjs/math": "^0.24.0-alpha.22",
+    "@cosmjs/stargate": "^0.25.6",
+    "@cosmjs/math": "^0.25.6",
     "antd": "^4.5.4",
     "clipboard-copy": "^3.1.0",
     "formik": "^2.1.5",

packages/staking-service/src/App/routes/Purchase/FormBuyShares/index.tsx

@@ -1,5 +1,5 @@
 import { useSdk } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Decimal } from "@cosmjs/math";
 import { Button, Typography } from "antd";
 import { Formik } from "formik";

packages/staking-service/src/App/routes/Purchase/index.tsx

@@ -8,7 +8,7 @@ import {
   TokenInfo,
   useSdk,
 } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Typography } from "antd";
 import React, { useEffect, useState } from "react";
 import { useHistory, useParams } from "react-router-dom";

packages/staking-service/src/App/routes/Validators/index.tsx

@@ -46,7 +46,7 @@ export function Validators(): JSX.Element {
       const contracts = await client.getContracts(config.codeId);
 
       for (const contract of contracts) {
-        const newCw20contract = CW20(client).use(contract.address);
+        const newCw20contract = CW20(client).use(contract);
         addContract(newCw20contract);
       }
     })();

packages/wallet/package.json

@@ -20,7 +20,7 @@
   "dependencies": {
     "@cosmicdapp/design": "^0.4.5",
     "@cosmicdapp/logic": "^0.4.5",
-    "@cosmjs/launchpad": "^0.24.0-alpha.22",
+    "@cosmjs/stargate": "^0.25.6",
     "antd": "^4.5.4",
     "formik": "^2.1.5",
     "formik-antd": "^2.0.1",

packages/wallet/src/App/routes/TokenDetail/index.tsx

@@ -5,7 +5,7 @@ import {
   nativeCoinToDisplay,
   useSdk,
 } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { isBroadcastTxFailure } from "@cosmjs/stargate";
 import { Typography } from "antd";
 import React, { useState } from "react";

packages/wallet/src/App/routes/Tokens/components/TokenList/index.tsx

@@ -1,5 +1,5 @@
 import { nativeCoinToDisplay, useSdk } from "@cosmicdapp/logic";
-import { Coin } from "@cosmjs/launchpad";
+import { Coin } from "@cosmjs/stargate";
 import { Typography } from "antd";
 import React, { useEffect, useState } from "react";
 import { useHistory } from "react-router-dom";