Feat(core)/bump dep

packages/graz/package.json

@@ -42,12 +42,12 @@
     "prepublishOnly": "pnpm build"
   },
   "peerDependencies": {
-    "@cosmjs/amino": "<=0.31.3",
-    "@cosmjs/cosmwasm-stargate": "<=0.31.3",
+    "@cosmjs/amino": "0.32.4",
+    "@cosmjs/cosmwasm-stargate": "0.32.4",
     "@cosmjs/launchpad": "*",
-    "@cosmjs/proto-signing": "<=0.31.3",
-    "@cosmjs/stargate": "<=0.31.3",
-    "@cosmjs/tendermint-rpc": "<=0.31.3",
+    "@cosmjs/proto-signing": "0.32.4",
+    "@cosmjs/stargate": "0.32.4",
+    "@cosmjs/tendermint-rpc": "0.32.4",
     "@leapwallet/cosmos-social-login-capsule-provider": "^0.0.41",
     "react": ">=17"
   },
@@ -58,14 +58,13 @@
     "@keplr-wallet/cosmos": "0.12.156",
     "@metamask/providers": "12.0.0",
     "@tanstack/react-query": "4.35.0",
-    "@terra-money/station-connector": "1.1.0",
+    "@terra-money/station-connector": "1.1.4",
     "@vectis/extension-client": "^0.7.2",
     "@walletconnect/sign-client": "2.17.2",
     "@walletconnect/types": "2.17.2",
     "@walletconnect/utils": "2.17.2",
     "@walletconnect/modal": "2.7.0",
     "cosmos-directory-client": "0.0.6",
-    "long": "4",
     "zustand": "4.5.2"
   },
   "devDependencies": {

packages/graz/src/actions/account.ts

@@ -204,7 +204,7 @@ export const reconnect = async (args?: ReconnectArgs) => {
 };
 
 export interface OfflineSigners {
-  offlineSigner: OfflineAminoSigner & OfflineDirectSigner;
+  offlineSigner: OfflineAminoSigner | OfflineDirectSigner;
   offlineSignerAmino: OfflineAminoSigner;
   offlineSignerAuto: OfflineAminoSigner | OfflineDirectSigner;
 }

packages/graz/src/actions/wallet/cosmos-metamask-snap/index.ts

@@ -1,4 +1,5 @@
 import { CosmosSnap, installSnap, isSnapInstalled } from "@cosmsnap/snapper";
+import type { MetaMaskInpageProvider } from "@metamask/providers";
 
 import { useGrazInternalStore } from "../../../store";
 import type { KnownKeys, Wallet } from "../../../types/wallet";
@@ -7,7 +8,7 @@ import type { ChainId } from "../../../utils/multi-chain";
 const metamaskSnapCosmosKeysMap: KnownKeys = {};
 
 export const getMetamaskSnapCosmos = (): Wallet => {
-  const ethereum = window.ethereum;
+  const ethereum = window.ethereum as MetaMaskInpageProvider | undefined;
   let cosmos = window.cosmos;
   if (ethereum) {
     const init = async () => {

packages/graz/src/actions/wallet/cosmostation.ts

@@ -35,10 +35,11 @@ export const getCosmostation = (): Wallet => {
     const setDefaultOptions = (options: KeplrIntereactionOptions) => {
       cosmostation.defaultOptions = options;
     };
+    // TODO: CHECK IF THIS IS THE CORRECT WAY TO CAST
     const res = Object.assign(cosmostation, {
       subscription,
       setDefaultOptions,
-    });
+    }) as unknown as Wallet;
     return res;
   }
 

packages/graz/src/actions/wallet/initia.ts

@@ -80,6 +80,7 @@ export const getInitia = (): Wallet => {
         pubKey: account.pubkey,
         bech32Address: account.address,
         address: rawAddress,
+        ethereumHexAddress: "",
         isNanoLedger: false,
         isKeystone: false,
       };

packages/graz/src/actions/wallet/keplr.ts

@@ -34,10 +34,12 @@ export const getKeplr = (): Wallet => {
     const setDefaultOptions = (options: KeplrIntereactionOptions) => {
       keplr.defaultOptions = options;
     };
+
+    // TODO: CHECK IF THIS IS THE CORRECT WAY TO CAST
     const res = Object.assign(keplr, {
       subscription,
       setDefaultOptions,
-    });
+    }) as unknown as Wallet;
 
     return res;
   }

packages/graz/src/actions/wallet/leap.ts

