Merge pull request #193 from Web3Auth/feat/bip340

v4: Add bip340

Author: himanshuchawla009

demo/redirect-flow-example/package-lock.json

@@ -4,8 +4,9 @@
   "private": true,
   "dependencies": {
     "@tkey/common-types": "^15.1.0",
-    "@toruslabs/tss-dkls-lib": "^4.0.0",
-    "@toruslabs/tss-frost-lib": "^1.0.0",
+    "@toruslabs/tss-dkls-lib": "^5.0.0-alpha.0",
+    "@toruslabs/tss-frost-lib": "^2.0.0-alpha.0",
+    "@toruslabs/tss-frost-lib-bip340": "^0.1.0-alpha.0",
     "@types/jest": "^27.5.2",
     "@types/node": "^16.18.48",
     "@types/react": "^18.3.11",

demo/redirect-flow-example/package.json

@@ -12,19 +12,23 @@ import {
   parseToken,
   factorKeyCurve,
   makeEthereumSigner,
+  SIG_TYPE,
 } from "@web3auth/mpc-core-kit";
-import Web3 from "web3";
+import Web3, { core } from "web3";
 import { CHAIN_NAMESPACES, CustomChainConfig, IProvider } from "@web3auth/base";
 import { EthereumSigningProvider } from "@web3auth/ethereum-mpc-provider";
 import { BN } from "bn.js";
 import { KeyType, Point } from "@tkey/common-types";
-import { tssLib } from "@toruslabs/tss-dkls-lib";
-// import{ tssLib } from "@toruslabs/tss-frost-lib";
+import { tssLib as tssLibDkls } from "@toruslabs/tss-dkls-lib";
+import{ tssLib as tssLibFrost } from "@toruslabs/tss-frost-lib";
+import{ tssLib as tssLibFrostBip340 } from "@toruslabs/tss-frost-lib-bip340";
 
 import "./App.css";
 import jwt, { Algorithm } from "jsonwebtoken";
 import { flow } from "./flow";
 
+type TssLib = typeof tssLibDkls | typeof tssLibFrost | typeof tssLibFrostBip340;
+
 const uiConsole = (...args: any[]): void => {
   const el = document.querySelector("#console>p");
   if (el) {
@@ -46,16 +50,6 @@ const DEFAULT_CHAIN_CONFIG: CustomChainConfig = {
   decimals: 18,
 };
 
-const coreKitInstance = new Web3AuthMPCCoreKit({
-  web3AuthClientId: "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ",
-  web3AuthNetwork: selectedNetwork,
-  uxMode: "redirect",
-  manualSync: true,
-  storage: window.localStorage,
-  // sessionTime: 3600, // <== can provide variable session time based on user subscribed plan
-  tssLib,
-  useDKG: false,
-});
 
 const privateKey = "MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCCD7oLrcKae+jVZPGx52Cb/lKhdKxpXjl9eGNa1MlY57A==";
 const jwtPrivateKey = `-----BEGIN PRIVATE KEY-----\n${privateKey}\n-----END PRIVATE KEY-----`;
@@ -97,7 +91,18 @@ function App() {
   const [question, setQuestion] = useState<string | undefined>(undefined);
   const [newQuestion, setNewQuestion] = useState<string | undefined>(undefined);
   const securityQuestion = useMemo(() => new TssSecurityQuestion(), []);
-
+  const [selectedTssLib, setSelectedTssLib] = useState<TssLib>(tssLibDkls);
+  const [coreKitInstance, setCoreKitInstance] = useState<Web3AuthMPCCoreKit>(
+    new Web3AuthMPCCoreKit({
+        web3AuthClientId: "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ",
+        web3AuthNetwork: selectedNetwork,
+        uxMode: "redirect",
+        manualSync: true,
+        storage: window.localStorage,
+        tssLib: selectedTssLib,
+        useDKG: false,
+      })
+  );
   async function setupProvider(chainConfig?: CustomChainConfig) {
     if (coreKitInstance.keyType !== KeyType.secp256k1) {
       console.warn(`Ethereum requires keytype ${KeyType.secp256k1}, skipping provider setup`);
@@ -110,44 +115,58 @@ function App() {
 
   // decide whether to rehydrate session
   const rehydrate = true;
-  const initialized = useRef(false);
-  useEffect(() => {
-    const init = async () => {
-      // Example config to handle redirect result manually
-      if (coreKitInstance.status === COREKIT_STATUS.NOT_INITIALIZED) {
-        await coreKitInstance.init({ handleRedirectResult: false, rehydrate });
-        if (window.location.hash.includes("#state")) {
-          await coreKitInstance.handleRedirectResult();
-        }
-      }
-      if (coreKitInstance.status === COREKIT_STATUS.LOGGED_IN) {
-        await setupProvider();
-      }
 
-      if (coreKitInstance.status === COREKIT_STATUS.REQUIRED_SHARE) {
-        uiConsole(
-          "required more shares, please enter your backup/ device factor key, or reset account unrecoverable once reset, please use it with caution]"
-        );
+
+  const init = async (newCoreKitInstance: Web3AuthMPCCoreKit) => {
+    // Example config to handle redirect result manually
+    if (newCoreKitInstance.status === COREKIT_STATUS.NOT_INITIALIZED) {
+      await newCoreKitInstance.init({ handleRedirectResult: false, rehydrate });
+      if (window.location.hash.includes("#state")) {
+        await newCoreKitInstance.handleRedirectResult();
       }
+    }
+    if (newCoreKitInstance.status === COREKIT_STATUS.LOGGED_IN) {
+      await setupProvider();
+    }
 
-      console.log("coreKitInstance.status", coreKitInstance.status);
-      setCoreKitStatus(coreKitInstance.status);
+    if (newCoreKitInstance.status === COREKIT_STATUS.REQUIRED_SHARE) {
+      uiConsole(
+        "required more shares, please enter your backup/ device factor key, or reset account unrecoverable once reset, please use it with caution]"
+      );
+    }
 
-      try {
-        let result = securityQuestion.getQuestion(coreKitInstance!);
-        setQuestion(result);
-        uiConsole("security question set");
-      } catch (e) {
-        uiConsole("security question not set");
-      }
-    };
-    if (!initialized.current)
+    console.log("newCoreKitInstance.status", newCoreKitInstance.status);
+    setCoreKitStatus(newCoreKitInstance.status);
+
+    try {
+      let result = securityQuestion.getQuestion(newCoreKitInstance!);
+      setQuestion(result);
+      uiConsole("security question set");
+    } catch (e) {
+      uiConsole("security question not set");
+    }
+  };
+
+
+  useEffect(() => {
+    const instance =  new Web3AuthMPCCoreKit({
+      web3AuthClientId: "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ",
+      web3AuthNetwork: selectedNetwork,
+      uxMode: "redirect",
+      manualSync: true,
+      storage: window.localStorage,
+      tssLib: selectedTssLib,
+      useDKG: false,
+    })
+    setCoreKitInstance(
+      instance
+    )
+    if (instance.status === COREKIT_STATUS.NOT_INITIALIZED)
     {
-      init();
-      initialized.current = true;
+      init(instance);
     }
 
-  }, []);
+  }, [selectedTssLib]);
 
   useEffect(() => {
     if (provider) {
@@ -171,7 +190,7 @@ function App() {
     if (!factorPubs) {
       throw new Error("factorPubs not found");
     }
-    const pubsHex = factorPubs[coreKitInstance.tKey.tssTag].map((pub: Point) => {
+    const pubsHex = factorPubs[coreKitInstance.tKey.tssTag].map(pub => {
       return pub.toSEC1(factorKeyCurve, true).toString("hex");
     });
     uiConsole(pubsHex);
@@ -357,26 +376,26 @@ function App() {
     }
     const address = (await web3.eth.getAccounts())[0];
     const balance = web3.utils.fromWei(
-      await web3.eth.getBalance(address) // Balance is in wei
+      await web3.eth.getBalance(address), // Balance is in wei
+      "ether"
     );
     uiConsole(balance);
     return balance;
   };
 
   const signMessage = async (): Promise<any> => {
-    if (coreKitInstance.keyType === "secp256k1") {
+    if (coreKitInstance.sigType === SIG_TYPE.ECDSA_SECP256K1) {
       if (!web3) {
         uiConsole("web3 not initialized yet");
         return;
       }
       const fromAddress = (await web3.eth.getAccounts())[0];
-     
       const message = "hello";
       const signedMessage = await web3.eth.personal.sign(message, fromAddress, "");
 
 
       uiConsole(signedMessage);
-    } else if (coreKitInstance.keyType === "ed25519") {
+    } else if (coreKitInstance.sigType === SIG_TYPE.ED25519 || coreKitInstance.sigType === SIG_TYPE.BIP340) {
       const msg = Buffer.from("hello signer!");
       const sig = await coreKitInstance.sign(msg);
       uiConsole(sig.toString("hex"));
@@ -512,7 +531,7 @@ function App() {
     const fromAddress = (await web3.eth.getAccounts())[0];
 
     const destination = "0x2E464670992574A613f10F7682D5057fB507Cc21";
-    const amount = web3.utils.toWei("0.0001"); // Convert 1 ether to wei
+    const amount = web3.utils.toWei("0.0001", "ether"); // Convert 1 ether to wei
 
     // Submit transaction to the blockchain and wait for it to be mined
     uiConsole("Sending transaction...");
@@ -572,6 +591,32 @@ function App() {
     await coreKitInstance.commitChanges();
   };
 
+  const tssLibSelector = (
+    <div className="flex-container">
+      <label>TSS Library:</label>
+      <select 
+        value={selectedTssLib === tssLibDkls ? "dkls" : selectedTssLib === tssLibFrost ? "frost" : "frostBip340"} 
+        onChange={(e) => {
+          switch(e.target.value) {
+            case "dkls":
+              setSelectedTssLib(tssLibDkls);
+              break;
+            case "frost":
+              setSelectedTssLib(tssLibFrost);
+              break;
+            case "frostBip340":
+              setSelectedTssLib(tssLibFrostBip340);
+              break;
+          }
+        }}
+      >
+        <option value="dkls">DKLS</option>
+        <option value="frost">FROST</option>
+        <option value="frostBip340">FROST BIP340</option>
+      </select>
+    </div>
+  );
+
   const loggedInView = (
     <>
       <h2 className="subtitle">Account Details</h2>
@@ -730,6 +775,7 @@ function App() {
 
   const unloggedInView = (
     <>
+      {tssLibSelector}
       <input value={mockEmail} onChange={(e) => setMockEmail(e.target.value)}></input>
       <button onClick={() => loginWithMock()} className="card">
         MockLogin