@ensdomains/ensjs 3.0.0-alpha.4 → 3.0.0-alpha.7

package/src/tests/signerInjection.test.ts

@@ -0,0 +1,46 @@
+import { ContractTransaction, ethers } from 'ethers'
+import { ENS } from '..'
+import setup from '../tests/setup'
+
+let ENSInstance: ENS
+let revert: Awaited<ReturnType<typeof setup>>['revert']
+let provider: ethers.providers.JsonRpcProvider
+let accounts: string[]
+
+beforeAll(async () => {
+  ;({ ENSInstance, revert, provider } = await setup())
+  accounts = await provider.listAccounts()
+})
+
+afterAll(async () => {
+  await revert()
+})
+
+jest.setTimeout(20000)
+
+describe('Signer Injection', () => {
+  beforeEach(async () => {
+    await revert()
+  })
+  it('should return a transaction successfully for a custom signer', async () => {
+    const signer = provider.getSigner(accounts[3])
+    const tx = await ENSInstance.setName('fleek.eth', {
+      signer,
+    })
+    expect(tx).toBeTruthy()
+    if (tx) {
+      await tx.wait()
+      expect(tx.from).toBe(accounts[3])
+    }
+  })
+  it('should return a transaction succesfully for a custom signer index', async () => {
+    const tx = (await ENSInstance.setName('fleek.eth', {
+      addressOrIndex: 3,
+    })) as ContractTransaction
+    expect(tx).toBeTruthy()
+    if (tx) {
+      await tx.wait()
+      expect(tx.from).toBe(accounts[3])
+    }
+  })
+})

package/src/utils/normalise.ts

@@ -1,5 +1,6 @@
 import { concat, hexlify, keccak256, toUtf8Bytes } from 'ethers/lib/utils'
 import uts46 from 'idna-uts46-hx/uts46bundle.js'
+import { decodeLabelhash, isEncodedLabelhash } from './labels'
 
 const zeros = new Uint8Array(32)
 zeros.fill(0)
@@ -7,16 +8,21 @@ zeros.fill(0)
 export const normalise = (name: string) =>
   name ? uts46.toUnicode(name, { useStd3ASCII: true }) : name
 
-export const namehash = (inputName: string): string => {
+export const namehash = (name: string): string => {
   let result: string | Uint8Array = zeros
 
-  const name = normalise(inputName)
-
   if (name) {
     const labels = name.split('.')
 
     for (var i = labels.length - 1; i >= 0; i--) {
-      const labelSha = keccak256(toUtf8Bytes(labels[i]))
+      let labelSha: string
+      if (isEncodedLabelhash(labels[i])) {
+        labelSha = decodeLabelhash(labels[i])
+      } else {
+        const normalised = normalise(labels[i])
+        labelSha = keccak256(toUtf8Bytes(normalised))
+      }
+
       result = keccak256(concat([result, labelSha]))
     }
   } else {

package/src/utils/writeTx.ts

@@ -0,0 +1,6 @@
+import { JsonRpcSigner } from '@ethersproject/providers'
+import type { PopulatedTransaction } from 'ethers'
+
+export default (signer: JsonRpcSigner, populate: boolean) =>
+  (tx: PopulatedTransaction) =>
+    populate ? tx : signer.sendTransaction(tx)