@ensdomains/ensjs 3.0.0-alpha.41 → 3.0.0-alpha.42

package/src/functions/wrapName.test.ts

@@ -46,15 +46,15 @@ describe('wrapName', () => {
       const nameWrapper = await ensInstance.contracts!.getNameWrapper()!
       const [, fuses] = await nameWrapper.getData(namehash('test123.eth'))
 
-      // parent cannot control
-      expect(fuses).toBe(64)
+      expect(fuses).toBe(196608)
     })
     it('should allow initial fuses', async () => {
       const tx = await ensInstance.wrapName('test123.eth', {
         wrappedOwner: accounts[2],
         fuseOptions: {
-          CANNOT_UNWRAP: true,
-          CANNOT_SET_TTL: true,
+          child: {
+            named: ['CANNOT_UNWRAP', 'CANNOT_SET_TTL'],
+          },
         },
         addressOrIndex: 1,
       })
@@ -63,7 +63,7 @@ describe('wrapName', () => {
 
       const nameWrapper = await ensInstance.contracts!.getNameWrapper()!
       const [, fuses] = await nameWrapper.getData(namehash('test123.eth'))
-      expect(fuses).toBe(81)
+      expect(fuses).toBe(196625)
     })
     it('should allow an initial resolver address', async () => {
       const tx = await ensInstance.wrapName('test123.eth', {
@@ -139,8 +139,9 @@ describe('wrapName', () => {
         ensInstance.wrapName('test.with-subnames.eth', {
           wrappedOwner: accounts[2],
           fuseOptions: {
-            cannotUnwrap: true,
-            cannotSetTtl: true,
+            child: {
+              named: ['CANNOT_UNWRAP', 'CANNOT_SET_TTL'],
+            },
           },
           addressOrIndex: 1,
         }),

package/src/functions/wrapName.ts

@@ -1,19 +1,16 @@
 import { defaultAbiCoder } from '@ethersproject/abi/lib/abi-coder'
 import { Signer } from '@ethersproject/abstract-signer'
-import { BigNumber } from '@ethersproject/bignumber/lib/bignumber'
 import { keccak256 as solidityKeccak256 } from '@ethersproject/solidity'
 import { ENSArgs } from '..'
-import { FuseOptions } from '../utils/fuses'
-import generateFuseInput from '../utils/generateFuseInput'
+import { CombinedFuseInput, encodeFuses } from '../utils/fuses'
 import { hexEncodeName } from '../utils/hexEncodedName'
-import { Expiry, makeExpiry, wrappedLabelLengthCheck } from '../utils/wrapper'
+import { Expiry, wrappedLabelLengthCheck } from '../utils/wrapper'
 
 async function wrapETH(
   { contracts }: ENSArgs<'contracts'>,
   labels: string[],
   wrappedOwner: string,
-  expiry: BigNumber,
-  decodedFuses: string,
+  decodedFuses: number,
   resolverAddress: string,
   signer: Signer,
   address: string,
@@ -24,8 +21,8 @@ async function wrapETH(
   const labelhash = solidityKeccak256(['string'], [labels[0]])
 
   const data = defaultAbiCoder.encode(
-    ['string', 'address', 'uint32', 'uint64', 'address'],
-    [labels[0], wrappedOwner, decodedFuses, expiry, resolverAddress],
+    ['string', 'address', 'uint16', 'address'],
+    [labels[0], wrappedOwner, decodedFuses, resolverAddress],
   )
 
   return baseRegistrar.populateTransaction[
@@ -63,11 +60,7 @@ async function wrapOther(
 }
 
 export default async function (
-  {
-    contracts,
-    signer,
-    getExpiry,
-  }: ENSArgs<'contracts' | 'signer' | 'getExpiry'>,
+  { contracts, signer }: ENSArgs<'contracts' | 'signer'>,
   name: string,
   {
     wrappedOwner,
@@ -76,14 +69,14 @@ export default async function (
     resolverAddress,
   }: {
     wrappedOwner: string
-    fuseOptions?: FuseOptions | string | number
+    fuseOptions?: Partial<CombinedFuseInput> | number
     expiry?: Expiry
     resolverAddress?: string
   },
 ) {
   const address = await signer.getAddress()
 
-  let decodedFuses: string
+  let decodedFuses: number
 
   const publicResolver = await contracts?.getPublicResolver()!
   if (!resolverAddress) resolverAddress = publicResolver.address
@@ -94,19 +87,15 @@ export default async function (
   if (labels.length === 2 && labels[1] === 'eth') {
     switch (typeof fuseOptions) {
       case 'object': {
-        decodedFuses = generateFuseInput(fuseOptions)
+        decodedFuses = encodeFuses(fuseOptions)
         break
       }
       case 'number': {
-        decodedFuses = fuseOptions.toString(16)
-        break
-      }
-      case 'string': {
         decodedFuses = fuseOptions
         break
       }
       case 'undefined': {
-        decodedFuses = '0'
+        decodedFuses = 0
         break
       }
       default: {
@@ -114,13 +103,10 @@ export default async function (
       }
     }
 
-    const expiryToUse = await makeExpiry({ getExpiry }, name, expiry)
-
     return wrapETH(
       { contracts },
       labels,
       wrappedOwner,
-      expiryToUse,
       decodedFuses,
       resolverAddress,
       signer,

package/src/generated/ETHRegistrarController.ts

@@ -45,16 +45,15 @@ export interface ETHRegistrarControllerInterface extends Interface {
     'available(string)': FunctionFragment
     'commit(bytes32)': FunctionFragment
     'commitments(bytes32)': FunctionFragment
-    'makeCommitment(string,address,uint256,bytes32,address,bytes[],bool,uint32,uint64)': FunctionFragment
+    'makeCommitment(string,address,uint256,bytes32,address,bytes[],bool,uint16)': FunctionFragment
     'maxCommitmentAge()': FunctionFragment
     'minCommitmentAge()': FunctionFragment
     'nameWrapper()': FunctionFragment
     'owner()': FunctionFragment
     'prices()': FunctionFragment
     'recoverFunds(address,address,uint256)': FunctionFragment
-    'register(string,address,uint256,bytes32,address,bytes[],bool,uint32,uint64)': FunctionFragment
+    'register(string,address,uint256,bytes32,address,bytes[],bool,uint16)': FunctionFragment
     'renew(string,uint256)': FunctionFragment
-    'renewWithFuses(string,uint256,uint32,uint64)': FunctionFragment
     'renounceOwnership()': FunctionFragment
     'rentPrice(string,uint256)': FunctionFragment
     'reverseRegistrar()': FunctionFragment
@@ -79,7 +78,6 @@ export interface ETHRegistrarControllerInterface extends Interface {
       | 'recoverFunds'
       | 'register'
       | 'renew'
-      | 'renewWithFuses'
       | 'renounceOwnership'
       | 'rentPrice'
       | 'reverseRegistrar'
@@ -116,7 +114,6 @@ export interface ETHRegistrarControllerInterface extends Interface {
       PromiseOrValue<BytesLike>[],
       PromiseOrValue<boolean>,
       PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
     ],
   ): string
   encodeFunctionData(
@@ -152,22 +149,12 @@ export interface ETHRegistrarControllerInterface extends Interface {
       PromiseOrValue<BytesLike>[],
       PromiseOrValue<boolean>,
       PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
     ],
   ): string
   encodeFunctionData(
     functionFragment: 'renew',
     values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>],
   ): string
-  encodeFunctionData(
-    functionFragment: 'renewWithFuses',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-    ],
-  ): string
   encodeFunctionData(
     functionFragment: 'renounceOwnership',
     values?: undefined,
@@ -222,10 +209,6 @@ export interface ETHRegistrarControllerInterface extends Interface {
   ): Result
   decodeFunctionResult(functionFragment: 'register', data: BytesLike): Result
   decodeFunctionResult(functionFragment: 'renew', data: BytesLike): Result
-  decodeFunctionResult(
-    functionFragment: 'renewWithFuses',
-    data: BytesLike,
-  ): Result
   decodeFunctionResult(
     functionFragment: 'renounceOwnership',
     data: BytesLike,
@@ -349,8 +332,7 @@ export interface ETHRegistrarController extends BaseContract {
       resolver: PromiseOrValue<string>,
       data: PromiseOrValue<BytesLike>[],
       reverseRecord: PromiseOrValue<boolean>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
+      ownerControlledFuses: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides,
     ): Promise<[string]>
 
@@ -379,8 +361,7 @@ export interface ETHRegistrarController extends BaseContract {
       resolver: PromiseOrValue<string>,
       data: PromiseOrValue<BytesLike>[],
       reverseRecord: PromiseOrValue<boolean>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
+      ownerControlledFuses: PromiseOrValue<BigNumberish>,
       overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
     ): Promise<ContractTransaction>
 
@@ -390,14 +371,6 @@ export interface ETHRegistrarController extends BaseContract {
       overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
     ): Promise<ContractTransaction>
 
-    renewWithFuses(
-      name: PromiseOrValue<string>,
-      duration: PromiseOrValue<BigNumberish>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
-    ): Promise<ContractTransaction>
-
     renounceOwnership(
       overrides?: Overrides & { from?: PromiseOrValue<string> },
     ): Promise<ContractTransaction>
@@ -459,8 +432,7 @@ export interface ETHRegistrarController extends BaseContract {
     resolver: PromiseOrValue<string>,
     data: PromiseOrValue<BytesLike>[],
     reverseRecord: PromiseOrValue<boolean>,
-    fuses: PromiseOrValue<BigNumberish>,
-    wrapperExpiry: PromiseOrValue<BigNumberish>,
+    ownerControlledFuses: PromiseOrValue<BigNumberish>,
     overrides?: CallOverrides,
   ): Promise<string>
 
@@ -489,8 +461,7 @@ export interface ETHRegistrarController extends BaseContract {
     resolver: PromiseOrValue<string>,
     data: PromiseOrValue<BytesLike>[],
     reverseRecord: PromiseOrValue<boolean>,
-    fuses: PromiseOrValue<BigNumberish>,
-    wrapperExpiry: PromiseOrValue<BigNumberish>,
+    ownerControlledFuses: PromiseOrValue<BigNumberish>,
     overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
   ): Promise<ContractTransaction>
 
@@ -500,14 +471,6 @@ export interface ETHRegistrarController extends BaseContract {
     overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
   ): Promise<ContractTransaction>
 
-  renewWithFuses(
-    name: PromiseOrValue<string>,
-    duration: PromiseOrValue<BigNumberish>,
-    fuses: PromiseOrValue<BigNumberish>,
-    wrapperExpiry: PromiseOrValue<BigNumberish>,
-    overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
-  ): Promise<ContractTransaction>
-
   renounceOwnership(
     overrides?: Overrides & { from?: PromiseOrValue<string> },
   ): Promise<ContractTransaction>
@@ -565,8 +528,7 @@ export interface ETHRegistrarController extends BaseContract {
       resolver: PromiseOrValue<string>,
       data: PromiseOrValue<BytesLike>[],
       reverseRecord: PromiseOrValue<boolean>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
+      ownerControlledFuses: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides,
     ): Promise<string>
 
@@ -595,8 +557,7 @@ export interface ETHRegistrarController extends BaseContract {
       resolver: PromiseOrValue<string>,
       data: PromiseOrValue<BytesLike>[],
       reverseRecord: PromiseOrValue<boolean>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
+      ownerControlledFuses: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides,
     ): Promise<void>
 
@@ -606,14 +567,6 @@ export interface ETHRegistrarController extends BaseContract {
       overrides?: CallOverrides,
     ): Promise<void>
 
-    renewWithFuses(
-      name: PromiseOrValue<string>,
-      duration: PromiseOrValue<BigNumberish>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides,
-    ): Promise<void>
-
     renounceOwnership(overrides?: CallOverrides): Promise<void>
 
     rentPrice(
@@ -709,8 +662,7 @@ export interface ETHRegistrarController extends BaseContract {
       resolver: PromiseOrValue<string>,
       data: PromiseOrValue<BytesLike>[],
       reverseRecord: PromiseOrValue<boolean>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
+      ownerControlledFuses: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides,
     ): Promise<BigNumber>
 
@@ -739,8 +691,7 @@ export interface ETHRegistrarController extends BaseContract {
       resolver: PromiseOrValue<string>,
       data: PromiseOrValue<BytesLike>[],
       reverseRecord: PromiseOrValue<boolean>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
+      ownerControlledFuses: PromiseOrValue<BigNumberish>,
       overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
     ): Promise<BigNumber>
 
@@ -750,14 +701,6 @@ export interface ETHRegistrarController extends BaseContract {
       overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
     ): Promise<BigNumber>
 
-    renewWithFuses(
-      name: PromiseOrValue<string>,
-      duration: PromiseOrValue<BigNumberish>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
-    ): Promise<BigNumber>
-
     renounceOwnership(
       overrides?: Overrides & { from?: PromiseOrValue<string> },
     ): Promise<BigNumber>
@@ -818,8 +761,7 @@ export interface ETHRegistrarController extends BaseContract {
       resolver: PromiseOrValue<string>,
       data: PromiseOrValue<BytesLike>[],
       reverseRecord: PromiseOrValue<boolean>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
+      ownerControlledFuses: PromiseOrValue<BigNumberish>,
       overrides?: CallOverrides,
     ): Promise<PopulatedTransaction>
 
@@ -848,8 +790,7 @@ export interface ETHRegistrarController extends BaseContract {
       resolver: PromiseOrValue<string>,
       data: PromiseOrValue<BytesLike>[],
       reverseRecord: PromiseOrValue<boolean>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
+      ownerControlledFuses: PromiseOrValue<BigNumberish>,
       overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
     ): Promise<PopulatedTransaction>
 
@@ -859,14 +800,6 @@ export interface ETHRegistrarController extends BaseContract {
       overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
     ): Promise<PopulatedTransaction>
 
-    renewWithFuses(
-      name: PromiseOrValue<string>,
-      duration: PromiseOrValue<BigNumberish>,
-      fuses: PromiseOrValue<BigNumberish>,
-      wrapperExpiry: PromiseOrValue<BigNumberish>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> },
-    ): Promise<PopulatedTransaction>
-
     renounceOwnership(
       overrides?: Overrides & { from?: PromiseOrValue<string> },
     ): Promise<PopulatedTransaction>