update useSimulateRegistration for legacy eth controller

e2e/specs/stateless/registerName.spec.ts

@@ -689,6 +689,7 @@ test('should not allow registering a premium name for less than 28 days', async
     expect(page.getByText('28 days registration', { exact: true })).toBeVisible()
   })
 
+  await page.pause()
   await page.getByTestId('payment-choice-ethereum').click()
   await expect(page.getByTestId('invoice-item-2-amount')).toBeVisible()
   await page.getByTestId('next-button').click()
@@ -1172,6 +1173,7 @@ test.describe('Error handling', () => {
     })
 
     await test.step('transaction: commit', async () => {
+      await page.pause()
       await expect(page.getByText('Open Wallet')).toBeVisible()
       await transactionModal.confirm()
       await expect(page.getByText(`Your "Start timer" transaction was successful`)).toBeVisible()

package.json

@@ -55,7 +55,7 @@
     "@ensdomains/address-encoder": "1.1.1",
     "@ensdomains/content-hash": "^3.0.0-beta.5",
     "@ensdomains/ens-contracts": "1.2.0-beta.0",
-    "@ensdomains/ensjs": "4.0.3-alpha.0",
+    "@ensdomains/ensjs": "4.0.3-alpha.11",
     "@ensdomains/thorin": "0.6.50",
     "@metamask/post-message-stream": "^6.1.2",
     "@metamask/providers": "^14.0.2",

src/hooks/registration/useSimulateRegistration.ts

@@ -1,8 +1,18 @@
+import { Address } from 'viem'
 import { usePublicClient, useSimulateContract, UseSimulateContractParameters } from 'wagmi'
 
-import { ethRegistrarControllerRegisterSnippet } from '@ensdomains/ensjs/contracts'
-import { makeRegistrationTuple, RegistrationParameters } from '@ensdomains/ensjs/utils'
+import {
+  ethRegistrarControllerRegisterSnippet,
+  legacyEthRegistrarControllerRegisterWithConfigSnippet,
+} from '@ensdomains/ensjs/contracts'
+import {
+  makeLegacyRegistrationWithConfigTuple,
+  makeRegistrationTuple,
+  RegistrationParameters,
+} from '@ensdomains/ensjs/utils'
 
+import { isLegacyRegistration } from '@app/utils/registration/isLegacyRegistration'
+import { makeLegacyRegistrationParams } from '@app/utils/registration/makeLegacyRegistrationParams'
 import { calculateValueWithBuffer } from '@app/utils/utils'
 
 import { usePrice } from '../ensjs/public/usePrice'
@@ -11,6 +21,46 @@ type UseSimulateRegistrationParameters = Pick<UseSimulateContractParameters, 'qu
   registrationParams: RegistrationParameters
 }
 
+type UseSimulateEthRegistrarControllerRegisterReturnType = UseSimulateContractParameters<
+  typeof ethRegistrarControllerRegisterSnippet,
+  'register'
+>
+
+type UseSimulateLegacyEthRegistrarControllerRegisterReturnType = UseSimulateContractParameters<
+  typeof legacyEthRegistrarControllerRegisterWithConfigSnippet,
+  'registerWithConfig'
+>
+
+type MakeSimulateRegistrationParamsReturnType =
+  | UseSimulateEthRegistrarControllerRegisterReturnType
+  | UseSimulateLegacyEthRegistrarControllerRegisterReturnType
+
+export const makeSimulateRegistrationParams = ({
+  registrationParams,
+  ensEthRegistrarControllerAddress,
+  legacyEthRegistrarControllerAddress,
+}: {
+  registrationParams: RegistrationParameters
+  ensEthRegistrarControllerAddress: Address
+  legacyEthRegistrarControllerAddress: Address
+}): MakeSimulateRegistrationParamsReturnType => {
+  if (isLegacyRegistration(registrationParams)) {
+    return {
+      abi: legacyEthRegistrarControllerRegisterWithConfigSnippet,
+      address: legacyEthRegistrarControllerAddress,
+      functionName: 'registerWithConfig',
+      args: makeLegacyRegistrationWithConfigTuple(makeLegacyRegistrationParams(registrationParams)),
+    }
+  }
+
+  return {
+    abi: ethRegistrarControllerRegisterSnippet,
+    address: ensEthRegistrarControllerAddress,
+    functionName: 'register',
+    args: makeRegistrationTuple(registrationParams),
+  }
+}
+
 export const useSimulateRegistration = ({
   registrationParams,
   query,
@@ -27,10 +77,12 @@ export const useSimulateRegistration = ({
   const value = base + premium
 
   return useSimulateContract({
-    abi: ethRegistrarControllerRegisterSnippet,
-    address: client.chain.contracts.ensEthRegistrarController.address,
-    functionName: 'register',
-    args: makeRegistrationTuple(registrationParams),
+    ...makeSimulateRegistrationParams({
+      registrationParams,
+      ensEthRegistrarControllerAddress: client.chain.contracts.ensEthRegistrarController.address,
+      legacyEthRegistrarControllerAddress:
+        client.chain.contracts.legacyEthRegistrarController.address,
+    }),
     value: calculateValueWithBuffer(value),
     query,
   })

src/utils/registration/makeLegacyRegistrationParams.ts

@@ -1,6 +1,9 @@
 import { Address } from 'viem'
 
-import { LegacyRegistrationParameters, RegistrationParameters } from '@ensdomains/ensjs/utils'
+import {
+  LegacyRegistrationWithConfigParameters,
+  RegistrationParameters,
+} from '@ensdomains/ensjs/utils'
 
 import { isEthCoin } from '../coin'
 import { emptyAddress } from '../constants'
@@ -12,15 +15,7 @@ export const makeLegacyRegistrationParams = ({
   duration,
   secret,
   resolverAddress = emptyAddress,
-}: RegistrationParameters): LegacyRegistrationParameters => {
-  if (resolverAddress === emptyAddress)
-    return {
-      name,
-      owner,
-      duration,
-      secret,
-    }
-
+}: RegistrationParameters): LegacyRegistrationWithConfigParameters => {
   const address = (records?.coins?.find(({ coin }) => isEthCoin(coin))?.value as Address) || owner
 
   return {
@@ -30,5 +25,5 @@ export const makeLegacyRegistrationParams = ({
     secret,
     resolverAddress,
     address,
-  }
+  } as LegacyRegistrationWithConfigParameters
 }