Merge pull request #425 from w3irdrobot/nip06

NIP06 support

packages/app/src/Pages/Login.tsx

@@ -8,8 +8,8 @@ import { useIntl, FormattedMessage } from "react-intl";
 
 import { RootState } from "State/Store";
 import { setPrivateKey, setPublicKey, setRelays, setGeneratedPrivateKey } from "State/Login";
-import { DefaultRelays, EmailRegex } from "Const";
-import { bech32ToHex, unwrap } from "Util";
+import { DefaultRelays, EmailRegex, MnemonicRegex } from "Const";
+import { bech32ToHex, generateBip39Entropy, entropyToDerivedKey, unwrap } from "Util";
 import { HexKey } from "@snort/nostr";
 import ZapButton from "Element/ZapButton";
 // import useImgProxy from "Feed/ImgProxy";
@@ -97,12 +97,14 @@ export default function LoginPage() {
       } else if (key.match(EmailRegex)) {
         const hexKey = await getNip05PubKey(key);
         dispatch(setPublicKey(hexKey));
+      } else if (key.match(MnemonicRegex)) {
+        const ent = generateBip39Entropy(key);
+        const keyHex = entropyToDerivedKey(ent);
+        dispatch(setPrivateKey(keyHex));
+      } else if (secp.utils.isValidPrivateKey(key)) {
+        dispatch(setPrivateKey(key));
       } else {
-        if (secp.utils.isValidPrivateKey(key)) {
-          dispatch(setPrivateKey(key));
-        } else {
-          throw new Error("INVALID PRIVATE KEY");
-        }
+        throw new Error("INVALID PRIVATE KEY");
       }
     } catch (e) {
       setError(`Failed to load NIP-05 pub key (${e})`);
@@ -111,8 +113,10 @@ export default function LoginPage() {
   }
 
   async function makeRandomKey() {
-    const newKey = secp.utils.bytesToHex(secp.utils.randomPrivateKey());
-    dispatch(setGeneratedPrivateKey(newKey));
+    const ent = generateBip39Entropy();
+    const entHex = secp.utils.bytesToHex(ent);
+    const newKeyHex = entropyToDerivedKey(ent);
+    dispatch(setGeneratedPrivateKey({ key: newKeyHex, entropy: entHex }));
     navigate("/new");
   }
 

packages/app/src/Pages/messages.ts

@@ -46,5 +46,5 @@ export default defineMessages({
   },
   Bookmarks: { defaultMessage: "Bookmarks" },
   BookmarksCount: { defaultMessage: "{n} Bookmarks" },
-  KeyPlaceholder: { defaultMessage: "nsec, npub, nip-05, hex" },
+  KeyPlaceholder: { defaultMessage: "nsec, npub, nip-05, hex, mnemonic" },
 });

packages/app/src/Pages/new/DiscoverFollows.tsx

@@ -1,19 +1,27 @@
 import { useIntl, FormattedMessage } from "react-intl";
+import { useDispatch } from "react-redux";
 import { useNavigate, Link } from "react-router-dom";
 import { RecommendedFollows } from "Const";
 import Logo from "Element/Logo";
 import FollowListBase from "Element/FollowListBase";
 import { useMemo } from "react";
+import { clearEntropy } from "State/Login";
 
 import messages from "./messages";
 
 export default function DiscoverFollows() {
   const { formatMessage } = useIntl();
+  const dispatch = useDispatch();
   const navigate = useNavigate();
   const sortedReccomends = useMemo(() => {
     return RecommendedFollows.sort(() => (Math.random() >= 0.5 ? -1 : 1));
   }, []);
 
+  async function clearEntropyAndGo() {
+    dispatch(clearEntropy());
+    navigate("/");
+  }
+
   return (
     <div className="main-content new-user" dir="auto">
       <Logo />
@@ -27,7 +35,7 @@ export default function DiscoverFollows() {
         <FormattedMessage {...messages.Share} values={{ link: <Link to="/">{formatMessage(messages.World)}</Link> }} />
       </p>
       <div className="next-actions continue-actions">
-        <button type="button" onClick={() => navigate("/")}>
+        <button type="button" onClick={() => clearEntropyAndGo()}>
           <FormattedMessage {...messages.Done} />{" "}
         </button>
       </div>

packages/app/src/Pages/new/NewUserFlow.tsx

@@ -6,7 +6,7 @@ import Logo from "Element/Logo";
 import { CollapsedSection } from "Element/Collapsed";
 import Copy from "Element/Copy";
 import { RootState } from "State/Store";
-import { hexToBech32 } from "Util";
+import { hexToBech32, hexToMnemonic } from "Util";
 
 import messages from "./messages";
 
@@ -68,7 +68,7 @@ const Extensions = () => {
 };
 
 export default function NewUserFlow() {
-  const { publicKey, privateKey } = useSelector((s: RootState) => s.login);
+  const { publicKey, privateKey, generatedEntropy } = useSelector((s: RootState) => s.login);
   const navigate = useNavigate();
 
   return (
@@ -91,6 +91,10 @@ export default function NewUserFlow() {
         <FormattedMessage {...messages.YourPrivkey} />
       </h2>
       <Copy text={hexToBech32("nsec", privateKey ?? "")} />
+      <h2>
+        <FormattedMessage {...messages.YourMnemonic} />
+      </h2>
+      <Copy text={hexToMnemonic(generatedEntropy ?? "")} />
       <div className="next-actions">
         <button type="button" onClick={() => navigate("/new/username")}>
           <FormattedMessage {...messages.KeysSaved} />{" "}

packages/app/src/Pages/new/messages.ts

@@ -10,6 +10,7 @@ export default defineMessages({
   },
   YourPubkey: { defaultMessage: "Your public key" },
   YourPrivkey: { defaultMessage: "Your private key" },
+  YourMnemonic: { defaultMessage: "Your mnemonic phrase" },
   KeysSaved: { defaultMessage: "I have saved my keys, continue" },
   WhatIsSnort: { defaultMessage: "What is Snort and how does it work?" },
   WhatIsSnortIntro: {