Merge pull request #181 from ensdomains/update-normlization-lib

Update ens-normalise
ensdomains · Apr 25, 2024 · a8976dd · a8976dd
2 parents 38ebec7 + e366d05
commit a8976dd
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 109 deletions.
diff --git a/packages/ensjs/package.json b/packages/ensjs/package.json
@@ -98,7 +98,7 @@
     "rcBranchVersion": "pnpm tsn ./scripts/rcBranchVersion.ts"
   },
   "dependencies": {
-    "@adraffy/ens-normalize": "1.9.0",
+    "@adraffy/ens-normalize": "1.10.1",
     "@ensdomains/address-encoder": "1.1.1",
     "@ensdomains/content-hash": "3.1.0-rc.1",
     "@ensdomains/dnsprovejs": "^0.5.1",

diff --git a/packages/ensjs/src/functions/public/ccip.test.ts b/packages/ensjs/src/functions/public/ccip.test.ts
@@ -1,22 +1,17 @@
 import { createPublicClient, http } from 'viem'
-import { goerli, mainnet } from 'viem/chains'
+import { mainnet } from 'viem/chains'
 import { describe, expect, it, vi } from 'vitest'
 import { addEnsContracts } from '../../contracts/addEnsContracts.js'
 import { ccipRequest } from '../../utils/ccipRequest.js'
 import batch from './batch.js'
 import getAddressRecord from './getAddressRecord.js'
 import getRecords from './getRecords.js'
-import getText from './getTextRecord.js'
+// import getText from './getTextRecord.js'
 
 vi.setConfig({
   testTimeout: 30000,
 })
 
-const goerliPublicClient = createPublicClient({
-  chain: addEnsContracts(goerli),
-  transport: http('https://goerli.gateway.tenderly.co/4imxc4hQfRjxrVB2kWKvTo'),
-})
-
 const mainnetPublicClient = createPublicClient({
   chain: addEnsContracts(mainnet),
   transport: http('https://mainnet.gateway.tenderly.co/4imxc4hQfRjxrVB2kWKvTo'),
@@ -25,90 +20,50 @@ const mainnetPublicClient = createPublicClient({
 describe('CCIP', () => {
   describe('getRecords', () => {
     it('should return records from a ccip-read name', async () => {
-      const result = await getRecords(goerliPublicClient, {
-        name: '1.offchainexample.eth',
-        texts: ['email', 'description'],
-        contentHash: true,
-        coins: ['ltc', '60'],
+      const result = await getRecords(mainnetPublicClient, {
+        name: 'sg.offchaindemo.eth',
+        // texts: ['email', 'description'],
+        // contentHash: true,
+        coins: ['60'],
       })
       expect(result).toMatchInlineSnapshot(`
         {
           "coins": [
-            {
-              "id": 2,
-              "name": "ltc",
-              "value": "MQMcJhpWHYVeQArcZR3sBgyPZxxRtnH441",
-            },
             {
               "id": 60,
               "name": "eth",
-              "value": "0x41563129cDbbD0c5D3e1c86cf9563926b243834d",
-            },
-          ],
-          "contentHash": {
-            "decoded": "bafybeico3uuyj3vphxpvbowchdwjlrlrh62awxscrnii7w7flu5z6fk77y",
-            "protocolType": "ipfs",
-          },
-          "resolverAddress": "0xEE28bdfBB91dE63bfBDA454082Bb1850f7804B09",
-          "texts": [
-            {
-              "key": "email",
-              "value": "[email protected]",
-            },
-            {
-              "key": "description",
-              "value": "hello offchainresolver wildcard record",
+              "value": "0x80c5657CEE59A5a193EfDCfDf3D3913Fad977B61",
             },
           ],
+          "resolverAddress": "0xDB34Da70Cfd694190742E94B7f17769Bc3d84D27",
         }
       `)
     })
     it('should return records from a ccip-read name with custom ccipRequest', async () => {
-      const goerliWithEns = addEnsContracts(goerli)
+      const goerliWithEns = addEnsContracts(mainnet)
       const goerliPublicClientWithCustomCcipRequest = createPublicClient({
         chain: goerliWithEns,
         transport: http(
-          'https://goerli.gateway.tenderly.co/4imxc4hQfRjxrVB2kWKvTo',
+          'https://mainnet.gateway.tenderly.co/4imxc4hQfRjxrVB2kWKvTo',
         ),
         ccipRead: {
           request: ccipRequest(goerliWithEns),
         },
       })
       const result = await getRecords(goerliPublicClientWithCustomCcipRequest, {
-        name: '1.offchainexample.eth',
-        texts: ['email', 'description'],
-        contentHash: true,
-        coins: ['ltc', '60'],
+        name: 'sg.offchaindemo.eth',
+        coins: ['60'],
       })
       expect(result).toMatchInlineSnapshot(`
         {
           "coins": [
-            {
-              "id": 2,
-              "name": "ltc",
-              "value": "MQMcJhpWHYVeQArcZR3sBgyPZxxRtnH441",
-            },
             {
               "id": 60,
               "name": "eth",
-              "value": "0x41563129cDbbD0c5D3e1c86cf9563926b243834d",
-            },
-          ],
-          "contentHash": {
-            "decoded": "bafybeico3uuyj3vphxpvbowchdwjlrlrh62awxscrnii7w7flu5z6fk77y",
-            "protocolType": "ipfs",
-          },
-          "resolverAddress": "0xEE28bdfBB91dE63bfBDA454082Bb1850f7804B09",
-          "texts": [
-            {
-              "key": "email",
-              "value": "[email protected]",
-            },
-            {
-              "key": "description",
-              "value": "hello offchainresolver wildcard record",
+              "value": "0x80c5657CEE59A5a193EfDCfDf3D3913Fad977B61",
             },
           ],
+          "resolverAddress": "0xDB34Da70Cfd694190742E94B7f17769Bc3d84D27",
         }
       `)
     })
@@ -138,39 +93,38 @@ describe('CCIP', () => {
   describe('batch', () => {
     it('allows batch ccip', async () => {
       const result = await batch(
-        goerliPublicClient,
-        getAddressRecord.batch({ name: '1.offchainexample.eth' }),
-        getAddressRecord.batch({ name: '1.offchainexample.eth', coin: 'ltc' }),
-        getText.batch({ name: '1.offchainexample.eth', key: 'email' }),
+        mainnetPublicClient,
+        getAddressRecord.batch({ name: 'sg.offchaindemo.eth' }),
+        getAddressRecord.batch({ name: 'sg.offchaindemo.eth', coin: '60' }),
+        // getText.batch({ name: '1.offchainexample.eth', key: 'email' }),
       )
       expect(result).toMatchInlineSnapshot(`
         [
           {
             "id": 60,
             "name": "eth",
-            "value": "0x41563129cDbbD0c5D3e1c86cf9563926b243834d",
+            "value": "0x80c5657CEE59A5a193EfDCfDf3D3913Fad977B61",
           },
           {
-            "id": 2,
-            "name": "ltc",
-            "value": "MQMcJhpWHYVeQArcZR3sBgyPZxxRtnH441",
+            "id": 60,
+            "name": "eth",
+            "value": "0x80c5657CEE59A5a193EfDCfDf3D3913Fad977B61",
           },
-          "[email protected]",
         ]
       `)
     })
     it('allows nested batch ccip', async () => {
       const result = await batch(
-        goerliPublicClient,
-        batch.batch(getAddressRecord.batch({ name: '1.offchainexample.eth' })),
+        mainnetPublicClient,
+        batch.batch(getAddressRecord.batch({ name: 'sg.offchaindemo.eth' })),
       )
       expect(result).toMatchInlineSnapshot(`
         [
           [
             {
               "id": 60,
               "name": "eth",
-              "value": "0x41563129cDbbD0c5D3e1c86cf9563926b243834d",
+              "value": "0x80c5657CEE59A5a193EfDCfDf3D3913Fad977B61",
             },
           ],
         ]