feat(BA-2555): Set primary flow for EOAs in Web

apps/web/src/components/Basenames/ManageNames/NameDisplay.tsx

@@ -59,13 +59,13 @@ export default function NameDisplay({
   const expirationText = formatDistanceToNow(parseISO(expiresAt), { addSuffix: true });
   const name = domain.split('.')[0];
 
-  const { setPrimaryUsername } = useUpdatePrimaryName(domain as Basename);
+  const { removeNameFromUI } = useRemoveNameFromUI();
+  const { setPrimaryUsername, isPending } = useUpdatePrimaryName(domain as Basename);
 
   // Transfer state and callbacks
   const [isTransferModalOpen, setIsTransferModalOpen] = useState<boolean>(false);
   const openTransferModal = useCallback(() => setIsTransferModalOpen(true), []);
   const closeTransferModal = useCallback(() => setIsTransferModalOpen(false), []);
-  const { removeNameFromUI } = useRemoveNameFromUI(domain as Basename);
 
   // Renewal state and callbacks
   const [isRenewalModalOpen, setIsRenewalModalOpen] = useState<boolean>(false);
@@ -102,7 +102,12 @@ export default function NameDisplay({
         </Link>
         <div className="flex items-center gap-2">
           {isPrimary && (
-            <span className="rounded-full bg-white px-2 py-1 text-sm text-black">Primary</span>
+            <span className="flex items-center gap-2 rounded-full bg-white px-2 py-1 text-sm text-black">
+              {isPending ? (
+                <Icon name="spinner" color="currentColor" width="12px" height="12px" />
+              ) : null}
+              <span>Primary</span>
+            </span>
           )}
           <Dropdown>
             <DropdownToggle>

apps/web/src/components/Basenames/ManageNames/hooks.tsx

@@ -43,6 +43,7 @@ export function useNameList() {
       }
     },
     enabled: !!address,
+    placeholderData: (prev) => prev,
   });
 
   // Navigation functions
@@ -102,21 +103,16 @@ export function useNameList() {
   };
 }
 
-export function useRemoveNameFromUI(domain: Basename) {
+export function useRemoveNameFromUI() {
   const { address } = useAccount();
   const chainId = useChainId();
 
   const network = chainId === 8453 ? 'base-mainnet' : 'base-sepolia';
   const queryClient = useQueryClient();
 
   const removeNameFromUI = useCallback(() => {
-    queryClient.setQueryData(
-      ['usernames', address, network],
-      (prevData: ManagedAddressesResponse) => {
-        return { ...prevData, data: prevData.data.filter((name) => name.domain !== domain) };
-      },
-    );
-  }, [address, domain, network, queryClient]);
+    void queryClient.invalidateQueries({ queryKey: ['usernames', address, network] });
+  }, [address, network, queryClient]);
 
   return { removeNameFromUI };
 }
@@ -131,38 +127,25 @@ export function useUpdatePrimaryName(domain: Basename) {
   const network = chainId === 8453 ? 'base-mainnet' : 'base-sepolia';
 
   // Hook to update primary name
-  const { setPrimaryName, transactionIsSuccess } = useSetPrimaryBasename({
+  const { setPrimaryName, transactionIsSuccess, transactionPending } = useSetPrimaryBasename({
     secondaryUsername: domain,
   });
 
   const setPrimaryUsername = useCallback(async () => {
     try {
       await setPrimaryName();
+      void queryClient.invalidateQueries({ queryKey: ['usernames', address, network] });
     } catch (error) {
       logError(error, 'Failed to update primary name');
       throw error;
     }
-  }, [logError, setPrimaryName]);
+  }, [address, network, logError, queryClient, setPrimaryName]);
 
   useEffect(() => {
     if (transactionIsSuccess) {
-      queryClient.setQueryData(
-        ['usernames', address, network],
-        (prevData: ManagedAddressesResponse) => {
-          return {
-            ...prevData,
-            data: prevData.data.map((name) =>
-              name.domain === domain
-                ? { ...name, is_primary: true }
-                : name.is_primary
-                ? { ...name, is_primary: false }
-                : name,
-            ),
-          };
-        },
-      );
+      void queryClient.invalidateQueries({ queryKey: ['usernames', address, network] });
     }
-  }, [transactionIsSuccess, address, domain, network, queryClient]);
+  }, [transactionIsSuccess, address, network, queryClient]);
 
-  return { setPrimaryUsername };
+  return { setPrimaryUsername, isPending: transactionPending, transactionIsSuccess };
 }

apps/web/src/hooks/useSetPrimaryBasename.ts

@@ -5,16 +5,20 @@ import {
   USERNAME_REVERSE_REGISTRAR_ADDRESSES,
 } from 'apps/web/src/addresses/usernames';
 import useBasenameChain from 'apps/web/src/hooks/useBasenameChain';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { Basename } from '@coinbase/onchainkit/identity';