@@ -34,10 +34,13 @@ export const getLeap = (): Wallet => {
     const setDefaultOptions = (options: KeplrIntereactionOptions) => {
       leap.defaultOptions = options;
     };
+
+    // TODO: CHECK IF THIS IS THE CORRECT WAY TO CAST
     const res = Object.assign(leap, {
       subscription,
       setDefaultOptions,
-    });
+    }) as unknown as Wallet;
+
     return res;
   }
 

packages/graz/src/actions/wallet/okx.ts

@@ -34,10 +34,12 @@ export const getOkx = (): Wallet => {
     const setDefaultOptions = (options: KeplrIntereactionOptions) => {
       okxWallet.defaultOptions = options;
     };
+
+    // TODO: CHECK IF THIS IS THE CORRECT WAY TO CAST
     const res = Object.assign(okxWallet, {
       subscription,
       setDefaultOptions,
-    });
+    }) as unknown as Wallet;
     return res;
   }
 

packages/graz/src/actions/wallet/vectis.ts

@@ -1,12 +1,12 @@
-import type { AminoSignResponse } from "@cosmjs/amino";
+import type { AminoSignResponse, OfflineAminoSigner } from "@cosmjs/amino";
 import { fromBech32 } from "@cosmjs/encoding";
-import type { DirectSignResponse } from "@cosmjs/proto-signing";
+import type { DirectSignResponse, OfflineDirectSigner } from "@cosmjs/proto-signing";
+import type { ChainInfo } from "@vectis/extension-client";
 import Long from "long";
 
 import { useGrazInternalStore } from "../../store";
 import type { Key, SignAminoParams, SignDirectParams, Wallet } from "../../types/wallet";
 import { clearSession } from ".";
