feat: wip pay fees for masp with transparent balance

Author: mateuszjasiuk

apps/extension/src/background/keyring/keyring.ts

@@ -722,10 +722,11 @@ export class KeyRing {
       : await this.getSigningKey(signer);
 
     // If disposable key is provided, use it to map real address to spending key
-    const spendingKeys =
-      disposableKey ?
-        [await this.getSpendingKey(disposableKey.realAddress)]
-      : [];
+    const spendingKeys = [
+      await this.getSpendingKey(
+        disposableKey ? disposableKey.realAddress : signer
+      ),
+    ];
 
     const { signing } = this.sdkService.getSdk();
 

apps/namadillo/src/App/Common/GasFeeModal.tsx

@@ -2,7 +2,9 @@ import {
   ActionButton,
   AmountInput,
   Modal,
+  Stack,
   StyledSelectBox,
+  ToggleButton,
 } from "@namada/components";
 import { chainAssetsMapAtom, nativeTokenAddressAtom } from "atoms/chain";
 import { GasPriceTable, GasPriceTableItem } from "atoms/fees/atoms";
@@ -92,8 +94,10 @@ export const GasFeeModal = ({
     gasConfig,
     gasEstimate,
     gasPriceTable,
+    gasSource,
     onChangeGasLimit,
     onChangeGasToken,
+    onChangeGasSource,
   } = feeProps;
 
   const sortByNativeToken = useSortByNativeToken();
@@ -165,7 +169,28 @@ export const GasFeeModal = ({
           })}
         </div>
 
-        <div className="text-sm mt-4 mb-1">Fee Token</div>
+        <Stack
+          direction="horizontal"
+          className="justify-between align-middle mt-4 mb-1"
+        >
+          <div className="text-sm">Fee Token</div>
+          <ToggleButton
+            label={
+              gasSource === "shielded" ? "Shielded Balance" : (
+                "Transparent Balance"
+              )
+            }
+            color="white"
+            activeColor="yellow"
+            checked={gasSource === "shielded"}
+            onChange={() =>
+              onChangeGasSource(
+                gasSource === "shielded" ? "transparent" : "shielded"
+              )
+            }
+            containerProps={{ className: "gap-3 text-xs" }}
+          />
+        </Stack>
         <StyledSelectBox
           id="fee-token-select"
           value={gasConfig.gasToken}

apps/namadillo/src/App/WorkerTest.tsx

@@ -122,11 +122,6 @@ export const createUnshieldingTransferAtom = atomWithMutation((get) => {
       signer,
       memo,
     }: BuildTxAtomParams<UnshieldingTransferMsgValue>) => {
-      invariant(
-        signer,
-        "Disposable signer is required for unshielding transfers"
-      );
-
       await sync(
         allViewingKeys,
         chainId,
@@ -187,12 +182,11 @@ const sync = async (
   invariant(chainId, "Chain ID is required for shielded sync");
   invariant(namTokenAddress, "NAM token address is required for shielded sync");
   invariant(rpcUrl, "RPC URL is required for shielded sync");
-  invariant(maspIndexerUrl, "Masp indexer URL is required for shielded sync");
 
   const { set } = getDefaultStore();
   await shieldedSync({
     rpcUrl,
-    maspIndexerUrl,
+    maspIndexerUrl: maspIndexerUrl || "",
     token: namTokenAddress,
     viewingKeys: allViewingKeys,
     chainId,

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

@@ -176,13 +176,15 @@ export const createUnshieldingTransferTx = async (
   props: UnshieldingTransferMsgValue[],
   gasConfig: GasConfig,
   rpcUrl: string,
-  disposableSigner: GenDisposableSignerResponse,
+  signer?: GenDisposableSignerResponse,
   memo?: string
 ): Promise<EncodedTxData<UnshieldingTransferProps> | undefined> => {
   const source = props[0]?.source;
   const destination = props[0]?.data[0]?.target;
   const token = props[0]?.data[0]?.token;
   const amount = props[0]?.data[0]?.amount;
+  const accountWithSigner =
+    signer ? { ...account, publicKey: signer.publicKey } : account;
 
   return await workerBuildTxPair({
     rpcUrl,
@@ -196,10 +198,7 @@ export const createUnshieldingTransferTx = async (
       const msg: Unshield = {
         type: "unshield",
         payload: {
-          account: {
-            ...account,
-            publicKey: disposableSigner.publicKey,
-          },
+          account: accountWithSigner,
           gasConfig,
           props: [msgValue],
           chain,

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

@@ -44,7 +44,7 @@ export type UseTransactionPropsEvents<T> = {
 export type UseTransactionProps<T> = {
   params: T[];
   createTxAtom: AtomType<T>;
-  useDisposableSigner?: boolean;
+  canUseDisposableSigner?: boolean;
   eventType: TransactionEventsClasses;
   parsePendingTxNotification?: (tx: TransactionPair<T>) => PartialNotification;
   parseErrorTxNotification?: () => PartialNotification;
@@ -66,7 +66,7 @@ export type UseTransactionOutput<T> = {
 export const useTransaction = <T,>({
   params,
   createTxAtom,
-  useDisposableSigner,
+  canUseDisposableSigner,
   eventType,
   parsePendingTxNotification,
   parseErrorTxNotification,
@@ -126,6 +126,8 @@ export const useTransaction = <T,>({
       );
 
       const txAdditionalParams = { ...additionalParams };
+      const useDisposableSigner =
+        canUseDisposableSigner && feeProps.gasSource === "shielded";
       if (useDisposableSigner) {
         onBeforeCreateDisposableSigner?.();
         txAdditionalParams.signer = await getDisposableSigner();