Merge branch 'main' into feature/cip30

Author: gavinharris-dev

README.md

@@ -19,7 +19,7 @@ import Web3Token from 'web3-cardano-token/dist/browser';
 
 // Connection to Nami wallet
 const cardano = window.cardano;
-await cardano.enable();
+await cardano.nami.enable();
 
 // getting address from which we will sign message
 const address = (await cardano.getUsedAddresses())[0];

src/lib/sign.js

@@ -25,6 +25,10 @@ export const sign = async (signer, expires_in = '1d', body = {}) => {
   } else {
     throw new Error('"signer" argument should be a function that returns a signature eg: "msg => web3.eth.personal.sign(msg, <YOUR_ADDRESS>)"')
   }
+  
+  if (typeof(signature) === "object") {
+    signature = signature.signature
+  }
 
   const {signature, key} = COSESign1Message;
 
@@ -67,4 +71,4 @@ const buildMessage = data => {
     message.push(`${key}: ${data[key]}`)
   }
   return message.join('\n');
-};
+};

src/lib/verify.js

@@ -96,16 +96,16 @@ export const verify = async (token) => {
 };
 
 /**
- * 
+
+ * Validate the Address provided. To do this we take the Address (or Base Address)
+ * and compare it to an address (BaseAddress or RewardAddress) reconstructed from the
+ * publicKey.
  * @param {Loader.Cardano.Address} checkAddress 
  * @param {Loader.Cardano.PublicKey} publicKey 
- * @returns 
+ * @returns {{status: bool, msg?: string, code?: number}}
  */
-function verifyAddress(checkAddress, publicKey) {
-  console.log("In Verify Address");
-
-  const baseAddress = Loader.Cardano.BaseAddress.from_address(checkAddress);
-
+const verifyAddress = (checkAddress, publicKey) => {
+  let errorMsg = "";
   try {
     //reconstruct address
     const paymentKeyHash = publicKey.hash();
@@ -116,26 +116,37 @@ function verifyAddress(checkAddress, publicKey) {
       Loader.Cardano.StakeCredential.from_keyhash(stakeKeyHash)
     );
 
-    if (
-      checkAddress.to_bech32() !== reconstructedAddress.to_address().to_bech32()
-    ) {
-      return {
-        verified: false,
-        code: 1,
-        message:
-          "Check address does not match Reconstructed Address (Public Key is not the correct key for this Address)",
-      };
-    }
-
+    const status = checkAddress.to_bech32() === reconstructedAddress.to_address().to_bech32();
     return {
-      verified: true,
+      status,
+      msg: status ? "Valid Address" : "Base Address does not validate to Reconstructed address",
+      code: 1
     };
-    
   } catch (e) {
+    errorMsg += ` ${e.message}`
+  }
+
+  try {
+    const stakeKeyHash = checkAddress.hash();
+    const reconstructedAddress = RewardAddress.new(
+      checkAddress.network_id(),
+      StakeCredential.from_keyhash(stakeKeyHash)
+    );
+    
+    const status = checkAddress.to_bech32() === reconstructedAddress.to_address().to_bech32();
     return {
-      verified: false,
-      code: 3,
-      message: e.message,
+      status,
+      msg: status ? "Valid Address" : "Address does not validate to Reconstructed address",
+      code: 1
     };
+
+  } catch (e) {
+    errorMsg += ` ${e.message}`
   }
-}
+
+  return {
+    status: false,
+    msg: `Error: ${errorMsg}`,
+    code: 3
+  };
+};