@keplr-wallet/hooks 0.12.271 → 0.12.273-alpha.0

package/build/tx/sender.js

@@ -11,10 +11,12 @@ const chain_1 = require("./chain");
 const mobx_1 = require("mobx");
 const react_1 = require("react");
 class SenderConfig extends chain_1.TxChainSetter {
-    constructor(chainGetter, initialChainId, initialSender) {
+    constructor(chainGetter, initialChainId, initialSender, initialisEvmOrEthermint) {
         super(chainGetter, initialChainId);
         this._value = "";
+        this._isEvmOrEthermint = false;
         this._value = initialSender;
+        this._isEvmOrEthermint = initialisEvmOrEthermint;
         (0, mobx_1.makeObservable)(this);
     }
     get sender() {
@@ -26,6 +28,12 @@ class SenderConfig extends chain_1.TxChainSetter {
     setValue(value) {
         this._value = value;
     }
+    get isEvmOrEthermint() {
+        return this._isEvmOrEthermint;
+    }
+    setisEvmOrEthermint(value) {
+        this._isEvmOrEthermint = value;
+    }
     get uiProperties() {
         return {};
     }
@@ -33,14 +41,21 @@ class SenderConfig extends chain_1.TxChainSetter {
 __decorate([
     mobx_1.observable
 ], SenderConfig.prototype, "_value", void 0);
+__decorate([
+    mobx_1.observable
+], SenderConfig.prototype, "_isEvmOrEthermint", void 0);
 __decorate([
     mobx_1.action
 ], SenderConfig.prototype, "setValue", null);
+__decorate([
+    mobx_1.action
+], SenderConfig.prototype, "setisEvmOrEthermint", null);
 exports.SenderConfig = SenderConfig;
-const useSenderConfig = (chainGetter, chainId, sender) => {
-    const [config] = (0, react_1.useState)(() => new SenderConfig(chainGetter, chainId, sender));
+const useSenderConfig = (chainGetter, chainId, sender, isEvmOrEthermint) => {
+    const [config] = (0, react_1.useState)(() => new SenderConfig(chainGetter, chainId, sender, isEvmOrEthermint));
     config.setChain(chainId);
     config.setValue(sender);
+    config.setisEvmOrEthermint(isEvmOrEthermint);
     return config;
 };
 exports.useSenderConfig = useSenderConfig;

package/build/tx/sender.js.map

@@ -1 +1 @@
-{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../src/tx/sender.ts"],"names":[],"mappings":";;;;;;;;;AACA,mCAAwC;AACxC,+BAA0D;AAE1D,iCAAiC;AAEjC,MAAa,YAAa,SAAQ,qBAAa;IAI7C,YACE,WAAwB,EACxB,cAAsB,EACtB,aAAqB;QAErB,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAP3B,WAAM,GAAW,EAAE,CAAC;QAS5B,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAE5B,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAGD,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA9BW;IADT,iBAAU;4CACmB;AAuB9B;IADC,aAAM;4CAGN;AA3BH,oCAgCC;AAEM,MAAM,eAAe,GAAG,CAC7B,WAAwB,EACxB,OAAe,EACf,MAAc,EACd,EAAE;IACF,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,gBAAQ,EACvB,GAAG,EAAE,CAAC,IAAI,YAAY,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CACrD,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACzB,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAExB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B"}
+{"version":3,"file":"sender.js","sourceRoot":"","sources":["../../src/tx/sender.ts"],"names":[],"mappings":";;;;;;;;;AACA,mCAAwC;AACxC,+BAA0D;AAE1D,iCAAiC;AAEjC,MAAa,YAAa,SAAQ,qBAAa;IAM7C,YACE,WAAwB,EACxB,cAAsB,EACtB,aAAqB,EACrB,uBAAgC;QAEhC,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAV3B,WAAM,GAAW,EAAE,CAAC;QAEpB,sBAAiB,GAAY,KAAK,CAAC;QAU3C,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,IAAI,CAAC,iBAAiB,GAAG,uBAAuB,CAAC;QAEjD,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAGD,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAGD,mBAAmB,CAAC,KAAc;QAChC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACjC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA3CW;IADT,iBAAU;4CACmB;AAEpB;IADT,iBAAU;uDACkC;AAyB7C;IADC,aAAM;4CAGN;AAOD;IADC,aAAM;uDAGN;AAxCH,oCA6CC;AAEM,MAAM,eAAe,GAAG,CAC7B,WAAwB,EACxB,OAAe,EACf,MAAc,EACd,gBAAyB,EACzB,EAAE;IACF,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,gBAAQ,EACvB,GAAG,EAAE,CAAC,IAAI,YAAY,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,CAAC,CACvE,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACzB,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;IAE7C,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B"}

package/build/tx/types.d.ts

@@ -28,6 +28,7 @@ export interface ISenderConfig extends ITxChainSetter {
     value: string;
     setValue(value: string): void;
     sender: string;
+    readonly isEvmOrEthermint: boolean;
     uiProperties: UIProperties;
 }
 export interface IFeeConfig extends ITxChainSetter {

package/build/tx/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/tx/types.ts"],"names":[],"mappings":";;;AA2Ha,QAAA,mBAAmB,GAI5B;IACF,GAAG,EAAE,IAAI;IACT,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,IAAI;CACX,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/tx/types.ts"],"names":[],"mappings":";;;AA4Ha,QAAA,mBAAmB,GAI5B;IACF,GAAG,EAAE,IAAI;IACT,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,IAAI;CACX,CAAC"}

package/build/tx/undelegate-tx.d.ts

@@ -1,6 +1,6 @@
 import { ChainGetter } from "@keplr-wallet/stores";
 import { QueriesStore } from "./internal";
-export declare const useUndelegateTxConfig: (chainGetter: ChainGetter, queriesStore: QueriesStore, chainId: string, sender: string, validatorAddress: string, initialGas: number) => {
+export declare const useUndelegateTxConfig: (chainGetter: ChainGetter, queriesStore: QueriesStore, chainId: string, sender: string, isEvmOrEthermint: boolean, validatorAddress: string, initialGas: number) => {
     amountConfig: import("./staked-amount").StakedAmountConfig;
     memoConfig: import("./memo").MemoConfig;
     gasConfig: import("./gas").GasConfig;

package/build/tx/undelegate-tx.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useUndelegateTxConfig = void 0;
 const index_1 = require("./index");
 const staked_amount_1 = require("./staked-amount");
-const useUndelegateTxConfig = (chainGetter, queriesStore, chainId, sender, validatorAddress, initialGas) => {
-    const senderConfig = (0, index_1.useSenderConfig)(chainGetter, chainId, sender);
+const useUndelegateTxConfig = (chainGetter, queriesStore, chainId, sender, isEvmOrEthermint, validatorAddress, initialGas) => {
+    const senderConfig = (0, index_1.useSenderConfig)(chainGetter, chainId, sender, isEvmOrEthermint);
     const amountConfig = (0, staked_amount_1.useStakedAmountConfig)(chainGetter, queriesStore, chainId, validatorAddress, senderConfig);
     const memoConfig = (0, index_1.useMemoConfig)(chainGetter, chainId);
     const gasConfig = (0, index_1.useGasConfig)(chainGetter, chainId, initialGas);

package/build/tx/undelegate-tx.js.map

@@ -1 +1 @@
-{"version":3,"file":"undelegate-tx.js","sourceRoot":"","sources":["../../src/tx/undelegate-tx.ts"],"names":[],"mappings":";;;AACA,mCAMiB;AACjB,mDAAwD;AAGjD,MAAM,qBAAqB,GAAG,CACnC,WAAwB,EACxB,YAA0B,EAC1B,OAAe,EACf,MAAc,EACd,gBAAwB,EACxB,UAAkB,EAClB,EAAE;IACF,MAAM,YAAY,GAAG,IAAA,uBAAe,EAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,IAAA,qCAAqB,EACxC,WAAW,EACX,YAAY,EACZ,OAAO,EACP,gBAAgB,EAChB,YAAY,CACb,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,IAAA,oBAAY,EAC5B,WAAW,EACX,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,SAAS,EACT;QACE,uBAAuB,EAAE,KAAK;KAC/B,CACF,CAAC;IACF,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAErC,MAAM,eAAe,GAAG,IAAA,0BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,SAAS,CAAC,YAAY,EAAE;QAC1B,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;KAC7E;IACD,eAAe,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC3C,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;IAEtE,OAAO;QACL,YAAY;QACZ,UAAU;QACV,SAAS;QACT,SAAS;QACT,eAAe;QACf,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AAhDW,QAAA,qBAAqB,yBAgDhC"}
+{"version":3,"file":"undelegate-tx.js","sourceRoot":"","sources":["../../src/tx/undelegate-tx.ts"],"names":[],"mappings":";;;AACA,mCAMiB;AACjB,mDAAwD;AAGjD,MAAM,qBAAqB,GAAG,CACnC,WAAwB,EACxB,YAA0B,EAC1B,OAAe,EACf,MAAc,EACd,gBAAyB,EACzB,gBAAwB,EACxB,UAAkB,EAClB,EAAE;IACF,MAAM,YAAY,GAAG,IAAA,uBAAe,EAClC,WAAW,EACX,OAAO,EACP,MAAM,EACN,gBAAgB,CACjB,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,qCAAqB,EACxC,WAAW,EACX,YAAY,EACZ,OAAO,EACP,gBAAgB,EAChB,YAAY,CACb,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,IAAA,oBAAY,EAC5B,WAAW,EACX,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,SAAS,EACT;QACE,uBAAuB,EAAE,KAAK;KAC/B,CACF,CAAC;IACF,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAErC,MAAM,eAAe,GAAG,IAAA,0BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,SAAS,CAAC,YAAY,EAAE;QAC1B,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;KAC7E;IACD,eAAe,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC3C,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;IAEtE,OAAO;QACL,YAAY;QACZ,UAAU;QACV,SAAS;QACT,SAAS;QACT,eAAe;QACf,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,qBAAqB,yBAsDhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/hooks",
-  "version": "0.12.271",
+  "version": "0.12.273-alpha.0",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -18,17 +18,17 @@
   "dependencies": {
     "@ethersproject/address": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
-    "@keplr-wallet/background": "0.12.271",
-    "@keplr-wallet/common": "0.12.271",
-    "@keplr-wallet/cosmos": "0.12.271",
-    "@keplr-wallet/crypto": "0.12.271",
-    "@keplr-wallet/proto-types": "0.12.271",
-    "@keplr-wallet/simple-fetch": "0.12.271",
-    "@keplr-wallet/stores": "0.12.271",
-    "@keplr-wallet/stores-etc": "0.12.271",
-    "@keplr-wallet/stores-eth": "0.12.271",
-    "@keplr-wallet/types": "0.12.271",
-    "@keplr-wallet/unit": "0.12.271",
+    "@keplr-wallet/background": "0.12.273-alpha.0",
+    "@keplr-wallet/common": "0.12.273-alpha.0",
+    "@keplr-wallet/cosmos": "0.12.273-alpha.0",
+    "@keplr-wallet/crypto": "0.12.273-alpha.0",
+    "@keplr-wallet/proto-types": "0.12.273-alpha.0",
+    "@keplr-wallet/simple-fetch": "0.12.273-alpha.0",
+    "@keplr-wallet/stores": "0.12.273-alpha.0",
+    "@keplr-wallet/stores-etc": "0.12.273-alpha.0",
+    "@keplr-wallet/stores-eth": "0.12.273-alpha.0",
+    "@keplr-wallet/types": "0.12.273-alpha.0",
+    "@keplr-wallet/unit": "0.12.273-alpha.0",
     "buffer": "^6.0.3",
     "long": "^4.0.0",
     "utility-types": "^3.10.0"
@@ -38,5 +38,5 @@
     "mobx-utils": "^6",
     "react": "^16.8.0 || ^17 || ^18"
   },
-  "gitHead": "7aa962fc78035488affaf8557981578dfcbd1408"
+  "gitHead": "82f54a8d233e1084d89b95acfb17affb888694ed"
 }

package/src/ibc/send-ibc-transfer.ts

@@ -26,6 +26,7 @@ export const useIBCTransferConfig = (
   queriesStore: IQueriesStore,
   chainId: string,
   sender: string,
+  isEvmOrEthermint: boolean,
   initialGas: number,
   options: {
     allowHexAddressToBech32Address?: boolean;
@@ -37,7 +38,12 @@ export const useIBCTransferConfig = (
 ) => {
   const channelConfig = useIBCChannelConfig();
 
-  const senderConfig = useSenderConfig(chainGetter, chainId, sender);
+  const senderConfig = useSenderConfig(
+    chainGetter,
+    chainId,
+    sender,
+    isEvmOrEthermint
+  );
 
   const amountConfig = useIBCAmountConfig(
     chainGetter,
@@ -85,6 +91,7 @@ export const useSendMixedIBCTransferConfig = (
   queriesStore: IQueriesStore,
   chainId: string,
   sender: string,
+  isEvmOrEthermint: boolean,
   initialGas: number,
   isIBCTransfer: boolean,
   options: {
@@ -102,7 +109,12 @@ export const useSendMixedIBCTransferConfig = (
 ) => {
   const channelConfig = useIBCChannelConfig(!isIBCTransfer);
 
-  const senderConfig = useSenderConfig(chainGetter, chainId, sender);
+  const senderConfig = useSenderConfig(
+    chainGetter,
+    chainId,
+    sender,
+    isEvmOrEthermint
+  );
 
   const amountConfig = useIBCAmountConfig(
     chainGetter,

package/src/tx/delegate-tx.ts

@@ -15,11 +15,17 @@ export const useDelegateTxConfig = (
   queriesStore: QueriesStore,
   chainId: string,
   sender: string,
+  isEvmOrEthermint: boolean,
   validatorAddress: string,
   initialGas: number,
   fractionSubFeeWeight?: number
 ) => {
-  const senderConfig = useSenderConfig(chainGetter, chainId, sender);
+  const senderConfig = useSenderConfig(
+    chainGetter,
+    chainId,
+    sender,
+    isEvmOrEthermint
+  );
   const amountConfig = useAmountConfig(
     chainGetter,
     queriesStore,

package/src/tx/fee.ts

@@ -184,12 +184,7 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
 
   @computed
   get selectableFeeCurrencies(): FeeCurrency[] {
-    if (
-      this.chainInfo.bip44.coinType === 60 ||
-      this.chainInfo.hasFeature("eth-address-gen") ||
-      this.chainInfo.hasFeature("eth-key-sign") ||
-      ("evm" in this.chainInfo && this.chainInfo.evm)
-    ) {
+    if (this.senderConfig.isEvmOrEthermint) {
       return this.chainInfo.feeCurrencies.slice(0, 1);
     }
 
@@ -255,6 +250,13 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
           });
       }
     } else if (this.canFeeMarketTxFeesAndReady()) {
+      if (this.chainInfo.hasFeature("initia-dynamicfee")) {
+        return this.chainInfo.feeCurrencies.slice(0, 1);
+      }
+      if (this.chainInfo.hasFeature("evm-feemarket")) {
+        return this.chainInfo.feeCurrencies.slice(0, 1);
+      }
+
       const queryCosmos = this.queriesStore.get(this.chainId).cosmos;
       if (queryCosmos) {
         const gasPrices = queryCosmos.queryFeeMarketGasPrices.gasPrices;
@@ -475,6 +477,19 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
         ) != null
       );
     }
+    if (this.chainInfo.hasFeature("evm-feemarket")) {
+      const queries = this.queriesStore.get(this.chainId);
+      if (!queries.cosmos) {
+        console.log(
+          "Chain has evm-feemarket feature. But no cosmos queries provided."
+        );
+        return false;
+      }
+      const queryEvmFeeMarketBaseFee = queries.cosmos.queryEvmFeeMarketBaseFee;
+
+      return queryEvmFeeMarketBaseFee.baseFee != null;
+    }
+
     if (this.chainInfo.hasFeature("initia-dynamicfee")) {
       const queries = this.queriesStore.get(this.chainId);
       if (!queries.keplrETC) {
@@ -678,64 +693,7 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
           if (queryEtc) {
             const gasPrice = queryEtc.queryInitiaDynamicFee.baseGasPrice;
             if (gasPrice) {
-              let multiplication = {
-                low: 1.1,
-                average: 1.2,
-                high: 1.3,
-              };
-
-              const multificationConfig =
-                this.queriesStore.simpleQuery.queryGet<{
-                  [str: string]:
-                    | {
-                        low: number;
-                        average: number;
-                        high: number;
-                      }
-                    | undefined;
-                }>(
-                  "https://gjsttg7mkgtqhjpt3mv5aeuszi0zblbb.lambda-url.us-west-2.on.aws",
-                  "/feemarket/info.json"
-                );
-
-              if (multificationConfig.response) {
-                const _default =
-                  multificationConfig.response.data["__default__"];
-                if (
-                  _default &&
-                  _default.low != null &&
-                  typeof _default.low === "number" &&
-                  _default.average != null &&
-                  typeof _default.average === "number" &&
-                  _default.high != null &&
-                  typeof _default.high === "number"
-                ) {
-                  multiplication = {
-                    low: _default.low,
-                    average: _default.average,
-                    high: _default.high,
-                  };
-                }
-                const specific =
-                  multificationConfig.response.data[
-                    this.chainInfo.chainIdentifier
-                  ];
-                if (
-                  specific &&
-                  specific.low != null &&
-                  typeof specific.low === "number" &&
-                  specific.average != null &&
-                  typeof specific.average === "number" &&
-                  specific.high != null &&
-                  typeof specific.high === "number"
-                ) {
-                  multiplication = {
-                    low: specific.low,
-                    average: specific.average,
-                    high: specific.high,
-                  };
-                }
-              }
+              const multiplication = this.getMultiplication();
               switch (feeType) {
                 case "low":
                   return new Dec(multiplication.low).mul(new Dec(gasPrice));
@@ -746,6 +704,22 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
               }
             }
           }
+        } else if (this.chainInfo.hasFeature("evm-feemarket")) {
+          const queryCosmos = this.queriesStore.get(this.chainId).cosmos;
+          if (queryCosmos) {
+            const baseFee = queryCosmos.queryEvmFeeMarketBaseFee.baseFee;
+            if (baseFee && baseFee.amount) {
+              const multiplication = this.getMultiplication();
+              switch (feeType) {
+                case "low":
+                  return new Dec(multiplication.low).mul(baseFee.amount);
+                case "average":
+                  return new Dec(multiplication.average).mul(baseFee.amount);
+                case "high":
+                  return new Dec(multiplication.high).mul(baseFee.amount);
+              }
+            }
+          }
         } else {
           const queryCosmos = this.queriesStore.get(this.chainId).cosmos;
           if (queryCosmos) {
@@ -755,64 +729,7 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
               (gasPrice) => gasPrice.denom === feeCurrency.coinMinimalDenom
             );
             if (gasPrice) {
-              let multiplication = {
-                low: 1.1,
-                average: 1.2,
-                high: 1.3,
-              };
-
-              const multificationConfig =
-                this.queriesStore.simpleQuery.queryGet<{
-                  [str: string]:
-                    | {
-                        low: number;
-                        average: number;
-                        high: number;
-                      }
-                    | undefined;
-                }>(
-                  "https://gjsttg7mkgtqhjpt3mv5aeuszi0zblbb.lambda-url.us-west-2.on.aws",
-                  "/feemarket/info.json"
-                );
-
-              if (multificationConfig.response) {
-                const _default =
-                  multificationConfig.response.data["__default__"];
-                if (
-                  _default &&
-                  _default.low != null &&
-                  typeof _default.low === "number" &&
-                  _default.average != null &&
-                  typeof _default.average === "number" &&
-                  _default.high != null &&
-                  typeof _default.high === "number"
-                ) {
-                  multiplication = {
-                    low: _default.low,
-                    average: _default.average,
-                    high: _default.high,
-                  };
-                }
-                const specific =
-                  multificationConfig.response.data[
-                    this.chainInfo.chainIdentifier
-                  ];
-                if (
-                  specific &&
-                  specific.low != null &&
-                  typeof specific.low === "number" &&
-                  specific.average != null &&
-                  typeof specific.average === "number" &&
-                  specific.high != null &&
-                  typeof specific.high === "number"
-                ) {
-                  multiplication = {
-                    low: specific.low,
-                    average: specific.average,
-                    high: specific.high,
-                  };
-                }
-              }
+              const multiplication = this.getMultiplication();
               switch (feeType) {
                 case "low":
                   return new Dec(multiplication.low).mul(gasPrice.amount);
@@ -1067,6 +984,26 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
             };
           }
         }
+      } else if (this.chainInfo.hasFeature("evm-feemarket")) {
+        const queryCosmos = this.queriesStore.get(this.chainId).cosmos;
+        if (queryCosmos) {
+          const queryEvmFeeMarketBaseFee = queryCosmos.queryEvmFeeMarketBaseFee;
+          if (queryEvmFeeMarketBaseFee.error) {
+            return {
+              warning: new Error("Failed to fetch base fee"),
+            };
+          }
+          if (!queryEvmFeeMarketBaseFee.response) {
+            return {
+              loadingState: "loading-block",
+            };
+          }
+          if (queryEvmFeeMarketBaseFee.isFetching) {
+            return {
+              loadingState: "loading",
+            };
+          }
+        }
       } else {
         const queryCosmos = this.queriesStore.get(this.chainId).cosmos;
         if (queryCosmos) {
@@ -1280,6 +1217,65 @@ export class FeeConfig extends TxChainSetter implements IFeeConfig {
 
     return {};
   }
+
+  private getMultiplication(): { low: number; average: number; high: number } {
+    let multiplication = {
+      low: 1.1,
+      average: 1.2,
+      high: 1.3,
+    };
+
+    const multificationConfig = this.queriesStore.simpleQuery.queryGet<{
+      [str: string]:
+        | {
+            low: number;
+            average: number;
+            high: number;
+          }
+        | undefined;
+    }>(
+      "https://gjsttg7mkgtqhjpt3mv5aeuszi0zblbb.lambda-url.us-west-2.on.aws",
+      "/feemarket/info.json"
+    );
+
+    if (multificationConfig.response) {
+      const _default = multificationConfig.response.data["__default__"];
+      if (
+        _default &&
+        _default.low != null &&
+        typeof _default.low === "number" &&
+        _default.average != null &&
+        typeof _default.average === "number" &&
+        _default.high != null &&
+        typeof _default.high === "number"
+      ) {
+        multiplication = {
+          low: _default.low,
+          average: _default.average,
+          high: _default.high,
+        };
+      }
+      const specific =
+        multificationConfig.response.data[this.chainInfo.chainIdentifier];
+      if (
+        specific &&
+        specific.low != null &&
+        typeof specific.low === "number" &&
+        specific.average != null &&
+        typeof specific.average === "number" &&
+        specific.high != null &&
+        typeof specific.high === "number"
+      ) {
+        multiplication = {
+          low: specific.low,
+          average: specific.average,
+          high: specific.high,
+        };
+      }
+    }
+
+    return multiplication;
+  }
 }
 
 export const useFeeConfig = (

package/src/tx/internal.ts

@@ -12,7 +12,9 @@ export type QueriesStore = IQueriesStore<
     Partial<EthereumQueries> & {
       cosmos?: Pick<
         CosmosQueriesImpl,
-        "queryDelegations" | "queryFeeMarketGasPrices"
+        | "queryDelegations"
+        | "queryFeeMarketGasPrices"
+        | "queryEvmFeeMarketBaseFee"
       >;
     } & {
       keplrETC?: Pick<

package/src/tx/recipient.ts

@@ -180,6 +180,7 @@ export class RecipientConfig
     const isEvmChain = !!this.chainInfo.evm;
     const hasEthereumAddress =
       chainInfo.bip44.coinType === 60 ||
+      chainInfo.alternativeBIP44s?.find((bip44) => bip44.coinType === 60) ||
       !!chainInfo.features?.includes("eth-address-gen") ||
       !!chainInfo.features?.includes("eth-key-sign") ||
       isEvmChain;

package/src/tx/redelegate-tx.ts

@@ -14,10 +14,16 @@ export const useRedelegateTxConfig = (
   queriesStore: QueriesStore,
   chainId: string,
   sender: string,
+  isEvmOrEthermint: boolean,
   validatorAddress: string,
   initialGas: number
 ) => {
-  const senderConfig = useSenderConfig(chainGetter, chainId, sender);
+  const senderConfig = useSenderConfig(
+    chainGetter,
+    chainId,
+    sender,
+    isEvmOrEthermint
+  );
   const amountConfig = useStakedAmountConfig(
     chainGetter,
     queriesStore,

package/src/tx/send-tx.ts

@@ -14,6 +14,7 @@ export const useSendTxConfig = (
   queriesStore: QueriesStore,
   chainId: string,
   sender: string,
+  isEvmOrEthermint: boolean,
   initialGas: number,
   options: {
     allowHexAddressToBech32Address?: boolean;
@@ -27,7 +28,12 @@ export const useSendTxConfig = (
     computeTerraClassicTax?: boolean;
   } = {}
 ) => {
-  const senderConfig = useSenderConfig(chainGetter, chainId, sender);
+  const senderConfig = useSenderConfig(
+    chainGetter,
+    chainId,
+    sender,
+    isEvmOrEthermint
+  );
 
   const amountConfig = useAmountConfig(
     chainGetter,

package/src/tx/sender.ts

@@ -7,15 +7,19 @@ import { useState } from "react";
 export class SenderConfig extends TxChainSetter implements ISenderConfig {
   @observable
   protected _value: string = "";
+  @observable
+  protected _isEvmOrEthermint: boolean = false;
 
   constructor(
     chainGetter: ChainGetter,
     initialChainId: string,
-    initialSender: string
+    initialSender: string,
+    initialisEvmOrEthermint: boolean
   ) {
     super(chainGetter, initialChainId);
 
     this._value = initialSender;
+    this._isEvmOrEthermint = initialisEvmOrEthermint;
 
     makeObservable(this);
   }
@@ -33,6 +37,15 @@ export class SenderConfig extends TxChainSetter implements ISenderConfig {
     this._value = value;
   }
 
+  get isEvmOrEthermint(): boolean {
+    return this._isEvmOrEthermint;
+  }
+
+  @action
+  setisEvmOrEthermint(value: boolean) {
+    this._isEvmOrEthermint = value;
+  }
+
   get uiProperties(): UIProperties {
     return {};
   }
@@ -41,13 +54,15 @@ export class SenderConfig extends TxChainSetter implements ISenderConfig {
 export const useSenderConfig = (
   chainGetter: ChainGetter,
   chainId: string,
-  sender: string
+  sender: string,
+  isEvmOrEthermint: boolean
 ) => {
   const [config] = useState(
-    () => new SenderConfig(chainGetter, chainId, sender)
+    () => new SenderConfig(chainGetter, chainId, sender, isEvmOrEthermint)
   );
   config.setChain(chainId);
   config.setValue(sender);
+  config.setisEvmOrEthermint(isEvmOrEthermint);
 
   return config;
 };

package/src/tx/types.ts

@@ -42,6 +42,7 @@ export interface ISenderConfig extends ITxChainSetter {
   setValue(value: string): void;
 
   sender: string;
+  readonly isEvmOrEthermint: boolean;
 
   uiProperties: UIProperties;
 }

package/src/tx/undelegate-tx.ts

@@ -14,10 +14,16 @@ export const useUndelegateTxConfig = (
   queriesStore: QueriesStore,
   chainId: string,
   sender: string,
+  isEvmOrEthermint: boolean,
   validatorAddress: string,
   initialGas: number
 ) => {
-  const senderConfig = useSenderConfig(chainGetter, chainId, sender);
+  const senderConfig = useSenderConfig(
+    chainGetter,
+    chainId,
+    sender,
+    isEvmOrEthermint
+  );
   const amountConfig = useStakedAmountConfig(
     chainGetter,
     queriesStore,