@keplr-wallet/hooks 0.9.18 → 0.10.0

package/src/tx/send-gas.ts

@@ -1,39 +1,25 @@
 import { GasConfig } from "./gas";
 import { DenomHelper } from "@keplr-wallet/common";
-import {
-  ChainGetter,
-  CosmosMsgOpts,
-  SecretMsgOpts,
-  CosmwasmMsgOpts,
-} from "@keplr-wallet/stores";
+import { ChainGetter } from "@keplr-wallet/stores";
 import { IAmountConfig } from "./types";
 import { useState } from "react";
-import { action, makeObservable, observable } from "mobx";
-
-type MsgOpts = CosmosMsgOpts & SecretMsgOpts & CosmwasmMsgOpts;
+import { makeObservable, override } from "mobx";
+import { AccountStore } from "./send-types";
+import { UnknownCurrencyError } from "./errors";
 
 export class SendGasConfig extends GasConfig {
-  @observable.ref
-  protected sendMsgOpts: MsgOpts["send"];
-
   constructor(
     chainGetter: ChainGetter,
+    protected readonly accountStore: AccountStore,
     initialChainId: string,
-    protected readonly amountConfig: IAmountConfig,
-    sendMsgOpts: MsgOpts["send"]
+    protected readonly amountConfig: IAmountConfig
   ) {
     super(chainGetter, initialChainId);
 
-    this.sendMsgOpts = sendMsgOpts;
-
     makeObservable(this);
   }
 
-  @action
-  setSendMsgOpts(opts: MsgOpts["send"]) {
-    this.sendMsgOpts = opts;
-  }
-
+  @override
   get gas(): number {
     // If gas not set manually, assume that the tx is for MsgSend.
     // And, set the default gas according to the currency type.
@@ -42,31 +28,65 @@ export class SendGasConfig extends GasConfig {
         this.amountConfig.sendCurrency.coinMinimalDenom
       );
 
+      const account = this.accountStore.getAccount(this.chainId);
+
       switch (denomHelper.type) {
         case "secret20":
-          return this.sendMsgOpts.secret20.gas;
+          return account.secret?.msgOpts.send.secret20.gas ?? 0;
         case "cw20":
-          return this.sendMsgOpts.cw20.gas;
+          return account.cosmwasm?.msgOpts.send.cw20.gas ?? 0;
         default:
-          return this.sendMsgOpts.native.gas;
+          return account.cosmos?.msgOpts.send.native.gas ?? 0;
       }
     }
 
     return super.gas;
   }
+
+  @override
+  get error(): Error | undefined {
+    if (this.amountConfig.sendCurrency) {
+      const denomHelper = new DenomHelper(
+        this.amountConfig.sendCurrency.coinMinimalDenom
+      );
+
+      const account = this.accountStore.getAccount(this.chainId);
+
+      switch (denomHelper.type) {
+        case "secret20": {
+          if (!account.secret?.msgOpts.send.secret20.gas) {
+            return new UnknownCurrencyError("Unknown currency");
+          }
+          break;
+        }
+        case "cw20": {
+          if (!account.cosmwasm?.msgOpts.send.cw20.gas) {
+            return new UnknownCurrencyError("Unknown currency");
+          }
+          break;
+        }
+        default: {
+          if (!account.cosmos?.msgOpts.send.native.gas) {
+            return new UnknownCurrencyError("Unknown currency");
+          }
+        }
+      }
+    }
+
+    return super.error;
+  }
 }
 
 export const useSendGasConfig = (
   chainGetter: ChainGetter,
+  accountStore: AccountStore,
   chainId: string,
-  amountConfig: IAmountConfig,
-  sendMsgOpts: MsgOpts["send"]
+  amountConfig: IAmountConfig
 ) => {
   const [gasConfig] = useState(
-    () => new SendGasConfig(chainGetter, chainId, amountConfig, sendMsgOpts)
+    () => new SendGasConfig(chainGetter, accountStore, chainId, amountConfig)
   );
   gasConfig.setChain(chainId);
-  gasConfig.setSendMsgOpts(sendMsgOpts);
 
   return gasConfig;
 };

