Merge branch 'main' into fix/primary-name-address-mismatch

Author: sugh01

e2e/specs/stateful/profile.spec.ts

@@ -1,4 +1,5 @@
 /* eslint-disable no-await-in-loop */
+/* eslint-disable no-restricted-syntax */
 import { expect } from '@playwright/test'
 
 import { test } from '../../../playwright/index.js'
@@ -49,6 +50,12 @@ const profiles = [
         value: '0xFc5...7acf0',
         fullValue: '0xFc5958B4B6F9a06D21E06429c8833f865577acf0',
       },
+      {
+        type: 'address',
+        key: 'sui',
+        value: '0x123...31231',
+        fullValue: '0x1231231231231231231231231231231231231231231231231231231231231231',
+      },
       {
         type: 'other',
         key: 'avatar',

e2e/specs/stateless/advancedEditor.spec.ts

@@ -25,6 +25,11 @@ test('should be able to maintain state when returning from transaction modal whe
         { coin: 'SOL', value: 'HN7cABqLq46Es1jh92dQQisAq662SmxELLLsHHe4YWrH' },
         { coin: 'ETH', value: '0xbec1C7C11F2Fa9AB24b9E49122D26e721766DAF6' },
         { coin: 'BTC', value: '1PzAJcFtEiXo9UGtRU6iqXQKj8NXtcC7DE' },
+        {
+          coin: 'SUI',
+          // eslint-disable-next-line no-restricted-syntax -- SUI addresses are 64 hex chars, not private keys
+          value: '0x1231231231231231231231231231231231231231231231231231231231231231',
+        },
       ],
       contentHash: 'ipfs://bafybeico3uuyj3vphxpvbowchdwjlrlrh62awxscrnii7w7flu5z6fk77y',
       abi: await encodeAbi({ encodeAs: 'json', data: dummyABI }),
@@ -51,6 +56,10 @@ test('should be able to maintain state when returning from transaction modal whe
   await expect(recordsPage.getRecordValue('address', 'BTC')).toHaveText(
     '1PzAJcFtEiXo9UGtRU6iqXQKj8NXtcC7DE',
   )
+  await expect(recordsPage.getRecordValue('address', 'SUI')).toHaveText(
+    // eslint-disable-next-line no-restricted-syntax -- SUI addresses are 64 hex chars, not private keys
+    '0x1231231231231231231231231231231231231231231231231231231231231231',
+  )
   await expect(recordsPage.getRecordValue('contentHash')).toHaveText(
     'ipfs://bafybeico3uuyj3vphxpvbowchdwjlrlrh62awxscrnii7w7flu5z6fk77y',
   )
@@ -71,6 +80,10 @@ test('should be able to maintain state when returning from transaction modal whe
   await expect(await advancedEditor.recordInput('address', 'BTC')).toHaveValue(
     '1PzAJcFtEiXo9UGtRU6iqXQKj8NXtcC7DE',
   )
+  await expect(await advancedEditor.recordInput('address', 'SUI')).toHaveValue(
+    // eslint-disable-next-line no-restricted-syntax -- SUI addresses are 64 hex chars, not private keys
+    '0x1231231231231231231231231231231231231231231231231231231231231231',
+  )
   await expect(await advancedEditor.recordInput('contentHash')).toHaveValue(
     'ipfs://bafybeico3uuyj3vphxpvbowchdwjlrlrh62awxscrnii7w7flu5z6fk77y',
   )
@@ -79,34 +92,37 @@ test('should be able to maintain state when returning from transaction modal whe
   await advancedEditor.recordClearButton('text', 'text').then((button) => button.click())
   await advancedEditor.recordClearButton('address', 'SOL').then((button) => button.click())
   await advancedEditor.recordClearButton('address', 'ETH').then((button) => button.click())
+  await advancedEditor.recordClearButton('address', 'SUI').then((button) => button.click())
   await advancedEditor.recordInput('contentHash').then((input) => input.fill(''))
   await advancedEditor.recordInput('abi').then((input) => input.fill(''))
 
   await advancedEditor.saveButton.click()
 
   // Validate transaction display item
-  await expect(transactionModal.displayItem('update')).toHaveText('5 records')
+  await expect(transactionModal.displayItem('update')).toHaveText('6 records')
 
   await transactionModal.backButton.click()
 
   // Validate inputs have been rebuilt correctly
   await expect(await advancedEditor.recordComponent('text', 'text')).toHaveCount(0)
   await expect(await advancedEditor.recordComponent('address', 'SOL')).toHaveCount(0)
   await expect(await advancedEditor.recordComponent('address', 'ETH')).toHaveCount(0)
+  await expect(await advancedEditor.recordComponent('address', 'SUI')).toHaveCount(0)
   await expect(await advancedEditor.recordInput('contentHash')).toHaveValue('')
   await expect(await advancedEditor.recordInput('abi')).toHaveValue('')
 
   await advancedEditor.saveButton.click()
 
   // Validate transaction display item
-  await expect(transactionModal.displayItem('update')).toHaveText('5 records')
+  await expect(transactionModal.displayItem('update')).toHaveText('6 records')
 
   await transactionModal.autoComplete()
 
   // Validate change in records
   await expect(recordsPage.getRecordButton('text', 'text')).toHaveCount(0)
   await expect(recordsPage.getRecordButton('address', 'SOL')).toHaveCount(0)
   await expect(recordsPage.getRecordButton('address', 'ETH')).toHaveCount(0)
+  await expect(recordsPage.getRecordButton('address', 'SUI')).toHaveCount(0)
   await expect(recordsPage.getRecordButton('contentHash')).toHaveCount(0)
   await expect(recordsPage.getRecordButton('abi')).toHaveCount(0)
 })

e2e/specs/stateless/extendNames.spec.ts

@@ -113,7 +113,9 @@ test('should be able to extend multiple names (including names in grace preiod)
     await addresPage.search(label)
     await expect(addresPage.getNameRow(name)).toBeVisible({ timeout: 5000 })
     await expect(await addresPage.getTimestamp(name)).not.toBe(timestampDict[name])
-    await expect(await addresPage.getTimestamp(name)).toBe(timestampDict[name] + 31536000000 * 3)
+    // Allow up to 3 days tolerance for leap year differences across 3 years
+    const ts = await addresPage.getTimestamp(name)
+    expect(Math.abs(ts - timestampDict[name] - 31536000000 * 3)).toBeLessThanOrEqual(86400000 * 3)
   }
 })
 