-import { ChainInfo } from "@vectis/extension-client";
 
 /**
  * Function to return {@link Wallet} object and throws and error if it does not exist on `window`.
@@ -48,7 +48,7 @@ export const getVectis = (): Wallet => {
         rpcUrl: chainInfo.rpc,
         restUrl: chainInfo.rest,
         prettyName: chainInfo.chainName.replace(" ", ""),
-        bech32Prefix: chainInfo.bech32Config?.bech32PrefixAccAddr,
+        bech32Prefix: chainInfo.bech32Config.bech32PrefixAccAddr,
         currencies: chainInfo.currencies,
         feeCurrencies: chainInfo.feeCurrencies,
         chainId: chainInfo.chainId,
@@ -75,23 +75,35 @@ export const getVectis = (): Wallet => {
 
     const signDirect = async (...args: SignDirectParams): Promise<DirectSignResponse> => {
       const { 1: signer, 2: signDoc } = args;
-      return vectis.signDirect(signer, {
+      const response = await vectis.signDirect(signer, {
         bodyBytes: signDoc.bodyBytes || Uint8Array.from([]),
         authInfoBytes: signDoc.authInfoBytes || Uint8Array.from([]),
         accountNumber: Long.fromString(signDoc.accountNumber?.toString() || "", false),
         chainId: signDoc.chainId || "",
       });
+
+      return {
+        ...response,
+        signed: {
+          ...response.signed,
+          accountNumber: BigInt(signDoc.accountNumber ?? 0),
+        },
+      };
     };
 
     const signAmino = async (...args: SignAminoParams): Promise<AminoSignResponse> => {
       const { 1: signer, 2: signDoc } = args;
       return vectis.signAmino(signer, signDoc);
     };
 
+    const getOfflineSignerAuto = (chainId: string): Promise<OfflineAminoSigner | OfflineDirectSigner> => {
+      return vectis.getOfflineSignerAuto(chainId) as unknown as Promise<OfflineAminoSigner | OfflineDirectSigner>;
+    };
+
     return {
       enable: (chainId: string | string[]) => vectis.enable(chainId),
       getOfflineSigner: (chainId: string) => vectis.getOfflineSigner(chainId),
-      getOfflineSignerAuto: (chainId: string) => vectis.getOfflineSignerAuto(chainId),
+      getOfflineSignerAuto,
       getKey,
       subscription,
       getOfflineSignerOnlyAmino,

packages/graz/src/actions/wallet/wallet-connect/index.ts

@@ -1,17 +1,18 @@
 import type { AminoSignResponse } from "@cosmjs/amino";
 import type { AccountData, Algo, DirectSignResponse } from "@cosmjs/proto-signing";
 import type { Keplr } from "@keplr-wallet/types";
+import { WalletConnectModal } from "@walletconnect/modal";
 import { SignClient } from "@walletconnect/sign-client";
 import type { ISignClient, SignClientTypes } from "@walletconnect/types";
 import { getSdkError } from "@walletconnect/utils";
-import Long from "long";
+import type { SignDoc } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 
 import { useGrazInternalStore, useGrazSessionStore } from "../../../store";
-import { Key, type SignAminoParams, type SignDirectParams, type Wallet, WalletType } from "../../../types/wallet";
+import type { Key } from "../../../types/wallet";
+import { type SignAminoParams, type SignDirectParams, type Wallet, WalletType } from "../../../types/wallet";
 import { isAndroid, isIos, isMobile } from "../../../utils/os";
 import { promiseWithTimeout } from "../../../utils/timeout";
 import type { GetWalletConnectParams, WalletConnectSignDirectResponse } from "./types";
-import { WalletConnectModal } from "@walletconnect/modal";
 
 export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
   if (!useGrazInternalStore.getState().walletConnect?.options?.projectId?.trim()) {
@@ -205,6 +206,7 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
       //   "f896cbca30cd6dc414712d3d6fcc2f8f7d35d5bd30e3b1fc5d60cf6c8926f98f",
       // ],
     });
+
     const lastSession = checkSession(chainId);
     if (!lastSession) {
       const { uri, approval } = await promiseWithTimeout(
@@ -276,7 +278,8 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
         await approving(signal);
       } catch (error) {
         walletConnectModal.closeModal();
-        if (!(error as Error).message.toLowerCase().includes("no matching key")) return Promise.reject(error);
+        if (!(error as Error).message.toLowerCase().includes("no matching key"))
+          return Promise.reject(new Error(error as string));
       }
       if (!params) {
         walletConnectModal.closeModal();
@@ -288,7 +291,7 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
         (async () => {
           const resultAcccounts = Object.fromEntries(
             await Promise.all(
-              (activeChainIds || chainId)?.map(async (c): Promise<[string, Key]> => [c, await getKey(c)]),
+              (activeChainIds || chainId).map(async (c): Promise<[string, Key]> => [c, await getKey(c)]),
             ),
           );
           useGrazSessionStore.setState({
@@ -356,8 +359,8 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
           signDoc: {
             chainId: signDoc.chainId,
             accountNumber: signDoc.accountNumber?.toString(),
-            bodyBytes: signDoc.bodyBytes ? Buffer.from(signDoc.bodyBytes).toString(encoding) : null,
-            authInfoBytes: signDoc.authInfoBytes ? Buffer.from(signDoc.authInfoBytes).toString(encoding) : null,
+            bodyBytes: Buffer.from(signDoc.bodyBytes).toString(encoding) || null,
+            authInfoBytes: Buffer.from(signDoc.authInfoBytes).toString(encoding) || null,
           },
         },
       },
@@ -370,12 +373,10 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
     const { signature, signed } = await wcSignDirect(chainId, signer, signDoc);
     return {
       signed: {
-        chainId: signed.chainId ?? "",
-        accountNumber: signed.accountNumber ? Long.fromString(signed.accountNumber) : new Long(0),
-        authInfoBytes: signed.authInfoBytes
-          ? new Uint8Array(Buffer.from(signed.authInfoBytes, encoding))
-          : new Uint8Array([]),
-        bodyBytes: signed.bodyBytes ? new Uint8Array(Buffer.from(signed.bodyBytes, encoding)) : new Uint8Array([]),
+        chainId: signed.chainId,
+        accountNumber: BigInt(signed.accountNumber),
+        authInfoBytes: new Uint8Array(Buffer.from(signed.authInfoBytes, encoding)),
+        bodyBytes: new Uint8Array(Buffer.from(signed.bodyBytes, encoding)),
       },
       signature,
     };
@@ -416,8 +417,7 @@ export const getWalletConnect = (params?: GetWalletConnectParams): Wallet => {
   const getOfflineSignerDirect = (chainId: string) => {
     return {
       getAccounts: async () => [await getAccount(chainId)],
-      signDirect: (signerAddress: string, signDoc: SignDirectParams["2"]) =>
-        signDirect(chainId, signerAddress, signDoc),
+      signDirect: (signerAddress: string, signDoc: SignDoc) => signDirect(chainId, signerAddress, signDoc),
     };
   };
 

packages/graz/src/actions/wallet/xdefi.ts

@@ -29,9 +29,10 @@ export const getXDefi = (): Wallet => {
         window.removeEventListener("keplr_keystorechange", listener);
       };
     };
+    // TODO: CHECK IF THIS IS THE CORRECT WAY TO CAST
     const res = Object.assign(xdefi, {
       subscription,
-    });
+    }) as unknown as Wallet;
 
     return res;
   }

packages/graz/src/hooks/account.ts

@@ -158,7 +158,9 @@ export const useBalances = <TMulti extends MultiChainHookArgs>(
         if (!stargateClient) {
           throw new Error(`Client is not ready ${_chain.chainId}`);
         }
-        if (!_chain.bech32Config?.bech32PrefixAccAddr) throw new Error(`Bech32Config is missing ${_chain.chainId}`);
+        if (!_chain.bech32Config) {
+          throw new Error(`bech32Config is not defined for ${_chain.chainId}`);
+        }
         const balances = await stargateClient.getAllBalances(
           toBech32(_chain.bech32Config.bech32PrefixAccAddr, fromBech32(_address).data),
         );

packages/graz/src/store/index.ts

@@ -1,14 +1,15 @@
 import type { ChainInfo, Keplr } from "@keplr-wallet/types";
 import type { CapsuleProvider } from "@leapwallet/cosmos-social-login-capsule-provider";
-import type { ISignClient, SignClientTypes } from "@walletconnect/types";
 import type { WalletConnectModalConfig } from "@walletconnect/modal";
+import type { ISignClient, SignClientTypes } from "@walletconnect/types";
 import { create } from "zustand";
 import type { PersistOptions } from "zustand/middleware";
 import { createJSONStorage } from "zustand/middleware";
 import { persist, subscribeWithSelector } from "zustand/middleware";
 
 import type { Dictionary } from "../types/core";
-import { Key, WalletType } from "../types/wallet";
+import type { Key } from "../types/wallet";
+import { WalletType } from "../types/wallet";
 
 export interface ChainConfig {
   path?: string;

packages/graz/src/types/tendermint.ts

@@ -1,3 +1,5 @@
 import type { QueryClient } from "@cosmjs/stargate";
+import type { Tendermint34Client, Tendermint37Client } from "@cosmjs/tendermint-rpc";
 
 export type ExtensionSetup<P extends object = object> = (queryClient: QueryClient) => P;
+export type TendermintClient = Tendermint37Client | Tendermint34Client;

packages/graz/src/types/wallet.ts

@@ -1,4 +1,12 @@
-import type { ChainInfo, Keplr, KeplrIntereactionOptions, Key as KeplrKey } from "@keplr-wallet/types";
+import type { OfflineAminoSigner } from "@cosmjs/amino";
+import type { DirectSignResponse, OfflineDirectSigner } from "@cosmjs/proto-signing";
+import type {
+  ChainInfo,
+  Keplr,
+  KeplrIntereactionOptions,
+  KeplrSignOptions,
+  Key as KeplrKey,
+} from "@keplr-wallet/types";
 
 export enum WalletType {
   KEPLR = "keplr",
@@ -48,10 +56,7 @@ export const WALLET_TYPES = [
   WalletType.OKX,
 ];
 
-export type Wallet = Pick<
-  Keplr,
-  "enable" | "getOfflineSigner" | "getOfflineSignerAuto" | "getOfflineSignerOnlyAmino" | "signDirect" | "signAmino"
-> & {
+export type Wallet = Pick<Keplr, "enable" | "getOfflineSignerOnlyAmino" | "signAmino"> & {
   experimentalSuggestChain: (chainInfo: Omit<ChainInfo, "nodeProvider">) => Promise<void>;
   signArbitrary?: Keplr["signArbitrary"];
   subscription?: (reconnect: () => void) => () => void;
@@ -60,6 +65,19 @@ export type Wallet = Pick<
   setDefaultOptions?: (options: KeplrIntereactionOptions) => void;
   onAfterLoginSuccessful?: () => Promise<void>;
   getKey: (chainId: string) => Promise<Key>;
+  getOfflineSigner: (chainId: string) => OfflineAminoSigner | OfflineDirectSigner;
+  getOfflineSignerAuto: (chainId: string) => Promise<OfflineAminoSigner | OfflineDirectSigner>;
+  signDirect: (
+    chainId: string,
+    signer: string,
+    signDoc: {
+      bodyBytes?: Uint8Array | null;
+      authInfoBytes?: Uint8Array | null;
+      chainId?: string | null;
+      accountNumber?: bigint | null;
+    },
+    signOptions?: KeplrSignOptions,
+  ) => Promise<DirectSignResponse>;
 };
 
 export type SignDirectParams = Parameters<Wallet["signDirect"]>;