@ensdomains/ensjs 3.0.0-alpha.11 → 3.0.0-alpha.14

package/src/utils/writeTx.ts

@@ -1,6 +1,16 @@
 import { JsonRpcSigner } from '@ethersproject/providers'
 import type { PopulatedTransaction } from 'ethers'
 
+type CustomData = Record<string, any>
+
+const withCustomData = <T extends object>(
+  tx: T,
+  customData: CustomData | undefined,
+): (T & { customData: CustomData }) | T =>
+  customData ? { ...tx, customData } : tx
+
 export default (signer: JsonRpcSigner, populate: boolean) =>
-  (tx: PopulatedTransaction) =>
-    populate ? tx : signer.sendTransaction(tx)
+  ({ customData, ...tx }: PopulatedTransaction) =>
+    populate
+      ? withCustomData(tx, customData)
+      : signer.sendTransaction(tx).then((r) => withCustomData(r, customData))

package/src/tests/populateTransaction.test.ts

@@ -1,40 +0,0 @@
-import { 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('populateTransaction', () => {
-  beforeEach(async () => {
-    await revert()
-  })
-  it('should return a transaction successfully', async () => {
-    const tx = await ENSInstance.setName('fleek.eth')
-    expect(tx).toBeTruthy()
-    if (tx) {
-      await tx.wait()
-      expect(tx.hash).toBeTruthy()
-    }
-  })
-  it('should return a populated transaction successfully', async () => {
-    const tx = await ENSInstance.setName.populateTransaction('fleek.eth')
-    expect(tx).toBeTruthy()
-    if (tx) {
-      expect(tx).not.toHaveProperty('hash')
-    }
-  })
-})

package/src/tests/setup.ts

@@ -1,58 +0,0 @@
-import { config } from 'dotenv'
-import { ethers } from 'ethers'
-import { resolve } from 'path'
-import { ENS } from '../'
-import { ContractName, SupportedNetworkId } from '../contracts/types'
-
-config({
-  path: resolve(__dirname, '../../.env.local'),
-  override: true,
-  debug: true,
-})
-
-const deploymentAddresses = JSON.parse(
-  process.env.DEPLOYMENT_ADDRESSES!,
-) as Record<ContractName | 'ENSRegistry', string>
-
-const createENS = (graphURI: string) =>
-  new ENS({
-    graphURI,
-    getContractAddress: (_: SupportedNetworkId) => (contractName) =>
-      deploymentAddresses[
-        contractName === 'ENSRegistryWithFallback'
-          ? 'ENSRegistry'
-          : contractName
-      ],
-  })
-
-export default async (useReal?: boolean) => {
-  const graphURI = useReal
-    ? 'https://api.thegraph.com/subgraphs/name/ensdomains/ensropsten'
-    : 'http://localhost:8000/subgraphs/name/graphprotocol/ens'
-
-  const provider = new ethers.providers.JsonRpcProvider(
-    'http://localhost:8545',
-    1337,
-  )
-
-  let ENSInstance = createENS(graphURI)
-  await ENSInstance.setProvider(provider)
-
-  let snapshot = await provider.send('evm_snapshot', [])
-
-  const revert = async (customSnapshot?: any) => {
-    const snapshotToUse = customSnapshot || snapshot
-    await provider.send('evm_revert', [snapshotToUse])
-    if (parseInt(snapshot, 16) >= parseInt(snapshotToUse, 16)) {
-      snapshot = await provider.send('evm_snapshot', [])
-    }
-
-    ENSInstance = createENS(graphURI)
-    await ENSInstance.setProvider(provider)
-    return
-  }
-
-  const createSnapshot = async () => await provider.send('evm_snapshot', [])
-
-  return { ENSInstance, revert, createSnapshot, provider }
-}

package/src/tests/signerInjection.test.ts

@@ -1,46 +0,0 @@
-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/tests/withProvider.test.ts

@@ -1,28 +0,0 @@
-import { ethers } from 'ethers'
-import { ENS } from '..'
-import setup from '../tests/setup'
-
-let ENSInstance: ENS
-let providerFake: ethers.providers.JsonRpcProvider
-
-beforeAll(async () => {
-  ;({ ENSInstance } = await setup())
-  providerFake = new ethers.providers.JsonRpcProvider(
-    'http://localhost:34023',
-    'ropsten',
-  )
-})
-
-describe('withProvider', () => {
-  it('should be able to use a new provider', async () => {
-    const addr = await ENSInstance.getAddr('with-profile.eth')
-    expect(addr).toBeTruthy()
-
-    try {
-      await ENSInstance.withProvider(providerFake).getOwner('with-profile.eth')
-      expect(false).toBeTruthy()
-    } catch {
-      expect(true).toBeTruthy()
-    }
-  })
-})