Fix ENS avatar resolution using addresses

packages/providers/src.ts/base-provider.ts

@@ -1754,23 +1754,26 @@ export class BaseProvider extends Provider implements EnsProvider {
     }
 
     async getAvatar(nameOrAddress: string): Promise<null | string> {
-        let resolver: Resolver = null;
         if (isHexString(nameOrAddress)) {
             // Address; reverse lookup
-            const address = this.formatter.address(nameOrAddress);
-
-            const reverseName = address.substring(2).toLowerCase() + ".addr.reverse";
-
-            const resolverAddress = await this._getResolver(reverseName);
-            if (!resolverAddress) { return null; }
-
-            resolver = new Resolver(this, resolverAddress, "_", address);
-
-        } else {
-            // ENS name; forward lookup
-            resolver = await this.getResolver(nameOrAddress);
-            if (!resolver) { return null; }
+            const address = this.formatter.address(nameOrAddress); 
+  
+            const reverseName = address.substring(2).toLowerCase() + ".addr.reverse"; 
+                
+            // Check to see if avatar is on reverse record
+            const avatar = await this.getAvatar(reverseName)
+            if (avatar != null) { return avatar; }
+
+            // If not, lookup address and try on forwards records 
+            const name = await this.lookupAddress(address);
+            if (name == null) { return null; }
+
+            return this.getAvatar(name);
         }
+
+        // ENS name; forward lookup
+        const resolver = await this.getResolver(nameOrAddress);
+        if (!resolver) { return null; }
 
         const avatar = await resolver.getAvatar();
         if (avatar == null) { return null; }

packages/tests/src.ts/test-providers.ts

@@ -1392,4 +1392,16 @@ describe("Resolve ENS avatar", function() {
             assert.equal(avatar, test.value, "avatar url");
         });
     });
+
+    it(`Resolves to same avatar from ENS or address`, async function() {
+        this.timeout(60000);
+        const provider = ethers.getDefaultProvider("homestead", getApiKeys("homestead"));
+
+        const ensName = "nick.eth";
+        const address = await provider.resolveName(ensName);
+
+        const avatarFromEns = await provider.getAvatar(ensName);
+        const avatarFromAddress = await provider.getAvatar(address);
+        assert.equal(avatarFromEns, avatarFromAddress, "avatar url");
+    });
 });