fix: remove axios (#2304)

mateuszjasiuk · neocybereth · web-flow · commit 36249c273580 · 2025-10-23T14:38:47.000+02:00
Co-authored-by: neocybereth &lt;sean@arrowburn.co.nz&gt;
diff --git a/apps/extension/.gitignore b/apps/extension/.gitignore
@@ -2,3 +2,5 @@
 .env
 /node_modules
 /build
+.yalc
+yalc.lock
diff --git a/apps/extension/package.json b/apps/extension/package.json
@@ -35,7 +35,7 @@
     "@dao-xyz/borsh": "^5.1.5",
     "@ledgerhq/hw-transport": "^6.31.4",
     "@ledgerhq/hw-transport-webusb": "^6.29.4",
-    "@namada/sdk": "^0.20.7",
+    "@namada/sdk": "0.22.0",
     "@zondax/ledger-namada": "^2.0.0",
     "bignumber.js": "^9.1.1",
     "buffer": "^6.0.3",
@@ -54,7 +54,7 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.20.11",
-    "@namada/sdk-node": "^0.20.7",
+    "@namada/sdk-node": "^0.22.0",
     "@svgr/webpack": "^6.3.1",
     "@types/chrome": "^0.0.237",
     "@types/firefox-webext-browser": "^94.0.1",
diff --git a/apps/namadillo/.gitignore b/apps/namadillo/.gitignore
@@ -9,3 +9,5 @@
 /playwright-report/
 /playwright/.cache/
 /public/localnet-config.toml
+.yalc
+yalc.lock
diff --git a/apps/namadillo/package.json b/apps/namadillo/package.json
@@ -10,9 +10,9 @@
     "@chain-registry/client": "^1.53.5",
     "@cosmjs/encoding": "^0.32.3",
     "@keplr-wallet/types": "^0.12.136",
-    "@namada/chain-registry": "^1.3.0",
-    "@namada/indexer-client": "4.0.3",
-    "@namada/sdk-multicore": "^0.20.8",
+    "@namada/chain-registry": "^1.5.0",
+    "@namada/indexer-client": "4.0.5",
+    "@namada/sdk-multicore": "0.22.0",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tanstack/query-core": "^5.40.0",
     "@tanstack/react-query": "^5.40.0",
@@ -79,7 +79,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.9.1",
-    "@namada/sdk-node": "^0.20.8",
+    "@namada/sdk-node": "^0.22.0",
     "@namada/vite-esbuild-plugin": "^1.0.1",
     "@playwright/test": "^1.24.1",
     "@svgr/webpack": "^6.5.1",
@@ -102,7 +102,6 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@vitejs/plugin-react": "^4.3.1",
     "autoprefixer": "^10.4.16",
-    "axios": "^1.8.2",
     "dotenv": "^16.0.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
diff --git a/apps/namadillo/src/App/Common/GasFeeModal.tsx b/apps/namadillo/src/App/Common/GasFeeModal.tsx
@@ -252,7 +252,7 @@ export const GasFeeModal = ({
                   totalInDollars,
                   unitValueInDollars,
                 } = buildGasOption({
-                  gasPriceInMinDenom: item.gasPriceInMinDenom,
+                  gasPriceInMinDenom: item.gasPrice,
                   gasToken: item.token.address,
                 });
 
diff --git a/apps/namadillo/src/App/Staking/UnstakeBondingTable.tsx b/apps/namadillo/src/App/Staking/UnstakeBondingTable.tsx
@@ -88,7 +88,7 @@ export const UnstakeBondingTable = ({
           className="relative"
         >
           <AmountField
-            placeholder="Select to increase stake"
+            placeholder="Select to decrease stake"
             value={amountToUnstake.eq(0) ? undefined : amountToUnstake}
             updated={hasNewAmounts}
             forceActive={true}
diff --git a/apps/namadillo/src/App/Transfer/TransferSource.tsx b/apps/namadillo/src/App/Transfer/TransferSource.tsx
@@ -12,6 +12,10 @@ import { SelectedChain } from "./SelectedChain";
 import { SelectedWallet } from "./SelectedWallet";
 import { TokenAmountCard } from "./TokenAmountCard";
 
+export const isNamada = (chain: Chain): boolean => {
+  return ["namada", "namadahousefire"].includes(chain.chain_name);
+};
+
 export type TransferSourceProps = {
   isConnected: boolean;
   wallet?: WalletProvider;
@@ -64,7 +68,7 @@ export const TransferSource = ({
   return (
     <div className="relative bg-neutral-800 rounded-lg px-4 py-5">
       {/** Intro header - Ex: "IBC To Namada" */}
-      {onChangeShielded && chain?.chain_name === "namada" && !isSubmitting && (
+      {onChangeShielded && chain && isNamada(chain) && !isSubmitting && (
         <nav className="relative z-10 mb-6">
           <TabSelector
             active={isShieldedAddress ? "shielded" : "transparent"}
diff --git a/apps/namadillo/src/atoms/balance/atoms.ts b/apps/namadillo/src/atoms/balance/atoms.ts
@@ -18,7 +18,6 @@ import { namadaRegistryChainAssetsMapAtom } from "atoms/integrations";
 import { tokenPricesFamily } from "atoms/prices/atoms";
 import { maspIndexerUrlAtom, rpcUrlAtom } from "atoms/settings";
 import { queryDependentFn } from "atoms/utils";
-import { isAxiosError } from "axios";
 import BigNumber from "bignumber.js";
 import { sequenceT } from "fp-ts/lib/Apply";
 import { pipe } from "fp-ts/lib/function";
@@ -29,6 +28,7 @@ import { atomWithQuery } from "jotai-tanstack-query";
 import { atomWithStorage } from "jotai/utils";
 import { Address, TokenBalance } from "types";
 import { namadaAsset, toDisplayAmount } from "utils";
+import { isError404 } from "utils/http";
 import {
   mapNamadaAddressesToAssets,
   mapNamadaAssetsToTokenBalances,
@@ -59,7 +59,7 @@ const toDatedKeypair = async (
     try {
       height = await fetchBlockHeightByTimestamp(api, timestamp);
     } catch (e) {
-      if (isAxiosError(e) && e.status === 404) {
+      if (isError404(e)) {
         console.warn(
           "Failed to fetch block height by timestamp, falling back to height 0",
           e
diff --git a/apps/namadillo/src/atoms/balance/functions.ts b/apps/namadillo/src/atoms/balance/functions.ts
@@ -17,43 +17,24 @@ export const getTotalDollar = (list?: TokenBalance[]): BigNumber =>
 export const getTotalNam = (list?: TokenBalance[]): BigNumber =>
   list?.find((i) => isNamadaAsset(i.asset))?.amount ?? new BigNumber(0);
 
-// Type to handle both balance data structures
-type BalanceItem = Balance | { tokenAddress: string; minDenomAmount: string };
-
 export const mapNamadaAddressesToAssets = ({
   balances,
   assets,
 }: {
-  balances: BalanceItem[];
+  balances: Balance[];
   assets: NamadaAsset[];
 }): Record<Address, NamadaAssetWithAmount> => {
   const map: Record<Address, NamadaAssetWithAmount> = {};
   balances.forEach((item) => {
-    // Handle both data structures temporarily:
-    // 1. {token: {address: '...'}, minDenomAmount: '...'}
-    // 2. {tokenAddress: '...', minDenomAmount: '...'}
-    let tokenAddress: string | undefined;
-
-    if ("token" in item && item.token?.address) {
-      tokenAddress = item.token.address;
-    } else if ("tokenAddress" in item) {
-      tokenAddress = item.tokenAddress;
-    }
-
-    if (!tokenAddress) {
-      return;
-    }
-
-    const asset = assets.find((asset) => asset.address === tokenAddress);
+    const asset = assets.find((asset) => asset.address === item.token.address);
 
     if (asset) {
-      map[tokenAddress] = {
+      map[item.token.address] = {
         amount: toDisplayAmount(asset, BigNumber(item.minDenomAmount)),
         asset,
       };
     }
   });
-
   return map;
 };
 
diff --git a/apps/namadillo/src/atoms/fees/atoms.ts b/apps/namadillo/src/atoms/fees/atoms.ts
@@ -13,10 +13,12 @@ import { atomFamily } from "jotai/utils";
 import { isPublicKeyRevealed } from "lib/query";
 import isEqual from "lodash.isequal";
 import { TxKind } from "types/txKind";
+import { isNamadaAsset, toDisplayAmount } from "utils";
 import { fetchGasEstimate, fetchTokensGasPrice } from "./services";
 
 export type GasPriceTableItem = {
   token: ApiV1ChainTokenGet200ResponseInner;
+  gasPrice: BigNumber;
   gasPriceInMinDenom: BigNumber;
 };
 
@@ -68,12 +70,16 @@ export const gasPriceTableAtom = atomWithQuery<GasPriceTable>((get) => {
       return (
         response
           // filter only tokens that exists on the chain
-          .filter(({ token }) => Boolean(chainAssetsMap.data[token]))
+          .filter(({ token }) => Boolean(chainAssetsMap.data[token.address]))
           .map(({ token, minDenomAmount }) => {
+            const asset = chainAssetsMap.data[token.address];
             const baseAmount = BigNumber(minDenomAmount);
-            // Transform string address to token object format
             return {
-              token: { address: token } as ApiV1ChainTokenGet200ResponseInner,
+              token,
+              gasPrice:
+                asset && isNamadaAsset(asset) ?
+                  toDisplayAmount(asset, baseAmount)
+                : baseAmount,
               gasPriceInMinDenom: baseAmount,
             };
           })
diff --git a/apps/namadillo/src/atoms/fees/services.ts b/apps/namadillo/src/atoms/fees/services.ts
@@ -1,13 +1,10 @@
-import { DefaultApi, GasEstimate } from "@namada/indexer-client";
+import {
+  DefaultApi,
+  GasEstimate,
+  GasPriceTableInner,
+} from "@namada/indexer-client";
 import { TxKind } from "types/txKind";
 
-// Type for the actual API response - token is a string address
-// Note: The API type definition is incorrect (says it's an object), but server returns a string
-export type GasPriceResponse = {
-  token: string;
-  minDenomAmount: string;
-};
-
 export const fetchGasEstimate = async (
   api: DefaultApi,
   txKinds: TxKind[]
@@ -48,9 +45,6 @@ export const fetchGasEstimate = async (
 
 export const fetchTokensGasPrice = async (
   api: DefaultApi
-): Promise<GasPriceResponse[]> => {
-  const response = await api.apiV1GasPriceGet();
-  // The API type definition is wrong - it says token is an object, but server returns a string
-  // Cast the response to match the actual runtime data
-  return response.data as unknown as GasPriceResponse[];
+): Promise<GasPriceTableInner[]> => {
+  return (await api.apiV1GasPriceGet()).data;
 };
diff --git a/apps/namadillo/src/atoms/prices/atoms.ts b/apps/namadillo/src/atoms/prices/atoms.ts
@@ -1,3 +1,6 @@
+import { namadaRegistryChainAssetsMapAtom } from "atoms/integrations";
+import { queryDependentFn } from "atoms/utils";
+import invariant from "invariant";
 import { atomWithQuery } from "jotai-tanstack-query";
 import { atomFamily } from "jotai/utils";
 import isEqual from "lodash.isequal";
@@ -6,10 +9,15 @@ import { fetchTokenPrices } from "./functions";
 
 export const tokenPricesFamily = atomFamily(
   (addresses: Address[]) =>
-    atomWithQuery(() => {
+    atomWithQuery((get) => {
+      const chainAssetsMap = get(namadaRegistryChainAssetsMapAtom);
+
       return {
-        queryKey: ["token-prices", addresses],
-        queryFn: () => fetchTokenPrices(addresses),
+        queryKey: ["token-prices", addresses, chainAssetsMap.data],
+        ...queryDependentFn(async () => {
+          invariant(chainAssetsMap.data, "No chain assets");
+          return fetchTokenPrices(addresses, chainAssetsMap.data);
+        }, [chainAssetsMap]),
       };
     }),
   isEqual
diff --git a/apps/namadillo/src/atoms/prices/functions.ts b/apps/namadillo/src/atoms/prices/functions.ts
@@ -1,17 +1,16 @@
 import { getIbcAssetByNamadaAsset } from "atoms/integrations";
 import BigNumber from "bignumber.js";
-import namadaAssets from "chain-registry/mainnet/namada/assets";
 import * as osmosisAssets from "chain-registry/mainnet/osmosis";
 import { Address, BaseDenom, NamadaAsset } from "types";
 import { fetchCoinPrices } from "./services";
 
 export const fetchTokenPrices = async (
-  tokenAddressToFetch: Address[]
+  tokenAddressToFetch: Address[],
+  namadaAssetsMap: Record<Address, NamadaAsset>
 ): Promise<Record<Address, BigNumber>> => {
   const baseMap: Record<BaseDenom, Address[]> = {};
   tokenAddressToFetch.forEach((address) => {
-    const namadaAssetsRegistry = namadaAssets.assets as NamadaAsset[];
-    const token = namadaAssetsRegistry.find((t) => t.address === address);
+    const token = namadaAssetsMap[address];
     const osmosisRegistryAssets = osmosisAssets.assets.assets;
     if (token) {
       // searching only on osmosis because these are the assets supported by fetchCoinPrices
diff --git a/apps/namadillo/src/atoms/transfer/services.ts b/apps/namadillo/src/atoms/transfer/services.ts
@@ -102,33 +102,6 @@ export const createTransparentTransferTx = async (
   );
 };
 
-const getMaspFeePaymentProps = (
-  source: string,
-  signerAddress: string,
-  gasConfig: GasConfig,
-  bparams?: BparamsMsgValue[]
-): UnshieldingTransferProps & {
-  memo: string;
-} => {
-  const feePaymentMsgValue: UnshieldingTransferProps = {
-    source,
-    data: [
-      {
-        target: signerAddress,
-        token: gasConfig.gasToken,
-        amount: gasConfig.gasPriceInMinDenom.times(gasConfig.gasLimit),
-      },
-    ],
-    bparams,
-    skipFeeCheck: true,
-  };
-  const feePaymentMsgValueWithMemo = {
-    ...feePaymentMsgValue,
-    memo: "MASP_FEE_PAYMENT",
-  };
-  return feePaymentMsgValueWithMemo;
-};
-
 /**
  * "Shielded transfer" refers to transfers between two shielded addresses.
  */
@@ -141,8 +114,7 @@ export const createShieldedTransferTx = async (
   disposableSigner: GenDisposableSignerResponse,
   memo?: string
 ): Promise<EncodedTxData<ShieldedTransferProps> | undefined> => {
-  const { publicKey: signerPublicKey, address: signerAddress } =
-    disposableSigner;
+  const { publicKey: signerPublicKey } = disposableSigner;
   const source = props[0]?.data[0]?.source;
   const destination = props[0]?.data[0]?.target;
   const token = props[0]?.data[0]?.token;
@@ -167,18 +139,6 @@ export const createShieldedTransferTx = async (
         bparams,
       };
 
-      const maspFeePaymentProps = (() => {
-        if (!isLedgerAccount) {
-          msgValue.skipFeeCheck = true;
-          return getMaspFeePaymentProps(
-            source,
-            signerAddress,
-            gasConfig,
-            bparams
-          );
-        }
-      })();
-
       const msg: ShieldedTransfer = {
         type: "shielded-transfer",
         payload: {
@@ -190,7 +150,6 @@ export const createShieldedTransferTx = async (
           props: [msgValue],
           chain,
           memo,
-          maspFeePaymentProps,
         },
       };
       return (await workerLink.shieldedTransfer(msg)).payload;
@@ -261,8 +220,7 @@ export const createUnshieldingTransferTx = async (
   disposableSigner: GenDisposableSignerResponse,
   memo?: string
 ): Promise<EncodedTxData<UnshieldingTransferProps> | undefined> => {
-  const { publicKey: signerPublicKey, address: signerAddress } =
-    disposableSigner;
+  const { publicKey: signerPublicKey } = disposableSigner;
 
   const source = props[0]?.source;
   const destination = props[0]?.data[0]?.target;
@@ -289,18 +247,6 @@ export const createUnshieldingTransferTx = async (
         bparams,
       };
 
-      const maspFeePaymentProps = (() => {
-        if (!isLedgerAccount) {
-          msgValue.skipFeeCheck = true;
-          return getMaspFeePaymentProps(
-            source,
-            signerAddress,
-            gasConfig,
-            bparams
-          );
-        }
-      })();
-
       const msg: Unshield = {
         type: "unshield",
         payload: {
@@ -312,7 +258,6 @@ export const createUnshieldingTransferTx = async (
           props: [msgValue],
           chain,
           memo,
-          maspFeePaymentProps,
         },
       };
       return (await workerLink.unshield(msg)).payload;
diff --git a/apps/namadillo/src/hooks/useTransactionFee/useTransactionFee.ts b/apps/namadillo/src/hooks/useTransactionFee/useTransactionFee.ts
diff --git a/apps/namadillo/src/lib/query.ts b/apps/namadillo/src/lib/query.ts
diff --git a/apps/namadillo/src/utils/gas.ts b/apps/namadillo/src/utils/gas.ts
diff --git a/apps/namadillo/src/workers/MaspTxWorker.ts b/apps/namadillo/src/workers/MaspTxWorker.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export const UnstakeBondingTable = ({`
`88`	`88`	`className="relative"`
`89`	`89`	`>`
`90`	`90`	`<AmountField`
`91`		`- placeholder="Select to increase stake"`
	`91`	`+ placeholder="Select to decrease stake"`
`92`	`92`	`value={amountToUnstake.eq(0) ? undefined : amountToUnstake}`
`93`	`93`	`updated={hasNewAmounts}`
`94`	`94`	`forceActive={true}`