package/src/tx/send-tx.ts

@@ -1,43 +1,36 @@
-import {
-  ChainGetter,
-  CosmosMsgOpts,
-  CosmwasmMsgOpts,
-  SecretMsgOpts,
-} from "@keplr-wallet/stores";
-import { ObservableQueryBalances } from "@keplr-wallet/stores/build/query/balances";
+import { ChainGetter, IQueriesStore } from "@keplr-wallet/stores";
 import { useFeeConfig, useMemoConfig, useRecipientConfig } from "./index";
 import { useSendGasConfig } from "./send-gas";
 import { useAmountConfig } from "./amount";
-
-type MsgOpts = CosmosMsgOpts & SecretMsgOpts & CosmwasmMsgOpts;
+import { AccountStore } from "./send-types";
 
 export const useSendTxConfig = (
   chainGetter: ChainGetter,
+  queriesStore: IQueriesStore,
+  accountStore: AccountStore,
   chainId: string,
-  sendMsgOpts: MsgOpts["send"],
   sender: string,
-  queryBalances: ObservableQueryBalances,
   ensEndpoint?: string
 ) => {
   const amountConfig = useAmountConfig(
     chainGetter,
+    queriesStore,
     chainId,
-    sender,
-    queryBalances
+    sender
   );
 
   const memoConfig = useMemoConfig(chainGetter, chainId);
   const gasConfig = useSendGasConfig(
     chainGetter,
+    accountStore,
     chainId,
-    amountConfig,
-    sendMsgOpts
+    amountConfig
   );
   const feeConfig = useFeeConfig(
     chainGetter,
+    queriesStore,
     chainId,
     sender,
-    queryBalances,
     amountConfig,
     gasConfig
   );

package/src/tx/send-types.ts

@@ -0,0 +1,25 @@
+import { IAccountStore, MsgOpt } from "@keplr-wallet/stores";
+
+export type AccountStore = IAccountStore<{
+  cosmos?: {
+    readonly msgOpts: {
+      readonly send: {
+        readonly native: MsgOpt;
+      };
+    };
+  };
+  cosmwasm?: {
+    readonly msgOpts: {
+      readonly send: {
+        readonly cw20: Pick<MsgOpt, "gas">;
+      };
+    };
+  };
+  secret?: {
+    readonly msgOpts: {
+      readonly send: {
+        readonly secret20: Pick<MsgOpt, "gas">;
+      };
+    };
+  };
+}>;

package/src/tx/staked-amount.ts

@@ -3,7 +3,8 @@ import { TxChainSetter } from "./chain";
 import {
   ChainGetter,
   CoinPrimitive,
-  ObservableQueryDelegations,
+  CosmosQueriesImpl,
+  IQueriesStore,
 } from "@keplr-wallet/stores";
 import { action, computed, makeObservable, observable } from "mobx";
 import { AppCurrency } from "@keplr-wallet/types";
@@ -18,9 +19,6 @@ import { Dec, DecUtils } from "@keplr-wallet/unit";
 import { useState } from "react";
 
 export class StakedAmountConfig extends TxChainSetter implements IAmountConfig {
-  @observable.ref
-  protected queryDelegations: ObservableQueryDelegations;
-
   @observable
   protected _sender: string;
 
@@ -35,15 +33,16 @@ export class StakedAmountConfig extends TxChainSetter implements IAmountConfig {
 
   constructor(
     chainGetter: ChainGetter,
+    protected readonly queriesStore: IQueriesStore<{
+      cosmos: Pick<CosmosQueriesImpl, "queryDelegations">;
+    }>,
     initialChainId: string,
     sender: string,
-    queryDelegations: ObservableQueryDelegations,
     initialValidatorAddress: string
   ) {
     super(chainGetter, initialChainId);
 
     this._sender = sender;
-    this.queryDelegations = queryDelegations;
     this._amount = "";
     this._validatorAddress = initialValidatorAddress;
 
@@ -59,11 +58,6 @@ export class StakedAmountConfig extends TxChainSetter implements IAmountConfig {
     return this._validatorAddress;
   }
 
-  @action
-  setQueryDelegations(queryDelegations: ObservableQueryDelegations) {
-    this.queryDelegations = queryDelegations;
-  }
-
   @action
   setSender(sender: string) {
     this._sender = sender;
@@ -116,8 +110,9 @@ export class StakedAmountConfig extends TxChainSetter implements IAmountConfig {
   @computed
   get amount(): string {
     if (this.fraction != null) {
-      const result = this.queryDelegations
-        .getQueryBech32Address(this.sender)
+      const result = this.queriesStore
+        .get(this.chainId)
+        .cosmos.queryDelegations.getQueryBech32Address(this.sender)
         .getDelegationTo(this.validatorAddress);
 
       if (result.toDec().lte(new Dec(0))) {
@@ -171,7 +166,8 @@ export class StakedAmountConfig extends TxChainSetter implements IAmountConfig {
     return [this.chainInfo.stakeCurrency];
   }
 
-  getError(): Error | undefined {
+  @computed
+  get error(): Error | undefined {
     const sendCurrency = this.sendCurrency;
     if (!sendCurrency) {
       return new Error("Currency to send not set");
@@ -195,8 +191,9 @@ export class StakedAmountConfig extends TxChainSetter implements IAmountConfig {
       return new NegativeAmountError("Amount is negative");
     }
 
-    const balance = this.queryDelegations
-      .getQueryBech32Address(this.sender)
+    const balance = this.queriesStore
+      .get(this.chainId)
+      .cosmos.queryDelegations.getQueryBech32Address(this.sender)
       .getDelegationTo(this.validatorAddress);
     const balanceDec = balance.toDec();
     if (dec.gt(balanceDec)) {
@@ -209,23 +206,24 @@ export class StakedAmountConfig extends TxChainSetter implements IAmountConfig {
 
 export const useStakedAmountConfig = (
   chainGetter: ChainGetter,
+  queriesStore: IQueriesStore<{
+    cosmos: Pick<CosmosQueriesImpl, "queryDelegations">;
+  }>,
   chainId: string,
   sender: string,
-  queryDelegations: ObservableQueryDelegations,
   validatorAddress: string
 ) => {
   const [txConfig] = useState(
     () =>
       new StakedAmountConfig(
         chainGetter,
+        queriesStore,
         chainId,
         sender,
-        queryDelegations,
         validatorAddress
       )
   );
   txConfig.setChain(chainId);
-  txConfig.setQueryDelegations(queryDelegations);
   txConfig.setSender(sender);
   txConfig.setValidatorAddress(validatorAddress);
 

package/src/tx/types.ts

@@ -12,7 +12,7 @@ export interface IMemoConfig extends ITxChainSetter {
   memo: string;
   setMemo(memo: string): void;
 
-  getError(): Error | undefined;
+  error: Error | undefined;
 }
 
 export interface IGasConfig extends ITxChainSetter {
@@ -23,7 +23,7 @@ export interface IGasConfig extends ITxChainSetter {
   gasRaw: string;
   setGas(gas: number | string): void;
 
-  getError(): Error | undefined;
+  error: Error | undefined;
 }
 
 export interface IFeeConfig extends ITxChainSetter {
@@ -36,7 +36,7 @@ export interface IFeeConfig extends ITxChainSetter {
   getFeeTypePretty(feeType: FeeType): CoinPretty;
   getFeePrimitive(): CoinPrimitive | undefined;
   isManual: boolean;
-  getError(): Error | undefined;
+  error: Error | undefined;
 }
 
 export interface IRecipientConfig extends ITxChainSetter {
@@ -44,7 +44,7 @@ export interface IRecipientConfig extends ITxChainSetter {
   rawRecipient: string;
   setRawRecipient(recipient: string): void;
 
-  getError(): Error | undefined;
+  error: Error | undefined;
 }
 
 export interface IAmountConfig extends ITxChainSetter {
@@ -76,7 +76,7 @@ export interface IAmountConfig extends ITxChainSetter {
   fraction: number | undefined;
   setFraction(value: number | undefined): void;
 
-  getError(): Error | undefined;
+  error: Error | undefined;
 }
 
 export const DefaultGasPriceStep: {

package/src/tx/undelegate-tx.ts

@@ -1,38 +1,99 @@
-import { ChainGetter, ObservableQueryDelegations } from "@keplr-wallet/stores";
-import { ObservableQueryBalances } from "@keplr-wallet/stores/build/query/balances";
 import {
+  ChainGetter,
+  IQueriesStore,
+  CosmosQueriesImpl,
+  IAccountStore,
+  MsgOpt,
+} from "@keplr-wallet/stores";
+import {
+  GasConfig,
   useFeeConfig,
-  useGasConfig,
   useMemoConfig,
   useRecipientConfig,
 } from "./index";
 import { useStakedAmountConfig } from "./staked-amount";
+import { makeObservable, override } from "mobx";
+import { useState } from "react";
+
+export class UndelegateGasConfig extends GasConfig {
+  constructor(
+    chainGetter: ChainGetter,
+    protected readonly accountStore: IAccountStore<{
+      cosmos: {
+        readonly msgOpts: {
+          readonly undelegate: MsgOpt;
+        };
+      };
+    }>,
+    initialChainId: string
+  ) {
+    super(chainGetter, initialChainId);
+
+    makeObservable(this);
+  }
+
+  @override
+  get gas(): number {
+    // If gas not set manually, assume that the tx is for MsgTransfer.
+    if (this._gasRaw == null) {
+      return this.accountStore.getAccount(this.chainId).cosmos.msgOpts
+        .undelegate.gas;
+    }
+
+    return super.gas;
+  }
+}
+
+export const useUndelegateGasConfig = (
+  chainGetter: ChainGetter,
+  accountStore: IAccountStore<{
+    cosmos: {
+      readonly msgOpts: {
+        readonly undelegate: MsgOpt;
+      };
+    };
+  }>,
+  chainId: string
+) => {
+  const [gasConfig] = useState(
+    () => new UndelegateGasConfig(chainGetter, accountStore, chainId)
+  );
+  gasConfig.setChain(chainId);
+
+  return gasConfig;
+};
 
 export const useUndelegateTxConfig = (
   chainGetter: ChainGetter,
+  queriesStore: IQueriesStore<{
+    cosmos: Pick<CosmosQueriesImpl, "queryDelegations">;
+  }>,
+  accountStore: IAccountStore<{
+    cosmos: {
+      readonly msgOpts: {
+        readonly undelegate: MsgOpt;
+      };
+    };
+  }>,
   chainId: string,
-  gas: number,
   sender: string,
-  queryBalances: ObservableQueryBalances,
-  queryDelegations: ObservableQueryDelegations,
   validatorAddress: string
 ) => {
   const amountConfig = useStakedAmountConfig(
     chainGetter,
+    queriesStore,
     chainId,
     sender,
-    queryDelegations,
     validatorAddress
   );
 
   const memoConfig = useMemoConfig(chainGetter, chainId);
-  const gasConfig = useGasConfig(chainGetter, chainId, gas);
-  gasConfig.setGas(gas);
+  const gasConfig = useUndelegateGasConfig(chainGetter, accountStore, chainId);
   const feeConfig = useFeeConfig(
     chainGetter,
+    queriesStore,
     chainId,
     sender,
-    queryBalances,
     amountConfig,
     gasConfig,
     false