Merge pull request #195 from ensdomains/fix/0x-multicoin-addr

fix: 0x multicoin addr in history
ensdomains · Sep 4, 2024 · 53a138e · 53a138e
2 parents 88670da + 568616c
commit 53a138e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/packages/ensjs/deploy/00_register_legacy.cjs b/packages/ensjs/deploy/00_register_legacy.cjs
@@ -217,6 +217,14 @@ const names = [
       ],
     },
   },
+  {
+    label: 'with-empty-addr',
+    namedOwner: 'owner2',
+    namedAddr: 'owner2',
+    records: {
+      addr: [{ key: 61, value: '0x' }],
+    },
+  },
   {
     label: 'with-contenthash',
     namedOwner: 'owner',
@@ -462,10 +470,7 @@ const func = async function (hre) {
            * @type {string | Buffer | Uint8Array}
            */
           let data
-          if (
-            abi.contentType === 1 ||
-            abi.contentType === 256
-          ) {
+          if (abi.contentType === 1 || abi.contentType === 256) {
             data = JSON.stringify(abi.data)
           } else if (abi.contentType === 2) {
             data = pako.deflate(JSON.stringify(abi.data))

diff --git a/packages/ensjs/src/functions/subgraph/getNameHistory.test.ts b/packages/ensjs/src/functions/subgraph/getNameHistory.test.ts
@@ -38,3 +38,18 @@ it('returns the history of a subname', async () => {
   expect(result.registrationEvents).toBeNull()
   expect(result.resolverEvents).not.toBeNull()
 })
+
+it('returns the history of a name with a null addr record', async () => {
+  const result = await getNameHistory(publicClient, {
+    name: 'with-empty-addr.eth',
+  })
+  if (!result) throw new Error('No result')
+  expect(result.domainEvents.length).toBeGreaterThan(0)
+  expect(result.registrationEvents!.length).toBeGreaterThan(0)
+  expect(result.resolverEvents).not.toBeNull()
+  expect(
+    result.resolverEvents!.some(
+      (event) => event.type === 'MulticoinAddrChanged' && event.addr === null,
+    ),
+  ).toBe(true)
+})
diff --git a/packages/ensjs/src/functions/subgraph/getNameHistory.ts b/packages/ensjs/src/functions/subgraph/getNameHistory.ts
@@ -1,6 +1,6 @@
 import { getCoderByCoinType } from '@ensdomains/address-encoder'
 import { gql } from 'graphql-request'
-import { hexToBytes } from 'viem'
+import { hexToBytes, trim } from 'viem'
 import type { ClientWithEns } from '../../contracts/consts.js'
 import { decodeContentHash } from '../../utils/contentHash.js'
 import { namehash } from '../../utils/normalise.js'
@@ -286,7 +286,7 @@ const getNameHistory = async (
               addr: multiaddr,
             }
           }
-          if (BigInt(multiaddr) === 0n) {
+          if (multiaddr === '0x' || trim(multiaddr) === '0x00') {
             return {
               ...event_,
               coinName: format.name,