Better errors when non-string address or ENS name is passed into Cont…

…racts or provider methods (#1051).
ethers-io · Oct 16, 2021 · a5c6a46 · a5c6a46
1 parent 8947fd4
commit a5c6a46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/packages/contracts/src.ts/index.ts b/packages/contracts/src.ts/index.ts
@@ -116,6 +116,10 @@ const allowedTransactionKeys: { [ key: string ]: boolean } = {
 async function resolveName(resolver: Signer | Provider, nameOrPromise: string | Promise<string>): Promise<string> {
     const name = await nameOrPromise;
 
+    if (typeof(name) !== "string") {
+        logger.throwArgumentError("invalid address or ENS name", "name", name);
+    }
+
     // If it is already an address, just use it (after adding checksum)
     try {
         return getAddress(name);

diff --git a/packages/providers/src.ts/base-provider.ts b/packages/providers/src.ts/base-provider.ts
@@ -1313,6 +1313,11 @@ export class BaseProvider extends Provider implements EnsProvider {
     }
 
     async _getAddress(addressOrName: string | Promise<string>): Promise<string> {
+        addressOrName = await addressOrName;
+        if (typeof(addressOrName) !== "string") {
+            logger.throwArgumentError("invalid address or ENS name", "name", addressOrName);
+        }
+
         const address = await this.resolveName(addressOrName);
         if (address == null) {
             logger.throwError("ENS name not configured", Logger.errors.UNSUPPORTED_OPERATION, {