feat: fix names and refactor

Author: mateuszjasiuk

apps/namadillo/public/config.toml

@@ -5,12 +5,12 @@
 #localnet_enabled = false
 #fathom_site_id = ""
 
-[server_fee.*]
-transparent_target = "tnam1qrku7yxdt6d23nhe826ntukygzkfyczuu5mm0yll"
-shielded_target = "znam175uaqlukleyjjyfcccehp2pw3g696a57skewlv0fenldlw702gtjd6qkpjs09zxl6jafsz3e73h"
+[frontend_fee."*"]
+transparent_target = "tnam1qrxsru5rdu4he400xny6p779fcw7xuftsgjnmzup"
+shielded_target = "znam1494fmm9qd4frr7jrydnxlcyt57nhngzutxnzgh6y70mkvh23d9z0jk2aasxh4p8dn2kczlgpans"
 percentage = 0.1
 
-[server_fee.tnam1p54697ljxkw3ptffwy8xjhua9uwjc7kk9cc6fxnw]
+[frontend_fee.tnam1p54697ljxkw3ptffwy8xjhua9uwjc7kk9cc6fxnw]
 transparent_target = "tnam1qrku7yxdt6d23nhe826ntukygzkfyczuu5mm0yll"
 shielded_target = "znam175uaqlukleyjjyfcccehp2pw3g696a57skewlv0fenldlw702gtjd6qkpjs09zxl6jafsz3e73h"
 percentage = 0.5

apps/namadillo/src/App/Ibc/IbcTransfer.tsx

