Cleanup

README.md

@@ -15,13 +15,19 @@
       '0x33838c6f4e621982c2009f9b93ecb854a4b122538159623abc87d2e4c5bd6d2e33591f443b419b3bd2790e455ba6d625f2ca14b822c5cef824ef7e9021443bed1c';
     const address = '0x86aa354fc865925f945b803ceae0b3f9d856b269';
 
-    const isSignerActionableOnAddress = await dappAuth.isSignerActionableOnAddress(
-      challenge,
-      signature,
-      address,
-    );
+    try {
+      const isAuthorizedSigner = await dappAuth.isAuthorizedSigner(
+        challenge,
+        signature,
+        address,
+      );
+
+      console.log(isAuthorizedSigner); // true
+    }
+    } catch (e) {
+      console.log(e);
+    }
 
-    console.log(isSignerActionableOnAddress); // true
   }
 ```
 

index.js

@@ -31,17 +31,16 @@ module.exports = class DappAuth {
         isAuthorizedDirectKey = true;
       }
     } catch (e) {
-      // if either direct-keyed auth flow threw an error, or it did not conclude to be authorized, proceed to try smart-contract wallet in finally clause.
-    } finally {
-      if (isAuthorizedDirectKey === true) return isAuthorizedDirectKey;
-      // try smart-contract wallet
-      const erc1271CoreContract = new this.web3.eth.Contract(ERC1271, address);
+      // if either direct-keyed auth flow threw an error, or it did not conclude to be authorized, proceed to try smart-contract wallet.
+    }
+    if (isAuthorizedDirectKey === true) return isAuthorizedDirectKey;
+    // try smart-contract wallet
+    const erc1271CoreContract = new this.web3.eth.Contract(ERC1271, address);
 
-      const magicValue = await erc1271CoreContract.methods
-        .isValidSignature(ethUtil.keccak(challenge), signature) // we send just a regular hash, which then the smart contract hashes ontop to an erc191 hash
-        .call();
+    const magicValue = await erc1271CoreContract.methods
+      .isValidSignature(ethUtil.keccak(challenge), signature) // we send just a regular hash, which then the smart contract hashes ontop to an erc191 hash
+      .call();
 
-      return magicValue === ERC1271_MAGIC_VALUE;
-    }
+    return magicValue === ERC1271_MAGIC_VALUE;
   }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dapperlabs/dappauth",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A util to prove actionable control ('ownership') over a public Ethereum address using eth_sign",
   "keywords": [
     "ethereum",