Fix: ENS domain being required (#293)

* fix ens domain bein required * fix build * fix code smell
aragon · Oct 24, 2023 · a9570ea · a9570ea
1 parent c7fbf55
commit a9570ea
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 24 deletions.
diff --git a/modules/client/CHANGELOG.md b/modules/client/CHANGELOG.md
@@ -18,6 +18,12 @@ TEMPLATE:
 -->
 
 ## [UPCOMING]
+
+### Fixed
+
+- Required ensSubdomain in createDao
+
+## [1.16.2]
 ### Fixed
 
 - Ens name regex

diff --git a/modules/client/package.json b/modules/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aragon/sdk-client",
   "author": "Aragon Association",
-  "version": "1.16.2",
+  "version": "1.16.3",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/sdk-client.esm.js",

diff --git a/modules/client/src/internal/client/estimation.ts b/modules/client/src/internal/client/estimation.ts
@@ -87,10 +87,10 @@ export class ClientEstimation extends ClientCore implements IClientEstimation {
 
     const gasEstimation = await daoInstance.estimateGas.createDao(
       {
-        subdomain: params.ensSubdomain,
+        subdomain: params.ensSubdomain ?? "",
         metadata: toUtf8Bytes(params.metadataUri),
-        daoURI: params.daoUri || "",
-        trustedForwarder: params.trustedForwarder || AddressZero,
+        daoURI: params.daoUri ?? "",
+        trustedForwarder: params.trustedForwarder ?? AddressZero,
       },
       pluginInstallationData,
     );

diff --git a/modules/client/src/internal/client/methods.ts b/modules/client/src/internal/client/methods.ts
@@ -254,10 +254,10 @@ export class ClientMethods extends ClientCore implements IClientMethods {
 
     const tx = await daoFactoryInstance.connect(signer).createDao(
       {
-        subdomain: params.ensSubdomain,
+        subdomain: params.ensSubdomain ?? "",
         metadata: toUtf8Bytes(params.metadataUri),
-        daoURI: params.daoUri || "",
-        trustedForwarder: params.trustedForwarder || AddressZero,
+        daoURI: params.daoUri ?? "",
+        trustedForwarder: params.trustedForwarder ?? AddressZero,
       },
       pluginInstallationData,
     );

diff --git a/modules/client/src/internal/schemas.ts b/modules/client/src/internal/schemas.ts
@@ -13,7 +13,7 @@ import { array, mixed, number, object, string } from "yup";
 export const CreateDaoSchema = object({
   metadataUri: IpfsUriSchema.required(),
   daoUri: string().url().notRequired(),
-  ensSubdomain: SubdomainSchema.required(),
+  ensSubdomain: SubdomainSchema.notRequired(),
   trustedForwarder: AddressOrEnsSchema.notRequired(),
   plugins: array(PluginInstallItemSchema).min(1).required(),
 });

diff --git a/modules/client/src/types.ts b/modules/client/src/types.ts
@@ -11,7 +11,7 @@ import {
 export type CreateDaoParams = {
   metadataUri: string;
   daoUri?: string;
-  ensSubdomain: string;
+  ensSubdomain?: string;
   trustedForwarder?: string;
   plugins: PluginInstallItem[];
 };

diff --git a/modules/client/test/unit/client/schemas.test.ts b/modules/client/test/unit/client/schemas.test.ts
@@ -103,21 +103,6 @@ describe("Test client schemas", () => {
           new ValidationError("metadataUri is a required field"),
         );
     });
-    it("should throw an error if the ensSubdomain is missing", () => {
-      const createDaoParams = {
-        metadataUri: TEST_IPFS_URI_V0,
-        plugins: [
-          {
-            id: TEST_ADDRESS,
-            data: new Uint8Array(),
-          },
-        ],
-      };
-      expect(() => CreateDaoSchema.strict().validateSync(createDaoParams))
-        .toThrow(
-          new ValidationError("ensSubdomain is a required field"),
-        );
-    });
     it("should throw an error if the plugins is missing", () => {
       const createDaoParams = {
         metadataUri: TEST_IPFS_URI_V0,