Merge branch 'arjun/ensip19-registration' into amiecorso/ba-2133-registration-flow-for-eoas-in-web

Author: amiecorso

apps/web/src/addresses/usernames.ts

@@ -13,6 +13,21 @@ export const USERNAME_REGISTRAR_CONTROLLER_ADDRESSES: AddressMap = {
   [base.id]: '0x4cCb0BB02FCABA27e82a56646E81d8c5bC4119a5',
 };
 
+export const USERNAME_L2_REVERSE_REGISTRAR_ADDRESSES: AddressMap = {
+  [baseSepolia.id]: '0x00000BeEF055f7934784D6d81b6BC86665630dbA',
+  [base.id]: '0x0000000000D8e504002cC26E3Ec46D81971C1664',
+};
+
+export const UPGRADEABLE_REGISTRAR_CONTROLLER_ADDRESSES: AddressMap = {
+  [baseSepolia.id]: '0x82c858CDF64b3D893Fe54962680edFDDC37e94C8',
+  [base.id]: '0xa7d2607c6BD39Ae9521e514026CBB078405Ab322',
+};
+
+export const UPGRADEABLE_L2_RESOLVER_ADDRESSES: AddressMap = {
+  [baseSepolia.id]: '0x85C87e548091f204C2d0350b39ce1874f02197c6',
+  [base.id]: '0x426fA03fB86E510d0Dd9F70335Cf102a98b10875',
+};
+
 export const USERNAME_EA_REGISTRAR_CONTROLLER_ADDRESSES: AddressMap = {
   [baseSepolia.id]: '0x3a0e8c2a0a28f396a5e5b69edb2e630311f1517a',
   [base.id]: '0xd3e6775Ed9B7dC12B205C8E608Dc3767B9e5eFdA',

apps/web/src/hooks/useRegisterNameCallback.ts

@@ -1,6 +1,9 @@
 import { useErrors } from 'apps/web/contexts/Errors';
 import L2ResolverAbi from 'apps/web/src/abis/L2Resolver';
-import { USERNAME_L2_RESOLVER_ADDRESSES } from 'apps/web/src/addresses/usernames';
+import {
+  UPGRADEABLE_L2_RESOLVER_ADDRESSES,
+  USERNAME_L2_REVERSE_REGISTRAR_ADDRESSES,
+} from 'apps/web/src/addresses/usernames';
 import useBaseEnsName from 'apps/web/src/hooks/useBaseEnsName';
 import useBasenameChain from 'apps/web/src/hooks/useBasenameChain';
 import useCapabilitiesSafe from 'apps/web/src/hooks/useCapabilitiesSafe';
@@ -21,7 +24,6 @@ import { Dispatch, SetStateAction, useCallback, useMemo, useState } from 'react'
 import { encodeFunctionData, namehash } from 'viem';
 import { useAccount } from 'wagmi';
 import { secondsInYears } from 'apps/web/src/utils/secondsInYears';
-import UpgradeableRegistrarControllerAbi from 'apps/web/src/abis/UpgradeableRegistrarControllerAbi';
 import L2ReverseRegistrarAbi from 'apps/web/src/abis/L2ReverseRegistrarAbi';
 import { encodePacked, getFunctionSelector, keccak256, type AbiFunction } from 'viem';
 import { usePublicClient, useSignMessage } from 'wagmi';
@@ -178,7 +180,7 @@ export function useRegisterNameCallback(
       name: normalizedName, // The name being registered.
       owner: address, // The address of the owner for the name.
       duration: secondsInYears(years), // The duration of the registration in seconds.
-      resolver: USERNAME_L2_RESOLVER_ADDRESSES[basenameChain.id], // The address of the resolver to set for this name.
+      resolver: UPGRADEABLE_L2_RESOLVER_ADDRESSES[basenameChain.id], // The address of the resolver to set for this name.
       data: [addressData, baseCointypeData, nameData], //  Multicallable data bytes for setting records in the associated resolver upon registration.
       reverseRecord, // Bool to decide whether to set this name as the "primary" name for the `owner`.
       coinTypes: coinTypesForRequest,
@@ -199,7 +201,7 @@ export function useRegisterNameCallback(
         await initiateBatchCalls({
           contracts: [
             {
-              abi: UpgradeableRegistrarControllerAbi,
+              abi: REGISTER_CONTRACT_ABI,
               address: REGISTER_CONTRACT_ADDRESSES[basenameChain.id],
               functionName: isDiscounted ? 'discountedRegister' : 'register',
               args: isDiscounted
@@ -211,7 +213,7 @@ export function useRegisterNameCallback(
               ? [
                   {
                     abi: L2ReverseRegistrarAbi,
-                    address: USERNAME_L2_RESOLVER_ADDRESSES[basenameChain.id],
+                    address: USERNAME_L2_REVERSE_REGISTRAR_ADDRESSES[basenameChain.id],
                     functionName: 'setName',
                     args: [normalizedName],
                   },

apps/web/src/utils/proofs/sybil_resistance.ts

@@ -35,6 +35,7 @@ import {
 } from 'viem';
 import { sign } from 'viem/accounts';
 import { base, baseSepolia } from 'viem/chains';
+import UpgradeableRegistrarControllerAbi from 'apps/web/src/abis/UpgradeableRegistrarControllerAbi';
 
 const EXPIRY = process.env.USERNAMES_SIGNATURE_EXPIRATION_SECONDS ?? '30';
 const previousClaimsKVPrefix = 'username:claims:';
@@ -77,7 +78,7 @@ export async function hasRegisteredWithDiscount(
 
   return publicClient.readContract({
     address: REGISTER_CONTRACT_ADDRESSES[chainId],
-    abi: RegistrarControllerABI,
+    abi: UpgradeableRegistrarControllerAbi,
     functionName: 'hasRegisteredWithDiscount',
     args: [addresses],
   });

apps/web/src/utils/usernames.ts

@@ -11,16 +11,15 @@ import {
   sha256,
 } from 'viem';
 import { normalize } from 'viem/ens';
-import RegistrarControllerABI from 'apps/web/src/abis/RegistrarControllerABI';
 import L2ResolverAbi from 'apps/web/src/abis/L2Resolver';
 import RegistryAbi from 'apps/web/src/abis/RegistryAbi';
 import BaseRegistrarAbi from 'apps/web/src/abis/BaseRegistrarAbi';
 import { base, baseSepolia, mainnet } from 'viem/chains';
 import { Basename } from '@coinbase/onchainkit/identity';
 import {
+  UPGRADEABLE_REGISTRAR_CONTROLLER_ADDRESSES,
   USERNAME_BASE_REGISTRAR_ADDRESSES,
   USERNAME_BASE_REGISTRY_ADDRESSES,
-  USERNAME_REGISTRAR_CONTROLLER_ADDRESSES,
 } from 'apps/web/src/addresses/usernames';
 
 import {
@@ -56,6 +55,7 @@ import {
   ALLOWED_IMAGE_TYPE,
   MAX_IMAGE_SIZE_IN_MB,
 } from 'apps/web/app/(basenames)/api/basenames/avatar/ipfsUpload/route';
+import UpgradeableRegistrarControllerAbi from 'apps/web/src/abis/UpgradeableRegistrarControllerAbi';
 
 export const USERNAME_MIN_CHARACTER_LENGTH = 3;
 export const USERNAME_MAX_CHARACTER_LENGTH = 20;
@@ -762,9 +762,9 @@ export const getBasenameImage = (username: string) => {
 
 export const USERNAMES_PINNED_CASTS_ENABLED =
   process.env.NEXT_PUBLIC_USERNAMES_PINNED_CASTS_ENABLED === 'true';
-export const REGISTER_CONTRACT_ABI = RegistrarControllerABI;
+export const REGISTER_CONTRACT_ABI = UpgradeableRegistrarControllerAbi;
 
-export const REGISTER_CONTRACT_ADDRESSES = USERNAME_REGISTRAR_CONTROLLER_ADDRESSES;
+export const REGISTER_CONTRACT_ADDRESSES = UPGRADEABLE_REGISTRAR_CONTROLLER_ADDRESSES;
 
 export const isBasenameRenewalsKilled = process.env.NEXT_PUBLIC_KILL_BASENAMES_RENEWALS === 'true';