@@ -179,7 +181,8 @@ test('should be able to extend a single unwrapped name from profile', async ({
     await extendNamesModal.getExtendButton.click()
     await transactionModal.autoComplete()
     const newTimestamp = await profilePage.getExpiryTimestamp()
-    expect(newTimestamp).toEqual(timestamp + 31536000000)
+    // Allow 1 day tolerance for leap year differences
+    expect(Math.abs(newTimestamp - timestamp - 31536000000)).toBeLessThanOrEqual(86400000)
   })
 })
 
@@ -241,7 +244,8 @@ test('should be able to extend a single unwrapped name in grace period from prof
     await transactionModal.autoComplete()
 
     const newTimestamp = await profilePage.getExpiryTimestamp()
-    expect(newTimestamp).toEqual(timestamp + 31536000000)
+    // Allow 1 day tolerance for leap year differences
+    expect(Math.abs(newTimestamp - timestamp - 31536000000)).toBeLessThanOrEqual(86400000)
   })
 })
 
@@ -304,7 +308,8 @@ test('should be able to extend a single unwrapped name in grace period from prof
     const transactionModal = makePageObject('TransactionModal')
     await transactionModal.autoComplete()
     const newTimestamp = await profilePage.getExpiryTimestamp()
-    await expect(newTimestamp).toEqual(timestamp + 31536000000)
+    // Allow 1 day tolerance for leap year differences
+    expect(Math.abs(newTimestamp - timestamp - 31536000000)).toBeLessThanOrEqual(86400000)
   })
 })
 

package.json

@@ -54,7 +54,7 @@
     "hh": "NODE_OPTIONS='--experimental-loader ts-node/esm/transpile-only' hardhat"
   },
   "dependencies": {
-    "@ensdomains/address-encoder": "1.1.3",
+    "@ensdomains/address-encoder": "1.1.4",
     "@ensdomains/content-hash": "^3.0.0-beta.5",
     "@ensdomains/ens-contracts": "1.6.0",
     "@ensdomains/ens-test-env": "1.0.1",
@@ -198,6 +198,7 @@
       "@wagmi/core": "2.13.3",
       "@walletconnect/ethereum-provider": "2.11.1",
       "@walletconnect/modal": "2.6.2",
+      "@ensdomains/address-encoder": "1.1.4",
       "aggregate-error": "npm:@socketregistry/aggregate-error@^1",
       "array-buffer-byte-length": "npm:@socketregistry/array-buffer-byte-length@^1",
       "array-flatten": "npm:@socketregistry/array-flatten@^1",

pnpm-lock.yaml

@@ -77,7 +77,7 @@
     "favourites": "Favourites",
     "settings": "Settings",
     "governance": "Governance",
-    "community": "Community",
+    "blog": "Blog",
     "developers": "Developers",
     "support": "Support",
     "bounty": "Bug Bounty",

public/locales/en/common.json

@@ -49,7 +49,7 @@
     }
   },
   "banner": {
-    "title": "Namechain is coming!",
+    "title": "ENSv2 is coming!",
     "caption": "Keep up with ENSv2 development",
     "cta": "ENSv2 hub"
   }

public/locales/en/ensv2.json

@@ -97,7 +97,8 @@
               "matic": "0xb8c2C2...",
               "linea": "0xb8c2C2...",
               "scr": "0xb8c2C2...",
-              "celo": "0xb8c2C2..."
+              "celo": "0xb8c2C2...",
+              "sui": "0x123abc..."
             }
           },
           "website": {

public/locales/en/register.json

@@ -54,7 +54,7 @@
     }
   },
   "banner": {
-    "title": "¡Namechain está llegando!",
+    "title": "¡ENSv2 está llegando!",
     "caption": "Mantente al día con el desarrollo de ENSv2",
     "cta": "Centro de ENSv2"
   }

public/locales/es/ensv2.json

@@ -54,7 +54,7 @@
     }
   },
   "banner": {
-    "title": "Namechain está chegando!",
+    "title": "ENSv2 está chegando!",
     "caption": "Mantenha-se atualizado com o desenvolvimento do ENSv2",
     "cta": "Central do ENSv2"
   }