@@ -69,11 +69,7 @@ export const IbcTransfer = ({
   const { trackEvent } = useFathomTracker();
   const { storeTransaction } = useTransactionActions();
 
-  const {
-    transferToNamada,
-    gasConfig: gasConfigQuery,
-    frontendFeeConfig,
-  } = useIbcTransaction({
+  const { transferToNamada, gasConfig, frontendFee } = useIbcTransaction({
     registry,
     sourceAddress,
     sourceChannel,
@@ -82,16 +78,6 @@ export const IbcTransfer = ({
     selectedAsset: selectedAssetWithAmount?.asset,
   });
 
-  // Transfer module expects gasToken to be address of the token on the side of namada
-  const gasConfig = useMemo(() => {
-    if (gasConfigQuery.data && selectedAssetWithAmount?.asset.address) {
-      return {
-        ...gasConfigQuery.data,
-        gasToken: selectedAssetWithAmount.asset.address,
-      };
-    }
-  }, [gasConfigQuery.data, selectedAssetWithAmount?.asset.address]);
-
   // DERIVED VALUES
   const shielded = isShieldedAddress(destinationAddress ?? "");
   const availableDisplayAmount = mapUndefined((baseDenom) => {
@@ -175,8 +161,8 @@ export const IbcTransfer = ({
           isShieldedAddress: shielded,
           onChangeAddress: setDestinationAddress,
         }}
-        gasConfig={gasConfig}
-        frontendFeeConfig={frontendFeeConfig}
+        gasConfig={gasConfig.data}
+        frontendFee={frontendFee}
         isSubmitting={
           transferToNamada.isPending ||
           /* isSuccess means that the transaction has been broadcasted, but doesn't take

apps/namadillo/src/App/Swap/hooks/usePerformOsmosisSwapTx.tsx

@@ -181,6 +181,7 @@ export function usePerformOsmosisSwapTx(): UsePerformOsmosisSwapResult {
           account: transparentAccount,
           params: [params],
           gasConfig: feeProps.gasConfig,
+          frontendFee: feeProps.frontendFee,
         });
 
         setStatus(SwapStatus.awaitingSignature());

apps/namadillo/src/App/Transfer/TransferModule.tsx

@@ -51,7 +51,7 @@ export const TransferModule = ({
   currentStatus,
   currentStatusExplanation,
   gasConfig: gasConfigProp,
-  frontendFeeConfig: frontendFeeConfigProp,
+  frontendFee: frontendFeeProp,
   onSubmitTransfer,
   completedAt,
   onComplete,
@@ -124,8 +124,7 @@ export const TransferModule = ({
 
   // We have to do this to get correct config for ibc deposits
   const gasConfig = gasConfigProp ?? feeProps?.gasConfig;
-  const frontendFeeConfig =
-    frontendFeeConfigProp ?? feeProps?.frontendFeeConfig;
+  const frontendFee = frontendFeeProp ?? feeProps?.frontendFee;
 
   const displayGasFee = useMemo(() => {
     return gasConfig ?
@@ -143,8 +142,9 @@ export const TransferModule = ({
         .decimalPlaces(6);
     }
 
+    // TODO: move this code
     const frontendSusFee =
-      frontendFeeConfig?.[selectedAsset.asset.address || "default"];
+      frontendFee?.[selectedAsset.asset.address || "default"];
 
     if (frontendSusFee && (isShielding || isUnshielding)) {
       amountMinusFees = amountMinusFees

apps/namadillo/src/App/Transfer/types.ts

@@ -8,7 +8,7 @@ import {
   Asset,
   AssetWithAmountAndChain,
   ChainRegistryEntry,
-  FrontendFeeConfig,
+  FrontendFee,
   GasConfig,
   LedgerAccountInfo,
   WalletProvider,
@@ -59,7 +59,7 @@ export type TransferModuleProps = {
   errorMessage?: string;
   // Fee overrides - used for IBC deposits only
   gasConfig?: GasConfig;
-  frontendFeeConfig?: FrontendFeeConfig;
+  frontendFee?: FrontendFee;
   currentStatus: string;
   currentStatusExplanation?: string;
   onSubmitTransfer: (params: OnSubmitTransferParams) => Promise<void>;

apps/namadillo/src/atoms/fees/services.ts

@@ -5,7 +5,7 @@ import {
 } from "@namada/indexer-client";
 import { FrontendSusFeeProps } from "@namada/sdk-multicore";
 import { assertNever } from "@namada/utils";
-import { FrontendFeeConfig } from "types";
+import { FrontendFee } from "types";
 import { TxKind } from "types/txKind";
 
 export const fetchGasEstimate = async (
@@ -53,12 +53,12 @@ export const fetchTokensGasPrice = async (
 };
 
 export const frontendSusMsgFromConfig = (
-  frontendFeeConfig: FrontendFeeConfig,
+  frontendFee: FrontendFee,
   token: string,
   whichTarget: "shielded" | "transparent"
 ): FrontendSusFeeProps => {
   const { percentage, shieldedTarget, transparentTarget } =
-    frontendFeeConfig[token] || frontendFeeConfig["*"];
+    frontendFee[token] || frontendFee["*"];
 
   const target =
     whichTarget === "shielded" ? shieldedTarget

apps/namadillo/src/atoms/integrations/services.ts

@@ -17,7 +17,7 @@ import {
 import { getIndexerApi } from "atoms/api";
 import { chainParametersAtom } from "atoms/chain";
 import { frontendSusMsgFromConfig } from "atoms/fees";
-import { rpcUrlAtom, serverFeeAtom } from "atoms/settings";
+import { frontendFeeAtom, rpcUrlAtom } from "atoms/settings";
 import { queryForAck, queryForIbcTimeout } from "atoms/transactions";
 import BigNumber from "bignumber.js";
 import * as Comlink from "comlink";
@@ -75,7 +75,7 @@ export const getShieldedArgs = async (
   const store = getDefaultStore();
   const rpcUrl = store.get(rpcUrlAtom);
   const chain = store.get(chainParametersAtom);
-  const frontendFeeConfig = store.get(serverFeeAtom);
+  const frontendFee = store.get(frontendFeeAtom);
 
   if (!chain.isSuccess) throw "Chain not loaded";
 
@@ -87,9 +87,10 @@ export const getShieldedArgs = async (
   });
 
   const frontendSusFee = frontendSusMsgFromConfig(
-    frontendFeeConfig,
+    frontendFee,
     namadaToken,
-    "transparent"
+    // For IBC shielding, the fee is always deposited into shielded pool
+    "shielded"
   );
 
   const msg: GenerateIbcShieldingMemo = {

apps/namadillo/src/atoms/settings/atoms.ts

@@ -179,11 +179,11 @@ export const maspIndexerUrlAtom = atom((get) => {
 });
 
 // TODO: figure out where to have this atom
-export const serverFeeAtom = atom((get) => {
-  const serverFee = get(defaultServerConfigAtom).data?.server_fee;
+export const frontendFeeAtom = atom((get) => {
+  const frontendFee = get(defaultServerConfigAtom).data?.frontend_fee;
   // TODO: validate with schema
   return pipe(
-    serverFee ?? {},
+    frontendFee ?? {},
     R.map((fee) => ({
       transparentTarget: fee.transparent_target,
       shieldedTarget: fee.shielded_target,

apps/namadillo/src/atoms/transfer/atoms.ts

@@ -103,16 +103,16 @@ export const createShieldingTransferAtom = atomWithMutation((get) => {
       gasConfig,
       account,
       memo,
-      frontendFeeConfig,
+      frontendFee,
     }: BuildTxAtomParams<ShieldingTransferProps>) =>
       createShieldingTransferTx(
         chain.data!,
         account,
         params,
         gasConfig,
         rpcUrl,
-        memo,
-        frontendFeeConfig
+        frontendFee,
+        memo
       ),
   };
 });
@@ -130,8 +130,8 @@ export const createUnshieldingTransferAtom = atomWithMutation((get) => {
       gasConfig,
       account,
       signer,
+      frontendFee,
       memo,
-      frontendFeeConfig,
     }: BuildTxAtomParams<UnshieldingTransferProps>) => {
       invariant(
         signer,
@@ -153,8 +153,8 @@ export const createUnshieldingTransferAtom = atomWithMutation((get) => {
         gasConfig,
         rpcUrl,
         signer,
-        memo,
-        frontendFeeConfig
+        frontendFee,
+        memo
       );
     },
   };
@@ -225,7 +225,7 @@ export const createIbcTxAtom = atomWithMutation((get) => {
       account,
       signer,
       memo,
-      frontendFeeConfig,
+      frontendFee,
     }: BuildTxAtomParams<IbcTransferProps>) => {
       invariant(
         signer,
@@ -241,8 +241,8 @@ export const createIbcTxAtom = atomWithMutation((get) => {
         gasConfig,
         rpcUrl,
         signer?.publicKey,
-        memo,
-        frontendFeeConfig
+        frontendFee,
+        memo
       );
     },
   };

apps/namadillo/src/atoms/transfer/services.ts

@@ -18,7 +18,7 @@ import BigNumber from "bignumber.js";
 import * as Comlink from "comlink";
 import { NamadaKeychain } from "hooks/useNamadaKeychain";
 import { buildTx, EncodedTxData, isPublicKeyRevealed } from "lib/query";
-import { Address, ChainSettings, FrontendFeeConfig, GasConfig } from "types";
+import { Address, ChainSettings, FrontendFee, GasConfig } from "types";
 import { getSdkInstance } from "utils/sdk";
 import {
   IbcTransfer,
@@ -169,7 +169,7 @@ export const createShieldingTransferTx = async (
   props: ShieldingTransferProps[],
   gasConfig: GasConfig,
   rpcUrl: string,
-  frontendFeeConfig: FrontendFeeConfig,
+  frontendFee: FrontendFee,
   memo?: string
 ): Promise<EncodedTxData<ShieldingTransferProps> | undefined> => {
   const source = props[0]?.data[0]?.source;
@@ -192,7 +192,7 @@ export const createShieldingTransferTx = async (
     buildTxFn: async (workerLink) => {
       const publicKeyRevealed = await isPublicKeyRevealed(account.address);
       const frontendSusFee = frontendSusMsgFromConfig(
-        frontendFeeConfig,
+        frontendFee,
         token,
         "transparent"
       );
@@ -228,7 +228,7 @@ export const createUnshieldingTransferTx = async (
   gasConfig: GasConfig,
   rpcUrl: string,
   disposableSigner: GenDisposableSignerResponse,
-  frontendFeeConfig: FrontendFeeConfig,
+  frontendFee: FrontendFee,
   memo?: string
 ): Promise<EncodedTxData<UnshieldingTransferProps> | undefined> => {
   const { publicKey: signerPublicKey } = disposableSigner;
@@ -253,7 +253,7 @@ export const createUnshieldingTransferTx = async (
     nativeToken: chain.nativeTokenAddress,
     buildTxFn: async (workerLink) => {
       const frontendSusFee = frontendSusMsgFromConfig(
-        frontendFeeConfig,
+        frontendFee,
         token,
         "transparent"
       );
@@ -289,7 +289,7 @@ export const createIbcTx = async (
   gasConfig: GasConfig,
   rpcUrl: string,
   signerPublicKey: string,
-  frontendFeeConfig: FrontendFeeConfig,
+  frontendFee: FrontendFee,
   memo?: string
 ): Promise<EncodedTxData<IbcTransferProps>> => {
   let bparams: BparamsMsgValue[] | undefined;
@@ -305,11 +305,11 @@ export const createIbcTx = async (
     nativeToken: chain.nativeTokenAddress,
     buildTxFn: async (workerLink) => {
       const firstProps = props[0];
-      const frontendSusFee = frontendSusMsgFromConfig(
-        frontendFeeConfig,
-        firstProps.token,
-        "transparent"
-      );
+      const isUnshielding = firstProps.gasSpendingKey === firstProps.source;
+      const frontendSusFee =
+        isUnshielding ?
+          frontendSusMsgFromConfig(frontendFee, firstProps.token, "transparent")
+        : undefined;
       const msgValue: IbcTransferProps = {
         ...firstProps,
         gasSpendingKey: firstProps.gasSpendingKey,