-import { useAccount } from 'wagmi';
+import { useAccount, useSignMessage } from 'wagmi';
 import useBaseEnsName from 'apps/web/src/hooks/useBaseEnsName';
 import { useErrors } from 'apps/web/contexts/Errors';
 import useWriteContractWithReceipt from 'apps/web/src/hooks/useWriteContractWithReceipt';
 import { useUsernameProfile } from 'apps/web/src/components/Basenames/UsernameProfileContext';
 import useWriteContractsWithLogs from 'apps/web/src/hooks/useWriteContractsWithLogs';
 import useCapabilitiesSafe from 'apps/web/src/hooks/useCapabilitiesSafe';
 import L2ReverseRegistrarAbi from 'apps/web/src/abis/L2ReverseRegistrarAbi';
+import UpgradeableRegistrarControllerAbi from 'apps/web/src/abis/UpgradeableRegistrarControllerAbi';
+import { UPGRADEABLE_REGISTRAR_CONTROLLER_ADDRESSES } from 'apps/web/src/addresses/usernames';
+import { type AbiFunction } from 'viem';
+import { buildReverseRegistrarSignatureDigest } from 'apps/web/src/utils/usernames';
 
 /*
   A hook to set a name as primary for resolution.
@@ -38,6 +42,9 @@ export default function useSetPrimaryBasename({ secondaryUsername }: UseSetPrima
   const { paymasterService: paymasterServiceEnabled } = useCapabilitiesSafe({
     chainId: secondaryUsernameChain.id,
   });
+  const { signMessageAsync } = useSignMessage();
+
+  const [signatureError, setSignatureError] = useState<Error | null>(null);
 
   // Get current primary username
   // Note: This is sometimes undefined
@@ -65,6 +72,28 @@ export default function useSetPrimaryBasename({ secondaryUsername }: UseSetPrima
       eventName: 'update_primary_name',
     });
 
+  const signMessageForReverseRecord = useCallback(async () => {
+    if (!address) throw new Error('No address');
+
+    const reverseRegistrar = USERNAME_L2_REVERSE_REGISTRAR_ADDRESSES[secondaryUsernameChain.id];
+    const functionAbi = L2ReverseRegistrarAbi.find(
+      (f) => f.type === 'function' && f.name === 'setNameForAddrWithSignature',
+    ) as unknown as AbiFunction;
+
+    const signatureExpiry = BigInt(Math.floor(Date.now() / 1000) + 5 * 60);
+    const nameLabel = (secondaryUsername as string).split('.')[0];
+    const { digest, coinTypes } = buildReverseRegistrarSignatureDigest({
+      reverseRegistrar,
+      functionAbi,
+      address,
+      chainId: secondaryUsernameChain.id,
+      name: nameLabel,
+      signatureExpiry,
+    });
+    const signature = await signMessageAsync({ message: { raw: digest } });
+    return { coinTypes, signatureExpiry, signature } as const;
+  }, [address, secondaryUsername, secondaryUsernameChain.id, signMessageAsync]);
+
   useEffect(() => {
     if (transactionIsSuccess) {
       refetchPrimaryUsername()
@@ -82,16 +111,28 @@ export default function useSetPrimaryBasename({ secondaryUsername }: UseSetPrima
 
     try {
       if (!paymasterServiceEnabled) {
+        let payload: {
+          coinTypes: readonly bigint[];
+          signatureExpiry: bigint;
+          signature: `0x${string}`;
+        };
+        try {
+          setSignatureError(null);
+          payload = await signMessageForReverseRecord();
+        } catch (e) {
+          logError(e, 'Reverse record signature step failed');
+          const msg = e instanceof Error && e.message ? e.message : 'Unknown error';
+          setSignatureError(new Error(`Could not prepare reverse record signature: ${msg}`));
+          return undefined;
+        }
+
+        const nameLabel = (secondaryUsername as string).split('.')[0];
+
         await initiateTransaction({
-          abi: ReverseRegistrarAbi,
-          address: USERNAME_REVERSE_REGISTRAR_ADDRESSES[secondaryUsernameChain.id],
-          args: [
-            address,
-            address,
-            USERNAME_L2_RESOLVER_ADDRESSES[secondaryUsernameChain.id],
-            secondaryUsername,
-          ],
-          functionName: 'setNameForAddr',
+          abi: UpgradeableRegistrarControllerAbi,
+          address: UPGRADEABLE_REGISTRAR_CONTROLLER_ADDRESSES[secondaryUsernameChain.id],
+          args: [nameLabel, payload.signatureExpiry, payload.coinTypes, payload.signature],
+          functionName: 'setReverseRecord',
         });
       } else {
         await initiateBatchCalls({
@@ -130,7 +171,9 @@ export default function useSetPrimaryBasename({ secondaryUsername }: UseSetPrima
     address,
     paymasterServiceEnabled,
     initiateTransaction,
+    secondaryUsernameChain,
     secondaryUsernameChain.id,
+    signMessageForReverseRecord,
     initiateBatchCalls,
     logError,
   ]);
@@ -146,5 +189,7 @@ export default function useSetPrimaryBasename({ secondaryUsername }: UseSetPrima
     canSetUsernameAsPrimary,
     isLoading,
     transactionIsSuccess: transactionIsSuccess || batchCallsIsSuccess,
+    transactionPending: transactionIsLoading || batchCallsIsLoading,
+    error: signatureError,
   };
 }